diff --git a/CHANGELOG.md b/CHANGELOG.md
index e20c85937aedca1b2c729f7f03c49b3a671aec9c..dc7ca1fdfb4a1c7e3d762c8f4b204347192c5d1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,50 @@
+0.42.0-beta7
+=============
+* Various improvements:
+ * Added Varnish 4 support
+ * Added CSS minification
+ * Improved the performance toolkit
+* Fixed bugs:
+ * Fixed an issue where the compiler for the single tenant mode did not resolve Repositories
+ * Fixed an issue where the "Select all" mass action on the Customers page did not select all customers
+ * Fixed an issue where values for a customer attribute of multiple-select type were not saved
+ * Fixed an issue where the parental wakeup() method was not called in interceptors
+ * Fixed an issue where bundle products with the same configurations added from different pages were displayed in the wishlist as separate items
+ * Fixed an issue where the number of items added to the wishlist was not displayed on certain pages
+ * Fixed an issue where logging was broken
+ * Fixed an issue where it was impossible to use \Magento\Customer\Model\Resource\AddressRepository::getList with predefined direction(sortOrder)
+ * Fixed an issue where editing a product from wishlist led caused a fatal error
+ * Fixed an issue where the redirect link to continue shopping was absent in the success message after adding product to a wishlist
+ * Fixed an issue where HTML tags where displayed in product prices on the Customer's Wishlist page in Admin
+ * Fixed an issue where the Name and Email fields were not automatically when creating an email using the Email to Friend functionality
+ * Fixed an issue with the redirect after searching product in a customer wishlist in Admin
+ * Fixed an issue where a configurable product did not go out of stock when last subitem of some option was sold
+ * Fixed an issue with varnish config generation for multiple IPs in access list field
+ * Fixed the wrong di.xml in the Magento_Developer module
+ * Fixed an issue where changes were not saved when default billing/shipping address was not selected in customer addresses
+ * Fixed the issue where the Update Qty button looked disabled during a partial invoice creation
+ * Fixed an issue where the creation date was not displayed in invoices and credit memo grids
+ * Fixed an issue where it was impossible to install Magento_Quote on PHP 5.6
+ * Fixed an issue that changes are not saved when default billing/shipping address is unchecked in customer addresses
+ * Fixed an issue where "Update Qty" button looks disabled while creating partial invoice
+ * Fixed an issue where date created column is not populated in invoices and credit memo grid
+ * Fixed an issue with installation of Magento_Quote module on PHP 5.6
+ * Fixed an issue with wrong link "File Permission Help"
+ * Fixed an issue where dev/tools are broken when DI compiler is used due to skipped by the compiler dev/tools/Magento folder
+* Framework improvements:
+ * JavaScript testsuites divided into frontend, backend and lib suites
+ * Implemented image compression on server side upload
+ * Implemented frontend page resources sorting
+ * Removed the Magic __call method usage in templates
+ * Introduced Jasmine + PhantomJS JavaScript testing infrastructure
+ * Removed support of PHP 5.4
+* Setup Tool improvements:
+ * Added tools for enabling/disabling modules: "module-enable --modules=Module_One,Module_Two, module-disable --modules=Module_One,Module_Two"
+ * Added help option for displaying list of available modules: "help module-list"
+* GitHub requests :
+ * [#593](https://github.com/magento/magento2/issues/593) -- Allow to use "0" as customer group
+ * [#804](https://github.com/magento/magento2/issues/804) -- Comment about VAT number displayed under different field in Customer Configuration
+
0.42.0-beta6
=============
* Various improvements:
diff --git a/Gruntfile.js b/Gruntfile.js
index 52e8da6cb725d77e9b6654749010e6862c41c485..9d070f2029d8304f2b62193c241854db8c90516f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,7 +9,9 @@ module.exports = function (grunt) {
// Required plugins
// _____________________________________________
- var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt);
+
+ var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt),
+ svgo = require('imagemin-svgo');
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
@@ -21,8 +23,6 @@ module.exports = function (grunt) {
pattern: ['grunt-*', '!grunt-template-jasmine-requirejs']
});
- var svgo = require('imagemin-svgo');
-
// Configuration
// _____________________________________________
@@ -318,7 +318,8 @@ module.exports = function (grunt) {
cssmin: {
options: {
- report: 'gzip'
+ report: 'gzip',
+ keepSpecialComments: 0
},
setup: {
files: {
@@ -342,6 +343,20 @@ module.exports = function (grunt) {
}
},
+ // Concatenation
+ // ---------------------------------------------
+
+ concat: {
+ options: {
+ stripBanners: true,
+ banner: '/**\n * Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n'
+ },
+ setup: {
+ src: '<%= path.css.setup %>/setup.css',
+ dest: '<%= path.css.setup %>/setup.css'
+ }
+ },
+
// Watches files for changes and runs tasks based on the changed files
// ---------------------------------------------
@@ -545,7 +560,8 @@ module.exports = function (grunt) {
grunt.task.run([
'less:' + component,
'autoprefixer:' + component,
- 'cssmin:' + component
+ 'cssmin:' + component,
+ 'concat:' + component
]);
}
if (component == undefined) {
diff --git a/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php b/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
index 24564a4eee5789a113af42639f834599abfa6e6a..825ad2ec74196add12ef7d4886043407b9686458 100644
--- a/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
+++ b/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
@@ -66,7 +66,7 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
/**
* Retrieve popup title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getPopupTitle()
{
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
index 6f43d668a4ad288cc0a71bbbbfde45995292d8ae..e9e00749a4fb2e2e706abceb5401b071c43e655f 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
protected $_config;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -32,13 +32,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\UrlInterface $urlBuilder
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\UrlInterface $urlBuilder,
\Magento\Framework\App\Config\ValueFactory $configValueFactory
) {
@@ -114,7 +114,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
/**
* Retrieve message text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getText()
{
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php b/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
index 26287c1db12fce0f776d07cb7f84733fe1ba0894..016508fef7d7861acfce12b534e893a7ca92d33b 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
@@ -69,7 +69,7 @@ class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
public function isDisplayed()
{
return $this->_authorization->isAllowed(
- 'Magento_Adminhtml::cache'
+ 'Magento_Backend::cache'
) && count(
$this->_getCacheTypesForRefresh()
) > 0;
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
index f14413eb82833cc24cf9b5c659f10a8bde98b0c1..748ec28eddf7bd80488d67fd42cfcec687960942 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
@@ -31,7 +31,7 @@ class Error extends \Magento\AdminNotification\Model\System\Message\Media\Abstra
/**
* Retrieve message text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getText()
{
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
index 74a8288f7a3b6b6375cd9aa3c3a87be97584638c..24f7637c83975ef940493857b581319c9f855f3c 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
@@ -30,7 +30,7 @@ class Success extends \Magento\AdminNotification\Model\System\Message\Media\Abst
/**
* Retrieve message text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getText()
{
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
index 72465b8fdfc3f1c57137881ce5bd921a3a63a571..3a966391c75cb0e1cc166a83a22ca198602e6181 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Security.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -129,7 +129,7 @@ class Security implements \Magento\Framework\Notification\MessageInterface
/**
* Retrieve message text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getText()
{
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index 39b04b32c70b5b56a5b0132a5dc5bf93b3596338..3be3a42303131b8e41e7b70cc14c6094dbabea1c 100644
--- a/app/code/Magento/AdminNotification/composer.json
+++ b/app/code/Magento/AdminNotification/composer.json
@@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"lib-libxml": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/AdminNotification/etc/acl.xml b/app/code/Magento/AdminNotification/etc/acl.xml
index cd908639d98c98764c220523363b6c1d3ed59be9..01ae3b6da6fbb3a4f9373f9ad3bf0c7bfe0067cb 100644
--- a/app/code/Magento/AdminNotification/etc/acl.xml
+++ b/app/code/Magento/AdminNotification/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::system">
- <resource id="Magento_Adminhtml::system_other_settings">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::system">
+ <resource id="Magento_Backend::system_other_settings">
<resource id="Magento_AdminNotification::adminnotification" title="Notifications" sortOrder="10">
<resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" sortOrder="10" />
<resource id="Magento_AdminNotification::show_list" title="Show List" sortOrder="20" />
diff --git a/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml b/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml
index 712232289da965658d0ad56b3b22bc33bba82c15..19c3fc2200c6697ddd56ad9696dc460a215c5f82 100644
--- a/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml
+++ b/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_AdminNotification" before="Magento_Adminhtml" />
+ <module name="Magento_AdminNotification" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
index 42bdfd000bd5e825382dd669e199817972e8af9d..b407b09c385963e265c379ed2e54437f686af001 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
@@ -7,7 +7,7 @@
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
<head>
- <css src="Magento_Core::prototype/magento.css"/>
+ <css src="Magento_Theme::prototype/magento.css"/>
</head>
<body>
<referenceContainer name="notifications">
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index 17b027bd5bed3aa47241e5de745dcc453b721aae..2b0213618d9fc145c45f4361c1c10bd1c1dcf194 100644
--- a/app/code/Magento/Authorization/composer.json
+++ b/app/code/Magento/Authorization/composer.json
@@ -3,12 +3,12 @@
"description": "Authorization module provides access to Magento ACL functionality.",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php b/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php
index 1e2f7b53f31a66bc2ba3c2f0f918024b494e817c..cfc55b87476217c6705ff583fd210fb187c80c79 100644
--- a/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php
@@ -47,7 +47,7 @@ if ($rulesCollection->count() == 0) {
$this->createRules()->setData(
[
'role_id' => $admGroupRole->getId(),
- 'resource_id' => 'Magento_Adminhtml::all',
+ 'resource_id' => 'Magento_Backend::all',
'privileges' => null,
'permission' => 'allow',
]
@@ -55,6 +55,6 @@ if ($rulesCollection->count() == 0) {
} else {
/** @var \Magento\Authorization\Model\Rules $rule */
foreach ($rulesCollection as $rule) {
- $rule->setData('resource_id', 'Magento_Adminhtml::all')->save();
+ $rule->setData('resource_id', 'Magento_Backend::all')->save();
}
}
diff --git a/app/code/Magento/Backend/App/Router.php b/app/code/Magento/Backend/App/Router.php
index 062d70ac4654f5e5e3581c9b3dd74242cfa7b290..3ae734acb76f902fcc918e5d29cd42b01904f9b3 100644
--- a/app/code/Magento/Backend/App/Router.php
+++ b/app/code/Magento/Backend/App/Router.php
@@ -53,7 +53,7 @@ class Router extends \Magento\Core\App\Router\Base
* @param \Magento\Framework\App\ResponseFactory $responseFactory
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
* @param \Magento\Framework\UrlInterface $url
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
* @param string $routerId
@@ -70,7 +70,7 @@ class Router extends \Magento\Core\App\Router\Base
\Magento\Framework\App\ResponseFactory $responseFactory,
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
\Magento\Framework\UrlInterface $url,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
$routerId,
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
index b6713c9e90ab36655fb7837f850ec72d7c466b1a..6433c0a0514b7e127299077aa81a14f6ca8aa1af 100644
--- a/app/code/Magento/Backend/Block/Dashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard.php
@@ -31,7 +31,7 @@ class Dashboard extends \Magento\Backend\Block\Template
$this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
- if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+ 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/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
index ae9f2d4a868dbd3b98dc2b0fa4499fc03ac0a5e6..91c4d619072bac7d99c3e452ff28da690468faf0 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Graph.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -210,7 +210,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
$timezoneLocal = $this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
list($dateStart, $dateEnd) = $this->_collectionFactory->create()->getDateRange(
diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
index 8ecf07022340e93948602f9ad50c03f53b27ea72..4d47f0a1a862b763000bfd807fa3050f7fbf3f66 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
@@ -110,7 +110,6 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
'items',
[
'header' => __('Items'),
- 'align' => 'right',
'type' => 'number',
'sortable' => false,
'index' => 'items_count'
@@ -122,8 +121,7 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
$this->addColumn(
'total',
[
- 'header' => __('Grand Total'),
- 'align' => 'right',
+ 'header' => __('Total'),
'sortable' => false,
'type' => 'currency',
'currency_code' => $baseCurrencyCode,
diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
index c29cceaf1f1e67216f37501445da082d8c5908a5..d734e7657ffad7dc2994e8404d198006386fd380 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Sales.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -71,6 +71,6 @@ class Sales extends \Magento\Backend\Block\Dashboard\Bar
$sales = $collection->getFirstItem();
$this->addTotal(__('Lifetime Sales'), $sales->getLifetime());
- $this->addTotal(__('Average Orders'), $sales->getAverage());
+ $this->addTotal(__('Average Order'), $sales->getAverage());
}
}
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
index 69a835e1ca043dd48a3b5d2110b38316e4d72767..bfba9ada27e4af5a410131576e925878fd74e4b2 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
@@ -91,11 +91,12 @@ class Most extends \Magento\Backend\Block\Dashboard\Grid
'orders_avg_amount',
[
'header' => __('Average'),
- 'align' => 'right',
'sortable' => false,
'type' => 'currency',
'currency_code' => $baseCurrencyCode,
- 'index' => 'orders_avg_amount'
+ 'index' => 'orders_avg_amount',
+ 'header_css_class' => 'col-avg',
+ 'column_css_class' => 'col-avg'
]
);
@@ -103,11 +104,12 @@ class Most extends \Magento\Backend\Block\Dashboard\Grid
'orders_sum_amount',
[
'header' => __('Total'),
- 'align' => 'right',
'sortable' => false,
'type' => 'currency',
'currency_code' => $baseCurrencyCode,
- 'index' => 'orders_sum_amount'
+ 'index' => 'orders_sum_amount',
+ 'header_css_class' => 'col-total',
+ 'column_css_class' => 'col-total'
]
);
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
index ce7b2ac229701b1698b6c22b6d0fc449965e1a8c..f1f4623d41e994e49104ea03a7ece847ef2e4f42 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
@@ -89,12 +89,13 @@ class Newest extends \Magento\Backend\Block\Dashboard\Grid
'orders_avg_amount',
[
'header' => __('Average'),
- 'align' => 'right',
'sortable' => false,
'type' => 'currency',
'currency_code' => $baseCurrencyCode,
'index' => 'orders_avg_amount',
- 'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
+ 'header_css_class' => 'col-avg',
+ 'column_css_class' => 'col-avg'
]
);
@@ -102,12 +103,13 @@ class Newest extends \Magento\Backend\Block\Dashboard\Grid
'orders_sum_amount',
[
'header' => __('Total'),
- 'align' => 'right',
'sortable' => false,
'type' => 'currency',
'currency_code' => $baseCurrencyCode,
'index' => 'orders_sum_amount',
- 'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency'
+ 'renderer' => 'Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency',
+ 'header_css_class' => 'col-total',
+ 'column_css_class' => 'col-total'
]
);
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
index a211d5d26b87da0c468fa988facc4cc45c75cbf3..6046b66a0b0ba9032c6e1ddf15755a633733858b 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
@@ -85,13 +85,20 @@ class Ordered extends \Magento\Backend\Block\Dashboard\Grid
*/
protected function _prepareColumns()
{
- $this->addColumn('name', ['header' => __('Product'), 'sortable' => false, 'index' => 'product_name']);
+ $this->addColumn(
+ 'name', [
+ 'header' => __('Product'),
+ 'sortable' => false,
+ 'index' => 'product_name',
+ 'header_css_class' => 'col-product',
+ 'column_css_class' => 'col-product'
+ ]
+ );
$this->addColumn(
'price',
[
'header' => __('Price'),
- 'width' => '120px',
'type' => 'currency',
'currency_code' => (string)$this->_storeManager->getStore(
(int)$this->getParam('store')
@@ -104,12 +111,12 @@ class Ordered extends \Magento\Backend\Block\Dashboard\Grid
$this->addColumn(
'ordered_qty',
[
- 'header' => __('Order Quantity'),
- 'width' => '120px',
- 'align' => 'right',
+ 'header' => __('Quantity'),
'sortable' => false,
'index' => 'qty_ordered',
- 'type' => 'number'
+ 'type' => 'number',
+ 'header_css_class' => 'col-qty',
+ 'column_css_class' => 'col-qty'
]
);
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
index 42c7cbb9115f99b8da761f0f1fb2d4fa94ea2737..bfd3740114ffbffec1387e72c603f9529a9cdadf 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
@@ -81,7 +81,6 @@ class Viewed extends \Magento\Backend\Block\Dashboard\Grid
'price',
[
'header' => __('Price'),
- 'width' => '120px',
'type' => 'currency',
'currency_code' => (string)$this->_storeManager->getStore(
(int)$this->getParam('store')
@@ -95,10 +94,10 @@ class Viewed extends \Magento\Backend\Block\Dashboard\Grid
'views',
[
'header' => __('Views'),
- 'width' => '120px',
- 'align' => 'right',
'sortable' => false,
- 'index' => 'views'
+ 'index' => 'views',
+ 'header_css_class' => 'col-views',
+ 'column_css_class' => 'col-views'
]
);
diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
index 227db0beb9a1b8d7e1c4dff5edab910f4173a987..f4b8eb0b23ed3660b45255b366c75c2771afb73d 100644
--- a/app/code/Magento/Backend/Block/Page/Header.php
+++ b/app/code/Magento/Backend/Block/Page/Header.php
@@ -80,6 +80,6 @@ class Header extends \Magento\Backend\Block\Template
*/
public function displayNoscriptNotice()
{
- return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Backend/Block/Page/Notices.php b/app/code/Magento/Backend/Block/Page/Notices.php
index 3ae3ef4f719efbe937f7b1a24be9f5761ba7b184..231d51c9919ddb093d476d93f90d54bcd8268294 100644
--- a/app/code/Magento/Backend/Block/Page/Notices.php
+++ b/app/code/Magento/Backend/Block/Page/Notices.php
@@ -22,7 +22,7 @@ class Notices extends \Magento\Backend\Block\Template
*/
public function displayNoscriptNotice()
{
- return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -32,6 +32,6 @@ class Notices extends \Magento\Backend\Block\Template
*/
public function displayDemoNotice()
{
- return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Backend/Block/System/Account/Edit.php b/app/code/Magento/Backend/Block/System/Account/Edit.php
index dd93eaf5fd5ecb1bedc4d98731471f57614945f8..dd376795810d3fb727e39488d9780961c03b8156 100644
--- a/app/code/Magento/Backend/Block/System/Account/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Account/Edit.php
@@ -27,7 +27,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php b/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
index 5a345204f462aa854b5f686aa7581f6bba932a84..54b2695b8624e4b58301f3b7db6ecb6e2fb7d4c6 100644
--- a/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
+++ b/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
@@ -69,7 +69,7 @@ class DisableOutput extends \Magento\Backend\Block\System\Config\Form\Fieldset
sort($modules);
foreach ($modules as $moduleName) {
- if ($moduleName === 'Magento_Adminhtml' || $moduleName === 'Magento_Backend') {
+ if ($moduleName === 'Magento_Backend') {
continue;
}
$html .= $this->_getFieldHtml($element, $moduleName);
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete.php b/app/code/Magento/Backend/Block/System/Store/Delete.php
index 0dd9534c42a47c6fa92f9185e0936709303e6ba3..6b93acaba9b5ee45e7dec48b627dc401575ed751 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete.php
@@ -49,7 +49,7 @@ class Delete extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get edit form container header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Backend/Block/System/Store/Store.php b/app/code/Magento/Backend/Block/System/Store/Store.php
index 21d35b35aad2cfb4edd42be620f65670d36aa331..5a984389aedc7eeb77786dc17f09483a9c5e0ca7 100644
--- a/app/code/Magento/Backend/Block/System/Store/Store.php
+++ b/app/code/Magento/Backend/Block/System/Store/Store.php
@@ -15,7 +15,7 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Container
/**
* @var string
*/
- protected $_blockGroup = 'Magento_Adminhtml';
+ protected $_blockGroup = 'Magento_Backend';
/**
* @return void
diff --git a/app/code/Magento/Backend/Block/System/Variable/Edit.php b/app/code/Magento/Backend/Block/System/Variable/Edit.php
index f73eb2b96f6b1af326f88387889561b0a4eaf22a..ea134a26e84c18f254b6ed2e120f2428d9eeecd0 100644
--- a/app/code/Magento/Backend/Block/System/Variable/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Variable/Edit.php
@@ -97,7 +97,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Return translated header text depending on creating/editing action
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
index b9546009a53f3ff556cd1b06e362c53a9957671e..ed21d0025e4abda8f69cf8ac6516a284a5a426d0 100644
--- a/app/code/Magento/Backend/Block/Template.php
+++ b/app/code/Magento/Backend/Block/Template.php
@@ -79,7 +79,7 @@ class Template extends \Magento\Framework\View\Element\Template
return !$this->_scopeConfig->isSetFlag(
'advanced/modules_disable_output/' . $moduleName,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php
index 5be2763e3a500febc4f6db568561688c509fd87f..da4142f87c2f17002c1bebd07fe7fcd472530828 100644
--- a/app/code/Magento/Backend/Block/Template/Context.php
+++ b/app/code/Magento/Backend/Block/Template/Context.php
@@ -66,7 +66,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
* @param \Magento\Framework\View\FileSystem $viewFileSystem
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
* @param \Magento\Framework\App\State $appState
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\Page\Config $pageConfig
* @param \Magento\Framework\AuthorizationInterface $authorization
* @param \Magento\Backend\Model\Session $backendSession
@@ -99,7 +99,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
\Magento\Framework\View\FileSystem $viewFileSystem,
\Magento\Framework\View\TemplateEnginePool $enginePool,
\Magento\Framework\App\State $appState,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\Page\Config $pageConfig,
\Magento\Framework\AuthorizationInterface $authorization,
\Magento\Backend\Model\Session $backendSession,
@@ -143,7 +143,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
/**
* Get store manager
*
- * @return \Magento\Framework\Store\StoreManagerInterface
+ * @return \Magento\Store\Model\StoreManagerInterface
*/
public function getStoreManager()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Context.php b/app/code/Magento/Backend/Block/Widget/Context.php
index e5ab71975d5ee024340ac9c3cf23f2eb37200a88..40bb65bc78fba6ee9f93abb0438ef40da958b8ac 100644
--- a/app/code/Magento/Backend/Block/Widget/Context.php
+++ b/app/code/Magento/Backend/Block/Widget/Context.php
@@ -49,7 +49,7 @@ class Context extends \Magento\Backend\Block\Template\Context
* @param \Magento\Framework\View\FileSystem $viewFileSystem
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
* @param \Magento\Framework\App\State $appState
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\AuthorizationInterface $authorization
* @param \Magento\Backend\Model\Session $backendSession
* @param \Magento\Framework\Math\Random $mathRandom
@@ -84,7 +84,7 @@ class Context extends \Magento\Backend\Block\Template\Context
\Magento\Framework\View\FileSystem $viewFileSystem,
\Magento\Framework\View\TemplateEnginePool $enginePool,
\Magento\Framework\App\State $appState,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\Page\Config $pageConfig,
\Magento\Framework\AuthorizationInterface $authorization,
\Magento\Backend\Model\Session $backendSession,
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 646aa0291859885c5fd49df59edb2ee45ce9ecc2..fa7185cca11b7e31e85d93ca6d245090f794ffab 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
@@ -203,7 +203,7 @@ class Date extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilt
$dateObj->setTimezone(
$this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
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 65a71d3944aea85cda093465c9294ce4400ab372..3ea98889419dc032726282b4ca3d392b4298a2a8 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
@@ -44,7 +44,7 @@ class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Date
$datetimeTo->setTimezone(
$this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$datetimeTo->addDay(1)->subSecond(1);
@@ -70,7 +70,7 @@ class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Date
$dateObj->setTimezone(
$this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
index d8e73328b9167cfccce66a28f1c350b0509e908d..f0454dd37a9ec1e60fd5e232c06e60635bf37d00 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -30,7 +30,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
/**
* Application object
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -51,7 +51,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
/**
* @param \Magento\Backend\Block\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\Currency\DefaultLocator $currencyLocator
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
@@ -59,7 +59,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
*/
public function __construct(
\Magento\Backend\Block\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Directory\Model\Currency\DefaultLocator $currencyLocator,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
index 628d68b0fbccd0c69f2b7b698a499f1575d6d693..a80409810e7b39bc41bab3da1398a265935e117d 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
@@ -83,7 +83,7 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
* Render row store views
*
* @param \Magento\Framework\Object $row
- * @return string
+ * @return \Magento\Framework\Phrase|string
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
@@ -135,7 +135,7 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractR
* Render row store views for export
*
* @param \Magento\Framework\Object $row
- * @return string
+ * @return \Magento\Framework\Phrase|string
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function renderExport(\Magento\Framework\Object $row)
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
index b3f9c969d729571b37bab80dde3e6340a27dffe5..6d7cd7a7c992608625d16915f76bab9583abb9dc 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
@@ -85,6 +85,6 @@ class Cache extends Action
*/
protected function _isAllowed()
{
- return $this->_authorization->isAllowed('Magento_Adminhtml::cache');
+ return $this->_authorization->isAllowed('Magento_Backend::cache');
}
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
index 9d8a1fcddd094e863c046a43986ccfa8bb51ad6c..a4c41fde49a929cf412eb3f6b5c145ca239f68c9 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
@@ -18,6 +18,6 @@ class Dashboard extends \Magento\Backend\App\Action
*/
protected function _isAllowed()
{
- return $this->_authorization->isAllowed('Magento_Adminhtml::dashboard');
+ return $this->_authorization->isAllowed('Magento_Backend::dashboard');
}
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
new file mode 100644
index 0000000000000000000000000000000000000000..5172f791b6d021decee43a64baa44430b84acf94
--- /dev/null
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Controller\Adminhtml\Dashboard;
+
+class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
+{
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+ * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ * @param array $reportTypes
+ * @param \Psr\Log\LoggerInterface $logger
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
+ \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+ array $reportTypes,
+ \Psr\Log\LoggerInterface $logger
+ ) {
+ parent::__construct($context, $dateFilter, $resultRedirectFactory, $reportTypes);
+ $this->logger = $logger;
+ }
+
+ /**
+ * @return \Magento\Backend\Model\View\Result\Redirect
+ */
+ public function execute()
+ {
+ try {
+ $collectionsNames = array_values($this->reportTypes);
+ foreach ($collectionsNames as $collectionName) {
+ $this->_objectManager->create($collectionName)->aggregate();
+ }
+ $this->messageManager->addSuccess(__('We updated lifetime statistic.'));
+ } catch (\Exception $e) {
+ $this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
+ $this->logger->critical($e);
+ }
+ return $this->resultRedirectFactory->create()->setPath('*/*');
+ }
+}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
index 1d003b0a130c4265ba40afef8212cbbb5d094b5f..c0017958a0bc88b09ab151f24faae155f483fd78 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
@@ -44,7 +44,7 @@ class GlobalSearch extends \Magento\Backend\Controller\Adminhtml\Index
{
$items = [];
- if (!$this->_authorization->isAllowed('Magento_Adminhtml::global_search')) {
+ if (!$this->_authorization->isAllowed('Magento_Backend::global_search')) {
$items[] = [
'id' => 'error',
'type' => __('Error'),
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System.php b/app/code/Magento/Backend/Controller/Adminhtml/System.php
index 7eaa0173569091b19b9872a7be9988ed818399a8..5ce34283afccf90cb503e1f603dc443c03158d30 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System.php
@@ -19,6 +19,6 @@ class System extends AbstractAction
*/
protected function _isAllowed()
{
- return $this->_authorization->isAllowed('Magento_Adminhtml::system');
+ return $this->_authorization->isAllowed('Magento_Backend::system');
}
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php b/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php
index 9345cb672d8dac523a297a2a13f1597174fcdb75..aeb025007f6b5706d5ee2b63e09228a125c3e2e8 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php
@@ -58,7 +58,7 @@ abstract class AbstractConfig extends \Magento\Backend\App\AbstractAction
protected function _isAllowed()
{
$sectionId = $this->_request->getParam('section');
- return $this->_authorization->isAllowed('Magento_Adminhtml::config')
+ return $this->_authorization->isAllowed('Magento_Backend::config')
|| $this->_configStructure->getElement($sectionId)->isAllowed();
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php
index 62bbfe91fee20eb036db01044f7b009d97830d8c..166951742d8f3451005b4a22baec65ff59ad1f21 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php
@@ -19,6 +19,6 @@ class Account extends Action
*/
protected function _isAllowed()
{
- return $this->_authorization->isAllowed('Magento_Adminhtml::myaccount');
+ return $this->_authorization->isAllowed('Magento_Backend::myaccount');
}
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php
index 8fae2b6ed7ef3871507a94d1b1c6e9926ebc83fe..66e2b5739f6157d3da37d3ce4212b9d3956df2ff 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php
@@ -73,6 +73,6 @@ class Design extends Action
*/
protected function _isAllowed()
{
- return $this->_authorization->isAllowed('Magento_Adminhtml::design');
+ return $this->_authorization->isAllowed('Magento_Backend::design');
}
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php
index bf6a5d36a52d162b8a155ffc427a8b884d50714a..4af63776d2482a21511034721220790fa805a459 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php
@@ -32,7 +32,7 @@ class Index extends \Magento\Backend\Controller\Adminhtml\System
{
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
$resultPage = $this->resultPageFactory->create();
- $resultPage->setActiveMenu('Magento_Adminhtml::system');
+ $resultPage->setActiveMenu('Magento_Backend::system');
$resultPage->addBreadcrumb(__('System'), __('System'));
return $resultPage;
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
index 9a9d2a4a6d620e056667cc5a44f95cef77decec1..4ed6e97af4265be80401e67aaf5053c99e6f9e8a 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
@@ -90,7 +90,7 @@ class Store extends Action
*/
protected function _isAllowed()
{
- return $this->_authorization->isAllowed('Magento_Adminhtml::store');
+ return $this->_authorization->isAllowed('Magento_Backend::store');
}
/**
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
index d7e2b7d677fe6e2e3cdbf4e651855bb86ef8a89e..65b4ec34cccfb53bf414537223c2db1c16d88424 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
@@ -16,7 +16,6 @@ class DeleteStore extends \Magento\Backend\Controller\Adminhtml\System\Store
$itemId = $this->getRequest()->getParam('item_id', null);
if (!($model = $this->_objectManager->create('Magento\Store\Model\Store')->load($itemId))) {
$this->messageManager->addError(__('Unable to proceed. Please, try again.'));
- $this->_redirect('adminhtml/*/');
/** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
$redirectResult = $this->resultRedirectFactory->create();
return $redirectResult->setPath('adminhtml/*/');
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php
index 8dd35c33673ffe0703a00fc605b1eed62d050c40..f133ce599b39d562e8cf2aabc457bbd5b59a6aab 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php
@@ -112,6 +112,6 @@ class Variable extends Action
*/
protected function _isAllowed()
{
- return $this->_authorization->isAllowed('Magento_Adminhtml::variable');
+ return $this->_authorization->isAllowed('Magento_Backend::variable');
}
}
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Data.php b/app/code/Magento/Backend/Helper/Dashboard/Data.php
index 25b527c5013b0f3ab0af6473757896e43e8ea56a..17cffb3f53c45f60c21b6dd9767bb78a954408ef 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Data.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Data.php
@@ -30,7 +30,7 @@ class Data extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param DeploymentConfig $deploymentConfig
@@ -39,7 +39,7 @@ class Data extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
DeploymentConfig $deploymentConfig,
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Order.php b/app/code/Magento/Backend/Helper/Dashboard/Order.php
index a78e32e23d17d273b27504a1b61d6f38bfa58c9a..899e2b2ee6e040420f54da0051e32ecb80cee434 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Order.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Order.php
@@ -18,7 +18,7 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Reports\Model\Resource\Order\Collection $orderCollection
@@ -27,7 +27,7 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Reports\Model\Resource\Order\Collection $orderCollection,
diff --git a/app/code/Magento/Backend/Model/Config.php b/app/code/Magento/Backend/Model/Config.php
index fac2a55a463c509799cac3f4feef9e0cd8b6f2f9..b5b099997e3275dcb46cb5b671a96648f3978861 100644
--- a/app/code/Magento/Backend/Model/Config.php
+++ b/app/code/Magento/Backend/Model/Config.php
@@ -71,7 +71,7 @@ class Config extends \Magento\Framework\Object
protected $_configValueFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -82,7 +82,7 @@ class Config extends \Magento\Framework\Object
* @param \Magento\Framework\DB\TransactionFactory $transactionFactory
* @param \Magento\Backend\Model\Config\Loader $configLoader
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
*/
public function __construct(
@@ -92,7 +92,7 @@ class Config extends \Magento\Framework\Object
\Magento\Framework\DB\TransactionFactory $transactionFactory,
\Magento\Backend\Model\Config\Loader $configLoader,
\Magento\Framework\App\Config\ValueFactory $configValueFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
array $data = []
) {
parent::__construct($data);
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php b/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
index be0e1bfd8ded4bed315b28c8d0bfab55d319de1a..a2ab813d88d44c74c2f857396691a18089d539f6 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
@@ -32,7 +32,7 @@ class Observer
protected $_response;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -48,7 +48,7 @@ class Observer
\Magento\Framework\Registry $coreRegistry,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Framework\App\ResponseInterface $response,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_backendData = $backendData;
$this->_coreRegistry = $coreRegistry;
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php
index b2eac31749d0a6392b278491481b2e79d21e13f8..677c9e83854dbc3a139e6a05fce3e60693bcf4cf 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php
@@ -77,7 +77,7 @@ abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
',',
$this->_scopeConfig->getValue(
'system/currency/installed',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
}
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Locale.php b/app/code/Magento/Backend/Model/Config/Backend/Locale.php
index 37d3b759e0f1925324b97c60b686bb70b45969b2..8341277a0f883d28364ead2ed7bf0c1f5e3a81f8 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Locale.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Locale.php
@@ -95,14 +95,14 @@ class Locale extends \Magento\Framework\App\Config\Value
$scopeName = __('Default scope');
break;
- case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE:
+ case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
/** @var $website \Magento\Store\Model\Website */
$website = $this->_websiteFactory->create();
$websiteName = $website->load($data->getScopeId())->getName();
$scopeName = __('website(%1) scope', $websiteName);
break;
- case \Magento\Framework\Store\ScopeInterface::SCOPE_STORE:
+ case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
/** @var $store \Magento\Store\Model\Store */
$store = $this->_storeFactory->create();
$storeName = $store->load($data->getScopeId())->getName();
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Store.php b/app/code/Magento/Backend/Model/Config/Backend/Store.php
index 0926b1a7d46b417a3f71307f38c305948a6d3dbb..8ada34865bf6051e693ad5266b277d88714b1375 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Store.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Store.php
@@ -46,7 +46,7 @@ class Store extends \Magento\Framework\App\Config\Value
$this->_mutableConfig->setValue(
\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
$this->getValue(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->_cacheManager->clean();
}
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Translate.php b/app/code/Magento/Backend/Model/Config/Backend/Translate.php
index 9fb7b137db93e2391f0f77ad1f914a5ab5c1ca94..eddfffe2a06baadc109fd35ac15fe3387c268152 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Translate.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Translate.php
@@ -67,7 +67,7 @@ class Translate extends \Magento\Framework\App\Config\Value
$types = array_keys(
$this->_scopeConfig->getValue(
self::XML_PATH_INVALID_CACHES,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
if ($this->isValueChanged()) {
diff --git a/app/code/Magento/Backend/Model/Config/ScopeDefiner.php b/app/code/Magento/Backend/Model/Config/ScopeDefiner.php
index fc5f1ad32413eeafe1746de7033bd96eadcc25b8..734cdca03c1acb0e7568410fa0f7428794ba7e90 100644
--- a/app/code/Magento/Backend/Model/Config/ScopeDefiner.php
+++ b/app/code/Magento/Backend/Model/Config/ScopeDefiner.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Backend\Model\Config;
-use Magento\Framework\Store\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
/**
* System configuration scope
diff --git a/app/code/Magento/Backend/Model/Config/Source/Website.php b/app/code/Magento/Backend/Model/Config/Source/Website.php
index 3998a2ba1534a7f94caf5846e814597176c851a4..da9f210595c3705b4cec356eeaf66fad42c2020d 100644
--- a/app/code/Magento/Backend/Model/Config/Source/Website.php
+++ b/app/code/Magento/Backend/Model/Config/Source/Website.php
@@ -13,14 +13,14 @@ class Website implements \Magento\Framework\Option\ArrayInterface
protected $_options;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
index cd53f3bf0dbc436aa79971a8894c2e2cf8bc4db3..4020737bac5a711010d157189b09bed06287aba1 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Backend\Model\Config\Structure;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
abstract class AbstractElement implements ElementInterface
{
@@ -26,12 +26,12 @@ abstract class AbstractElement implements ElementInterface
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(StoreManagerInterface $storeManager)
{
@@ -42,7 +42,7 @@ abstract class AbstractElement implements ElementInterface
* Translate element attribute
*
* @param string $code
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
protected function _getTranslatedAttribute($code)
{
@@ -134,8 +134,8 @@ abstract class AbstractElement implements ElementInterface
public function isVisible()
{
$showInScope = [
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE => $this->_hasVisibilityValue('showInStore'),
- \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE => $this->_hasVisibilityValue('showInWebsite'),
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE => $this->_hasVisibilityValue('showInStore'),
+ \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE => $this->_hasVisibilityValue('showInWebsite'),
\Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT => $this->_hasVisibilityValue('showInDefault'),
];
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php b/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php
index 0083aebe7fb9aad29995b86428e0529c904ac93a..0ee58ea850e997d6242d5febdea9e721665e368c 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php
@@ -15,11 +15,11 @@ abstract class AbstractComposite extends \Magento\Backend\Model\Config\Structure
protected $_childrenIterator;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Iterator $childrenIterator
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
Iterator $childrenIterator
) {
parent::__construct($storeManager);
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php
index 429afca222f755cad726de615314eb10c47145a5..e5458890fe64544ed7aa3e4186c58afc7e9dfd43 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php
@@ -66,7 +66,7 @@ class Mapper
if (false == $dependentField->isVisible()) {
$valueInStore = $this->_scopeConfig->getValue(
$dependentField->getPath($fieldPrefix),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeCode
);
$shouldAddDependency = !$field->isValueSatisfy($valueInStore);
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
index d591f2f3a69a167e85213c2746bb6bbe3e2c5844..fd94275687eade03535c3a8793467943f0724413 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
@@ -49,7 +49,7 @@ class Field extends \Magento\Backend\Model\Config\Structure\AbstractElement
protected $_blockFactory;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Backend\Model\Config\BackendFactory $backendFactory
* @param \Magento\Backend\Model\Config\SourceFactory $sourceFactory
* @param \Magento\Backend\Model\Config\CommentFactory $commentFactory
@@ -57,7 +57,7 @@ class Field extends \Magento\Backend\Model\Config\Structure\AbstractElement
* @param \Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Backend\Model\Config\BackendFactory $backendFactory,
\Magento\Backend\Model\Config\SourceFactory $sourceFactory,
\Magento\Backend\Model\Config\CommentFactory $commentFactory,
@@ -385,7 +385,7 @@ class Field extends \Magento\Backend\Model\Config\Structure\AbstractElement
* Translate a label
*
* @param string $label an option label that should be translated
- * @return string the translated version of the input label
+ * @return \Magento\Framework\Phrase
*/
private function _translateLabel($label)
{
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
index 7213a534cc9da2f95c3658f976a8222eb36bdf00..251fa37a319d1bbc6c1d26374c508a40897c7290 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
@@ -24,13 +24,13 @@ class Group extends AbstractComposite
protected $_dependencyMapper;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Backend\Model\Config\Structure\Element\Iterator\Field $childrenIterator
* @param \Magento\Backend\Model\Config\BackendClone\Factory $cloneModelFactory
* @param \Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Backend\Model\Config\Structure\Element\Iterator\Field $childrenIterator,
\Magento\Backend\Model\Config\BackendClone\Factory $cloneModelFactory,
\Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php
index e5f75aae53644cbb3525aaa432b4bb6efa2a972e..3965d01a4d26afb78e3057dcbf9e6b9f54c2b279 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php
@@ -15,12 +15,12 @@ class Section extends AbstractComposite
protected $_authorization;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Iterator $childrenIterator
* @param \Magento\Framework\AuthorizationInterface $authorization
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
Iterator $childrenIterator,
\Magento\Framework\AuthorizationInterface $authorization
) {
diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php
index 6ed736567dfde4078396182a279dd0c2578c35d6..c52c96fe555ab66caf9ba17a68ba4aed3150174e 100644
--- a/app/code/Magento/Backend/Model/Menu/Item.php
+++ b/app/code/Magento/Backend/Model/Menu/Item.php
@@ -425,7 +425,7 @@ class Item
protected function _isConfigDependenciesAvailable()
{
if ($this->_dependsOnConfig) {
- return $this->_scopeConfig->isSetFlag((string)$this->_dependsOnConfig, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag((string)$this->_dependsOnConfig, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
return true;
}
diff --git a/app/code/Magento/Backend/Model/Session/AdminConfig.php b/app/code/Magento/Backend/Model/Session/AdminConfig.php
index 0e66533f78691d6d7911e415f17cf5528a97e961..564f9540a9703fb227bb7d5dd639cc9cd3c8fc4c 100644
--- a/app/code/Magento/Backend/Model/Session/AdminConfig.php
+++ b/app/code/Magento/Backend/Model/Session/AdminConfig.php
@@ -30,7 +30,7 @@ class AdminConfig extends Config
protected $_frontNameResolver;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -43,7 +43,7 @@ class AdminConfig extends Config
* @param DeploymentConfig $deploymentConfig
* @param string $scopeType
* @param FrontNameResolver $frontNameResolver
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param string $lifetimePath
* @param string $sessionName
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -57,7 +57,7 @@ class AdminConfig extends Config
DeploymentConfig $deploymentConfig,
$scopeType,
FrontNameResolver $frontNameResolver,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$lifetimePath = self::XML_PATH_COOKIE_LIFETIME,
$sessionName = self::SESSION_NAME_ADMIN
) {
diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
index 644ea27c6057fcd605ed4d5b0819859eb59b0728..96141a383c6909794113c967076579ed1f698ae8 100644
--- a/app/code/Magento/Backend/Model/Session/Quote.php
+++ b/app/code/Magento/Backend/Model/Session/Quote.php
@@ -65,7 +65,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
protected $quoteRepository;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -86,7 +86,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
* @param CustomerRepositoryInterface $customerRepository
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
* @param \Magento\Sales\Model\OrderFactory $orderFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param GroupManagementInterface $groupManagement
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -102,7 +102,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
CustomerRepositoryInterface $customerRepository,
\Magento\Quote\Model\QuoteRepository $quoteRepository,
\Magento\Sales\Model\OrderFactory $orderFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
GroupManagementInterface $groupManagement
) {
$this->customerRepository = $customerRepository;
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index af6d9c5b7742df67ea490adaedd920f78a6cb16a..e6dd21d71aa49f289d014f65271af5e3c931559f 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -3,27 +3,27 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-cron": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-reports": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-user": "0.42.0-beta6",
- "magento/module-backup": "0.42.0-beta6",
- "magento/module-email": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-translation": "0.42.0-beta6",
- "magento/module-require-js": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-cron": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-reports": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-user": "0.42.0-beta7",
+ "magento/module-backup": "0.42.0-beta7",
+ "magento/module-email": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-translation": "0.42.0-beta7",
+ "magento/module-require-js": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Backend/etc/acl.xml b/app/code/Magento/Backend/etc/acl.xml
index 016251c8c070b7d61ac07e58fa1072d60a158ae0..b488fc8dc33768b1297e56ab0555480dcd339962 100644
--- a/app/code/Magento/Backend/etc/acl.xml
+++ b/app/code/Magento/Backend/etc/acl.xml
@@ -8,51 +8,51 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::all" title="Allow everything" sortOrder="10" />
- <resource id="Magento_Adminhtml::admin" title="Magento Admin" sortOrder="20">
- <resource id="Magento_Adminhtml::dashboard" title="Dashboard" sortOrder="0" />
- <resource id="Magento_Adminhtml::global_search" title="Global Search" sortOrder="100" />
- <resource id="Magento_Adminhtml::myaccount" title="My Account" sortOrder="50" />
- <resource id="Magento_Adminhtml::marketing" title="Marketing" sortOrder="50">
- <resource id="Magento_Adminhtml::marketing_seo" title="SEO & Search" sortOrder="40" />
- <resource id="Magento_Adminhtml::marketing_user_content" title="User Content" sortOrder="50" />
+ <resource id="Magento_Backend::all" title="Allow everything" sortOrder="10" />
+ <resource id="Magento_Backend::admin" title="Magento Admin" sortOrder="20">
+ <resource id="Magento_Backend::dashboard" title="Dashboard" sortOrder="0" />
+ <resource id="Magento_Backend::global_search" title="Global Search" sortOrder="100" />
+ <resource id="Magento_Backend::myaccount" title="My Account" sortOrder="50" />
+ <resource id="Magento_Backend::marketing" title="Marketing" sortOrder="50">
+ <resource id="Magento_Backend::marketing_seo" title="SEO & Search" sortOrder="40" />
+ <resource id="Magento_Backend::marketing_user_content" title="User Content" sortOrder="50" />
</resource>
- <resource id="Magento_Adminhtml::content" title="Content" sortOrder="60">
- <resource id="Magento_Adminhtml::content_elements" title="Elements" sortOrder="10" />
- <resource id="Magento_Adminhtml::design" title="Design" sortOrder="20">
- <resource id="Magento_Adminhtml::schedule" title="Schedule" sortOrder="30" />
+ <resource id="Magento_Backend::content" title="Content" sortOrder="60">
+ <resource id="Magento_Backend::content_elements" title="Elements" sortOrder="10" />
+ <resource id="Magento_Backend::design" title="Design" sortOrder="20">
+ <resource id="Magento_Backend::schedule" title="Schedule" sortOrder="30" />
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores" title="Stores" sortOrder="80">
- <resource id="Magento_Adminhtml::stores_settings" title="Settings" sortOrder="10">
- <resource id="Magento_Adminhtml::store" title="All Stores" sortOrder="10"/>
- <resource id="Magento_Adminhtml::config" title="Configuration" sortOrder="20">
- <resource id="Magento_Adminhtml::advanced" title="Advanced Section" sortOrder="90" />
- <resource id="Magento_Adminhtml::config_admin" title="Advanced Admin Section" sortOrder="100" />
- <resource id="Magento_Adminhtml::config_design" title="Design Section" sortOrder="40" />
- <resource id="Magento_Adminhtml::config_general" title="General Section" sortOrder="20" />
- <resource id="Magento_Adminhtml::config_system" title="System Section" sortOrder="80" />
- <resource id="Magento_Adminhtml::currency" title="Currency Setup Section" sortOrder="120" />
- <resource id="Magento_Adminhtml::dev" title="Developer Section" sortOrder="110" />
- <resource id="Magento_Adminhtml::web" title="Web Section" sortOrder="30" />
- <resource id="Magento_Adminhtml::trans_email" title="Store Email Addresses Section" sortOrder="100" />
- <resource id="Magento_Adminhtml::sendfriend" title="Email to a Friend" sortOrder="140" />
+ <resource id="Magento_Backend::stores" title="Stores" sortOrder="80">
+ <resource id="Magento_Backend::stores_settings" title="Settings" sortOrder="10">
+ <resource id="Magento_Backend::store" title="All Stores" sortOrder="10"/>
+ <resource id="Magento_Backend::config" title="Configuration" sortOrder="20">
+ <resource id="Magento_Backend::advanced" title="Advanced Section" sortOrder="90" />
+ <resource id="Magento_Backend::config_admin" title="Advanced Admin Section" sortOrder="100" />
+ <resource id="Magento_Backend::config_design" title="Design Section" sortOrder="40" />
+ <resource id="Magento_Backend::config_general" title="General Section" sortOrder="20" />
+ <resource id="Magento_Backend::config_system" title="System Section" sortOrder="80" />
+ <resource id="Magento_Backend::currency" title="Currency Setup Section" sortOrder="120" />
+ <resource id="Magento_Backend::dev" title="Developer Section" sortOrder="110" />
+ <resource id="Magento_Backend::web" title="Web Section" sortOrder="30" />
+ <resource id="Magento_Backend::trans_email" title="Store Email Addresses Section" sortOrder="100" />
+ <resource id="Magento_Backend::sendfriend" title="Email to a Friend" sortOrder="140" />
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores_attributes" title="Attributes" sortOrder="40" />
- <resource id="Magento_Adminhtml::stores_other_settings" title="Other Settings" sortOrder="50" />
+ <resource id="Magento_Backend::stores_attributes" title="Attributes" sortOrder="40" />
+ <resource id="Magento_Backend::stores_other_settings" title="Other Settings" sortOrder="50" />
</resource>
- <resource id="Magento_Adminhtml::system" title="System" sortOrder="90">
- <resource id="Magento_Adminhtml::convert" title="Data Transfer" sortOrder="10" />
- <resource id="Magento_Adminhtml::extensions" title="Magento Connect" sortOrder="20">
- <resource id="Magento_Adminhtml::local" title="Connect Manager" sortOrder="10" />
- <resource id="Magento_Adminhtml::custom" title="Package Extensions" sortOrder="20" />
+ <resource id="Magento_Backend::system" title="System" sortOrder="90">
+ <resource id="Magento_Backend::convert" title="Data Transfer" sortOrder="10" />
+ <resource id="Magento_Backend::extensions" title="Magento Connect" sortOrder="20">
+ <resource id="Magento_Backend::local" title="Connect Manager" sortOrder="10" />
+ <resource id="Magento_Backend::custom" title="Package Extensions" sortOrder="20" />
</resource>
- <resource id="Magento_Adminhtml::tools" title="Tools" sortOrder="50">
- <resource id="Magento_Adminhtml::cache" title="Cache Management" sortOrder="10" />
+ <resource id="Magento_Backend::tools" title="Tools" sortOrder="50">
+ <resource id="Magento_Backend::cache" title="Cache Management" sortOrder="10" />
</resource>
- <resource id="Magento_Adminhtml::system_other_settings" title="Other Settings" sortOrder="80">
- <resource id="Magento_Adminhtml::variable" title="Custom Variables" sortOrder="20" />
+ <resource id="Magento_Backend::system_other_settings" title="Other Settings" sortOrder="80">
+ <resource id="Magento_Backend::variable" title="Custom Variables" sortOrder="20" />
</resource>
</resource>
</resource>
diff --git a/app/code/Magento/Backend/etc/adminhtml/menu.xml b/app/code/Magento/Backend/etc/adminhtml/menu.xml
index 4a17367d3cb815b34f1b39ec276186e4fee5415d..8d9fa29167bbc64210ebde41ce1f8bbfe521c17f 100644
--- a/app/code/Magento/Backend/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/menu.xml
@@ -7,27 +7,27 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../Backend/etc/menu.xsd">
<menu>
- <add id="Magento_Backend::system_design_schedule" title="Schedule" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::system_design" action="adminhtml/system_design" resource="Magento_Adminhtml::schedule"/>
+ <add id="Magento_Backend::system_design_schedule" title="Schedule" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::system_design" action="adminhtml/system_design" resource="Magento_Backend::schedule"/>
<add id="Magento_Backend::system_currency" title="Currency" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::stores" action="adminhtml/system_currency" resource="Magento_CurrencySymbol::system_currency"/>
- <add id="Magento_Backend::system_variable" title="Custom Variables" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::system_other_settings" action="adminhtml/system_variable" resource="Magento_Adminhtml::variable"/>
- <add id="Magento_Backend::system_store" title="All Stores" module="Magento_Core" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Adminhtml::store"/>
- <add id="Magento_Backend::system_config" title="Configuration" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::stores_settings" action="adminhtml/system_config" resource="Magento_Adminhtml::config"/>
- <add id="Magento_Backend::dashboard" title="Dashboard" module="Magento_Backend" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Adminhtml::dashboard"/>
- <add id="Magento_Backend::system" title="System" module="Magento_Backend" sortOrder="80" resource="Magento_Adminhtml::system"/>
- <add id="Magento_Backend::system_tools" title="Tools" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::system" resource="Magento_Adminhtml::tools"/>
- <add id="Magento_Backend::system_design" title="Design" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::content" resource="Magento_Adminhtml::design"/>
- <add id="Magento_Backend::system_convert" title="Data Transfer" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system" resource="Magento_Adminhtml::convert"/>
- <add id="Magento_Backend::system_cache" title="Cache Management" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system_tools" action="adminhtml/cache" resource="Magento_Adminhtml::cache"/>
- <add id="Magento_Backend::marketing" title="Marketing" module="Magento_Backend" sortOrder="40" resource="Magento_Adminhtml::marketing"/>
- <add id="Magento_Backend::marketing_communications" title="Communications" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::marketing" resource="Magento_Adminhtml::marketing_communications"/>
- <add id="Magento_Backend::marketing_seo" title="SEO & Search" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::marketing" resource="Magento_Adminhtml::marketing_seo"/>
- <add id="Magento_Backend::marketing_user_content" title="User Content" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::marketing" resource="Magento_Adminhtml::marketing_user_content"/>
- <add id="Magento_Backend::content" title="Content" module="Magento_Backend" sortOrder="50" resource="Magento_Adminhtml::content"/>
- <add id="Magento_Backend::content_elements" title="Elements" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::content" resource="Magento_Adminhtml::content_elements"/>
- <add id="Magento_Backend::stores" title="Stores" module="Magento_Backend" sortOrder="70" resource="Magento_Adminhtml::stores"/>
- <add id="Magento_Backend::stores_settings" title="Settings" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::stores" resource="Magento_Adminhtml::stores_settings"/>
- <add id="Magento_Backend::stores_attributes" title="Attributes" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Adminhtml::stores_attributes"/>
- <add id="Magento_Backend::other_settings" title="Other Settings" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Adminhtml::stores_other_settings"/>
- <add id="Magento_Backend::system_other_settings" title="Other Settings" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Adminhtml::system_other_settings"/>
+ <add id="Magento_Backend::system_variable" title="Custom Variables" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::system_other_settings" action="adminhtml/system_variable" resource="Magento_Backend::variable"/>
+ <add id="Magento_Backend::system_store" title="All Stores" module="Magento_Core" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Backend::store"/>
+ <add id="Magento_Backend::system_config" title="Configuration" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::stores_settings" action="adminhtml/system_config" resource="Magento_Backend::config"/>
+ <add id="Magento_Backend::dashboard" title="Dashboard" module="Magento_Backend" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Backend::dashboard"/>
+ <add id="Magento_Backend::system" title="System" module="Magento_Backend" sortOrder="80" resource="Magento_Backend::system"/>
+ <add id="Magento_Backend::system_tools" title="Tools" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::system" resource="Magento_Backend::tools"/>
+ <add id="Magento_Backend::system_design" title="Design" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::content" resource="Magento_Backend::design"/>
+ <add id="Magento_Backend::system_convert" title="Data Transfer" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system" resource="Magento_Backend::convert"/>
+ <add id="Magento_Backend::system_cache" title="Cache Management" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system_tools" action="adminhtml/cache" resource="Magento_Backend::cache"/>
+ <add id="Magento_Backend::marketing" title="Marketing" module="Magento_Backend" sortOrder="40" resource="Magento_Backend::marketing"/>
+ <add id="Magento_Backend::marketing_communications" title="Communications" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::marketing" resource="Magento_Backend::marketing_communications"/>
+ <add id="Magento_Backend::marketing_seo" title="SEO & Search" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::marketing" resource="Magento_Backend::marketing_seo"/>
+ <add id="Magento_Backend::marketing_user_content" title="User Content" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::marketing" resource="Magento_Backend::marketing_user_content"/>
+ <add id="Magento_Backend::content" title="Content" module="Magento_Backend" sortOrder="50" resource="Magento_Backend::content"/>
+ <add id="Magento_Backend::content_elements" title="Elements" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::content" resource="Magento_Backend::content_elements"/>
+ <add id="Magento_Backend::stores" title="Stores" module="Magento_Backend" sortOrder="70" resource="Magento_Backend::stores"/>
+ <add id="Magento_Backend::stores_settings" title="Settings" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::stores" resource="Magento_Backend::stores_settings"/>
+ <add id="Magento_Backend::stores_attributes" title="Attributes" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Backend::stores_attributes"/>
+ <add id="Magento_Backend::other_settings" title="Other Settings" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Backend::stores_other_settings"/>
+ <add id="Magento_Backend::system_other_settings" title="Other Settings" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Backend::system_other_settings"/>
</menu>
</config>
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index b4aeadf75a9e3cf82a74c2ef70d85fe132153741..57dd62a88bfcdafb73a86f6e3862a3fd04adfb55 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -19,7 +19,7 @@
<section id="advanced" translate="label" type="text" sortOrder="910" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Advanced</label>
<tab>advanced</tab>
- <resource>Magento_Adminhtml::advanced</resource>
+ <resource>Magento_Backend::advanced</resource>
<group id="modules_disable_output" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Disable Modules Output</label>
<frontend_model>Magento\Backend\Block\System\Config\Form\Fieldset\Modules\DisableOutput</frontend_model>
@@ -29,7 +29,7 @@
<class>separator-top</class>
<label>Store Email Addresses</label>
<tab>general</tab>
- <resource>Magento_Adminhtml::trans_email</resource>
+ <resource>Magento_Backend::trans_email</resource>
<group id="ident_custom1" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Custom Email 1</label>
<field id="email" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -99,7 +99,7 @@
<section id="design" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Design</label>
<tab>general</tab>
- <resource>Magento_Adminhtml::config_design</resource>
+ <resource>Magento_Backend::config_design</resource>
<group id="theme" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Design Theme</label>
<field id="theme_id" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -153,7 +153,7 @@
<section id="dev" translate="label" type="text" sortOrder="920" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Developer</label>
<tab>advanced</tab>
- <resource>Magento_Adminhtml::dev</resource>
+ <resource>Magento_Backend::dev</resource>
<group id="restrict" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Developer Client Restrictions</label>
<field id="allow_ips" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -236,7 +236,7 @@
<section id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>General</label>
<tab>general</tab>
- <resource>Magento_Adminhtml::config_general</resource>
+ <resource>Magento_Backend::config_general</resource>
<group id="country" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Country Options</label>
<field id="allow" translate="label" type="multiselect" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -321,7 +321,7 @@
<class>separator-top</class>
<label>System</label>
<tab>advanced</tab>
- <resource>Magento_Adminhtml::config_system</resource>
+ <resource>Magento_Backend::config_system</resource>
<group id="smtp" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Mail Sending Settings</label>
<field id="disable" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -375,7 +375,7 @@
<section id="admin" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Admin</label>
<tab>advanced</tab>
- <resource>Magento_Adminhtml::config_admin</resource>
+ <resource>Magento_Backend::config_admin</resource>
<group id="emails" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Admin User Emails</label>
<field id="forgot_email_template" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -458,7 +458,7 @@
<section id="web" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Web</label>
<tab>general</tab>
- <resource>Magento_Adminhtml::web</resource>
+ <resource>Magento_Backend::web</resource>
<group id="url" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Url Options</label>
<field id="use_store" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 4d5f28658fb334e23328d1b6fc56b141306d80f2..de433e3b8e18e62e80deeb85e59d663fbd9374b0 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -79,7 +79,7 @@
<argument name="scopeResolver" xsi:type="object">Magento\Backend\Model\Url\ScopeResolver</argument>
<argument name="authSession" xsi:type="object">Magento\Backend\Model\Auth\Session\Proxy</argument>
<argument name="formKey" xsi:type="object">Magento\Framework\Data\Form\FormKey\Proxy</argument>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
<argument name="backendHelper" xsi:type="object">Magento\Backend\Helper\Data\Proxy</argument>
</arguments>
</type>
@@ -108,7 +108,7 @@
</type>
<type name="Magento\Framework\Acl\RootResource">
<arguments>
- <argument name="identifier" xsi:type="string">Magento_Adminhtml::all</argument>
+ <argument name="identifier" xsi:type="string">Magento_Backend::all</argument>
</arguments>
</type>
<type name="Magento\Backend\Controller\Adminhtml\Index\GlobalSearch">
diff --git a/app/code/Magento/Backend/etc/menu.xsd b/app/code/Magento/Backend/etc/menu.xsd
index 311bc95d85aaa16e302ffb0745a2579c2cbd2a59..5ba2e6a84e93e1289e0b681a6eebdee3f9b7f964 100644
--- a/app/code/Magento/Backend/etc/menu.xsd
+++ b/app/code/Magento/Backend/etc/menu.xsd
@@ -131,7 +131,7 @@
</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
- <xs:pattern value="[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}" />
+ <xs:pattern value="[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}" />
</xs:restriction>
</xs:simpleType>
diff --git a/app/code/Magento/Backend/etc/webapi.xml b/app/code/Magento/Backend/etc/webapi.xml
index 1188507e9308266ecaccf4dc6c8413c011ec1163..8d6b69d864e598ac6aab1ae7dfd4a01f4369413e 100644
--- a/app/code/Magento/Backend/etc/webapi.xml
+++ b/app/code/Magento/Backend/etc/webapi.xml
@@ -10,7 +10,7 @@
<route url="/V1/modules" method="GET">
<service class="Magento\Backend\Service\V1\ModuleServiceInterface" method="getModules"/>
<resources>
- <resource ref="Magento_Adminhtml::admin"/>
+ <resource ref="Magento_Backend::admin"/>
</resources>
</route>
</routes>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml
index fc7ac38effa69508c846f3f7fa940ed037035933..e02a071da919ee8dc863f2270c484f1f037cd871 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml
@@ -15,7 +15,9 @@
</block>
</referenceContainer>
<referenceContainer name="content">
- <block class="Magento\Backend\Block\Dashboard" name="dashboard"/>
+ <block class="Magento\Backend\Block\Dashboard" name="dashboard">
+ <block class="Magento\Backend\Block\Template" name="refresh_statistics" template="Magento_Backend::dashboard/totalbar/refreshstatistics.phtml"/>
+ </block>
</referenceContainer>
</body>
</page>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
index 977282aa8d3a8f20f281e9d48b091bf8fb8da761..67fa7c2c76c76c4c8d0673a826ddeba139164470 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -28,7 +28,7 @@
<argument name="edition" translate="true" xsi:type="string">Community Edition</argument>
</arguments>
</block>
- <block class="Magento\Backend\Block\GlobalSearch" as="search" after="logo" acl="Magento_Adminhtml::global_search"/>
+ <block class="Magento\Backend\Block\GlobalSearch" as="search" after="logo" acl="Magento_Backend::global_search"/>
<block class="Magento\Backend\Block\Page\Header" name="user" after="-">
<arguments>
<argument name="show_part" xsi:type="string">user</argument>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/editor.xml b/app/code/Magento/Backend/view/adminhtml/layout/editor.xml
index 6701d66516030d1758e6b8c47b2184ef1b1f279e..887e846d529ee4b4ed440af48f15785f04c9bee8 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/editor.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/editor.xml
@@ -9,7 +9,7 @@
<head>
<link src="Magento_Backend::js/bootstrap/editor.js"/>
<css src="prototype/windows/themes/default.css"/>
- <css src="Magento_Core::prototype/magento.css"/>
+ <css src="Magento_Theme::prototype/magento.css"/>
</head>
<body/>
</page>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
index 356a5566f1197cda8987adcc33f7d3baa598fabf..9e03fffabbccf4f4a485d16fee76708661e9af67 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
@@ -9,15 +9,21 @@
?>
<div class="dashboard-diagram">
<div class="dashboard-diagram-switcher">
- <label for="order_<?php echo $block->getHtmlId() ?>_period"><?php echo __('Select Range:') ?></label>
- <select name="period" id="order_<?php echo $block->getHtmlId() ?>_period" onchange="changeDiagramsPeriod(this);">
- <?php foreach ($this->helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?>
- <?php if (in_array($value, ['custom'])) {
- continue;
-} ?>
- <option value="<?php echo $value ?>" <?php if ($block->getRequest()->getParam('period') == $value): ?> selected="selected"<?php endif; ?>><?php echo $label ?></option>
- <?php endforeach; ?>
- </select>
+ <label for="order_<?php echo $block->getHtmlId() ?>_period" class="label"><?php echo __('Select Range:') ?></label>
+ <div class="form-select-label">
+ <select name="period" id="order_<?php echo $block->getHtmlId() ?>_period"
+ onchange="changeDiagramsPeriod(this);" class="form-el-select">
+ <?php foreach ($this->helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?>
+ <?php if (in_array($value, ['custom'])) {
+ continue;
+ } ?>
+ <option
+ value="<?php echo $value ?>"
+ <?php if ($block->getRequest()->getParam('period') == $value): ?> selected="selected"<?php endif; ?>
+ ><?php echo $label ?></option>
+ <?php endforeach; ?>
+ </select>
+ </div>
</div>
<?php if ($block->getCount()): ?>
<div class="dashboard-diagram-image">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
index c89b0dbf6ced87d07b554bbd590e78a6bb0174eb..9cb41edab859889083e756ef23d5b7d7a1729449 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
@@ -4,8 +4,6 @@
* See COPYING.txt for license details.
*/
?>
-<div class="box" style="margin:20px;">
- <p class="a-center">
- <?php echo __('Chart is disabled. To enable the chart, click <a href="%1">here</a>.', $block->getConfigUrl())?>
- </p>
+<div class="dashboard-diagram-disabled">
+ <?php echo __('Chart is disabled. To enable the chart, click <a href="%1">here</a>.', $block->getConfigUrl())?>
</div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
index 25a69225494d6b5be228143b8a9f37c572c1e3c5..966f1d251a519c782246764d100fd67127f6619f 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
@@ -12,40 +12,40 @@
$numColumns = sizeof($block->getColumns());
?>
<?php if ($block->getCollection()): ?>
-<div class="dashboard-data-wrapper">
- <table class="dashboard-data" id="<?php echo $block->getId() ?>_table">
- <?php
- /* This part is commented to remove all <col> tags from the code. */
- /* foreach ($block->getColumns() as $_column): ?>
- <col <?php echo $_column->getHtmlProperty() ?> />
- <?php endforeach; */ ?>
- <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()): ?>
- <thead>
+<div class="dashboard-item-content">
+ <?php if ($block->getCollection()->getSize()>0): ?>
+ <table class="dashboard-data" id="<?php echo $block->getId() ?>_table">
+ <?php
+ /* This part is commented to remove all <col> tags from the code. */
+ /* foreach ($block->getColumns() as $_column): ?>
+ <col <?php echo $_column->getHtmlProperty() ?> />
+ <?php endforeach; */ ?>
+ <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()): ?>
+ <thead>
<?php if ($block->getHeadersVisibility()): ?>
- <tr class="headings">
- <?php foreach ($block->getColumns() as $_column): ?>
- <th <?php echo $_column->getHeaderHtmlProperty() ?>><?php echo $_column->getHeaderHtml() ?></th>
- <?php endforeach; ?>
+ <tr>
+ <?php foreach ($block->getColumns() as $_column): ?>
+ <th <?php echo $_column->getHeaderHtmlProperty() ?>><?php echo $_column->getHeaderHtml() ?></th>
+ <?php endforeach; ?>
</tr>
<?php endif; ?>
- </thead>
- <?php endif; ?>
- <tbody>
- <?php if (($block->getCollection()->getSize()>0) && (!$block->getIsCollapsed())): ?>
- <?php foreach ($block->getCollection() as $_index => $_item): ?>
- <tr title="<?php echo $block->getRowUrl($_item) ?>">
- <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
- <td class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"><?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : ' ') ?></td>
- <?php endforeach; ?>
- </tr>
- <?php endforeach; ?>
- <?php elseif ($block->getEmptyText()): ?>
- <tr>
- <td class="<?php echo $block->getEmptyTextClass() ?>" colspan="100"><?php echo $block->getEmptyText() ?></td>
- </tr>
- <?php endif; ?>
- </tbody>
- </table>
+ </thead>
+ <?php endif; ?>
+ <?php if (!$block->getIsCollapsed()): ?>
+ <tbody>
+ <?php foreach ($block->getCollection() as $_index => $_item): ?>
+ <tr title="<?php echo $block->getRowUrl($_item) ?>">
+ <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
+ <td class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"><?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : ' ') ?></td>
+ <?php endforeach; ?>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ <?php endif; ?>
+ </table>
+ <?php else: ?>
+ <div class="<?php echo $block->getEmptyTextClass() ?>"><?php echo $block->getEmptyText() ?></div>
+ <?php endif; ?>
</div>
<?php if ($block->canDisplayContainer()): ?>
<script>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
index db07c6147086e60a67d9174becc179276fea5812..e95c1ac8696bb100e8bc90aa41785503a280e11d 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
@@ -68,41 +68,34 @@ window.changeDiagramsPeriod = function(periodObj) {
});
</script>
<?php endif; ?>
- <div class="dashboard-container">
- <div class="dashboard-inner">
- <div class="dashboard-main">
- <div class="dashboard-diagram-container">
- <?php echo $block->getChildHtml('diagrams') ?>
- <?php if (is_array($block->getChildBlock('diagrams')->getTabsIds())) : ?>
- <div id="diagram_tab_content" class="dashboard-diagram-tab-content"></div>
- <?php endif; ?>
- </div>
- <?php echo $block->getChildHtml('totals') ?>
- <div class="dashboard-store-stats">
- <?php echo $block->getChildHtml('grids') ?>
- <div id="grid_tab_content" class="dashboard-store-stats-content"></div>
- </div>
- </div>
- <div class="dashboard-secondary">
- <?php echo $block->getChildHtml('sales') ?>
- <div class="dashboard-item">
- <header class="dashboard-item-header">
- <h3 class="title"><?php echo __('Last 5 Orders') ?></h3>
- </header>
- <?php echo $block->getChildHtml('lastOrders'); ?>
- </div>
- <div class="dashboard-item">
- <header class="dashboard-item-header">
- <h3 class="title"><?php echo __('Last 5 Search Terms') ?></h3>
- </header>
- <?php echo $block->getChildHtml('lastSearches'); ?>
- </div>
- <div class="dashboard-item">
- <header class="dashboard-item-header">
- <h3 class="title"><?php echo __('Top 5 Search Terms') ?></h3>
- </header>
- <?php echo $block->getChildHtml('topSearches'); ?>
- </div>
- </div>
- </div>
- </div>
+<div class="dashboard-container row">
+ <div class="dashboard-main col-m-8 col-m-push-4">
+ <div class="dashboard-diagram-container">
+ <?php echo $block->getChildHtml('diagrams') ?>
+ <?php if (is_array($block->getChildBlock('diagrams')->getTabsIds())) : ?>
+ <div id="diagram_tab_content" class="dashboard-diagram-tab-content"></div>
+ <?php endif; ?>
+ </div>
+ <?php echo $block->getChildHtml('totals') ?>
+ <div class="dashboard-store-stats">
+ <?php echo $block->getChildHtml('grids') ?>
+ <div id="grid_tab_content" class="dashboard-store-stats-content"></div>
+ <?php echo $block->getChildHtml('refresh_statistics') ?>
+ </div>
+ </div>
+ <div class="dashboard-secondary col-m-4 col-m-pull-8">
+ <?php echo $block->getChildHtml('sales') ?>
+ <div class="dashboard-item">
+ <div class="dashboard-item-title"><?php echo __('Last Orders') ?></div>
+ <?php echo $block->getChildHtml('lastOrders'); ?>
+ </div>
+ <div class="dashboard-item">
+ <div class="dashboard-item-title"><?php echo __('Last Search Terms') ?></div>
+ <?php echo $block->getChildHtml('lastSearches'); ?>
+ </div>
+ <div class="dashboard-item">
+ <div class="dashboard-item-title"><?php echo __('Top Search Terms') ?></div>
+ <?php echo $block->getChildHtml('topSearches'); ?>
+ </div>
+ </div>
+</div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
index 6b03e37cfd0df21f867f8715ccfa43e6dee6fbd3..fe5772aa4b3642e1c752f0cb3a24bd3511e7e17e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
@@ -10,13 +10,13 @@
<?php if (sizeof($block->getTotals()) > 0): ?>
<?php foreach ($block->getTotals() as $_total): ?>
<div class="dashboard-item dashboard-item-primary">
- <header class="dashboard-item-header">
- <h3 class="title"><?php echo $_total['label'] ?></h3>
- </header>
- <strong class="dashboard-sales-value">
- <?php echo $_total['value'] ?>
- <span class="dashboard-sales-decimals"><?php echo $_total['decimals'] ?></span>
- </strong>
+ <div class="dashboard-item-title"><?php echo $_total['label'] ?></div>
+ <div class="dashboard-item-content">
+ <strong class="dashboard-sales-value">
+ <?php echo $_total['value'] ?>
+ <span class="dashboard-sales-decimals"><?php echo $_total['decimals'] ?></span>
+ </strong>
+ </div>
</div>
<?php endforeach; ?>
<?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
index 8c57f7355abc4672f6c83e90da5d9dd85c828ca1..e549eb962b8416216248fdbf49f84d1ef99e2f4d 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
@@ -7,12 +7,12 @@
// @codingStandardsIgnoreFile
?>
-<div style="padding:5px;">
<?php if (count($block->getCollection()->getItems()) > 0): ?>
- <?php foreach ($block->getCollection()->getItems() as $item): ?>
- <span><?php echo $item->getQueryText() ?></span><br />
- <?php endforeach; ?>
+ <div class="searches-results">
+ <?php foreach ($block->getCollection()->getItems() as $item): ?>
+ <span><?php echo $item->getQueryText() ?></span><br />
+ <?php endforeach; ?>
+ </div>
<?php else: ?>
-<div class="a-center"><?php echo __('There are no search keywords.') ?></div>
+ <div class="empty-text"><?php echo __('There are no search keywords.') ?></div>
<?php endif; ?>
-</div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..52c656076e9e40fc5262030394d4b072c47f0bc1
--- /dev/null
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+<form action="<?php echo $block->getUrl('*/*/refreshStatistics'); ?>" method="post">
+ <input name="form_key" type="hidden" value="<?php echo $block->getFormKey(); ?>" />
+ <button type="submit" style="float:right; margin: 15px" title="Refresh data">
+ <?php echo __('Refresh data') ?>
+ </button>
+</form>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
index 285a25ad27d31809cf7d275ca7b10fa71a2c7e84..f7635da3c5804c60c85931168ee7e9620752a4ec 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -19,7 +19,7 @@
<?php echo $block->escapeHtml($block->getUser()->getUsername()); ?>
</a>
<ul class="dropdown-menu admin-user-menu">
- <?php if ($block->getAuthorization()->isAllowed('Magento_Adminhtml::myaccount')): ?>
+ <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
<li>
<a href="<?php echo $block->getUrl('adminhtml/system_account/index') ?>" <?php echo $block->getUiId('user', 'account', 'settings')?> title="<?php echo __('Account Setting') ?>"><?php echo __('Account Setting') ?> <span><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span></a>
</li>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index edc512b99c8238dcc8cfb6497d5a4408b8d8fa07..09ef80cdfa899e7225fa1034d5bcb22e6b34e025 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -113,7 +113,7 @@
<?php endforeach; ?>
<?php endforeach; ?>
<?php endforeach; ?>
- <?php if ($block->getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Adminhtml::store')): ?>
+ <?php if ($block->getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
<li class="dropdown-toolbar">
<a href="<?php echo $block->getUrl('*/system_store') ?>"><?php echo __('Stores Configuration') ?></a>
</li>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml
index dc25a1e7945f63104bfb1b59c109b7964456b596..4cec327329db0c0ebe1bb589fe33c310076c91e0 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml
@@ -28,7 +28,7 @@
</select>
</div>
<?php echo $block->getHintHtml() ?>
- <?php if ($block->getAuthorization()->isAllowed('Magento_Adminhtml::store')): ?>
+ <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
<div class="actions">
<a href="<?php echo $block->getUrl('*/system_store') ?>"><?php echo __('Stores') ?></a>
</div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
index c2997d1768a7e09f9f5d0afb63c707e7701028ed..1371e5acb783116dca2e7ccd62e8b0447bf37bdf 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
@@ -36,7 +36,7 @@
</script>
<?php else :?>
<input type="hidden" name="<?php echo $block->getInputElementName()?>" value="" id="<?php echo $_id?>" />
-<script type="text/javascript">
+<script>
require([
'mage/adminhtml/grid'
], function(){
diff --git a/app/code/Magento/Backup/Model/Observer.php b/app/code/Magento/Backup/Model/Observer.php
index 56e4bc515c5a928d30689cae8baebe49de8afbdf..6518b64e61ee0da8c459d05c82fc5e42972d0ac4 100644
--- a/app/code/Magento/Backup/Model/Observer.php
+++ b/app/code/Magento/Backup/Model/Observer.php
@@ -12,7 +12,7 @@
namespace Magento\Backup\Model;
use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class Observer
{
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index 350e2cd27bd51fd3da0bbc5b3091f2a78a0dc7b0..e62db7e73e9d2adb3c80201b0aa6c4dafc714eef 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -3,13 +3,14 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-cron": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-cron": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Backup/etc/acl.xml b/app/code/Magento/Backup/etc/acl.xml
index 03b48f04cd91c4490c9ae943a4da22b12eebb9c1..6b9dda6244e7d739cdfcba36337fc57888aecb2d 100644
--- a/app/code/Magento/Backup/etc/acl.xml
+++ b/app/code/Magento/Backup/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::system">
- <resource id="Magento_Adminhtml::tools">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::system">
+ <resource id="Magento_Backend::tools">
<resource id="Magento_Backup::backup" title="Backups" sortOrder="30">
<resource id="Magento_Backup::rollback" title="Rollback" />
</resource>
diff --git a/app/code/Magento/Backup/etc/adminhtml/routes.xml b/app/code/Magento/Backup/etc/adminhtml/routes.xml
index d59acc42ae4942628c71643ff4d1f4beea3e2353..8993bc033dc68c5a394af30008b0826ade1ac614 100644
--- a/app/code/Magento/Backup/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="backup" frontName="backup">
- <module name="Magento_Backup" before="Magento_Adminhtml" />
+ <module name="Magento_Backup" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Backup/etc/module.xml b/app/code/Magento/Backup/etc/module.xml
index 315546d99b5af9aceb80c04891f0edc8f847cbec..d4c108c014b670829b67cf597dc31887ae07066b 100644
--- a/app/code/Magento/Backup/etc/module.xml
+++ b/app/code/Magento/Backup/etc/module.xml
@@ -8,6 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
<module name="Magento_Backup" schema_version="1.6.0.0">
<sequence>
+ <module name="Magento_Store"/>
</sequence>
</module>
</config>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index 69c605c8bf9e6c6094d9912da4faeb9a90f04db9..1f97b56488bcdfd5dff4742ca9905eaafe297316 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -131,7 +131,7 @@ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -139,7 +139,7 @@ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
index 77d839b7cb9bc2ffdfae85b9e15293732fccd662..35bda8aafe5bbc699ad722f1074276b0bbafa7d8 100644
--- a/app/code/Magento/Bundle/Model/LinkManagement.php
+++ b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -46,7 +46,7 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
* @param \Magento\Bundle\Model\Resource\BundleFactory $bundleFactory
* @param \Magento\Bundle\Model\SelectionFactory $bundleSelection
* @param \Magento\Bundle\Model\Resource\Option\CollectionFactory $optionCollection
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
ProductRepositoryInterface $productRepository,
@@ -54,7 +54,7 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
\Magento\Bundle\Model\SelectionFactory $bundleSelection,
\Magento\Bundle\Model\Resource\BundleFactory $bundleFactory,
\Magento\Bundle\Model\Resource\Option\CollectionFactory $optionCollection,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->productRepository = $productRepository;
$this->linkBuilder = $linkBuilder;
diff --git a/app/code/Magento/Bundle/Model/OptionRepository.php b/app/code/Magento/Bundle/Model/OptionRepository.php
index d02ce9ebb95d713c2717413d95c57519d9df8ecb..438a229021721800c5359053ddf0e31937c2e0f5 100644
--- a/app/code/Magento/Bundle/Model/OptionRepository.php
+++ b/app/code/Magento/Bundle/Model/OptionRepository.php
@@ -60,7 +60,7 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
* @param Product\Type $type
* @param \Magento\Bundle\Api\Data\OptionDataBuilder $optionBuilder
* @param Resource\Option $optionResource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Bundle\Api\ProductLinkManagementInterface $linkManagement
* @param Product\OptionList $productOptionList
* @param Product\LinksList $linkList
@@ -70,7 +70,7 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
\Magento\Bundle\Model\Product\Type $type,
\Magento\Bundle\Api\Data\OptionDataBuilder $optionBuilder,
\Magento\Bundle\Model\Resource\Option $optionResource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Bundle\Api\ProductLinkManagementInterface $linkManagement,
\Magento\Bundle\Model\Product\OptionList $productOptionList,
\Magento\Bundle\Model\Product\LinksList $linkList
diff --git a/app/code/Magento/Bundle/Model/Product/CatalogPrice.php b/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
index 977a927516459f8595757a3b8619e0a97ec10c0a..78e473883547c7737d2bc978438b9e2e0baa4ed9 100644
--- a/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
+++ b/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
@@ -11,7 +11,7 @@ namespace Magento\Bundle\Model\Product;
class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -26,12 +26,12 @@ class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterfa
protected $coreRegistry;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
* @param \Magento\Framework\Registry $coreRegistry
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel,
\Magento\Framework\Registry $coreRegistry
) {
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index 4fc817f7006e7f871a3adae1d79a2bd676420ad2..af198bf0b1b72d3c2a79d11dc9f0e7be37d2aa89 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -41,7 +41,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
/**
* @param \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -51,7 +51,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
*/
public function __construct(
\Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 8ad7f0d1dee9d5779cbf2db8541817f5f43d1974..b14a7d9292e6229e45a5fc3545fbdda66c7db79d 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -90,7 +90,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
protected $_catalogProduct = null;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -158,7 +158,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Catalog\Model\Config $config
* @param \Magento\Bundle\Model\Resource\Selection $bundleSelection
* @param \Magento\Bundle\Model\OptionFactory $bundleOption
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param PriceCurrencyInterface $priceCurrency
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
* @param \Magento\CatalogInventory\Api\StockStateInterface $stockState
@@ -184,7 +184,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
\Magento\Catalog\Model\Config $config,
\Magento\Bundle\Model\Resource\Selection $bundleSelection,
\Magento\Bundle\Model\OptionFactory $bundleOption,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
PriceCurrencyInterface $priceCurrency,
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
\Magento\CatalogInventory\Api\StockStateInterface $stockState
@@ -670,7 +670,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Framework\Object $buyRequest
* @param \Magento\Catalog\Model\Product $product
* @param string $processMode
- * @return array|string
+ * @return \Magento\Framework\Phrase|array|string
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -852,7 +852,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
/**
* Retrieve message for specify option(s)
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getSpecifyOptionMessage()
{
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
index f842fd6131ff96ddc4618888d9a6f90659655abb..e0d16c9c0be6e8ec5f68523c0cec3b01099abe3a 100644
--- a/app/code/Magento/Bundle/composer.json
+++ b/app/code/Magento/Bundle/composer.json
@@ -3,25 +3,25 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-catalog-rule": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-gift-message": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-webapi": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-catalog-rule": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-gift-message": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-webapi": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Bundle/etc/adminhtml/routes.xml b/app/code/Magento/Bundle/etc/adminhtml/routes.xml
index be8fd1bfecb7f16c7a2be81900bb2611143cc2f8..ee8835be1a6802a4f5a27031a8ae32bd1e219e5c 100644
--- a/app/code/Magento/Bundle/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Bundle/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_Bundle" before="Magento_Adminhtml" />
+ <module name="Magento_Bundle" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Captcha/Helper/Data.php b/app/code/Magento/Captcha/Helper/Data.php
index af41ad286188af46d17b1e90adcf34c86d4bfd81..47c0ad3a56bb0c77eeafad9ce5b5f9c63c4df010 100644
--- a/app/code/Magento/Captcha/Helper/Data.php
+++ b/app/code/Magento/Captcha/Helper/Data.php
@@ -55,7 +55,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_filesystem;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -66,14 +66,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param Filesystem $filesystem
* @param \Magento\Captcha\Model\CaptchaFactory $factory
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
Filesystem $filesystem,
\Magento\Captcha\Model\CaptchaFactory $factory
@@ -117,7 +117,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_config->getValue(
'customer/captcha/' . $key,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index cb83e17a96ee5e5f84e8e9eb5cbed1f95b2475a8..6b0a348cd9ab0c6ed69dd2a97a01d9f5591afaa0 100644
--- a/app/code/Magento/Captcha/composer.json
+++ b/app/code/Magento/Captcha/composer.json
@@ -3,16 +3,16 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
index 783a3bf00587ec154f665b9d1376938145d3a339..26491d6934760197d63d73ec0cf92fa76830287c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
@@ -237,7 +237,7 @@ class Form extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getHeader()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
index 9e99b739b35283197ab32085ed2169b9d27c1616..023b9f78f2c0a77e85d35670c7476f0faa84b3ca 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
@@ -14,7 +14,7 @@ namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
class Image extends \Magento\Framework\Data\Form\Element\Image
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -23,7 +23,7 @@ class Image extends \Magento\Framework\Data\Form\Element\Image
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\UrlInterface $urlBuilder
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
*/
public function __construct(
@@ -31,7 +31,7 @@ class Image extends \Magento\Framework\Data\Form\Element\Image
\Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\UrlInterface $urlBuilder,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$data = []
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
index 3085a2ebba94cc7ee5b7b46a3ae35d86ba8ed21f..e45d7cbb1aebd9b73b757be745e323cc9c2246fe 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
@@ -164,7 +164,7 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended
'type' => 'currency',
'currency_code' => (string)$this->_scopeConfig->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
),
'index' => 'price'
]
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
index a073b268fe9d43bf6eb82d97c5d2521b61c896b0..29f7d7227a290bac1a230be877481c0d9f3d4094 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -106,7 +106,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Retrieve header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index 2f184f4bc916a124c2959e03a9931a25aab6792a..d7922efb53e5e86ee38d2606ac46ba8dc07febc0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -183,7 +183,7 @@ class Main extends \Magento\Backend\Block\Template
/**
* Retrieve Block Header Text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _getHeader()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
index 8050a1c294e9e64303a22a44cc05f475b8e1cb43..41b5a6dbdd89072cf220c590c4fa2b72723cf526 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
@@ -53,7 +53,7 @@ class Add extends \Magento\Backend\Block\Template
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _getHeader()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
index 21e896072717c9d58cdb71ddda8bf083cc92fc85..c98a4c62ab51796e15bf1aad791a41d882ef3242 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
@@ -44,7 +44,7 @@ class Main extends \Magento\Backend\Block\Template
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _getHeader()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index 00fa7838673786656affb1c69206a4ca81de9e18..3c38b075a9cbe7a4f3f2af760a1a5860a78d52df 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -154,7 +154,7 @@ HTML;
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -162,7 +162,7 @@ HTML;
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
index 39c307ffb0dc0fc64eb8d39ae3892d715847b747..07a86a028ed44584e8370199b770246806e6feea 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
@@ -82,7 +82,7 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
/**
* Tab settings
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -90,7 +90,7 @@ class Inventory extends \Magento\Backend\Block\Widget implements \Magento\Backen
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
index 2d391fedb039e5e794370c3742ad4f0ef15ea3b0..80a2d20ac048d2c1d39703a3563a3b32a3267fd8 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
@@ -45,7 +45,7 @@ class Websites extends \Magento\Backend\Block\Widget implements \Magento\Backend
/**
* Tab settings
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -53,7 +53,7 @@ class Websites extends \Magento\Backend\Block\Widget implements \Magento\Backend
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index f9d6a0e2c29555afd959169d0bfab3860f0b5459..f757d4f3e99c133f275f93fb453ab80c633e120a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -28,8 +28,8 @@ class Alerts extends \Magento\Backend\Block\Widget\Tab
$accordion = $this->getLayout()->createBlock('Magento\Backend\Block\Widget\Accordion')->setId('productAlerts');
/* @var $accordion \Magento\Backend\Block\Widget\Accordion */
- $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
- $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
if ($alertPriceAllow) {
$accordion->addItem(
@@ -76,8 +76,8 @@ class Alerts extends \Magento\Backend\Block\Widget\Tab
*/
public function canShowTab()
{
- $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
- $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+ $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
return ($alertPriceAllow || $alertStockAllow) && parent::canShowTab();
}
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
index f1906209cf6a730742ef547f7cdd9ea2d791001c..3a3b7c04f5ff5e0e742e30072b58150f0f4916ef 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
@@ -99,7 +99,7 @@ class Price extends Extended
'type' => 'currency',
'currency_code' => $this->_scopeConfig->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
]
);
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index d0fca12a103bb8210a09f8eff24bef0ebb6d437f..9f6229afbb32bee847f6fdcc591e92ee16174375 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -299,7 +299,7 @@ class Crosssell extends Extended
'type' => 'currency',
'currency_code' => (string)$this->_scopeConfig->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
),
'index' => 'price',
'header_css_class' => 'col-price',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 45b9a559cb50254bb28906b28bc1b5ff6c93b446..3a86850d5f87c6a8abdcc4c68480d6b7e4eac86a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -284,7 +284,7 @@ class Option extends Widget
$values = [];
$scope = (int)$this->_scopeConfig->getValue(
\Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
foreach ($optionsArr as $option) {
/* @var $option \Magento\Catalog\Model\Product\Option */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
index 23a5257f146a25e882b29be157d99e0fbe69f9d1..685aa481fe9fa9c335987aae68ce1f7f0bb3056f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -293,7 +293,7 @@ class Related extends Extended
'type' => 'currency',
'currency_code' => (string)$this->_scopeConfig->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
),
'index' => 'price',
'header_css_class' => 'col-price',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index 0a55182e300a476c471d418aae955bff5c260600..ca442c0b98b3e9fe3f9dbaf56a3e0bd2c76e2471 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -289,7 +289,7 @@ class Upsell extends \Magento\Backend\Block\Widget\Grid\Extended
'type' => 'currency',
'currency_code' => (string)$this->_scopeConfig->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
),
'index' => 'price',
'header_css_class' => 'col-price',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
index 906575c83dd033ad149fb38e41a78885fdff53a8..7a0dcd8e5548d7e577ba48e6f6a3f9309365fc79 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
@@ -72,7 +72,7 @@ class BaseImage extends \Magento\Framework\Data\Form\Element\AbstractElement
/**
* Get label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index b7d4052a455e0c029add8c36d1c596802d444a2c..d8ad9281699487ced8601782e1131745e6f1e6c3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -20,7 +20,7 @@ use Magento\Eav\Model\Entity\Attribute;
class Gallery extends AbstractElement
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -34,7 +34,7 @@ class Gallery extends AbstractElement
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
* @param \Magento\Framework\Escaper $escaper
* @param \Magento\Framework\View\LayoutInterface $layout
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
*/
public function __construct(
@@ -42,7 +42,7 @@ class Gallery extends AbstractElement
\Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
\Magento\Framework\Escaper $escaper,
\Magento\Framework\View\LayoutInterface $layout,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$data = []
) {
$this->_layout = $layout;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
index fb9cf9a0b43e1b8ab2a04457ca6928d5c13bd9e2..2e5688bbca6177d8278e64c7776f97d5f6bb4e42 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
@@ -19,7 +19,7 @@ class Price extends \Magento\Framework\Data\Form\Element\Text
protected $_taxData;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -32,7 +32,7 @@ class Price extends \Magento\Framework\Data\Form\Element\Text
* @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
* @param \Magento\Framework\Escaper $escaper
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
* @param \Magento\Tax\Helper\Data $taxData
* @param array $data
@@ -41,7 +41,7 @@ class Price extends \Magento\Framework\Data\Form\Element\Text
\Magento\Framework\Data\Form\Element\Factory $factoryElement,
\Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
\Magento\Framework\Escaper $escaper,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,
\Magento\Tax\Helper\Data $taxData,
array $data = []
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
index 3b50f3b6daffe41318d446a724e41d22bccc965a..c630e455bd4c3273cf3abeedc8818d2332eea1d1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
@@ -52,7 +52,7 @@ class Link extends \Magento\Framework\View\Element\Template
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
diff --git a/app/code/Magento/Catalog/Block/Breadcrumbs.php b/app/code/Magento/Catalog/Block/Breadcrumbs.php
index 248bc8e5a7c22808bcd89a5e5ea4042ddad85ca9..5b6769b296d1ac7d233c104fd770085b159ed91e 100644
--- a/app/code/Magento/Catalog/Block/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/Block/Breadcrumbs.php
@@ -43,7 +43,7 @@ class Breadcrumbs extends \Magento\Framework\View\Element\Template
*/
public function getTitleSeparator($store = null)
{
- $separator = (string)$this->_scopeConfig->getValue('catalog/seo/title_separator', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ $separator = (string)$this->_scopeConfig->getValue('catalog/seo/title_separator', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
return ' ' . $separator . ' ';
}
diff --git a/app/code/Magento/Catalog/Block/Category/Rss/Link.php b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
index f13dc6550417b4902941409636b3b878c7620eb6..2f3905087570a8f7272aa11d2b4d0bb7d51720c4 100644
--- a/app/code/Magento/Catalog/Block/Category/Rss/Link.php
+++ b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
@@ -47,12 +47,12 @@ class Link extends \Magento\Framework\View\Element\Template
{
return $this->_scopeConfig->getValue(
'rss/catalog/category',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
index 861a0cbfffa6bbb2231b4be702e32f3bd4af9754..b958562f969b13914c0a8db03dfc1cf91a103011 100644
--- a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
+++ b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -192,7 +192,7 @@ class ListCompare extends \Magento\Catalog\Block\Product\Compare\AbstractCompare
*
* @param Product $product
* @param \Magento\Catalog\Model\Resource\Eav\Attribute $attribute
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getProductAttributeValue($product, $attribute)
{
diff --git a/app/code/Magento/Catalog/Block/Product/Context.php b/app/code/Magento/Catalog/Block/Product/Context.php
index 10f1d2ab5481413fa14ffe1e63282957710251d9..7244352e262863747eebdc0e4ba1c53bab71378d 100644
--- a/app/code/Magento/Catalog/Block/Product/Context.php
+++ b/app/code/Magento/Catalog/Block/Product/Context.php
@@ -94,7 +94,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
* @param \Magento\Framework\View\FileSystem $viewFileSystem
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
* @param \Magento\Framework\App\State $appState
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Config $catalogConfig
* @param \Magento\Framework\Registry $registry
* @param \Magento\Tax\Helper\Data $taxHelper
@@ -133,7 +133,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
\Magento\Framework\View\FileSystem $viewFileSystem,
\Magento\Framework\View\TemplateEnginePool $enginePool,
\Magento\Framework\App\State $appState,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\Page\Config $pageConfig,
\Magento\Catalog\Model\Config $catalogConfig,
\Magento\Framework\Registry $registry,
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 7177c8a45c7da33d9b7a82300c19d6c229d2e9c4..b2f02218b1d7ed604c72e6961e9bbef826e6ee9c 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -650,12 +650,12 @@ class Toolbar extends \Magento\Framework\View\Element\Template
)->setFrameLength(
$this->_scopeConfig->getValue(
'design/pagination/pagination_frame',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->setJump(
$this->_scopeConfig->getValue(
'design/pagination/pagination_frame_skip',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->setLimit(
$this->getLimit()
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
index 302c92ff1de23584df48e8961e0ba2653990e13d..4cdd4984ff31a893d6909a9ba446b6411eeda75d 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
@@ -91,7 +91,7 @@ class Date extends \Magento\Catalog\Block\Product\View\Options\AbstractOptions
)->setClass(
'product-custom-option datetime-picker input-text'
)->setImage(
- $this->getViewFileUrl('Magento_Core::calendar.png')
+ $this->getViewFileUrl('Magento_Theme::calendar.png')
)->setDateFormat(
$this->_localeDate->getDateFormat(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT)
)->setValue(
diff --git a/app/code/Magento/Catalog/Block/Rss/Category.php b/app/code/Magento/Catalog/Block/Rss/Category.php
index 2453f3c5e47953ca3fb3ef575447d5e453b9b590..0386230d779720173efdd7cd3f2d5f19426719ce 100644
--- a/app/code/Magento/Catalog/Block/Rss/Category.php
+++ b/app/code/Magento/Catalog/Block/Rss/Category.php
@@ -37,7 +37,7 @@ class Category extends \Magento\Framework\View\Element\AbstractBlock implements
protected $rssModel;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -217,7 +217,7 @@ class Category extends \Magento\Framework\View\Element\AbstractBlock implements
{
return $this->_scopeConfig->isSetFlag(
'rss/catalog/category',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php b/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
index 69634b68d58d65ede235265a575365b315f868fc..85c4cca4dcee216826c4dc45157dc34306453a89 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
@@ -29,7 +29,7 @@ class NewProducts extends \Magento\Framework\View\Element\AbstractBlock implemen
protected $rssUrlBuilder;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -68,7 +68,7 @@ class NewProducts extends \Magento\Framework\View\Element\AbstractBlock implemen
*/
public function isAllowed()
{
- return $this->_scopeConfig->isSetFlag('rss/catalog/new', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag('rss/catalog/new', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -81,7 +81,7 @@ class NewProducts extends \Magento\Framework\View\Element\AbstractBlock implemen
$title = __('New Products from %1', $storeModel->getFrontendName());
$lang = $this->_scopeConfig->getValue(
'general/locale/code',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeModel
);
$data = [
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
index 499e8e652e47e68a37483c75af498e1d75d94ab8..60be17cb4881e970b91962cc255f3b8e2105a98b 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
@@ -41,7 +41,7 @@ class Special extends \Magento\Framework\View\Element\AbstractBlock implements D
protected $httpContext;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -123,7 +123,7 @@ class Special extends \Magento\Framework\View\Element\AbstractBlock implements D
$title = __('%1 - Special Products', $this->storeManager->getStore()->getFrontendName());
$lang = $this->_scopeConfig->getValue(
'general/locale/code',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$data = [
@@ -258,7 +258,7 @@ class Special extends \Magento\Framework\View\Element\AbstractBlock implements D
{
return $this->_scopeConfig->isSetFlag(
'rss/catalog/special',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
index 9e7071dd11744af6886905a446d88c7b78e2801c..048739d49b1dd0bc5f951492798bd95c7ff6061e 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
@@ -45,7 +45,7 @@ class Category extends \Magento\Backend\App\Action
$category->load($categoryId);
if ($storeId) {
$rootId = $this->_objectManager->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
$storeId
)->getRootCategoryId();
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
index d1c6b3a1c14194149f994ae4e757fd052ca3a47a..f6b54278aa3eabc0a117ebf45ad491337a5fe39a 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
@@ -49,7 +49,7 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Category
$categoryId = (int)$this->getRequest()->getParam('id');
if ($storeId && !$categoryId && !$parentId) {
- $store = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore($storeId);
+ $store = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore($storeId);
$this->getRequest()->setParam('id', (int)$store->getRootCategoryId());
}
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index 669584b1a84ab9442e7847bc1b6e15b981bd99df..4599a379adbc9bace4e4f1dbc2ca7277f4861994 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -93,7 +93,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Category
if (!$parentId) {
if ($storeId) {
$parentId = $this->_objectManager->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
$storeId
)->getRootCategoryId();
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
index 790959ea64e7f4970df0f8bad4fc5894ab88b824..b7410f3ada3ee5558c1c7a1825eee36ac2d3c7aa 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
@@ -49,7 +49,7 @@ class Tree extends \Magento\Catalog\Controller\Adminhtml\Category
if ($storeId) {
if (!$categoryId) {
$store = $this->_objectManager
- ->get('Magento\Framework\Store\StoreManagerInterface')
+ ->get('Magento\Store\Model\StoreManagerInterface')
->getStore($storeId);
$rootId = $store->getRootCategoryId();
$this->getRequest()->setParam('id', $rootId);
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
index 31a448a81d1d8ea719792a2bb5de0464494faa52..34d74da1fa0c07362963ab4a59a3505bee21af92 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
@@ -68,7 +68,7 @@ class Edit extends \Magento\Catalog\Controller\Adminhtml\Product
$resultPage->getConfig()->getTitle()->prepend(__('Products'));
$resultPage->getConfig()->getTitle()->prepend($product->getName());
- if (!$this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->isSingleStoreMode()
+ if (!$this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->isSingleStoreMode()
&&
($switchBlock = $resultPage->getLayout()->getBlock('store_switcher'))
) {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index fc23b7d3f5a831ebc6571f487c791a725cafc0be..9dbbddcee68f828b225304bea6dad7050d74c275 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -13,7 +13,7 @@ class Helper
protected $request;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -34,14 +34,14 @@ class Helper
/**
* @param \Magento\Framework\App\RequestInterface $request
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param StockDataFilter $stockFilter
* @param \Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks
* @param \Magento\Backend\Helper\Js $jsHelper
*/
public function __construct(
\Magento\Framework\App\RequestInterface $request,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
StockDataFilter $stockFilter,
\Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks,
\Magento\Backend\Helper\Js $jsHelper
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
index f12d2aa2f1ec4f3e77c90701b19464321d08cdb8..f0f0b5274a66745f3cd6ea50960b853a0697f59d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
@@ -44,7 +44,7 @@ class Wysiwyg extends \Magento\Catalog\Controller\Adminhtml\Product
{
$elementId = $this->getRequest()->getParam('element_id', md5(microtime()));
$storeId = $this->getRequest()->getParam('store_id', 0);
- $storeMediaUrl = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')
+ $storeMediaUrl = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')
->getStore($storeId)
->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index 79be48c730c5cd30bb6b55ba5d0c407b2bce1667..0a6ee361fd07dbb44789e5176d164cab7649fd51 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -38,7 +38,7 @@ class View extends \Magento\Framework\App\Action\Action
protected $_catalogDesign;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -52,6 +52,16 @@ class View extends \Magento\Framework\App\Action\Action
*/
protected $resultPageFactory;
+ /**
+ * @var \Magento\Framework\Controller\Result\ForwardFactory
+ */
+ protected $resultForwardFactory;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
/**
* Catalog Layer Resolver
*
@@ -71,10 +81,12 @@ class View extends \Magento\Framework\App\Action\Action
* @param \Magento\Catalog\Model\Design $catalogDesign
* @param \Magento\Catalog\Model\Session $catalogSession
* @param \Magento\Framework\Registry $coreRegistry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
- * @param Resolver $layerResolver
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+ * @param Resolver $layerResolver
* @param CategoryRepositoryInterface $categoryRepository
*/
public function __construct(
@@ -82,9 +94,11 @@ class View extends \Magento\Framework\App\Action\Action
\Magento\Catalog\Model\Design $catalogDesign,
\Magento\Catalog\Model\Session $catalogSession,
\Magento\Framework\Registry $coreRegistry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
PageFactory $resultPageFactory,
+ \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory,
+ \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
Resolver $layerResolver,
CategoryRepositoryInterface $categoryRepository
) {
@@ -95,6 +109,8 @@ class View extends \Magento\Framework\App\Action\Action
$this->_coreRegistry = $coreRegistry;
$this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
$this->resultPageFactory = $resultPageFactory;
+ $this->resultForwardFactory = $resultForwardFactory;
+ $this->resultRedirectFactory = $resultRedirectFactory;
$this->layerResolver = $layerResolver;
$this->categoryRepository = $categoryRepository;
}
@@ -137,15 +153,14 @@ class View extends \Magento\Framework\App\Action\Action
/**
* Category view action
*
- * @return \Magento\Framework\View\Result\Page
+ * @return \Magento\Framework\Controller\ResultInterface
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
{
if ($this->_request->getParam(\Magento\Framework\App\Action\Action::PARAM_NAME_URL_ENCODED)) {
- $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
- return;
+ return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl());
}
$category = $this->_initCategory();
if ($category) {
@@ -192,7 +207,7 @@ class View extends \Magento\Framework\App\Action\Action
$page->getLayout()->initMessages();
return $page;
} elseif (!$this->getResponse()->isRedirect()) {
- $this->_forward('noroute');
+ return $this->resultForwardFactory->create()->forward('noroute');
}
}
}
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare.php b/app/code/Magento/Catalog/Controller/Product/Compare.php
index 2fce69244f5a062b8c75af0587ee11adeb518577..4e934b0685e698f5e1f179935e8ee9d2a746025a 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare.php
@@ -68,7 +68,7 @@ class Compare extends \Magento\Framework\App\Action\Action
protected $_compareItemFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -102,7 +102,7 @@ class Compare extends \Magento\Framework\App\Action\Action
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
* @param \Magento\Catalog\Model\Session $catalogSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param FormKeyValidator $formKeyValidator
* @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
@@ -117,7 +117,7 @@ class Compare extends \Magento\Framework\App\Action\Action
\Magento\Customer\Model\Visitor $customerVisitor,
\Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
\Magento\Catalog\Model\Session $catalogSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
FormKeyValidator $formKeyValidator,
Result\RedirectFactory $resultRedirectFactory,
PageFactory $resultPageFactory,
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
index 5090c890f13d21c6c10d11a1d58c5edf073b668f..aa311afa1c33047eeed43400001bf7096242e366 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
@@ -29,7 +29,7 @@ class Index extends \Magento\Catalog\Controller\Product\Compare
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
* @param \Magento\Catalog\Model\Session $catalogSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param FormKeyValidator $formKeyValidator
* @param Result\RedirectFactory $resultRedirectFactory
* @param PageFactory $resultPageFactory
@@ -46,7 +46,7 @@ class Index extends \Magento\Catalog\Controller\Product\Compare
\Magento\Customer\Model\Visitor $customerVisitor,
\Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
\Magento\Catalog\Model\Session $catalogSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
FormKeyValidator $formKeyValidator,
Result\RedirectFactory $resultRedirectFactory,
PageFactory $resultPageFactory,
diff --git a/app/code/Magento/Catalog/Helper/Category.php b/app/code/Magento/Catalog/Helper/Category.php
index 22ef6b0ca986179c5302555f93149d4e44a770e1..04492509b595c0b014b80d91f056d5ea6a698a76 100644
--- a/app/code/Magento/Catalog/Helper/Category.php
+++ b/app/code/Magento/Catalog/Helper/Category.php
@@ -39,7 +39,7 @@ class Category extends AbstractHelper
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -65,7 +65,7 @@ class Category extends AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Data\CollectionFactory $dataCollectionFactory
* @param CategoryRepositoryInterface $categoryRepository
@@ -73,7 +73,7 @@ class Category extends AbstractHelper
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Data\CollectionFactory $dataCollectionFactory,
CategoryRepositoryInterface $categoryRepository
@@ -118,7 +118,7 @@ class Category extends AbstractHelper
0,
(int)$this->_scopeConfig->getValue(
'catalog/navigation/max_depth',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$storeCategories = $category->getCategories($parent, $recursionLevel, $sorted, $asCollection, $toLoad);
@@ -181,7 +181,7 @@ class Category extends AbstractHelper
{
return $this->_scopeConfig->getValue(
self::XML_PATH_USE_CATEGORY_CANONICAL_TAG,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index e48b8a74427b15aaae413ca8cc5e8570b03920dd..7e4d6732ae26f134e6b73ab60df4e4196d5feadb 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -98,7 +98,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -168,7 +168,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Session $catalogSession
* @param \Magento\Framework\Stdlib\String $string
* @param Category $catalogCategory
@@ -190,7 +190,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Session $catalogSession,
\Magento\Framework\Stdlib\String $string,
Category $catalogCategory,
@@ -388,7 +388,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::XML_PATH_PRICE_SCOPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -411,7 +411,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->isSetFlag(
self::CONFIG_USE_STATIC_URLS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->_storeId
);
}
@@ -425,7 +425,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->isSetFlag(
self::CONFIG_PARSE_URL_DIRECTIVES,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->_storeId
);
}
@@ -449,7 +449,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->isSetFlag(
self::XML_PATH_DISPLAY_PRODUCT_COUNT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index c4937397eeb9c995930359a6ec8d81a3b1bb88e6..4f1afb10f4ba2de4749fa8fe5403e6617249c2c7 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -164,25 +164,25 @@ class Image extends AbstractHelper
$this->setWatermark(
$this->_scopeConfig->getValue(
"design/watermark/{$this->_getModel()->getDestinationSubdir()}_image",
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$this->setWatermarkImageOpacity(
$this->_scopeConfig->getValue(
"design/watermark/{$this->_getModel()->getDestinationSubdir()}_imageOpacity",
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$this->setWatermarkPosition(
$this->_scopeConfig->getValue(
"design/watermark/{$this->_getModel()->getDestinationSubdir()}_position",
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$this->setWatermarkSize(
$this->_scopeConfig->getValue(
"design/watermark/{$this->_getModel()->getDestinationSubdir()}_size",
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
index eeee50878443d79842e4e6a8451d3fc69b032484..b18e4b6b2f0d1107968a5325da70be2af5cbd679 100644
--- a/app/code/Magento/Catalog/Helper/Product.php
+++ b/app/code/Magento/Catalog/Helper/Product.php
@@ -107,7 +107,7 @@ class Product extends \Magento\Core\Helper\Url
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Session $catalogSession
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\Registry $coreRegistry
@@ -123,7 +123,7 @@ class Product extends \Magento\Core\Helper\Url
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Session $catalogSession,
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\Registry $coreRegistry,
@@ -341,7 +341,7 @@ class Product extends \Magento\Core\Helper\Url
{
return $this->_scopeConfig->getValue(
self::XML_PATH_USE_PRODUCT_CANONICAL_TAG,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -600,7 +600,7 @@ class Product extends \Magento\Core\Helper\Url
/**
* Get label for virtual control
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTypeSwitcherControlLabel()
{
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index de95592316a2b45bcf2bbc3c12372c6421e656de..469c47e77d539d84ed4bf04ceed27f4539fbf877 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -96,7 +96,7 @@ class Compare extends \Magento\Core\Helper\Url
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Resource\Product\Compare\Item\CollectionFactory $itemCollectionFactory
* @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
* @param \Magento\Customer\Model\Visitor $customerVisitor
@@ -109,7 +109,7 @@ class Compare extends \Magento\Core\Helper\Url
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Product\Compare\Item\CollectionFactory $itemCollectionFactory,
\Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
\Magento\Customer\Model\Visitor $customerVisitor,
diff --git a/app/code/Magento/Catalog/Helper/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php
index a74b848da95df281370a19b6ea52e0ccc8aaa360..eca50adc3e225065464c39d10fec961b5708d6f9 100644
--- a/app/code/Magento/Catalog/Helper/Product/Composite.php
+++ b/app/code/Magento/Catalog/Helper/Product/Composite.php
@@ -10,7 +10,7 @@ use Magento\Framework\App\Helper\Context;
use Magento\Framework\View\Result\LayoutFactory;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Catalog\Helper\Product;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Controller\RegistryConstants;
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Framework\Registry;
@@ -38,7 +38,7 @@ class Composite extends \Magento\Framework\App\Helper\AbstractHelper
protected $_catalogProduct = null;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -59,7 +59,7 @@ class Composite extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Product $catalogProduct
* @param Registry $coreRegistry
* @param LayoutFactory $resultLayoutFactory
diff --git a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
index 8cca46b6a9da1a31f6c4dcf9b9f0b75df5cfd7aa..add782fd4d41e654d853cf0cf47037d094ffd395 100644
--- a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
@@ -52,7 +52,7 @@ class Attribute extends \Magento\Backend\Helper\Data
protected $_eavConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -67,7 +67,7 @@ class Attribute extends \Magento\Backend\Helper\Data
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Backend\Model\Session $session
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -81,7 +81,7 @@ class Attribute extends \Magento\Backend\Helper\Data
\Magento\Eav\Model\Config $eavConfig,
\Magento\Backend\Model\Session $session,
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_eavConfig = $eavConfig;
$this->_session = $session;
diff --git a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
index 1d0d2ef7ac8d5a15ac5f23c61d2f3b911b8e2f85..27d3d25fa89dc22eb08245e7a9dcdd227d99b94d 100644
--- a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
+++ b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
@@ -101,7 +101,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
protected $_attributeFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -127,7 +127,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
* @param \Magento\Catalog\Model\Resource\ConfigFactory $configFactory
* @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Mview\View\Changelog $changelog
* @param bool $addFilterableAttrs
* @param bool $addChildData
@@ -141,7 +141,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
\Magento\Catalog\Model\Attribute\Config $attributeConfig,
\Magento\Catalog\Model\Resource\ConfigFactory $configFactory,
\Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Mview\View\Changelog $changelog,
$addFilterableAttrs = false,
$addChildData = false,
diff --git a/app/code/Magento/Catalog/Helper/Product/ProductList.php b/app/code/Magento/Catalog/Helper/Product/ProductList.php
index 63940f607222854ae15814adaf8ccee5de48715c..f298f7b940f79e14800711da955b83c3071eb3c6 100644
--- a/app/code/Magento/Catalog/Helper/Product/ProductList.php
+++ b/app/code/Magento/Catalog/Helper/Product/ProductList.php
@@ -50,7 +50,7 @@ class ProductList
*/
public function getAvailableViewMode()
{
- switch ($this->scopeConfig->getValue(self::XML_PATH_LIST_MODE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+ switch ($this->scopeConfig->getValue(self::XML_PATH_LIST_MODE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
case 'grid':
$availableMode = ['grid' => __('Grid')];
break;
@@ -96,7 +96,7 @@ class ProductList
{
return $this->scopeConfig->getValue(
\Magento\Catalog\Model\Config::XML_PATH_LIST_DEFAULT_SORT_BY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -114,13 +114,13 @@ class ProductList
$perPageConfigKey = 'catalog/frontend/' . $mode . '_per_page_values';
$perPageValues = (string)$this->scopeConfig->getValue(
$perPageConfigKey,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$perPageValues = explode(',', $perPageValues);
$perPageValues = array_combine($perPageValues, $perPageValues);
if ($this->scopeConfig->isSetFlag(
'catalog/frontend/list_allow_all',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)) {
return ($perPageValues + ['all' => __('All')]);
} else {
@@ -139,12 +139,12 @@ class ProductList
if ($viewMode == self::VIEW_MODE_LIST) {
return $this->scopeConfig->getValue(
'catalog/frontend/list_per_page',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
} elseif ($viewMode == self::VIEW_MODE_GRID) {
return $this->scopeConfig->getValue(
'catalog/frontend/grid_per_page',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return 0;
diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index 91574d561c1b68ba1a06049d50f12023437b0def..19c70245700c41c2c56f1f42aa645ab8a4f23cc5 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -55,7 +55,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -64,7 +64,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
* @param AttributeValueFactory $customAttributeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -74,7 +74,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
\Magento\Framework\Registry $registry,
\Magento\Framework\Api\MetadataServiceInterface $metadataService,
AttributeValueFactory $customAttributeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index 64ce3d94e347cb7b4ae9b261c67c6ec3fcec26c0..cc6329800747bf920e016b132540dded47129af0 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Catalog\Model\Attribute\Backend;
-use Magento\Core\Model\Layout\Update\ValidatorFactory;
+use Magento\Framework\View\Model\Layout\Update\ValidatorFactory;
use Magento\Eav\Model\Entity\Attribute\Exception;
/**
@@ -48,7 +48,7 @@ class Customlayoutupdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Abs
return true;
}
- /** @var $validator \Magento\Core\Model\Layout\Update\Validator */
+ /** @var $validator \Magento\Framework\View\Model\Layout\Update\Validator */
$validator = $this->_layoutUpdateValidatorFactory->create();
if (!$validator->isValid($xml)) {
$messages = $validator->getMessages();
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 4bdd5cc819d2a81b448d19b35b1a37ff55f15db3..abb1c4d530b0146c1b324c76ce8af5c61dc5aac9 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -178,7 +178,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
* @param \Magento\Framework\Registry $registry
* @param \Magento\Catalog\Api\CategoryAttributeRepositoryInterface $metadataService
* @param AttributeValueFactory $customAttributeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Resource\Category\Tree $categoryTreeResource
* @param Resource\Category\TreeFactory $categoryTreeFactory
* @param \Magento\Store\Model\Resource\Store\CollectionFactory $storeCollectionFactory
@@ -201,7 +201,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
\Magento\Framework\Registry $registry,
\Magento\Catalog\Api\CategoryAttributeRepositoryInterface $metadataService,
AttributeValueFactory $customAttributeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Category\Tree $categoryTreeResource,
\Magento\Catalog\Model\Resource\Category\TreeFactory $categoryTreeFactory,
\Magento\Store\Model\Resource\Store\CollectionFactory $storeCollectionFactory,
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
index 7aebe4cc11837069467db745bc63cf6d9d6d1180..c1d07fc693ab29467a3765b2d30f9d5fb9b50a22 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -68,7 +68,7 @@ class Sortby extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
$attributeCode
) : $this->_scopeConfig->getValue(
"catalog/frontend/default_sort_by",
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (!in_array($data, $available) && !in_array('available_sort_by', $postDataConfig)) {
throw new \Magento\Framework\Model\Exception(
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
index 59e05f1fc589ec72b0cd4346104798676db1294d..95ec54333023e84b7f971412938a4825bbc238c0 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
@@ -13,14 +13,14 @@ namespace Magento\Catalog\Model\Category\Attribute\Source;
class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
{
/**
- * @var \Magento\Core\Model\PageLayout\Config\Builder
+ * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
*/
protected $pageLayoutBuilder;
/**
- * @param \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder
+ * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
*/
- public function __construct(\Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder)
+ public function __construct(\Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder)
{
$this->pageLayoutBuilder = $pageLayoutBuilder;
}
diff --git a/app/code/Magento/Catalog/Model/Category/Tree.php b/app/code/Magento/Catalog/Model/Category/Tree.php
index 538605dd82d162e0e02615ef49385463116223b3..8b131a66d64a1381eda7287ad09ca31555c5d869 100644
--- a/app/code/Magento/Catalog/Model/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Category/Tree.php
@@ -18,7 +18,7 @@ class Tree
protected $categoryTree;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -34,13 +34,13 @@ class Tree
/**
* @param \Magento\Catalog\Model\Resource\Category\Tree $categoryTree
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Resource\Category\Collection $categoryCollection
* @param \Magento\Catalog\Api\Data\CategoryTreeDataBuilder $treeBuilder
*/
public function __construct(
\Magento\Catalog\Model\Resource\Category\Tree $categoryTree,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Category\Collection $categoryCollection,
\Magento\Catalog\Api\Data\CategoryTreeDataBuilder $treeBuilder
) {
diff --git a/app/code/Magento/Catalog/Model/CategoryRepository.php b/app/code/Magento/Catalog/Model/CategoryRepository.php
index b4929f290f59cb725fa2cd93ddc814fe858ed723..161c990a845e6c4217937ccc9d6b589b3694ad0e 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository.php
@@ -19,7 +19,7 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
protected $instances = [];
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -48,13 +48,13 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
/**
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
* @param \Magento\Catalog\Model\Resource\Category $categoryResource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Api\Data\CategoryDataBuilder $dataBuilder
*/
public function __construct(
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
\Magento\Catalog\Model\Resource\Category $categoryResource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Api\Data\CategoryDataBuilder $dataBuilder
) {
$this->categoryFactory = $categoryFactory;
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index eb7e12ddc7c83718a9c8a2c3d1a122007c5d0de4..8cbdb43ad337b980023575b93070cdcb929ca8a0 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -85,7 +85,7 @@ class Config extends \Magento\Eav\Model\Config
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -130,7 +130,7 @@ class Config extends \Magento\Eav\Model\Config
* @param \Magento\Catalog\Model\Product\TypeFactory $productTypeFactory
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $groupCollectionFactory
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $setCollectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -146,7 +146,7 @@ class Config extends \Magento\Eav\Model\Config
\Magento\Catalog\Model\Product\TypeFactory $productTypeFactory,
\Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $groupCollectionFactory,
\Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $setCollectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig
) {
$this->_scopeConfig = $scopeConfig;
@@ -481,6 +481,6 @@ class Config extends \Magento\Eav\Model\Config
*/
public function getProductListDefaultSortBy($store = null)
{
- return $this->_scopeConfig->getValue(self::XML_PATH_LIST_DEFAULT_SORT_BY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XML_PATH_LIST_DEFAULT_SORT_BY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
}
diff --git a/app/code/Magento/Catalog/Model/Entity/Attribute.php b/app/code/Magento/Catalog/Model/Entity/Attribute.php
index a03e272b84191b4a338e031386ed67850cf501c7..50e0a28c5d5fd6f3b57ad9e45db974e2077b7e88 100644
--- a/app/code/Magento/Catalog/Model/Entity/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Entity/Attribute.php
@@ -76,7 +76,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -97,7 +97,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
\Magento\Core\Helper\Data $coreData,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php b/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
index 25580a392be25327065409ece330b963e70ba648..ee3f56b70d965639b28d298b3356eb4f926cd437 100644
--- a/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
+++ b/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Catalog\Model\Indexer;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
abstract class AbstractFlatState
{
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index 96f73c1fab6121ca93555ef095f30c0a25443b66..9fba6a8ae96707b844aac77f2f95a1eea1394cec 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -28,7 +28,7 @@ class AbstractAction
protected $resource;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -48,12 +48,12 @@ class AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Helper $resourceHelper
) {
$this->resource = $resource;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
index 2015ea5681c0e1f7a9a78f971404ddce457c8a27..34c02fd4e7e0201b2ca9319e0fe529bcb55038c6 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
@@ -17,13 +17,13 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param CategoryRepositoryInterface $categoryRepository
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
CategoryRepositoryInterface $categoryRepository
) {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index c8869611bf2ce766d1c9de9fe0ef20f2a8c434aa..fc76af0a7552bf05631cf973bf868445252b0ef6 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -64,7 +64,7 @@ abstract class AbstractAction
protected $resource;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -82,12 +82,12 @@ abstract class AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Config $config
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Config $config
) {
$this->resource = $resource;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
index e0481f9859d6ad74fe50b09f48434450312a6912..c160e95db9b1f1836852dee34755e80b93bb6ea0 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
@@ -26,7 +26,7 @@ abstract class AbstractAction
protected $_tableDropSuffix = '_drop_indexer';
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -71,7 +71,7 @@ abstract class AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
* @param \Magento\Catalog\Model\Product\Type $productType
* @param TableBuilder $tableBuilder
@@ -79,7 +79,7 @@ abstract class AbstractAction
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
\Magento\Catalog\Model\Product\Type $productType,
TableBuilder $tableBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
index c6050d69cedb96e98cbfe016f681ca8d9d3da2bb..f3f78f4e1edae65178ec18b7d7ce4d6ddcebddaf 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
@@ -20,19 +20,19 @@ class Eraser
protected $connection;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->productIndexerHelper = $productHelper;
$this->connection = $resource->getConnection('default');
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
index 5b04085972308f47ee1b2d3e59beab71f133a97a..d7f2bda96a5fc5e4aa5056fc22b482dbc0b1a7c3 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
@@ -25,7 +25,7 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
* @param \Magento\Catalog\Model\Product\Type $productType
* @param TableBuilder $tableBuilder
@@ -35,7 +35,7 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
\Magento\Catalog\Model\Product\Type $productType,
TableBuilder $tableBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
index 079ff838e3614dbaaf9fa695c678616bafe6ac7f..1014882f1ef82478be30f10d9c930ef6d178055f 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
@@ -21,7 +21,7 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
* @param \Magento\Catalog\Model\Product\Type $productType
* @param TableBuilder $tableBuilder
@@ -30,7 +30,7 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
\Magento\Catalog\Model\Product\Type $productType,
TableBuilder $tableBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index bab6bd58d3d13bc4e9b107cebc9440147de778f0..3c5fd37274111d25ad407d87d5b42528f811ee71 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -31,7 +31,7 @@ class FlatTableBuilder
protected $_config;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -44,14 +44,14 @@ class FlatTableBuilder
* @param \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param TableDataInterface $tableData
*/
public function __construct(
\Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper,
\Magento\Framework\App\Resource $resource,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Indexer\Product\Flat\TableDataInterface $tableData
) {
$this->_productIndexerHelper = $productIndexerHelper;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index c922137b498155f345f7e54dc12efa1fd65c70c6..52861a1d42adae0dc6159754e99eb1ac3f5516c9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -39,7 +39,7 @@ abstract class AbstractAction
protected $_config;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -87,7 +87,7 @@ abstract class AbstractAction
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -98,7 +98,7 @@ abstract class AbstractAction
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php
index 3d7782328365e329667378415d348eed55b4d831..0d8b328c8873a21a4a8f306b4824614a108c87e9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Model\Indexer\Product\Price;
class Observer
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -43,7 +43,7 @@ class Observer
protected $_connection;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -51,7 +51,7 @@ class Observer
* @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $processor
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Stdlib\DateTime $dateTime,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/Catalog/Model/Layer.php b/app/code/Magento/Catalog/Model/Layer.php
index 812edf932793209b30e2d217d306d7d6131e23d0..74bcbfdf7cc843adc5172d6a3f31a0b8cf43799b 100644
--- a/app/code/Magento/Catalog/Model/Layer.php
+++ b/app/code/Magento/Catalog/Model/Layer.php
@@ -40,7 +40,7 @@ class Layer extends \Magento\Framework\Object
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -90,7 +90,7 @@ class Layer extends \Magento\Framework\Object
* @param Layer\StateFactory $layerStateFactory
* @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
* @param Resource\Product $catalogProduct
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $registry
* @param CategoryRepositoryInterface $categoryRepository
* @param array $data
@@ -100,7 +100,7 @@ class Layer extends \Magento\Framework\Object
\Magento\Catalog\Model\Layer\StateFactory $layerStateFactory,
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
\Magento\Catalog\Model\Resource\Product $catalogProduct,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $registry,
CategoryRepositoryInterface $categoryRepository,
array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Category.php b/app/code/Magento/Catalog/Model/Layer/Category.php
index 22fb2dba6197c35ac68c9d92ed1be8ca0f652468..c27f563e8b5f293cfcd95daaf53fe42a86e03a39 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category.php
@@ -16,7 +16,7 @@ class Category extends \Magento\Catalog\Model\Layer
* @param StateFactory $layerStateFactory
* @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
* @param Resource\Product $catalogProduct
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $registry
* @param CategoryRepositoryInterface $categoryRepository
* @param array $data
@@ -26,7 +26,7 @@ class Category extends \Magento\Catalog\Model\Layer
StateFactory $layerStateFactory,
Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
Resource\Product $catalogProduct,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $registry,
CategoryRepositoryInterface $categoryRepository,
array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php b/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
index 4ba8fb004975e2fcb23c7c44cccb669b551bfe6e..7d37ce6bf92c2e1821d1955c1c083a16aae80417 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
@@ -17,7 +17,7 @@ class FilterableAttributeList implements FilterableAttributeListInterface
protected $collectionFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -30,12 +30,12 @@ class FilterableAttributeList implements FilterableAttributeListInterface
* FilterableAttributeList constructor
*
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
*/
public function __construct(
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver
) {
$this->collectionFactory = $collectionFactory;
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php b/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
index d935d6db2f07c842c868e90e72db9ec435613ba7..35fa74eebaa1f0532086cd5545972c44a6159bf0 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
@@ -12,7 +12,7 @@ use Magento\Catalog\Model\Layer\StateKeyInterface;
class StateKey implements StateKeyInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -22,11 +22,11 @@ class StateKey implements StateKeyInterface
protected $customerSession;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Session $customerSession
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Session $customerSession
) {
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
index b3ccf6aac75bbdc8c1a98854c43bc0c3a58dc34c..91e8aaadbef394af6cfaee77da71ff7971770e4b 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
@@ -36,7 +36,7 @@ abstract class AbstractFilter extends \Magento\Framework\Object implements Filte
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -58,7 +58,7 @@ abstract class AbstractFilter extends \Magento\Framework\Object implements Filte
* Constructor
*
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param array $data
@@ -66,7 +66,7 @@ abstract class AbstractFilter extends \Magento\Framework\Object implements Filte
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php b/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
index 8d1cde939fb2ee2b9cbe2b5d2b6c2a2e81378ec7..b46e0d63c8831b0e693e8e697f1c34ffd79c9c3f 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
@@ -33,7 +33,7 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
/**
* @param ItemFactory $filterItemFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\Resource\Layer\Filter\AttributeFactory $filterAttributeFactory
@@ -43,7 +43,7 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Catalog\Model\Resource\Layer\Filter\AttributeFactory $filterAttributeFactory,
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Category.php b/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
index 9924b0bd8503ee9c0a672b1d81f8fceb2f609337..b582dd8fdfd825e9ba82c00185a1358673c5fd3f 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
@@ -53,7 +53,7 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
* Construct
*
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Framework\Escaper $escaper
@@ -62,7 +62,7 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Framework\Escaper $escaper,
@@ -112,7 +112,7 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
/**
* Get filter name
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getName()
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
index 783ab5ac822e44e711ac1f2d03916843cb597dca..cc9e06a5a80a105144af894bcb8bd7688c384108 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Model\Layer\Filter\DataProvider;
use Magento\Catalog\Model\Layer;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Registry;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class Price
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
index 8c3b30fb4628b25bac7bbca095a0cb539d4786fb..2aff097b02334f3a347d2bcc7e739f8e0aeef5ba 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
@@ -32,7 +32,7 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
/**
* @param ItemFactory $filterItemFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\Resource\Layer\Filter\DecimalFactory $filterDecimalFactory
@@ -41,7 +41,7 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
@@ -97,7 +97,7 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
*
* @param int $range
* @param float $value
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _renderItemLabel($range, $value)
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
index b8c4183760e10f8a305e48e586f75af33dc1bbed..d86b8220296bf9842d1d601426bb4516ecb8c2e1 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
@@ -11,7 +11,7 @@ namespace Magento\Catalog\Model\Layer\Filter\Dynamic;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Model\Exception;
use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class AlgorithmFactory
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
index d53ed9bbda47b40a9c31d3e523738f2cf3126780..ab08c7eb49de90e50339247fe41e8981c3fe3d43 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
@@ -10,7 +10,7 @@ use Magento\Catalog\Model\Layer\Resolver;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Search\Dynamic\Algorithm;
use Magento\Framework\Search\Dynamic\IntervalFactory;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class Improved implements AlgorithmInterface
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
index 6d8a98eaa43bcdb0daf4c97bbba5e6b3dc96cacf..b81568ae537e083fad59ffdb61a807acd3f36732 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
@@ -12,7 +12,7 @@ use Magento\Catalog\Model\Resource\Layer\Filter\Price;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Registry;
use Magento\Framework\Search\Dynamic\Algorithm;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class Manual implements AlgorithmInterface
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
index ac5c0e707620a4b1598a6a8acd538cf7301a57d3..5f2e21f3f22d9fda5f159860864b4310f9085ef3 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
@@ -64,7 +64,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
/**
* @param ItemFactory $filterItemFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource
@@ -78,7 +78,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Catalog\Model\Resource\Layer\Filter\Price $resource,
@@ -210,7 +210,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
/**
* Get 'clear price' link text
*
- * @return false|string
+ * @return \Magento\Framework\Phrase|bool
*/
public function getClearLinkText()
{
@@ -227,7 +227,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
*
* @param float|string $fromPrice
* @param float|string $toPrice
- * @return string
+ * @return float|\Magento\Framework\Phrase
*/
protected function _renderRangeLabel($fromPrice, $toPrice)
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
index 5c80ebacb6db1a2f22ca15f33077ccfbd3461fb5..c1ff0681b3e7fde38c1fcb648671f32065e587cb 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Model\Layer\Filter\Price;
use Magento\Catalog\Model\Layer\Resolver;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Registry;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class Range
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
index a8a1735867e3411bd9877ed53e0582f2000b1f52..baece7b17624a68f5514f3aaeb4baea540b91059 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Model\Layer\Filter\Price;
use Magento\Catalog\Model\Layer\Filter\Item\DataBuilder;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class Render
{
@@ -49,7 +49,7 @@ class Render
*
* @param float|string $fromPrice
* @param float|string $toPrice
- * @return string
+ * @return float|\Magento\Framework\Phrase
*/
public function renderRangeLabel($fromPrice, $toPrice)
{
diff --git a/app/code/Magento/Catalog/Model/Layer/Search.php b/app/code/Magento/Catalog/Model/Layer/Search.php
index 150dfab4b28a69d6e09101217a9797dc6354bc87..467fe6462d90046ae78a1af6324a82f71e491881 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search.php
@@ -17,7 +17,7 @@ class Search extends \Magento\Catalog\Model\Layer
* @param StateFactory $layerStateFactory
* @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
* @param Resource\Product $catalogProduct
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $registry
* @param CategoryRepositoryInterface $categoryRepository
* @param array $data
@@ -27,7 +27,7 @@ class Search extends \Magento\Catalog\Model\Layer
StateFactory $layerStateFactory,
Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
Resource\Product $catalogProduct,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $registry,
CategoryRepositoryInterface $categoryRepository,
array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php b/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
index 630b4179b45acf62e9451da2cee29197e2357d80..986d4bf3ae8e8d078b1b5bb8bf7e4e47e7d2c472 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
@@ -9,7 +9,7 @@ use Magento\Catalog\Model\Config;
use Magento\Catalog\Model\Layer\CollectionFilterInterface;
use Magento\Catalog\Model\Product\Visibility;
use Magento\Framework\DB\Select;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
class CollectionFilter implements CollectionFilterInterface
{
@@ -19,7 +19,7 @@ class CollectionFilter implements CollectionFilterInterface
protected $catalogConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var StoreManagerInterface
*/
protected $storeManager;
@@ -30,7 +30,7 @@ class CollectionFilter implements CollectionFilterInterface
/**
* @param Config $catalogConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param Visibility $productVisibility
*/
public function __construct(
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php b/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
index 1918ab29b016f23a5f2400088b23a502862214d0..45093a58a281860d42c2c656ec19eed2fb9e6878 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
@@ -10,12 +10,12 @@ class FilterableAttributeList extends \Magento\Catalog\Model\Layer\Category\Filt
{
/**
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
*/
public function __construct(
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver
) {
parent::__construct($collectionFactory, $storeManager, $layerResolver);
diff --git a/app/code/Magento/Catalog/Model/Observer.php b/app/code/Magento/Catalog/Model/Observer.php
index ea38137a24a35491a7c48aebee5d29d3b47226ca..dac92e427e266bdd07f63eb1e3ce3c5edf18c7dc 100644
--- a/app/code/Magento/Catalog/Model/Observer.php
+++ b/app/code/Magento/Catalog/Model/Observer.php
@@ -36,7 +36,7 @@ class Observer
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -64,7 +64,7 @@ class Observer
/**
* @param \Magento\Catalog\Model\Resource\Category $categoryResource
* @param \Magento\Catalog\Model\Resource\Product $catalogProduct
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
* @param \Magento\Catalog\Helper\Category $catalogCategory
* @param \Magento\Catalog\Helper\Data $catalogData
@@ -74,7 +74,7 @@ class Observer
public function __construct(
\Magento\Catalog\Model\Resource\Category $categoryResource,
\Magento\Catalog\Model\Resource\Product $catalogProduct,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver,
\Magento\Catalog\Helper\Category $catalogCategory,
\Magento\Catalog\Helper\Data $catalogData,
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index 5dd893011abe4d26d37a0a4c220cf1ce5dd22300..0cfa67a717a5ec003f97b6c6908e8cf045e8d418 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -243,7 +243,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
* @param \Magento\Framework\Registry $registry
* @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $metadataService
* @param AttributeValueFactory $customAttributeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Product\Url $url
* @param Product\Link $productLink
* @param Product\Configuration\Item\OptionFactory $itemOptionFactory
@@ -274,7 +274,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
\Magento\Framework\Registry $registry,
\Magento\Catalog\Api\ProductAttributeRepositoryInterface $metadataService,
AttributeValueFactory $customAttributeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
Product\Url $url,
Product\Link $productLink,
\Magento\Catalog\Model\Product\Configuration\Item\OptionFactory $itemOptionFactory,
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
index be7e03bd46b32a5a314aff8a066443d45e46902b..82377067645a4f59a945dac539d6dc6470fdab1e 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
@@ -21,7 +21,7 @@ class GroupPrice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupP
/**
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -30,7 +30,7 @@ class GroupPrice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupP
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Catalog\Model\Product\Type $catalogProductType,
@@ -61,7 +61,7 @@ class GroupPrice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupP
/**
* Error message when duplicates
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _getDuplicateErrorMessage()
{
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index 43cb781a090524b12682a1aba40260bc761c0057..c743b671c4bdb9dc91e0113d3774ce04ec0a7822 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -45,7 +45,7 @@ abstract class AbstractGroupPrice extends Price
/**
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -53,7 +53,7 @@ abstract class AbstractGroupPrice extends Price
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Catalog\Model\Product\Type $catalogProductType,
@@ -135,7 +135,7 @@ abstract class AbstractGroupPrice extends Price
*
* @param \Magento\Catalog\Model\Product $object
* @throws \Magento\Framework\Model\Exception
- * @return bool
+ * @return \Magento\Framework\Phrase|bool
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
index 5fdb39d5408fa33e8846074dd06773364018734c..79b2b1b752ad9a6cd367e5eeba0df8e06cea13f5 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
@@ -22,7 +22,7 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -44,13 +44,13 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
* Construct
*
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index 6a83277a6157ad187ecd0bdf44a3d59cecbfee8f..7142957657abc51daf63152ba8210cfecfc9cc92 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -22,7 +22,7 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
/**
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -31,7 +31,7 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Catalog\Model\Product\Type $catalogProductType,
@@ -75,7 +75,7 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
/**
* Error message when duplicates
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _getDuplicateErrorMessage()
{
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
index 01cf0954608684030073ec0ea9fe82578b8e3f65..389500c6108a21c56ce2887c543684a66184930f 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
@@ -16,16 +16,16 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFronten
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* Construct
*
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
index 2a5f2607b0170de4d1f6e0ea50856a6562b916cb..11d9864f39bb050989f56367a73ac1befce8dcd3 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
@@ -21,7 +21,7 @@ class Countryofmanufacture extends \Magento\Eav\Model\Entity\Attribute\Source\Ab
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -36,12 +36,12 @@ class Countryofmanufacture extends \Magento\Eav\Model\Entity\Attribute\Source\Ab
* Construct
*
* @param \Magento\Directory\Model\CountryFactory $countryFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Cache\Type\Config $configCacheType
*/
public function __construct(
\Magento\Directory\Model\CountryFactory $countryFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Cache\Type\Config $configCacheType
) {
$this->_countryFactory = $countryFactory;
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
index 26c76db08df0c2a79fca60c8f04bfb353e27f1d0..ed84205fd51689334fbab7c08dafe62bdc50d765 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
@@ -13,14 +13,14 @@ namespace Magento\Catalog\Model\Product\Attribute\Source;
class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
{
/**
- * @var \Magento\Core\Model\PageLayout\Config\Builder
+ * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
*/
protected $pageLayoutBuilder;
/**
- * @param \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder
+ * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
*/
- public function __construct(\Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder)
+ public function __construct(\Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder)
{
$this->pageLayoutBuilder = $pageLayoutBuilder;
}
diff --git a/app/code/Magento/Catalog/Model/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
index 21565cb0061492531458e71474965543f49a6299..b488f1d02e0bdba0c9530c720e48737e1d1c6775 100644
--- a/app/code/Magento/Catalog/Model/Product/Compare/Item.php
+++ b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
@@ -65,14 +65,14 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Catalog\Helper\Product\Compare $catalogProductCompare
@@ -83,7 +83,7 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Visitor $customerVisitor,
\Magento\Customer\Model\Session $customerSession,
\Magento\Catalog\Helper\Product\Compare $catalogProductCompare,
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index 7e38fc5705e38eddda290c7b505489bee9069ce5..bedbdec0d88602a8f4952b918d718ba7b7dab307 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -33,7 +33,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
];
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -73,7 +73,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
protected $attributeRepository;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
* @param MediaConfig $mediaConfig
@@ -84,7 +84,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
* @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media $mediaGallery
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository,
MediaConfig $mediaConfig,
diff --git a/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php b/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
index 7c270cfc54dc6fd60e13d98623aa1e3e5503a1d0..3c562be9fa177bff1f9defbf95d5f38dfcea14d6 100644
--- a/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
@@ -39,13 +39,13 @@ class GroupPriceManagement implements \Magento\Catalog\Api\ProductGroupPriceMana
protected $config;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
/**
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Api\Data\ProductGroupPriceDataBuilder $groupPriceBuilder
* @param GroupRepositoryInterface $groupRepository
* @param PriceModifier $priceModifier
@@ -57,7 +57,7 @@ class GroupPriceManagement implements \Magento\Catalog\Api\ProductGroupPriceMana
GroupRepositoryInterface $groupRepository,
\Magento\Catalog\Model\Product\PriceModifier $priceModifier,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->productRepository = $productRepository;
$this->groupPriceBuilder = $groupPriceBuilder;
@@ -81,7 +81,7 @@ class GroupPriceManagement implements \Magento\Catalog\Api\ProductGroupPriceMana
$product = $this->productRepository->get($productSku, true);
$groupPrices = $product->getData('group_price');
$websiteIdentifier = 0;
- $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
if ($value != 0) {
$websiteIdentifier = $this->storeManager->getWebsite()->getId();
}
@@ -126,7 +126,7 @@ class GroupPriceManagement implements \Magento\Catalog\Api\ProductGroupPriceMana
{
$product = $this->productRepository->get($productSku, true);
$websiteIdentifier = 0;
- $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
if ($value != 0) {
$websiteIdentifier = $this->storeManager->getWebsite()->getId();
}
@@ -141,7 +141,7 @@ class GroupPriceManagement implements \Magento\Catalog\Api\ProductGroupPriceMana
{
$product = $this->productRepository->get($productSku, true);
$priceKey = 'website_price';
- $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
if ($value == 0) {
$priceKey = 'price';
}
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index fd4a81f6218f2621ad54a3eb8b3c56cad5954043..eede4fe531f7479b5bb878cea5d4bfd1ee4a54e3 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -163,14 +163,14 @@ class Image extends \Magento\Framework\Model\AbstractModel
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig
* @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
* @param \Magento\Framework\Filesystem $filesystem
@@ -187,7 +187,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig,
\Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
\Magento\Framework\Filesystem $filesystem,
@@ -471,7 +471,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
// check if placeholder defined in config
$isConfigPlaceholder = $this->_scopeConfig->getValue(
"catalog/placeholder/{$this->getDestinationSubdir()}_placeholder",
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$configPlaceholder = '/placeholder/' . $isConfigPlaceholder;
if (!empty($isConfigPlaceholder) && $this->_fileExists($baseDir . $configPlaceholder)) {
diff --git a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
index 35d07d3cf0d36c2a0b7dff9eb8f5691c73096785..3babcdc846db67b6416995b46e8f84692d4e9481 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
@@ -6,7 +6,7 @@
namespace Magento\Catalog\Model\Product\Media;
use Magento\Catalog\Api\ProductMediaAttributeManagementInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Catalog\Model\Product;
class AttributeManagement implements ProductMediaAttributeManagementInterface
@@ -17,7 +17,7 @@ class AttributeManagement implements ProductMediaAttributeManagementInterface
private $collectionFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
private $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Product/Media/Config.php b/app/code/Magento/Catalog/Model/Product/Media/Config.php
index b1ebf440a003dedb1bdb5bbec0f16112b85c12b7..55b22c509a9450c8296e4851d5797c1b64cf803b 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/Config.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/Config.php
@@ -18,14 +18,14 @@ class Config implements ConfigInterface
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->storeManager = $storeManager;
}
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index 6271c735c6b66c92e187b1d7e6977c28f0a57c79..b573c37ee059e5bed70f7b232686dbfcdc5fe891 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -190,7 +190,7 @@ class DefaultType extends \Magento\Framework\Object
*/
public function getConfigData($key)
{
- return $this->_scopeConfig->getValue('catalog/custom_options/' . $key, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue('catalog/custom_options/' . $key, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
index 55710d57ac5de84967694ef79c6f916983c4f890..d4cf7b3463d9648a0d9638c3a2daed12469cbc71 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
@@ -52,7 +52,7 @@ abstract class Validator
{
return $this->scopeConfig->getValue(
'catalog/custom_options/' . $key,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
index a62e5eec4865ce7246d1cf08a55d4e50c116668e..f6f81d4173c1d856602d43e1bf8b6647f30254d8 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -118,7 +118,7 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
/**
* Return currently unavailable product configuration message
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _getWrongConfigurationMessage()
{
diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
index f40ae21baed3ea6e2ef01027d7dbcf124a4f1f48..4d40710150da39a9a7d5099b583783823660a020 100644
--- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
@@ -29,7 +29,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
protected $priceBuilder;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -56,7 +56,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
/**
* @param ProductRepositoryInterface $productRepository
* @param \Magento\Catalog\Api\Data\ProductTierPriceDataBuilder $priceBuilder
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param PriceModifier $priceModifier
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param GroupManagementInterface $groupManagement
@@ -65,7 +65,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
public function __construct(
ProductRepositoryInterface $productRepository,
\Magento\Catalog\Api\Data\ProductTierPriceDataBuilder $priceBuilder,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\PriceModifier $priceModifier,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
GroupManagementInterface $groupManagement,
@@ -93,7 +93,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
$product = $this->productRepository->get($productSku, ['edit_mode' => true]);
$tierPrices = $product->getData('tier_price');
$websiteIdentifier = 0;
- $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
if ($value != 0) {
$websiteIdentifier = $this->storeManager->getWebsite()->getId();
}
@@ -149,7 +149,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
{
$product = $this->productRepository->get($productSku, ['edit_mode' => true]);
$websiteIdentifier = 0;
- $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
if ($value != 0) {
$websiteIdentifier = $this->storeManager->getWebsite()->getId();
}
@@ -165,7 +165,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
$product = $this->productRepository->get($productSku, ['edit_mode' => true]);
$priceKey = 'website_price';
- $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+ $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
if ($value == 0) {
$priceKey = 'price';
}
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index a3e7fcfc6c642ff13558e1a6d73d73627f88aa02..2ec3557b2a79f64943e390cf12852c064db97d03 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -552,7 +552,7 @@ abstract class AbstractType
/**
* Retrieve message for specify option(s)
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getSpecifyOptionMessage()
{
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index 0050da069e01b13ceb74be83076a747f300b3db5..da34894119078e6845de7f87da16a45b40bd7741 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -48,7 +48,7 @@ class Price
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -71,7 +71,7 @@ class Price
/**
* @param \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -80,7 +80,7 @@ class Price
*/
public function __construct(
\Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Catalog/Model/Product/Url.php b/app/code/Magento/Catalog/Model/Product/Url.php
index e4fb8ac7baa07244f86be86d5ac77fcbd0cb1e8b..819232c0725978042acbfc97257a5708a49f81cd 100644
--- a/app/code/Magento/Catalog/Model/Product/Url.php
+++ b/app/code/Magento/Catalog/Model/Product/Url.php
@@ -38,7 +38,7 @@ class Url extends \Magento\Framework\Object
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -55,7 +55,7 @@ class Url extends \Magento\Framework\Object
/**
* @param \Magento\Framework\UrlInterface $url
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Category $catalogCategory
* @param \Magento\Framework\Filter\FilterManager $filter
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -65,7 +65,7 @@ class Url extends \Magento\Framework\Object
*/
public function __construct(
\Magento\Framework\UrlInterface $url,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Category $catalogCategory,
\Magento\Framework\Filter\FilterManager $filter,
\Magento\Framework\Session\SidResolverInterface $sidResolver,
diff --git a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
index adfda93a7c98e1764db339109ab60ea53eb726f2..a27766bd86276520c5228944dc1e8e2447ea9722 100644
--- a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
@@ -26,7 +26,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -46,7 +46,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Factory $modelFactory
* @param array $data
*/
@@ -57,7 +57,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
\Magento\Framework\Locale\FormatInterface $localeFormat,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Factory $modelFactory,
$data = []
) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Attribute.php b/app/code/Magento/Catalog/Model/Resource/Attribute.php
index 21813424a1193ac247a40cc933ca557f0f690534..26ca2463c968dfa6a9d3e3051ac012fc37786a7e 100644
--- a/app/code/Magento/Catalog/Model/Resource/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Resource/Attribute.php
@@ -28,14 +28,14 @@ class Attribute extends \Magento\Eav\Model\Resource\Entity\Attribute
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Entity\Type $eavEntityType
* @param \Magento\Eav\Model\Config $eavConfig
* @param LockValidatorInterface $lockValidator
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Resource\Entity\Type $eavEntityType,
\Magento\Eav\Model\Config $eavConfig,
LockValidatorInterface $lockValidator
diff --git a/app/code/Magento/Catalog/Model/Resource/Category.php b/app/code/Magento/Catalog/Model/Resource/Category.php
index 19eb4ee65f49c5620dedc50851aa1069ebe1c28e..02a2c6d82a4d662dd5e253716dbc33b6f7b2dbfc 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category.php
@@ -74,7 +74,7 @@ class Category extends AbstractResource
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Factory $modelFactory
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Resource\Category\TreeFactory $categoryTreeFactory
@@ -90,7 +90,7 @@ class Category extends AbstractResource
\Magento\Framework\Locale\FormatInterface $localeFormat,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Factory $modelFactory,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Resource\Category\TreeFactory $categoryTreeFactory,
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php
index c4d1e5e602c4b8d6a9100b25eb91868fcfc0a21c..61b59b70d9d5699c279321b291fdf12fd14e76ba 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php
@@ -17,16 +17,16 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFronten
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* Construct
*
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
index 95227879e5cbbde9a3b39244b49b29883cd00cea..e18f88ff4d18ad408c7660321165419f25d3ddc9 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
@@ -59,7 +59,7 @@ class Flat extends \Magento\Indexer\Model\Resource\AbstractResource
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -81,7 +81,7 @@ class Flat extends \Magento\Indexer\Model\Resource\AbstractResource
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
* @param \Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Config $catalogConfig
* @param \Magento\Framework\Event\ManagerInterface $eventManager
*/
@@ -89,7 +89,7 @@ class Flat extends \Magento\Indexer\Model\Resource\AbstractResource
\Magento\Framework\App\Resource $resource,
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
\Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Config $catalogConfig,
\Magento\Framework\Event\ManagerInterface $eventManager
) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php b/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
index adb32fd357681cb4394d7cc738a07e7ef4ef2e24..b40b88289c25168009f683e7632b0ba9fca0ad66 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
@@ -11,7 +11,7 @@ use Magento\Framework\Event\ManagerInterface;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\Model\Resource\Db\AbstractDb;
use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Catalog category flat collection
@@ -37,7 +37,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -53,7 +53,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param Logger $logger
* @param FetchStrategyInterface $fetchStrategy
* @param ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Zend_Db_Adapter_Abstract $connection
* @param AbstractDb $resource
*/
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
index bf196c00952a81724b419ded01fb13f911766e3b..bbd46711f99c340cfe661a48c372c837f96266cd 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
@@ -69,7 +69,7 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -92,7 +92,7 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
*
* @param \Magento\Catalog\Model\Resource\Category $catalogCategory
* @param \Magento\Framework\App\CacheInterface $cache
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
@@ -101,7 +101,7 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
public function __construct(
\Magento\Catalog\Model\Resource\Category $catalogCategory,
\Magento\Framework\App\CacheInterface $cache,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Attribute\Config $attributeConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
index de2727ae8b93f93ed61726504cc1d26c695bb61b..80e088ff3af0fa967a00b72889789bcf88f78934 100644
--- a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
@@ -23,7 +23,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -37,7 +37,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Zend_Db_Adapter_Abstract $connection
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -52,7 +52,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$connection = null
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Resource/Config.php b/app/code/Magento/Catalog/Model/Resource/Config.php
index 1a650c5c7f09b24f87b4d1acd2de74affa51d36a..d4abad7a0ed0cfaffce7e5b38a643a35f63b9d9c 100644
--- a/app/code/Magento/Catalog/Model/Resource/Config.php
+++ b/app/code/Magento/Catalog/Model/Resource/Config.php
@@ -36,18 +36,18 @@ class Config extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
index 286750824f7ca7cd391a72a6e29d67872fb62120..bbe11009e88cc39b77c2c2e3fd11fcbd82d1368e 100644
--- a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
@@ -103,7 +103,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -127,7 +127,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
\Magento\Core\Helper\Data $coreData,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php
index fdcc55de263ddcb59b50b223fca9452b1256e529..7dfcf7810f121ed40636473427a03eef7c1b5daf 100644
--- a/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php
@@ -33,7 +33,7 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb
private $session;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
private $storeManager;
@@ -42,14 +42,14 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
* @param \Magento\Customer\Model\Session $session
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver,
\Magento\Customer\Model\Session $session,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->layer = $layerResolver->get();
$this->session = $session;
diff --git a/app/code/Magento/Catalog/Model/Resource/Product.php b/app/code/Magento/Catalog/Model/Resource/Product.php
index abfa6e7998c717d049fa76ca5c0c720621bd3e67..814f9e6ec81e9c7607fe2057d0f3f9b0d3dc598b 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product.php
@@ -63,7 +63,7 @@ class Product extends AbstractResource
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Factory $modelFactory
* @param Category\CollectionFactory $categoryCollectionFactory
* @param Category $catalogCategory
@@ -81,7 +81,7 @@ class Product extends AbstractResource
\Magento\Framework\Locale\FormatInterface $localeFormat,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Factory $modelFactory,
\Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory,
Category $catalogCategory,
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
index a5ef49306bc7da7f309feab52a38d615b7e5c1e4..1d4a1ee8a13ab50237693ee7cfc9dff70bbc3492 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
@@ -265,7 +265,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -289,7 +289,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -1244,7 +1244,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
$this->_addUrlRewrite = true;
$useCategoryUrl = $this->_scopeConfig->getValue(
\Magento\Catalog\Helper\Product::XML_PATH_PRODUCT_URL_USE_CATEGORY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStoreId()
);
if ($useCategoryUrl) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
index d64d6cc2d5bb576249c231d838084acc4d6faa48..e4e28b738b52ea1fb701c0ba560d8b7d9d6b9121 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
@@ -59,7 +59,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -85,7 +85,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Flat.php b/app/code/Magento/Catalog/Model/Resource/Product/Flat.php
index ecdac4c6c4ee8e5f78a446703e85c139fbd1ce90..711a988b91a945053c393ee479107894caa1893c 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Flat.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Flat.php
@@ -31,18 +31,18 @@ class Flat extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Config $catalogConfig
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Config $catalogConfig
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option.php b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
index 1e3882df9ae61e9c2107e70256f2e4dd47c46150..0150acf9b0e767b2f8ea551e8588538170290669 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
@@ -15,7 +15,7 @@ class Option extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -38,13 +38,13 @@ class Option extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
$this->_currencyFactory = $currencyFactory;
@@ -153,7 +153,7 @@ class Option extends \Magento\Framework\Model\Resource\Db\AbstractDb
$scope = (int)$this->_config->getValue(
\Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if ($object->getStoreId() != '0' && $scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
index 851bfa2bd096ef201624853688522d9f00bfba77..d819d3a0da8c407acbb95f809fc8dc8403d4b00c 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
@@ -15,7 +15,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -32,7 +32,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Catalog\Model\Resource\Product\Option\Value\CollectionFactory $optionValueCollectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Zend_Db_Adapter_Abstract $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -42,7 +42,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Catalog\Model\Resource\Product\Option\Value\CollectionFactory $optionValueCollectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
index 89a1dba13bc49435b5ab9432f0f2bf1798ff7a24..89ecd99e7b368f5b467f9b3ad4a802ba2097449a 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
@@ -15,7 +15,7 @@ class Value extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -38,13 +38,13 @@ class Value extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
$this->_currencyFactory = $currencyFactory;
@@ -130,7 +130,7 @@ class Value extends \Magento\Framework\Model\Resource\Db\AbstractDb
$scope = (int)$this->_config->getValue(
\Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if ($scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Website.php b/app/code/Magento/Catalog/Model/Resource/Product/Website.php
index f73573e2e5074197cc4a863822e92e4f0053cfcf..25c5a807fe8928a3f236e1e951b9448d64bab4ad 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Website.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Website.php
@@ -13,17 +13,17 @@ class Website extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_storeManager = $storeManager;
parent::__construct($resource);
diff --git a/app/code/Magento/Catalog/Model/Resource/Url.php b/app/code/Magento/Catalog/Model/Resource/Url.php
index 8bbcdb9f5adb238a2378e1f010dcf0ad7e06328c..b41e752056677d3461ae5f2778555779fd9faebf 100644
--- a/app/code/Magento/Catalog/Model/Resource/Url.php
+++ b/app/code/Magento/Catalog/Model/Resource/Url.php
@@ -78,7 +78,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -89,7 +89,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
* @param Product $productResource
* @param \Magento\Catalog\Model\Category $catalogCategory
@@ -97,7 +97,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig,
Product $productResource,
\Magento\Catalog\Model\Category $catalogCategory,
diff --git a/app/code/Magento/Catalog/Model/Rss/Product/Special.php b/app/code/Magento/Catalog/Model/Rss/Product/Special.php
index 488c04a652f1872d8008917c07df0a71fddf8044..9bcf78cea24bf9e3fe41def9ae7b71a716628d2e 100644
--- a/app/code/Magento/Catalog/Model/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Model/Rss/Product/Special.php
@@ -17,17 +17,17 @@ class Special
protected $productFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
/**
* @param \Magento\Catalog\Model\ProductFactory $productFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Catalog\Model\ProductFactory $productFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->productFactory = $productFactory;
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
index 5872ea852a0e70efda99b8af2c59b002da574596..c9054ef4160d0d8d2f7f0f91af0982ccf6e2fa19 100644
--- a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
+++ b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
@@ -14,7 +14,7 @@ use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
use Magento\Framework\App\Resource;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\UrlRewrite\Model\Storage\DbStorage;
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
@@ -26,7 +26,7 @@ class Suffix extends \Magento\Framework\App\Config\Value
/** @var \Magento\UrlRewrite\Helper\UrlRewrite */
protected $urlRewriteHelper;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $storeManager;
/** @var \Magento\UrlRewrite\Model\UrlFinderInterface */
@@ -42,7 +42,7 @@ class Suffix extends \Magento\Framework\App\Config\Value
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param \Magento\UrlRewrite\Helper\UrlRewrite $urlRewriteHelper
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Resource $appResource
* @param \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder
* @param array $data
@@ -53,7 +53,7 @@ class Suffix extends \Magento\Framework\App\Config\Value
\Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\UrlRewrite\Helper\UrlRewrite $urlRewriteHelper,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Resource $appResource,
\Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index f8912a3edfe9d96e8b6b2aec73f51d5131cbff9c..93376946e09d1c98bbae3268581904817b4903ad 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -38,19 +38,19 @@ class Filter extends \Magento\Framework\Filter\Template
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Stdlib\String $string
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param array $variables
*/
public function __construct(
\Magento\Framework\Stdlib\String $string,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\Asset\Repository $assetRepo,
$variables = []
) {
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index dcb19669c33e268712972e4edc9b28af1ef4dca3..fd8ff58b30e091e9477d7dc86572489a2e8ced81 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -3,36 +3,36 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-cms": "0.42.0-beta6",
- "magento/module-indexer": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-log": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-widget": "0.42.0-beta6",
- "magento/module-wishlist": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-msrp": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-catalog-rule": "0.42.0-beta6",
- "magento/module-product-alert": "0.42.0-beta6",
- "magento/module-url-rewrite": "0.42.0-beta6",
- "magento/module-catalog-url-rewrite": "0.42.0-beta6",
- "magento/module-page-cache": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/module-indexer": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-log": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-widget": "0.42.0-beta7",
+ "magento/module-wishlist": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-msrp": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-catalog-rule": "0.42.0-beta7",
+ "magento/module-product-alert": "0.42.0-beta7",
+ "magento/module-url-rewrite": "0.42.0-beta7",
+ "magento/module-catalog-url-rewrite": "0.42.0-beta7",
+ "magento/module-page-cache": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"suggest": {
- "magento/module-cookie": "0.42.0-beta6"
+ "magento/module-cookie": "0.42.0-beta7"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Catalog/etc/acl.xml b/app/code/Magento/Catalog/etc/acl.xml
index 0b2c33c4242a0929a5cce92fd6162bb178d20b13..f43fc32b97bb6a2efddee88babf7ccce8eaafbda 100644
--- a/app/code/Magento/Catalog/etc/acl.xml
+++ b/app/code/Magento/Catalog/etc/acl.xml
@@ -8,20 +8,20 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_Catalog::catalog" title="Products" sortOrder="30">
<resource id="Magento_Catalog::catalog_inventory" title="Inventory" sortOrder="10">
<resource id="Magento_Catalog::products" title="Catalog" sortOrder="10" />
<resource id="Magento_Catalog::categories" title="Categories" sortOrder="20" />
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Catalog::config_catalog" title="Catalog Section" />
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores_attributes">
+ <resource id="Magento_Backend::stores_attributes">
<resource id="Magento_Catalog::attributes_attributes" title="Product" sortOrder="30" />
<resource id="Magento_Catalog::update_attributes" title="Update Attributes" sortOrder="35" />
<resource id="Magento_Catalog::sets" title="Product Template" sortOrder="40"/>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/routes.xml b/app/code/Magento/Catalog/etc/adminhtml/routes.xml
index 39679652290e42502acec95f385ded156858e728..0c690d80e4ce183c1b8c0cd49568301a17888fea 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="catalog" frontName="catalog">
- <module name="Magento_Catalog" before="Magento_Adminhtml" />
+ <module name="Magento_Catalog" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
index f0672909765cef928d8eff979b2b46f5b2f98002..e886fedc4d52ef834f50186507cef30788d45648 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
@@ -10,7 +10,7 @@
<div class="attribute-set">
<div class="edit-attribute-set attribute-set-col">
<?php echo $block->getSetFormHtml() ?>
- <script type="text/javascript">
+ <script>
require([
"jquery",
"mage/mage"
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
index 6f4474c450a629dc334f3a049e34af2ef03e7172..71a7919aed364f2c35f6f23041d8df2bc08305ba 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
@@ -23,7 +23,7 @@
<?php echo $block->getDateHtml() ?>
<?php if (!$block->useCalendar()): ?>
- <script type="text/javascript">
+ <script>
require([
"prototype",
"Magento_Catalog/catalog/product/composite/configure"
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
index 15282c3b3857d6ff3b8f46d429d522d088db5b26..5f4c0189358dd89140372f5fc52b2dcf36bda0ed 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
@@ -69,7 +69,7 @@ toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_con
<input type="checkbox" id="inventory_use_config_min_qty" name="<?php echo $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php echo $_readonly;?>>
<label for="inventory_use_config_min_qty"><?php echo __('Use Config Settings') ?></label>
<?php if (!$block->isReadonly()): ?>
- <script type="text/javascript">
+ <script>
require(["prototype"], function(){
toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_min_qty').parentNode);
});
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index e97ee609b72ba46e3e5bec348ea1a595b445f764..58aa1666678f9ada70bf0a6f23c786aad747f81d 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -210,7 +210,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Eav\Model\Config $config
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Catalog\Model\Resource\Product\Collection $collection
* @param \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig
@@ -229,7 +229,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Eav\Model\Config $config,
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Psr\Log\LoggerInterface $logger,
\Magento\Catalog\Model\Resource\Product\Collection $collection,
\Magento\ImportExport\Model\Export\ConfigInterface $exportConfig,
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index c4bbe716a94501dd37beb5150a4dfdeda413129c..979a5ede17cf5283885587749ff3ab112d46069f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -276,7 +276,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
protected $_resource;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -304,7 +304,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
* @param \Magento\ImportExport\Model\Resource\Import\Data $importData
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
- * @param \Magento\Framework\Store\StoreManagerInterface $_storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $_storeManager
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\Catalog\Model\Resource\Product\Option\CollectionFactory $optionColFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $colIteratorFactory
@@ -319,7 +319,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
\Magento\ImportExport\Model\Resource\Import\Data $importData,
\Magento\Framework\App\Resource $resource,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
- \Magento\Framework\Store\StoreManagerInterface $_storeManager,
+ \Magento\Store\Model\StoreManagerInterface $_storeManager,
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\Catalog\Model\Resource\Product\Option\CollectionFactory $optionColFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $colIteratorFactory,
@@ -484,7 +484,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
} else {
$this->_pageSize = self::XML_PATH_PAGE_SIZE ? (int)$this->_scopeConfig->getValue(
self::XML_PATH_PAGE_SIZE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) : 0;
}
return $this;
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
index e720730c386bc7aff48dcee7173e56058276f2d4..af478e82e4c3f9786d8ea72fcded969a083bd76d 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
@@ -8,7 +8,7 @@ namespace Magento\CatalogImportExport\Model\Import\Product;
class StoreResolver
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -40,9 +40,9 @@ class StoreResolver
protected $storeIdToWebsiteStoreIds = [];
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->storeManager = $storeManager;
}
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index 613d231cb5a26b75964e20794fc6fc32131c507a..d123e6c39ad4b6a7904d53fae8d3015164db8fc7 100644
--- a/app/code/Magento/CatalogImportExport/composer.json
+++ b/app/code/Magento/CatalogImportExport/composer.json
@@ -3,20 +3,20 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-import-export": "0.42.0-beta6",
- "magento/module-indexer": "0.42.0-beta6",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-import-export": "0.42.0-beta7",
+ "magento/module-indexer": "0.42.0-beta7",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"ext-ctype": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
index 699139cb7e9d24dc30b1ef836b1a6ae3bf344b71..93224e80fe3efdf07c602ec02d57bd36274b3db6 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
@@ -105,7 +105,7 @@ abstract class AbstractStockqty extends \Magento\Framework\View\Element\Template
if (!$this->hasData('threshold_qty')) {
$qty = (float)$this->_scopeConfig->getValue(
self::XML_PATH_STOCK_THRESHOLD_QTY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->setData('threshold_qty', $qty);
}
diff --git a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
index dba9ec3ae9a91a9b3b04392e920a1fa499273299..a68ab1576e1bdccd5e9cca3483443e81cafbfa15 100644
--- a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
+++ b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
@@ -175,7 +175,7 @@ class Minsaleqty
{
$value = $this->scopeConfig->getValue(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_MIN_SALE_QTY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
$value = $this->unserializeValue($value);
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
index 2d8efe41d2b75fabb1497a20b9277a12decf1f8a..e8d111dfa1f352ab469f627cc5c86cd6fbbfb1b7 100644
--- a/app/code/Magento/CatalogInventory/Helper/Stock.php
+++ b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogInventory\Helper;
use Magento\CatalogInventory\Api\StockRegistryInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\ObjectManagerInterface;
@@ -46,7 +46,7 @@ class Stock
/**
* @param StockRegistryInterface $stockRegistry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param ScopeConfigInterface $scopeConfig
* @param ObjectManagerInterface $objectManager
*/
@@ -109,7 +109,7 @@ class Stock
{
$manageStock = $this->scopeConfig->getValue(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_MANAGE_STOCK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$cond = [
'{{table}}.use_config_manage_stock = 0 AND {{table}}.manage_stock=1 AND {{table}}.is_in_stock=1',
diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
index 14f613549db800f67aed4c39d37a198beb97e6c2..fe76faa8934a55a6a68915f800849af506442f84 100644
--- a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
@@ -29,7 +29,7 @@ class Item extends \Magento\CatalogInventory\Model\Stock\Item
* @param MetadataServiceInterface $metadataService
* @param AttributeValueFactory $customAttributeFactory
* @param \Magento\Customer\Model\Session $customerSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param StockConfigurationInterface $stockConfiguration
* @param StockRegistryInterface $stockRegistry
* @param StockItemRepositoryInterface $stockItemRepository
@@ -45,7 +45,7 @@ class Item extends \Magento\CatalogInventory\Model\Stock\Item
MetadataServiceInterface $metadataService,
AttributeValueFactory $customAttributeFactory,
\Magento\Customer\Model\Session $customerSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
StockConfigurationInterface $stockConfiguration,
StockRegistryInterface $stockRegistry,
StockItemRepositoryInterface $stockItemRepository,
diff --git a/app/code/Magento/CatalogInventory/Model/Configuration.php b/app/code/Magento/CatalogInventory/Model/Configuration.php
index 3f587e9fbcd0c103519dfbf13a8832bf471dd122..2d4d0189a63c565b9bca8f97fb3b016e328220b6 100644
--- a/app/code/Magento/CatalogInventory/Model/Configuration.php
+++ b/app/code/Magento/CatalogInventory/Model/Configuration.php
@@ -9,7 +9,7 @@ use Magento\CatalogInventory\Api\StockConfigurationInterface;
use Magento\CatalogInventory\Helper\Minsaleqty as MinsaleqtyHelper;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Catalog\Model\ProductTypes\ConfigInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Class Configuration
@@ -129,13 +129,13 @@ class Configuration implements StockConfigurationInterface
* @param ConfigInterface $config
* @param ScopeConfigInterface $scopeConfig
* @param MinsaleqtyHelper $minsaleqtyHelper
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
*/
public function __construct(
ConfigInterface $config,
ScopeConfigInterface $scopeConfig,
MinsaleqtyHelper $minsaleqtyHelper,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ StoreManagerInterface $storeManager
) {
$this->config = $config;
$this->scopeConfig = $scopeConfig;
@@ -196,7 +196,7 @@ class Configuration implements StockConfigurationInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_CAN_SUBTRACT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -209,7 +209,7 @@ class Configuration implements StockConfigurationInterface
{
return (float)$this->scopeConfig->getValue(
self::XML_PATH_MIN_QTY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -232,7 +232,7 @@ class Configuration implements StockConfigurationInterface
{
return (float)$this->scopeConfig->getValue(
self::XML_PATH_MAX_SALE_QTY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -245,7 +245,7 @@ class Configuration implements StockConfigurationInterface
{
return (float) $this->scopeConfig->getValue(
self::XML_PATH_NOTIFY_STOCK_QTY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -261,7 +261,7 @@ class Configuration implements StockConfigurationInterface
{
return (bool) $this->scopeConfig->getValue(
self::XML_PATH_ENABLE_QTY_INCREMENTS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -274,7 +274,7 @@ class Configuration implements StockConfigurationInterface
{
return (float)$this->scopeConfig->getValue(
self::XML_PATH_QTY_INCREMENTS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -289,7 +289,7 @@ class Configuration implements StockConfigurationInterface
{
return (int) $this->scopeConfig->getValue(
self::XML_PATH_BACKORDERS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -304,7 +304,7 @@ class Configuration implements StockConfigurationInterface
{
return (int) $this->scopeConfig->isSetFlag(
self::XML_PATH_MANAGE_STOCK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -320,7 +320,7 @@ class Configuration implements StockConfigurationInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_CAN_BACK_IN_STOCK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -335,7 +335,7 @@ class Configuration implements StockConfigurationInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_SHOW_OUT_OF_STOCK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -350,7 +350,7 @@ class Configuration implements StockConfigurationInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_ITEM_AUTO_RETURN,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -366,7 +366,7 @@ class Configuration implements StockConfigurationInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -380,7 +380,7 @@ class Configuration implements StockConfigurationInterface
{
return $this->scopeConfig->getValue(
self::XML_PATH_ITEM . $field,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
index 18a88e83fb758fcfb935e4abefc180bc5968e8ee..3b16b43106e80a89ab2ee38e42121354e32083a3 100644
--- a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
@@ -61,7 +61,7 @@ class Layer
{
return $this->scopeConfig->isSetFlag(
'cataloginventory/options/show_out_of_stock',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php b/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
index 9699aa3e98b36bc9401ef5059a9633e811bc3a82..6be23ba43302afed63fa6a4b9f5744b811af9602 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
@@ -148,7 +148,7 @@ class DefaultStock extends \Magento\Catalog\Model\Resource\Product\Indexer\Abstr
{
return $this->_scopeConfig->isSetFlag(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_MANAGE_STOCK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock.php
index 25d8f752f5a4230bdb8bd8adbcbb5c32b0c8c2d2..42c162eb4f8ed17843e2f1d03a1f6fc182169240 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock.php
@@ -7,7 +7,7 @@
namespace Magento\CatalogInventory\Model\Resource;
use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Stock resource model
@@ -74,7 +74,7 @@ class Stock extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $dateTime;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var StoreManagerInterface
*/
protected $storeManager;
@@ -181,7 +181,7 @@ class Stock extends \Magento\Framework\Model\Resource\Db\AbstractDb
foreach ($configMap as $field => $const) {
$this->{$field} = (int) $this->_scopeConfig->getValue(
$const,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
index 7754966be9461c56dba75e6d72ed2aaeff3b9b35..a78cd2b52317ebb7f6bc4c8b0394be927e897a18 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
@@ -10,7 +10,7 @@ use Magento\Framework\DB\GenericMapper;
use Magento\Framework\DB\MapperFactory;
use Magento\Framework\DB\Select;
use Magento\Framework\Data\ObjectFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Psr\Log\LoggerInterface as Logger;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
@@ -24,7 +24,7 @@ class StockItemCriteriaMapper extends GenericMapper
* @param Logger $logger
* @param FetchStrategyInterface $fetchStrategy
* @param ObjectFactory $objectFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param MapperFactory $mapperFactory
* @param Select $select
*/
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php
index ff68cf46fb9dc41449039cc886dababdac16d0ba..4b971fecf3131fb9487cc314cac2a64cb9540e4e 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php
@@ -15,7 +15,7 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store model manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -33,13 +33,13 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Store\Model\WebsiteFactory $websiteFactory
* @param \Magento\Eav\Model\Config $eavConfig
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Store\Model\WebsiteFactory $websiteFactory,
\Magento\Eav\Model\Config $eavConfig
) {
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
index e614cb51ba487657a7b8be8d32e42fee5766c5b8..2e28d5fbd60fe221b5a870f4ee9c45869647a395 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -68,7 +68,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
/**
* Store model manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -117,7 +117,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
* @param MetadataServiceInterface $metadataService
* @param AttributeValueFactory $customAttributeFactory
* @param \Magento\Customer\Model\Session $customerSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param StockConfigurationInterface $stockConfiguration
* @param StockRegistryInterface $stockRegistry
* @param StockItemRepositoryInterface $stockItemRepository
@@ -132,7 +132,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
MetadataServiceInterface $metadataService,
AttributeValueFactory $customAttributeFactory,
\Magento\Customer\Model\Session $customerSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
StockConfigurationInterface $stockConfiguration,
StockRegistryInterface $stockRegistry,
StockItemRepositoryInterface $stockItemRepository,
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
index 2051eaa9ce0b8da1858cc4589b7289456ae828f1..0a9f1f04d013281a4d64a76a1f364422e14ee603 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
@@ -15,7 +15,7 @@ use Magento\CatalogInventory\Api\Data\StockStatusInterfaceFactory;
use Magento\CatalogInventory\Api\StockCriteriaInterfaceFactory;
use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Class StockRegistryProvider
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index eeacadc5c7b9e2c5f493bc7a01c4571810ee9581..984c403ca23bb3fc2ef47114e4e22c95e3ad01fb 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -3,18 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-indexer": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-indexer": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogInventory/etc/acl.xml b/app/code/Magento/CatalogInventory/etc/acl.xml
index dd120ed5a0ac2a402cb1a1ec01ba346f607560e3..278e6b650b55b40f5abe43e4c3f981d43bd1d8ec 100644
--- a/app/code/Magento/CatalogInventory/etc/acl.xml
+++ b/app/code/Magento/CatalogInventory/etc/acl.xml
@@ -8,10 +8,10 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_CatalogInventory::cataloginventory" title="Inventory Section" />
</resource>
</resource>
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php
index 0c9a9a9b513e72730674327df64dd0ec5e0e9636..7fa26b258728cddbfa443a0296eba2edd81a9234 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php
@@ -81,7 +81,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Getter for form header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
index b29dffb9b1779b6ad89c5b01d45dba2221a32eb3..a1c7136d74c9faf5a69666f3ee1eb3416ce371be 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
@@ -14,7 +14,7 @@ class Actions extends Generic implements TabInterface
/**
* Prepare content for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -24,7 +24,7 @@ class Actions extends Generic implements TabInterface
/**
* Prepare title for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
index 88dd5e76a532909de7ad89bdd29e4c813acef3f7..b51ba93f76373d6286488210fd884aa96ab68668 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
@@ -45,7 +45,7 @@ class Conditions extends Generic implements TabInterface
/**
* Prepare content for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -55,7 +55,7 @@ class Conditions extends Generic implements TabInterface
/**
* Prepare title for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
index 078549a12bf3ed068f48a4e297dea8c1ab9c9626..4e9f25b954c15d489240337fbd00730d0c5094f9 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
@@ -67,7 +67,7 @@ class Main extends Generic implements TabInterface
/**
* Prepare content for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -77,7 +77,7 @@ class Main extends Generic implements TabInterface
/**
* Prepare title for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index 02afbcf4eb9d9481e79a90537aa8aafbe82c5d44..5812b16b0832d1b03d53041e0442d4dc28076b68 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -25,7 +25,7 @@ class IndexBuilder
protected $resource;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -78,7 +78,7 @@ class IndexBuilder
* @param RuleCollectionFactory $ruleCollectionFactory
* @param PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Framework\Stdlib\DateTime $dateFormat
@@ -91,7 +91,7 @@ class IndexBuilder
RuleCollectionFactory $ruleCollectionFactory,
PriceCurrencyInterface $priceCurrency,
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Psr\Log\LoggerInterface $logger,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Stdlib\DateTime $dateFormat,
diff --git a/app/code/Magento/CatalogRule/Model/Observer.php b/app/code/Magento/CatalogRule/Model/Observer.php
index b0c6ff50c45aa73fa52782a7dfa6a6f57bacea58..887b60b9c8a2e5426eee596422197fb29c027dff 100644
--- a/app/code/Magento/CatalogRule/Model/Observer.php
+++ b/app/code/Magento/CatalogRule/Model/Observer.php
@@ -15,7 +15,7 @@ use Magento\Catalog\Model\Resource\Product\Collection as ProductCollection;
use Magento\CatalogRule\Model\Rule;
use Magento\CatalogRule\Model\Rule\Product\Price;
use Magento\Framework\Registry;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
use Magento\Customer\Api\GroupManagementInterface;
use Magento\Customer\Model\Session as CustomerModelSession;
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule.php b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
index f9e6ee80903b4268c69d6825a988e05ca743a860..330c01f9680b2f1ba912b556e863563ecd0204e3 100644
--- a/app/code/Magento/CatalogRule/Model/Resource/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
@@ -78,7 +78,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
protected $_conditionFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -94,7 +94,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Product\ConditionFactory $conditionFactory
* @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
* @param \Magento\Eav\Model\Config $eavConfig
@@ -107,7 +107,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\ConditionFactory $conditionFactory,
\Magento\Framework\Stdlib\DateTime\DateTime $coreDate,
\Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index 44ba49e140294a531169574074cc3531f2ef93e4..1228ac74d24cb34975ecd832a25d2f714b1af202 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -129,7 +129,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
protected $_productFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -149,7 +149,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
* @param \Magento\Framework\Data\FormFactory $formFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\CatalogRule\Model\Rule\Condition\CombineFactory $combineFactory
* @param \Magento\CatalogRule\Model\Rule\Action\CollectionFactory $actionCollectionFactory
* @param \Magento\Catalog\Model\ProductFactory $productFactory
@@ -170,7 +170,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
\Magento\Framework\Data\FormFactory $formFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\CatalogRule\Model\Rule\Condition\CombineFactory $combineFactory,
\Magento\CatalogRule\Model\Rule\Action\CollectionFactory $actionCollectionFactory,
\Magento\Catalog\Model\ProductFactory $productFactory,
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
index 88f332c64286e2270294ce6a78bc12de4929e5fb..ff9d3085be9cf445833447c778162fa0972e5fce 100644
--- a/app/code/Magento/CatalogRule/composer.json
+++ b/app/code/Magento/CatalogRule/composer.json
@@ -3,19 +3,19 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-rule": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-indexer": "0.42.0-beta6",
- "magento/module-import-export": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-rule": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-indexer": "0.42.0-beta7",
+ "magento/module-import-export": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogRule/etc/acl.xml b/app/code/Magento/CatalogRule/etc/acl.xml
index b8de10ca8bc21f2709ddeb325e2bc085adca9cca..c5216b6f58560ba67841eb803c45a0f8346578ca 100644
--- a/app/code/Magento/CatalogRule/etc/acl.xml
+++ b/app/code/Magento/CatalogRule/etc/acl.xml
@@ -8,8 +8,8 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::marketing">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::marketing">
<resource id="Magento_CatalogRule::promo" title="Promotions" sortOrder="10">
<resource id="Magento_CatalogRule::promo_catalog" title="Catalog Price Rules" sortOrder="10" />
</resource>
diff --git a/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml b/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml
index 550edbd358b9a54ccf92f11b9cc6c92ba204ab61..b085941c0c111f45aaeca2f128da2522169fcf01 100644
--- a/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml
+++ b/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="catalog_rule" frontName="catalog_rule">
- <module name="Magento_CatalogRule" before="Magento_Adminhtml" />
+ <module name="Magento_CatalogRule" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
index f9c63ee9f2744762dc5f4d564e62428009d88c61..948f2db6e5e1366bdae12e03b7a49a8c5f8bccd0 100644
--- a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
@@ -346,7 +346,7 @@ class Form extends Template
)->setValue(
$value
)->setImage(
- $this->getViewFileUrl('Magento_Core::calendar.png')
+ $this->getViewFileUrl('Magento_Theme::calendar.png')
)->setDateFormat(
$this->_localeDate->getDateFormat(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT)
)->setClass(
diff --git a/app/code/Magento/CatalogSearch/Block/Result.php b/app/code/Magento/CatalogSearch/Block/Result.php
index 3d227ea5835f310b58c5db24365a1d7a751a408c..072b76a79733974449ec00b1fd2f5f8f9b1750d5 100644
--- a/app/code/Magento/CatalogSearch/Block/Result.php
+++ b/app/code/Magento/CatalogSearch/Block/Result.php
@@ -184,7 +184,7 @@ class Result extends Template
/**
* Get search query text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getSearchQueryText()
{
@@ -209,7 +209,7 @@ class Result extends Template
/**
* Retrieve No Result or Minimum query length Text
*
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getNoResultText()
{
diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
index 6c98094d8f55f5db3ad3b2a8d7dfc9688ca39eb6..4392814b229bdfea985f98c709ff72e4c458fae7 100644
--- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
@@ -9,7 +9,7 @@ namespace Magento\CatalogSearch\Controller\Result;
use Magento\Catalog\Model\Layer\Resolver;
use Magento\Catalog\Model\Session;
use Magento\Framework\App\Action\Context;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Search\Model\QueryFactory;
class Index extends \Magento\Framework\App\Action\Action
@@ -41,7 +41,7 @@ class Index extends \Magento\Framework\App\Action\Action
/**
* @param Context $context
* @param Session $catalogSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param QueryFactory $queryFactory
* @param Resolver $layerResolver
*/
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
index 30b8477a0bdaebb840f40c0aca9ea00a84395285..341783fa0dcd6b1a71ec600f8edd392e0ccccc6b 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
@@ -15,7 +15,7 @@ use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface as
use Magento\Framework\Search\Dynamic\DataProviderInterface;
use Magento\Framework\Search\Dynamic\IntervalFactory;
use Magento\Framework\Search\Request\BucketInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index a943dd06abab53074b894814415e34c6eb6a90f8..5558d89322e009da115ee81d9a3962c17c0111f9 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -18,7 +18,7 @@ use Magento\Eav\Model\Entity\Attribute as EntityAttribute;
use Magento\Framework\Model\Context;
use Magento\Framework\Model\Exception;
use Magento\Framework\Registry;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Catalog advanced search model
@@ -83,7 +83,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -118,7 +118,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
* @param Config $catalogConfig
* @param CurrencyFactory $currencyFactory
* @param ProductFactory $productFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param ResourceProvider $resourceProvider
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index fab9da1af37c8d53cf2bfdbfaa8397ebb0206b4f..e4f6fea57b08b1ef8befff137a864eca3aa6cebd 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -98,7 +98,7 @@ class Full
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -153,7 +153,7 @@ class Full
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\CatalogSearch\Helper\Data $catalogSearchData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -172,7 +172,7 @@ class Full
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\CatalogSearch\Helper\Data $catalogSearchData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime $dateTime,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -765,12 +765,12 @@ class Full
if (!isset($this->dates[$storeId])) {
$timezone = $this->scopeConfig->getValue(
$this->localeDate->getDefaultTimezonePath(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$locale = $this->scopeConfig->getValue(
$this->localeResolver->getDefaultLocalePath(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$locale = new \Zend_Locale($locale);
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php b/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php
index 3cd2c5a514c59cb78e2b197bbd928774c7d027c5..1603844981af7f4c2dcb3dd55996eaf95c8ccee1 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php
@@ -18,7 +18,7 @@ class Advanced extends \Magento\Catalog\Model\Layer
* @param \Magento\Catalog\Model\Layer\StateFactory $layerStateFactory
* @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
* @param Resource\Product $catalogProduct
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $registry
* @param CategoryRepositoryInterface $categoryRepository
* @param array $data
@@ -28,7 +28,7 @@ class Advanced extends \Magento\Catalog\Model\Layer
\Magento\Catalog\Model\Layer\StateFactory $layerStateFactory,
Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
Resource\Product $catalogProduct,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $registry,
CategoryRepositoryInterface $categoryRepository,
array $data = []
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php
index 7f2b7be73cfcf3949ac770410be9f48dbf2edce2..7acc2cd6a3b2041b7b751fc4f5ad0ad373a1189a 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php
@@ -21,7 +21,7 @@ class CollectionFilter implements CollectionFilterInterface
protected $helper;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -33,14 +33,14 @@ class CollectionFilter implements CollectionFilterInterface
/**
* @param \Magento\Catalog\Model\Config $catalogConfig
* @param \Magento\CatalogSearch\Helper\Data $helper
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\Visibility $productVisibility
* @param \Magento\Framework\Registry $registry
*/
public function __construct(
\Magento\Catalog\Model\Config $catalogConfig,
\Magento\CatalogSearch\Helper\Data $helper,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\Visibility $productVisibility,
\Magento\Framework\Registry $registry
) {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php
index c5277044a26f300d7133069ddbf9645619a7c662..645f8a5901f009343f971f4eec52b4bdc96fc973 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php
@@ -10,12 +10,12 @@ class FilterableAttributeList extends \Magento\Catalog\Model\Layer\Category\Filt
{
/**
* @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
*/
public function __construct(
\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer\Resolver $layerResolver
) {
parent::__construct($collectionFactory, $storeManager, $layerResolver);
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index 33eb26bbafba6e97e1d49c543492df3041f83be6..ec2782eb07c4fd78875636e455c54ab08256366e 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -19,7 +19,7 @@ class Attribute extends AbstractFilter
/**
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Framework\Filter\StripTags $tagFilter
@@ -27,7 +27,7 @@ class Attribute extends AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Framework\Filter\StripTags $tagFilter,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
index 26a7bf5d5092a075c088a9bf6e2a7b26f7cc9c5d..3c29805598700f91cab04a2f909941c2527641fa 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
@@ -25,7 +25,7 @@ class Category extends AbstractFilter
/**
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
@@ -35,7 +35,7 @@ class Category extends AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Framework\Escaper $escaper,
@@ -92,7 +92,7 @@ class Category extends AbstractFilter
/**
* Get filter name
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getName()
{
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
index 087e2c88c003d75dd83fd2f7162a653b5fe2c971..e00a0a138e704a6546b916f65080d5ce10ca2670 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
@@ -24,7 +24,7 @@ class Decimal extends AbstractFilter
/**
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\Resource\Layer\Filter\DecimalFactory $filterDecimalFactory
@@ -33,7 +33,7 @@ class Decimal extends AbstractFilter
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Catalog\Model\Resource\Layer\Filter\DecimalFactory $filterDecimalFactory,
@@ -136,7 +136,7 @@ class Decimal extends AbstractFilter
*
* @param float|string $fromPrice
* @param float|string $toPrice
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function renderRangeLabel($fromPrice, $toPrice)
{
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index 713e3b12e8fb004d05534775fb0f14c790dc8d61..f026a8fc4f4c897ccbbc5f3059f0d06a9df4707e 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -10,6 +10,7 @@ use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
/**
* Layer price filter based on Search API
*
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Price extends AbstractFilter
{
@@ -43,23 +44,22 @@ class Price extends AbstractFilter
/**
* @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Layer $layer
* @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
* @param \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Search\Dynamic\Algorithm $priceAlgorithm
- * @param \Magento\Framework\Registry $coreRegistry
- * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory $algorithmFactory
+ * @param \Magento\Catalog\Model\Layer\Filter\DataProvider\PriceFactory $dataProviderFactory
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(
\Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Layer $layer,
\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
\Magento\Catalog\Model\Resource\Layer\Filter\Price $resource,
@@ -171,7 +171,7 @@ class Price extends AbstractFilter
*
* @param float|string $fromPrice
* @param float|string $toPrice
- * @return string
+ * @return float|\Magento\Framework\Phrase
*/
protected function _renderRangeLabel($fromPrice, $toPrice)
{
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
index 20633d528d21a3e9144fbfc953ab6b0e952f660d..5f38437c05978d5ee5f73d28511c1ff1d1b78b85 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
@@ -17,12 +17,12 @@ class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey implements
protected $queryFactory;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Search\Model\QueryFactory $queryFactory
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Session $customerSession,
\Magento\Search\Model\QueryFactory $queryFactory
) {
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php b/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
index 2227c8bfa7cf2f480a193f0b19721185e61af1e3..2cbb9e51f972ca4665d6e177701054306b6c07a4 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
@@ -22,7 +22,7 @@ class Advanced extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -30,12 +30,12 @@ class Advanced extends \Magento\Framework\Model\Resource\Db\AbstractDb
* Construct
*
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Event\ManagerInterface $eventManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Event\ManagerInterface $eventManager
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
index 8f004d5d809ee012e1cf4254b3ed6514ed5ea43f..e1948554d6cf70577f0c04de355d5cfb3516856c 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
@@ -41,7 +41,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager ,
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -66,7 +66,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php b/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php
index cb6636b0520e772c8c544d935b9848f5657228f0..1d021b322f757222f69b83ab86b2691e8db0bcdc 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php
@@ -9,7 +9,7 @@
*/
namespace Magento\CatalogSearch\Model\Resource;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class EngineProvider
{
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
index 02aa586bcb5da3d3871eda3a1c032c4a0b0b9cf4..aab04055483cfa7429697aa863e2861a5b7beb96 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
@@ -58,7 +58,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -85,7 +85,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -178,7 +178,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
$priceRangeCalculation = $this->_scopeConfig->getValue(
\Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if ($priceRangeCalculation) {
$this->requestBuilder->bind('price_dynamic_algorithm', $priceRangeCalculation);
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php b/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php
index 9389b9f22b0a1b0132d3ad22ffeb348016ea1ca1..c18aa10f02c4349591c4a2c4e0affaa809b24068 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CatalogSearch\Model\Resource;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class ResourceProvider
{
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
index caa53627c4210d3e08a2870261b4ba1f5ee22b5b..e592285ee1278b388f19683a0f203991bb788c70 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
@@ -47,7 +47,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection impl
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -72,7 +72,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection impl
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
index 74c68b4fdae12eb4bdc42b5eab4dd5aa542ed6d6..e47ba631ebfca2072f261e3ccd600f48c66b4702 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
@@ -11,8 +11,8 @@ use Magento\Framework\App\Resource;
use Magento\Framework\DB\Select;
use Magento\Framework\Search\Adapter\Mysql\IndexBuilderInterface;
use Magento\Framework\Search\RequestInterface;
-use Magento\Framework\Store\ScopeInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Build base Query for Index
@@ -30,14 +30,14 @@ class IndexBuilder implements IndexBuilderInterface
private $config;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var StoreManagerInterface
*/
private $storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
* @param ScopeConfigInterface $config
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
*/
public function __construct(Resource $resource, ScopeConfigInterface $config, StoreManagerInterface $storeManager)
{
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 117ae11699ba543f2b4939b27bbeb9cc46854a9c..8a6837646b782021fd10ae557c7eb2ad346fd6c4 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -3,21 +3,20 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-search": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-indexer": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-search": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-indexer": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
index 566fe53bf30fe3acaf62d8eb717bc4ff94805b7b..e4c718050c3ffce84cd873a4adcfd7f01cefd03d 100644
--- a/app/code/Magento/CatalogSearch/etc/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/di.xml
@@ -74,7 +74,7 @@
<argument name="intervals" xsi:type="array">
<item name="Magento\CatalogSearch\Model\Resource\Engine" xsi:type="string">Magento\CatalogSearch\Model\Price\Interval</item>
</argument>
- <argument name="scope" xsi:type="const">\Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scope" xsi:type="const">\Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\Backend\Controller\Adminhtml\Index\GlobalSearch">
diff --git a/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php b/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
index 070fcc526da0507dd31e9b6374e0576c5333e243..5e6cd86f1757ffec13efe2720d69253e861fe589 100644
--- a/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
+++ b/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CatalogUrlRewrite\Block;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* Renderer for URL key input
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php
index 1a6fc23b6d0a14465fddee9b0a99d07344213dc2..cc6941491117bb34b6a6e790e8894747aefaab0a 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php
@@ -11,7 +11,7 @@ use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Event\Observer as EventObserver;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\UrlRewrite\Model\UrlPersistInterface;
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
index aea86ff792c0d89a9b36f96474de044e219a7ae5..9bebcf6b59ea8a5fe0d1be3b7aa9c1bd16a33a32 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
@@ -9,7 +9,7 @@ use Magento\UrlRewrite\Model\UrlPersistInterface;
use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
use Magento\Catalog\Model\CategoryFactory;
use Magento\Catalog\Model\ProductFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
use Magento\Store\Model\Store;
@@ -35,7 +35,7 @@ class Group
/** @var ProductUrlRewriteGenerator */
protected $productUrlRewriteGenerator;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var StoreManagerInterface */
protected $storeManager;
/**
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
index 6eda18ccc18700e01d5f4752b68717023b6d00cf..6e7547e9ce886d153588d177030161eb8b609af7 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
@@ -30,7 +30,7 @@ class CategoryUrlPathGenerator
/** @var \Magento\Framework\App\Config\ScopeConfigInterface */
protected $scopeConfig;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $storeManager;
/**
@@ -39,12 +39,12 @@ class CategoryUrlPathGenerator
protected $categoryRepository;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param CategoryRepositoryInterface $categoryRepository
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
CategoryRepositoryInterface $categoryRepository
) {
@@ -117,7 +117,7 @@ class CategoryUrlPathGenerator
if (!isset($this->categoryUrlSuffix[$storeId])) {
$this->categoryUrlSuffix[$storeId] = $this->scopeConfig->getValue(
self::XML_PATH_CATEGORY_URL_SUFFIX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
index 1c64c8a1a3449025e1b8e7b83decc21d4fd0d2c0..1e6fac93ed6fdb3b16c89fd2b09980300518bbdb 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
@@ -14,7 +14,7 @@ use Magento\UrlRewrite\Model\UrlFinderInterface;
use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
use Magento\UrlRewrite\Service\V1\Data\UrlRewriteBuilder;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
index 6a7a4a6b4bfa95fcfd8e284db930f3dfc9e7973e..bdf70eeb288bd88f8366a008d4a8c8fa6f3f2ada 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
@@ -16,7 +16,7 @@ class ProductUrlPathGenerator
*/
protected $productUrlSuffix = [];
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $storeManager;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface */
@@ -26,12 +26,12 @@ class ProductUrlPathGenerator
protected $categoryUrlPathGenerator;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param CategoryUrlPathGenerator $categoryUrlPathGenerator
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
) {
@@ -111,7 +111,7 @@ class ProductUrlPathGenerator
if (!isset($this->productUrlSuffix[$storeId])) {
$this->productUrlSuffix[$storeId] = $this->scopeConfig->getValue(
self::XML_PATH_PRODUCT_URL_SUFFIX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
index 507febcf075c2617a48b8a4a0e0615cb04714099..a8661bfdc9eaa358ead6ad52b74989d4bf705794 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
@@ -40,7 +40,7 @@ class ProductUrlRewriteGenerator
/** @var \Magento\CatalogUrlRewrite\Model\ObjectRegistry */
protected $productCategories;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $storeManager;
/**
@@ -49,7 +49,7 @@ class ProductUrlRewriteGenerator
* @param \Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator $categoriesUrlRewriteGenerator
* @param \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory $objectRegistryFactory
* @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
CanonicalUrlRewriteGenerator $canonicalUrlRewriteGenerator,
@@ -57,7 +57,7 @@ class ProductUrlRewriteGenerator
CategoriesUrlRewriteGenerator $categoriesUrlRewriteGenerator,
ObjectRegistryFactory $objectRegistryFactory,
StoreViewService $storeViewService,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->canonicalUrlRewriteGenerator = $canonicalUrlRewriteGenerator;
$this->currentUrlRewritesRegenerator = $currentUrlRewritesRegenerator;
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index f834889b4ae6a3cb6b39877f717d25a40ead0999..919208806eaa6cc2c6feb159471b2e6dbb724e8b 100644
--- a/app/code/Magento/CatalogUrlRewrite/composer.json
+++ b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -3,18 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-catalog-import-export": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-import-export": "0.42.0-beta6",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-url-rewrite": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-catalog-import-export": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-import-export": "0.42.0-beta7",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-url-rewrite": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index 588cc9809bc84ae28e18eb7c35d78253b19fc047..19da2e1702c3f1147df2fbc5b9a0c8872887b073 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -28,7 +28,7 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -41,7 +41,7 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
* @param \Magento\Catalog\Model\Resource\Product $productResource
* @param \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection $attrSetCollection
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -54,7 +54,7 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
\Magento\Catalog\Model\Resource\Product $productResource,
\Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection $attrSetCollection,
\Magento\Framework\Locale\FormatInterface $localeFormat,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
array $data = []
) {
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
index 11074174c44737935ba5c071c60b096a3b1cba2d..d41ba92fa1c8190aa4008cedea9c7b2b501f958b 100644
--- a/app/code/Magento/CatalogWidget/composer.json
+++ b/app/code/Magento/CatalogWidget/composer.json
@@ -3,20 +3,20 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-widget": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-rule": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-wishlist": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-widget": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-rule": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-wishlist": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml b/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml
index 708f09d1f0d726eed879ce74dceaf728ad74fd05..870b1cabec0be48ae6c5fccee6dd9bad67c1b36d 100644
--- a/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml
+++ b/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="catalog_widget" frontName="catalog_widget">
- <module name="Magento_CatalogWidget" before="Magento_Adminhtml" />
+ <module name="Magento_CatalogWidget" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Centinel/Block/Adminhtml/Validation.php b/app/code/Magento/Centinel/Block/Adminhtml/Validation.php
index 6c0d66aeb735be79df626dcea1a3600c7cd8cc18..cd3ee0a70796ae6f58c588b62d2db317f122092e 100644
--- a/app/code/Magento/Centinel/Block/Adminhtml/Validation.php
+++ b/app/code/Magento/Centinel/Block/Adminhtml/Validation.php
@@ -25,7 +25,7 @@ class Validation extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCre
/**
* Return text for block`s header
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Centinel/Helper/Data.php b/app/code/Magento/Centinel/Helper/Data.php
index 7d9481b96a6776f85999c5ec092a3f54e83ccbe6..393505eef9eb03eab21d2f8b22d3e343aeec3137 100644
--- a/app/code/Magento/Centinel/Helper/Data.php
+++ b/app/code/Magento/Centinel/Helper/Data.php
@@ -17,7 +17,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* Return label for cmpi field
*
* @param string $fieldName
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getCmpiLabel($fieldName)
{
@@ -64,7 +64,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* Return text value for cmpi eci flag field
*
* @param string $value
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
private function _getCmpiEciValue($value)
{
@@ -85,7 +85,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* Return text value for cmpi enrolled field
*
* @param string $value
- * @return string
+ * @return \Magento\Framework\Phrase
*/
private function _getCmpiEnrolledValue($value)
{
@@ -105,7 +105,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* Return text value for cmpi pares field
*
* @param string $value
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
private function _getCmpiParesValue($value)
{
diff --git a/app/code/Magento/Centinel/Model/Config.php b/app/code/Magento/Centinel/Model/Config.php
index 5bc8147524de4cb3ce06a241165eb40a56f71649..81d187f3ed2ed1abd52e349b4bf9c00fd5ffe19d 100644
--- a/app/code/Magento/Centinel/Model/Config.php
+++ b/app/code/Magento/Centinel/Model/Config.php
@@ -134,7 +134,7 @@ class Config
*/
private function _getServiceConfigValue($key)
{
- return $this->_scopeConfig->getValue($this->_serviceConfigPath . '/' . $key, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $this->getStore());
+ return $this->_scopeConfig->getValue($this->_serviceConfigPath . '/' . $key, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->getStore());
}
/**
diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json
index bef1d7faf6fdb9ec5d8028b20e4e4ba6bcad16cb..8ce38d81b1383c6031ea7aa03b23e60c21af3ce8 100644
--- a/app/code/Magento/Centinel/composer.json
+++ b/app/code/Magento/Centinel/composer.json
@@ -3,15 +3,16 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Centinel/etc/adminhtml/routes.xml b/app/code/Magento/Centinel/etc/adminhtml/routes.xml
index dd23e109265de15ad9bc0322f0984601e3fd26ca..2ff9c2bc4715a7fed5d87b70d7f05edfb9a25c4e 100644
--- a/app/code/Magento/Centinel/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Centinel/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_Centinel" before="Magento_Adminhtml" />
+ <module name="Magento_Centinel" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php b/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php
index 2cad44671ef6acb80e3c9d772fbb24b98f39dc48..38abcd03b81c435a1db979a7c95b4ac186d33122 100644
--- a/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php
+++ b/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php
@@ -53,7 +53,7 @@ class CartTab extends TabWrapper
/**
* Return Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
diff --git a/app/code/Magento/Checkout/Block/Cart.php b/app/code/Magento/Checkout/Block/Cart.php
index 6c3e87661066d8ab8f7adfeffeed948f2a099051..6e406dae410fc3f9ce9153bc892039d8b39c77bc 100644
--- a/app/code/Magento/Checkout/Block/Cart.php
+++ b/app/code/Magento/Checkout/Block/Cart.php
@@ -130,7 +130,7 @@ class Cart extends \Magento\Checkout\Block\Cart\AbstractCart
if ($isActive === null) {
$isActive = $this->_scopeConfig->getValue(
'wishlist/general/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) && $this->httpContext->getValue(
Context::CONTEXT_AUTH
);
diff --git a/app/code/Magento/Checkout/Block/Cart/Link.php b/app/code/Magento/Checkout/Block/Cart/Link.php
index f913bf1b8192192b7eb75f11b82940d640861038..1abffad414609118251a3189eb1bcfee20e10f2c 100644
--- a/app/code/Magento/Checkout/Block/Cart/Link.php
+++ b/app/code/Magento/Checkout/Block/Cart/Link.php
@@ -83,7 +83,7 @@ class Link extends \Magento\Framework\View\Element\Html\Link
* Create link label based on cart item quantity
*
* @param int $count
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _createLabel($count)
{
diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 9b314544b889365b48e7c2a44ccb3d1092c871b2..27f72fb347f391cd41e74da27eb83713e46abd1a 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -76,7 +76,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -124,7 +124,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
{
if ($name = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return $name;
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 6170e65cef60c2bd8d4992a3963c888e88a0fce1..a811d6069b6ffe4a1f7469064bb79a7581fe8f87 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -73,7 +73,7 @@ class Sidebar extends AbstractCart implements IdentityInterface
if (is_null($count)) {
$count = $this->_scopeConfig->getValue(
self::XML_PATH_CHECKOUT_SIDEBAR_COUNT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->setData('item_count', $count);
}
@@ -179,7 +179,7 @@ class Sidebar extends AbstractCart implements IdentityInterface
{
return (bool)$this->_scopeConfig->getValue(
'checkout/sidebar/display',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php b/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
index 6189b5f5e0a132ba1149f052d5651e855e2f65b8..941b0425c66f41988d20bd0161fd6706968a2ff6 100644
--- a/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
@@ -139,7 +139,7 @@ abstract class AbstractOnepage extends \Magento\Framework\View\Element\Template
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
index 2e56f635a2d7d52b356348caca8ded554843ffc5..679f00970c0e2cef87cbfb4004372d6103ec6cc3 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
@@ -103,7 +103,7 @@ class Available extends \Magento\Checkout\Block\Onepage\AbstractOnepage
{
if ($name = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return $name;
diff --git a/app/code/Magento/Checkout/Controller/Action.php b/app/code/Magento/Checkout/Controller/Action.php
index 6a7bbd4dab6b9f95948fc635aef722b26696a7af..daa22d34d16b57cdf0af041d28743e7276dc4d88 100644
--- a/app/code/Magento/Checkout/Controller/Action.php
+++ b/app/code/Magento/Checkout/Controller/Action.php
@@ -29,21 +29,29 @@ abstract class Action extends \Magento\Framework\App\Action\Action
*/
protected $accountManagement;
+ /**
+ * @var \Magento\Framework\Controller\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
/**
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Customer\Model\Session $customerSession
* @param CustomerRepositoryInterface $customerRepository
* @param AccountManagementInterface $accountManagement
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Customer\Model\Session $customerSession,
CustomerRepositoryInterface $customerRepository,
- AccountManagementInterface $accountManagement
+ AccountManagementInterface $accountManagement,
+ \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
) {
$this->_customerSession = $customerSession;
$this->customerRepository = $customerRepository;
$this->accountManagement = $accountManagement;
+ $this->resultRedirectFactory = $resultRedirectFactory;
parent::__construct($context);
}
@@ -54,7 +62,7 @@ abstract class Action extends \Magento\Framework\App\Action\Action
*
* @param bool $redirect - stop dispatch and redirect?
* @param bool $addErrors - add error messages?
- * @return bool
+ * @return bool|\Magento\Framework\Controller\Result\Redirect
*/
protected function _preDispatchValidateCustomer($redirect = true, $addErrors = true)
{
@@ -73,8 +81,8 @@ abstract class Action extends \Magento\Framework\App\Action\Action
}
}
if ($redirect) {
- $this->_redirect('customer/account/edit');
$this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
+ return $this->resultRedirectFactory->create()->setPath('customer/account/edit');
}
return false;
}
diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
index d3ce20b7be2fdc7c41797632c039af78ddcb4851..e2db457c9ee14985bb4c37297a0a1aebfcbd29fc 100644
--- a/app/code/Magento/Checkout/Controller/Cart.php
+++ b/app/code/Magento/Checkout/Controller/Cart.php
@@ -7,6 +7,7 @@ namespace Magento\Checkout\Controller;
use Magento\Catalog\Controller\Product\View\ViewInterface;
use Magento\Checkout\Model\Cart as CustomerCart;
+use Magento\Store\Model\ScopeInterface;
/**
* Shopping cart controller
@@ -24,7 +25,7 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
protected $_checkoutSession;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -38,56 +39,62 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
*/
protected $cart;
+ /**
+ * @var \Magento\Framework\Controller\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
/**
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param CustomerCart $cart
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
- CustomerCart $cart
+ CustomerCart $cart,
+ \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
) {
$this->_formKeyValidator = $formKeyValidator;
$this->_scopeConfig = $scopeConfig;
$this->_checkoutSession = $checkoutSession;
$this->_storeManager = $storeManager;
$this->cart = $cart;
+ $this->resultRedirectFactory = $resultRedirectFactory;
parent::__construct($context);
}
/**
* Set back redirect url to response
*
- * @return $this
+ * @return \Magento\Framework\Controller\Result\Redirect
*/
protected function _goBack()
{
$returnUrl = $this->getRequest()->getParam('return_url');
+ $resultRedirect = $this->resultRedirectFactory->create();
if ($returnUrl && $this->_isInternalUrl($returnUrl)) {
$this->messageManager->getMessages()->clear();
- $this->getResponse()->setRedirect($returnUrl);
- } elseif (!$this->_scopeConfig->getValue(
- 'checkout/cart/redirect_to_cart',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- ) && !$this->getRequest()->getParam(
- 'in_cart'
- ) && ($backUrl = $this->_redirect->getRefererUrl())
+ $resultRedirect->setUrl($returnUrl);
+ } elseif (!$this->_scopeConfig->getValue('checkout/cart/redirect_to_cart', ScopeInterface::SCOPE_STORE)
+ && !$this->getRequest()->getParam('in_cart')
+ && ($backUrl = $this->_redirect->getRefererUrl())
) {
- $this->getResponse()->setRedirect($backUrl);
+ $resultRedirect->setUrl($backUrl);
} else {
if ($this->getRequest()->getActionName() == 'add' && !$this->getRequest()->getParam('in_cart')) {
$this->_checkoutSession->setContinueShoppingUrl($this->_redirect->getRefererUrl());
}
- $this->_redirect('checkout/cart');
+ $resultRedirect->setPath('checkout/cart');
}
- return $this;
+ return $resultRedirect;
}
/**
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index d6cafaf38a0084fdfbd35b4ffb0c662ec75af7a8..d3b8958c7656f47dd79956f38afb55cd4cb60736 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -27,21 +27,31 @@ class Add extends \Magento\Checkout\Controller\Cart
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param CustomerCart $cart
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
* @param ProductRepositoryInterface $productRepository
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
CustomerCart $cart,
+ \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
ProductRepositoryInterface $productRepository
) {
- parent::__construct($context, $scopeConfig, $checkoutSession, $storeManager, $formKeyValidator, $cart);
+ parent::__construct(
+ $context,
+ $scopeConfig,
+ $checkoutSession,
+ $storeManager,
+ $formKeyValidator,
+ $cart,
+ $resultRedirectFactory
+ );
$this->productRepository = $productRepository;
}
@@ -54,7 +64,7 @@ class Add extends \Magento\Checkout\Controller\Cart
{
$productId = (int)$this->getRequest()->getParam('product');
if ($productId) {
- $storeId = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
+ $storeId = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
try {
return $this->productRepository->getById($productId, false, $storeId);
} catch (NoSuchEntityException $e) {
@@ -67,7 +77,7 @@ class Add extends \Magento\Checkout\Controller\Cart
/**
* Add product to shopping cart action
*
- * @return void
+ * @return \Magento\Framework\Controller\Result\Redirect
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
@@ -88,8 +98,7 @@ class Add extends \Magento\Checkout\Controller\Cart
* Check product availability
*/
if (!$product) {
- $this->_goBack();
- return;
+ return $this->_goBack();
}
$this->cart->addProduct($product, $params);
@@ -117,7 +126,7 @@ class Add extends \Magento\Checkout\Controller\Cart
);
$this->messageManager->addSuccess($message);
}
- $this->_goBack();
+ return $this->_goBack();
}
} catch (\Magento\Framework\Model\Exception $e) {
if ($this->_checkoutSession->getUseNotice(true)) {
@@ -135,15 +144,15 @@ class Add extends \Magento\Checkout\Controller\Cart
$url = $this->_checkoutSession->getRedirectUrl(true);
if ($url) {
- $this->getResponse()->setRedirect($url);
+ return $this->resultRedirectFactory->create()->setUrl($url);
} else {
$cartUrl = $this->_objectManager->get('Magento\Checkout\Helper\Cart')->getCartUrl();
- $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($cartUrl));
+ return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl($cartUrl));
}
} catch (\Exception $e) {
$this->messageManager->addException($e, __('We cannot add this item to your shopping cart'));
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
- $this->_goBack();
+ return $this->_goBack();
}
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
index fc8ce181e38e83c8c93b141e167db4c109d27453..f32c7a55de177ba6887eef6fb356007801b324cf 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
@@ -9,17 +9,16 @@ namespace Magento\Checkout\Controller\Cart;
class Addgroup extends \Magento\Checkout\Controller\Cart
{
/**
- * @return void
+ * @return \Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
$orderItemIds = $this->getRequest()->getParam('order_items', []);
if (is_array($orderItemIds)) {
- $itemsCollection = $this->_objectManager->create(
- 'Magento\Sales\Model\Order\Item'
- )->getCollection()->addIdFilter(
- $orderItemIds
- )->load();
+ $itemsCollection = $this->_objectManager->create('Magento\Sales\Model\Order\Item')
+ ->getCollection()
+ ->addIdFilter($orderItemIds)
+ ->load();
/* @var $itemsCollection \Magento\Sales\Model\Resource\Order\Item\Collection */
foreach ($itemsCollection as $item) {
try {
@@ -33,12 +32,12 @@ class Addgroup extends \Magento\Checkout\Controller\Cart
} catch (\Exception $e) {
$this->messageManager->addException($e, __('We cannot add this item to your shopping cart'));
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
- $this->_goBack();
+ return $this->_goBack();
}
}
$this->cart->save();
$this->_checkoutSession->setCartWasUpdated(true);
}
- $this->_goBack();
+ return $this->_goBack();
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 5b3cbc4aef6a5de2e7d0f9d1bca896ce28ea9ad0..48230baf5e14d3e781ce48ca878e537decd30115 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -6,6 +6,8 @@
*/
namespace Magento\Checkout\Controller\Cart;
+use Magento\Framework;
+
class Configure extends \Magento\Checkout\Controller\Cart
{
/**
@@ -17,28 +19,38 @@ class Configure extends \Magento\Checkout\Controller\Cart
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param \Magento\Checkout\Model\Cart $cart
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
*/
public function __construct(
- \Magento\Framework\App\Action\Context $context,
- \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+ Framework\App\Action\Context $context,
+ Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
\Magento\Checkout\Model\Cart $cart,
- \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
+ Framework\View\Result\PageFactory $resultPageFactory
) {
- parent::__construct($context, $scopeConfig, $checkoutSession, $storeManager, $formKeyValidator, $cart);
+ parent::__construct(
+ $context,
+ $scopeConfig,
+ $checkoutSession,
+ $storeManager,
+ $formKeyValidator,
+ $cart,
+ $resultRedirectFactory
+ );
$this->resultPageFactory = $resultPageFactory;
}
/**
* Action to reconfigure cart item
*
- * @return \Magento\Framework\View\Result\Page
+ * @return \Magento\Framework\View\Result\Page|\Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
@@ -53,8 +65,7 @@ class Configure extends \Magento\Checkout\Controller\Cart
try {
if (!$quoteItem || $productId != $quoteItem->getProduct()->getId()) {
$this->messageManager->addError(__("We can't find the quote item."));
- $this->_redirect('checkout/cart');
- return;
+ return $this->resultRedirectFactory->create()->setPath('checkout/cart');
}
$params = new \Magento\Framework\Object();
@@ -74,8 +85,7 @@ class Configure extends \Magento\Checkout\Controller\Cart
} catch (\Exception $e) {
$this->messageManager->addError(__('We cannot configure the product.'));
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
- $this->_goBack();
- return;
+ return $this->_goBack();
}
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index c617613c273cbc75f2e9a5275c86d293df6f05e4..bd615f30205e23df4368410a728725e1fd029f48 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -1,13 +1,10 @@
<?php
/**
- *
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\Checkout\Controller\Cart;
-use Magento\Checkout\Model\Cart as CustomerCart;
-
class CouponPost extends \Magento\Checkout\Controller\Cart
{
/**
@@ -21,18 +18,20 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
- * @param CustomerCart $cart
+ * @param \Magento\Checkout\Model\Cart $cart
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
- CustomerCart $cart,
+ \Magento\Checkout\Model\Cart $cart,
+ \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
\Magento\Quote\Model\QuoteRepository $quoteRepository
) {
parent::__construct(
@@ -41,7 +40,8 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
$checkoutSession,
$storeManager,
$formKeyValidator,
- $cart
+ $cart,
+ $resultRedirectFactory
);
$this->quoteRepository = $quoteRepository;
}
@@ -49,7 +49,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
/**
* Initialize coupon
*
- * @return void
+ * @return \Magento\Framework\Controller\Result\Redirect
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
@@ -59,20 +59,16 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
* No reason continue with empty shopping cart
*/
if (!$this->cart->getQuote()->getItemsCount()) {
- $this->_goBack();
- return;
+ return $this->_goBack();
}
- $couponCode = $this->getRequest()->getParam(
- 'remove'
- ) == 1 ? '' : trim(
- $this->getRequest()->getParam('coupon_code')
- );
+ $couponCode = $this->getRequest()->getParam('remove') == 1
+ ? ''
+ : trim($this->getRequest()->getParam('coupon_code'));
$oldCouponCode = $this->cart->getQuote()->getCouponCode();
if (!strlen($couponCode) && !strlen($oldCouponCode)) {
- $this->_goBack();
- return;
+ return $this->_goBack();
}
try {
@@ -109,6 +105,6 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
- $this->_goBack();
+ return $this->_goBack();
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/Delete.php b/app/code/Magento/Checkout/Controller/Cart/Delete.php
index 4c623b6404a0ed841abdbc9eca38f96e2c2a85c3..8b5e2da9ce319ecd52b5d8d6302c0d5b83189a23 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Delete.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Delete.php
@@ -11,7 +11,7 @@ class Delete extends \Magento\Checkout\Controller\Cart
/**
* Delete shopping cart item action
*
- * @return void
+ * @return \Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
@@ -25,6 +25,6 @@ class Delete extends \Magento\Checkout\Controller\Cart
}
}
$defaultUrl = $this->_objectManager->create('Magento\Framework\UrlInterface')->getUrl('*/*');
- $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($defaultUrl));
+ return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl($defaultUrl));
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
index 46b3174768e3905663993b2c46644e19f2317277..bfdb46f9353394288dd9b4e75a3abeeeb58d5ea4 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
@@ -1,11 +1,11 @@
<?php
/**
- *
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\Checkout\Controller\Cart;
+use Magento\Framework;
use Magento\Checkout\Model\Cart as CustomerCart;
class EstimatePost extends \Magento\Checkout\Controller\Cart
@@ -19,18 +19,20 @@ class EstimatePost extends \Magento\Checkout\Controller\Cart
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Session $checkoutSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param CustomerCart $cart
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
*/
public function __construct(
- \Magento\Framework\App\Action\Context $context,
- \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+ Framework\App\Action\Context $context,
+ Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Session $checkoutSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
CustomerCart $cart,
+ Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
\Magento\Quote\Model\QuoteRepository $quoteRepository
) {
$this->quoteRepository = $quoteRepository;
@@ -40,14 +42,15 @@ class EstimatePost extends \Magento\Checkout\Controller\Cart
$checkoutSession,
$storeManager,
$formKeyValidator,
- $cart
+ $cart,
+ $resultRedirectFactory
);
}
/**
* Initialize shipping information
*
- * @return void
+ * @return \Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
@@ -57,20 +60,14 @@ class EstimatePost extends \Magento\Checkout\Controller\Cart
$regionId = (string)$this->getRequest()->getParam('region_id');
$region = (string)$this->getRequest()->getParam('region');
- $this->cart->getQuote()->getShippingAddress()->setCountryId(
- $country
- )->setCity(
- $city
- )->setPostcode(
- $postcode
- )->setRegionId(
- $regionId
- )->setRegion(
- $region
- )->setCollectShippingRates(
- true
- );
+ $this->cart->getQuote()->getShippingAddress()
+ ->setCountryId($country)
+ ->setCity($city)
+ ->setPostcode($postcode)
+ ->setRegionId($regionId)
+ ->setRegion($region)
+ ->setCollectShippingRates(true);
$this->quoteRepository->save($this->cart->getQuote());
- $this->_goBack();
+ return $this->_goBack();
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php
index 0567b1e8bc441bb132460a293bdb0b1016fc5b3d..4f873d1e10254ecbfeafbb8003dcf8f0438f2f2e 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php
@@ -9,7 +9,7 @@ namespace Magento\Checkout\Controller\Cart;
class EstimateUpdatePost extends \Magento\Checkout\Controller\Cart
{
/**
- * @return void
+ * @return \Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
@@ -17,6 +17,6 @@ class EstimateUpdatePost extends \Magento\Checkout\Controller\Cart
if (!empty($code)) {
$this->cart->getQuote()->getShippingAddress()->setShippingMethod($code)->save();
}
- $this->_goBack();
+ return $this->_goBack();
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 8b5c9154e943d02bfddeacb32a73bf9584c62b30..15b238c9a409f2daf2143d6c514a1403ac98404f 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -11,10 +11,47 @@ namespace Magento\Checkout\Controller\Cart;
class Index extends \Magento\Checkout\Controller\Cart
{
+ /**
+ * @var \Magento\Framework\View\Result\PageFactory
+ */
+ protected $resultPageFactory;
+
+ /**
+ * @param \Magento\Framework\App\Action\Context $context
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+ * @param \Magento\Checkout\Model\Session $checkoutSession
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+ * @param \Magento\Checkout\Model\Cart $cart
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+ * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ */
+ public function __construct(
+ \Magento\Framework\App\Action\Context $context,
+ \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+ \Magento\Checkout\Model\Session $checkoutSession,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+ \Magento\Checkout\Model\Cart $cart,
+ \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
+ \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ ) {
+ parent::__construct(
+ $context,
+ $scopeConfig,
+ $checkoutSession,
+ $storeManager,
+ $formKeyValidator,
+ $cart,
+ $resultRedirectFactory
+ );
+ $this->resultPageFactory = $resultPageFactory;
+ }
+
/**
* Shopping cart display action
*
- * @return void
+ * @return \Magento\Framework\View\Result\Page
*/
public function execute()
{
@@ -24,26 +61,24 @@ class Index extends \Magento\Checkout\Controller\Cart
$this->cart->save();
if (!$this->cart->getQuote()->validateMinimumAmount()) {
- $currencyCode = $this->_objectManager->get(
- 'Magento\Framework\Store\StoreManagerInterface'
- )->getStore()->getCurrentCurrencyCode();
- $minimumAmount = $this->_objectManager->get(
- 'Magento\Framework\Locale\CurrencyInterface'
- )->getCurrency(
- $currencyCode
- )->toCurrency(
- $this->_scopeConfig->getValue(
- 'sales/minimum_order/amount',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- )
+ $currencyCode = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')
+ ->getStore()
+ ->getCurrentCurrencyCode();
+ $minimumAmount = $this->_objectManager->get('Magento\Framework\Locale\CurrencyInterface')
+ ->getCurrency($currencyCode)
+ ->toCurrency(
+ $this->_scopeConfig->getValue(
+ 'sales/minimum_order/amount',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ )
);
$warning = $this->_scopeConfig->getValue(
'sales/minimum_order/description',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) ? $this->_scopeConfig->getValue(
'sales/minimum_order/description',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) : __(
'Minimum order amount is %1',
$minimumAmount
@@ -73,11 +108,10 @@ class Index extends \Magento\Checkout\Controller\Cart
\Magento\Framework\Profiler::start(__METHOD__ . 'cart_display');
- $this->_view->loadLayout();
- $layout = $this->_view->getLayout();
- $layout->initMessages();
- $this->_view->getPage()->getConfig()->getTitle()->set(__('Shopping Cart'));
- $this->_view->renderLayout();
+ $resultPage = $this->resultPageFactory->create();
+ $resultPage->getLayout()->initMessages();
+ $resultPage->getConfig()->getTitle()->set(__('Shopping Cart'));
\Magento\Framework\Profiler::stop(__METHOD__ . 'cart_display');
+ return $resultPage;
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
index 433300a78fda6cf8b71a95137f4b9b4756e9faa9..97eb05cf1d7ff802968ab3c7d553e39460dd3ef4 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
@@ -14,7 +14,7 @@ class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
/**
* Update product configuration for a cart item
*
- * @return void
+ * @return \Magento\Framework\Controller\Result\Redirect
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
@@ -68,7 +68,7 @@ class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
);
$this->messageManager->addSuccess($message);
}
- $this->_goBack();
+ return $this->_goBack();
}
} catch (\Magento\Framework\Model\Exception $e) {
if ($this->_checkoutSession->getUseNotice(true)) {
@@ -82,16 +82,16 @@ class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
$url = $this->_checkoutSession->getRedirectUrl(true);
if ($url) {
- $this->getResponse()->setRedirect($url);
+ return $this->resultRedirectFactory->create()->setUrl($url);
} else {
$cartUrl = $this->_objectManager->get('Magento\Checkout\Helper\Cart')->getCartUrl();
- $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($cartUrl));
+ return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl($cartUrl));
}
} catch (\Exception $e) {
$this->messageManager->addException($e, __('We cannot update the item.'));
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
- $this->_goBack();
+ return $this->_goBack();
}
- $this->_redirect('*/*');
+ return $this->resultRedirectFactory->create()->setPath('*/*');
}
}
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
index 094541435b0c20f1bc48585b497dbcf408c21d40..d06986c9b68cd5110c0fb440df3196dee803c1f8 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -67,13 +67,12 @@ class UpdatePost extends \Magento\Checkout\Controller\Cart
/**
* Update shopping cart data action
*
- * @return void
+ * @return \Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
if (!$this->_formKeyValidator->validate($this->getRequest())) {
- $this->_redirect('*/*/');
- return;
+ return $this->resultRedirectFactory->create()->setPath('*/*/');
}
$updateAction = (string)$this->getRequest()->getParam('update_cart_action');
@@ -89,6 +88,6 @@ class UpdatePost extends \Magento\Checkout\Controller\Cart
$this->_updateShoppingCart();
}
- $this->_goBack();
+ return $this->_goBack();
}
}
diff --git a/app/code/Magento/Checkout/Controller/Index/Index.php b/app/code/Magento/Checkout/Controller/Index/Index.php
index a7d53f46d9df2d87af30e173733608ac517b4f1d..7e34b412e338311a0ac66aaeb53a45867572ee29 100644
--- a/app/code/Magento/Checkout/Controller/Index/Index.php
+++ b/app/code/Magento/Checkout/Controller/Index/Index.php
@@ -9,10 +9,27 @@ namespace Magento\Checkout\Controller\Index;
class Index extends \Magento\Framework\App\Action\Action
{
/**
- * @return void
+ * @var \Magento\Framework\Controller\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
+ /**
+ * @param \Magento\Framework\App\Action\Context $context
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+ */
+ public function __construct(
+ \Magento\Framework\App\Action\Context $context,
+ \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+ ) {
+ parent::__construct($context);
+ $this->resultRedirectFactory = $resultRedirectFactory;
+ }
+
+ /**
+ * @return \Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
- $this->_redirect('checkout/onepage', ['_secure' => true]);
+ return $this->resultRedirectFactory->create()->setPath('checkout/onepage', ['_secure' => true]);
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage.php b/app/code/Magento/Checkout/Controller/Onepage.php
index 0cd64fb99023f9e27bcfc0a36de69364d20b7dc7..50a888a0da021d3be81f404ee6371193f77bdb01 100644
--- a/app/code/Magento/Checkout/Controller/Onepage.php
+++ b/app/code/Magento/Checkout/Controller/Onepage.php
@@ -61,17 +61,43 @@ class Onepage extends Action
*/
protected $quoteRepository;
+ /**
+ * @var \Magento\Framework\View\Result\PageFactory
+ */
+ protected $resultPageFactory;
+
+ /**
+ * @var \Magento\Framework\View\Result\LayoutFactory
+ */
+ protected $resultLayoutFactory;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\RawFactory
+ */
+ protected $resultRawFactory;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\JSONFactory
+ */
+ protected $resultJsonFactory;
+
/**
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Customer\Model\Session $customerSession
* @param CustomerRepositoryInterface $customerRepository
* @param AccountManagementInterface $accountManagement
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Framework\Translate\InlineInterface $translateInline
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\View\LayoutFactory $layoutFactory
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+ * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+ * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+ * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+ *
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -79,12 +105,17 @@ class Onepage extends Action
\Magento\Customer\Model\Session $customerSession,
CustomerRepositoryInterface $customerRepository,
AccountManagementInterface $accountManagement,
+ \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
\Magento\Framework\Registry $coreRegistry,
\Magento\Framework\Translate\InlineInterface $translateInline,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\View\LayoutFactory $layoutFactory,
- \Magento\Quote\Model\QuoteRepository $quoteRepository
+ \Magento\Quote\Model\QuoteRepository $quoteRepository,
+ \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+ \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+ \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+ \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
) {
$this->_coreRegistry = $coreRegistry;
$this->_translateInline = $translateInline;
@@ -92,7 +123,17 @@ class Onepage extends Action
$this->scopeConfig = $scopeConfig;
$this->layoutFactory = $layoutFactory;
$this->quoteRepository = $quoteRepository;
- parent::__construct($context, $customerSession, $customerRepository, $accountManagement);
+ $this->resultPageFactory = $resultPageFactory;
+ $this->resultLayoutFactory = $resultLayoutFactory;
+ $this->resultRawFactory = $resultRawFactory;
+ $this->resultJsonFactory = $resultJsonFactory;
+ parent::__construct(
+ $context,
+ $customerSession,
+ $customerRepository,
+ $accountManagement,
+ $resultRedirectFactory
+ );
}
/**
@@ -105,7 +146,10 @@ class Onepage extends Action
public function dispatch(RequestInterface $request)
{
$this->_request = $request;
- $this->_preDispatchValidateCustomer();
+ $result = $this->_preDispatchValidateCustomer();
+ if ($result instanceof \Magento\Framework\Controller\ResultInterface) {
+ return $result;
+ }
/** @var \Magento\Quote\Model\Quote $quote */
$quote = $this->_objectManager->get('Magento\Checkout\Model\Session')->getQuote();
@@ -120,12 +164,14 @@ class Onepage extends Action
}
/**
- * @return $this
+ * @return \Magento\Framework\Controller\Result\Raw
*/
protected function _ajaxRedirectResponse()
{
- $this->getResponse()->setHeader('HTTP/1.1', '403 Session Expired')->setHeader('Login-Required', 'true');
- return $this;
+ $resultRaw = $this->resultRawFactory->create();
+ $resultRaw->setHeader('HTTP/1.1', '403 Session Expired')
+ ->setHeader('Login-Required', 'true');
+ return $resultRaw;
}
/**
@@ -137,21 +183,14 @@ class Onepage extends Action
{
$quote = $this->getOnepage()->getQuote();
if (!$quote->hasItems() || $quote->getHasError() || !$quote->validateMinimumAmount()) {
- $this->_ajaxRedirectResponse();
- return true;
+ return false;
}
$action = $this->getRequest()->getActionName();
- if ($this->_objectManager->get(
- 'Magento\Checkout\Model\Session'
- )->getCartWasUpdated(
- true
- ) && !in_array(
- $action,
- ['index', 'progress']
- )
+ if ($this->_objectManager->get('Magento\Checkout\Model\Session')->getCartWasUpdated(true)
+ &&
+ !in_array($action, ['index', 'progress'])
) {
- $this->_ajaxRedirectResponse();
- return true;
+ return false;
}
return false;
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Failure.php b/app/code/Magento/Checkout/Controller/Onepage/Failure.php
index a928f7cb7be6d76a3ebbdbb96ae4f009fdb4a886..e6155dbea2981db811b5a6a9a9a639148d785959 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Failure.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Failure.php
@@ -9,7 +9,7 @@ namespace Magento\Checkout\Controller\Onepage;
class Failure extends \Magento\Checkout\Controller\Onepage
{
/**
- * @return void
+ * @return \Magento\Framework\View\Result\Page|\Magento\Framework\Controller\Result\Redirect
*/
public function execute()
{
@@ -17,11 +17,9 @@ class Failure extends \Magento\Checkout\Controller\Onepage
$lastOrderId = $this->getOnepage()->getCheckout()->getLastOrderId();
if (!$lastQuoteId || !$lastOrderId) {
- $this->_redirect('checkout/cart');
- return;
+ return $this->resultRedirectFactory->create()->setPath('checkout/cart');
}
- $this->_view->loadLayout();
- $this->_view->renderLayout();
+ return $this->resultPageFactory->create();
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Index.php b/app/code/Magento/Checkout/Controller/Onepage/Index.php
index 3da33c0906112dd8e97cc9bb11d49ba8db10b751..4686ece6b0b82bc133d696c934c0034c75140287 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Index.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Index.php
@@ -11,34 +11,27 @@ class Index extends \Magento\Checkout\Controller\Onepage
/**
* Checkout page
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
if (!$this->_objectManager->get('Magento\Checkout\Helper\Data')->canOnepageCheckout()) {
$this->messageManager->addError(__('The onepage checkout is disabled.'));
- $this->_redirect('checkout/cart');
- return;
+ return $this->resultRedirectFactory->create()->setPath('checkout/cart');
}
$quote = $this->getOnepage()->getQuote();
if (!$quote->hasItems() || $quote->getHasError() || !$quote->validateMinimumAmount()) {
- $this->_redirect('checkout/cart');
- return;
+ return $this->resultRedirectFactory->create()->setPath('checkout/cart');
}
$this->_customerSession->regenerateId();
$this->_objectManager->get('Magento\Checkout\Model\Session')->setCartWasUpdated(false);
- $currentUrl = $this->_objectManager->create('Magento\Framework\UrlInterface')
- ->getUrl(
- '*/*/*',
- ['_secure' => true]
- );
+ $currentUrl = $this->_url->getUrl('*/*/*', ['_secure' => true]);
$this->_objectManager->get('Magento\Customer\Model\Session')->setBeforeAuthUrl($currentUrl);
$this->getOnepage()->initCheckout();
- $this->_view->loadLayout();
- $layout = $this->_view->getLayout();
- $layout->initMessages();
- $this->_view->getPage()->getConfig()->getTitle()->set(__('Checkout'));
- $this->_view->renderLayout();
+ $resultPage = $this->resultPageFactory->create();
+ $resultPage->getLayout()->initMessages();
+ $resultPage->getConfig()->getTitle()->set(__('Checkout'));
+ return $resultPage;
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Review.php b/app/code/Magento/Checkout/Controller/Onepage/Review.php
index b5dcbb7f6662c1ad7f52058259ba5909651aa4e0..21be8905b2a7825b955d065f94829fa43294011a 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Review.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Review.php
@@ -12,14 +12,15 @@ class Review extends Onepage
{
/**
* {@inheritdoc}
+ *
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
if ($this->_expireAjax()) {
- return;
+ return $this->_ajaxRedirectResponse();
}
- $this->_view->addPageLayoutHandles();
- $this->_view->loadLayout(false);
- $this->_view->renderLayout();
+
+ return $this->resultLayoutFactory->create();
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php b/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
index b3b1e3e5fd89c33d8edcb6fc1e7f7ae3e5ec7e40..c9f0fc3478af5774150ee7fcc86c8fd4158efa15 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
@@ -11,12 +11,12 @@ class SaveBilling extends \Magento\Checkout\Controller\Onepage
/**
* Save checkout billing address
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
if (!$this->getRequest()->isPost() || $this->_expireAjax()) {
- return;
+ return $this->_ajaxRedirectResponse();
}
$data = $this->getRequest()->getPost('billing', []);
$customerAddressId = $this->getRequest()->getPost('billing_address_id', false);
@@ -40,7 +40,7 @@ class SaveBilling extends \Magento\Checkout\Controller\Onepage
'error' => -1,
'message' => $this->scopeConfig->getValue(
'sales/minimum_order/error_message',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$quote->getStoreId()
),
];
@@ -60,8 +60,6 @@ class SaveBilling extends \Magento\Checkout\Controller\Onepage
}
}
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+ return $this->resultJsonFactory->create()->setData($result);
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveMethod.php b/app/code/Magento/Checkout/Controller/Onepage/SaveMethod.php
index 192d37367d4c9ae4d2cad06c69ddc74ef048b500..e9a79177a91498f7a2bbfea1f608a6851f5db085 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveMethod.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveMethod.php
@@ -11,19 +11,16 @@ class SaveMethod extends \Magento\Checkout\Controller\Onepage
/**
* Save checkout method
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
- if ($this->_expireAjax()) {
- return;
- }
- if ($this->getRequest()->isPost()) {
- $method = $this->getRequest()->getPost('method');
- $result = $this->getOnepage()->saveCheckoutMethod($method);
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+ if (!$this->getRequest()->isPost() || $this->_expireAjax()) {
+ return $this->_ajaxRedirectResponse();
}
+ $method = $this->getRequest()->getPost('method');
+ $result = $this->getOnepage()->saveCheckoutMethod($method);
+
+ return $this->resultJsonFactory->create()->setData($result);
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
index 6bb7a5e450882e6e51e435e74e9e92a783743019..04b8f03a083e31b43a510a590857e50986e5e204 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
@@ -11,19 +11,18 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
/**
* Create order action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function execute()
{
if (!$this->_formKeyValidator->validate($this->getRequest())) {
- $this->_redirect('*/*/');
- return;
+ return $this->resultRedirectFactory->create()->setPath('*/*/');
}
if ($this->_expireAjax()) {
- return;
+ return $this->_ajaxRedirectResponse();
}
$result = [];
@@ -35,10 +34,7 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
$result['error_messages'] = __(
'Please agree to all the terms and conditions before placing the order.'
);
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
- return;
+ return $this->resultJsonFactory->create()->setData($result);
}
$data = $this->getRequest()->getPost('payment', []);
@@ -68,12 +64,8 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
$result['update_section'] = ['name' => 'payment-method', 'html' => $this->_getPaymentMethodsHtml()];
} catch (\Magento\Framework\Model\Exception $e) {
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
- $this->_objectManager->get(
- 'Magento\Checkout\Helper\Data'
- )->sendPaymentFailedEmail(
- $this->getOnepage()->getQuote(),
- $e->getMessage()
- );
+ $this->_objectManager->get('Magento\Checkout\Helper\Data')
+ ->sendPaymentFailedEmail($this->getOnepage()->getQuote(), $e->getMessage());
$result['success'] = false;
$result['error'] = true;
$result['error_messages'] = $e->getMessage();
@@ -96,12 +88,8 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
}
} catch (\Exception $e) {
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
- $this->_objectManager->get(
- 'Magento\Checkout\Helper\Data'
- )->sendPaymentFailedEmail(
- $this->getOnepage()->getQuote(),
- $e->getMessage()
- );
+ $this->_objectManager->get('Magento\Checkout\Helper\Data')
+ ->sendPaymentFailedEmail($this->getOnepage()->getQuote(), $e->getMessage());
$result['success'] = false;
$result['error'] = true;
$result['error_messages'] = __('Something went wrong processing your order. Please try again later.');
@@ -114,8 +102,6 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
$result['redirect'] = $redirectUrl;
}
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+ return $this->resultJsonFactory->create()->setData($result);
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php b/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
index d401a79fb575f41952a1be60f3182f2e0d6015ac..83e3c46621b6d5b26e1386d9396124e6718bc6e6 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
@@ -23,20 +23,15 @@ class SavePayment extends \Magento\Checkout\Controller\Onepage
*
* Sets either redirect or a JSON response
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function execute()
{
- if ($this->_expireAjax()) {
- return;
+ if (!$this->getRequest()->isPost() || $this->_expireAjax()) {
+ return $this->_ajaxRedirectResponse();
}
try {
- if (!$this->getRequest()->isPost()) {
- $this->_ajaxRedirectResponse();
- return;
- }
-
$data = $this->getRequest()->getPost('payment', []);
$result = $this->getOnepage()->savePayment($data);
@@ -61,8 +56,7 @@ class SavePayment extends \Magento\Checkout\Controller\Onepage
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
$result['error'] = __('Unable to set Payment Method');
}
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+
+ return $this->resultJsonFactory->create()->setData($result);
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php b/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
index 540086881d182525a3c33255a250e400b45d6dad..491a0411bccdd001cf1251065f957128da4c0b54 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
@@ -11,12 +11,12 @@ class SaveShipping extends \Magento\Checkout\Controller\Onepage
/**
* Shipping address save action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
if (!$this->getRequest()->isPost() || $this->_expireAjax()) {
- return;
+ return $this->_ajaxRedirectResponse();
}
$data = $this->getRequest()->getPost('shipping', []);
$customerAddressId = $this->getRequest()->getPost('shipping_address_id', false);
@@ -29,7 +29,7 @@ class SaveShipping extends \Magento\Checkout\Controller\Onepage
'error' => -1,
'message' => $this->scopeConfig->getValue(
'sales/minimum_order/error_message',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$quote->getStoreId()
),
];
@@ -42,8 +42,7 @@ class SaveShipping extends \Magento\Checkout\Controller\Onepage
$result['update_progress'] = ['html' => $this->getProgressHtml($result['goto_section'])];
}
}
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+
+ return $this->resultJsonFactory->create()->setData($result);
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveShippingMethod.php b/app/code/Magento/Checkout/Controller/Onepage/SaveShippingMethod.php
index ed67d8e681db0c1fef68eeab12f46836bc64110e..eccadcd5ab4d8c8a033f52f889bd830f7f37fd95 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveShippingMethod.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveShippingMethod.php
@@ -11,38 +11,32 @@ class SaveShippingMethod extends \Magento\Checkout\Controller\Onepage
/**
* Shipping method save action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
- if ($this->_expireAjax()) {
- return;
+ if (!$this->getRequest()->isPost() || $this->_expireAjax()) {
+ return $this->_ajaxRedirectResponse();
}
- if ($this->getRequest()->isPost()) {
- $data = $this->getRequest()->getPost('shipping_method', '');
- $result = $this->getOnepage()->saveShippingMethod($data);
- // $result will contain error data if shipping method is empty
- if (!$result) {
- $this->_eventManager->dispatch(
- 'checkout_controller_onepage_save_shipping_method',
- ['request' => $this->getRequest(), 'quote' => $this->getOnepage()->getQuote()]
- );
- $this->getOnepage()->getQuote()->collectTotals();
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
- $result['goto_section'] = 'payment';
- $result['update_section'] = [
- 'name' => 'payment-method',
- 'html' => $this->_getPaymentMethodsHtml(),
- ];
- $result['update_progress'] = ['html' => $this->getProgressHtml($result['goto_section'])];
- }
- $this->quoteRepository->save($this->getOnepage()->getQuote()->collectTotals());
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
+ $data = $this->getRequest()->getPost('shipping_method', '');
+ $result = $this->getOnepage()->saveShippingMethod($data);
+ // $result will contain error data if shipping method is empty
+ if (!$result) {
+ $this->_eventManager->dispatch(
+ 'checkout_controller_onepage_save_shipping_method',
+ ['request' => $this->getRequest(), 'quote' => $this->getOnepage()->getQuote()]
);
+ $this->getOnepage()->getQuote()->collectTotals();
+
+ $result['goto_section'] = 'payment';
+ $result['update_section'] = [
+ 'name' => 'payment-method',
+ 'html' => $this->_getPaymentMethodsHtml(),
+ ];
+ $result['update_progress'] = ['html' => $this->getProgressHtml($result['goto_section'])];
}
+ $this->quoteRepository->save($this->getOnepage()->getQuote()->collectTotals());
+ return $this->resultJsonFactory->create()->setData($result);
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php b/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php
index 3b4d470fa597b13a5d8daa1b089911d608376961..0f3a69eebe6bf10f2aec59dd1bf35df245669d6b 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php
@@ -9,15 +9,14 @@ namespace Magento\Checkout\Controller\Onepage;
class ShippingMethod extends \Magento\Checkout\Controller\Onepage
{
/**
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
if ($this->_expireAjax()) {
- return;
+ return $this->_ajaxRedirectResponse();
}
- $this->_view->addPageLayoutHandles();
- $this->_view->loadLayout(false);
- $this->_view->renderLayout();
+
+ return $this->resultLayoutFactory->create();
}
}
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
index 53dffbf01521753155c4ae232f335805c6619744..22df006d4fac2dfb92eae4e31747ab8776aa7453 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
@@ -11,23 +11,22 @@ class Success extends \Magento\Checkout\Controller\Onepage
/**
* Order success action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
$session = $this->getOnepage()->getCheckout();
if (!$this->_objectManager->get('Magento\Checkout\Model\Session\SuccessValidator')->isValid()) {
- $this->_redirect('checkout/cart');
- return;
+ return $this->resultRedirectFactory->create()->setPath('checkout/cart');
}
$session->clearQuote();
//@todo: Refactor it to match CQRS
- $this->_view->loadLayout();
- $this->_view->getLayout()->initMessages();
+ $resultPage = $this->resultPageFactory->create();
+ $resultPage->getLayout()->initMessages();
$this->_eventManager->dispatch(
'checkout_onepage_controller_success_action',
['order_ids' => [$session->getLastOrderId()]]
);
- $this->_view->renderLayout();
+ return $resultPage;
}
}
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index ad7b2ed1721680364051d1489a92575cd13bce13..54705d9d4d1dadf3d3a0359e9c3a88d698d8eeab 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -49,14 +49,14 @@ class Cart extends \Magento\Core\Helper\Url
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Checkout\Model\Cart $checkoutCart
* @param \Magento\Checkout\Model\Session $checkoutSession
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Checkout\Model\Cart $checkoutCart,
\Magento\Checkout\Model\Session $checkoutSession
@@ -210,6 +210,6 @@ class Cart extends \Magento\Core\Helper\Url
*/
public function getShouldRedirectToCart($store = null)
{
- return $this->_scopeConfig->isSetFlag(self::XML_PATH_REDIRECT_TO_CART, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->isSetFlag(self::XML_PATH_REDIRECT_TO_CART, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
}
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
index b7e6a243b0fc369427b61bad8bb29f921fbf4270..8d7fc660b514aa89e39ab6a4486415c46a0ac7d3 100644
--- a/app/code/Magento/Checkout/Helper/Data.php
+++ b/app/code/Magento/Checkout/Helper/Data.php
@@ -29,7 +29,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -61,7 +61,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Checkout\Model\Session $checkoutSession
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
@@ -71,7 +71,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Checkout\Model\Session $checkoutSession,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
@@ -143,7 +143,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return (bool)$this->_scopeConfig->getValue(
'checkout/options/onepage_checkout_enabled',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -217,14 +217,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
$template = $this->_scopeConfig->getValue(
'checkout/payment_failed/template',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
);
$copyTo = $this->_getEmails('checkout/payment_failed/copy_to', $checkout->getStoreId());
$copyMethod = $this->_scopeConfig->getValue(
'checkout/payment_failed/copy_method',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
);
$bcc = [];
@@ -234,19 +234,19 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
$_receiver = $this->_scopeConfig->getValue(
'checkout/payment_failed/receiver',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
);
$sendTo = [
[
'email' => $this->_scopeConfig->getValue(
'trans_email/ident_' . $_receiver . '/email',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
),
'name' => $this->_scopeConfig->getValue(
'trans_email/ident_' . $_receiver . '/name',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
),
],
@@ -295,11 +295,11 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
'shippingAddress' => $checkout->getShippingAddress(),
'shippingMethod' => $this->_scopeConfig->getValue(
'carriers/' . $shippingMethod . '/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
),
'paymentMethod' => $this->_scopeConfig->getValue(
'payment/' . $paymentMethod . '/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
),
'items' => nl2br($items),
'total' => $total,
@@ -307,7 +307,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
)->setFrom(
$this->_scopeConfig->getValue(
'checkout/payment_failed/identity',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$checkout->getStoreId()
)
)->addTo(
@@ -334,7 +334,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
$data = $this->_scopeConfig->getValue(
$configPath,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
if (!empty($data)) {
@@ -358,7 +358,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
}
$guestCheckout = $this->_scopeConfig->isSetFlag(
self::XML_PATH_GUEST_CHECKOUT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
@@ -395,7 +395,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->isSetFlag(
self::XML_PATH_CUSTOMER_MUST_BE_LOGGED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index b44a2140bc6d1bd140673fa1ff31124109ff18d3..bc7bbb9af1298229279e1a9f45ccc58106fc2ec2 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -46,7 +46,7 @@ class Cart extends Object implements CartInterface
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -93,7 +93,7 @@ class Cart extends Object implements CartInterface
/**
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Resource\Cart $resourceCart
* @param Session $checkoutSession
* @param \Magento\Customer\Model\Session $customerSession
@@ -108,7 +108,7 @@ class Cart extends Object implements CartInterface
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Checkout\Model\Resource\Cart $resourceCart,
Session $checkoutSession,
\Magento\Customer\Model\Session $customerSession,
@@ -623,7 +623,7 @@ class Cart extends Object implements CartInterface
if ($quoteId && $this->_summaryQty === null) {
$useQty = $this->_scopeConfig->getValue(
'checkout/cart_link/use_qty',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->_summaryQty = $useQty ? $this->getItemsQty() : $this->getItemsCount();
}
diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index 2e40a7bd3f55b1b5fda8e1716209b49807131472..d647592240822cdf1f22f59fdbfee95e3108f905 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -72,7 +72,7 @@ class Session extends \Magento\Framework\Session\SessionManager
protected $_eventManager;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -95,7 +95,7 @@ class Session extends \Magento\Framework\Session\SessionManager
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
* @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -113,7 +113,7 @@ class Session extends \Magento\Framework\Session\SessionManager
\Magento\Quote\Model\QuoteRepository $quoteRepository,
\Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
) {
$this->_orderFactory = $orderFactory;
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index 1562275b9ce06fc2e6c62f7fa2f55330e96f9260..35e81bbe013eb685c67d53a863a016dfba90181a 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -77,7 +77,7 @@ class Onepage
protected $_eventManager = null;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -178,7 +178,7 @@ class Onepage
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Checkout\Model\Session $checkoutSession
* @param \Magento\Customer\Model\Session $customerSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Customer\Model\AddressFactory $customrAddrFactory
* @param \Magento\Customer\Model\FormFactory $customerFormFactory
@@ -208,7 +208,7 @@ class Onepage
\Psr\Log\LoggerInterface $logger,
\Magento\Checkout\Model\Session $checkoutSession,
\Magento\Customer\Model\Session $customerSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\RequestInterface $request,
\Magento\Customer\Model\AddressFactory $customrAddrFactory,
\Magento\Customer\Model\FormFactory $customerFormFactory,
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index a84dcaee2dfa851cacfb4657b8fe13028de85b42..8d2934a9d3e961350d4bda6e58181ed822318502 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -3,31 +3,31 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-payment": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-gift-message": "0.42.0-beta6",
- "magento/module-wishlist": "0.42.0-beta6",
- "magento/module-page-cache": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-msrp": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-ui": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-payment": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-gift-message": "0.42.0-beta7",
+ "magento/module-wishlist": "0.42.0-beta7",
+ "magento/module-page-cache": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-msrp": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-ui": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"suggest": {
- "magento/module-cookie": "0.42.0-beta6"
+ "magento/module-cookie": "0.42.0-beta7"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
index f9bb6f56b796fa4c46eaeaecd3562958216a7648..8965d3d498b0530e0aeb58ab1f76fe4b212bda28 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
@@ -14,7 +14,7 @@
<container name="checkout.onepage.review.info.items.before" as="items_before" label="Items Before"/>
<container name="checkout.onepage.review.info.items.after" as="items_after" label="Items After"/>
<block class="Magento\Checkout\Block\Onepage\Review\Button" name="checkout.onepage.review.button" as="button" template="Magento_Checkout::onepage/review/button.phtml"/>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</block>
</container>
</layout>
diff --git a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php
index 110cbd76d57c7d8c1fc609e25ed5000a1d727c72..fe29bddc7a7117cf5d78953178b6cea7da073b94 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php
@@ -48,7 +48,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get Header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/CheckoutAgreements/Block/Agreements.php b/app/code/Magento/CheckoutAgreements/Block/Agreements.php
index 1df7e59a0a358e4e80a3ad704c771c002600b7ef..f43827a6b58201b97f3e4ae9fd89e485093523d3 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Agreements.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Agreements.php
@@ -35,7 +35,7 @@ class Agreements extends \Magento\Framework\View\Element\Template
public function getAgreements()
{
if (!$this->hasAgreements()) {
- if (!$this->_scopeConfig->isSetFlag('checkout/options/enable_agreements', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+ if (!$this->_scopeConfig->isSetFlag('checkout/options/enable_agreements', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
$agreements = [];
} else {
/** @var \Magento\CheckoutAgreements\Model\Resource\Agreement\Collection $agreements */
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
index 2dff3c5c82fd2cb4adaf189fd45fc59cb7d50c4a..a8e88e80ff2fc4bcec1f56b9536f125e3e4f2320 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
@@ -6,7 +6,7 @@
namespace Magento\CheckoutAgreements\Model;
use Magento\Checkout\Model\Agreements\AgreementsProviderInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* Provide Agreements stored in db
@@ -22,17 +22,17 @@ class AgreementsProvider implements AgreementsProviderInterface
/** @var \Magento\Framework\App\Config\ScopeConfigInterface */
protected $scopeConfig;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $storeManager;
/**
* @param Resource\Agreement\CollectionFactory $agreementCollectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
*/
public function __construct(
\Magento\CheckoutAgreements\Model\Resource\Agreement\CollectionFactory $agreementCollectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
) {
$this->agreementCollectionFactory = $agreementCollectionFactory;
diff --git a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
index 4df65dee190cd7e90f8fcab1401f61ca249970a2..892e1599241f3e1858379aed0788bd134f023914 100644
--- a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
+++ b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
@@ -11,8 +11,8 @@ namespace Magento\CheckoutAgreements\Model;
use Magento\CheckoutAgreements\Model\Resource\Agreement\CollectionFactory as AgreementCollectionFactory;
use Magento\CheckoutAgreements\Model\Resource\Agreement\Collection as AgreementCollection;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Store\StoreManagerInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
/**
@@ -30,7 +30,7 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
/**
* Store manager.
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
private $storeManager;
@@ -45,7 +45,7 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
* Constructs a checkout agreement data object.
*
* @param AgreementCollectionFactory $collectionFactory Collection factory.
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager Store manager.
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager Store manager.
* @param ScopeConfigInterface $scopeConfig Scope config.
*/
public function __construct(
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index 871390b4d8b1211e38de1d74048f49831431d93c..7577ba5e66f406f5beb4eae76e5ac3dfad6aff13 100644
--- a/app/code/Magento/CheckoutAgreements/composer.json
+++ b/app/code/Magento/CheckoutAgreements/composer.json
@@ -3,14 +3,14 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CheckoutAgreements/etc/acl.xml b/app/code/Magento/CheckoutAgreements/etc/acl.xml
index 585c65a89cfc73685c3101b4a85a094d0ae367b7..d3ae7b6338cbd1674401ec83f16f06e7bc4b525f 100644
--- a/app/code/Magento/CheckoutAgreements/etc/acl.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
<resource id="Magento_CheckoutAgreements::checkoutagreement" title="Terms & Conditions" sortOrder="30" />
</resource>
</resource>
diff --git a/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml b/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml
index 6bde15b5e437a10924ed172d0154d98f46183f2a..5d1ee9a70e41561654d2212514e05f1c8a1676b3 100644
--- a/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="checkout" frontName="checkout">
- <module name="Magento_CheckoutAgreements" before="Magento_Adminhtml" />
+ <module name="Magento_CheckoutAgreements" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit.php
index c118bf1eb9bffde9340da119a17c79d852b399c4..10cc1d2fc62d322993f6e17bcc7726923e2d923d 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit.php
@@ -71,7 +71,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get edit form container header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit.php
index 8d363e9942a527d3e463cd48b7d8294ae4425263..0c4320b00dd85acf07acc3d99b5dab87e967892c 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit.php
@@ -75,7 +75,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Retrieve text for header element depending on loaded page
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Content.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Content.php
index cf4e4cfccb4b9625f20163bbc53d105e831c8b85..0933a7a260440b58395a47f323b3bcc6e7824c65 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Content.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Content.php
@@ -106,7 +106,7 @@ class Content extends \Magento\Backend\Block\Widget\Form\Generic implements
/**
* Prepare label for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -116,7 +116,7 @@ class Content extends \Magento\Backend\Block\Widget\Form\Generic implements
/**
* Prepare title for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
index bb7234a561fc53ec949b03dd6f7dd3332c945131..0d639ce8483757c082e10fb37a79d1a2f63eda36 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
@@ -22,7 +22,7 @@ class Design extends \Magento\Backend\Block\Widget\Form\Generic implements
protected $_pageLayout;
/**
- * @var \Magento\Core\Model\PageLayout\Config\Builder
+ * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
*/
protected $pageLayoutBuilder;
@@ -32,7 +32,7 @@ class Design extends \Magento\Backend\Block\Widget\Form\Generic implements
* @param \Magento\Framework\Data\FormFactory $formFactory
* @param \Magento\Theme\Model\Layout\Source\Layout $pageLayout
* @param \Magento\Framework\View\Design\Theme\LabelFactory $labelFactory
- * @param \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder
+ * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
* @param array $data
*/
public function __construct(
@@ -41,7 +41,7 @@ class Design extends \Magento\Backend\Block\Widget\Form\Generic implements
\Magento\Framework\Data\FormFactory $formFactory,
\Magento\Theme\Model\Layout\Source\Layout $pageLayout,
\Magento\Framework\View\Design\Theme\LabelFactory $labelFactory,
- \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder,
+ \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder,
array $data = []
) {
$this->pageLayoutBuilder = $pageLayoutBuilder;
@@ -191,7 +191,7 @@ class Design extends \Magento\Backend\Block\Widget\Form\Generic implements
/**
* Prepare label for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -201,7 +201,7 @@ class Design extends \Magento\Backend\Block\Widget\Form\Generic implements
/**
* Prepare title for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php
index 7bf1236e1ee1313230bfd59dceec7e40f0fcf3a4..2426eca3134e1864e0bbfded16d8b01b15750513 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php
@@ -145,7 +145,7 @@ class Main extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
/**
* Prepare label for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -155,7 +155,7 @@ class Main extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
/**
* Prepare title for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Meta.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Meta.php
index 7a38b4e4990589043e663799fe75c258b7333942..5b0bda2853ff78477b1496dd1d5567f2fc7b28b4 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Meta.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Meta.php
@@ -74,7 +74,7 @@ class Meta extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
/**
* Prepare label for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -84,7 +84,7 @@ class Meta extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
/**
* Prepare title for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
index ce330ce17a0b4ed1b7a4d2beef587060ab6cf27f..0580ceeaeb0d16706547ec6831b197c142e1cd27 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
@@ -21,7 +21,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
protected $_cmsPage;
/**
- * @var \Magento\Core\Model\PageLayout\Config\Builder
+ * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
*/
protected $pageLayoutBuilder;
@@ -30,7 +30,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Cms\Model\Page $cmsPage
* @param \Magento\Cms\Model\Resource\Page\Grid\CollectionFactory $collectionFactory
- * @param \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder
+ * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
* @param array $data
*/
public function __construct(
@@ -38,7 +38,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Cms\Model\Page $cmsPage,
\Magento\Cms\Model\Resource\Page\Grid\CollectionFactory $collectionFactory,
- \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder,
+ \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder,
array $data = []
) {
$this->_collectionFactory = $collectionFactory;
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
index 900055473762d1df906c0cbf66bec23bddd52df0..f6efab805aa28ef9fd36d9bf5eca387adf8914df 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
@@ -28,7 +28,7 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
protected $_collectionFactory;
/**
- * @var \Magento\Core\Model\PageLayout\Config\Builder
+ * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
*/
protected $pageLayoutBuilder;
@@ -38,7 +38,7 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
* @param \Magento\Cms\Model\Page $cmsPage
* @param \Magento\Cms\Model\PageFactory $pageFactory
* @param \Magento\Cms\Model\Resource\Page\Grid\CollectionFactory $collectionFactory
- * @param \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder
+ * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
* @param array $data
*/
public function __construct(
@@ -47,7 +47,7 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
\Magento\Cms\Model\Page $cmsPage,
\Magento\Cms\Model\PageFactory $pageFactory,
\Magento\Cms\Model\Resource\Page\Grid\CollectionFactory $collectionFactory,
- \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder,
+ \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder,
array $data = []
) {
$this->pageLayoutBuilder = $pageLayoutBuilder;
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
index 0cd2db75c4fe0d8b63aa9aba11f85d5dd14608ae..adc6a0ee5169eb916e16e674b425c164839b0799 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
@@ -81,7 +81,7 @@ class Tree extends \Magento\Backend\Block\Template
/**
* Root node name of tree
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getRootNodeName()
{
diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
index d512a2aa053a41564383a2f3cf0687faaaec825c..2f8f28e4334fc17c2f112217efbb9aad8c4f3cf0 100644
--- a/app/code/Magento/Cms/Block/Block.php
+++ b/app/code/Magento/Cms/Block/Block.php
@@ -21,7 +21,7 @@ class Block extends \Magento\Framework\View\Element\AbstractBlock implements \Ma
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -37,14 +37,14 @@ class Block extends \Magento\Framework\View\Element\AbstractBlock implements \Ma
*
* @param \Magento\Framework\View\Element\Context $context
* @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Cms\Model\BlockFactory $blockFactory
* @param array $data
*/
public function __construct(
\Magento\Framework\View\Element\Context $context,
\Magento\Cms\Model\Template\FilterProvider $filterProvider,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Cms\Model\BlockFactory $blockFactory,
array $data = []
) {
diff --git a/app/code/Magento/Cms/Block/Page.php b/app/code/Magento/Cms/Block/Page.php
index 0d23f9f88a382b0abf1e19225951bae67b7fe568..6788811a85054149231104adabc78b647ee92b38 100644
--- a/app/code/Magento/Cms/Block/Page.php
+++ b/app/code/Magento/Cms/Block/Page.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Cms\Block;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* Cms page content block
@@ -26,7 +26,7 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -48,7 +48,7 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
* @param \Magento\Framework\View\Element\Context $context
* @param \Magento\Cms\Model\Page $page
* @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Cms\Model\PageFactory $pageFactory
* @param \Magento\Framework\View\Page\Config $pageConfig
* @param array $data
@@ -57,7 +57,7 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
\Magento\Framework\View\Element\Context $context,
\Magento\Cms\Model\Page $page,
\Magento\Cms\Model\Template\FilterProvider $filterProvider,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Cms\Model\PageFactory $pageFactory,
\Magento\Framework\View\Page\Config $pageConfig,
array $data = []
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
old mode 100644
new mode 100755
index da2844521bc3168f3f4b7ddebd36ea86e99db343..c3a871112593f687b23ce20d719fc279b008d394
--- a/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
@@ -37,15 +37,33 @@ class AbstractMassDelete extends \Magento\Backend\App\Action
*/
protected $model = 'Magento\Framework\Model\AbstractModel';
+ /**
+ * @var \Magento\Backend\Model\View\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ ) {
+ $this->resultRedirectFactory = $resultRedirectFactory;
+ parent::__construct($context);
+ }
+
/**
* Execute action
*
- * @return void
+ * @return \Magento\Backend\Model\View\Result\Redirect
*/
public function execute()
{
$data = $this->getRequest()->getParam('massaction', '[]');
$data = json_decode($data, true);
+ $resultRedirect = $this->resultRedirectFactory->create();
try {
if (isset($data['all_selected']) && $data['all_selected'] === true) {
@@ -58,13 +76,12 @@ class AbstractMassDelete extends \Magento\Backend\App\Action
$this->selectedDelete($data['selected']);
} else {
$this->messageManager->addError(__('Please select item(s).'));
- $this->_redirect(static::REDIRECT_URL);
}
} catch (\Exception $e) {
$this->messageManager->addError($e->getMessage());
}
- $this->_redirect(static::REDIRECT_URL);
+ return $resultRedirect->setPath(static::REDIRECT_URL);
}
/**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block.php b/app/code/Magento/Cms/Controller/Adminhtml/Block.php
old mode 100644
new mode 100755
index befeb1f30b9909aadc10abcb8a005c35e79d12c4..d14bd9e73dbf3a4ba6e6ee9475a67639835d9d46
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block.php
@@ -30,24 +30,17 @@ class Block extends \Magento\Backend\App\Action
}
/**
- * Init actions
+ * Init page
*
- * @return $this
+ * @param \Magento\Backend\Model\View\Result\Page $resultPage
+ * @return \Magento\Backend\Model\View\Result\Page
*/
- protected function _initAction()
+ protected function initPage($resultPage)
{
- // load layout, set active menu and breadcrumbs
- $this->_view->loadLayout();
- $this->_setActiveMenu(
- 'Magento_Cms::cms_block'
- )->_addBreadcrumb(
- __('CMS'),
- __('CMS')
- )->_addBreadcrumb(
- __('Static Blocks'),
- __('Static Blocks')
- );
- return $this;
+ $resultPage->setActiveMenu('Magento_Cms::cms_block')
+ ->addBreadcrumb(__('CMS'), __('CMS'))
+ ->addBreadcrumb(__('Static Blocks'), __('Static Blocks'));
+ return $resultPage;
}
/**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
old mode 100644
new mode 100755
index 2c91e21aebea9d25b4d3bc3efb715faaa0a6d208..df5ed33ff756e2279854f7387bb4e8c00911be94
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
@@ -8,13 +8,34 @@ namespace Magento\Cms\Controller\Adminhtml\Block;
class Delete extends \Magento\Cms\Controller\Adminhtml\Block
{
+ /**
+ * @var \Magento\Backend\Model\View\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ ) {
+ $this->resultRedirectFactory = $resultRedirectFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Delete action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
+ /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+ $resultRedirect = $this->resultRedirectFactory->create();
// check if we know what should be deleted
$id = $this->getRequest()->getParam('block_id');
if ($id) {
@@ -26,19 +47,17 @@ class Delete extends \Magento\Cms\Controller\Adminhtml\Block
// display success message
$this->messageManager->addSuccess(__('The block has been deleted.'));
// go to grid
- $this->_redirect('*/*/');
- return;
+ return $resultRedirect->setPath('*/*/');
} catch (\Exception $e) {
// display error message
$this->messageManager->addError($e->getMessage());
// go back to edit form
- $this->_redirect('*/*/edit', ['block_id' => $id]);
- return;
+ return $resultRedirect->setPath('*/*/edit', ['block_id' => $id]);
}
}
// display error message
$this->messageManager->addError(__('We can\'t find a block to delete.'));
// go to grid
- $this->_redirect('*/*/');
+ return $resultRedirect->setPath('*/*/');
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
old mode 100644
new mode 100755
index 9214ba6354f13a3ed087dea1c341756af5c10961..d042bb4fc351e7aece51e943a70351b75718fd8b
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
@@ -8,10 +8,37 @@ namespace Magento\Cms\Controller\Adminhtml\Block;
class Edit extends \Magento\Cms\Controller\Adminhtml\Block
{
+ /**
+ * @var \Magento\Backend\Model\View\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
+ /**
+ * @var \Magento\Framework\View\Result\PageFactory
+ */
+ protected $resultPageFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+ \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ ) {
+ $this->resultRedirectFactory = $resultRedirectFactory;
+ $this->resultPageFactory = $resultPageFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Edit CMS block
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
@@ -25,8 +52,9 @@ class Edit extends \Magento\Cms\Controller\Adminhtml\Block
$model->load($id);
if (!$model->getId()) {
$this->messageManager->addError(__('This block no longer exists.'));
- $this->_redirect('*/*/');
- return;
+ /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+ $resultRedirect = $this->resultRedirectFactory->create();
+ return $resultRedirect->setPath('*/*/');
}
}
// 3. Set entered data if was error when we do save
@@ -38,14 +66,16 @@ class Edit extends \Magento\Cms\Controller\Adminhtml\Block
// 4. Register model to use later in blocks
$this->_coreRegistry->register('cms_block', $model);
+ /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+ $resultPage = $this->resultPageFactory->create();
+
// 5. Build edit form
- $this->_initAction()->_addBreadcrumb(
+ $this->initPage($resultPage)->addBreadcrumb(
$id ? __('Edit Block') : __('New Block'),
$id ? __('Edit Block') : __('New Block')
);
- $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Blocks'));
- $this->_view->getPage()
- ->getConfig()->getTitle()->prepend($model->getId() ? $model->getTitle() : __('New Block'));
- $this->_view->renderLayout();
+ $resultPage->getConfig()->getTitle()->prepend(__('Blocks'));
+ $resultPage->getConfig()->getTitle()->prepend($model->getId() ? $model->getTitle() : __('New Block'));
+ return $resultPage;
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
old mode 100644
new mode 100755
index 7422bd9adee3ead11f4edac293f3a3ca309cebd1..b81e879b9171f69f12bafe1d16ce6414881f3e9d
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
@@ -8,15 +8,35 @@ namespace Magento\Cms\Controller\Adminhtml\Block;
class Index extends \Magento\Cms\Controller\Adminhtml\Block
{
+ /**
+ * @var \Magento\Framework\View\Result\PageFactory
+ */
+ protected $resultPageFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ ) {
+ $this->resultPageFactory = $resultPageFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Index action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
- $this->_initAction();
- $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Blocks'));
- $this->_view->renderLayout();
+ /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+ $resultPage = $this->resultPageFactory->create();
+ $this->initPage($resultPage)->getConfig()->getTitle()->prepend(__('Blocks'));
+ return $resultPage;
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
old mode 100644
new mode 100755
index 5a6836e29317e634e4ce7f6e43d06f88ae5bef5a..bc87b5cb8089fd63d13fadfea4adc631e1310f6b
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
@@ -8,14 +8,34 @@ namespace Magento\Cms\Controller\Adminhtml\Block;
class NewAction extends \Magento\Cms\Controller\Adminhtml\Block
{
+ /**
+ * @var \Magento\Backend\Model\View\Result\ForwardFactory
+ */
+ protected $resultForwardFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+ ) {
+ $this->resultForwardFactory = $resultForwardFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Create new CMS block
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
- // the same form is used to create and edit
- $this->_forward('edit');
+ /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+ $resultForward = $this->resultForwardFactory->create();
+ return $resultForward->forward('edit');
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
old mode 100644
new mode 100755
index b7be060697e8d773b7f7e955e2d65bd9245cdef8..b1006419ecbee1e6f503e606feeeece482d11463
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
@@ -8,13 +8,34 @@ namespace Magento\Cms\Controller\Adminhtml\Block;
class Save extends \Magento\Cms\Controller\Adminhtml\Block
{
+ /**
+ * @var \Magento\Backend\Model\View\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ ) {
+ $this->resultRedirectFactory = $resultRedirectFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Save action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
+ /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+ $resultRedirect = $this->resultRedirectFactory->create();
// check if data sent
$data = $this->getRequest()->getPost();
if ($data) {
@@ -22,8 +43,7 @@ class Save extends \Magento\Cms\Controller\Adminhtml\Block
$model = $this->_objectManager->create('Magento\Cms\Model\Block')->load($id);
if (!$model->getId() && $id) {
$this->messageManager->addError(__('This block no longer exists.'));
- $this->_redirect('*/*/');
- return;
+ return $resultRedirect->setPath('*/*/');
}
// init model and set data
@@ -41,22 +61,19 @@ class Save extends \Magento\Cms\Controller\Adminhtml\Block
// check if 'Save and Continue'
if ($this->getRequest()->getParam('back')) {
- $this->_redirect('*/*/edit', ['block_id' => $model->getId()]);
- return;
+ return $resultRedirect->setPath('*/*/edit', ['block_id' => $model->getId()]);
}
// go to grid
- $this->_redirect('*/*/');
- return;
+ return $resultRedirect->setPath('*/*/');
} catch (\Exception $e) {
// display error message
$this->messageManager->addError($e->getMessage());
// save data in session
$this->_objectManager->get('Magento\Backend\Model\Session')->setFormData($data);
// redirect to edit form
- $this->_redirect('*/*/edit', ['block_id' => $this->getRequest()->getParam('block_id')]);
- return;
+ return $resultRedirect->setPath('*/*/edit', ['block_id' => $this->getRequest()->getParam('block_id')]);
}
}
- $this->_redirect('*/*/');
+ return $resultRedirect->setPath('*/*/');
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
old mode 100644
new mode 100755
index 6690917e839b445e66419529be70f44069343162..e785e256d97b3fa57c18bd37f2b0bd5ac51cbef8
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
@@ -6,21 +6,54 @@
*/
namespace Magento\Cms\Controller\Adminhtml\Block\Widget;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\LayoutFactory;
+use Magento\Framework\Controller\Result\RawFactory;
+
class Chooser extends \Magento\Backend\App\Action
{
+ /**
+ * @var \Magento\Framework\View\LayoutFactory
+ */
+ protected $layoutFactory;
+
+ /**
+ * @var RawFactory
+ */
+ protected $resultRawFactory;
+
+ /**
+ * @param Context $context
+ * @param LayoutFactory $layoutFactory
+ * @param RawFactory $resultRawFactory
+ */
+ public function __construct(Context $context, LayoutFactory $layoutFactory, RawFactory $resultRawFactory)
+ {
+ $this->layoutFactory = $layoutFactory;
+ $this->resultRawFactory = $resultRawFactory;
+ parent::__construct($context);
+ }
+
/**
* Chooser Source action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
+ /** @var \Magento\Framework\View\Layout $layout */
+ $layout = $this->layoutFactory->create();
+
$uniqId = $this->getRequest()->getParam('uniq_id');
- $pagesGrid = $this->_view->getLayout()->createBlock(
+ $pagesGrid = $layout->createBlock(
'Magento\Cms\Block\Adminhtml\Block\Widget\Chooser',
'',
['data' => ['id' => $uniqId]]
);
- $this->getResponse()->setBody($pagesGrid->toHtml());
+
+ /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+ $resultRaw = $this->resultRawFactory->create();
+ $resultRaw->setContents($pagesGrid->toHtml());
+ return $resultRaw;
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
index 558ba3021d7240529900accf19eea9ae098ff929..306668ffe6ac4ef2b1b87559a87ff11fb7df1f6d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
@@ -6,8 +6,27 @@
*/
namespace Magento\Cms\Controller\Adminhtml\Page;
+use Magento\Backend\App\Action;
+
class Delete extends \Magento\Backend\App\Action
{
+ /**
+ * @var \Magento\Backend\Model\View\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
+ /**
+ * @param Action\Context $context
+ * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ */
+ public function __construct(
+ Action\Context $context,
+ \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ ) {
+ $this->resultRedirectFactory = $resultRedirectFactory;
+ parent::__construct($context);
+ }
+
/**
* {@inheritdoc}
*/
@@ -19,12 +38,14 @@ class Delete extends \Magento\Backend\App\Action
/**
* Delete action
*
- * @return void
+ * @return \Magento\Backend\Model\View\Result\Redirect
*/
public function execute()
{
// check if we know what should be deleted
$id = $this->getRequest()->getParam('page_id');
+ /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+ $resultRedirect = $this->resultRedirectFactory->create();
if ($id) {
$title = "";
try {
@@ -40,8 +61,7 @@ class Delete extends \Magento\Backend\App\Action
'adminhtml_cmspage_on_delete',
['title' => $title, 'status' => 'success']
);
- $this->_redirect('*/*/');
- return;
+ return $resultRedirect->setPath('*/*/');
} catch (\Exception $e) {
$this->_eventManager->dispatch(
'adminhtml_cmspage_on_delete',
@@ -50,13 +70,12 @@ class Delete extends \Magento\Backend\App\Action
// display error message
$this->messageManager->addError($e->getMessage());
// go back to edit form
- $this->_redirect('*/*/edit', ['page_id' => $id]);
- return;
+ return $resultRedirect->setPath('*/*/edit', ['page_id' => $id]);
}
}
// display error message
$this->messageManager->addError(__('We can\'t find a page to delete.'));
// go to grid
- $this->_redirect('*/*/');
+ return $resultRedirect->setPath('*/*/');
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
old mode 100644
new mode 100755
index 1eea746d46d08c5d95692fc9333bd29efd74d1ae..36e68c281a54aa5fa5226af889678e9907bf601a
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
@@ -17,12 +17,30 @@ class Edit extends \Magento\Backend\App\Action
*/
protected $_coreRegistry = null;
+ /**
+ * @var \Magento\Framework\View\Result\PageFactory
+ */
+ protected $resultPageFactory;
+
+ /**
+ * @var \Magento\Backend\Model\View\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
/**
* @param Action\Context $context
+ * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
* @param \Magento\Framework\Registry $registry
*/
- public function __construct(Action\Context $context, \Magento\Framework\Registry $registry)
- {
+ public function __construct(
+ Action\Context $context,
+ \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+ \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+ \Magento\Framework\Registry $registry
+ ) {
+ $this->resultPageFactory = $resultPageFactory;
+ $this->resultRedirectFactory = $resultRedirectFactory;
$this->_coreRegistry = $registry;
parent::__construct($context);
}
@@ -38,28 +56,23 @@ class Edit extends \Magento\Backend\App\Action
/**
* Init actions
*
- * @return $this
+ * @return \Magento\Backend\Model\View\Result\Page
*/
protected function _initAction()
{
// load layout, set active menu and breadcrumbs
- $this->_view->loadLayout();
- $this->_setActiveMenu(
- 'Magento_Cms::cms_page'
- )->_addBreadcrumb(
- __('CMS'),
- __('CMS')
- )->_addBreadcrumb(
- __('Manage Pages'),
- __('Manage Pages')
- );
- return $this;
+ /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+ $resultPage = $this->resultPageFactory->create();
+ $resultPage->setActiveMenu('Magento_Cms::cms_page')
+ ->addBreadcrumb(__('CMS'), __('CMS'))
+ ->addBreadcrumb(__('Manage Pages'), __('Manage Pages'));
+ return $resultPage;
}
/**
* Edit CMS page
*
- * @return void
+ * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function execute()
@@ -73,8 +86,10 @@ class Edit extends \Magento\Backend\App\Action
$model->load($id);
if (!$model->getId()) {
$this->messageManager->addError(__('This page no longer exists.'));
- $this->_redirect('*/*/');
- return;
+ /** \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+ $resultRedirect = $this->resultRedirectFactory->create();
+
+ return $resultRedirect->setPath('*/*/');
}
}
@@ -88,13 +103,16 @@ class Edit extends \Magento\Backend\App\Action
$this->_coreRegistry->register('cms_page', $model);
// 5. Build edit form
- $this->_initAction()->_addBreadcrumb(
+ /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+ $resultPage = $this->_initAction();
+ $resultPage->addBreadcrumb(
$id ? __('Edit Page') : __('New Page'),
$id ? __('Edit Page') : __('New Page')
);
- $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Pages'));
- $this->_view->getPage()->getConfig()->getTitle()
+ $resultPage->getConfig()->getTitle()->prepend(__('Pages'));
+ $resultPage->getConfig()->getTitle()
->prepend($model->getId() ? $model->getTitle() : __('New Page'));
- $this->_view->renderLayout();
+
+ return $resultPage;
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
index f09834b1696126606cd1271db064a7dc2a29829b..61405419a007bd574a91981a35367b0af69336f0 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
@@ -6,8 +6,27 @@
*/
namespace Magento\Cms\Controller\Adminhtml\Page;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\Result\PageFactory;
+
class Index extends \Magento\Backend\App\Action
{
+ /**
+ * @var PageFactory
+ */
+ protected $resultPageFactory;
+
+ /**
+ * @param Context $context
+ * @param PageFactory $resultPageFactory
+ */
+ public function __construct(
+ Context $context,
+ PageFactory $resultPageFactory
+ ) {
+ parent::__construct($context);
+ $this->resultPageFactory = $resultPageFactory;
+ }
/**
* Check the permission to run it
*
@@ -21,21 +40,17 @@ class Index extends \Magento\Backend\App\Action
/**
* Index action
*
- * @return void
+ * @return \Magento\Backend\Model\View\Result\Page
*/
public function execute()
{
- $this->_view->loadLayout();
- $this->_setActiveMenu(
- 'Magento_Cms::cms_page'
- )->_addBreadcrumb(
- __('CMS'),
- __('CMS')
- )->_addBreadcrumb(
- __('Manage Pages'),
- __('Manage Pages')
- );
- $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Pages'));
- $this->_view->renderLayout();
+ /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+ $resultPage = $this->resultPageFactory->create();
+ $resultPage->setActiveMenu('Magento_Cms::cms_page');
+ $resultPage->addBreadcrumb(__('CMS'), __('CMS'));
+ $resultPage->addBreadcrumb(__('Manage Pages'), __('Manage Pages'));
+ $resultPage->getConfig()->getTitle()->prepend(__('Pages'));
+
+ return $resultPage;
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
old mode 100644
new mode 100755
index 147f11fa3bdb82aa9f0438ee89a2aa1f60f70f39..100c0b05f2a0fc8ce7c85df2a8c0c59839b92752
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
@@ -8,6 +8,23 @@ namespace Magento\Cms\Controller\Adminhtml\Page;
class NewAction extends \Magento\Backend\App\Action
{
+ /**
+ * @var \Magento\Backend\Model\View\Result\Forward
+ */
+ protected $resultForwardFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+ ) {
+ $this->resultForwardFactory = $resultForwardFactory;
+ parent::__construct($context);
+ }
+
/**
* {@inheritdoc}
*/
@@ -19,10 +36,12 @@ class NewAction extends \Magento\Backend\App\Action
/**
* Forward to edit
*
- * @return void
+ * @return \Magento\Backend\Model\View\Result\Forward
*/
public function execute()
{
- $this->_forward('edit');
+ /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
+ $resultForward = $this->resultForwardFactory->create();
+ return $resultForward->forward('edit');
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
index 6ff20ec06ff463b148af7d2436dbf3550057caf9..fc04c496ac135479d28c84433179fdd0242d5e07 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
@@ -14,7 +14,7 @@ class PostDataProcessor
protected $dateFilter;
/**
- * @var \Magento\Core\Model\Layout\Update\ValidatorFactory
+ * @var \Magento\Framework\View\Model\Layout\Update\ValidatorFactory
*/
protected $validatorFactory;
@@ -26,12 +26,12 @@ class PostDataProcessor
/**
* @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
* @param \Magento\Framework\Message\ManagerInterface $messageManager
- * @param \Magento\Core\Model\Layout\Update\ValidatorFactory $validatorFactory
+ * @param \Magento\Framework\View\Model\Layout\Update\ValidatorFactory $validatorFactory
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
\Magento\Framework\Message\ManagerInterface $messageManager,
- \Magento\Core\Model\Layout\Update\ValidatorFactory $validatorFactory
+ \Magento\Framework\View\Model\Layout\Update\ValidatorFactory $validatorFactory
) {
$this->dateFilter = $dateFilter;
$this->messageManager = $messageManager;
@@ -65,7 +65,7 @@ class PostDataProcessor
{
$errorNo = true;
if (!empty($data['layout_update_xml']) || !empty($data['custom_layout_update_xml'])) {
- /** @var $validatorCustomLayout \Magento\Core\Model\Layout\Update\Validator */
+ /** @var $validatorCustomLayout \Magento\Framework\View\Model\Layout\Update\Validator */
$validatorCustomLayout = $this->validatorFactory->create();
if (!empty($data['layout_update_xml']) && !$validatorCustomLayout->isValid($data['layout_update_xml'])) {
$errorNo = false;
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
index 52c036c763026f77f0ab1d573d240e80c18ec64a..fcfe1823ca4006bcd18af36d4c7d348b85cdfdea 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -7,9 +7,15 @@
namespace Magento\Cms\Controller\Adminhtml\Page;
use Magento\Backend\App\Action;
+use Magento\Backend\Model\View\Result\RedirectFactory;
class Save extends \Magento\Backend\App\Action
{
+ /**
+ * @var RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
/**
* @var PostDataProcessor
*/
@@ -18,10 +24,15 @@ class Save extends \Magento\Backend\App\Action
/**
* @param Action\Context $context
* @param PostDataProcessor $dataProcessor
+ * @param RedirectFactory $resultRedirectFactory
*/
- public function __construct(Action\Context $context, PostDataProcessor $dataProcessor)
- {
+ public function __construct(
+ Action\Context $context,
+ PostDataProcessor $dataProcessor,
+ RedirectFactory $resultRedirectFactory
+ ) {
$this->dataProcessor = $dataProcessor;
+ $this->resultRedirectFactory = $resultRedirectFactory;
parent::__construct($context);
}
@@ -36,11 +47,13 @@ class Save extends \Magento\Backend\App\Action
/**
* Save action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
$data = $this->getRequest()->getPost();
+ /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+ $resultRedirect = $this->resultRedirectFactory->create();
if ($data) {
$data = $this->dataProcessor->filter($data);
$model = $this->_objectManager->create('Magento\Cms\Model\Page');
@@ -58,8 +71,7 @@ class Save extends \Magento\Backend\App\Action
);
if (!$this->dataProcessor->validate($data)) {
- $this->_redirect('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
- return;
+ return $resultRedirect->setPath('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
}
try {
@@ -67,11 +79,9 @@ class Save extends \Magento\Backend\App\Action
$this->messageManager->addSuccess(__('The page has been saved.'));
$this->_objectManager->get('Magento\Backend\Model\Session')->setFormData(false);
if ($this->getRequest()->getParam('back')) {
- $this->_redirect('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
- return;
+ return $resultRedirect->setPath('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
}
- $this->_redirect('*/*/');
- return;
+ return $resultRedirect->setPath('*/*/');
} catch (\Magento\Framework\Model\Exception $e) {
$this->messageManager->addError($e->getMessage());
} catch (\RuntimeException $e) {
@@ -81,9 +91,8 @@ class Save extends \Magento\Backend\App\Action
}
$this->_getSession()->setFormData($data);
- $this->_redirect('*/*/edit', ['page_id' => $this->getRequest()->getParam('page_id')]);
- return;
+ return $resultRedirect->setPath('*/*/edit', ['page_id' => $this->getRequest()->getParam('page_id')]);
}
- $this->_redirect('*/*/');
+ return $resultRedirect->setPath('*/*/');
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
index 0212c7418931793d373c19e7f6876de9eeba1594..49e8206f822fa07158335c767c0fb19d67e3b1a8 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
@@ -6,21 +6,54 @@
*/
namespace Magento\Cms\Controller\Adminhtml\Page\Widget;
+use Magento\Backend\App\Action;
+
class Chooser extends \Magento\Backend\App\Action
{
+ /**
+ * @var \Magento\Framework\View\LayoutFactory
+ */
+ protected $layoutFactory;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\RawFactory
+ */
+ protected $resultRawFactory;
+
+ /**
+ * @param Action\Context $context
+ * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+ * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+ */
+ public function __construct(
+ Action\Context $context,
+ \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+ \Magento\Framework\View\LayoutFactory $layoutFactory
+ ) {
+ $this->layoutFactory = $layoutFactory;
+ $this->resultRawFactory = $resultRawFactory;
+ parent::__construct($context);
+ }
+
/**
* Chooser Source action
*
- * @return void
+ * @return \Magento\Framework\Controller\Result\Raw
*/
public function execute()
{
$uniqId = $this->getRequest()->getParam('uniq_id');
- $pagesGrid = $this->_view->getLayout()->createBlock(
+ /** @var \Magento\Framework\View\Layout $layout */
+ $layout = $this->layoutFactory->create();
+ $pagesGrid = $layout->createBlock(
'Magento\Cms\Block\Adminhtml\Page\Widget\Chooser',
'',
['data' => ['id' => $uniqId]]
);
- $this->getResponse()->setBody($pagesGrid->toHtml());
+ $html = $pagesGrid->toHtml();
+ /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+ $resultRaw = $this->resultRawFactory->create();
+
+ return $resultRaw->setContents($html);
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
old mode 100644
new mode 100755
index 712131099be7fe7018d5874357b4e8a1000bb414..51d1fc3502be0f18fea71866c28440aac770c136
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -15,24 +15,30 @@ class Directive extends \Magento\Backend\App\Action
*/
protected $urlDecoder;
+ /**
+ * @var \Magento\Framework\Controller\Result\RawFactory
+ */
+ protected $resultRawFactory;
+
/**
* @param Action\Context $context
* @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+ * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
*/
public function __construct(
Action\Context $context,
- \Magento\Framework\Url\DecoderInterface $urlDecoder
+ \Magento\Framework\Url\DecoderInterface $urlDecoder,
+ \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
) {
parent::__construct($context);
$this->urlDecoder = $urlDecoder;
+ $this->resultRawFactory = $resultRawFactory;
}
/**
* Template directives callback
*
- * @todo: move this to some model
- *
- * @return void
+ * @return \Magento\Framework\Controller\Result\Raw
*/
public function execute()
{
@@ -41,15 +47,19 @@ class Directive extends \Magento\Backend\App\Action
$imagePath = $this->_objectManager->create('Magento\Cms\Model\Template\Filter')->filter($directive);
/** @var \Magento\Framework\Image\Adapter\AdapterInterface $image */
$image = $this->_objectManager->get('Magento\Framework\Image\AdapterFactory')->create();
- $response = $this->getResponse();
+ /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+ $resultRaw = $this->resultRawFactory->create();
try {
$image->open($imagePath);
- $response->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
+ $resultRaw->setHeader('Content-Type', $image->getMimeType());
+ $resultRaw->setContents($image->getImage());
} catch (\Exception $e) {
$imagePath = $this->_objectManager->get('Magento\Cms\Model\Wysiwyg\Config')->getSkinImagePlaceholderPath();
$image->open($imagePath);
- $response->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
+ $resultRaw->setHeader('Content-Type', $image->getMimeType());
+ $resultRaw->setContents($image->getImage());
$this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
}
+ return $resultRaw;
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php
old mode 100644
new mode 100755
index 4a3c4daf35fe575cb422b6613f9d24c5aa30884d..5306fdb26fd41f4b771b98b6f7b1013909dc0e15
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php
@@ -8,6 +8,33 @@ namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
class Contents extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
{
+ /**
+ * @var \Magento\Framework\View\Result\LayoutFactory
+ */
+ protected $resultLayoutFactory;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\JSONFactory
+ */
+ protected $resultJsonFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+ * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+ \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+ ) {
+ $this->resultLayoutFactory = $resultLayoutFactory;
+ $this->resultJsonFactory = $resultJsonFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Save current path in session
*
@@ -24,19 +51,21 @@ class Contents extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
/**
* Contents action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
try {
$this->_initAction()->_saveSessionCurrentPath();
- $this->_view->loadLayout('empty');
- $this->_view->renderLayout();
+ /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+ $resultLayout = $this->resultLayoutFactory->create();
+ return $resultLayout;
} catch (\Exception $e) {
$result = ['error' => true, 'message' => $e->getMessage()];
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+ /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+ $resultJson = $this->resultJsonFactory->create();
+ $resultJson->setData($result);
+ return $resultJson;
}
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
old mode 100644
new mode 100755
index de1d96c36e98c4ce5fb262ff34b638744d20846a..c415e2331c36c68641046758bee3c390b6ac0db2
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
@@ -10,10 +10,38 @@ use Magento\Framework\App\Filesystem\DirectoryList;
class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
{
+ /**
+ * @var \Magento\Framework\Controller\Result\JSONFactory
+ */
+ protected $resultJsonFactory;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\RawFactory
+ */
+ protected $resultRawFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+ * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory,
+ \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+ ) {
+ $this->resultRawFactory = $resultRawFactory;
+ $this->resultJsonFactory = $resultJsonFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
+
/**
* Delete file from media storage
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
@@ -36,11 +64,12 @@ class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
$this->getStorage()->deleteFile($filePath);
}
}
+ return $this->resultRawFactory->create();
} catch (\Exception $e) {
$result = ['error' => true, 'message' => $e->getMessage()];
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+ /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+ $resultJson = $this->resultJsonFactory->create();
+ return $resultJson->setData($result);
}
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
old mode 100644
new mode 100755
index f292568f1d204570c023815cb85076df54f736e7..a9fde1794b9da9fac7365961c40ba097e3750b89
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
@@ -8,21 +8,49 @@ namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
{
+ /**
+ * @var \Magento\Framework\Controller\Result\JSONFactory
+ */
+ protected $resultJsonFactory;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\RawFactory
+ */
+ protected $resultRawFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+ * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory,
+ \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+ ) {
+ $this->resultRawFactory = $resultRawFactory;
+ $this->resultJsonFactory = $resultJsonFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Delete folder action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
try {
$path = $this->getStorage()->getCmsWysiwygImages()->getCurrentPath();
$this->getStorage()->deleteDirectory($path);
+ return $this->resultRawFactory->create();
} catch (\Exception $e) {
$result = ['error' => true, 'message' => $e->getMessage()];
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+ /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+ $resultJson = $this->resultJsonFactory->create();
+ return $resultJson->setData($result);
}
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
old mode 100644
new mode 100755
index ec69d0799c9259dc995b8bc24d14e891ade8715a..3c22b5fbcb0179f0b43e1de22a82dd033e2c9673
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
@@ -8,10 +8,29 @@ namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
class Index extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
{
+ /**
+ * @var \Magento\Framework\View\Result\LayoutFactory
+ */
+ protected $resultLayoutFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+ ) {
+ $this->resultLayoutFactory = $resultLayoutFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Index action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
@@ -23,11 +42,13 @@ class Index extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
$this->messageManager->addError($e->getMessage());
}
$this->_initAction();
- $this->_view->loadLayout('overlay_popup');
- $block = $this->_view->getLayout()->getBlock('wysiwyg_images.js');
+ /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+ $resultLayout = $this->resultLayoutFactory->create();
+ $resultLayout->addHandle('overlay_popup');
+ $block = $resultLayout->getLayout()->getBlock('wysiwyg_images.js');
if ($block) {
$block->setStoreId($storeId);
}
- $this->_view->renderLayout();
+ return $resultLayout;
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
old mode 100644
new mode 100755
index a8aa18318bda30e15a2429dc2bfb53b5c56ae6fb..c270e3463f9189d5d0cd1f9eae97d001fb900ae3
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
@@ -8,10 +8,29 @@ namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
{
+ /**
+ * @var \Magento\Framework\Controller\Result\JSONFactory
+ */
+ protected $resultJsonFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+ ) {
+ $this->resultJsonFactory = $resultJsonFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* New folder action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
@@ -23,8 +42,8 @@ class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
} catch (\Exception $e) {
$result = ['error' => true, 'message' => $e->getMessage()];
}
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+ /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+ $resultJson = $this->resultJsonFactory->create();
+ return $resultJson->setData($result);
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
old mode 100644
new mode 100755
index 923ecd79b2bf2d876715e46ce61db767d40bca76..738cba1295e40a49e57ad3c791d2aafed0cc8fc1
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -8,10 +8,29 @@ namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
class OnInsert extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
{
+ /**
+ * @var \Magento\Framework\Controller\Result\RawFactory
+ */
+ protected $resultRawFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+ ) {
+ $this->resultRawFactory = $resultRawFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Fire when select image
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
@@ -26,6 +45,9 @@ class OnInsert extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
$helper->setStoreId($storeId);
$image = $helper->getImageHtmlDeclaration($filename, $asIs);
- $this->getResponse()->setBody($image);
+
+ /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+ $resultRaw = $this->resultRawFactory->create();
+ return $resultRaw->setContents($image);
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
old mode 100644
new mode 100755
index 47c80bb413a2228fde78df24adade9106827bee6..a5a2d6bbc2a1e29fa867f56b9111dee77e486c70
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
@@ -6,23 +6,49 @@
*/
namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
+use Magento\Backend\App\Action;
+
class Thumbnail extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
{
+ /**
+ * @var \Magento\Framework\Controller\Result\RawFactory
+ */
+ protected $resultRawFactory;
+
+ /**
+ * @param Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+ */
+ public function __construct(
+ Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+ ) {
+ $this->resultRawFactory = $resultRawFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
+
/**
* Generate image thumbnail on the fly
*
- * @return void
+ * @return \Magento\Framework\Controller\Result\Raw
*/
public function execute()
{
$file = $this->getRequest()->getParam('file');
$file = $this->_objectManager->get('Magento\Cms\Helper\Wysiwyg\Images')->idDecode($file);
$thumb = $this->getStorage()->resizeOnTheFly($file);
+ /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+ $resultRaw = $this->resultRawFactory->create();
if ($thumb !== false) {
/** @var \Magento\Framework\Image\Adapter\AdapterInterface $image */
$image = $this->_objectManager->get('Magento\Framework\Image\AdapterFactory')->create();
$image->open($thumb);
- $this->getResponse()->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
+ $resultRaw->setHeader('Content-Type', $image->getMimeType());
+ $resultRaw->setContents($image->getImage());
+ return $resultRaw;
} else {
// todo: generate some placeholder
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php
old mode 100644
new mode 100755
index 03091d8547ce23eab8c30d2e723fdd20b7685dc6..00950a5390e6b3d61f2c38f43131b99d40ff6b5a
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php
@@ -8,25 +8,55 @@ namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
class TreeJson extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
{
+ /**
+ * @var \Magento\Framework\Controller\Result\JSONFactory
+ */
+ protected $resultJsonFactory;
+
+ /**
+ * @var \Magento\Framework\View\LayoutFactory
+ */
+ protected $layoutFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+ * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory,
+ \Magento\Framework\View\LayoutFactory $layoutFactory
+ ) {
+ $this->layoutFactory = $layoutFactory;
+ $this->resultJsonFactory = $resultJsonFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Tree json action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
+ /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+ $resultJson = $this->resultJsonFactory->create();
try {
$this->_initAction();
- $this->getResponse()->representJson(
- $this->_view->getLayout()->createBlock(
+ /** @var \Magento\Framework\View\Layout $layout */
+ $layout = $this->layoutFactory->create();
+ $resultJson->setJsonData(
+ $layout->createBlock(
'Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree'
)->getTreeJson()
);
} catch (\Exception $e) {
$result = ['error' => true, 'message' => $e->getMessage()];
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+ $resultJson->setData($result);
}
+ return $resultJson;
}
}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
old mode 100644
new mode 100755
index 4736cc941e13677615bd4daf5b7a600e3be80e2a..61b1c8f631b49b27a981880e13e0e1fb6fd4370e
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
@@ -8,10 +8,29 @@ namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
{
+ /**
+ * @var \Magento\Framework\Controller\Result\JSONFactory
+ */
+ protected $resultJsonFactory;
+
+ /**
+ * @param \Magento\Backend\App\Action\Context $context
+ * @param \Magento\Framework\Registry $coreRegistry
+ * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+ */
+ public function __construct(
+ \Magento\Backend\App\Action\Context $context,
+ \Magento\Framework\Registry $coreRegistry,
+ \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+ ) {
+ $this->resultJsonFactory = $resultJsonFactory;
+ parent::__construct($context, $coreRegistry);
+ }
+
/**
* Files upload processing
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
@@ -22,8 +41,8 @@ class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
} catch (\Exception $e) {
$result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
}
- $this->getResponse()->representJson(
- $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
- );
+ /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+ $resultJson = $this->resultJsonFactory->create();
+ return $resultJson->setData($result);
}
}
diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
old mode 100644
new mode 100755
index cd80052706154298408aac88d4104d487f74937d..48375885c9842d7a9efa60a40b8716735da54431
--- a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
+++ b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
@@ -1,8 +1,5 @@
<?php
/**
- * Default no route page action
- * Used if no route page don't configure or available
- *
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
@@ -11,15 +8,30 @@ namespace Magento\Cms\Controller\Index;
class DefaultNoRoute extends \Magento\Framework\App\Action\Action
{
/**
- *
- * @return void
+ * @var \Magento\Framework\View\Result\PageFactory
+ */
+ protected $resultPageFactory;
+
+ /**
+ * @param \Magento\Framework\App\Action\Context $context
+ * @param \Magento\Framework\View\Result\PageFactory resultPageFactory
+ */
+ public function __construct(
+ \Magento\Framework\App\Action\Context $context,
+ \Magento\Framework\View\Result\PageFactory $resultPageFactory
+ ) {
+ $this->resultPageFactory = $resultPageFactory;
+ parent::__construct($context);
+ }
+
+ /**
+ * @return \Magento\Framework\View\Result\LayoutFactory
*/
public function execute()
{
- $this->getResponse()->setHeader('HTTP/1.1', '404 Not Found');
- $this->getResponse()->setHeader('Status', '404 File not found');
-
- $this->_view->loadLayout();
- $this->_view->renderLayout();
+ $resultLayout = $this->resultPageFactory->create();
+ $resultLayout->setHeader('HTTP/1.1', '404 Not Found');
+ $resultLayout->setHeader('Status', '404 File not found');
+ return $resultLayout;
}
}
diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
old mode 100644
new mode 100755
index 35c1c3ee776fe9a8db717e595dda1ea90959ad43..fe007e0d5173d63e33d4af772688f25ed95972e9
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -8,11 +8,28 @@ namespace Magento\Cms\Controller\Index;
class Index extends \Magento\Framework\App\Action\Action
{
+ /**
+ * @var \Magento\Framework\Controller\Result\ForwardFactory
+ */
+ protected $resultForwardFactory;
+
+ /**
+ * @param \Magento\Framework\App\Action\Context $context
+ * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+ */
+ public function __construct(
+ \Magento\Framework\App\Action\Context $context,
+ \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+ ) {
+ $this->resultForwardFactory = $resultForwardFactory;
+ parent::__construct($context);
+ }
+
/**
* Renders CMS Home page
*
* @param string|null $coreRoute
- * @return void
+ * @return \Magento\Framework\Controller\Result\Forward
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function execute($coreRoute = null)
@@ -21,10 +38,15 @@ class Index extends \Magento\Framework\App\Action\Action
'Magento\Framework\App\Config\ScopeConfigInterface'
)->getValue(
\Magento\Cms\Helper\Page::XML_PATH_HOME_PAGE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
- if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
- $this->_forward('defaultIndex');
+ $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->prepareResultPage($this, $pageId);
+ if (!$resultPage) {
+ /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+ $resultForward = $this->resultForwardFactory->create();
+ $resultForward->forward('defaultIndex');
+ return $resultForward;
}
+ return $resultPage;
}
}
diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
old mode 100644
new mode 100755
index eb80279fef3f9bb9202cf26ab94c4b16745818fe..ec1bdfcf89cf1f301149a55715d196976bbac80b
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -8,27 +8,50 @@ namespace Magento\Cms\Controller\Noroute;
class Index extends \Magento\Framework\App\Action\Action
{
+ /**
+ * @var \Magento\Framework\Controller\Result\ForwardFactory
+ */
+ protected $resultForwardFactory;
+
+ /**
+ * @param \Magento\Framework\App\Action\Context $context
+ * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+ */
+ public function __construct(
+ \Magento\Framework\App\Action\Context $context,
+ \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+ ) {
+ $this->resultForwardFactory = $resultForwardFactory;
+ parent::__construct($context);
+ }
+
/**
* Render CMS 404 Not found page
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
- $this->getResponse()->setHeader('HTTP/1.1', '404 Not Found');
- $this->getResponse()->setHeader('Status', '404 File not found');
-
$pageId = $this->_objectManager->get(
'Magento\Framework\App\Config\ScopeConfigInterface',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->getValue(
\Magento\Cms\Helper\Page::XML_PATH_NO_ROUTE_PAGE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
/** @var \Magento\Cms\Helper\Page $pageHelper */
$pageHelper = $this->_objectManager->get('Magento\Cms\Helper\Page');
- if (!$pageHelper->renderPage($this, $pageId)) {
- $this->_forward('defaultNoRoute', 'index');
+ $resultPage = $pageHelper->prepareResultPage($this, $pageId);
+ if ($resultPage) {
+ $resultPage->setHeader('HTTP/1.1', '404 Not Found');
+ $resultPage->setHeader('Status', '404 File not found');
+ return $resultPage;
+ } else {
+ /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+ $resultForward = $this->resultForwardFactory->create();
+ $resultForward->setController('index');
+ $resultForward->forward('defaultNoRoute');
+ return $resultForward;
}
}
}
diff --git a/app/code/Magento/Cms/Controller/Page/View.php b/app/code/Magento/Cms/Controller/Page/View.php
old mode 100644
new mode 100755
index 9be7e22f321d7422036d0a1853ef1d4de8f8831c..4775fc3fe9358127e9d6bc060109b8e6d5516b65
--- a/app/code/Magento/Cms/Controller/Page/View.php
+++ b/app/code/Magento/Cms/Controller/Page/View.php
@@ -8,16 +8,36 @@ namespace Magento\Cms\Controller\Page;
class View extends \Magento\Framework\App\Action\Action
{
+ /**
+ * @var \Magento\Framework\Controller\Result\ForwardFactory
+ */
+ protected $resultForwardFactory;
+
+ /**
+ * @param \Magento\Framework\App\Action\Context $context
+ * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+ */
+ public function __construct(
+ \Magento\Framework\App\Action\Context $context,
+ \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+ ) {
+ $this->resultForwardFactory = $resultForwardFactory;
+ parent::__construct($context);
+ }
+
/**
* View CMS page action
*
- * @return void
+ * @return \Magento\Framework\Controller\ResultInterface
*/
public function execute()
{
$pageId = $this->getRequest()->getParam('page_id', $this->getRequest()->getParam('id', false));
- if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
- $this->_forward('noroute');
+ $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->prepareResultPage($this, $pageId);
+ if (!$resultPage) {
+ $resultForward = $this->resultForwardFactory->create();
+ return $resultForward->forward('noroute');
}
+ return $resultPage;
}
}
diff --git a/app/code/Magento/Cms/Controller/Router.php b/app/code/Magento/Cms/Controller/Router.php
index 56684456944f14719e6ed07d826fef4e0e8c5a42..669434a6342470eabc9e8ff1477783f4be226604 100644
--- a/app/code/Magento/Cms/Controller/Router.php
+++ b/app/code/Magento/Cms/Controller/Router.php
@@ -27,7 +27,7 @@ class Router implements \Magento\Framework\App\RouterInterface
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -64,7 +64,7 @@ class Router implements \Magento\Framework\App\RouterInterface
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\UrlInterface $url
* @param \Magento\Cms\Model\PageFactory $pageFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\ResponseInterface $response
*/
public function __construct(
@@ -72,7 +72,7 @@ class Router implements \Magento\Framework\App\RouterInterface
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\UrlInterface $url,
\Magento\Cms\Model\PageFactory $pageFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\ResponseInterface $response
) {
$this->actionFactory = $actionFactory;
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
old mode 100644
new mode 100755
index 7a6a44969f10016c3c9d3bfc19a2ae9cbffbc2fb..38cdcaae130bf0392d4168a630b3a6afd66bf196
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -9,6 +9,9 @@ use Magento\Framework\App\Action\Action;
/**
* CMS Page Helper
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
class Page extends \Magento\Framework\App\Helper\AbstractHelper
{
@@ -52,7 +55,7 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -69,16 +72,9 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
protected $_escaper;
/**
- * @deprecated
- * @TODO MAGETWO-28356: Refactor controller actions to new ResultInterface
- * @var \Magento\Framework\App\ViewInterface
+ * @var \Magento\Framework\View\Result\PageFactory
*/
- protected $_view;
-
- /**
- * @var \Magento\Framework\View\Page\Config
- */
- protected $pageConfig;
+ protected $resultPageFactory;
/**
* Constructor
@@ -88,11 +84,10 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Cms\Model\Page $page
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Cms\Model\PageFactory $pageFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Escaper $escaper
- * @param \Magento\Framework\App\ViewInterface $view
- * @param \Magento\Framework\View\Page\Config $pageConfig
+ * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -101,50 +96,30 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
\Magento\Cms\Model\Page $page,
\Magento\Framework\View\DesignInterface $design,
\Magento\Cms\Model\PageFactory $pageFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Escaper $escaper,
- \Magento\Framework\App\ViewInterface $view,
- \Magento\Framework\View\Page\Config $pageConfig
+ \Magento\Framework\View\Result\PageFactory $resultPageFactory
) {
$this->messageManager = $messageManager;
- $this->_view = $view;
$this->_page = $page;
$this->_design = $design;
$this->_pageFactory = $pageFactory;
$this->_storeManager = $storeManager;
- $this->_storeManager = $storeManager;
$this->_localeDate = $localeDate;
$this->_escaper = $escaper;
- $this->pageConfig = $pageConfig;
+ $this->resultPageFactory = $resultPageFactory;
parent::__construct($context);
}
/**
- * Renders CMS page on front end
- *
- * Call from controller action
+ * Return result CMS page
*
* @param Action $action
- * @param int $pageId
- * @return bool
+ * @param null $pageId
+ * @return \Magento\Framework\View\Result\Page|bool
*/
- public function renderPage(Action $action, $pageId = null)
- {
- return $this->_renderPage($action, $pageId);
- }
-
- /**
- * Renders CMS page
- *
- * @param Action $action
- * @param int $pageId
- * @param bool $renderLayout
- * @return bool
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
- * @SuppressWarnings(PHPMD.NPathComplexity)
- */
- protected function _renderPage(Action $action, $pageId = null, $renderLayout = true)
+ public function prepareResultPage(Action $action, $pageId = null)
{
if (!is_null($pageId) && $pageId !== $this->_page->getId()) {
$delimiterPosition = strrpos($pageId, '|');
@@ -173,19 +148,9 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
$this->_design->setDesignTheme($this->_page->getCustomTheme());
}
}
- $resultPage = $this->_view->getPage();
- if ($this->_page->getPageLayout()) {
- if ($this->_page->getCustomPageLayout()
- && $this->_page->getCustomPageLayout() != 'empty'
- && $inRange
- ) {
- $handle = $this->_page->getCustomPageLayout();
- } else {
- $handle = $this->_page->getPageLayout();
- }
- $resultPage->getConfig()->setPageLayout($handle);
- }
- $resultPage->initLayout();
+ /** @var \Magento\Framework\View\Result\Page $resultPage */
+ $resultPage = $this->resultPageFactory->create();
+ $this->setLayoutType($inRange, $resultPage);
$resultPage->addHandle('cms_page_view');
$resultPage->addPageLayoutHandles(['id' => $this->_page->getIdentifier()]);
@@ -214,26 +179,7 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
$messageBlock->addStorageType($this->messageManager->getDefaultGroup());
$messageBlock->addMessages($this->messageManager->getMessages(true));
- if ($renderLayout) {
- $this->_view->renderLayout();
- }
-
- return true;
- }
-
- /**
- * Renders CMS Page with more flexibility then original renderPage function.
- * Allows to use also backend action as first parameter.
- * Also takes third parameter which allows not run renderLayout method.
- *
- * @param Action $action
- * @param int $pageId
- * @param bool $renderLayout
- * @return bool
- */
- public function renderPageExtended(Action $action, $pageId = null, $renderLayout = true)
- {
- return $this->_renderPage($action, $pageId, $renderLayout);
+ return $resultPage;
}
/**
@@ -259,4 +205,27 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
return $this->_urlBuilder->getUrl(null, ['_direct' => $page->getIdentifier()]);
}
+
+ /**
+ * Set layout type
+ *
+ * @param bool $inRange
+ * @param \Magento\Framework\View\Result\Page $resultPage
+ * @return \Magento\Framework\View\Result\Page
+ */
+ protected function setLayoutType($inRange, $resultPage)
+ {
+ if ($this->_page->getPageLayout()) {
+ if ($this->_page->getCustomPageLayout()
+ && $this->_page->getCustomPageLayout() != 'empty'
+ && $inRange
+ ) {
+ $handle = $this->_page->getCustomPageLayout();
+ } else {
+ $handle = $this->_page->getPageLayout();
+ }
+ $resultPage->getConfig()->setPageLayout($handle);
+ }
+ return $resultPage;
+ }
}
diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
index af9308c14f5a6f085ac13209d000b09bf5edaef1..6a175852ee4f254ce7ffae34ac4613ff6a755d1b 100644
--- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
@@ -46,7 +46,7 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -56,13 +56,13 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Backend\Helper\Data $backendData
* @param \Magento\Framework\Filesystem $filesystem
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Backend\Helper\Data $backendData,
\Magento\Framework\Filesystem $filesystem,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
parent::__construct($context);
$this->_backendData = $backendData;
diff --git a/app/code/Magento/Cms/Model/Observer.php b/app/code/Magento/Cms/Model/Observer.php
index c514d0165107a42a5f13b295f0d937bc6d6ae078..7082759a7c42e37cfa4c50a114d860d75ff184df 100644
--- a/app/code/Magento/Cms/Model/Observer.php
+++ b/app/code/Magento/Cms/Model/Observer.php
@@ -68,7 +68,7 @@ class Observer
$pageId = $this->_scopeConfig->getValue(
\Magento\Cms\Helper\Page::XML_PATH_NO_COOKIES_PAGE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$pageUrl = $this->_cmsPage->getPageUrl($pageId);
diff --git a/app/code/Magento/Cms/Model/Resource/AbstractCollection.php b/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
index 698cd57845824652741a264c21743f4b55fd1ed7..f251a32c3dd1ef3f021fa06d0546e5353dd921d2 100644
--- a/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
+++ b/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
@@ -6,7 +6,7 @@
namespace Magento\Cms\Model\Resource;
use Magento\Framework\Data\AbstractSearchResult;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\Data\SearchResultProcessorFactory;
use Magento\Framework\Data\SearchResultProcessor;
use Magento\Framework\DB\QueryInterface;
@@ -20,7 +20,7 @@ use Magento\Framework\Data\SearchResultIteratorFactory;
class AbstractCollection extends AbstractSearchResult
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var StoreManagerInterface
*/
protected $storeManager;
@@ -46,7 +46,7 @@ class AbstractCollection extends AbstractSearchResult
* @param EntityFactoryInterface $entityFactory
* @param ManagerInterface $eventManager
* @param SearchResultIteratorFactory $resultIteratorFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param SearchResultProcessorFactory $searchResultProcessorFactory
*/
public function __construct(
diff --git a/app/code/Magento/Cms/Model/Resource/Block.php b/app/code/Magento/Cms/Model/Resource/Block.php
index 2b15dcaa243f43a315579da3bb173ec1ff305b92..894aa6d629576134cfa51e517905d78aa45aa23c 100644
--- a/app/code/Magento/Cms/Model/Resource/Block.php
+++ b/app/code/Magento/Cms/Model/Resource/Block.php
@@ -18,7 +18,7 @@ class Block extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -27,12 +27,12 @@ class Block extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
parent::__construct($resource);
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Cms/Model/Resource/Page.php b/app/code/Magento/Cms/Model/Resource/Page.php
index b5af42c81c334ddd11e3d5e0439611c0c780eb62..4efe1734c056c1177cf69944b27f4cb9934fed51 100644
--- a/app/code/Magento/Cms/Model/Resource/Page.php
+++ b/app/code/Magento/Cms/Model/Resource/Page.php
@@ -28,7 +28,7 @@ class Page extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -42,13 +42,13 @@ class Page extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime $dateTime
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime $dateTime
) {
parent::__construct($resource);
diff --git a/app/code/Magento/Cms/Model/Resource/Page/Collection.php b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
index 491e95954d13c93a264d58b078c751941c9ac7ba..0a37cf81d47570cce0755b2e39425766cf6be5d0 100644
--- a/app/code/Magento/Cms/Model/Resource/Page/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
@@ -10,7 +10,7 @@ use Magento\Framework\Data\Collection\EntityFactoryInterface;
use Magento\Framework\Data\SearchResultIteratorFactory;
use Magento\Framework\DB\QueryInterface;
use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\Data\SearchResultProcessorFactory;
use Magento\Framework\Data\SearchResultProcessor;
@@ -34,7 +34,7 @@ class Collection extends AbstractSearchResult
* @param EntityFactoryInterface $entityFactory
* @param ManagerInterface $eventManager
* @param SearchResultIteratorFactory $resultIteratorFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param SearchResultProcessorFactory $searchResultProcessorFactory
*/
public function __construct(
diff --git a/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php b/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
index 3ccfe7ee83272be2096a84e6481e75a9ba910552..41402e0ed343f197fa58b3f10d6bf55bf302fcdc 100644
--- a/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
@@ -22,7 +22,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -31,7 +31,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -40,7 +40,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index ae1e7ae9e3d21274ae15390266f5c18a043f67fe..7fd5b26290dfc090bed06886557bb8919ed68b39 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -85,7 +85,7 @@ class Config extends \Magento\Framework\Object
protected $_backendUrl;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -97,7 +97,7 @@ class Config extends \Magento\Framework\Object
* @param \Magento\Core\Model\Variable\Config $variableConfig
* @param \Magento\Widget\Model\Widget\Config $widgetConfig
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $windowSize
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -110,7 +110,7 @@ class Config extends \Magento\Framework\Object
\Magento\Core\Model\Variable\Config $variableConfig,
\Magento\Widget\Model\Widget\Config $widgetConfig,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
array $windowSize = [],
array $data = []
) {
@@ -218,7 +218,7 @@ class Config extends \Magento\Framework\Object
{
$wysiwygState = $this->_scopeConfig->getValue(
self::WYSIWYG_STATUS_CONFIG_PATH,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStoreId()
);
return in_array($wysiwygState, [self::WYSIWYG_ENABLED, self::WYSIWYG_HIDDEN]);
@@ -233,7 +233,7 @@ class Config extends \Magento\Framework\Object
{
$status = $this->_scopeConfig->getValue(
self::WYSIWYG_STATUS_CONFIG_PATH,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return $status == self::WYSIWYG_HIDDEN;
}
diff --git a/app/code/Magento/Cms/Ui/DataProvider/Page/Options/PageLayout.php b/app/code/Magento/Cms/Ui/DataProvider/Page/Options/PageLayout.php
index 33df16b5390848bfba4bbe96e3bd003afcf8d6f3..7a053e0fd3948891f3fa1d10aa5e690d586aecf6 100644
--- a/app/code/Magento/Cms/Ui/DataProvider/Page/Options/PageLayout.php
+++ b/app/code/Magento/Cms/Ui/DataProvider/Page/Options/PageLayout.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Cms\Ui\DataProvider\Page\Options;
-use Magento\Core\Model\PageLayout\Config\Builder;
+use Magento\Framework\View\Model\PageLayout\Config\BuilderInterface;
use Magento\Ui\Component\Listing\OptionsInterface;
/**
@@ -14,16 +14,16 @@ use Magento\Ui\Component\Listing\OptionsInterface;
class PageLayout implements OptionsInterface
{
/**
- * @var \Magento\Core\Model\PageLayout\Config\Builder
+ * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
*/
protected $pageLayoutBuilder;
/**
* Constructor
*
- * @param Builder $pageLayoutBuilder
+ * @param BuilderInterface $pageLayoutBuilder
*/
- public function __construct(Builder $pageLayoutBuilder)
+ public function __construct(BuilderInterface $pageLayoutBuilder)
{
$this->pageLayoutBuilder = $pageLayoutBuilder;
}
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index 34ea997f6f300ff23fea7d12450fbd22688323d9..892f42f42fd24fc595d27d4f7e1d3fe0000e546e 100644
--- a/app/code/Magento/Cms/composer.json
+++ b/app/code/Magento/Cms/composer.json
@@ -3,19 +3,19 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-widget": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-email": "0.42.0-beta6",
- "magento/module-ui": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-widget": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-email": "0.42.0-beta7",
+ "magento/module-ui": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Cms/etc/acl.xml b/app/code/Magento/Cms/etc/acl.xml
index 84509ce0f46f87b791af9a644f63e371a52d045c..2e6b7a2c5e2081d7887cdca0537939ed2e25e0bb 100644
--- a/app/code/Magento/Cms/etc/acl.xml
+++ b/app/code/Magento/Cms/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::content">
- <resource id="Magento_Adminhtml::content_elements">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::content">
+ <resource id="Magento_Backend::content_elements">
<resource id="Magento_Cms::page" title="Pages" sortOrder="10">
<resource id="Magento_Cms::save" title="Save Page" sortOrder="10" />
<resource id="Magento_Cms::page_delete" title="Delete Page" sortOrder="20" />
@@ -19,9 +19,9 @@
<resource id="Magento_Cms::media_gallery" title="Media Gallery" sortOrder="70" />
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Cms::config_cms" title="Content Management" />
</resource>
</resource>
diff --git a/app/code/Magento/Cms/etc/adminhtml/routes.xml b/app/code/Magento/Cms/etc/adminhtml/routes.xml
index fbfc4ca010ef6b8e66f03fb12e2e5ce0dcdbcdef..b0ddbbf93e31cfe46a4a5c85339bc154c1dd19f3 100644
--- a/app/code/Magento/Cms/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Cms/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="cms" frontName="cms">
- <module name="Magento_Cms" before="Magento_Adminhtml" />
+ <module name="Magento_Cms" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php b/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
index 119f4dfdaef47870013aaba5c2125babbff32eb7..41fd268b4dd686430c602dfb8fe65c00cfd13b76 100644
--- a/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
+++ b/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CmsUrlRewrite\Model;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\UrlRewrite\Service\V1\Data\UrlRewriteBuilder;
class CmsPageUrlRewriteGenerator
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index 38760c722b027b5d5dec983da3c5a04aac13cef0..2800905d79e5b9371b11446260a60f7d0a237479 100644
--- a/app/code/Magento/CmsUrlRewrite/composer.json
+++ b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -3,13 +3,14 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-cms": "0.42.0-beta6",
- "magento/module-url-rewrite": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/module-url-rewrite": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index 58535dee16ffed1d1c7da80a98bdb3c9b5a094da..cd67453846fd689b5516b3fe31771b08c7cfcf96 100644
--- a/app/code/Magento/ConfigurableImportExport/composer.json
+++ b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -3,16 +3,16 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-catalog-import-export": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-import-export": "0.42.0-beta6",
- "magento/module-configurable-product": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-catalog-import-export": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-import-export": "0.42.0-beta7",
+ "magento/module-configurable-product": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/Config.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
index fb2ff768f60fea5eb643e6fe893a0cc9da117bc4..8a328e31b050b43e53343047ac835e8f7088427c 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
@@ -330,7 +330,7 @@ class Config extends Widget implements TabInterface
/**
* Retrieve Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -340,7 +340,7 @@ class Config extends Widget implements TabInterface
/**
* Retrieve Tab title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
index 86070ac04922e969bf6cf80f4a72770c76973543..84fbb287ce22ee324f131934a1d7980b7888a929 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
@@ -63,7 +63,7 @@ class Configurable extends Renderer implements IdentityInterface
*/
if ($this->_scopeConfig->getValue(
self::CONFIG_THUMBNAIL_SOURCE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
!($this->getChildProduct()->getThumbnail() && $this->getChildProduct()->getThumbnail() != 'no_selection')
) {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
index 4975ebfba871d49bda3889f97cadf45e05e89ff9..cc5151fce4135feac6e8618f9cd8178037aa2498 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
@@ -24,7 +24,7 @@ class SuggestConfigurableAttributes extends Action
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -32,13 +32,13 @@ class SuggestConfigurableAttributes extends Action
* @param Action\Context $context
* @param SuggestedAttributeList $attributeList
* @param \Magento\Core\Helper\Data $coreHelper
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
Action\Context $context,
SuggestedAttributeList $attributeList,
\Magento\Core\Helper\Data $coreHelper,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->attributeList = $attributeList;
$this->coreHelper = $coreHelper;
diff --git a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
index cef1c44b363d07855c50876da1bdffa41b9bfa6c..adb3c2b9bd41389c17936161a43d206f4450599e 100644
--- a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
+++ b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
@@ -41,7 +41,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
protected $optionResource;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -60,7 +60,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
* @param \Magento\ConfigurableProduct\Api\Data\OptionValueDataBuilder $optionValueBuilder
* @param ConfigurableType $configurableType
* @param Resource\Product\Type\Configurable\Attribute $optionResource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository
* @param ConfigurableType\AttributeFactory $configurableAttributeFactory
*/
@@ -69,7 +69,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
\Magento\ConfigurableProduct\Api\Data\OptionValueDataBuilder $optionValueBuilder,
\Magento\ConfigurableProduct\Model\Product\Type\Configurable $configurableType,
\Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute $optionResource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository,
\Magento\ConfigurableProduct\Model\Product\Type\Configurable\AttributeFactory $configurableAttributeFactory
) {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index bafaaca7db316db0499a6044240e434018b48209..c618cd27f8b6d43dda86f61f25289adbf9f2accf 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -719,7 +719,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Framework\Object $buyRequest
* @param \Magento\Catalog\Model\Product $product
* @param string $processMode
- * @return array|string
+ * @return \Magento\Framework\Phrase|array|string
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
@@ -809,7 +809,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
}
}
- return $this->getSpecifyOptionMessage();
+ return (string)$this->getSpecifyOptionMessage();
}
/**
@@ -834,7 +834,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
}
}
if (empty($attributes)) {
- throw new \Magento\Framework\Model\Exception($this->getSpecifyOptionMessage());
+ throw new \Magento\Framework\Model\Exception((string)$this->getSpecifyOptionMessage());
}
}
return $this;
@@ -843,7 +843,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
/**
* Retrieve message for specify option(s)
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getSpecifyOptionMessage()
{
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
index 43d717193d13bca692a5fb47a263cca65fc21b7e..55e4f4e0c39254007444cba30c7e0cddc6f2db75 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
@@ -19,7 +19,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
/**
* @param \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -29,7 +29,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
*/
public function __construct(
\Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
index ead1105b04a45f9888cde16d43146114a912c002..6a26d7235085fa26535699c99d4fc0a415e4ae62 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
@@ -49,7 +49,7 @@ class AssociatedProduct extends \Magento\Catalog\Model\Resource\Product\Collecti
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -76,7 +76,7 @@ class AssociatedProduct extends \Magento\Catalog\Model\Resource\Product\Collecti
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php
index d03d2dd89ae02d8a288069aebc84d89655d435eb..7361db789933d36ef1180326547fbbace47bc2a0 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php
@@ -35,18 +35,18 @@ class Attribute extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
index 0a955a372793e5404e7e32e66b547056a1a49295..9d2ca8b5414c7920d4fb9235e6c6eaaaf4882368 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
@@ -54,7 +54,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -70,7 +70,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable $catalogProductTypeConfigurable
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute $resource
@@ -83,7 +83,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ConfigurableProduct\Model\Product\Type\Configurable $catalogProductTypeConfigurable,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute $resource,
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php
index 8ee7d54d4518a6ce4492f09a4592374e98a922cc..706d41d867bad8fc87395b7144b6b7776add361c 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php
@@ -29,7 +29,7 @@ class AttributePrice extends AbstractPrice implements AttributePriceInterface
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -44,7 +44,7 @@ class AttributePrice extends AbstractPrice implements AttributePriceInterface
* @param CalculatorInterface $calculator
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param PriceModifierInterface $modifier
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
Product $saleableItem,
@@ -52,7 +52,7 @@ class AttributePrice extends AbstractPrice implements AttributePriceInterface
CalculatorInterface $calculator,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
PriceModifierInterface $modifier,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->priceCurrency = $priceCurrency;
$this->priceModifier = $modifier;
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 30d61ed9945e6bb64c8456bbb49366de36eeec5c..d8995bd92a863e4c98500a05cb5611cb708a5721 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -3,24 +3,24 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-catalog-rule": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-webapi": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-catalog-rule": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-webapi": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Contact/Controller/Index.php b/app/code/Magento/Contact/Controller/Index.php
index 6335cf80724f9300d4346c8d0d81ae76ae6bfdb7..d144b198916e8b7574756dbf347297986572591c 100644
--- a/app/code/Magento/Contact/Controller/Index.php
+++ b/app/code/Magento/Contact/Controller/Index.php
@@ -7,7 +7,7 @@ namespace Magento\Contact\Controller;
use Magento\Framework\App\Action\NotFoundException;
use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* Contact index controller
@@ -50,7 +50,7 @@ class Index extends \Magento\Framework\App\Action\Action
protected $scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -59,14 +59,14 @@ class Index extends \Magento\Framework\App\Action\Action
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
parent::__construct($context);
$this->_transportBuilder = $transportBuilder;
diff --git a/app/code/Magento/Contact/Controller/Index/Post.php b/app/code/Magento/Contact/Controller/Index/Post.php
index 812e7818a66273d1314b6e294b45f0afc04651dc..8c4e71906508098c2efba61b58935460b2019635 100644
--- a/app/code/Magento/Contact/Controller/Index/Post.php
+++ b/app/code/Magento/Contact/Controller/Index/Post.php
@@ -45,7 +45,7 @@ class Post extends \Magento\Contact\Controller\Index
throw new \Exception();
}
- $storeScope = \Magento\Framework\Store\ScopeInterface::SCOPE_STORE;
+ $storeScope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
$transport = $this->_transportBuilder
->setTemplateIdentifier($this->scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, $storeScope))
->setTemplateOptions(
diff --git a/app/code/Magento/Contact/Helper/Data.php b/app/code/Magento/Contact/Helper/Data.php
index c18494f3dcb6862c61d82773688b30d7f548b968..86a94346806e152773d227d71717212e13506e75 100644
--- a/app/code/Magento/Contact/Helper/Data.php
+++ b/app/code/Magento/Contact/Helper/Data.php
@@ -62,7 +62,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::XML_PATH_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index 2a10f560cc752ce7f3e5c0111e35b775236142be..9cbcf42dcbe241847bb5bd14f14b7695634bc885 100644
--- a/app/code/Magento/Contact/composer.json
+++ b/app/code/Magento/Contact/composer.json
@@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-cms": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Contact/etc/acl.xml b/app/code/Magento/Contact/etc/acl.xml
index adcb100513a93e98f07a64877c0d66c8a271c2af..363ab6f81ad82a63dbe53af2989ccdf0d93278e9 100644
--- a/app/code/Magento/Contact/etc/acl.xml
+++ b/app/code/Magento/Contact/etc/acl.xml
@@ -8,10 +8,10 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Contact::contact" title="Contacts Section" />
</resource>
</resource>
diff --git a/app/code/Magento/Cookie/Helper/Cookie.php b/app/code/Magento/Cookie/Helper/Cookie.php
index 86f011311c247813fca7b7bfabdacd14cc46082d..a1d291261f636d1b7db1db80ef844cb3d2d7676a 100644
--- a/app/code/Magento/Cookie/Helper/Cookie.php
+++ b/app/code/Magento/Cookie/Helper/Cookie.php
@@ -42,7 +42,7 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param array $data
*
@@ -50,7 +50,7 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
array $data = []
) {
@@ -79,7 +79,7 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
$acceptedSaveCookiesWebsites = $this->_getAcceptedSaveCookiesWebsites();
return $this->_scopeConfig->getValue(
self::XML_PATH_COOKIE_RESTRICTION,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->_currentStore
) && empty($acceptedSaveCookiesWebsites[$this->_website->getId()]);
}
@@ -117,7 +117,7 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
{
return (int)$this->_scopeConfig->getValue(
self::XML_PATH_COOKIE_RESTRICTION_LIFETIME,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->_currentStore
);
}
diff --git a/app/code/Magento/Cookie/View/frontend/templates/html/notices.phtml b/app/code/Magento/Cookie/View/frontend/templates/html/notices.phtml
index c4f38e0a853fdfe1361a1f09d47feb435e4dcebb..22c7292a4dcef0a086cd707406bd4d87b7f0c2c5 100644
--- a/app/code/Magento/Cookie/View/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Cookie/View/frontend/templates/html/notices.phtml
@@ -7,14 +7,14 @@
// @codingStandardsIgnoreFile
?>
-<?php /** @var \Magento\Cookie\Block\Html\Notices $this */ ?>
+<?php /** @var \Magento\Cookie\Block\Html\Notices $block */ ?>
<?php if ($this->helper('Magento\Cookie\Helper\Cookie')->isUserNotAllowSaveCookie()): ?>
<div class="message global cookie" id="notice-cookie-block" style="display: none">
<div class="content">
<p>
<strong><?php echo __('We use cookies to make your experience better.') ?></strong>
<span><?php echo __('To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.') ?></span>
- <?php echo __('<a href="%1">Learn more</a>.', $this->getPrivacyPolicyLink()) ?></p>
+ <?php echo __('<a href="%1">Learn more</a>.', $block->getPrivacyPolicyLink()) ?></p>
<div class="actions">
<button id="btn-cookie-allow" class="action allow primary">
<span><?php echo __('Allow Cookies');?></span>
@@ -34,7 +34,7 @@
cookieName: '<?php echo \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>',
cookieValue: '<?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>',
cookieLifetime: <?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getCookieRestrictionLifetime()?>,
- noCookiesUrl: '<?php echo $this->getUrl('cookie/index/noCookies') ?>'
+ noCookiesUrl: '<?php echo $block->getUrl('cookie/index/noCookies') ?>'
});
// ]]>
diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json
index 8c916a3327eeaf4c0d50209fe19eaf41d1a6ffd4..5858b13a5d8da2d336094cbefc4caa33a66ba1b5 100644
--- a/app/code/Magento/Cookie/composer.json
+++ b/app/code/Magento/Cookie/composer.json
@@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.4.11|~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"suggest": {
- "magento/module-backend": "0.42.0-beta6"
+ "magento/module-backend": "0.42.0-beta7"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Core/App/Router/Base.php b/app/code/Magento/Core/App/Router/Base.php
index 9b84da13d6272879f0c4f94b40245ab16e71881f..58175d62b172684c14c834830ec1f1916deb8c20 100644
--- a/app/code/Magento/Core/App/Router/Base.php
+++ b/app/code/Magento/Core/App/Router/Base.php
@@ -67,7 +67,7 @@ class Base implements \Magento\Framework\App\RouterInterface
protected $_url;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -115,7 +115,7 @@ class Base implements \Magento\Framework\App\RouterInterface
* @param \Magento\Framework\App\ResponseFactory $responseFactory
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
* @param \Magento\Framework\UrlInterface $url
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
* @param string $routerId
@@ -131,7 +131,7 @@ class Base implements \Magento\Framework\App\RouterInterface
\Magento\Framework\App\ResponseFactory $responseFactory,
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
\Magento\Framework\UrlInterface $url,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
$routerId,
@@ -330,7 +330,7 @@ class Base implements \Magento\Framework\App\RouterInterface
*/
protected function _getDefaultPath()
{
- return $this->_scopeConfig->getValue('web/default/front', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue('web/default/front', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -406,14 +406,14 @@ class Base implements \Magento\Framework\App\RouterInterface
return parse_url(
$this->_scopeConfig->getValue(
'web/unsecure/base_url',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
),
PHP_URL_SCHEME
) === 'https' || $this->_scopeConfig->isSetFlag(
\Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) && parse_url(
- $this->_scopeConfig->getValue('web/secure/base_url', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->_scopeConfig->getValue('web/secure/base_url', \Magento\Store\Model\ScopeInterface::SCOPE_STORE),
PHP_URL_SCHEME
) == 'https' && $this->_urlSecurityInfo->isSecure(
$path
diff --git a/app/code/Magento/Core/Helper/Data.php b/app/code/Magento/Core/Helper/Data.php
index b1763205c9c8975edc9252e7b7ce30b181d2679c..21809fba96716335ba7b78dacc986a6c339ab768 100644
--- a/app/code/Magento/Core/Helper/Data.php
+++ b/app/code/Magento/Core/Helper/Data.php
@@ -55,7 +55,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -77,7 +77,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param PriceCurrencyInterface $priceCurrency
* @param bool $dbCompatibleMode
@@ -85,7 +85,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
PriceCurrencyInterface $priceCurrency,
$dbCompatibleMode = true
@@ -172,7 +172,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
$allowedIps = $this->_scopeConfig->getValue(
self::XML_PATH_DEV_ALLOW_IPS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$remoteAddr = $this->_remoteAddress->getRemoteAddress();
@@ -242,7 +242,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DEFAULT_COUNTRY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Core/Helper/Url.php b/app/code/Magento/Core/Helper/Url.php
index e3096f6839474200605b62c616218e5c331cbb48..270a8194bccd998cfeb8323c9293a1fca341cae9 100644
--- a/app/code/Magento/Core/Helper/Url.php
+++ b/app/code/Magento/Core/Helper/Url.php
@@ -14,17 +14,17 @@ namespace Magento\Core\Helper;
class Url extends \Magento\Framework\App\Helper\AbstractHelper
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
parent::__construct($context);
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Core/Model/File/Storage.php b/app/code/Magento/Core/Model/File/Storage.php
index 0d9d138c3ad9635115f7639365e59ccaad26b9a5..540c0b8fb19a01444ea3282943f187f4540d4b0f 100644
--- a/app/code/Magento/Core/Model/File/Storage.php
+++ b/app/code/Magento/Core/Model/File/Storage.php
@@ -292,7 +292,7 @@ class Storage extends AbstractModel
$config['allowed_resources'][] = $allowedResource;
}
- $config['update_time'] = $this->_scopeConfig->getValue(self::XML_PATH_MEDIA_UPDATE_TIME, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ $config['update_time'] = $this->_scopeConfig->getValue(self::XML_PATH_MEDIA_UPDATE_TIME, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
return $config;
}
diff --git a/app/code/Magento/Core/Model/File/Storage/Database.php b/app/code/Magento/Core/Model/File/Storage/Database.php
index 8770fcf34b68893a59b75f6808f1031a3ec3aa2a..1b4060f7e211b362c2b111a56ac50e4de2f7fc55 100644
--- a/app/code/Magento/Core/Model/File/Storage/Database.php
+++ b/app/code/Magento/Core/Model/File/Storage/Database.php
@@ -116,7 +116,7 @@ class Database extends \Magento\Core\Model\File\Storage\Database\AbstractDatabas
/**
* Return storage name
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getStorageName()
{
diff --git a/app/code/Magento/Core/Model/File/Storage/File.php b/app/code/Magento/Core/Model/File/Storage/File.php
index 0ae3a40daf700d3ed94244039e247d9a13dda86a..189f47f6b31a7f45d37c42f2cd5e78f380e98277 100644
--- a/app/code/Magento/Core/Model/File/Storage/File.php
+++ b/app/code/Magento/Core/Model/File/Storage/File.php
@@ -86,7 +86,7 @@ class File
/**
* Return storage name
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getStorageName()
{
diff --git a/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php b/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
index 1f555aef0dfc23786cede9a03ee0c21d60b1e3ae..a4e57209398de9e2512063da027d59de197d45ad 100644
--- a/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
+++ b/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
@@ -99,7 +99,7 @@ class NotProtectedExtension extends \Zend_Validate_Abstract
*/
public function getProtectedFileExtensions($store = null)
{
- return $this->_scopeConfig->getValue(self::XML_PATH_PROTECTED_FILE_EXTENSIONS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XML_PATH_PROTECTED_FILE_EXTENSIONS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
/**
diff --git a/app/code/Magento/Core/Model/Variable.php b/app/code/Magento/Core/Model/Variable.php
index 18ead04b6ecc03df26a28ca36cc9719e30a9914d..91b5462ca847ecf623b179511d1b00f7ce16ff2b 100644
--- a/app/code/Magento/Core/Model/Variable.php
+++ b/app/code/Magento/Core/Model/Variable.php
@@ -123,7 +123,7 @@ class Variable extends \Magento\Framework\Model\AbstractModel
/**
* Validation of object data. Checking for unique variable code
*
- * @return bool|string
+ * @return \Magento\Framework\Phrase|bool
*/
public function validate()
{
diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json
index 4b61028a611831029566aba7487ea70a8a341162..9ad63e9c43eb8cc2f4d215f3ff0e4bb0a4a47875 100644
--- a/app/code/Magento/Core/composer.json
+++ b/app/code/Magento/Core/composer.json
@@ -3,16 +3,14 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-page-cache": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"lib-libxml": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
index f63086dd9f7af30aff23cba47c57a77a72a93b21..a1f195ab31c289bf90b06eb333ea427d39e26c68 100644
--- a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
@@ -15,13 +15,6 @@ $installer->appendClassAliasReplace(
\Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
['config_id']
);
-$installer->appendClassAliasReplace(
- 'core_layout_update',
- 'xml',
- \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
- \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
- ['layout_update_id']
-);
$installer->doUpdateClassAliases();
/**
diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml
index 751643e14c78d8df40180673e8b24dcceead23fc..660ff5429aea4147b3d174b0aa2f259bc0b07a8e 100644
--- a/app/code/Magento/Core/etc/di.xml
+++ b/app/code/Magento/Core/etc/di.xml
@@ -6,375 +6,12 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
- <preference for="Magento\Framework\Acl\CacheInterface" type="Magento\Framework\Acl\Cache" />
- <preference for="Magento\Framework\App\AreaInterface" type="Magento\Framework\App\Area" />
- <preference for="Magento\Framework\Module\Updater\SetupInterface" type="Magento\Framework\Module\DataSetup" />
- <preference for="Magento\Framework\Module\ResourceResolverInterface" type="Magento\Framework\Module\ResourceResolver" />
- <preference for="Magento\Framework\AuthorizationInterface" type="Magento\Framework\Authorization" />
- <preference for="Magento\Framework\Authorization\PolicyInterface" type="Magento\Framework\Authorization\Policy\DefaultPolicy" />
- <preference for="Magento\Framework\Authorization\RoleLocatorInterface" type="Magento\Framework\Authorization\RoleLocator\DefaultRoleLocator" />
- <preference for="Magento\Framework\Session\SessionManagerInterface" type="Magento\Framework\Session\Generic" />
- <preference for="Magento\Framework\App\Config\ScopeConfigInterface" type="Magento\Framework\App\Config" />
- <preference for="Magento\Framework\App\Config\ReinitableConfigInterface" type="Magento\Framework\App\ReinitableConfig" />
- <preference for="Magento\Framework\App\Config\MutableScopeConfigInterface" type="Magento\Framework\App\MutableScopeConfig" />
- <preference for="Magento\Framework\App\Config\Storage\WriterInterface" type="Magento\Framework\App\Config\Storage\Writer" />
- <preference for="Magento\Framework\View\Design\Theme\FileInterface" type="Magento\Theme\Model\Theme\File" />
- <preference for="Magento\Framework\Config\ConverterInterface" type="Magento\Framework\Config\Converter\Dom"/>
- <preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Framework\App\DefaultPath\DefaultPath" />
- <preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Framework\Encryption\Encryptor" />
- <preference for="Magento\Framework\Filter\Encrypt\AdapterInterface" type="Magento\Framework\Filter\Encrypt\Basic" />
- <preference for="Magento\Framework\Cache\ConfigInterface" type="Magento\Framework\Cache\Config" />
- <preference for="Magento\Framework\View\Design\Theme\ThemeProviderInterface" type="Magento\Theme\Model\Theme\ThemeProvider" />
- <preference for="Magento\Framework\View\Design\Theme\FileProviderInterface" type="Magento\Theme\Model\Theme\FileProvider" />
- <preference for="Magento\Framework\View\Design\Theme\Customization\ConfigInterface" type="Magento\Theme\Model\Theme\Customization\Config" />
- <preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />
- <preference for="Magento\Framework\View\Asset\MergeStrategyInterface" type="Magento\Framework\View\Asset\MergeStrategy\Direct" />
- <preference for="Magento\Framework\App\ViewInterface" type="Magento\Framework\App\View" />
- <preference for="Magento\Framework\TranslateInterface" type="Magento\Framework\Translate" />
- <preference for="Magento\Framework\App\Response\RedirectInterface" type="Magento\Store\App\Response\Redirect" />
- <preference for="Magento\Framework\Data\Collection\EntityFactoryInterface" type="Magento\Framework\Data\Collection\EntityFactory" />
- <preference for="Magento\Framework\Translate\InlineInterface" type="Magento\Framework\Translate\Inline" />
- <preference for="Magento\Framework\Translate\Inline\ConfigInterface" type="Magento\Translation\Model\Inline\Config" />
- <preference for="Magento\Framework\Translate\Inline\ParserInterface" type="Magento\Translation\Model\Inline\Parser" />
- <preference for="Magento\Framework\Session\ValidatorInterface" type="Magento\Framework\Session\Validator" />
- <preference for="Magento\Framework\Session\StorageInterface" type="Magento\Framework\Session\Storage" />
- <preference for="Magento\Framework\Url\RouteParamsResolverInterface" type="Magento\Framework\Url\RouteParamsResolver" />
- <preference for="Magento\Framework\Url\QueryParamsResolverInterface" type="Magento\Framework\Url\QueryParamsResolver" />
- <preference for="Magento\Framework\Url\ScopeResolverInterface" type="Magento\Framework\Url\ScopeResolver" />
- <preference for="Magento\Framework\Url\SecurityInfoInterface" type="Magento\Framework\Url\SecurityInfo\Proxy" />
- <preference for="Magento\Framework\Mview\ConfigInterface" type="Magento\Framework\Mview\Config" />
- <preference for="Magento\Framework\Mview\ViewInterface" type="Magento\Framework\Mview\View" />
- <preference for="Magento\Framework\Mview\ProcessorInterface" type="Magento\Framework\Mview\Processor" />
- <preference for="Magento\Framework\Mview\View\CollectionInterface" type="Magento\Framework\Mview\View\Collection" />
- <preference for="Magento\Framework\Mview\View\SubscriptionInterface" type="Magento\Framework\Mview\View\Subscription" />
- <preference for="Magento\Framework\Css\PreProcessor\AdapterInterface" type="Magento\Framework\Css\PreProcessor\Adapter\Oyejorge" />
- <preference for="Magento\Framework\Translate\ResourceInterface" type="Magento\Translation\Model\Resource\Translate" />
- <preference for="Magento\Framework\LocaleInterface" type="Magento\Framework\Locale" />
- <preference for="Magento\Framework\Locale\CurrencyInterface" type="Magento\Framework\Locale\Currency" />
- <preference for="Magento\Framework\CurrencyInterface" type="Magento\Framework\Currency" />
- <preference for="Magento\Framework\Locale\FormatInterface" type="Magento\Framework\Locale\Format" />
- <preference for="Magento\Framework\Locale\ResolverInterface" type="Magento\Framework\Locale\Resolver" />
- <preference for="Magento\Framework\Stdlib\DateTime\TimezoneInterface" type="Magento\Framework\Stdlib\DateTime\Timezone" />
- <preference for="Magento\Framework\Stdlib\DateTime\DateInterface" type="Magento\Framework\Stdlib\DateTime\Date" />
- <preference for="Magento\Framework\Less\PreProcessor\ErrorHandlerInterface" type="Magento\Framework\Less\PreProcessor\ErrorHandler" />
- <preference for="Magento\Framework\Module\ResourceInterface" type="Magento\Framework\Module\Resource" />
<preference for="Magento\Framework\App\Config\Resource\ConfigInterface" type="Magento\Core\Model\Resource\Config" />
- <preference for="Magento\Framework\App\DesignInterface" type="Magento\Theme\Model\Design" />
- <preference for="Magento\Framework\Pricing\Amount\AmountInterface" type="Magento\Framework\Pricing\Amount\Base" />
- <preference for="Magento\Framework\View\Page\FaviconInterface" type="Magento\Theme\Model\Favicon\Favicon" />
- <preference for="Magento\Framework\Api\SearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
- <preference for="Magento\Framework\Api\SearchCriteriaInterface" type="Magento\Framework\Api\SearchCriteria" />
- <preference for="Magento\Framework\Api\AttributeInterface" type="Magento\Framework\Api\AttributeValue" />
- <preference for="Magento\Framework\View\Design\Theme\ListInterface" type="Magento\Theme\Model\Theme\Collection" />
- <type name="Magento\Framework\App\DefaultPath\DefaultPath">
- <arguments>
- <argument name="parts" xsi:type="array">
- <item name="module" xsi:type="string">core</item>
- <item name="controller" xsi:type="string">index</item>
- <item name="action" xsi:type="string">index</item>
- </argument>
- </arguments>
- </type>
- <type name="Magento\Framework\App\AreaList">
- <arguments>
- <argument name="areas" xsi:type="array">
- <item name="frontend" xsi:type="array">
- <item name="frontName" xsi:type="null" />
- <item name="router" xsi:type="string">standard</item>
- </item>
- </argument>
- <argument name="default" xsi:type="string">frontend</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Data\Structure" shared="false" />
- <type name="Magento\Framework\Data\Collection\Db\FetchStrategy\Cache">
- <arguments>
- <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Collection</argument>
- <argument name="cacheIdPrefix" xsi:type="string">collection_</argument>
- <argument name="cacheLifetime" xsi:type="string">86400</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Event\Config\Data">
- <arguments>
- <argument name="reader" xsi:type="object">Magento\Framework\Event\Config\Reader\Proxy</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Acl\Cache">
- <arguments>
- <argument name="cacheKey" xsi:type="string">global_acl_resources</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\View\Asset\Collection" shared="false" />
- <type name="Magento\Theme\Model\Theme\Collection" shared="false" />
- <type name="Magento\Core\Model\Layout\Merge">
- <arguments>
- <argument name="fileSource" xsi:type="object">Magento\Framework\View\Layout\File\Collector\Aggregated\Proxy</argument>
- <argument name="pageLayoutFileSource" xsi:type="object">pageLayoutFileCollectorAggregated</argument>
- <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Layout</argument>
- </arguments>
- </type>
- <type name="Magento\Core\Model\Resource\Layout\Update">
- <arguments>
- <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Layout</argument>
- </arguments>
- </type>
-
- <virtualType name="layoutFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
- <arguments>
- <argument name="subDir" xsi:type="string">layout</argument>
- </arguments>
- </virtualType>
- <virtualType name="layoutFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">layoutFileSourceBase</argument>
- </arguments>
- </virtualType>
- <virtualType name="layoutFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">layoutFileSourceBaseFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="layoutFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular">
- <arguments>
- <argument name="subDir" xsi:type="string">layout</argument>
- </arguments>
- </virtualType>
- <virtualType name="layoutFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">layoutFileSourceTheme</argument>
- </arguments>
- </virtualType>
- <virtualType name="layoutFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">layoutFileSourceThemeFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="layoutFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
- <arguments>
- <argument name="subDir" xsi:type="string">layout/override/base</argument>
- </arguments>
- </virtualType>
- <virtualType name="layoutFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">layoutFileSourceOverrideBase</argument>
- </arguments>
- </virtualType>
- <virtualType name="layoutFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">layoutFileSourceOverrideBaseFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="layoutFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
- <arguments>
- <argument name="subDir" xsi:type="string">layout/override/theme</argument>
- </arguments>
- </virtualType>
- <virtualType name="layoutFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">layoutFileSourceOverrideTheme</argument>
- </arguments>
- </virtualType>
- <virtualType name="layoutFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">layoutFileSourceOverrideThemeFiltered</argument>
- </arguments>
- </virtualType>
-
- <type name="Magento\Framework\View\Layout\File\Collector\Aggregated">
- <arguments>
- <argument name="baseFiles" xsi:type="object">layoutFileSourceBaseSorted</argument>
- <argument name="themeFiles" xsi:type="object">layoutFileSourceThemeSorted</argument>
- <argument name="overrideBaseFiles" xsi:type="object">layoutFileSourceOverrideBaseSorted</argument>
- <argument name="overrideThemeFiles" xsi:type="object">layoutFileSourceOverrideThemeSorted</argument>
- </arguments>
- </type>
-
- <virtualType name="pageLayoutFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
- <arguments>
- <argument name="subDir" xsi:type="string">page_layout</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageLayoutFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">pageLayoutFileSourceBase</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageLayoutFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">pageLayoutFileSourceBaseFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="pageLayoutFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular">
- <arguments>
- <argument name="subDir" xsi:type="string">page_layout</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageLayoutFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">pageLayoutFileSourceTheme</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageLayoutFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">pageLayoutFileSourceThemeFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="pageLayoutFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
- <arguments>
- <argument name="subDir" xsi:type="string">page_layout/override/base</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageLayoutFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideBase</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageLayoutFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideBaseFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="pageLayoutFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
- <arguments>
- <argument name="subDir" xsi:type="string">page_layout/override/theme</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageLayoutFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideTheme</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageLayoutFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideThemeFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="pageLayoutFileCollectorAggregated" type="Magento\Framework\View\Layout\File\Collector\Aggregated">
- <arguments>
- <argument name="baseFiles" xsi:type="object">pageLayoutFileSourceBaseSorted</argument>
- <argument name="themeFiles" xsi:type="object">pageLayoutFileSourceThemeSorted</argument>
- <argument name="overrideBaseFiles" xsi:type="object">pageLayoutFileSourceOverrideBaseSorted</argument>
- <argument name="overrideThemeFiles" xsi:type="object">pageLayoutFileSourceOverrideThemeSorted</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="pageFileSourceBase" type="Magento\Framework\View\File\Collector\Base"/>
- <virtualType name="pageFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">pageFileSourceBase</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">pageFileSourceBaseFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="pageFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular"/>
- <virtualType name="pageFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">pageFileSourceTheme</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">pageFileSourceThemeFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="pageFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
- <arguments>
- <argument name="subDir" xsi:type="string">page/override</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">pageFileSourceOverrideBase</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">pageFileSourceOverrideBaseFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="pageFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
- <arguments>
- <argument name="subDir" xsi:type="string">override/theme</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">pageFileSourceOverrideTheme</argument>
- </arguments>
- </virtualType>
- <virtualType name="pageFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">pageFileSourceOverrideThemeFiltered</argument>
- </arguments>
- </virtualType>
-
- <virtualType name="pageLayoutRenderPool" type="Magento\Framework\View\Layout\ReaderPool">
- <arguments>
- <argument name="readers" xsi:type="array">
- <item name="container" xsi:type="string">Magento\Framework\View\Layout\Reader\Container</item>
- <item name="move" xsi:type="string">Magento\Framework\View\Layout\Reader\Move</item>
- <item name="remove" xsi:type="string">Magento\Framework\View\Layout\Reader\Remove</item>
- </argument>
- </arguments>
- </virtualType>
- <type name="Magento\Framework\View\Page\Layout\Reader">
- <arguments>
- <argument name="pageLayoutFileSource" xsi:type="object">pageLayoutFileCollectorAggregated</argument>
- <argument name="reader" xsi:type="object">pageLayoutRenderPool</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\View\PageLayout\File\Collector\Aggregated">
- <arguments>
- <argument name="baseFiles" xsi:type="object">pageFileSourceBaseSorted</argument>
- <argument name="themeFiles" xsi:type="object">pageFileSourceThemeSorted</argument>
- <argument name="overrideBaseFiles" xsi:type="object">pageFileSourceOverrideBaseSorted</argument>
- <argument name="overrideThemeFiles" xsi:type="object">pageFileSourceOverrideThemeSorted</argument>
- </arguments>
- </type>
-
- <type name="Magento\Framework\View\Design\Theme\Image">
- <arguments>
- <argument name="uploader" xsi:type="object">Magento\Framework\View\Design\Theme\Image\Uploader\Proxy</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\App\Config\ScopePool">
- <arguments>
- <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\App\Config\Initial">
- <arguments>
- <argument name="reader" xsi:type="object">Magento\Framework\App\Config\Initial\Reader\Proxy</argument>
- </arguments>
- </type>
<type name="Magento\Framework\App\Config\Initial\SchemaLocator">
<arguments>
<argument name="moduleName" xsi:type="string">Magento_Core</argument>
</arguments>
</type>
- <type name="Magento\Framework\App\Config\Initial\Reader">
- <arguments>
- <argument name="converter" xsi:type="object">Magento\Framework\App\Config\Initial\Converter</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\App\Route\Config">
- <arguments>
- <argument name="reader" xsi:type="object">Magento\Framework\App\Route\Config\Reader\Proxy</argument>
- </arguments>
- </type>
<type name="Magento\Core\App\Router\Base">
<arguments>
<argument name="routerId" xsi:type="string">standard</argument>
@@ -390,40 +27,6 @@
</argument>
</arguments>
</type>
- <type name="Magento\Framework\Session\Validator">
- <arguments>
- <argument name="skippedUserAgentList" xsi:type="array">
- <item name="flash" xsi:type="string">Shockwave Flash</item>
- <item name="flash_mac" xsi:type="string"><![CDATA[Adobe Flash Player\s{1,}\w{1,10}]]></item>
- </argument>
- </arguments>
- </type>
- <type name="Magento\Theme\Model\View\Design">
- <arguments>
- <argument name="themes" xsi:type="array">
- <item name="frontend" xsi:type="string">Magento/blank</item>
- <item name="adminhtml" xsi:type="string">Magento/backend</item>
- </argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Object\Copy\Config\Reader">
- <arguments>
- <argument name="fileName" xsi:type="string">fieldset.xml</argument>
- <argument name="schemaLocator" xsi:type="object">Magento\Framework\Object\Copy\Config\SchemaLocator</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Object\Copy\Config\SchemaLocator">
- <arguments>
- <argument name="schema" xsi:type="string">lib/internal/Magento/Framework/Object/etc/fieldset.xsd</argument>
- <argument name="perFileSchema" xsi:type="string">lib/internal/Magento/Framework/Object/etc/fieldset_file.xsd</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Object\Copy\Config\Data">
- <arguments>
- <argument name="reader" xsi:type="object">Magento\Framework\Object\Copy\Config\Reader\Proxy</argument>
- <argument name="cacheId" xsi:type="string">fieldset_config</argument>
- </arguments>
- </type>
<type name="Magento\Framework\DB\Helper">
<arguments>
<argument name="modulePrefix" xsi:type="string">core</argument>
@@ -437,12 +40,6 @@
<argument name="connectionName" xsi:type="string">\Magento\Framework\Module\Updater\SetupInterface::DEFAULT_SETUP_CONNECTION</argument>
</arguments>
</type>
- <type name="Magento\Framework\App\Helper\Context">
- <arguments>
- <argument name="urlBuilder" xsi:type="object">Magento\Framework\UrlInterface\Proxy</argument>
- <argument name="httpRequest" xsi:type="object">Magento\Framework\App\Request\Http\Proxy</argument>
- </arguments>
- </type>
<type name="Magento\Core\Helper\File\Storage">
<arguments>
<argument name="storage" xsi:type="object">Magento\Core\Model\File\Storage\Proxy</argument>
@@ -453,46 +50,7 @@
<argument name="fileStorage" xsi:type="object">Magento\Core\Model\File\Storage\File\Proxy</argument>
</arguments>
</type>
- <type name="Magento\Framework\Image">
- <arguments>
- <argument name="adapter" xsi:type="object">Magento\Framework\Image\Adapter\Gd2</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\View\Layout\PageType\Config\Reader">
- <arguments>
- <argument name="fileName" xsi:type="string">page_types.xml</argument>
- <argument name="converter" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Converter</argument>
- <argument name="schemaLocator" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\SchemaLocator</argument>
- <argument name="defaultScope" xsi:type="string">frontend</argument>
- </arguments>
- </type>
- <virtualType name="Magento\Framework\View\Layout\PageType\Config\Data" type="Magento\Framework\Config\Data">
- <arguments>
- <argument name="reader" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Reader</argument>
- <argument name="cacheId" xsi:type="string">page_types_config</argument>
- </arguments>
- </virtualType>
- <type name="Magento\Framework\View\Layout\PageType\Config">
- <arguments>
- <argument name="dataStorage" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Data</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\App\Area">
- <arguments>
- <argument name="translator" xsi:type="object">Magento\Framework\Translate</argument>
- <argument name="design" xsi:type="object">Magento\Theme\Model\Design\Proxy</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\App\FrontController">
- <plugin name="install" type="Magento\Framework\Module\Plugin\DbStatusValidator" sortOrder="40"/>
- </type>
- <type name="Magento\Framework\Module\Plugin\DbStatusValidator">
- <arguments>
- <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
- </arguments>
- </type>
<type name="Magento\Framework\App\Action\Action">
- <plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck" sortOrder="10"/>
<plugin name="designLoader" type="Magento\Core\App\Action\Plugin\Design" sortOrder="30"/>
</type>
<virtualType name="Magento\Core\Model\Session\Storage" type="Magento\Framework\Session\Storage">
@@ -505,137 +63,20 @@
<argument name="storage" xsi:type="object">Magento\Core\Model\Session\Storage</argument>
</arguments>
</type>
- <virtualType name="Magento\Framework\Message\Session\Storage" type="Magento\Framework\Session\Storage">
- <arguments>
- <argument name="namespace" xsi:type="string">message</argument>
- </arguments>
- </virtualType>
- <type name="Magento\Framework\Message\Session">
- <arguments>
- <argument name="storage" xsi:type="object">Magento\Framework\Message\Session\Storage</argument>
- </arguments>
- </type>
<type name="Magento\Framework\View\Asset\MergeService">
<plugin name="cleanMergedJsCss" type="Magento\Core\Model\Asset\Plugin\CleanMergedJsCss"/>
</type>
- <type name="Magento\Framework\Url\ScopeResolver">
- <arguments>
- <argument name="areaCode" xsi:type="string">frontend</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Less\PreProcessor\Instruction\MagentoImport">
- <arguments>
- <argument name="fileSource" xsi:type="object">Magento\Framework\Less\File\Collector\Aggregated</argument>
- </arguments>
- </type>
- <virtualType name="lessFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
- <arguments>
- <argument name="subDir" xsi:type="string">web</argument>
- </arguments>
- </virtualType>
- <virtualType name="lessFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">lessFileSourceBase</argument>
- </arguments>
- </virtualType>
- <virtualType name="lessFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">lessFileSourceBaseFiltered</argument>
- </arguments>
- </virtualType>
- <virtualType name="lessFileOverriddenBase" type="Magento\Framework\View\File\Collector\Override\Base">
- <arguments>
- <argument name="subDir" xsi:type="string">web</argument>
- </arguments>
- </virtualType>
- <virtualType name="lessFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
- <arguments>
- <argument name="subject" xsi:type="object">lessFileSourceTheme</argument>
- </arguments>
- </virtualType>
- <virtualType name="lessFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
- <arguments>
- <argument name="subject" xsi:type="object">lessFileSourceThemeFiltered</argument>
- </arguments>
- </virtualType>
- <type name="Magento\Framework\Less\File\Collector\Aggregated">
- <arguments>
- <argument name="libraryFiles" xsi:type="object">Magento\Framework\Less\File\Collector\Library</argument>
- <argument name="baseFiles" xsi:type="object">lessFileSourceBaseSorted</argument>
- <argument name="overriddenBaseFiles" xsi:type="object">lessFileOverriddenBase</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\App\Config\Initial\Converter">
- <arguments>
- <argument name="nodeMap" xsi:type="array">
- <item name="default" xsi:type="string">/config/default</item>
- <item name="stores" xsi:type="string">/config/stores</item>
- <item name="websites" xsi:type="string">/config/websites</item>
- </argument>
- </arguments>
- </type>
<type name="Magento\Framework\Stdlib\DateTime\Timezone">
<arguments>
<argument name="defaultTimezonePath" xsi:type="const">Magento\Core\Helper\Data::XML_PATH_DEFAULT_TIMEZONE</argument>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Url">
- <arguments>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\Framework\Locale\Resolver">
<plugin name="initLocale" type="Magento\Framework\Translate\Locale\Resolver\Plugin" sortOrder="10"/>
<arguments>
<argument name="defaultLocalePath" xsi:type="const">Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE</argument>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\App\ScopeResolverPool">
- <arguments>
- <argument name="scopeResolvers" xsi:type="array">
- <item name="store" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
- <item name="stores" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
- <item name="website" xsi:type="object">Magento\Store\Model\Resolver\Website</item>
- <item name="websites" xsi:type="object">Magento\Store\Model\Resolver\Website</item>
- </argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Model\ActionValidator\RemoveAction">
- <arguments>
- <argument name="protectedModels" xsi:type="array">
- <item name="store" xsi:type="string">Magento\Store\Model\Store</item>
- <item name="website" xsi:type="string">Magento\Store\Model\Website</item>
- <item name="storeGroup" xsi:type="string">Magento\Store\Model\Group</item>
- </argument>
- </arguments>
- </type>
- <type name="Magento\Framework\App\PageCache\Identifier">
- <plugin name="core-app-area-design-exception-plugin"
- type="Magento\PageCache\Model\App\CacheIdentifierPlugin" sortOrder="10"/>
- </type>
- <type name="Magento\Framework\Module\Setup\MigrationData">
- <arguments>
- <argument name="data" xsi:type="array">
- <item name="plain" xsi:type="string"><![CDATA[/^(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)::.*?$/sui]]></item>
- <item name="wiki" xsi:type="string"><![CDATA[/{{(block|widget).*?(class|type)=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?}}/sui]]></item>
- <item name="xml" xsi:type="string"><![CDATA[/<block.*?class=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?>/sui]]></item>
- <item name="serialized" xsi:type="string"><![CDATA[#(?P<string>s:\d+:"(?P<alias>[a-z]+[_a-z\d]*?/[a-z]+[_a-z\d]*?)")#sui]]></item>
- </argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Module\Updater\SetupFactory">
- <arguments>
- <argument name="resourceTypes" xsi:type="array">
- <item name="core_setup" xsi:type="string">Magento\Framework\Module\DataSetup</item>
- </argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Module\DataSetup">
- <arguments>
- <argument name="resourceName" xsi:type="string">core_setup</argument>
- <argument name="connectionName" xsi:type="string">Magento\Framework\Module\Updater::DEFAULT_SETUP_CONNECTION</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\Framework\App\Config\Value">
diff --git a/app/code/Magento/Core/etc/frontend/di.xml b/app/code/Magento/Core/etc/frontend/di.xml
index 5e4f205f7ecb118f1f5d5205eecc2e9e8a658f52..724bc250b66564e5205c6661bf1e35e18f290cca 100644
--- a/app/code/Magento/Core/etc/frontend/di.xml
+++ b/app/code/Magento/Core/etc/frontend/di.xml
@@ -6,10 +6,6 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
- <type name="Magento\Framework\View\Layout">
- <plugin name="core-session-depersonalize"
- type="Magento\Core\Model\Layout\DepersonalizePlugin" sortOrder="1"/>
- </type>
<type name="Magento\Framework\App\FrontController">
<plugin name="requestPreprocessor" type="Magento\Store\App\FrontController\Plugin\RequestPreprocessor" sortOrder="50"/>
</type>
diff --git a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
index b9ae57c7459610f21448b11c731f1fedbfb42b99..3db748ab808f69fb71a96010655af13d74fb7404 100644
--- a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
+++ b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
@@ -88,120 +88,6 @@ $table = $connection->newTable(
);
$connection->createTable($table);
-/**
- * Create table 'core_layout_update'
- */
-$table = $connection->newTable(
- $installer->getTable('core_layout_update')
-)->addColumn(
- 'layout_update_id',
- \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
- null,
- ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
- 'Layout Update Id'
-)->addColumn(
- 'handle',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- 255,
- [],
- 'Handle'
-)->addColumn(
- 'xml',
- \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
- '64k',
- [],
- 'Xml'
-)->addColumn(
- 'sort_order',
- \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
- null,
- ['nullable' => false, 'default' => '0'],
- 'Sort Order'
-)->addColumn(
- 'updated_at',
- \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
- null,
- ['nullable' => true],
- 'Last Update Timestamp'
-)->addIndex(
- $installer->getIdxName('core_layout_update', ['handle']),
- ['handle']
-)->setComment(
- 'Layout Updates'
-);
-$connection->createTable($table);
-
-/**
- * Create table 'core_layout_link'
- */
-$table = $connection->newTable(
- $installer->getTable('core_layout_link')
-)->addColumn(
- 'layout_link_id',
- \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
- null,
- ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
- 'Link Id'
-)->addColumn(
- 'store_id',
- \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
- null,
- ['unsigned' => true, 'nullable' => false, 'default' => '0'],
- 'Store Id'
-)->addColumn(
- 'theme_id',
- \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
- null,
- ['unsigned' => true, 'nullable' => false],
- 'Theme id'
-)->addColumn(
- 'layout_update_id',
- \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
- null,
- ['unsigned' => true, 'nullable' => false, 'default' => '0'],
- 'Layout Update Id'
-)->addColumn(
- 'is_temporary',
- \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
- null,
- ['nullable' => false, 'default' => '0'],
- 'Defines whether Layout Update is Temporary'
-)->addIndex(
- $installer->getIdxName('core_layout_link', ['layout_update_id']),
- ['layout_update_id']
-)->addForeignKey(
- $installer->getFkName('core_layout_link', 'layout_update_id', 'core_layout_update', 'layout_update_id'),
- 'layout_update_id',
- $installer->getTable('core_layout_update'),
- 'layout_update_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->addIndex(
- $installer->getIdxName(
- 'core_layout_link',
- ['store_id', 'theme_id', 'layout_update_id', 'is_temporary'],
- \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
- ),
- ['store_id', 'theme_id', 'layout_update_id', 'is_temporary']
-)->addForeignKey(
- $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id'),
- 'store_id',
- $installer->getTable('store'),
- 'store_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->addForeignKey(
- $installer->getFkName('core_layout_link', 'theme_id', 'theme', 'theme_id'),
- 'theme_id',
- $installer->getTable('theme'),
- 'theme_id',
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
- \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->setComment(
- 'Layout Link'
-);
-$connection->createTable($table);
-
/**
* Create table 'core_session'
*/
diff --git a/app/code/Magento/Core/view/adminhtml/web/prototype/magento/window_close.png b/app/code/Magento/Core/view/adminhtml/web/prototype/magento/window_close.png
deleted file mode 100644
index 8eec3e768bba0f8eb7700fe6e0afb44ea4c53076..0000000000000000000000000000000000000000
Binary files a/app/code/Magento/Core/view/adminhtml/web/prototype/magento/window_close.png and /dev/null differ
diff --git a/app/code/Magento/Core/view/frontend/templates/messages.phtml b/app/code/Magento/Core/view/frontend/templates/messages.phtml
deleted file mode 100644
index df7e9cdd588e802a64d9261b82470a83811258d3..0000000000000000000000000000000000000000
--- a/app/code/Magento/Core/view/frontend/templates/messages.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-?>
-<?php foreach ($types as $type) {
- if ($messages = $block->getMessages($type)) {
- if (!$html) {
- $html .= '<div class="messages">';
- }
- $html .= '<div class="message ' . $type . '">';
-
- foreach ($messages as $message) {
- $html .= '<div>';
- $html .= $message->getText();
- $html .= '</div>';
- }
- $html .= '</div>';
- }
- }
-if ($html) {
- $html .= '</div>';
-}
-?>
diff --git a/app/code/Magento/Cron/Model/Observer.php b/app/code/Magento/Cron/Model/Observer.php
index 5431168a28cb0bdc63beaf573c66763e320cd708..2f8a1dafaa0a468261865288cb11bbdd0951566b 100644
--- a/app/code/Magento/Cron/Model/Observer.php
+++ b/app/code/Magento/Cron/Model/Observer.php
@@ -136,7 +136,7 @@ class Observer
'group'
) === null && $this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/use_separate_process',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) == 1
) {
$this->_shell->execute(
@@ -192,7 +192,7 @@ class Observer
{
$scheduleLifetime = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_LIFETIME,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$scheduleLifetime = $scheduleLifetime * self::SECONDS_IN_MINUTE;
if ($scheduledTime < $currentTime - $scheduleLifetime) {
@@ -250,7 +250,7 @@ class Observer
$lastRun = (int)$this->_cache->load(self::CACHE_KEY_LAST_SCHEDULE_GENERATE_AT . $groupId);
$rawSchedulePeriod = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_GENERATE_EVERY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$schedulePeriod = $rawSchedulePeriod * self::SECONDS_IN_MINUTE;
if ($lastRun > time() - $schedulePeriod) {
@@ -322,7 +322,7 @@ class Observer
$lastCleanup = (int)$this->_cache->load(self::CACHE_KEY_LAST_HISTORY_CLEANUP_AT . $groupId);
$historyCleanUp = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_CLEANUP_EVERY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if ($lastCleanup > time() - $historyCleanUp * self::SECONDS_IN_MINUTE) {
return $this;
@@ -338,11 +338,11 @@ class Observer
$historySuccess = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_SUCCESS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$historyFailure = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_FAILURE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$historyLifetimes = [
Schedule::STATUS_SUCCESS => $historySuccess * self::SECONDS_IN_MINUTE,
@@ -372,7 +372,7 @@ class Observer
{
$cronExpr = $this->_scopeConfig->getValue(
$jobConfig['config_path'],
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return $cronExpr;
@@ -430,7 +430,7 @@ class Observer
{
$scheduleAheadFor = (int)$this->_scopeConfig->getValue(
'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_AHEAD_FOR,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$scheduleAheadFor = $scheduleAheadFor * self::SECONDS_IN_MINUTE;
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index fc1a2e9c7d94849918c95f3bcff89cf4c0f0b293..4e6ffb6220fde929d1e6703e1d0f34942d60bb7d 100644
--- a/app/code/Magento/Cron/composer.json
+++ b/app/code/Magento/Cron/composer.json
@@ -3,12 +3,13 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Cron/etc/module.xml b/app/code/Magento/Cron/etc/module.xml
index d88d54d09f131513bb77d005499c85a945751e54..a715d334b05cba24e437c76a7be2e5955f330d24 100644
--- a/app/code/Magento/Cron/etc/module.xml
+++ b/app/code/Magento/Cron/etc/module.xml
@@ -7,5 +7,8 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
<module name="Magento_Cron" schema_version="2.0.0">
+ <sequence>
+ <module name="Magento_Store"/>
+ </sequence>
</module>
</config>
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
index bd0c8013a6c7f05aa265553f59c5b9d73dbb5750..00e289b9372672f2618304f9d661e1c9ae84614d 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
@@ -59,7 +59,7 @@ class Currency extends \Magento\Backend\Block\Template
/**
* Get header
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeader()
{
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
index 0d7a22af869f3c32732d9d26bd92a4f2836d81db..cced163b12413d310e865149ff098d40053f768b 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
@@ -76,7 +76,7 @@ class Currencysymbol extends \Magento\Backend\Block\Widget\Form
/**
* Returns page header
*
- * @return bool|string
+ * @return \Magento\Framework\Phrase
*/
public function getHeader()
{
@@ -129,7 +129,7 @@ class Currencysymbol extends \Magento\Backend\Block\Widget\Form
/**
* Returns inheritance text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getInheritText()
{
diff --git a/app/code/Magento/CurrencySymbol/Helper/Data.php b/app/code/Magento/CurrencySymbol/Helper/Data.php
index a26fb87826f97b1f05835fa868f806b9190846b2..690ec4b6aa523585a656d439ca2a197f795d61d7 100644
--- a/app/code/Magento/CurrencySymbol/Helper/Data.php
+++ b/app/code/Magento/CurrencySymbol/Helper/Data.php
@@ -21,7 +21,7 @@ class Data extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory
@@ -30,7 +30,7 @@ class Data extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory,
diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
index 89ba3f06436e48463bd53a31bf1f984fe72c93da..19261b5ba0c895f514b3549da4a67d0e35c774d0 100644
--- a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
@@ -84,7 +84,7 @@ class Currencysymbol
protected $_systemStore;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -110,7 +110,7 @@ class Currencysymbol
* @param \Magento\Framework\App\Config\ReinitableConfigInterface $coreConfig
* @param \Magento\Backend\Model\Config\Factory $configFactory
* @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param \Magento\Store\Model\System\Store $systemStore
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -120,7 +120,7 @@ class Currencysymbol
\Magento\Framework\App\Config\ReinitableConfigInterface $coreConfig,
\Magento\Backend\Model\Config\Factory $configFactory,
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
\Magento\Store\Model\System\Store $systemStore,
\Magento\Framework\Event\ManagerInterface $eventManager
@@ -154,7 +154,7 @@ class Currencysymbol
self::ALLOWED_CURRENCIES_CONFIG_SEPARATOR,
$this->_scopeConfig->getValue(
self::XML_PATH_ALLOWED_CURRENCIES,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null
)
);
@@ -181,7 +181,7 @@ class Currencysymbol
}
$storeSymbols = $this->_scopeConfig->getValue(
self::XML_PATH_ALLOWED_CURRENCIES,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
$allowedCurrencies = array_merge(
@@ -314,7 +314,7 @@ class Currencysymbol
$result = [];
$configData = (string)$this->_scopeConfig->getValue(
$configPath,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
if ($configData) {
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index 2ca51df0d6ebe05b044035a2ab470ba6e588461c..327228d6ba2114b2ea53889513d906df88d40d02 100644
--- a/app/code/Magento/CurrencySymbol/composer.json
+++ b/app/code/Magento/CurrencySymbol/composer.json
@@ -3,16 +3,16 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-page-cache": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-page-cache": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CurrencySymbol/etc/acl.xml b/app/code/Magento/CurrencySymbol/etc/acl.xml
index 60b154659bbb404ba32635eeefb1736ac140e09e..98eba2a12defc2533466d809470eef8d2e5d38ab 100644
--- a/app/code/Magento/CurrencySymbol/etc/acl.xml
+++ b/app/code/Magento/CurrencySymbol/etc/acl.xml
@@ -8,8 +8,8 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
<resource id="Magento_CurrencySymbol::system_currency" title="Currency" sortOrder="30">
<resource id="Magento_CurrencySymbol::currency_rates" title="Currency Rates" sortOrder="10" />
<resource id="Magento_CurrencySymbol::symbols" title="Currency Symbols" sortOrder="20" />
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard.php b/app/code/Magento/Customer/Block/Account/Dashboard.php
index 423b14871749e474fffd5e78f44f8653b8a9c148..8340a1b9b2a31781dddb3d934e0261ae1802f3b1 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard.php
@@ -166,7 +166,7 @@ class Dashboard extends \Magento\Framework\View\Element\Template
/**
* Retrieve subscription text, either subscribed or not.
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getSubscriptionText()
{
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard/Address.php b/app/code/Magento/Customer/Block/Account/Dashboard/Address.php
index 0c4840c22aa2922646d159db90ed5f28b3edca42..e1cfca8d61250b81d0f63e2d7eb926a05833598a 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard/Address.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard/Address.php
@@ -75,7 +75,7 @@ class Address extends \Magento\Framework\View\Element\Template
/**
* HTML for Shipping Address
*
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getPrimaryShippingAddressHtml()
{
@@ -95,7 +95,7 @@ class Address extends \Magento\Framework\View\Element\Template
/**
* HTML for Billing Address
*
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getPrimaryBillingAddressHtml()
{
diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
index fb35dad44d24221ee5914cb7af79e7fa72a88ce4..b2e7476743729d2dcaa8024dc7c254e0b909aaeb 100644
--- a/app/code/Magento/Customer/Block/Address/Edit.php
+++ b/app/code/Magento/Customer/Block/Address/Edit.php
@@ -349,6 +349,6 @@ class Edit extends \Magento\Directory\Block\Data
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit.php b/app/code/Magento/Customer/Block/Adminhtml/Edit.php
index c7eb9602bf5b75d1fb299540bfc59304cb29204b..3cace28fc3ee44ee23151d0b061a70ddf3e9501a 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit.php
@@ -152,7 +152,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Retrieve the header text, either the name of an existing customer or 'New Customer'.
*
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Group.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Group.php
index 42b87ff19d18736ef871dac043623998b00a7657..c4a30f1c6e9216754deaba9124a7a765e8ffdc54 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Group.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Group.php
@@ -65,7 +65,7 @@ class Group extends Element
/**
* Retrieve disable auto group change checkbox label text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getDisableAutoGroupChangeCheckboxLabel()
{
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php
index 2e87ba6d8f640f8f50efc67528c56b16ceca250e..6ab83f2f7d5a72031f81e057c14f835b515c30ab 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php
@@ -18,7 +18,7 @@ class Sendemail extends Element
protected $_template = 'edit/tab/account/form/renderer/sendemail.phtml';
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|null
+ * @var \Magento\Store\Model\StoreManagerInterface|null
*/
protected $_storeManager = null;
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
index a481a5ae8327f70b2049c159049c14bd0118916d..6467fe865e6db15c13c46a9bf3281ada2daff897 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
@@ -62,7 +62,7 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T
/**
* Return Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -72,7 +72,7 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T
/**
* Return Tab title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php
index 9938665fe2af60c3355d57915e70a3a7d2aeaea1..eb8e8dba07b38a08fda2428bbe107d8c93a87af0 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php
@@ -34,7 +34,7 @@ class Status extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
/**
* @param \Magento\Framework\Object $row
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function render(\Magento\Framework\Object $row)
{
@@ -43,7 +43,7 @@ class Status extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
/**
* @param string $status
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public static function getStatus($status)
{
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
index 34cb2231c8ba8db65b56f751e157f27d6e80f6af..1dbf9f7a2209f21d29500538a504f5831bb5465d 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
@@ -43,7 +43,7 @@ class View extends \Magento\Backend\Block\Template implements TabInterface
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -51,7 +51,7 @@ class View extends \Magento\Backend\Block\Template implements TabInterface
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
index af725020dadd5f43706ad3009d9d846d2dc96803..2ea02b24ab271ec0f4dd0648ae99eefc779051bb 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
@@ -152,7 +152,7 @@ class PersonalInfo extends \Magento\Backend\Block\Template
{
return $this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getCustomer()->getStoreId()
);
}
@@ -172,7 +172,7 @@ class PersonalInfo extends \Magento\Backend\Block\Template
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getIsConfirmedStatus()
{
@@ -199,7 +199,7 @@ class PersonalInfo extends \Magento\Backend\Block\Template
}
/**
- * @return string|null
+ * @return \Magento\Framework\Phrase|string
*/
public function getBillingAddressHtml()
{
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
index 9c0f25d8798dcb871f0a5fa81669b1e054a33517..582fb3b44b92cdfbb56284b2e0024a1619f7706a 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
@@ -98,7 +98,7 @@ class Sales extends \Magento\Backend\Block\Template
$this->_currency = $this->_currencyFactory->create()->load(
$this->_scopeConfig->getValue(
Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
index a974ec152d397fd3f5a329c94c6f46b62f05c54b..67f34e93282c001cb8346705797c03c4b51b482b 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
@@ -123,7 +123,7 @@ class File extends \Magento\Framework\Data\Form\Element\AbstractElement
/**
* Return Delete CheckBox Label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _getDeleteCheckboxLabel()
{
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
index 325ad4e6201eb2aeaf6683bc2728e7fe4ff3fc04..b9d4ed6cc59c8070abfa06854dd3563bbadad8ea 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
@@ -17,7 +17,7 @@ class Image extends \Magento\Customer\Block\Adminhtml\Form\Element\File
/**
* Return Delete CheckBox Label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _getDeleteCheckboxLabel()
{
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
index a53dd3e812c4586fdab022adcdbcddc83e775fd3..8d7f5e3fd2138124f5fb3e3366fb7ef3360abafa 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
@@ -78,7 +78,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Retrieve the header text, either editing an existing group or creating a new one.
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index 0e8699643a9732c901447b656d0d4af4d1383ed1..10745089fdefe756af7d91298583fad5d030fcf8 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -74,7 +74,7 @@ class Register extends \Magento\Directory\Block\Data
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index 5c2b7fe97c96227768b35b702ab8e0e82c06c8ae..61d24dcc78e493c4adad33fecac516cca3a0bce9 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -118,7 +118,7 @@ class Dob extends AbstractWidget
/**
* Return label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
@@ -138,7 +138,7 @@ class Dob extends AbstractWidget
'class' => $this->getHtmlClass(),
'value' => $this->getValue(),
'date_format' => $this->getDateFormat(),
- 'image' => $this->getViewFileUrl('Magento_Core::calendar.png'),
+ 'image' => $this->getViewFileUrl('Magento_Theme::calendar.png'),
]);
return $this->dateElement->getHtml();
}
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index 01b1a631fc04a934b7e65be59ba7ff4905497d04..a42a81c43f8589f176884e88e35786399456f71b 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -12,13 +12,13 @@ use Magento\Customer\Model\Session;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Controller\Result\RedirectFactory;
use Magento\Framework\View\Result\PageFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Customer\Api\CustomerRepositoryInterface;
use Magento\Customer\Helper\Address;
use Magento\Framework\UrlFactory;
use Magento\Framework\Exception\StateException;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* Class Confirm
diff --git a/app/code/Magento/Customer/Controller/Account/Confirmation.php b/app/code/Magento/Customer/Controller/Account/Confirmation.php
index 8d2f65b6f4406c5358b64b885eac2072c0919f61..ba7ee81e3eaf8e199059bf50f728e5ef58bc5e51 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirmation.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirmation.php
@@ -10,13 +10,13 @@ use Magento\Framework\App\Action\Context;
use Magento\Customer\Model\Session;
use Magento\Framework\Controller\Result\RedirectFactory;
use Magento\Framework\View\Result\PageFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Framework\Exception\State\InvalidTransitionException;
class Confirmation extends \Magento\Customer\Controller\Account
{
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var StoreManagerInterface */
protected $storeManager;
/** @var AccountManagementInterface */
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
index 6a23122b3ecc60fbf5cd1a7a088be80210c8ca73..d9ad0aecebb24ddd3ea1f733bc9f8f762ce5c92c 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -13,7 +13,7 @@ use Magento\Customer\Model\Session;
use Magento\Framework\Controller\Result\RedirectFactory;
use Magento\Framework\View\Result\PageFactory;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Customer\Helper\Address;
use Magento\Framework\UrlFactory;
@@ -28,7 +28,7 @@ use Magento\Framework\Escaper;
use Magento\Customer\Model\CustomerExtractor;
use Magento\Framework\Exception\StateException;
use Magento\Framework\Exception\InputException;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
index cbefdec2ed4ca478095270b82d883ac7ed1b823e..b7948e9f95bee8856875b6b3ff95b6e4ce2948c6 100644
--- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -11,7 +11,7 @@ use Magento\Customer\Model\Session;
use Magento\Framework\Controller\Result\RedirectFactory;
use Magento\Framework\View\Result\PageFactory;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Framework\Url\DecoderInterface;
use Magento\Customer\Model\Url as CustomerUrl;
@@ -27,7 +27,7 @@ class LoginPost extends \Magento\Customer\Controller\Account
/** @var ScopeConfigInterface */
protected $scopeConfig;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var StoreManagerInterface */
protected $storeManager;
/** @var AccountManagementInterface */
@@ -101,7 +101,7 @@ class LoginPost extends \Magento\Customer\Controller\Account
if ($this->_getSession()->isLoggedIn()) {
if (!$this->scopeConfig->isSetFlag(
CustomerUrl::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
$referer = $this->getRequest()->getParam(CustomerUrl::REFERER_QUERY_PARAM_NAME);
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
index 591141720c71a0133bf1f91abda09ced8edb16e1..b95e9b1af53d79c1d4506d4dfde9483179fd0ad6 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
@@ -75,7 +75,7 @@ class Cart extends \Magento\Backend\App\Action
$this->_quote = $this->quoteRepository->create();
}
$this->_quote->setWebsite(
- $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite($websiteId)
+ $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getWebsite($websiteId)
);
$this->_quoteItem = $this->_quote->getItemById($quoteItemId);
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
index c4a1403b87e45e0f9fdf8e67ca242a1988c9d7bf..3050408cda037c5efa53dc02f43684c56211ac5a 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
@@ -33,7 +33,7 @@ class Cart extends \Magento\Customer\Controller\Adminhtml\Index
$quote = $quoteRepository->create();
}
$quote->setWebsite(
- $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite($websiteId)
+ $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getWebsite($websiteId)
);
$item = $quote->getItemById($deleteItemId);
if ($item && $item->getId()) {
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index d09f027e4bfaae1517727c60fc078ffdea8cfb59..398522e04a45838cc4537906d3e3d616395c63b6 100644
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -68,7 +68,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
/** @var \Magento\Framework\View\Element\BlockFactory */
protected $_blockFactory;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $_storeManager;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface */
@@ -86,7 +86,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\View\Element\BlockFactory $blockFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param CustomerMetadataInterface $customerMetadataService
* @param AddressMetadataInterface $addressMetadataService
@@ -95,7 +95,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\View\Element\BlockFactory $blockFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
CustomerMetadataInterface $customerMetadataService,
AddressMetadataInterface $addressMetadataService,
@@ -167,7 +167,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
if (!isset($this->_config[$websiteId])) {
$this->_config[$websiteId] = $this->_scopeConfig->getValue(
'customer/address',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -319,7 +319,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_VAT_VALIDATION_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -333,7 +333,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -347,7 +347,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_VIV_ON_EACH_TRANSACTION,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -362,7 +362,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
{
return (string)$this->_scopeConfig->getValue(
self::XML_PATH_VIV_TAX_CALCULATION_ADDRESS_TYPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -376,7 +376,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_VAT_FRONTEND_VISIBILITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 190efb84e084b32f1680e4176aa8f59e5ae63bc0..34b9102493067ad959107198958726644e544e7f 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -35,7 +35,7 @@ use Magento\Framework\Math\Random;
use Magento\Framework\Reflection\DataObjectProcessor;
use Magento\Framework\Stdlib\DateTime;
use Magento\Framework\Stdlib\String as StringHelper;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Handle various customer account actions
@@ -105,7 +105,7 @@ class AccountManagement implements AccountManagementInterface
private $eventManager;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
private $storeManager;
@@ -840,7 +840,7 @@ class AccountManagement implements AccountManagementInterface
$transport = $this->transportBuilder->setTemplateIdentifier(
$this->scopeConfig->getValue(
self::XML_PATH_RESET_PASSWORD_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
)
)->setTemplateOptions(
@@ -850,7 +850,7 @@ class AccountManagement implements AccountManagementInterface
)->setFrom(
$this->scopeConfig->getValue(
self::XML_PATH_FORGOT_EMAIL_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
)
)->addTo(
@@ -911,13 +911,13 @@ class AccountManagement implements AccountManagementInterface
{
/** @var \Magento\Framework\Mail\TransportInterface $transport */
$transport = $this->transportBuilder->setTemplateIdentifier(
- $this->scopeConfig->getValue($template, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
+ $this->scopeConfig->getValue($template, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
)->setTemplateOptions(
['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $storeId]
)->setTemplateVars(
$templateParams
)->setFrom(
- $this->scopeConfig->getValue($sender, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
+ $this->scopeConfig->getValue($sender, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
)->addTo(
$customer->getEmail(),
$this->customerViewHelper->getCustomerName($customer)
@@ -942,7 +942,7 @@ class AccountManagement implements AccountManagementInterface
return (bool)$this->scopeConfig->getValue(
self::XML_PATH_IS_CONFIRM,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/Customer/Model/Address/Config.php b/app/code/Magento/Customer/Model/Address/Config.php
index 46eef9b39e044c453e39e66f7b9c6f1a2e6e0ed9..c2cd8f0dba94b3a7b92749b45be5898549e6abad 100644
--- a/app/code/Magento/Customer/Model/Address/Config.php
+++ b/app/code/Magento/Customer/Model/Address/Config.php
@@ -41,7 +41,7 @@ class Config extends \Magento\Framework\Config\Data
protected $_defaultTypes = [];
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -58,7 +58,7 @@ class Config extends \Magento\Framework\Config\Data
/**
* @param \Magento\Customer\Model\Address\Config\Reader $reader
* @param \Magento\Framework\Config\CacheInterface $cache
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Helper\Address $addressHelper
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param string $cacheId
@@ -66,7 +66,7 @@ class Config extends \Magento\Framework\Config\Data
public function __construct(
\Magento\Customer\Model\Address\Config\Reader $reader,
\Magento\Framework\Config\CacheInterface $cache,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Helper\Address $addressHelper,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
$cacheId = 'address_format'
@@ -130,7 +130,7 @@ class Config extends \Magento\Framework\Config\Data
)->setTitle(
(string)$typeConfig['title']
)->setDefaultFormat(
- $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+ $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
)->setEscapeHtml(
$escapeHtml
);
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
index 0947b65311163ced471d5215ce0eeff175fb52e7..fe286e314ec45b3d9cce92bf2d24e24223887a7e 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
@@ -17,14 +17,14 @@ class Street extends \Magento\Framework\App\Config\Value
*/
protected $_eavConfig;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -34,7 +34,7 @@ class Street extends \Magento\Framework\App\Config\Value
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -55,7 +55,7 @@ class Street extends \Magento\Framework\App\Config\Value
$attribute = $this->_eavConfig->getAttribute('customer_address', 'street');
$value = $this->getValue();
switch ($this->getScope()) {
- case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES:
+ case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES:
$website = $this->_storeManager->getWebsite($this->getScopeCode());
$attribute->setWebsite($website);
$attribute->load($attribute->getId());
@@ -81,7 +81,7 @@ class Street extends \Magento\Framework\App\Config\Value
{
$result = parent::afterDelete();
- if ($this->getScope() == \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES) {
+ if ($this->getScope() == \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES) {
$attribute = $this->_eavConfig->getAttribute('customer_address', 'street');
$website = $this->_storeManager->getWebsite($this->getScopeCode());
$attribute->setWebsite($website);
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php b/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
index df2b0563feaf07caa5a9f5a93a098f32dbb24dc1..639238500a6df12a3e22f940b051e04ea3fd0261 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
@@ -19,14 +19,14 @@ class Customer extends \Magento\Framework\App\Config\Value
*/
protected $_eavConfig;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -36,7 +36,7 @@ class Customer extends \Magento\Framework\App\Config\Value
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Customer/Model/Config/Share.php b/app/code/Magento/Customer/Model/Config/Share.php
index b8961d32b50b3bcc75c07333c1fb2d2c9df3e3db..bec6a49291d683bf89b265c5e787ac573df221fd 100644
--- a/app/code/Magento/Customer/Model/Config/Share.php
+++ b/app/code/Magento/Customer/Model/Config/Share.php
@@ -31,7 +31,7 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
*/
protected $_customerResource;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $_storeManager;
/**
@@ -40,7 +40,7 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Resource\Customer $customerResource
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -50,7 +50,7 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Resource\Customer $customerResource,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -80,7 +80,7 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
{
return $this->_config->getValue(
self::XML_PATH_CUSTOMER_ACCOUNT_SHARE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) == self::SHARE_WEBSITE;
}
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 340a9ad95437ad5791ccd418895efbbab55ce244..6bda65fd95c5adfdcaf1fd79936b92d0f213378d 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -133,7 +133,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
protected $_isReadonly = false;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -212,7 +212,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
* @param AttributeValueFactory $customAttributeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $config
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param Resource\Customer $resource
@@ -236,7 +236,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
\Magento\Framework\Registry $registry,
\Magento\Framework\Api\MetadataServiceInterface $metadataService,
AttributeValueFactory $customAttributeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $config,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Customer\Model\Resource\Customer $resource,
@@ -816,7 +816,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_IS_CONFIRM,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
}
@@ -861,13 +861,13 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
{
/** @var \Magento\Framework\Mail\TransportInterface $transport */
$transport = $this->_transportBuilder->setTemplateIdentifier(
- $this->_scopeConfig->getValue($template, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
+ $this->_scopeConfig->getValue($template, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
)->setTemplateOptions(
['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $storeId]
)->setTemplateVars(
$templateParams
)->setFrom(
- $this->_scopeConfig->getValue($sender, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
+ $this->_scopeConfig->getValue($sender, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
)->addTo(
$this->getEmail(),
$this->getName()
@@ -910,7 +910,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
$storeId = $this->getStoreId() ? $this->getStoreId() : $this->_storeManager->getStore()->getId();
$groupId = $this->_scopeConfig->getValue(
GroupManagement::XML_PATH_DEFAULT_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$this->setData('group_id', $groupId);
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
index 2907ff51187ac46cab9066673694271b7338b495..a7932d37dda586799e31667a7b0a244151f2516e 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
@@ -13,14 +13,14 @@ namespace Magento\Customer\Model\Customer\Attribute\Backend;
class Store extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
index 8baa46f869d15cf5ec530bd5c5d665cf86f0ac7b..688be581107444623120599e60ba9ba9bc463739 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
@@ -13,14 +13,14 @@ namespace Magento\Customer\Model\Customer\Attribute\Backend;
class Website extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Customer/Model/CustomerExtractor.php b/app/code/Magento/Customer/Model/CustomerExtractor.php
index fbfe36e7d32a7834f4150d0269377a20a0694a96..7e16f8359a27992368d06f8a4c8a7ebc7951e464 100644
--- a/app/code/Magento/Customer/Model/CustomerExtractor.php
+++ b/app/code/Magento/Customer/Model/CustomerExtractor.php
@@ -22,7 +22,7 @@ class CustomerExtractor
protected $customerFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -39,14 +39,14 @@ class CustomerExtractor
/**
* @param Metadata\FormFactory $formFactory
* @param \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param GroupManagementInterface $customerGroupManagement
* @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
*/
public function __construct(
\Magento\Customer\Model\Metadata\FormFactory $formFactory,
\Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
GroupManagementInterface $customerGroupManagement,
\Magento\Framework\Api\DataObjectHelper $dataObjectHelper
) {
diff --git a/app/code/Magento/Customer/Model/CustomerRegistry.php b/app/code/Magento/Customer/Model/CustomerRegistry.php
index 1f33005f38d77c8f0ec4686d8470d8b97e00c5b9..cc4ea04078b95398a7ab715b76552df2e4f843a2 100644
--- a/app/code/Magento/Customer/Model/CustomerRegistry.php
+++ b/app/code/Magento/Customer/Model/CustomerRegistry.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Model;
use Magento\Customer\Model\Data\CustomerSecure;
use Magento\Customer\Model\Data\CustomerSecureFactory;
use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Registry for \Magento\Customer\Model\Customer
@@ -44,7 +44,7 @@ class CustomerRegistry
private $customerSecureRegistryById = [];
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
private $storeManager;
@@ -53,12 +53,12 @@ class CustomerRegistry
*
* @param CustomerFactory $customerFactory
* @param CustomerSecureFactory $customerSecureFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
*/
public function __construct(
CustomerFactory $customerFactory,
CustomerSecureFactory $customerSecureFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ StoreManagerInterface $storeManager
) {
$this->customerFactory = $customerFactory;
$this->customerSecureFactory = $customerSecureFactory;
diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
index 6e2f8727ffa9c65fb0f207310e97f55c9fcf8478..06127d3e48911ba06e5a147fa08a525d49dce3a4 100644
--- a/app/code/Magento/Customer/Model/GroupManagement.php
+++ b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -12,7 +12,7 @@ use Magento\Framework\Api\SearchCriteriaBuilder;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Api\FilterBuilder;
use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Api\GroupRepositoryInterface;
use Magento\Customer\Api\Data\GroupInterfaceFactory;
use Magento\Customer\Model\GroupFactory;
@@ -31,7 +31,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
const GROUP_CODE_MAX_LENGTH = 32;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var StoreManagerInterface
*/
protected $storeManager;
@@ -75,7 +75,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
* @param FilterBuilder $filterBuilder
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ StoreManagerInterface $storeManager,
ScopeConfigInterface $scopeConfig,
GroupFactory $groupFactory,
GroupRepositoryInterface $groupRepository,
@@ -117,7 +117,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
try {
$groupId = $this->scopeConfig->getValue(
self::XML_PATH_DEFAULT_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
} catch (\Magento\Framework\App\InitException $e) {
diff --git a/app/code/Magento/Customer/Model/Resource/Customer.php b/app/code/Magento/Customer/Model/Resource/Customer.php
index d362545e7eeeb71cab002a0ba1b21907e8499be2..63f8d37a6c67c7a32d153149ce0b2cb21039e498 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer.php
@@ -380,7 +380,7 @@ class Customer extends \Magento\Eav\Model\Entity\AbstractEntity
{
if ($this->_scopeConfig->getValue(
\Magento\Customer\Model\Customer::XML_PATH_GENERATE_HUMAN_FRIENDLY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
parent::setNewIncrementId($object);
diff --git a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
index 7e7e1d4e2525a5138153e929acdc0417016ec09e..610870d48f195e1e3f7059ad730a2e0df12cdb62 100644
--- a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
@@ -58,7 +58,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
protected $eventManager;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -76,7 +76,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
* @param \Magento\Customer\Api\CustomerMetadataInterface $customerMetadata
* @param \Magento\Customer\Api\Data\CustomerSearchResultsDataBuilder $searchResultsDataBuilder
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -89,7 +89,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
\Magento\Customer\Api\CustomerMetadataInterface $customerMetadata,
\Magento\Customer\Api\Data\CustomerSearchResultsDataBuilder $searchResultsDataBuilder,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
) {
$this->customerFactory = $customerFactory;
diff --git a/app/code/Magento/Customer/Model/Resource/GroupRepository.php b/app/code/Magento/Customer/Model/Resource/GroupRepository.php
index 7c2d6cca58c219f1d9e527a5cbf37154442a87cc..5fde3ceb88fedd28ba296665fbded5cd9ed55aa2 100644
--- a/app/code/Magento/Customer/Model/Resource/GroupRepository.php
+++ b/app/code/Magento/Customer/Model/Resource/GroupRepository.php
@@ -124,7 +124,7 @@ class GroupRepository implements \Magento\Customer\Api\GroupRepositoryInterface
* Would like a better way to determine this error condition but
* difficult to do without imposing more database calls
*/
- if ($e->getMessage() === __('Customer Group already exists.')) {
+ if ($e->getMessage() == (string)__('Customer Group already exists.')) {
throw new InvalidTransitionException('Customer Group already exists.');
}
throw $e;
diff --git a/app/code/Magento/Customer/Model/Session/Storage.php b/app/code/Magento/Customer/Model/Session/Storage.php
index b700cde7446cb18622994ffcd605f0c1a286dbd7..a29e6e55302d4382c5dbda1409498deeed3a20fc 100644
--- a/app/code/Magento/Customer/Model/Session/Storage.php
+++ b/app/code/Magento/Customer/Model/Session/Storage.php
@@ -11,13 +11,13 @@ class Storage extends \Magento\Framework\Session\Storage
{
/**
* @param \Magento\Customer\Model\Config\Share $configShare
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param string $namespace
* @param array $data
*/
public function __construct(
\Magento\Customer\Model\Config\Share $configShare,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$namespace = 'customer',
array $data = []
) {
diff --git a/app/code/Magento/Customer/Model/Url.php b/app/code/Magento/Customer/Model/Url.php
index db980db3e36c7d5b2fc28c856c85c09bc4fa980f..1572e60414378e9fe9a48848b30d9049308689f7 100644
--- a/app/code/Magento/Customer/Model/Url.php
+++ b/app/code/Magento/Customer/Model/Url.php
@@ -9,7 +9,7 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\RequestInterface;
use Magento\Framework\Url\EncoderInterface;
use Magento\Framework\UrlInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* Customer url model
diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index 6462ff65732d17f5da0cd2e088a63f19331c5aa3..c280d6c7addf64663c7fb8e5ed53ecdc3c0fd64b 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -7,7 +7,7 @@ namespace Magento\Customer\Model;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* Customer VAT model
@@ -94,7 +94,7 @@ class Vat
{
return (string)$this->scopeConfig->getValue(
self::XML_PATH_MERCHANT_COUNTRY_CODE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -109,7 +109,7 @@ class Vat
{
return (string)$this->scopeConfig->getValue(
self::XML_PATH_MERCHANT_VAT_NUMBER,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -128,7 +128,7 @@ class Vat
$isAutoGroupAssign = $this->scopeConfig->isSetFlag(
self::XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
$store
);
if (!$isAutoGroupAssign) {
@@ -147,7 +147,7 @@ class Vat
if (isset($vatClassToGroupXmlPathMap[$vatClass])) {
$groupId = (int)$this->scopeConfig->getValue(
$vatClassToGroupXmlPathMap[$vatClass],
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -290,7 +290,7 @@ class Vat
',',
$this->scopeConfig->getValue(
self::XML_PATH_EU_COUNTRIES_LIST,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
)
);
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index 130f1f2de28f063b8ad724d09acc6699d418887f..158a5b3c238546ad4661472368b5e32356cbb3d3 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -264,7 +264,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
{
return $this->scopeConfig->getValue(
\Magento\Framework\Session\Config::XML_PATH_COOKIE_LIFETIME,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) + 86400;
}
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
index 0449aad7f645fe4d09b3455ecc799f3de772311a..b5c6f4bd7c2a1ab82a6e17f43c2837586732016b 100644
--- a/app/code/Magento/Customer/composer.json
+++ b/app/code/Magento/Customer/composer.json
@@ -3,32 +3,32 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-newsletter": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-wishlist": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-review": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-page-cache": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-authorization": "0.42.0-beta6",
- "magento/module-integration": "0.42.0-beta6",
- "magento/module-ui": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-newsletter": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-wishlist": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-review": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-page-cache": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-authorization": "0.42.0-beta7",
+ "magento/module-integration": "0.42.0-beta7",
+ "magento/module-ui": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"suggest": {
- "magento/module-cookie": "0.42.0-beta6"
+ "magento/module-cookie": "0.42.0-beta7"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Customer/etc/acl.xml b/app/code/Magento/Customer/etc/acl.xml
index 1390534d482473b690db04f048c8b25d8ee6b418..1b9e7facbefcc753075712cddbdb12256173a7d5 100644
--- a/app/code/Magento/Customer/etc/acl.xml
+++ b/app/code/Magento/Customer/etc/acl.xml
@@ -8,17 +8,17 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_Customer::customer" title="Customers" sortOrder="40">
<resource id="Magento_Customer::manage" title="All Customers" sortOrder="10" />
</resource>
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Customer::config_customer" title="Customers Section" sortOrder="50" />
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores_other_settings">
+ <resource id="Magento_Backend::stores_other_settings">
<resource id="Magento_Customer::group" title="Customer Groups" sortOrder="10" />
</resource>
</resource>
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Address.php b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
index 732ff997f7749f295cc6e4de2d8e857571dc248f..bfe77d3e13c450aa353d8bb7af894494bd81f0ca 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
@@ -103,7 +103,7 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -116,7 +116,7 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
index 3cbdb1b452cbda2ee94bfddbe6fca672b5ea2d4b..f611129b7aa9d60c3b84f460fc0030f13f3a0c5f 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
@@ -81,7 +81,7 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -91,7 +91,7 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
index fbf84628545a3e0e2b1fed710bacd4f479f9ade9..fd577239948e53d486348ad0bd6e2b4009878302 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
@@ -75,7 +75,7 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory
@@ -89,7 +89,7 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
\Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index 64b60c632b54b1ce75b0a81a0a9082d6587e83b0..425c3bab09f303f81aee5460a085c770fc3ecc8c 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -219,7 +219,7 @@ class Address extends AbstractCustomer
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory
@@ -240,7 +240,7 @@ class Address extends AbstractCustomer
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
\Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index b2dace60d35f893f9a118ada56a0a40d4ef390f0..a498218c67381f0ed6baabef9bd49c9f56342e38 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -124,7 +124,7 @@ class Customer extends AbstractCustomer
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory
@@ -140,7 +140,7 @@ class Customer extends AbstractCustomer
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
\Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory,
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index e49f86893a2de592d1223a377f573beed6d2c58d..ace76834ed5f1de23bc0fdcd5725e52e20ddd61c 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -3,17 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-import-export": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-import-export": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
index 9d4a2c9dcab25d0fe1e1499f360fbd31de80f115..207446ba1db7c25979ba1780bd3e5413e2259659 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
@@ -44,7 +44,7 @@ class Container extends \Magento\Backend\Block\Widget\Container
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
index 2e7b74bca7417a281c02f79338f7a9d0c556d1c9..28db136b67d8f651be513e987e634e0508b6b5a0 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
@@ -96,7 +96,7 @@ class LogoUploader extends \Magento\DesignEditor\Block\Adminhtml\Editor\Form\Ren
{
$image = null;
if (null !== $store) {
- $image = basename($this->_scopeConfig->getValue('design/header/logo_src', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store->getId()));
+ $image = basename($this->_scopeConfig->getValue('design/header/logo_src', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store->getId()));
}
return $image;
}
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
index e48e5e3df2e058b9f37aa54317b1d579bd57ad6c..ead8b8604bce1f29fad46e34d97d50898dd1fb35 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
@@ -87,7 +87,7 @@ class Js extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Return confirmation message for delete action
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getConfirmMessageDelete()
{
@@ -151,7 +151,7 @@ class Js extends \Magento\Backend\Block\Widget\Form\Generic
/**
* Get js tab title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTitle()
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content/Files.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content/Files.php
index f153b9e2e700095517da47ad892ccd823b89887e..5758957680fcee74b5b26be9ad1c005efa141db2 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content/Files.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content/Files.php
@@ -34,7 +34,7 @@ class Files extends \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Files
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getStorageType()
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Tabs/AbstractTabs.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Tabs/AbstractTabs.php
index 8d639c54d2d483a699faf66bce0e3a9b557d4bf7..c23777ec5fe4375b199dcadef208e2bde94d7e77 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Tabs/AbstractTabs.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Tabs/AbstractTabs.php
@@ -45,7 +45,7 @@ abstract class AbstractTabs extends \Magento\Framework\View\Element\Template
/**
* Get translated title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTitle()
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Assigned.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Assigned.php
index 74a90bd7a63c8ec1003ccce419f1ce9a8c67c207..b926866874722ddd881a1e6b3b6ba1bcec7cff1e 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Assigned.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Assigned.php
@@ -14,7 +14,7 @@ class Assigned extends \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\Sele
/**
* Get list title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php
index 750d52bfc623d1fa896b150626acf9dcc25db303..9dec8955ed766e8b2718665566472ef8ca48cb42 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php
@@ -16,7 +16,7 @@ class Available extends \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\Sel
/**
* Get tab title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Unassigned.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Unassigned.php
index 2fb94c167f3eaaf60547284a200cb49be8ed09f7..4b3d386a4e7218e09e2ad78c18d516709ff658b3 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Unassigned.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Unassigned.php
@@ -14,7 +14,7 @@ class Unassigned extends \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\Se
/**
* Get list title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Available.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Available.php
index bf538e4e9cb69932cf96b61ac5d9c23eff1bf0c2..3003018208d2f42bd9bc337e6f7fe40e51fd46db 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Available.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Available.php
@@ -25,7 +25,7 @@ class Available extends \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\Tab
/**
* Return Tab title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Customizations.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Customizations.php
index 67dd0193e1b16a16d51b71c23ba08b280f6dfb7f..743076bc1970f2231f22149f68ba6440a4da4b1f 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Customizations.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Customizations.php
@@ -24,7 +24,7 @@ class Customizations extends \Magento\DesignEditor\Block\Adminhtml\Theme\Selecto
/**
* Return Tab title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
index 452e1efbb634ee6a75e501fc5bc17fa35fedf43d..dd512bd0c91b48bcbb4835613606c5c8623e0575 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
@@ -26,8 +26,8 @@ class AssignThemeToStore extends \Magento\DesignEditor\Controller\Adminhtml\Syst
$defaultStore = -1;
$emptyStores = -2;
if ($stores == $defaultStore) {
- /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
- $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+ /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+ $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
$ids = array_keys($storeManager->getStores());
$stores = [array_shift($ids)];
} elseif ($stores == $emptyStores) {
diff --git a/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php b/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
index 5e4e7c539a0d1499c917fa32577e52023507d5e3..9fcc813836edf04a0202911704154cf5ce3455fe 100644
--- a/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
+++ b/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
@@ -47,7 +47,7 @@ class Standard extends \Magento\Core\App\Router\Base
* @param \Magento\Framework\App\ResponseFactory $responseFactory
* @param \Magento\Framework\App\Route\Config $routeConfig
* @param \Magento\Framework\UrlInterface $url
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
* @param string $routerId
@@ -66,7 +66,7 @@ class Standard extends \Magento\Core\App\Router\Base
\Magento\Framework\App\ResponseFactory $responseFactory,
\Magento\Framework\App\Route\Config $routeConfig,
\Magento\Framework\UrlInterface $url,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
$routerId,
diff --git a/app/code/Magento/DesignEditor/Model/State.php b/app/code/Magento/DesignEditor/Model/State.php
index 99ee39bab1922e2ee85b644eed5f0325dd13a4b4..3e284ed2fd26401902eff8aaf8b5639e2391028b 100644
--- a/app/code/Magento/DesignEditor/Model/State.php
+++ b/app/code/Magento/DesignEditor/Model/State.php
@@ -186,7 +186,7 @@ class State
$this->_mutableConfig->setValue(
\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
$themeId,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->_configuration->setValue(\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID, $themeId);
}
diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json
index 9e1f0a8f1cbad59e841cce1e4082e78381874fd7..9ecd7c8969c735c29538b415f5158dc5f4ef6fef 100644
--- a/app/code/Magento/DesignEditor/composer.json
+++ b/app/code/Magento/DesignEditor/composer.json
@@ -3,16 +3,17 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-translation": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/DesignEditor/etc/acl.xml b/app/code/Magento/DesignEditor/etc/acl.xml
index 785ba266c94d323e29d16f1bdb6ab4e47d18903c..ac1ca9d5a54e7e9779f4596380b0e2fb28d0f30a 100644
--- a/app/code/Magento/DesignEditor/etc/acl.xml
+++ b/app/code/Magento/DesignEditor/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::content">
- <resource id="Magento_Adminhtml::design">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::content">
+ <resource id="Magento_Backend::design">
<resource id="Magento_DesignEditor::editor" title="The Designer" sortOrder="10" />
</resource>
</resource>
diff --git a/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml b/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml
index 6e63320b28c7e878ba2ea388001bb53cf42895f8..742c2846176239ed24a99b6ca8a08586bbd05097 100644
--- a/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml
+++ b/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_DesignEditor" before="Magento_Adminhtml" />
+ <module name="Magento_DesignEditor" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/DesignEditor/etc/di.xml b/app/code/Magento/DesignEditor/etc/di.xml
index 8653a423d851d51fc19402a12cfaaeb36fb16623..3b3824539d759d59d4f6bb43e11ef98488f8f149 100644
--- a/app/code/Magento/DesignEditor/etc/di.xml
+++ b/app/code/Magento/DesignEditor/etc/di.xml
@@ -37,7 +37,7 @@
</type>
<type name="Magento\DesignEditor\Model\Url\NavigationMode">
<arguments>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\DesignEditor\Model\State">
diff --git a/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml b/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml
index 3140404b2223c53dbe7dcfb955aed07e718390e2..23f609877c26a50ccf5849bd144297626ca08dfe 100644
--- a/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml
+++ b/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml
@@ -64,8 +64,8 @@ require([
var dialogVde = $('#translate-dialog');
$textTranslations.translateInlineVde({
- img: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon.png') ?>',
- imgHover: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon_hover.png') ?>',
+ img: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon.png') ?>',
+ imgHover: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon_hover.png') ?>',
translateMode: '<?php echo $block->getTranslateMode() ?>',
onClick: function(e, widget) {
$body.removeClass('trnslate-inline-' + widget.options.translateMode + '-area');
@@ -80,8 +80,8 @@ require([
});
$imageTranslations.translateInlineImageVde({
- img: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon.png') ?>',
- imgHover: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon_hover.png') ?>',
+ img: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon.png') ?>',
+ imgHover: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon_hover.png') ?>',
translateMode: '<?php echo $block->getTranslateMode() ?>',
onClick: function(e, widget) {
$body.removeClass('trnslate-inline-' + widget.options.translateMode + '-area');
@@ -96,8 +96,8 @@ require([
});
$scriptTranslations.translateInlineScriptVde({
- img: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon.png') ?>',
- imgHover: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon_hover.png') ?>',
+ img: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon.png') ?>',
+ imgHover: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon_hover.png') ?>',
translateMode: '<?php echo $block->getTranslateMode() ?>',
onClick: function(e, widget) {
$body.removeClass('trnslate-inline-' + widget.options.translateMode + '-area');
diff --git a/app/code/Magento/Developer/LICENSE.txt b/app/code/Magento/Developer/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..49525fd99da9c51e6d85420266d41cb3d6b7a648
--- /dev/null
+++ b/app/code/Magento/Developer/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/Developer/LICENSE_AFL.txt b/app/code/Magento/Developer/LICENSE_AFL.txt
new file mode 100644
index 0000000000000000000000000000000000000000..87943b95d43a5bb8736093275afe3cb8e1d93d26
--- /dev/null
+++ b/app/code/Magento/Developer/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
index 61683433a3eba721459e668a2cd4150a6ef1c4a6..9e40d6f9cd1a75f111df35cf400c8642001a6db5 100644
--- a/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
+++ b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
@@ -64,8 +64,8 @@ class DebugHints
\Magento\Framework\View\TemplateEngineFactory $subject,
\Magento\Framework\View\TemplateEngineInterface $invocationResult
) {
- if ($this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE) && $this->_coreData->isDevAllowed()) {
- $showBlockHints = $this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ if ($this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE) && $this->_coreData->isDevAllowed()) {
+ $showBlockHints = $this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
return $this->_objectManager->create(
'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints',
['subject' => $invocationResult, 'showBlockHints' => $showBlockHints]
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index c6b1e4436388861e258eeb9825b332bfe45ded99..4436480fa389fe0be881f38f713d95a50b326bc2 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -3,12 +3,13 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-core": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 03e53d36c5449b9dea76d4f330c936c5b7a6c8f1..6b82978549bf8b8676bc89ef1f42f84ee6c14895 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -157,7 +157,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
protected $_coreDate;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -205,7 +205,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
* @param \Magento\Shipping\Helper\Carrier $carrierHelper
* @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
* @param \Magento\Framework\Module\Dir\Reader $configReader
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\String $string
* @param \Magento\Framework\Math\Division $mathDivision
* @param \Magento\Framework\Filesystem $filesystem
@@ -233,7 +233,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
\Magento\Shipping\Helper\Carrier $carrierHelper,
\Magento\Framework\Stdlib\DateTime\DateTime $coreDate,
\Magento\Framework\Module\Dir\Reader $configReader,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\String $string,
\Magento\Framework\Math\Division $mathDivision,
\Magento\Framework\Filesystem $filesystem,
@@ -284,7 +284,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
if (!$origValue) {
$origValue = $this->_scopeConfig->getValue(
$pathToValue,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()
);
}
@@ -422,7 +422,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
->setOrigEmail(
$this->_scopeConfig->getValue(
'trans_email/ident_general/email',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$requestObject->getStoreId()
)
)
@@ -435,7 +435,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
$originStreet2 = $this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ADDRESS2,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$requestObject->getStoreId()
);
@@ -1265,7 +1265,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
$countryParams = $this->getCountryParams(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
@@ -1388,7 +1388,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
$originRegion = $this->getCountryParams(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()
)
)->getRegion();
diff --git a/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
index 0f66031a62e79097b252f568c0be3b9daae88818..43ed90ffedcdc732a05cde308c5c914b27ec59b0 100644
--- a/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
@@ -34,7 +34,7 @@ class Shipping
*/
public function afterGetStateActive(\Magento\Checkout\Block\Cart\Shipping $subject, $result)
{
- return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -45,6 +45,6 @@ class Shipping
*/
public function afterGetCityActive(\Magento\Checkout\Block\Cart\Shipping $subject, $result)
{
- return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
index 6a0ffb64eff0097eec6d131ca689e2926c0e22b3..c13286894a95cf9f1df7834691baf30899fd221a 100644
--- a/app/code/Magento/Dhl/composer.json
+++ b/app/code/Magento/Dhl/composer.json
@@ -3,22 +3,22 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-shipping": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-shipping": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"lib-libxml": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php b/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
index 1f67df4a13055df5101a208ca64391e983394ea8..c99cba86d9e1f6aa6e26f3c5b4410e2057df2120 100644
--- a/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
+++ b/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
@@ -20,7 +20,7 @@ class Base extends \Magento\Backend\Block\System\Config\Form\Field
if ($this->getRequest()->getParam('website') != '') {
$priceScope = $this->_scopeConfig->getValue(
\Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if ($priceScope == \Magento\Store\Model\Store::PRICE_SCOPE_GLOBAL) {
return '';
diff --git a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
index 8162705c6e7913ce07788c0589a468018ee7d729..b8aada56cf7fd804c69cb98897ee91f264cb6d7b 100644
--- a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
+++ b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
@@ -13,8 +13,8 @@ class SwitchAction extends \Magento\Framework\App\Action\Action
*/
public function execute()
{
- /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
- $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+ /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+ $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
$currency = (string)$this->getRequest()->getParam('currency');
if ($currency) {
$storeManager->getStore()->setCurrentCurrencyCode($currency);
diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
index 40b4f42406c0c18dbebfca4299b4d40ef0eacb80..9f9f9977bef05de6f05a479013f2f1d5b6ed8510 100644
--- a/app/code/Magento/Directory/Helper/Data.php
+++ b/app/code/Magento/Directory/Helper/Data.php
@@ -77,7 +77,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_coreHelper;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -97,7 +97,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Directory\Model\Resource\Country\Collection $countryCollection
* @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regCollectionFactory,
* @param \Magento\Core\Helper\Data $coreHelper
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
@@ -107,7 +107,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
\Magento\Directory\Model\Resource\Country\Collection $countryCollection,
\Magento\Directory\Model\Resource\Region\CollectionFactory $regCollectionFactory,
\Magento\Core\Helper\Data $coreHelper,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
@@ -228,7 +228,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
$value = trim(
$this->_config->getValue(
self::OPTIONAL_ZIP_COUNTRIES_CONFIG_PATH,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$this->_optZipCountries = preg_split('/\,/', $value, 0, PREG_SPLIT_NO_EMPTY);
@@ -260,10 +260,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
public function getCountriesWithStatesRequired($asJson = false)
{
$value = trim(
- $this->_config->getValue(
- self::XML_PATH_STATES_REQUIRED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- )
+ $this->_config->getValue(self::XML_PATH_STATES_REQUIRED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
);
$countryList = preg_split('/\,/', $value, 0, PREG_SPLIT_NO_EMPTY);
if ($asJson) {
@@ -281,7 +278,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return (bool)$this->_config->getValue(
self::XML_PATH_DISPLAY_ALL_STATES,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
index 129d1f976761e3c219066a48b98e3431374057d0..3b5ec26325abc5716c3c2137e5c4e75549eaf4d0 100644
--- a/app/code/Magento/Directory/Model/Currency.php
+++ b/app/code/Magento/Directory/Model/Currency.php
@@ -46,7 +46,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
protected $_localeFormat;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -69,7 +69,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Directory\Helper\Data $directoryHelper
* @param Currency\FilterFactory $currencyFilterFactory
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
@@ -82,7 +82,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\Locale\FormatInterface $localeFormat,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Directory\Helper\Data $directoryHelper,
\Magento\Directory\Model\Currency\FilterFactory $currencyFilterFactory,
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,
diff --git a/app/code/Magento/Directory/Model/Currency/DefaultLocator.php b/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
index 29fe6747dbbedf2c091deb08892fa252af61c101..d9ccfa0b263b50b306b4bfa97803c838778f660d 100644
--- a/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
+++ b/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
@@ -17,17 +17,17 @@ class DefaultLocator
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $configuration
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $configuration,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_configuration = $configuration;
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Directory/Model/Currency/Filter.php b/app/code/Magento/Directory/Model/Currency/Filter.php
index 7670fac88b0297c52c661c490b1bad21641632da..b15eee9c3aa35d209984a878163ea9e729e25f87 100644
--- a/app/code/Magento/Directory/Model/Currency/Filter.php
+++ b/app/code/Magento/Directory/Model/Currency/Filter.php
@@ -33,7 +33,7 @@ class Filter implements \Zend_Filter_Interface
protected $_localeFormat;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -51,7 +51,7 @@ class Filter implements \Zend_Filter_Interface
/**
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
* @param PriceCurrencyInterface $priceCurrency
* @param string $code
@@ -59,7 +59,7 @@ class Filter implements \Zend_Filter_Interface
*/
public function __construct(
\Magento\Framework\Locale\FormatInterface $localeFormat,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,
PriceCurrencyInterface $priceCurrency,
$code,
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Config.php b/app/code/Magento/Directory/Model/Currency/Import/Config.php
index 153bc7e4273acf4d0cf009165a473d3c0c3ca9d1..2af251f98275cff6050ecbed4fba7aa5596ecd30 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Config.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Config.php
@@ -62,7 +62,7 @@ class Config
* Retrieve already translated label that corresponds to service name
*
* @param string $serviceName
- * @return string|null
+ * @return \Magento\Framework\Phrase|null
*/
public function getServiceLabel($serviceName)
{
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
index 5fd5e279bbe635601d3131e54074f0a75fac2b7e..9068c4429d7925d5a2f761b9e954177fce5e7bee 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
@@ -63,7 +63,7 @@ class Webservicex extends \Magento\Directory\Model\Currency\Import\AbstractImpor
[
'timeout' => $this->_scopeConfig->getValue(
'currency/webservicex/timeout',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
),
]
)->request(
diff --git a/app/code/Magento/Directory/Model/Observer.php b/app/code/Magento/Directory/Model/Observer.php
index c1892ec452505a42379a9f2aa846eb402b81d7dd..23d0b5c52f010583ae316fd3ee91fea5c6743a29 100644
--- a/app/code/Magento/Directory/Model/Observer.php
+++ b/app/code/Magento/Directory/Model/Observer.php
@@ -43,7 +43,7 @@ class Observer
protected $_transportBuilder;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -61,7 +61,7 @@ class Observer
* @param \Magento\Directory\Model\Currency\Import\Factory $importFactory
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
*/
@@ -69,7 +69,7 @@ class Observer
\Magento\Directory\Model\Currency\Import\Factory $importFactory,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
) {
@@ -91,10 +91,10 @@ class Observer
$importWarnings = [];
if (!$this->_scopeConfig->getValue(
self::IMPORT_ENABLE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) || !$this->_scopeConfig->getValue(
self::CRON_STRING_PATH,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return;
@@ -104,7 +104,7 @@ class Observer
$rates = [];
$service = $this->_scopeConfig->getValue(
self::IMPORT_SERVICE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if ($service) {
try {
@@ -132,7 +132,7 @@ class Observer
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -144,12 +144,12 @@ class Observer
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_RECIPIENT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$transport = $this->_transportBuilder->getTransport();
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index 967634c6ada66e056bee242fbe90a2bf2c56c6cf..8232d9220b4128888b13b215597efa9a22e3c601 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -6,7 +6,7 @@
namespace Magento\Directory\Model;
use Magento\Framework\App\ScopeInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Psr\Log\LoggerInterface as Logger;
use Magento\Store\Model\Store;
@@ -16,7 +16,7 @@ use Magento\Store\Model\Store;
class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -31,7 +31,7 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
protected $logger;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param CurrencyFactory $currencyFactory
* @param Logger $logger
*/
diff --git a/app/code/Magento/Directory/Model/Resource/Country/Collection.php b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
index acafaa8ff131839f94e3cf910a8c9525279c0431..99e1306287d0aca4ac01e55693168ba93ec140cd 100644
--- a/app/code/Magento/Directory/Model/Resource/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
@@ -104,7 +104,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function loadByStore($store = null)
{
- $allowCountries = explode(',', (string)$this->_scopeConfig->getValue('general/country/allow', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store));
+ $allowCountries = explode(',', (string)$this->_scopeConfig->getValue('general/country/allow', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store));
if (!empty($allowCountries)) {
$this->addFieldToFilter("country_id", ['in' => $allowCountries]);
}
diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
index 903f63652f5aa9ee241ddc9c5a04513cf1bcde1a..c65921089a0051cf21ce517794231c5ec7265917 100644
--- a/app/code/Magento/Directory/composer.json
+++ b/app/code/Magento/Directory/composer.json
@@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"lib-libxml": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Directory/etc/adminhtml/routes.xml b/app/code/Magento/Directory/etc/adminhtml/routes.xml
index d192fd983744ee0b8e0d1d995ae4aa1fea1224e4..3659f78c7e8389bc6985e6b186aa20a324339875 100644
--- a/app/code/Magento/Directory/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Directory/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="directory" frontName="directory">
- <module name="Magento_Directory" before="Magento_Adminhtml" />
+ <module name="Magento_Directory" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Directory/etc/adminhtml/system.xml b/app/code/Magento/Directory/etc/adminhtml/system.xml
index 251a33ec635f5975decb303905beb4e0e12c8bdd..0bd0e0eb903599cd1a8fdfb2e885b5cda504d999 100644
--- a/app/code/Magento/Directory/etc/adminhtml/system.xml
+++ b/app/code/Magento/Directory/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
<section id="currency" translate="label" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Currency Setup</label>
<tab>general</tab>
- <resource>Magento_Adminhtml::currency</resource>
+ <resource>Magento_Backend::currency</resource>
<group id="options" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Currency Options</label>
<field id="base" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index eef105a8bfb248da599403061a53b83a20301411..1d2de7b95f92b34ce1967ba279faf83494da0377 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -80,7 +80,7 @@ class Downloadable extends \Magento\Backend\Block\Widget implements \Magento\Bac
/**
* Get tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -90,7 +90,7 @@ class Downloadable extends \Magento\Backend\Block\Widget implements \Magento\Bac
/**
* Get tab title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index a6e1757d635cef95719c3bc05069e883304c164d..50cdaebedacbc9b6b7aa2030f5bd136248a88aec 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -209,7 +209,7 @@ class Links extends \Magento\Backend\Block\Template
$this->getProduct()->getTypeId() ==
'downloadable' ? $this->getProduct()->getLinksTitle() : $this->_scopeConfig->getValue(
\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -234,7 +234,7 @@ class Links extends \Magento\Backend\Block\Template
{
$scope = (int)$this->_scopeConfig->getValue(
\Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if ($scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE) {
return true;
@@ -355,7 +355,7 @@ class Links extends \Magento\Backend\Block\Template
{
return $this->_scopeConfig->getValue(
\Magento\Downloadable\Model\Link::XML_PATH_DEFAULT_DOWNLOADS_NUMBER,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 5ae2d6cf91ee3cde23362704b860df38799e0e9b..8725016bcd3eb00ac56f4b515df51c9ab091fb96 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -207,7 +207,7 @@ class Samples extends \Magento\Backend\Block\Widget
&& $this->getProduct()->getTypeId() == 'downloadable' ? $this->getProduct()->getSamplesTitle() :
$this->_scopeConfig->getValue(
\Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
index 6e0e1921643db3d0ec6ef0a2d3b1fa7b7449c076..f2724cdfbd8c669014b7527331c89b2a32f2637f 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
@@ -77,6 +77,6 @@ class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\Name
if ($this->_purchased && $this->_purchased->getLinkSectionTitle()) {
return $this->_purchased->getLinkSectionTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
index f380a109c61d965c8aac43e96e94820f87a564bb..544d9c091faf67a14c96ad0627c53d04da988162 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
@@ -131,7 +131,7 @@ class Links extends \Magento\Catalog\Block\Product\AbstractProduct
}
return $this->_scopeConfig->getValue(
\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -145,7 +145,7 @@ class Links extends \Magento\Catalog\Block\Product\AbstractProduct
{
return $this->_scopeConfig->isSetFlag(
\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
index c0403fbaf81a715e98173473bbd85cf7e711b44f..179b2816b92e3e001b32ad04ff40d61861b07e2b 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
@@ -56,7 +56,7 @@ class Samples extends \Magento\Catalog\Block\Product\AbstractProduct
if ($this->getProduct()->getSamplesTitle()) {
return $this->getProduct()->getSamplesTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -67,6 +67,6 @@ class Samples extends \Magento\Catalog\Block\Product\AbstractProduct
*/
public function getIsOpenInNewWindow()
{
- return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
index b92deacb7a9517ef2839d4e20d7d799ea7bfa224..5b6c1b0960b4d8366c54d9be8bbcefb02e7c438b 100644
--- a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
+++ b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
@@ -136,7 +136,7 @@ class ListProducts extends \Magento\Framework\View\Element\Template
* Return number of left downloads or unlimited
*
* @param Item $item
- * @return string
+ * @return \Magento\Framework\Phrase|int
*/
public function getRemainingDownloads($item)
{
@@ -166,6 +166,6 @@ class ListProducts extends \Magento\Framework\View\Element\Template
*/
public function getIsOpenInNewWindow()
{
- return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
index dfceb5f25c04f2af5f8a3cc2f74025d05f76106a..80c7998839e1f2cc996f4be85d2f41bc5e98d37e 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
@@ -83,7 +83,7 @@ class Downloadable extends \Magento\Sales\Block\Order\Email\Items\DefaultItems
if ($this->_purchased->getLinkSectionTitle()) {
return $this->_purchased->getLinkSectionTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
index 617cb173de3e3dd4e4795b3a7e8c7249c4694a95..2def86d9c63e08f4123847c905bf66e8aba8eff2 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
@@ -74,7 +74,7 @@ class Downloadable extends \Magento\Sales\Block\Order\Email\Items\Order\DefaultO
if ($this->_purchased->getLinkSectionTitle()) {
return $this->_purchased->getLinkSectionTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
index cea241327648ff4b851d120f2b0ef03f98a96783..7176465cae4437758a013a619683582b42949145 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
@@ -77,6 +77,6 @@ class Downloadable extends \Magento\Sales\Block\Order\Item\Renderer\DefaultRende
if ($this->_purchasedLinks->getLinkSectionTitle()) {
return $this->_purchasedLinks->getLinkSectionTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
index 2beaed9036c407a2be91a1bb4c702eb6a78b8ea3..8d4df3c04791accc9fdc49e496a4c777a584178a 100644
--- a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
+++ b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
@@ -79,7 +79,7 @@ class Configuration extends \Magento\Framework\App\Helper\AbstractHelper impleme
if (strlen($title)) {
return $title;
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Downloadable/Helper/Data.php b/app/code/Magento/Downloadable/Helper/Data.php
index cbb96e9d4fb1eee62b2476f1f527cdc0867e0339..faab224de0f9ece8f5081a8122c28ccc3ff8ab13 100644
--- a/app/code/Magento/Downloadable/Helper/Data.php
+++ b/app/code/Magento/Downloadable/Helper/Data.php
@@ -51,7 +51,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
case \Magento\Downloadable\Model\Link::LINK_SHAREABLE_CONFIG:
$shareable = (bool)$this->_scopeConfig->isSetFlag(
\Magento\Downloadable\Model\Link::XML_PATH_CONFIG_IS_SHAREABLE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $shareable;
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index ed7200dff8e70e19fe038c90aca7cc7e3739433b..4351cf3dccbf55249f5086184630cc662080abd7 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -302,6 +302,6 @@ class Download extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getContentDisposition($store = null)
{
- return $this->_scopeConfig->getValue(self::XML_PATH_CONTENT_DISPOSITION, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XML_PATH_CONTENT_DISPOSITION, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
}
diff --git a/app/code/Magento/Downloadable/Model/Observer.php b/app/code/Magento/Downloadable/Model/Observer.php
index 080630fc984fd84542c948c05a7e7ab8510e641e..87fce9c49a4dd5ada0eb52a37307673164351675 100644
--- a/app/code/Magento/Downloadable/Model/Observer.php
+++ b/app/code/Magento/Downloadable/Model/Observer.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Downloadable\Model;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* Downloadable Products Observer
@@ -158,7 +158,7 @@ class Observer
->_scopeConfig
->getValue(
\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ ScopeInterface::SCOPE_STORE
);
$linkPurchased->setLinkSectionTitle($linkSectionTitle)->save();
foreach ($linkIds as $linkId) {
@@ -258,7 +258,7 @@ class Observer
$downloadableItemsStatuses = [];
$orderItemStatusToEnable = $this->_scopeConfig->getValue(
\Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
$order->getStoreId()
);
@@ -351,7 +351,7 @@ class Observer
if (!$this->_scopeConfig->isSetFlag(
self::XML_PATH_DISABLE_GUEST_CHECKOUT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
$store
)) {
return $this;
diff --git a/app/code/Magento/Downloadable/Model/Product/Type.php b/app/code/Magento/Downloadable/Model/Product/Type.php
index 5ffb9d0424977ba95306855d718a6cdfc095bb95..26390b3bf5d79314ba670017500317bb26975d30 100644
--- a/app/code/Magento/Downloadable/Model/Product/Type.php
+++ b/app/code/Magento/Downloadable/Model/Product/Type.php
@@ -446,7 +446,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\Virtual
* @param \Magento\Framework\Object $buyRequest
* @param \Magento\Catalog\Model\Product $product
* @param string $processMode
- * @return array|string
+ * @return \Magento\Framework\Phrase|array|string
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
*/
diff --git a/app/code/Magento/Downloadable/Model/Resource/Link.php b/app/code/Magento/Downloadable/Model/Resource/Link.php
index 1b9da79852e18cadd51aee9c8c21b6580b5003f9..758401cb4b2e7778fe5f71f110582bfbb4e9627f 100644
--- a/app/code/Magento/Downloadable/Model/Resource/Link.php
+++ b/app/code/Magento/Downloadable/Model/Resource/Link.php
@@ -30,7 +30,7 @@ class Link extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_currencyFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -39,14 +39,14 @@ class Link extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $configuration
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $configuration,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_catalogData = $catalogData;
$this->_configuration = $configuration;
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
index e8bf82f84fbd077f066593a39e9fec4c85da098f..913d2f31f15cf928e1be3f38e5503b40d24c650e 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -107,6 +107,6 @@ abstract class AbstractItems extends \Magento\Sales\Model\Order\Pdf\Items\Abstra
if ($this->_purchasedLinks->getLinkSectionTitle()) {
return $this->_purchasedLinks->getLinkSectionTitle();
}
- return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index aed92698d22b0ef36f0bc8c87e7d61fb73461966..d338d3e0af8918bd33dbaac2673198d4697e8b21 100644
--- a/app/code/Magento/Downloadable/composer.json
+++ b/app/code/Magento/Downloadable/composer.json
@@ -3,27 +3,27 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-wishlist": "0.42.0-beta6",
- "magento/module-gift-message": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-msrp": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-wishlist": "0.42.0-beta7",
+ "magento/module-gift-message": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-msrp": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Downloadable/etc/acl.xml b/app/code/Magento/Downloadable/etc/acl.xml
index 6ba91097d5dfca3b940410d4d5c3ddd84c7b5d5d..0602ba98356284a55d2751dac391029254632a41 100644
--- a/app/code/Magento/Downloadable/etc/acl.xml
+++ b/app/code/Magento/Downloadable/etc/acl.xml
@@ -8,10 +8,10 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Downloadable::downloadable" title="Downloadable Product Section" />
</resource>
</resource>
diff --git a/app/code/Magento/Downloadable/etc/adminhtml/routes.xml b/app/code/Magento/Downloadable/etc/adminhtml/routes.xml
index e52d15b879599b967f8826d8ba57c2f975b9012c..11aec011d13435c34a1dcaa29d1c6361d9008133 100644
--- a/app/code/Magento/Downloadable/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Downloadable/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_Downloadable" before="Magento_Adminhtml" />
+ <module name="Magento_Downloadable" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
index 0ed290c01cc8535610fff3fe326b7dbb48547c6d..f3bcc89c72978d513a06bc206ae5cb1b4317dc13 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -118,7 +118,7 @@ require([
'<div class="fileinput-button form-buttons">'+
'<span><?php echo __('Browse Files...') ?></span>' +
'<input id="downloadable_link_{{id}}_sample_file" type="file" name="<?php echo $block->getFileFieldName('link_samples') ?>">' +
- '<script type="text/javascript">' +
+ '<script>' +
'/*<![CDATA[*/' +
'linksUploader("#downloadable_link_{{id}}_sample_file", "<?php echo $block->getUploadUrl('link_samples') ?>"); ' +
'/*]]>*/' +
@@ -146,7 +146,7 @@ require([
'<div class="fileinput-button form-buttons">'+
'<span><?php echo __('Browse Files...') ?></span>' +
'<input id="downloadable_link_{{id}}_file" type="file" name="<?php echo $block->getFileFieldName('links') ?>">' +
- '<script type="text/javascript">' +
+ '<script>' +
'/*<![CDATA[*/' +
'linksUploader("#downloadable_link_{{id}}_file", "<?php echo $block->getUploadUrl('links') ?>"); ' +
'/*]]>*/' +
diff --git a/app/code/Magento/Eav/Helper/Data.php b/app/code/Magento/Eav/Helper/Data.php
index 92b8999be8b0914c3e1ee5468469fb65a996cce7..851c189bc9f06aaba86f4f53c4dc0042591bba5e 100644
--- a/app/code/Magento/Eav/Helper/Data.php
+++ b/app/code/Magento/Eav/Helper/Data.php
@@ -129,7 +129,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getInputTypesValidatorData()
{
- return $this->_scopeConfig->getValue(self::XML_PATH_VALIDATOR_DATA_INPUT_TYPES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_VALIDATOR_DATA_INPUT_TYPES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index a385e9baec54f55caf7197e18a6c73a9c0f2ac22..efe61c256b20b04f3a5e1a7d699a2adf178a8e62 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -71,7 +71,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Eav\Model\Config $eavConfig
* @param TypeFactory $eavTypeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -91,7 +91,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
\Magento\Core\Helper\Data $coreData,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index 6543051fd86f3c7093ab22b55ad20a770076cc7a..4c1c663da69e0ab42694f77911b8bd8c93dd31f1 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -87,7 +87,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
protected $_eavTypeFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -114,7 +114,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
* @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -131,7 +131,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
\Magento\Core\Helper\Data $coreData,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
\Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
index 386a6a26dddd5c7b73db4a4c33cb4c0fdcf763e2..a9f56c983ac28a6a4ef8ae588455afd4edbe7869 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
@@ -8,14 +8,14 @@ namespace Magento\Eav\Model\Entity\Attribute\Backend;
class Store extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
index 21a0b2cdb875aeaee9e53f6fd170d83bc0b6a811..919985062333e000196f493d4b4d05a192b88890 100644
--- a/app/code/Magento/Eav/Model/Form.php
+++ b/app/code/Magento/Eav/Model/Form.php
@@ -106,7 +106,7 @@ abstract class Form
protected $_validator = null;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -141,7 +141,7 @@ abstract class Form
protected $_validatorConfigFactory;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Eav\Model\Config $eavConfig
* @param \Magento\Framework\Module\Dir\Reader $modulesReader
* @param \Magento\Eav\Model\AttributeDataFactory $attrDataFactory
@@ -152,7 +152,7 @@ abstract class Form
* @throws \Magento\Framework\Model\Exception
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Eav\Model\Config $eavConfig,
\Magento\Framework\Module\Dir\Reader $modulesReader,
\Magento\Eav\Model\AttributeDataFactory $attrDataFactory,
diff --git a/app/code/Magento/Eav/Model/Form/Fieldset.php b/app/code/Magento/Eav/Model/Form/Fieldset.php
index c9d91a2fae92af4c9f89395c5921ae3e727573b6..61ce2fb0e3fb416ae5b0cc1c3357558efb297077 100644
--- a/app/code/Magento/Eav/Model/Form/Fieldset.php
+++ b/app/code/Magento/Eav/Model/Form/Fieldset.php
@@ -28,14 +28,14 @@ class Fieldset extends \Magento\Framework\Model\AbstractModel
protected $_eventPrefix = 'eav_form_fieldset';
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -43,7 +43,7 @@ class Fieldset extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
index 466788144ce7e819309da5a339483a9be99c8716..e82817160f17725d0c84f91a54518d639abdd1e1 100644
--- a/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
@@ -34,7 +34,7 @@ abstract class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\C
protected $_entityType;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -44,7 +44,7 @@ abstract class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\C
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -54,7 +54,7 @@ abstract class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\C
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
index 66dd3594cc6b000b269820a523afc436061f2ac9..0d10528a5ae92b55676465d5a977e525a88d1ea5 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
@@ -25,7 +25,7 @@ class Attribute extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected static $_entityAttributes = [];
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -38,12 +38,12 @@ class Attribute extends \Magento\Framework\Model\Resource\Db\AbstractDb
* Class constructor
*
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Type $eavEntityType
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
Type $eavEntityType
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
index ced22f1a4f799f5777f7f952f1277b8d4a8b5455..ac3dd682afef84fc8b114b92fc6eefc236d5477a 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
@@ -25,7 +25,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_coreResource;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -35,7 +35,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\App\Resource $coreResource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -45,7 +45,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\App\Resource $coreResource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
index dd521294b40fc0443718c871691f89007c1a83a9..1ae31e5992976ceb2087ba64c336831d68741f40 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
@@ -41,7 +41,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $_entityType;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -56,7 +56,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Eav\Model\Config $eavConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -66,7 +66,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Eav\Model\Config $eavConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php b/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
index 824ec8712ce7b7feab1122fe4b201d3766c9e6fa..4b0deed191746edb8117c6cc4e17a46c465703d6 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
@@ -18,7 +18,7 @@ use Magento\Framework\Event\ManagerInterface;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\Model\Resource\Db\AbstractDb;
use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
{
@@ -39,7 +39,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param Logger $logger
* @param FetchStrategyInterface $fetchStrategy
* @param ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param mixed $connection
* @param AbstractDb $resource
*/
diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
index 4b8e33a5dc565a376e2936f28aedd38399bbc006..4d36768559eba1697cda6c2a756433fd78697ecc 100644
--- a/app/code/Magento/Eav/composer.json
+++ b/app/code/Magento/Eav/composer.json
@@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template.php b/app/code/Magento/Email/Block/Adminhtml/Template.php
index b5b8bcded15e1bf477199145d4733c9ed256c41b..d320ead156940548badea348102339b4d9a289f8 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template.php
@@ -97,7 +97,7 @@ class Template extends \Magento\Backend\Block\Template implements \Magento\Backe
/**
* Get transactional emails page header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
index 55e9f016f7f9e837e7092d43059ee0818cb57149..20cc24446adb8c54d389f14416aab4f8411f9391 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -290,7 +290,7 @@ class Edit extends \Magento\Backend\Block\Widget implements \Magento\Backend\Blo
/**
* Return header text for form
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
index e36aaf6c4c8ab773f756426a8cadae647867a4ea..b4e6ecf4eac5b2a93f3b702d2b82403098e4773a 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
@@ -52,7 +52,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
$this->pageConfig->addPageAsset('prototype/window.js');
$this->pageConfig->addPageAsset('prototype/windows/themes/default.css');
- $this->pageConfig->addPageAsset('Magento_Core::prototype/magento.css');
+ $this->pageConfig->addPageAsset('Magento_Theme::prototype/magento.css');
return parent::_prepareLayout();
}
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php
index 18458ab616f22e15d7e33ccb8afe5cadcb749959..1578c2db4ee99e2c4c22824f30bcc2ed48f2c793 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php
@@ -26,7 +26,7 @@ class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
* Render grid column
*
* @param \Magento\Framework\Object $row
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function render(\Magento\Framework\Object $row)
{
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index 733e8e73e4583b8eda5e916a2c2828c93c5cbbe9..dbc58086db9bc348c5b92496c4c489e4b68cdc7f 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -61,7 +61,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
protected $_appEmulation;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -70,7 +70,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
* @param \Magento\Store\Model\App\Emulation $appEmulation
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
*/
public function __construct(
@@ -78,7 +78,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
\Magento\Store\Model\App\Emulation $appEmulation,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
array $data = []
) {
$this->_design = $design;
diff --git a/app/code/Magento/Email/Model/BackendTemplate.php b/app/code/Magento/Email/Model/BackendTemplate.php
index 1484e8bc8ebec1b8ced49ae36129e574a8adb518..27c6084b4382fb0ac0aad564a7d5edf92742ebad 100644
--- a/app/code/Magento/Email/Model/BackendTemplate.php
+++ b/app/code/Magento/Email/Model/BackendTemplate.php
@@ -22,7 +22,7 @@ class BackendTemplate extends Template
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
* @param \Magento\Store\Model\App\Emulation $appEmulation
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\View\FileSystem $viewFileSystem
@@ -39,7 +39,7 @@ class BackendTemplate extends Template
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
\Magento\Store\Model\App\Emulation $appEmulation,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\View\FileSystem $viewFileSystem,
diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
index cdedc30f72a7e40d9689a7871b991fd30818ffd5..75969ae91239b3c3d37d041b30ad088b8f0676d7 100644
--- a/app/code/Magento/Email/Model/Template.php
+++ b/app/code/Magento/Email/Model/Template.php
@@ -8,7 +8,7 @@ namespace Magento\Email\Model;
use Magento\Email\Model\Template\Filter;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Filter\Template as FilterTemplate;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Template model
@@ -19,7 +19,7 @@ use Magento\Framework\Store\StoreManagerInterface;
* \Magento\Email\Model\TemplateFactory $templateFactory
* $templateFactory->create()->load($this->_scopeConfig->getValue(
* 'path_to_email_template_id_config',
- * \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ * \Magento\Store\Model\ScopeInterface::SCOPE_STORE
* ));
* $variables = array(
* 'someObject' => $this->_coreResourceEmailTemplate
@@ -158,7 +158,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
* @param \Magento\Store\Model\App\Emulation $appEmulation
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\View\FileSystem $viewFileSystem
@@ -213,7 +213,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento
$store = $this->_storeManager->getStore($store);
$fileName = $this->_scopeConfig->getValue(
self::XML_PATH_DESIGN_EMAIL_LOGO,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
if ($fileName) {
@@ -252,7 +252,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento
$store = $this->_storeManager->getStore($store);
$alt = $this->_scopeConfig->getValue(
self::XML_PATH_DESIGN_EMAIL_LOGO_ALT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
if ($alt) {
diff --git a/app/code/Magento/Email/Model/Template/Config.php b/app/code/Magento/Email/Model/Template/Config.php
index 672c5be0a72fff225d4a807b11b86831ab2c1554..0fdd709d514908e6fd335dc05e5bf1ef50fa5812 100644
--- a/app/code/Magento/Email/Model/Template/Config.php
+++ b/app/code/Magento/Email/Model/Template/Config.php
@@ -45,7 +45,7 @@ class Config
* Retrieve translated label of an email template
*
* @param string $templateId
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTemplateLabel($templateId)
{
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 47762cc92c2933e6099dc6c3b408230c9b6e0c45..cb2309aadf8378832b6520b582d172d5c00448bd 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -70,7 +70,7 @@ class Filter extends \Magento\Framework\Filter\Template
protected $_variableFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -117,7 +117,7 @@ class Filter extends \Magento\Framework\Filter\Template
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Core\Model\VariableFactory $coreVariableFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\Framework\View\LayoutFactory $layoutFactory
* @param \Magento\Framework\App\State $appState
@@ -133,7 +133,7 @@ class Filter extends \Magento\Framework\Filter\Template
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Core\Model\VariableFactory $coreVariableFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\Framework\View\LayoutFactory $layoutFactory,
\Magento\Framework\App\State $appState,
@@ -568,7 +568,7 @@ class Filter extends \Magento\Framework\Filter\Template
if (isset($params['path'])) {
$configValue = $this->_scopeConfig->getValue(
$params['path'],
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/Email/Model/Template/SenderResolver.php b/app/code/Magento/Email/Model/Template/SenderResolver.php
index 04bf336e9243219bfa638aac1b0f29551eb1dcd8..f1e1a4b659883e8b36323e63c62abd2f530adf54 100644
--- a/app/code/Magento/Email/Model/Template/SenderResolver.php
+++ b/app/code/Magento/Email/Model/Template/SenderResolver.php
@@ -32,12 +32,12 @@ class SenderResolver implements \Magento\Framework\Mail\Template\SenderResolverI
if (!is_array($sender)) {
$result['name'] = $this->_scopeConfig->getValue(
'trans_email/ident_' . $sender . '/name',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$scopeId
);
$result['email'] = $this->_scopeConfig->getValue(
'trans_email/ident_' . $sender . '/email',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$scopeId
);
} else {
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index 1a3609b63e2baed68bd0b38088513f6fb5c7a36c..55b98136b8982808c36a7d2bc3c4e6e40c0ee31b 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -3,15 +3,16 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-cms": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Email/etc/acl.xml b/app/code/Magento/Email/etc/acl.xml
index c9e8fc65bda5ce816cf6336b7470fb427dd1d5b4..43c654d5b6e23ddb20bd1ce20dca2987e0236b95 100644
--- a/app/code/Magento/Email/etc/acl.xml
+++ b/app/code/Magento/Email/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::marketing">
- <resource id="Magento_Adminhtml::marketing_communications" title="Communications" sortOrder="30">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::marketing">
+ <resource id="Magento_Backend::marketing_communications" title="Communications" sortOrder="30">
<resource id="Magento_Email::template" title="Email Templates" sortOrder="10" />
</resource>
</resource>
diff --git a/app/code/Magento/Email/etc/adminhtml/routes.xml b/app/code/Magento/Email/etc/adminhtml/routes.xml
index 0d88127a9e0759780575861cac60bed0de6dcb15..e09e11132fce398fae15dca8f85d71f54a34e09e 100644
--- a/app/code/Magento/Email/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Email/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_Email" before="Magento_Adminhtml" />
+ <module name="Magento_Email" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index a9a6176f5c1cd2a6528fc749b8345af5e9c5369a..f3767390c046a85abf9c61d13d4adc2b77fbbed3 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -108,7 +108,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
protected $_customizableContainerTypes = ['YOUR_PACKAGING'];
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -132,7 +132,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Directory\Helper\Data $directoryData
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Dir\Reader $configReader
* @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
* @param array $data
@@ -154,7 +154,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Directory\Helper\Data $directoryData,
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Dir\Reader $configReader,
\Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory,
array $data = []
@@ -297,7 +297,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
} else {
$origCountry = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
);
}
@@ -309,7 +309,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
$r->setOrigPostal(
$this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
@@ -1329,7 +1329,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
'AccountNumber' => $this->getConfigData('account'),
'CountryCode' => $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
),
],
@@ -1366,7 +1366,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
'AccountNumber' => $this->getConfigData('account'),
'CountryCode' => $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
),
],
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index 7139dc25e184eceece4d7d7f8c59ac83bf144acc..8d06f716ca36daf330739491dade0595b4c98fcc 100644
--- a/app/code/Magento/Fedex/composer.json
+++ b/app/code/Magento/Fedex/composer.json
@@ -3,19 +3,20 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-shipping": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-shipping": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"lib-libxml": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
index 71f9fdea4cebbf1c3bb6d84482065e817c82c3c4..83207d1c87424fb162e7b57d8b469e2800418575 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
@@ -46,7 +46,7 @@ class Config extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Config
{
return $this->_scopeConfig->getValue(
\Magento\GiftMessage\Helper\Message::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/GiftMessage/Helper/Message.php b/app/code/Magento/GiftMessage/Helper/Message.php
index 3477c675ca05cee1313c39eb6a5840db77dc1844..7672d3f08763ecb24e284aba464b34bcf15789fe 100644
--- a/app/code/Magento/GiftMessage/Helper/Message.php
+++ b/app/code/Magento/GiftMessage/Helper/Message.php
@@ -66,7 +66,7 @@ class Message extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
@@ -80,7 +80,7 @@ class Message extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -148,7 +148,7 @@ class Message extends \Magento\Core\Helper\Data
if ($type == 'items') {
$items = $entity->getAllItems();
if (!is_array($items) || empty($items)) {
- return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
if ($entity instanceof \Magento\Quote\Model\Quote) {
$_type = $entity->getIsMultiShipping() ? 'address_item' : 'item';
@@ -183,7 +183,7 @@ class Message extends \Magento\Core\Helper\Data
$store
);
} else {
- return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
return false;
}
@@ -197,7 +197,7 @@ class Message extends \Magento\Core\Helper\Data
*/
protected function _getDependenceFromStoreConfig($productGiftMessageAllow, $store = null)
{
- $result = $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ $result = $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
if ($productGiftMessageAllow === '' || is_null($productGiftMessageAllow)) {
return $result;
} else {
diff --git a/app/code/Magento/GiftMessage/Model/CartRepository.php b/app/code/Magento/GiftMessage/Model/CartRepository.php
index 505561535030c4262b3c532ff48f74f4c07853ee..528ccf78320b624bdbdcf75bbf5aac889108dbc9 100644
--- a/app/code/Magento/GiftMessage/Model/CartRepository.php
+++ b/app/code/Magento/GiftMessage/Model/CartRepository.php
@@ -26,7 +26,7 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
/**
* Store manager interface.
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -53,14 +53,14 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
/**
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param GiftMessageManager $giftMessageManager
* @param \Magento\GiftMessage\Helper\Message $helper
* @param MessageFactory $messageFactory
*/
public function __construct(
\Magento\Quote\Model\QuoteRepository $quoteRepository,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\GiftMessage\Model\GiftMessageManager $giftMessageManager,
\Magento\GiftMessage\Helper\Message $helper,
\Magento\GiftMessage\Model\MessageFactory $messageFactory
diff --git a/app/code/Magento/GiftMessage/Model/ItemRepository.php b/app/code/Magento/GiftMessage/Model/ItemRepository.php
index 9174a7174c1403cf37257b35540a9634ef47b6da..90db371ca8fbdf8ffad383f375a9350e81fdbd01 100644
--- a/app/code/Magento/GiftMessage/Model/ItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/ItemRepository.php
@@ -27,7 +27,7 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
/**
* Store manager interface.
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -54,14 +54,14 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
/**
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param GiftMessageManager $giftMessageManager
* @param \Magento\GiftMessage\Helper\Message $helper
* @param MessageFactory $messageFactory
*/
public function __construct(
\Magento\Quote\Model\QuoteRepository $quoteRepository,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\GiftMessage\Model\GiftMessageManager $giftMessageManager,
\Magento\GiftMessage\Helper\Message $helper,
\Magento\GiftMessage\Model\MessageFactory $messageFactory
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index 0c525d715be66e32a76b53313e15d7bc4eec9086..40334a864ac69e57eede0d849ccb11735e7113fc 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -3,20 +3,21 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-multishipping": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-multishipping": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
index 8c2858a924c503fa6337224fac41872d0f5373e0..2ccc9b94c477c7f72636831ece5500589d533402 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
@@ -7,7 +7,7 @@
-->
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
<head>
- <css src="Magento_Core::prototype/magento.css"/>
+ <css src="Magento_Theme::prototype/magento.css"/>
</head>
<body>
<referenceBlock name="order_item_extra_info">
diff --git a/app/code/Magento/GoogleAdwords/Helper/Data.php b/app/code/Magento/GoogleAdwords/Helper/Data.php
index 693ba8dfa66d674a53dc5ba2651c6b012557be70..f2a97d5a07b093ab98793d8703fef8455a408b8a 100644
--- a/app/code/Magento/GoogleAdwords/Helper/Data.php
+++ b/app/code/Magento/GoogleAdwords/Helper/Data.php
@@ -109,7 +109,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->isSetFlag(
self::XML_PATH_ACTIVE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) &&
$this->getConversionId() &&
$this->getConversionLanguage() &&
@@ -173,7 +173,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return (int)$this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -186,7 +186,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_LANGUAGE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -199,7 +199,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_FORMAT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -212,7 +212,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_COLOR,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -225,7 +225,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_LABEL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -238,7 +238,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_VALUE_TYPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -261,7 +261,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return (double)$this->_scopeConfig->getValue(
self::XML_PATH_CONVERSION_VALUE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index 9af26ee8b6d87d873d4a2befe92c84d7d847b03e..a79ee0d97ac01dac68a00c89152dd3bf206b33ba 100644
--- a/app/code/Magento/GoogleAdwords/composer.json
+++ b/app/code/Magento/GoogleAdwords/composer.json
@@ -3,12 +3,13 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-sales": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
index 080aeeba7a1e544679f4c7783de704bcc09abfab..0dad83405489d6a6dc4e7e26ccc221f5d4080dbb 100644
--- a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
+++ b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
@@ -18,7 +18,7 @@
var google_conversion_value = <?php echo $block->getHelper()->getConversionValue() ?>;
/* ]]> */
</script>
-<script type="text/javascript" src="<?php echo $block->getHelper()->getConversionJsSrc()?>"></script>
+<script src="<?php echo $block->getHelper()->getConversionJsSrc()?>"></script>
<noscript>
<div style="display:inline;">
<img height="1" width="1" style="border-style:none;" alt=""
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
index 04bb7196fa61d728b017a62f4a5aab3c6b2e1dcb..8236e5fac9e5422e43293066b922e852e8a5668b 100644
--- a/app/code/Magento/GoogleAnalytics/Block/Ga.php
+++ b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -50,7 +50,7 @@ class Ga extends \Magento\Framework\View\Element\Template
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
index 9e32e1aff2526a85fbb29049ed69a39c70141e37..49b29bc28cf3e6b34418f3a7fabf1b87eb46bb01 100644
--- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
@@ -50,7 +50,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function isGoogleAnalyticsAvailable($store = null)
{
- $accountId = $this->_scopeConfig->getValue(self::XML_PATH_ACCOUNT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
- return $accountId && $this->_scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ $accountId = $this->_scopeConfig->getValue(self::XML_PATH_ACCOUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+ return $accountId && $this->_scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
}
diff --git a/app/code/Magento/GoogleAnalytics/Model/Observer.php b/app/code/Magento/GoogleAnalytics/Model/Observer.php
index 8bd837b511dc5b228a9f16754de40aea0f335b8a..b8c916189fa2ba15e79cf635864f62f514a6c638 100644
--- a/app/code/Magento/GoogleAnalytics/Model/Observer.php
+++ b/app/code/Magento/GoogleAnalytics/Model/Observer.php
@@ -26,17 +26,17 @@ class Observer
protected $_layout;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\GoogleAnalytics\Helper\Data $googleAnalyticsData
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\GoogleAnalytics\Helper\Data $googleAnalyticsData
) {
diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json
index 3d278c81a1273c982d87d8309484e6c9e9646c4d..882f63a99dccc095035d86d5a645f04bc0771d71 100644
--- a/app/code/Magento/GoogleAnalytics/composer.json
+++ b/app/code/Magento/GoogleAnalytics/composer.json
@@ -3,14 +3,14 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-cookie": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-cookie": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/GoogleAnalytics/etc/acl.xml b/app/code/Magento/GoogleAnalytics/etc/acl.xml
index 15685bce0c57e6193bbc35ca25dfc2b1d9496c2f..8263667164d5017aa149618bd56f10c3bfa5aa13 100644
--- a/app/code/Magento/GoogleAnalytics/etc/acl.xml
+++ b/app/code/Magento/GoogleAnalytics/etc/acl.xml
@@ -8,10 +8,10 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_GoogleAnalytics::google" title="Google API" />
</resource>
</resource>
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
index 949e0665e5f8acd1a4d71921c2dace1815f3a521..e94e53e04e148ea1ba8f3dca564977a2c2b3d866 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
@@ -27,7 +27,7 @@ class Googleoptimizer extends \Magento\GoogleOptimizer\Block\Adminhtml\AbstractT
/**
* Return Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -37,7 +37,7 @@ class Googleoptimizer extends \Magento\GoogleOptimizer\Block\Adminhtml\AbstractT
/**
* Return Tab title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
index 78a07ea5486bea754d97b494889fdfdfe2cf92ad..f2c88705e30184b3327daf4132f97ffa2d917b46 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
@@ -27,7 +27,7 @@ class Googleoptimizer extends \Magento\GoogleOptimizer\Block\Adminhtml\AbstractT
/**
* Return Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -37,7 +37,7 @@ class Googleoptimizer extends \Magento\GoogleOptimizer\Block\Adminhtml\AbstractT
/**
* Return Tab title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Data.php b/app/code/Magento/GoogleOptimizer/Helper/Data.php
index 601c5423add16980069be91e281bcc78cad63abd..8010a5fc27292710c38eaa3e366b4d8c7648a765 100644
--- a/app/code/Magento/GoogleOptimizer/Helper/Data.php
+++ b/app/code/Magento/GoogleOptimizer/Helper/Data.php
@@ -55,7 +55,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function isGoogleExperimentEnabled($store = null)
{
- return (bool)$this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return (bool)$this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
/**
diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
index e3b26d4e3108fb49244c14cb52b9fbcc2f1a95a8..ad7d2d5b9e24a96208891bb0387b735f2b711016 100644
--- a/app/code/Magento/GoogleOptimizer/composer.json
+++ b/app/code/Magento/GoogleOptimizer/composer.json
@@ -3,16 +3,16 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-google-analytics": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-cms": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-google-analytics": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit.php
index 8324b0fc83f7ec7648ce634c1e84aaea47735b1f..90e9c6b5ad7015e20de52ba69331ff879290f711 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit.php
@@ -67,7 +67,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
index e3d713530184ee2f8aa56c8fdb42f50b5081cbec..aa95f8a884c1276da40b6a5fc236958d4ed29930 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
@@ -85,7 +85,7 @@ class Items extends \Magento\Backend\App\Action
public function _getStore()
{
$store = $this->_objectManager->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
(int)$this->getRequest()->getParam('store', 0)
);
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
index 022290b7d40fc26ccbd770a8d3da9e19e2ca0ecb..56380c2148cfacfde955603861af9d03fa33fbb4 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
@@ -67,7 +67,7 @@ class Index extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\
'adminhtml/*/',
[
'store' => $this->_objectManager->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId(),
'_current' => true
]
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
index 755c3dc4b0844d50c26a630e27c67e43d4e6d602..c22b04e12e022a0d78b414dd9eafea1e76153be9 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
@@ -93,7 +93,7 @@ class Types extends \Magento\Backend\App\Action
public function _getStore()
{
$storeId = (int)$this->getRequest()->getParam('store', 0);
- $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
if ($storeId == 0) {
$defaultStore = $storeManager->getDefaultStoreView();
if (!$defaultStore) {
diff --git a/app/code/Magento/GoogleShopping/Helper/Data.php b/app/code/Magento/GoogleShopping/Helper/Data.php
index 31ecda5a3c65ea08bc0270bd259531108e4da76a..04f617eb913c729cceca36384b4eaee9a05a485d 100644
--- a/app/code/Magento/GoogleShopping/Helper/Data.php
+++ b/app/code/Magento/GoogleShopping/Helper/Data.php
@@ -22,19 +22,19 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\Stdlib\String $string
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\Stdlib\String $string,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->string = $string;
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
index 7f63f63f7eccf4960ce25b464cb073236daf0943..1e9b15cd96b556b55fada2f964136dab97b9f013 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
@@ -69,7 +69,7 @@ class Link extends \Magento\GoogleShopping\Model\Attribute\DefaultAttribute
if ($url) {
$isStoreInUrl = $this->_scopeConfig->isSetFlag(
\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (!$isStoreInUrl) {
$urlInfo = parse_url($url);
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Price.php b/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
index f6843bbabe708883e5a3dab31ab3976f668717fa..a75a1f1a774fb21782fce489c671a8783e8ea4db 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
@@ -42,7 +42,7 @@ class Price extends DefaultAttribute
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -71,7 +71,7 @@ class Price extends DefaultAttribute
* @param \Magento\GoogleShopping\Helper\Product $gsProduct
* @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
* @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\GoogleShopping\Model\Config $config
* @param \Magento\Catalog\Helper\Data $catalogData
@@ -90,7 +90,7 @@ class Price extends DefaultAttribute
\Magento\GoogleShopping\Helper\Product $gsProduct,
\Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
\Magento\GoogleShopping\Model\Resource\Attribute $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Tax\Helper\Data $taxData,
\Magento\GoogleShopping\Model\Config $config,
\Magento\Catalog\Helper\Data $catalogData,
diff --git a/app/code/Magento/GoogleShopping/Model/Config.php b/app/code/Magento/GoogleShopping/Model/Config.php
index 7227f933f278d853bcb325c8af2cca55cc540ad6..5e4ef7014d13d80afb2c1a834654a1b2f481f22b 100644
--- a/app/code/Magento/GoogleShopping/Model/Config.php
+++ b/app/code/Magento/GoogleShopping/Model/Config.php
@@ -32,7 +32,7 @@ class Config extends \Magento\Framework\Object
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -43,13 +43,13 @@ class Config extends \Magento\Framework\Object
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
* @param array $data
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Encryption\EncryptorInterface $encryptor,
array $data = []
) {
@@ -69,7 +69,7 @@ class Config extends \Magento\Framework\Object
public function getConfigData($key, $storeId = null)
{
if (!isset($this->_config[$key][$storeId])) {
- $value = $this->_scopeConfig->getValue('google/googleshopping/' . $key, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId);
+ $value = $this->_scopeConfig->getValue('google/googleshopping/' . $key, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId);
$this->_config[$key][$storeId] = $value;
}
return $this->_config[$key][$storeId];
diff --git a/app/code/Magento/GoogleShopping/Model/MassOperations.php b/app/code/Magento/GoogleShopping/Model/MassOperations.php
index 143c966a8b21209ac0f972875a2b16132b604763..7cabe18ba1a86c9175a3559f49d91429b75408e5 100644
--- a/app/code/Magento/GoogleShopping/Model/MassOperations.php
+++ b/app/code/Magento/GoogleShopping/Model/MassOperations.php
@@ -33,7 +33,7 @@ class MassOperations
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -70,7 +70,7 @@ class MassOperations
* @param \Magento\GoogleShopping\Model\ItemFactory $itemFactory
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param \Magento\Framework\Notification\NotifierInterface $notifier
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\GoogleShopping\Helper\Data $gleShoppingData
* @param \Magento\GoogleShopping\Helper\Category $gleShoppingCategory
@@ -82,7 +82,7 @@ class MassOperations
\Magento\GoogleShopping\Model\ItemFactory $itemFactory,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Framework\Notification\NotifierInterface $notifier,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Psr\Log\LoggerInterface $logger,
\Magento\GoogleShopping\Helper\Data $gleShoppingData,
\Magento\GoogleShopping\Helper\Category $gleShoppingCategory,
diff --git a/app/code/Magento/GoogleShopping/Model/Observer.php b/app/code/Magento/GoogleShopping/Model/Observer.php
index 19fb3d9da9305107c12c19af35cb243eef1b4f78..3fc97c0a8991d02824a0dac071a9e0ae1b09abbd 100644
--- a/app/code/Magento/GoogleShopping/Model/Observer.php
+++ b/app/code/Magento/GoogleShopping/Model/Observer.php
@@ -130,7 +130,7 @@ class Observer
foreach ($items as $item) {
$flag = $this->_scopeConfig->isSetFlag(
'google/googleshopping/observed',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$item->getStoreId()
);
if (!$flag) {
diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json
index 1c4e724ff8c4e7d8481ad1ef3dce6738b65ce6a5..bddf78c17c164c4a3e6b7aaffcd38110926ba320 100644
--- a/app/code/Magento/GoogleShopping/composer.json
+++ b/app/code/Magento/GoogleShopping/composer.json
@@ -3,19 +3,19 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/GoogleShopping/etc/acl.xml b/app/code/Magento/GoogleShopping/etc/acl.xml
index 263ba2cebff76b4b99dab900c7b5c441d213573d..8391a7ff774cc6ac67acf672d169c6cb172d2e44 100644
--- a/app/code/Magento/GoogleShopping/etc/acl.xml
+++ b/app/code/Magento/GoogleShopping/etc/acl.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_Catalog::catalog">
<resource id="Magento_GoogleShopping::googleshopping" title="Google Content" sortOrder="20">
<resource id="Magento_GoogleShopping::types" title="Attributes" sortOrder="10" />
diff --git a/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml b/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml
index c4c968ce5e21aba5c3dfd856ad05df331be97a9d..a1e9f6e6c9fdaf40d6a478109c36c27dff643c04 100644
--- a/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml
+++ b/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_GoogleShopping" before="Magento_Adminhtml" />
+ <module name="Magento_GoogleShopping" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
index 6226b26df50f8122026c717b845bcaa99461923e..d790db48e17d7f65889552f17415ba390085cb97 100644
--- a/app/code/Magento/GroupedImportExport/composer.json
+++ b/app/code/Magento/GroupedImportExport/composer.json
@@ -3,16 +3,16 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-import-export": "0.42.0-beta6",
- "magento/module-catalog-import-export": "0.42.0-beta6",
- "magento/module-grouped-product": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-import-export": "0.42.0-beta7",
+ "magento/module-catalog-import-export": "0.42.0-beta7",
+ "magento/module-grouped-product": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
index dc7cdbc273917ae49b4c3b12f44cab6fb15c8ca7..a6f28362cd08a8329da590a3ed56611c362289d8 100644
--- a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
@@ -44,7 +44,7 @@ class Grouped extends Renderer implements IdentityInterface
*/
if ($this->_scopeConfig->getValue(
self::CONFIG_THUMBNAIL_SOURCE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
!($this->getProduct()->getThumbnail() && $this->getProduct()->getThumbnail() != 'no_selection')
) {
diff --git a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php
index 058d809207b4351fe1221d42079ab256c0fd7e1b..2f1dbf803cce894c7e7e8e35e3d0b9309952c8f3 100644
--- a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php
+++ b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php
@@ -19,7 +19,7 @@ class AssociatedProducts extends \Magento\Backend\Block\Catalog\Product\Tab\Cont
/**
* Return Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
diff --git a/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php b/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
index b879fba84643dd12c980dae7f39112d376d3866f..316e6e382e312a605ac3c8ab1100154845b1def6 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
@@ -11,7 +11,7 @@ namespace Magento\GroupedProduct\Model\Product;
class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -21,11 +21,11 @@ class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterfa
protected $commonPriceModel;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
) {
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index a042ef95bfb51c2d2d0ef9fcf734890c6eb7c53b..8801faf0fcec5ec0cee5700ca1a08c176247599f 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -61,7 +61,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -92,7 +92,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Psr\Log\LoggerInterface $logger
* @param ProductRepositoryInterface $productRepository
* @param \Magento\GroupedProduct\Model\Resource\Product\Link $catalogProductLink
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\Attribute\Source\Status $catalogProductStatus
* @param \Magento\Framework\App\State $appState
* @param \Magento\Msrp\Helper\Data $msrpData
@@ -111,7 +111,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
\Psr\Log\LoggerInterface $logger,
ProductRepositoryInterface $productRepository,
\Magento\GroupedProduct\Model\Resource\Product\Link $catalogProductLink,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\Attribute\Source\Status $catalogProductStatus,
\Magento\Framework\App\State $appState,
\Magento\Msrp\Helper\Data $msrpData
@@ -336,7 +336,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Framework\Object $buyRequest
* @param \Magento\Catalog\Model\Product $product
* @param string $processMode
- * @return array|string
+ * @return \Magento\Framework\Phrase|array|string
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $product, $processMode)
diff --git a/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php b/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
index 0344038d8d630e733f996446770e05b4f9d68b42..3d594a711f249f905bc223a3b90228073949cec7 100644
--- a/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
+++ b/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
@@ -36,7 +36,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\Resource\Produ
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -62,7 +62,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\Resource\Produ
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index 9c4fdf3cb003c69d84b100942b93923177d6af3c..3c575a96a6caf17307350926a5b45009facf0927 100644
--- a/app/code/Magento/GroupedProduct/composer.json
+++ b/app/code/Magento/GroupedProduct/composer.json
@@ -3,22 +3,22 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-msrp": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-msrp": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php
index 49768bac039b51c4522dae9d183f4b39eed3a2c1..f4231fa5f361df98160a3298f76792a552128529 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php
@@ -31,7 +31,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index f737cd87e3012676b437be2eec4833b1017a1859..8aa42f3a82a756ac0b1d5958705e53351c121b59 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -131,7 +131,7 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
*
* @param Attribute $attribute
* @param mixed $value
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
protected function _getMultiSelectHtmlWithValue(Attribute $attribute, $value)
{
@@ -209,7 +209,7 @@ class Filter extends \Magento\Backend\Block\Widget\Grid\Extended
*
* @param Attribute $attribute
* @param mixed $value
- * @return string
+ * @return \Magento\Framework\Phrase|string
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php
index bfa8777077193e8f34391d0ff1be1e60e04364c0..bf9d5038128dca550a8b1e9e2ab8019f1a3f2478 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php
@@ -37,7 +37,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/ImportExport/Helper/Data.php b/app/code/Magento/ImportExport/Helper/Data.php
index a2923476b7df36a7f4627bd135ae55dfe86d8de1..43ec77d4f66f10c73bc0f8f8e3054da28813b29d 100644
--- a/app/code/Magento/ImportExport/Helper/Data.php
+++ b/app/code/Magento/ImportExport/Helper/Data.php
@@ -32,7 +32,7 @@ class Data extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\File\Size $fileSize
@@ -41,7 +41,7 @@ class Data extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Framework\File\Size $fileSize,
@@ -81,7 +81,7 @@ class Data extends \Magento\Core\Helper\Data
*/
public function getLocalValidPaths()
{
- $paths = $this->_scopeConfig->getValue(self::XML_PATH_EXPORT_LOCAL_VALID_PATH, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ $paths = $this->_scopeConfig->getValue(self::XML_PATH_EXPORT_LOCAL_VALID_PATH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
return $paths;
}
@@ -92,6 +92,6 @@ class Data extends \Magento\Core\Helper\Data
*/
public function getBunchSize()
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_BUNCH_SIZE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_BUNCH_SIZE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
index acf1cb9419416eace49d93384cb2dff5b2faacc6..7241c25053d9dc8c567ba7a65fd5bdcae43d156f 100644
--- a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
@@ -34,7 +34,7 @@ abstract class AbstractEntity
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -173,7 +173,7 @@ abstract class AbstractEntity
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param array $data
@@ -181,7 +181,7 @@ abstract class AbstractEntity
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
array $data = []
@@ -197,7 +197,7 @@ abstract class AbstractEntity
$data['page_size']
) ? $data['page_size'] : (static::XML_PATH_PAGE_SIZE ? (int)$this->_scopeConfig->getValue(
static::XML_PATH_PAGE_SIZE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) : 0);
$this->_byPagesIterator = isset(
$data['collection_by_pages_iterator']
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index e24cbe371cbcb361efce456f63e33322dc942e26..8803d34fc3d7061be086a9d5ad8c2627ac41377b 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -46,7 +46,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -55,7 +55,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
index da249dfa425e52e6d0b79a8ad668bfe2bdd1d467..584b19dc908930fcfb0cba7c1b977e22490d9274 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
@@ -141,7 +141,7 @@ abstract class AbstractEntity
protected $_localeDate;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -149,13 +149,13 @@ abstract class AbstractEntity
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Eav\Model\Config $config
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Eav\Model\Config $config,
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_localeDate = $localeDate;
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
index bcf90b1527a7fb045a90ee99abf6435ec76edefb..4285ddd4224050551ab26e86dfcfb7981c0c1b03 100644
--- a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
@@ -268,7 +268,7 @@ abstract class AbstractEntity
$data['page_size']
) ? $data['page_size'] : (static::XML_PATH_PAGE_SIZE ? (int)$this->_scopeConfig->getValue(
static::XML_PATH_PAGE_SIZE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) : 0);
$this->_maxDataSize = isset(
$data['max_data_size']
@@ -277,7 +277,7 @@ abstract class AbstractEntity
$data['bunch_size']
) ? $data['bunch_size'] : (static::XML_PATH_BUNCH_SIZE ? (int)$this->_scopeConfig->getValue(
static::XML_PATH_BUNCH_SIZE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) : 0);
}
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
index f6a1783a083961fa10d22d51189e3aab948ba959..1345aa9c341d26fa3fa84c5412fc6bfa34259ca7 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
@@ -19,7 +19,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -79,7 +79,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
* @param \Magento\ImportExport\Model\ImportFactory $importFactory
* @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
* @param \Magento\Eav\Model\Config $eavConfig
* @param array $data
@@ -92,7 +92,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
\Magento\ImportExport\Model\ImportFactory $importFactory,
\Magento\ImportExport\Model\Resource\Helper $resourceHelper,
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\Eav\Model\Config $eavConfig,
array $data = []
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index bdb200723d9b9893a7ef5df648452b1f076a2bd5..ebaeeaf30b7c7648cdad77c0bb73cf3d0fd78715 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -465,7 +465,7 @@ abstract class AbstractEntity
$messages = [];
foreach ($this->_errors as $errorCode => $errorRows) {
if (isset($this->_messageTemplates[$errorCode])) {
- $errorCode = __($this->_messageTemplates[$errorCode]);
+ $errorCode = (string)__($this->_messageTemplates[$errorCode]);
}
foreach ($errorRows as $errorRowData) {
$key = $errorRowData[1] ? sprintf($errorCode, $errorRowData[1]) : $errorCode;
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index e4d91683712a7861bd52c8d388a0d87a5ec8dd02..309046d397ee240e3adef2fd8673b779e4479d1c 100644
--- a/app/code/Magento/ImportExport/composer.json
+++ b/app/code/Magento/ImportExport/composer.json
@@ -3,17 +3,17 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-indexer": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-indexer": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"ext-ctype": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/ImportExport/etc/acl.xml b/app/code/Magento/ImportExport/etc/acl.xml
index 7b2e4a03c36392242e16233c06e9f1cfe4e5e917..20d76086a050214c42097b98769f2b1e32c6596f 100644
--- a/app/code/Magento/ImportExport/etc/acl.xml
+++ b/app/code/Magento/ImportExport/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::system">
- <resource id="Magento_Adminhtml::convert">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::system">
+ <resource id="Magento_Backend::convert">
<resource id="Magento_ImportExport::import" title="Import" sortOrder="10" />
<resource id="Magento_ImportExport::export" title="Export" sortOrder="20" />
</resource>
diff --git a/app/code/Magento/ImportExport/etc/adminhtml/routes.xml b/app/code/Magento/ImportExport/etc/adminhtml/routes.xml
index da01c87a4ab24564867dbfdf5baf6984cd0213e0..34c4c0dfdd7daebc9a659e4a13f011e48d4750d5 100644
--- a/app/code/Magento/ImportExport/etc/adminhtml/routes.xml
+++ b/app/code/Magento/ImportExport/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_ImportExport" before="Magento_Adminhtml" />
+ <module name="Magento_ImportExport" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
index 11e383f85338007bc48e09e10912b5f6a36abbd5..0730d06eeee328934df0346eefde03535d5aa7f7 100644
--- a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
+++ b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
@@ -11,7 +11,7 @@ class Updated extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Datetim
* Render indexer updated time
*
* @param \Magento\Framework\Object $row
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function render(\Magento\Framework\Object $row)
{
diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json
index 92dbe692825955557c023563c3892fa18b24c961..831e18986f95d6b07c902ef1385316a78326bcd4 100644
--- a/app/code/Magento/Indexer/composer.json
+++ b/app/code/Magento/Indexer/composer.json
@@ -3,13 +3,13 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-page-cache": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-page-cache": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Indexer/etc/acl.xml b/app/code/Magento/Indexer/etc/acl.xml
index d072048ba0118742eded38b587b4de123900a64c..bc1801d89cf8320e0524485832b2b2d241321906 100644
--- a/app/code/Magento/Indexer/etc/acl.xml
+++ b/app/code/Magento/Indexer/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::system">
- <resource id="Magento_Adminhtml::tools">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::system">
+ <resource id="Magento_Backend::tools">
<resource id="Magento_Indexer::index" title="Index Management" sortOrder="30" />
<resource id="Magento_Indexer::changeMode" title="Change indexer mode" sortOrder="40" />
</resource>
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php
index 43697870a0a5f5dae7934c9d42717b664e212341..2c2df7dd5c64a07be021d72a192d2849aa15eafd 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php
@@ -94,7 +94,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get header text for edit page.
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
index e5a8193adcb9f4961aa8bf32f18921ae3202ab2d..9ecc712c50affb1ab65487d819dc00d837392891 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
@@ -56,7 +56,7 @@ class Info extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
/**
* Prepare label for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
diff --git a/app/code/Magento/Integration/Helper/Oauth/Data.php b/app/code/Magento/Integration/Helper/Oauth/Data.php
index 125ffb3ffcebcf02b3991d1e654a4f8ac1a758b9..466c7ff509a4eb92d5a4da59ed2e3785f9068f9b 100644
--- a/app/code/Magento/Integration/Helper/Oauth/Data.php
+++ b/app/code/Magento/Integration/Helper/Oauth/Data.php
@@ -65,7 +65,7 @@ class Data
// Safe get cleanup probability value from system configuration
$configValue = (int)$this->_scopeConfig->getValue(
self::XML_PATH_CLEANUP_PROBABILITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return $configValue > 0 ? 1 == \Magento\Framework\Math\Random::getRandomNumber(1, $configValue) : false;
}
@@ -79,7 +79,7 @@ class Data
{
$minutes = (int)$this->_scopeConfig->getValue(
self::XML_PATH_CLEANUP_EXPIRATION_PERIOD,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return $minutes > 0 ? $minutes : self::CLEANUP_EXPIRATION_PERIOD_DEFAULT;
}
@@ -93,7 +93,7 @@ class Data
{
$seconds = (int)$this->_scopeConfig->getValue(
self::XML_PATH_CONSUMER_EXPIRATION_PERIOD,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return $seconds > 0 ? $seconds : self::CONSUMER_EXPIRATION_PERIOD_DEFAULT;
}
@@ -107,7 +107,7 @@ class Data
{
$redirects = (int)$this->_scopeConfig->getValue(
self::XML_PATH_CONSUMER_POST_MAXREDIRECTS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return $redirects > 0 ? $redirects : 0;
}
@@ -121,7 +121,7 @@ class Data
{
$seconds = (int)$this->_scopeConfig->getValue(
self::XML_PATH_CONSUMER_POST_TIMEOUT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return $seconds > 0 ? $seconds : self::CONSUMER_POST_TIMEOUT_DEFAULT;
}
diff --git a/app/code/Magento/Integration/Service/V1/Oauth.php b/app/code/Magento/Integration/Service/V1/Oauth.php
index 442a7cd2b5d233037d83ea4c553177336dd9e4d3..5816700e8eb7d2a40f7deba869cc6835b5e5278a 100644
--- a/app/code/Magento/Integration/Service/V1/Oauth.php
+++ b/app/code/Magento/Integration/Service/V1/Oauth.php
@@ -21,7 +21,7 @@ use Magento\Integration\Model\Oauth\Token\Provider as TokenProvider;
class Oauth implements OauthInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -63,7 +63,7 @@ class Oauth implements OauthInterface
/**
* Initialize dependencies.
*
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param ConsumerFactory $consumerFactory
* @param TokenFactory $tokenFactory
* @param IntegrationOauthHelper $dataHelper
@@ -73,7 +73,7 @@ class Oauth implements OauthInterface
* @param TokenProvider $tokenProvider
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
ConsumerFactory $consumerFactory,
TokenFactory $tokenFactory,
IntegrationOauthHelper $dataHelper,
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index de2bc4a48eff5d0ddafb77ef6b10ad4261b7e7e0..33ee89f877519ac45ad595e5f89558998b6fdfdd 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -3,16 +3,17 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-user": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-authorization": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-user": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-authorization": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Integration/etc/adminhtml/routes.xml b/app/code/Magento/Integration/etc/adminhtml/routes.xml
index 8713db0e27e04723b35651ad1906670ddb821604..6547865b6865e27e7935fcf1a8e80f204d50706e 100644
--- a/app/code/Magento/Integration/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Integration/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_Integration" before="Magento_Adminhtml" />
+ <module name="Magento_Integration" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Integration/etc/module.xml b/app/code/Magento/Integration/etc/module.xml
index 6723cfcff2370484382b50a21a3b38b716338635..9266394d394876876a85ef46c56f5e14f227d6c9 100644
--- a/app/code/Magento/Integration/etc/module.xml
+++ b/app/code/Magento/Integration/etc/module.xml
@@ -9,6 +9,7 @@
<module name="Magento_Integration" schema_version="2.0.0">
<sequence>
<module name="Magento_Core"/>
+ <module name="Magento_Store"/>
<module name="Magento_User"/>
</sequence>
</module>
diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json
index c21caaa2493216b533aafc1efc043ce498298dc1..136e59fd7eb348ea4e4f57ce22b748b4fa44188e 100644
--- a/app/code/Magento/LayeredNavigation/composer.json
+++ b/app/code/Magento/LayeredNavigation/composer.json
@@ -3,13 +3,13 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php b/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
index 8a96e045d811a1e475ee23e7837be717a11d163a..a79bb9e48809f4156cd131293bb23190f00f84c5 100644
--- a/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
+++ b/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
@@ -76,7 +76,7 @@ class Status extends \Magento\Backend\Block\Template
{
return $this->_scopeConfig->getValue(
$this->_localeDate->getDefaultTimezonePath(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getCustomer()->getStoreId()
);
}
@@ -97,7 +97,7 @@ class Status extends \Magento\Backend\Block\Template
/**
* Get customer's current status
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getCurrentStatus()
{
@@ -114,7 +114,7 @@ class Status extends \Magento\Backend\Block\Template
/**
* Get customer last login date
*
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getLastLoginDate()
{
@@ -126,7 +126,7 @@ class Status extends \Magento\Backend\Block\Template
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getStoreLastLoginDate()
{
diff --git a/app/code/Magento/Log/Model/Aggregation.php b/app/code/Magento/Log/Model/Aggregation.php
index 714e8d62c56c8fd76a3bf2c3949cdbc0aa5a4afa..30046eeb81353401489020c17e019ec12b862301 100644
--- a/app/code/Magento/Log/Model/Aggregation.php
+++ b/app/code/Magento/Log/Model/Aggregation.php
@@ -23,14 +23,14 @@ class Aggregation extends \Magento\Framework\Model\AbstractModel
protected $_lastRecord;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -38,7 +38,7 @@ class Aggregation extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Log/Model/Cron.php b/app/code/Magento/Log/Model/Cron.php
index 9ee04b5a31e1f1603a66e85ae4d7fb7bda0d14ec..80396b78c15d65db02107c5660b066aa72969fa8 100644
--- a/app/code/Magento/Log/Model/Cron.php
+++ b/app/code/Magento/Log/Model/Cron.php
@@ -36,7 +36,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -60,7 +60,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
* @param \Magento\Log\Model\Log $log
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -73,7 +73,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
\Magento\Framework\Registry $registry,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Log\Model\Log $log,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
@@ -100,7 +100,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
}
if (!$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return $this;
@@ -110,7 +110,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
$transport = $this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_LOG_CLEAN_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -122,12 +122,12 @@ class Cron extends \Magento\Framework\Model\AbstractModel
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_LOG_CLEAN_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->getTransport();
@@ -147,7 +147,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
{
if (!$this->_scopeConfig->isSetFlag(
self::XML_PATH_LOG_CLEAN_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return $this;
diff --git a/app/code/Magento/Log/Model/Log.php b/app/code/Magento/Log/Model/Log.php
index 2962878e3493a90a9e66dea9dadf5ae103dec83c..e82acd114d3415cde1630ea2346b2aaeac0cc899 100644
--- a/app/code/Magento/Log/Model/Log.php
+++ b/app/code/Magento/Log/Model/Log.php
@@ -73,7 +73,7 @@ class Log extends \Magento\Framework\Model\AbstractModel
{
return $this->_scopeConfig->getValue(
self::XML_LOG_CLEAN_DAYS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) * 60 * 60 * 24;
}
@@ -97,7 +97,7 @@ class Log extends \Magento\Framework\Model\AbstractModel
{
$configValue = $this->_scopeConfig->getValue(
'customer/online_customers/online_minutes_interval',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return intval($configValue) > 0 ? intval($configValue) : self::DEFAULT_ONLINE_MINUTES_INTERVAL;
}
diff --git a/app/code/Magento/Log/Model/Resource/Visitor.php b/app/code/Magento/Log/Model/Resource/Visitor.php
index 0631f7db84ca22cad060e33e3fdfc8c82d13a9ab..c11527b8462a7f33c94d5253bd37697440d9f829 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor.php
@@ -30,20 +30,20 @@ class Visitor extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_date;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\String $string
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\String $string
) {
$this->_date = $date;
diff --git a/app/code/Magento/Log/Model/Shell/Command/Clean.php b/app/code/Magento/Log/Model/Shell/Command/Clean.php
index 4ffdc812adcdafacb07169d6237e0b7b242b0a8a..65415c82f489bacadaf34c2dd2fae709f859d77a 100644
--- a/app/code/Magento/Log/Model/Shell/Command/Clean.php
+++ b/app/code/Magento/Log/Model/Shell/Command/Clean.php
@@ -54,7 +54,7 @@ class Clean implements \Magento\Log\Model\Shell\CommandInterface
$this->_mutableConfig->setValue(
\Magento\Log\Model\Log::XML_LOG_CLEAN_DAYS,
$this->_days,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
/** @var $model \Magento\Log\Model\Log */
diff --git a/app/code/Magento/Log/Model/Visitor.php b/app/code/Magento/Log/Model/Visitor.php
index 6b1679a3e8cabcba10a7ee38d24e579998ad19aa..ddd051f7ba5c3703625e49e65ac9510caefe296c 100644
--- a/app/code/Magento/Log/Model/Visitor.php
+++ b/app/code/Magento/Log/Model/Visitor.php
@@ -22,7 +22,7 @@ namespace Magento\Log\Model;
class Visitor extends \Magento\Framework\Model\AbstractModel
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -55,7 +55,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Session\SessionManagerInterface $session
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\HTTP\Header $httpHeader
* @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
* @param \Magento\Framework\HTTP\PhpEnvironment\ServerAddress $serverAddress
@@ -69,7 +69,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\Session\SessionManagerInterface $session,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\HTTP\Header $httpHeader,
\Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
\Magento\Framework\HTTP\PhpEnvironment\ServerAddress $serverAddress,
diff --git a/app/code/Magento/Log/Model/Visitor/Online.php b/app/code/Magento/Log/Model/Visitor/Online.php
index 490b75ba616e404cb7bc1d4da0da987cd10f0954..ea1f7e47b03434fda504c4ef99dccc28d7f88109 100644
--- a/app/code/Magento/Log/Model/Visitor/Online.php
+++ b/app/code/Magento/Log/Model/Visitor/Online.php
@@ -122,7 +122,7 @@ class Online extends \Magento\Framework\Model\AbstractModel
{
return $this->_scopeConfig->getValue(
self::XML_PATH_UPDATE_FREQUENCY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -136,7 +136,7 @@ class Online extends \Magento\Framework\Model\AbstractModel
$value = intval(
$this->_scopeConfig->getValue(
self::XML_PATH_ONLINE_INTERVAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
if (!$value) {
diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json
index d94c279ab73d7e4503086fd4dfdb799532d5df85..e7046103a86fb16cd5e3d8b29302c77c6baa7256 100644
--- a/app/code/Magento/Log/composer.json
+++ b/app/code/Magento/Log/composer.json
@@ -3,14 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Log/etc/acl.xml b/app/code/Magento/Log/etc/acl.xml
index 65893d1bcc6397f4c183f185555c9ea11ae83d4b..626a8d7d04431a5d85b22a53aa20c5c5642ab7cf 100644
--- a/app/code/Magento/Log/etc/acl.xml
+++ b/app/code/Magento/Log/etc/acl.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_Customer::customer">
<resource id="Magento_Log::online" title="Now Online" sortOrder="20" />
</resource>
diff --git a/app/code/Magento/Log/etc/module.xml b/app/code/Magento/Log/etc/module.xml
index 6b905f3f2e358c8214b0b436346b58fc1d8350ca..7eb861d5a0edfdfec8e54934851f7ab58ee957ce 100644
--- a/app/code/Magento/Log/etc/module.xml
+++ b/app/code/Magento/Log/etc/module.xml
@@ -8,6 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
<module name="Magento_Log" schema_version="2.0.0">
<sequence>
+ <module name="Magento_Store"/>
<module name="Magento_Customer"/>
</sequence>
</module>
diff --git a/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php b/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
index 55d0dc5fb679cb830c5dd2503cdfb6c5d99d4b90..b8191d6778be70c009f737774f9eb91aa91f1de0 100644
--- a/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
+++ b/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
@@ -17,7 +17,7 @@ class Type extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Price
* @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
* @param \Magento\Framework\Escaper $escaper
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
* @param \Magento\Tax\Helper\Data $taxData
* @param \Magento\Msrp\Model\Config $config
@@ -27,7 +27,7 @@ class Type extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Price
\Magento\Framework\Data\Form\Element\Factory $factoryElement,
\Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
\Magento\Framework\Escaper $escaper,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\CurrencyInterface $localeCurrency,
\Magento\Tax\Helper\Data $taxData,
\Magento\Msrp\Model\Config $config,
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index 2fa8a659592f9af7e569b9498cce71d8e9873afe..e316672f2cce709a7c0ba7f369788160ceb1f26e 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -8,7 +8,7 @@ namespace Magento\Msrp\Helper;
use Magento\Framework\App\Helper\AbstractHelper;
use Magento\Framework\App\Helper\Context;
use Magento\Msrp\Model\Product\Attribute\Source\Type;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Catalog\Model\Product;
use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -18,7 +18,7 @@ use Magento\Catalog\Api\ProductRepositoryInterface;
class Data extends AbstractHelper
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var StoreManagerInterface
*/
protected $storeManager;
@@ -44,7 +44,7 @@ class Data extends AbstractHelper
/**
* @param Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param \Magento\Msrp\Model\Product\Options $productOptions
* @param \Magento\Msrp\Model\Msrp $msrp
* @param \Magento\Msrp\Model\Config $config
diff --git a/app/code/Magento/Msrp/Model/Config.php b/app/code/Magento/Msrp/Model/Config.php
index b63cbd82b2ecddec3c22a45fb9935a4420cb8112..be5d39d56523ba7bcfa4d0abd1fd2b1be219a7e2 100644
--- a/app/code/Magento/Msrp/Model/Config.php
+++ b/app/code/Magento/Msrp/Model/Config.php
@@ -5,9 +5,9 @@
*/
namespace Magento\Msrp\Model;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\Escaper;
class Config
@@ -27,7 +27,7 @@ class Config
protected $scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var StoreManagerInterface
*/
protected $storeManager;
@@ -43,12 +43,12 @@ class Config
/**
* @param ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param Escaper $escaper
*/
public function __construct(
ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ StoreManagerInterface $storeManager,
Escaper $escaper
) {
$this->scopeConfig = $scopeConfig;
@@ -77,7 +77,7 @@ class Config
{
return (bool)$this->scopeConfig->getValue(
self::XML_PATH_MSRP_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
$this->storeId
);
}
@@ -91,7 +91,7 @@ class Config
{
return $this->scopeConfig->getValue(
self::XML_PATH_MSRP_DISPLAY_ACTUAL_PRICE_TYPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
$this->storeId
);
}
@@ -106,7 +106,7 @@ class Config
return $this->escaper->escapeHtml(
$this->scopeConfig->getValue(
self::XML_PATH_MSRP_EXPLANATION_MESSAGE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
$this->storeId
),
['b', 'br', 'strong', 'i', 'u', 'p', 'span']
@@ -123,7 +123,7 @@ class Config
return $this->escaper->escapeHtml(
$this->scopeConfig->getValue(
self::XML_PATH_MSRP_EXPLANATION_MESSAGE_WHATS_THIS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
$this->storeId
),
['b', 'br', 'strong', 'i', 'u', 'p', 'span']
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 103e3328bc95701d03808f2dd8830821d4a0e7c0..56ed88b5119ec2c7755340685a97fa18d6298d5d 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -3,19 +3,20 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-bundle": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-downloadable": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-grouped-product": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-bundle": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-downloadable": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-grouped-product": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
index a6bd847b469c18224518f51dcd0ea2cfb0970d91..33e18d922427df1a04f301e76b11eb6ccb6b2e72 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
@@ -142,7 +142,7 @@ class Shipping extends \Magento\Sales\Block\Items\AbstractItems
{
if ($name = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return $name;
diff --git a/app/code/Magento/Multishipping/Controller/Checkout.php b/app/code/Magento/Multishipping/Controller/Checkout.php
index baa5cffd12797b2e98fde9da51c8b9a49c0fcd78..5482e8239be1f985f541198cc99423e83782cd06 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout.php
@@ -23,14 +23,22 @@ class Checkout extends \Magento\Checkout\Controller\Action implements
* @param \Magento\Customer\Model\Session $customerSession
* @param CustomerRepositoryInterface $customerRepository
* @param AccountManagementInterface $accountManagement
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
\Magento\Customer\Model\Session $customerSession,
CustomerRepositoryInterface $customerRepository,
- AccountManagementInterface $accountManagement
+ AccountManagementInterface $accountManagement,
+ \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
) {
- parent::__construct($context, $customerSession, $customerRepository, $accountManagement);
+ parent::__construct(
+ $context,
+ $customerSession,
+ $customerRepository,
+ $accountManagement,
+ $resultRedirectFactory
+ );
}
/**
@@ -122,16 +130,18 @@ class Checkout extends \Magento\Checkout\Controller\Action implements
}
}
- if (!$this->_preDispatchValidateCustomer()) {
+ $result = $this->_preDispatchValidateCustomer();
+ if ($result instanceof \Magento\Framework\Controller\ResultInterface) {
+ return $result;
+ }
+
+ if (!$result) {
return $this->getResponse();
}
- if ($this->_getCheckoutSession()->getCartWasUpdated(
- true
- ) && !in_array(
- $action,
- ['index', 'login', 'register', 'addresses', 'success']
- )
+ if ($this->_getCheckoutSession()->getCartWasUpdated(true)
+ &&
+ !in_array($action, ['index', 'login', 'register', 'addresses', 'success'])
) {
$this->getResponse()->setRedirect($this->_getHelper()->getCartUrl());
$this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index 4e9fce82bde999c519d1693f29b9a2dfc0a1e98d..907aaa4d0c12171c812f5f6371885a85cc625764 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -26,6 +26,7 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
* @param \Magento\Customer\Model\Session $customerSession
* @param CustomerRepositoryInterface $customerRepository
* @param AccountManagementInterface $accountManagement
+ * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
*/
public function __construct(
@@ -33,10 +34,17 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
\Magento\Customer\Model\Session $customerSession,
CustomerRepositoryInterface $customerRepository,
AccountManagementInterface $accountManagement,
+ \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator
) {
$this->formKeyValidator = $formKeyValidator;
- parent::__construct($context, $customerSession, $customerRepository, $accountManagement);
+ parent::__construct(
+ $context,
+ $customerSession,
+ $customerRepository,
+ $accountManagement,
+ $resultRedirectFactory
+ );
}
/**
diff --git a/app/code/Magento/Multishipping/Helper/Data.php b/app/code/Magento/Multishipping/Helper/Data.php
index fd217c5ee95ab34603878f1fd0168e272b566909..d7458c1e1a0470bb40acb6ef00a22b9c77e9494a 100644
--- a/app/code/Magento/Multishipping/Helper/Data.php
+++ b/app/code/Magento/Multishipping/Helper/Data.php
@@ -70,7 +70,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getMaximumQty()
{
- return (int)$this->scopeConfig->getValue(self::XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return (int)$this->scopeConfig->getValue(self::XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -82,7 +82,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
public function isMultishippingCheckoutAvailable()
{
$quote = $this->getQuote();
- $isMultiShipping = $this->scopeConfig->isSetFlag(self::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ $isMultiShipping = $this->scopeConfig->isSetFlag(self::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
if (!$quote || !$quote->hasItems()) {
return $isMultiShipping;
}
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index 7cf624fb5a580d9744f71f357fe63af8ce340649..809ec11f824c0bb52cb5b27e830e79a6b347bd08 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -47,7 +47,7 @@ class Multishipping extends \Magento\Framework\Object
protected $_session;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -146,7 +146,7 @@ class Multishipping extends \Magento\Framework\Object
* @param \Magento\Quote\Model\Quote\Address\ToOrderAddress $quoteAddressToOrderAddress
* @param \Magento\Quote\Model\Quote\Payment\ToOrderPayment $quotePaymentToOrderPayment
* @param \Magento\Quote\Model\Quote\Item\ToOrderItem $quoteItemToOrderItem
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Payment\Model\Method\SpecificationInterface $paymentSpecification
* @param \Magento\Multishipping\Helper\Data $helper
* @param OrderSender $orderSender
@@ -170,7 +170,7 @@ class Multishipping extends \Magento\Framework\Object
\Magento\Quote\Model\Quote\Address\ToOrderAddress $quoteAddressToOrderAddress,
\Magento\Quote\Model\Quote\Payment\ToOrderPayment $quotePaymentToOrderPayment,
\Magento\Quote\Model\Quote\Item\ToOrderItem $quoteItemToOrderItem,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Payment\Model\Method\SpecificationInterface $paymentSpecification,
\Magento\Multishipping\Helper\Data $helper,
OrderSender $orderSender,
@@ -766,10 +766,10 @@ class Multishipping extends \Magento\Framework\Object
{
return !($this->_scopeConfig->isSetFlag(
'sales/minimum_order/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) && $this->_scopeConfig->isSetFlag(
'sales/minimum_order/multi_address',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) && !$this->getQuote()->validateMinimumAmount());
}
@@ -782,12 +782,12 @@ class Multishipping extends \Magento\Framework\Object
{
$descr = $this->_scopeConfig->getValue(
'sales/minimum_order/multi_address_description',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (empty($descr)) {
$descr = $this->_scopeConfig->getValue(
'sales/minimum_order/description',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $descr;
@@ -800,12 +800,12 @@ class Multishipping extends \Magento\Framework\Object
{
$error = $this->_scopeConfig->getValue(
'sales/minimum_order/multi_address_error_message',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (empty($error)) {
$error = $this->_scopeConfig->getValue(
'sales/minimum_order/error_message',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $error;
diff --git a/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php b/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php
index f9ff5b6a7302a60ea0297f2d16731e852af7744a..5d2045ed68e95c6121e24e427ac8fbb46953fad9 100644
--- a/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php
+++ b/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php
@@ -67,9 +67,9 @@ class Is3DSecure extends AbstractSpecification
protected function is3DSecureEnabled($paymentMethod)
{
return $this->scopeConfig->isSetFlag(
- sprintf(self::PATH_PAYMENT_3DSECURE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $paymentMethod)
+ sprintf(self::PATH_PAYMENT_3DSECURE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $paymentMethod)
) || $this->scopeConfig->isSetFlag(
- sprintf(self::PATH_PAYMENT_CENTINEL, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $paymentMethod)
+ sprintf(self::PATH_PAYMENT_CENTINEL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $paymentMethod)
);
}
}
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index ca767dadc636a282891753234c74fa6b34edd9dc..3c78da1132c1135fcaaf0d9b9f84f37a265600db 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -3,19 +3,20 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-payment": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-payment": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Multishipping/etc/acl.xml b/app/code/Magento/Multishipping/etc/acl.xml
index 2563dd54b92362949a4916322e1feea93c4cbc60..477af62823cba5c38112ed18b84efefbcb2671d6 100644
--- a/app/code/Magento/Multishipping/etc/acl.xml
+++ b/app/code/Magento/Multishipping/etc/acl.xml
@@ -8,10 +8,10 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Multishipping::config_multishipping" title="Multishipping Settings Section" sortOrder="6" />
</resource>
</resource>
diff --git a/app/code/Magento/Multishipping/etc/module.xml b/app/code/Magento/Multishipping/etc/module.xml
index 27d308c3eba5633f1db50deaf460300cd92a9f07..0973c6781782d02f828bf61ec8bb5b80ddb3c07d 100644
--- a/app/code/Magento/Multishipping/etc/module.xml
+++ b/app/code/Magento/Multishipping/etc/module.xml
@@ -9,6 +9,7 @@
<module name="Magento_Multishipping" schema_version="2.0.0.0">
<sequence>
<module name="Magento_Core"/>
+ <module name="Magento_Store"/>
<module name="Magento_Catalog"/>
</sequence>
</module>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml
index d657fa9186e89066be3b0499c122d2b5f950c6da..e00f3dc665c49116b8613c93d5fe9f7077e74555 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml
@@ -22,7 +22,7 @@
<block class="Magento\Framework\View\Element\RendererList" name="checkout.cart.item.renderers" as="renderer.list"/>
</block>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
<referenceBlock name="head.components">
<block class="Magento\Framework\View\Element\Template" name="multishipping_checkout_addresses_page_head_components" template="Magento_Multishipping::js/components.phtml"/>
</referenceBlock>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml
index 199c65996f8fd04fdaf7ba803e1d759af4daad85..b71e35b9b4c706d22a15c6ae0e40b994c2a253b7 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml
@@ -31,6 +31,6 @@
<container name="checkout.multishipping.overview.items.after" as="items_after" label="Overview Items After"/>
</block>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml
index 933fc87f59a0fb98a2f9cee275abb7876e03808b..8020a79055261d47eb720f33e370403f362aeef1 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml
@@ -28,6 +28,6 @@
</block>
</block>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
index d0343d45848547463c071d4fc2248b89b3ff4689..f6abfc399c74ce0f9d0ae3bc615ad593f9670f4a 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
@@ -28,7 +28,7 @@ class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
protected $_coreRegistry;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -41,7 +41,7 @@ class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
* @param \Magento\Backend\Block\Context $context
* @param \Magento\Framework\DB\Helper $resourceHelper
* @param \Magento\Store\Model\Resource\Website\CollectionFactory $websitesFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $registry
* @param array $data
*/
@@ -49,7 +49,7 @@ class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
\Magento\Backend\Block\Context $context,
\Magento\Framework\DB\Helper $resourceHelper,
\Magento\Store\Model\Resource\Website\CollectionFactory $websitesFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $registry,
array $data = []
) {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
index 4f9490d028c3e94c80fa9940a3cf591c2ce5f296..ea00f911c8d589edc2fe1e534454ee64ab300d37 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
@@ -56,7 +56,7 @@ class Template extends \Magento\Backend\Block\Template
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index 52641dcdc49fd239243a59d5a89c6dc6a02a27f5..11eafbcac08907851f74453a6da85377d4238c9b 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -187,7 +187,7 @@ class Edit extends \Magento\Backend\Block\Widget
/**
* Return header text for form
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
index e62c103ab9829ab8ace42e661b8a30b5cf06c2a3..18de6a18d03c5ebeb6e6079bda4bf10fa9b7e9e7 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
@@ -58,15 +58,15 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
$model = $this->getModel();
$identity = $this->_scopeConfig->getValue(
\Magento\Newsletter\Model\Subscriber::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$identityName = $this->_scopeConfig->getValue(
'trans_email/ident_' . $identity . '/name',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$identityEmail = $this->_scopeConfig->getValue(
'trans_email/ident_' . $identity . '/email',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
/** @var \Magento\Framework\Data\Form $form */
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index 3f278ba31e041a362ff8fb61a98b61e1fc14a19e..9fd0fb9fa4a08513f59d2a08bec8184e8a9ad41f 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -16,7 +16,7 @@ class Save extends \Magento\Newsletter\Controller\Manage
protected $formKeyValidator;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -36,7 +36,7 @@ class Save extends \Magento\Newsletter\Controller\Manage
* @param \Magento\Framework\App\Action\Context $context
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param CustomerRepository $customerRepository
* @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
*/
@@ -44,7 +44,7 @@ class Save extends \Magento\Newsletter\Controller\Manage
\Magento\Framework\App\Action\Context $context,
\Magento\Customer\Model\Session $customerSession,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
CustomerRepository $customerRepository,
\Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
) {
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber.php b/app/code/Magento/Newsletter/Controller/Subscriber.php
index d1fcf3f4ec174f0dc51bab8a421fa24fa90e976a..ecebc482b444eecd0e978af6615e231285cb802f 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber.php
@@ -10,7 +10,7 @@
namespace Magento\Newsletter\Controller;
use Magento\Framework\App\Action\Context;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Model\Session;
use Magento\Newsletter\Model\SubscriberFactory;
use Magento\Customer\Model\Url as CustomerUrl;
@@ -32,7 +32,7 @@ class Subscriber extends \Magento\Framework\App\Action\Action
protected $_subscriberFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -45,7 +45,7 @@ class Subscriber extends \Magento\Framework\App\Action\Action
* @param Context $context
* @param SubscriberFactory $subscriberFactory
* @param Session $customerSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param CustomerUrl $customerUrl
*/
public function __construct(
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index c55d26f11b5bf69e084d6f044c664db6cff44e6e..3d787c4479500199be68fd5daf189c23100dbf71 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -10,7 +10,7 @@ use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement
use Magento\Customer\Model\Session;
use Magento\Customer\Model\Url as CustomerUrl;
use Magento\Framework\App\Action\Context;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Newsletter\Model\SubscriberFactory;
class NewAction extends \Magento\Newsletter\Controller\Subscriber
@@ -76,7 +76,7 @@ class NewAction extends \Magento\Newsletter\Controller\Subscriber
if ($this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface')
->getValue(
\Magento\Newsletter\Model\Subscriber::XML_PATH_ALLOW_GUEST_SUBSCRIBE_FLAG,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) != 1
&& !$this->_customerSession->isLoggedIn()
) {
diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
index 35b9305945a31c93367283d523cea7d6bac3d47a..72239c7dcfabd57bc466a3773e292e719169dfbf 100644
--- a/app/code/Magento/Newsletter/Model/Queue.php
+++ b/app/code/Magento/Newsletter/Model/Queue.php
@@ -116,7 +116,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
* @param \Magento\Store\Model\App\Emulation $appEmulation
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Newsletter\Model\Template\Filter $templateFilter
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
@@ -132,7 +132,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
\Magento\Store\Model\App\Emulation $appEmulation,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Newsletter\Model\Template\Filter $templateFilter,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index 0da823146252c9c0672f657d26c7858ca2c8648c..a201e88646585247aa7deb2860f5419c94a5cd32 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -96,7 +96,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -128,7 +128,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Newsletter\Helper\Data $newsletterData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Session $customerSession
* @param CustomerRepositoryInterface $customerRepository
* @param AccountManagementInterface $customerAccountManagement
@@ -144,7 +144,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
\Magento\Newsletter\Helper\Data $newsletterData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Session $customerSession,
CustomerRepositoryInterface $customerRepository,
AccountManagementInterface $customerAccountManagement,
@@ -401,7 +401,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
$isConfirmNeed = $this->_scopeConfig->getValue(
self::XML_PATH_CONFIRMATION_FLAG,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) == 1 ? true : false;
$isOwnSubscribes = false;
@@ -634,10 +634,10 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
if (!$this->_scopeConfig->getValue(
self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) || !$this->_scopeConfig->getValue(
self::XML_PATH_CONFIRM_EMAIL_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return $this;
@@ -648,7 +648,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -660,7 +660,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_CONFIRM_EMAIL_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->getEmail(),
@@ -687,10 +687,10 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
if (!$this->_scopeConfig->getValue(
self::XML_PATH_SUCCESS_EMAIL_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) || !$this->_scopeConfig->getValue(
self::XML_PATH_SUCCESS_EMAIL_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return $this;
@@ -701,7 +701,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_SUCCESS_EMAIL_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -713,7 +713,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_SUCCESS_EMAIL_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->getEmail(),
@@ -739,10 +739,10 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
}
if (!$this->_scopeConfig->getValue(
self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) || !$this->_scopeConfig->getValue(
self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return $this;
@@ -753,7 +753,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -765,7 +765,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->getEmail(),
diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
index cc3d409ed2a47ffe857d5c9b2725d6642ca9b261..4ff5e4d526c661f2cad580ffdf468e27c121da3a 100644
--- a/app/code/Magento/Newsletter/Model/Template.php
+++ b/app/code/Magento/Newsletter/Model/Template.php
@@ -53,7 +53,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
/**
* Store manager to emulate design
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -95,7 +95,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\Registry $registry
* @param \Magento\Store\Model\App\Emulation $appEmulation
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Newsletter\Model\Template\Filter $filter
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -109,7 +109,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\Registry $registry,
\Magento\Store\Model\App\Emulation $appEmulation,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\RequestInterface $request,
\Magento\Newsletter\Model\Template\Filter $filter,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -335,7 +335,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
{
return !$this->_scopeConfig->isSetFlag(
\Magento\Email\Model\Template::XML_PATH_SYSTEM_SMTP_DISABLE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) && $this->getTemplateSenderName() && $this->getTemplateSenderEmail() && $this->getTemplateSubject();
}
}
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index 429698f0b568f5b796fa66a9158576710f3aa58f..5e3290e91433d0253bc5873b30533c6775ea83ad 100644
--- a/app/code/Magento/Newsletter/composer.json
+++ b/app/code/Magento/Newsletter/composer.json
@@ -3,21 +3,21 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-widget": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-cms": "0.42.0-beta6",
- "magento/module-email": "0.42.0-beta6",
- "magento/module-cron": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-require-js": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-widget": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/module-email": "0.42.0-beta7",
+ "magento/module-cron": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-require-js": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Newsletter/etc/acl.xml b/app/code/Magento/Newsletter/etc/acl.xml
index 333c73272cf23c2e5a33a7f92d38d7861fc3985c..05e452828724a59d470b83fa27a31e38576696cc 100644
--- a/app/code/Magento/Newsletter/etc/acl.xml
+++ b/app/code/Magento/Newsletter/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::marketing">
- <resource id="Magento_Adminhtml::marketing_communications">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::marketing">
+ <resource id="Magento_Backend::marketing_communications">
<resource id="Magento_Newsletter::template" title="Newsletter Template" sortOrder="20" />
<resource id="Magento_Newsletter::queue" title="Newsletter Queue" sortOrder="30"/>
<resource id="Magento_Newsletter::subscriber" title="Newsletter Subscribers" sortOrder="40"/>
@@ -21,9 +21,9 @@
<resource id="Magento_Newsletter::problem" title="Newsletter Problem Reports" sortOrder="40"/>
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Newsletter::newsletter" title="Newsletter Section" />
</resource>
</resource>
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index f510de1cef04d20d4f112f77cfac2fcc28d0855a..4570fc526add9a68ed213f59b787232a4567dcc6 100644
--- a/app/code/Magento/OfflinePayments/composer.json
+++ b/app/code/Magento/OfflinePayments/composer.json
@@ -3,12 +3,12 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-payment": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-payment": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
index b0adb7297f688c6aa1b88e2ca32bf744c4d7ea52..f56fac0e30b25b8aeec0bfde255171bd756b1a5e 100644
--- a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
+++ b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
@@ -18,7 +18,7 @@ class ExportTablerates extends \Magento\Backend\Controller\Adminhtml\System\Abst
protected $_fileFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -27,14 +27,14 @@ class ExportTablerates extends \Magento\Backend\Controller\Adminhtml\System\Abst
* @param \Magento\Backend\Model\Config\Structure $configStructure
* @param ConfigSectionChecker $sectionChecker
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
\Magento\Backend\Model\Config\Structure $configStructure,
ConfigSectionChecker $sectionChecker,
\Magento\Framework\App\Response\Http\FileFactory $fileFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_storeManager = $storeManager;
$this->_fileFactory = $fileFactory;
diff --git a/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php b/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
index 55b4fc70e1f2470efcac7a26710cde0e1b463aac..b3bc246030b9386d471eb0819511a097e7edb208 100644
--- a/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
@@ -36,6 +36,6 @@ class Shipping
*/
public function afterGetStateActive(\Magento\Checkout\Block\Cart\Shipping $subject, $result)
{
- return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/tablerate/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/tablerate/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
index 511672f40d86dee636153d9a9fa5104bdad48710..efe7c7f63f4062d051244b81ce6fc64f12953ebc 100644
--- a/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
@@ -17,16 +17,16 @@ class Freeshipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTota
protected $_calculator;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\OfflineShipping\Model\SalesRule\Calculator $calculator
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\OfflineShipping\Model\SalesRule\Calculator $calculator
) {
$this->setCode('discount');
diff --git a/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
index 6c5869c7bd2e0e98e941e1dd5e4ec22e33cf01c6..23985af45cddcce41807863f3aa01f40b40dfb14 100644
--- a/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
@@ -95,7 +95,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_logger;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -125,7 +125,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Framework\App\Resource $resource
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\OfflineShipping\Model\Carrier\Tablerate $carrierTablerate
* @param \Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollectionFactory
* @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory
@@ -135,7 +135,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
\Magento\Framework\App\Resource $resource,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\OfflineShipping\Model\Carrier\Tablerate $carrierTablerate,
\Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollectionFactory,
\Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory,
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index 3484d23411c0f5d359280ce65ab30667fe10f9b5..cec1708ee2706a033f9bcc84aebc3b5664d80ddd 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -3,19 +3,20 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-shipping": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-sales-rule": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-shipping": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-sales-rule": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/OfflineShipping/etc/module.xml b/app/code/Magento/OfflineShipping/etc/module.xml
index fa87ce91d4ecb161345185364a6f9b633a932aa3..84e7bb228b473549cbe494f2e85c7742fb4c14a3 100644
--- a/app/code/Magento/OfflineShipping/etc/module.xml
+++ b/app/code/Magento/OfflineShipping/etc/module.xml
@@ -8,6 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
<module name="Magento_OfflineShipping" schema_version="2.0.0">
<sequence>
+ <module name="Magento_Store"/>
<module name="Magento_Sales"/>
<module name="Magento_Quote"/>
<module name="Magento_SalesRule"/>
diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
index 55f70ea787a6ea7c1f3fb065987155192f70800b..56d46f7111fcc0cc2006e59aeaf3a72d20b05b65 100644
--- a/app/code/Magento/PageCache/Model/Config.php
+++ b/app/code/Magento/PageCache/Model/Config.php
@@ -125,11 +125,11 @@ class Config
return [
'/* {{ host }} */' => $this->_scopeConfig->getValue(
self::XML_VARNISH_PAGECACHE_BACKEND_HOST,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
),
'/* {{ port }} */' => $this->_scopeConfig->getValue(
self::XML_VARNISH_PAGECACHE_BACKEND_PORT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
),
'/* {{ ips }} */' => $this->_getAccessList(),
'/* {{ design_exceptions_code }} */' => $this->_getDesignExceptions()
@@ -152,7 +152,7 @@ class Config
$tpl = " \"%s\";";
$accessList = $this->_scopeConfig->getValue(
self::XML_VARNISH_PAGECACHE_ACCESS_LIST,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (!empty($accessList)) {
$ips = explode(',', $accessList);
@@ -179,7 +179,7 @@ class Config
$expressions = $this->_scopeConfig->getValue(
self::XML_VARNISH_PAGECACHE_DESIGN_THEME_REGEX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if ($expressions) {
$rules = array_values(unserialize($expressions));
diff --git a/app/code/Magento/Core/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php
similarity index 98%
rename from app/code/Magento/Core/Model/Layout/DepersonalizePlugin.php
rename to app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php
index b1719655c33aa0f3f7edb83e454333dde9f39655..79b5dcc9f84c698603d7e9885b0acbae88543669 100644
--- a/app/code/Magento/Core/Model/Layout/DepersonalizePlugin.php
+++ b/app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout;
+namespace Magento\PageCache\Model\Layout;
/**
* Class DepersonalizePlugin
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index e71ba61a03e95054869da7264277a86055413b4c..3fa0e00ae9b792efc2edad72b3b4cfb6475c025a 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -3,12 +3,13 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/PageCache/etc/adminhtml/routes.xml b/app/code/Magento/PageCache/etc/adminhtml/routes.xml
index 3479efeeaaec55fc73fd45b37202955860571eb1..384b2f4df3a43f8ca23c079018ca326268ec2cb0 100644
--- a/app/code/Magento/PageCache/etc/adminhtml/routes.xml
+++ b/app/code/Magento/PageCache/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_PageCache" before="Magento_Adminhtml" />
+ <module name="Magento_PageCache" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/PageCache/etc/di.xml b/app/code/Magento/PageCache/etc/di.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6e694f4729967ef84e73245d31af11ea4b25c138
--- /dev/null
+++ b/app/code/Magento/PageCache/etc/di.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+ <type name="Magento\Framework\App\PageCache\Identifier">
+ <plugin name="core-app-area-design-exception-plugin"
+ type="Magento\PageCache\Model\App\CacheIdentifierPlugin" sortOrder="10"/>
+ </type>
+</config>
diff --git a/app/code/Magento/PageCache/etc/frontend/di.xml b/app/code/Magento/PageCache/etc/frontend/di.xml
index 860fab8f451a306a90937168f19ad5681ca075e6..50779f57dd331352a05dbc9099e6e54c213486ea 100644
--- a/app/code/Magento/PageCache/etc/frontend/di.xml
+++ b/app/code/Magento/PageCache/etc/frontend/di.xml
@@ -17,5 +17,7 @@
</type>
<type name="Magento\Framework\View\Layout">
<plugin name="layout-model-caching-unique-name" type="Magento\PageCache\Model\Layout\LayoutPlugin"/>
+ <plugin name="core-session-depersonalize"
+ type="Magento\PageCache\Model\Layout\DepersonalizePlugin" sortOrder="1"/>
</type>
</config>
diff --git a/app/code/Magento/PageCache/etc/module.xml b/app/code/Magento/PageCache/etc/module.xml
index a6f9421bc9311b6b5a753623fe03db80fe4bc144..a94c5335ea937c411f112de7997cced8a5ca7649 100644
--- a/app/code/Magento/PageCache/etc/module.xml
+++ b/app/code/Magento/PageCache/etc/module.xml
@@ -9,6 +9,7 @@
<module name="Magento_PageCache" schema_version="1.6.0.0">
<sequence>
<module name="Magento_Core"/>
+ <module name="Magento_Store"/>
</sequence>
</module>
</config>
diff --git a/app/code/Magento/Payment/Block/Info/Cc.php b/app/code/Magento/Payment/Block/Info/Cc.php
index 9f68446b4babba8b56b341656495a48670de38e1..0cb99fe22f0d8ffe764746265dabaaff90ae459f 100644
--- a/app/code/Magento/Payment/Block/Info/Cc.php
+++ b/app/code/Magento/Payment/Block/Info/Cc.php
@@ -97,19 +97,19 @@ class Cc extends \Magento\Payment\Block\Info
$transport = parent::_prepareSpecificInformation($transport);
$data = [];
if ($ccType = $this->getCcTypeName()) {
- $data[__('Credit Card Type')] = $ccType;
+ $data[(string)__('Credit Card Type')] = $ccType;
}
if ($this->getInfo()->getCcLast4()) {
- $data[__('Credit Card Number')] = sprintf('xxxx-%s', $this->getInfo()->getCcLast4());
+ $data[(string)__('Credit Card Number')] = sprintf('xxxx-%s', $this->getInfo()->getCcLast4());
}
if (!$this->getIsSecureMode()) {
if ($ccSsIssue = $this->getInfo()->getCcSsIssue()) {
- $data[__('Switch/Solo/Maestro Issue Number')] = $ccSsIssue;
+ $data[(string)__('Switch/Solo/Maestro Issue Number')] = $ccSsIssue;
}
$year = $this->getInfo()->getCcSsStartYear();
$month = $this->getInfo()->getCcSsStartMonth();
if ($year && $month) {
- $data[__('Switch/Solo/Maestro Start Date')] = $this->_formatCardDate($year, $month);
+ $data[(string)__('Switch/Solo/Maestro Start Date')] = $this->_formatCardDate($year, $month);
}
}
return $transport->setData(array_merge($data, $transport->getData()));
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index f4a4812ac77c3254255fe8ba3813724efeaa8da2..6f77f919472e893a745e1ae516f3c7dc88e90cac 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -112,7 +112,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
$class = $this->_scopeConfig->getValue(
$this->getMethodModelConfigName($code),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (!$class) {
@@ -137,7 +137,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
foreach (array_keys($methods) as $code) {
$model = $this->_scopeConfig->getValue(
$this->getMethodModelConfigName($code),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
if (!$model) {
@@ -325,7 +325,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
\Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_ACTIVE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -340,7 +340,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
\Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_ORDER_STATUS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -355,7 +355,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
\Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_PAYMENT_ACTION,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Payment/Model/Config.php b/app/code/Magento/Payment/Model/Config.php
index 6acbd23ab21df31347cf0727d28a3fbdeff4b3e8..a36c3dff9ec978b8ab3ac436079b267165f522eb 100644
--- a/app/code/Magento/Payment/Model/Config.php
+++ b/app/code/Magento/Payment/Model/Config.php
@@ -6,7 +6,7 @@
namespace Magento\Payment\Model;
use Magento\Payment\Model\Method\AbstractMethod;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* Payment configuration model
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index bc32ea93f8daf2856e517d1c6c56acc33eb251cd..8e913f3b5332ae80e9324649b5490b97abec5db6 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -736,7 +736,7 @@ abstract class AbstractMethod extends \Magento\Framework\Model\AbstractExtensibl
$storeId = $this->getStore();
}
$path = 'payment/' . $this->getCode() . '/' . $field;
- return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId);
+ return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId);
}
/**
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 31a2047acd01427bb5d67519f48cef9b54bac5f7..073b46042a993b760368a355e2ea7b75d753fc04 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -3,17 +3,17 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-centinel": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-centinel": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Payment/etc/acl.xml b/app/code/Magento/Payment/etc/acl.xml
index 36d1497d07035248ebce87f289d4c4cfdbe0a283..3f3e5dd65fc129a01e4cb19e0d6dca347db2210b 100644
--- a/app/code/Magento/Payment/etc/acl.xml
+++ b/app/code/Magento/Payment/etc/acl.xml
@@ -8,10 +8,10 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Payment::payment" title="Payment Methods Section" />
<resource id="Magento_Payment::payment_services" title="Payment Services" />
</resource>
diff --git a/app/code/Magento/Persistent/Helper/Data.php b/app/code/Magento/Persistent/Helper/Data.php
index 6f88ed3e21339e2347b67f149fe59ce1c9c527f7..b5b23229d72709f1e4e053fd64e1569410781297 100644
--- a/app/code/Magento/Persistent/Helper/Data.php
+++ b/app/code/Magento/Persistent/Helper/Data.php
@@ -9,7 +9,7 @@
*/
namespace Magento\Persistent\Helper;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class Data extends \Magento\Core\Helper\Data
{
@@ -45,7 +45,7 @@ class Data extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\Module\Dir\Reader $modulesReader
@@ -55,7 +55,7 @@ class Data extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Framework\Module\Dir\Reader $modulesReader,
diff --git a/app/code/Magento/Persistent/Helper/Session.php b/app/code/Magento/Persistent/Helper/Session.php
index ab25d9913eaaeed28420293abd04b1025281408e..57a880e30f431f07e6eed3eafee1817e6575c23e 100644
--- a/app/code/Magento/Persistent/Helper/Session.php
+++ b/app/code/Magento/Persistent/Helper/Session.php
@@ -48,7 +48,7 @@ class Session extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param Data $persistentData
@@ -59,7 +59,7 @@ class Session extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Persistent\Helper\Data $persistentData,
diff --git a/app/code/Magento/Persistent/Model/Session.php b/app/code/Magento/Persistent/Model/Session.php
index 2e1e18e3fad72fcbfe6315cbd5caa0792bc1b00b..afd932a75f7147222b469b3dbe41698d33f8e511 100644
--- a/app/code/Magento/Persistent/Model/Session.php
+++ b/app/code/Magento/Persistent/Model/Session.php
@@ -66,7 +66,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -104,7 +104,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Persistent\Helper\Data $persistentData
* @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
* @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Math\Random $mathRandom
* @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -120,7 +120,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
\Magento\Persistent\Helper\Data $persistentData,
\Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Math\Random $mathRandom,
\Magento\Framework\Session\Config\ConfigInterface $sessionConfig,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json
index 6b79d041d9114e97b83120165ecfa78be378f4cf..747c8326919af11917a1e829bb2d5182e3423964 100644
--- a/app/code/Magento/Persistent/composer.json
+++ b/app/code/Magento/Persistent/composer.json
@@ -3,18 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-cron": "0.42.0-beta6",
- "magento/module-page-cache": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-cron": "0.42.0-beta7",
+ "magento/module-page-cache": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Persistent/etc/acl.xml b/app/code/Magento/Persistent/etc/acl.xml
index 37a1d36736278fd3f38050c7bfca7424792dea9b..cf8102fcb3ff4863ed15e9548bb62f5eb5b04770 100644
--- a/app/code/Magento/Persistent/etc/acl.xml
+++ b/app/code/Magento/Persistent/etc/acl.xml
@@ -8,10 +8,10 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Persistent::persistent" title="Persistent Shopping Cart" sortOrder="60" />
</resource>
</resource>
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Price.php b/app/code/Magento/ProductAlert/Controller/Add/Price.php
index ebb601f68bd9fb55effefedd570847d4f1ae4709..5a9fdd0e38d1d0d430f1b4511d5358bb21e8dbe6 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Price.php
@@ -12,7 +12,7 @@ use Magento\Framework\Exception\NoSuchEntityException;
class Price extends \Magento\ProductAlert\Controller\Add
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -22,13 +22,13 @@ class Price extends \Magento\ProductAlert\Controller\Add
/**
* @param Context $context
* @param \Magento\Customer\Model\Session $customerSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
*/
public function __construct(
Context $context,
\Magento\Customer\Model\Session $customerSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository
) {
parent::__construct($context, $customerSession);
@@ -81,7 +81,7 @@ class Price extends \Magento\ProductAlert\Controller\Add
)->setPrice(
$product->getFinalPrice()
)->setWebsiteId(
- $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
);
$model->save();
$this->messageManager->addSuccess(__('You saved the alert subscription.'));
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Stock.php b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
index 62bfac2e928457fc95d0461b611a4e0c1af69f51..3e47cd66b25274fa25037737b684d9f519298263 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
@@ -49,7 +49,7 @@ class Stock extends \Magento\ProductAlert\Controller\Add
)->setProductId(
$product->getId()
)->setWebsiteId(
- $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
);
$model->save();
$this->messageManager->addSuccess(__('Alert subscription has been saved.'));
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
index 338021740a7763fa732c5b1a548467bc52bedf2d..8d6b92fd56fc249150bc3121844e40d4278889f2 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
@@ -52,7 +52,7 @@ class Price extends \Magento\ProductAlert\Controller\Unsubscribe
)->setProductId(
$product->getId()
)->setWebsiteId(
- $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
)->loadByParam();
if ($model->getId()) {
$model->delete();
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
index 5cf0a186da5f17ef9fdc281b845b93a715031825..aacabec010c730287e8263e2cc45ab7cfc7ad840 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
@@ -18,7 +18,7 @@ class PriceAll extends \Magento\ProductAlert\Controller\Unsubscribe
'Magento\ProductAlert\Model\Price'
)->deleteCustomer(
$this->_customerSession->getCustomerId(),
- $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
);
$this->messageManager->addSuccess(__('You will no longer receive price alerts for this product.'));
} catch (\Exception $e) {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
index 65e8695bb3f82a1dcdd5933646b7318c398bbc59..2d29c9993fc182aba8318c432ca93a02ff089cb1 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
@@ -52,7 +52,7 @@ class Stock extends \Magento\ProductAlert\Controller\Unsubscribe
)->setProductId(
$product->getId()
)->setWebsiteId(
- $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
)->loadByParam();
if ($model->getId()) {
$model->delete();
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
index 8688ccf6980550d784b0fa93c046bc13f89ee294..3d9b989cdbb8c9b388469ab83629cac2b7b378c0 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
@@ -18,7 +18,7 @@ class StockAll extends \Magento\ProductAlert\Controller\Unsubscribe
'Magento\ProductAlert\Model\Stock'
)->deleteCustomer(
$this->_customerSession->getCustomerId(),
- $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+ $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
);
$this->messageManager->addSuccess(__('You will no longer receive stock alerts.'));
} catch (\Exception $e) {
diff --git a/app/code/Magento/ProductAlert/Helper/Data.php b/app/code/Magento/ProductAlert/Helper/Data.php
index d2cac1b0b48ca16edf01fb7ed4d556ab8f851359..4ffb1cae8b9eac2b2a47da789fb3c634d0183b84 100644
--- a/app/code/Magento/ProductAlert/Helper/Data.php
+++ b/app/code/Magento/ProductAlert/Helper/Data.php
@@ -42,14 +42,14 @@ class Data extends \Magento\Core\Helper\Url
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Registry $coreRegistry,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -137,7 +137,7 @@ class Data extends \Magento\Core\Helper\Url
{
return $this->_scopeConfig->isSetFlag(
\Magento\ProductAlert\Model\Observer::XML_PATH_STOCK_ALLOW,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -150,7 +150,7 @@ class Data extends \Magento\Core\Helper\Url
{
return $this->_scopeConfig->isSetFlag(
\Magento\ProductAlert\Model\Observer::XML_PATH_PRICE_ALLOW,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index 3f75ca489f9354ec76671a4285b4d7494e9bf402..395d2d9bef1416d60602e56d3dce9b3d8fdf1ea9 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -83,7 +83,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -112,7 +112,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Registry $registry
* @param \Magento\ProductAlert\Helper\Data $productAlertData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @param \Magento\Customer\Helper\View $customerHelper
* @param \Magento\Store\Model\App\Emulation $appEmulation
@@ -127,7 +127,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
\Magento\Framework\Registry $registry,
\Magento\ProductAlert\Helper\Data $productAlertData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
\Magento\Customer\Helper\View $customerHelper,
\Magento\Store\Model\App\Emulation $appEmulation,
@@ -313,14 +313,14 @@ class Email extends \Magento\Framework\Model\AbstractModel
if ($this->_type == 'price' && !$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_PRICE_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
)
) {
return false;
} elseif ($this->_type == 'stock' && !$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_STOCK_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
)
) {
@@ -342,7 +342,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
$block = $this->_getPriceBlock();
$templateId = $this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_PRICE_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
} else {
@@ -354,7 +354,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
$block = $this->_getStockBlock();
$templateId = $this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_STOCK_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
}
@@ -377,7 +377,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_EMAIL_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
)
)->addTo(
diff --git a/app/code/Magento/ProductAlert/Model/Observer.php b/app/code/Magento/ProductAlert/Model/Observer.php
index 5d2211ae48d6fb202b0b0bed801c6985ea7f6b7c..3a601e4518b66c4723ce26606c6c0c5b7be12313 100644
--- a/app/code/Magento/ProductAlert/Model/Observer.php
+++ b/app/code/Magento/ProductAlert/Model/Observer.php
@@ -69,7 +69,7 @@ class Observer
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -116,7 +116,7 @@ class Observer
/**
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\ProductAlert\Model\Resource\Price\CollectionFactory $priceColFactory
* @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
@@ -130,7 +130,7 @@ class Observer
public function __construct(
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ProductAlert\Model\Resource\Price\CollectionFactory $priceColFactory,
\Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -189,7 +189,7 @@ class Observer
}
if (!$this->_scopeConfig->getValue(
self::XML_PATH_PRICE_ALLOW,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$website->getDefaultGroup()->getDefaultStore()->getId()
)
) {
@@ -277,7 +277,7 @@ class Observer
}
if (!$this->_scopeConfig->getValue(
self::XML_PATH_STOCK_ALLOW,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$website->getDefaultGroup()->getDefaultStore()->getId()
)
) {
@@ -356,7 +356,7 @@ class Observer
if (count($this->_errors)) {
if (!$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return $this;
@@ -367,7 +367,7 @@ class Observer
$transport = $this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -379,12 +379,12 @@ class Observer
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_RECIPIENT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->getTransport();
diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json
index aa17fec0b241764248245ab6df46be5a119adb03..f8f4b9d468be20f21d84d72ce63593b0e4117152 100644
--- a/app/code/Magento/ProductAlert/composer.json
+++ b/app/code/Magento/ProductAlert/composer.json
@@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php b/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
index 5d787e42968859807c508b4c540df518215ba76b..6a41f4a20ab267a29788320f4a600e5b56d2f435 100644
--- a/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
+++ b/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
@@ -22,11 +22,11 @@ class ShippingMethodConverter
* Constructs a shipping method builder object.
*
* @param \Magento\Quote\Api\Data\ShippingMethodDataBuilder $builder Shipping method builder.
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager Store manager interface.
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager Store manager interface.
*/
public function __construct(
\Magento\Quote\Api\Data\ShippingMethodDataBuilder $builder,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->builder = $builder;
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php b/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php
index e93079c972b78ba8b09cb5b6d1dd8bb75a1e0b0f..f5221834db63d89e126d5015afac357c7035eb78 100644
--- a/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php
+++ b/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Quote\Model\Observer\Backend;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Model\Config\Share as ShareConfig;
use Magento\Quote\Model\QuoteRepository;
use Magento\Framework\Event\Observer;
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index b717b12f5dfa711c9c18e1576be465ea5d9ea50b..b7d93ae762c1e03dd0e4340a9e297ed751d1e36c 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -203,7 +203,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -343,7 +343,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
* @param QuoteValidator $quoteValidator
* @param \Magento\Catalog\Helper\Product $catalogProduct
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param Quote\AddressFactory $quoteAddressFactory
* @param \Magento\Customer\Model\CustomerFactory $customerFactory
@@ -381,7 +381,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
\Magento\Quote\Model\QuoteValidator $quoteValidator,
\Magento\Catalog\Helper\Product $catalogProduct,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory,
\Magento\Customer\Model\CustomerFactory $customerFactory,
@@ -2168,7 +2168,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
$storeId = $this->getStoreId();
$minOrderActive = $this->_scopeConfig->isSetFlag(
'sales/minimum_order/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
if (!$minOrderActive) {
@@ -2176,17 +2176,17 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
}
$minOrderMulti = $this->_scopeConfig->isSetFlag(
'sales/minimum_order/multi_address',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$minAmount = $this->_scopeConfig->getValue(
'sales/minimum_order/amount',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$taxInclude = $this->_scopeConfig->getValue(
'sales/minimum_order/tax_including',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 4691bfbea93a528a9d40216823cfa657249ea089..4d0b03bfb41d225af17ba58fb8a86f6a567f2450 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1139,7 +1139,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
$storeId = $this->getQuote()->getStoreId();
$validateEnabled = $this->_scopeConfig->isSetFlag(
'sales/minimum_order/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
if (!$validateEnabled) {
@@ -1152,12 +1152,12 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
$amount = $this->_scopeConfig->getValue(
'sales/minimum_order/amount',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$taxInclude = $this->_scopeConfig->getValue(
'sales/minimum_order/tax_including',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$taxes = $taxInclude ? $this->getBaseTaxAmount() : 0;
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
index 8399e7e95151f19f4d807208fd39565b21bf0438..bc19616dd902fc7882111f38db335d6daddb5377 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
@@ -68,7 +68,7 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Sales\Model\Config $salesConfig
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Quote\Model\Quote\Address\TotalFactory $totalFactory
* @param mixed $sourceData
* @param mixed $store
@@ -78,7 +78,7 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
\Psr\Log\LoggerInterface $logger,
\Magento\Sales\Model\Config $salesConfig,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Quote\Model\Quote\Address\TotalFactory $totalFactory,
$sourceData = null,
$store = null
@@ -147,7 +147,7 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
{
$sorts = $this->_scopeConfig->getValue(
self::XML_PATH_SALES_TOTALS_SORT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->_store
);
foreach ($sorts as $code => $sortOrder) {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php
index 6d4216c30b9ade0876fedb012078af689c67d4c7..aa50ef3fbe82259882832ba86d04269c49ebdd72 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php
@@ -15,17 +15,17 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
protected $_eventManager = null;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_eventManager = $eventManager;
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
index 50627185999fdf43dca48fda3b112f9b858c0d59..2ec8148ba2bd1d0d04d8cc30553779c38458ec19 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
@@ -188,7 +188,7 @@ class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
/**
* Get Shipping label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
index 50cd9fc25275c009f9dd205e110ee1e4745a5383..447ab43fa78b836f47ea60c5fbe329068bec864d 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
@@ -177,7 +177,7 @@ class Subtotal extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
/**
* Get Subtotal label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php
index 4fb37eff461a3b6eff6439731ec05ce37334cea0..d2ed16c319f8f96ae39edcf8ff44ac7216e5e800 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php
@@ -177,7 +177,7 @@ class Tax extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
$shippingTaxClass = $this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Processor.php b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
index 8c7a3205db46d012c4d5bb040707a6c96e51c724..3e62bc5cc8c499376c94d4089c5d61a51304508b 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Processor.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
@@ -8,7 +8,7 @@ namespace Magento\Quote\Model\Quote\Item;
use \Magento\Catalog\Model\Product;
use Magento\Quote\Model\Quote\ItemFactory;
use Magento\Quote\Model\Quote\Item;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\App\State;
use Magento\Framework\Object;
@@ -25,7 +25,7 @@ class Processor
protected $quoteItemFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -36,7 +36,7 @@ class Processor
/**
* @param ItemFactory $quoteItemFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param State $appState
*/
public function __construct(
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index 97a25fe47a8cf2b1000ce2ef5e7bdf54a119bdb7..82c02292af678aa8d41d0fbd0df22a9e32452458 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -7,7 +7,7 @@ namespace Magento\Quote\Model;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Quote\Model\Quote;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\Api\SearchCriteria;
use Magento\Framework\Api\Search\FilterGroup;
use Magento\Quote\Model\Resource\Quote\Collection as QuoteCollection;
@@ -31,7 +31,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
protected $quoteFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var StoreManagerInterface
*/
protected $storeManager;
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index d2e35edb8a77c9934ada9761667e620b61e478b5..cb2daccb078ac910ebb6baf0509933a18048d7b6 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -1,34 +1,34 @@
{
- "name": "magento/module-quote",
- "description": "N/A",
- "require": {
- "php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-authorization": "0.42.0-beta6",
- "magento/module-payment": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/magento-composer-installer": "*"
- },
- "type": "magento2-module",
- "version": "0.42.0-beta6",
- "license": [
- "OSL-3.0",
- "AFL-3.0"
- ],
- "extra": {
- "map": [
- [
- "*",
- "Magento/Quote"
- ]
- ]
- }
+ "name": "magento/module-quote",
+ "description": "N/A",
+ "require": {
+ "php": "~5.5.0|~5.6.0",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-authorization": "0.42.0-beta7",
+ "magento/module-payment": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/magento-composer-installer": "*"
+ },
+ "type": "magento2-module",
+ "version": "0.42.0-beta7",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "extra": {
+ "map": [
+ [
+ "*",
+ "Magento/Quote"
+ ]
+ ]
+ }
}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
index 523db6f6008be4faed428c539f0fdc88d11ca750..4aabda290f681d4879d1cef1eb52a7da798ea90d 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
@@ -16,7 +16,7 @@ class Customer extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
* Renders grid column
*
* @param \Magento\Framework\Object $row
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function render(\Magento\Framework\Object $row)
{
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
index 0bf95fefe265a84dd124a86b7bd2afb7578817c4..bc16b2edc87bf281f679d782678ce6ff53a8dc13 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
@@ -16,7 +16,7 @@ class Purchases extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstr
* Renders Purchases value
*
* @param \Magento\Framework\Object $row
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function render(\Magento\Framework\Object $row)
{
diff --git a/app/code/Magento/Reports/Block/Product/Compared.php b/app/code/Magento/Reports/Block/Product/Compared.php
index c25678aa360d71113c5fa3f1e2906773d24840f9..6693d0053ea87edac053ff4e54bb3ada3de04152 100644
--- a/app/code/Magento/Reports/Block/Product/Compared.php
+++ b/app/code/Magento/Reports/Block/Product/Compared.php
@@ -34,7 +34,7 @@ class Compared extends \Magento\Reports\Block\Product\AbstractProduct
if ($this->hasData('page_size')) {
return $this->getData('page_size');
}
- return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_COMPARED_COUNT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_COMPARED_COUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Reports/Block/Product/Viewed.php b/app/code/Magento/Reports/Block/Product/Viewed.php
index e3b5460eb79e96a5d161095a481efd3740e31f0b..addfa8cafd53a941194c033bbcdc9f9978b393e0 100644
--- a/app/code/Magento/Reports/Block/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Product/Viewed.php
@@ -34,7 +34,7 @@ class Viewed extends \Magento\Reports\Block\Product\AbstractProduct implements \
if ($this->hasData('page_size')) {
return $this->getData('page_size');
}
- return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_VIEWED_COUNT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_VIEWED_COUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
index 461068befbef7756e32e442466aa6713a6115b7f..ff2f27decbf31d9e25c4256b98e02e9c946d8d20 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
@@ -28,15 +28,33 @@ class Statistics extends \Magento\Backend\App\Action
*/
protected $_dateFilter;
+ /**
+ * Codes for Refresh Statistics
+ *
+ * @var []
+ */
+ protected $reportTypes;
+
+ /**
+ * @var \Magento\Backend\Model\View\Result\RedirectFactory
+ */
+ protected $resultRedirectFactory;
+
/**
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+ * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+ * @param [] $reportTypes
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
- \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+ \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
+ \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+ array $reportTypes
) {
$this->_dateFilter = $dateFilter;
+ $this->reportTypes = $reportTypes;
+ $this->resultRedirectFactory = $resultRedirectFactory;
parent::__construct($context);
}
@@ -72,19 +90,9 @@ class Statistics extends \Magento\Backend\App\Action
$codes = explode(',', $codes);
}
- $aliases = [
- 'sales' => 'Magento\Sales\Model\Resource\Report\Order',
- 'tax' => 'Magento\Tax\Model\Resource\Report\Tax',
- 'shipping' => 'Magento\Sales\Model\Resource\Report\Shipping',
- 'invoiced' => 'Magento\Sales\Model\Resource\Report\Invoiced',
- 'refunded' => 'Magento\Sales\Model\Resource\Report\Refunded',
- 'coupons' => 'Magento\SalesRule\Model\Resource\Report\Rule',
- 'bestsellers' => 'Magento\Sales\Model\Resource\Report\Bestsellers',
- 'viewed' => 'Magento\Reports\Model\Resource\Report\Product\Viewed',
- ];
$out = [];
foreach ($codes as $code) {
- $out[] = $aliases[$code];
+ $out[] = $this->reportTypes[$code];
}
return $out;
}
diff --git a/app/code/Magento/Reports/Model/Config.php b/app/code/Magento/Reports/Model/Config.php
index 5d82666c16b2eaf65a7301458005da8e64514954..12fa3befcf7a0a53fc93c5cd2667a52a2758e872 100644
--- a/app/code/Magento/Reports/Model/Config.php
+++ b/app/code/Magento/Reports/Model/Config.php
@@ -16,18 +16,18 @@ class Config extends \Magento\Framework\Object
protected $_moduleReader;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Module\Dir\Reader $moduleReader
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
*/
public function __construct(
\Magento\Framework\Module\Dir\Reader $moduleReader,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
array $data = []
) {
parent::__construct($data);
diff --git a/app/code/Magento/Reports/Model/Event/Observer.php b/app/code/Magento/Reports/Model/Event/Observer.php
index 89ffef07ff9d3086373ef45d1d76decae7d9d6da..0283cf6e15df5dcca6fabe573da3882bd2ce61e1 100644
--- a/app/code/Magento/Reports/Model/Event/Observer.php
+++ b/app/code/Magento/Reports/Model/Event/Observer.php
@@ -11,7 +11,7 @@ namespace Magento\Reports\Model\Event;
class Observer
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -41,7 +41,7 @@ class Observer
protected $_customerVisitor;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Reports\Model\EventFactory $event
* @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
* @param \Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory
@@ -49,7 +49,7 @@ class Observer
* @param \Magento\Customer\Model\Visitor $customerVisitor
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Reports\Model\EventFactory $event,
\Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
\Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory,
diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
index 59250994238a5020fe6acb7e86945dd5ca7ddd05..4d3ca4716833f3ba99cd5dae823c9085e92880c6 100644
--- a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
+++ b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
@@ -18,7 +18,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
protected $_countCacheKey;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -50,7 +50,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Session\Generic $reportSession
@@ -64,7 +64,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Visitor $customerVisitor,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\Session\Generic $reportSession,
diff --git a/app/code/Magento/Reports/Model/Product/Index/Compared.php b/app/code/Magento/Reports/Model/Product/Index/Compared.php
index 1d8a7b4fd0df622484df085c9c6e4073a564ad6a..2bf6917f348786a75cce710579f3fa04b588278e 100644
--- a/app/code/Magento/Reports/Model/Product/Index/Compared.php
+++ b/app/code/Magento/Reports/Model/Product/Index/Compared.php
@@ -39,7 +39,7 @@ class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Visitor $customerVisitor
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Framework\Session\Generic $reportSession
@@ -54,7 +54,7 @@ class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Visitor $customerVisitor,
\Magento\Customer\Model\Session $customerSession,
\Magento\Framework\Session\Generic $reportSession,
diff --git a/app/code/Magento/Reports/Model/Resource/Event.php b/app/code/Magento/Reports/Model/Resource/Event.php
index 0897d524090db370b95f4223d5fade31766a4f22..313876eb8d89a67752d069a4bc37281806c475c3 100644
--- a/app/code/Magento/Reports/Model/Resource/Event.php
+++ b/app/code/Magento/Reports/Model/Resource/Event.php
@@ -18,19 +18,19 @@ class Event extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
parent::__construct($resource);
$this->_scopeConfig = $scopeConfig;
@@ -140,7 +140,7 @@ class Event extends \Magento\Framework\Model\Resource\Db\AbstractDb
// get all stores, required by configuration in current store scope
$productsScope = $this->_scopeConfig->getValue(
'catalog/recently_products/scope',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
switch ($productsScope) {
case 'website':
diff --git a/app/code/Magento/Reports/Model/Resource/Order/Collection.php b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
index d767bb8d539e7e02e56d7ecf99adc7968c8f2de6..107112fb91026b8dc1c63d403962e4fccb629b47 100644
--- a/app/code/Magento/Reports/Model/Resource/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
@@ -40,7 +40,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -66,7 +66,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\DB\Helper $coreResourceHelper
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Sales\Model\Order\Config $orderConfig
* @param \Magento\Sales\Model\Resource\Report\OrderFactory $reportOrderFactory
@@ -82,7 +82,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\DB\Helper $coreResourceHelper,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Sales\Model\Order\Config $orderConfig,
\Magento\Sales\Model\Resource\Report\OrderFactory $reportOrderFactory,
@@ -116,7 +116,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
{
$this->_isLive = (bool)(!$this->_scopeConfig->getValue(
'sales/dashboard/use_aggregated_data',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
));
return $this;
}
@@ -424,7 +424,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
$dateStart->setDay(
$this->_scopeConfig->getValue(
'reports/dashboard/mtd_start',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
break;
@@ -440,7 +440,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
',',
$this->_scopeConfig->getValue(
'reports/dashboard/ytd_start',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$startMonth = isset($startMonthDay[0]) ? (int)$startMonthDay[0] : 1;
@@ -591,7 +591,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
if ($this->_scopeConfig->getValue(
'sales/dashboard/use_aggregated_data',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
$this->setMainTable('sales_order_aggregated_created');
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
index 32865c968cf4df3c82872c7849799d38c86610cc..37336a9287103d4d84f83c6cb2975ea564b3bf84 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
@@ -66,7 +66,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -93,7 +93,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
index 318f7d88f3a244ce466cd5f167cfe87fca0c69bd..b172b4e053c274e51f42417e56f381343b2abb9d 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
@@ -38,7 +38,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\Resource\Produc
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -63,7 +63,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\Resource\Produc
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
index 4e904c051ca83228dac0f52a2ad949a37f1af568..d0085c397c382abaeb89a38e5d59113c439d9d0f 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
@@ -55,7 +55,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -85,7 +85,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php b/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
index 5a2993bcb919e5ba88aa12b5c448be10be1d0dc0..c65cfead0e20ec5e8eda69018b9a827201d82fb7 100644
--- a/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
@@ -25,7 +25,7 @@ class Collection extends \Magento\Review\Model\Resource\Review\Collection
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Review\Helper\Data $reviewData
* @param \Magento\Review\Model\Rating\Option\VoteFactory $voteFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Resource\Customer $customerResource
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
@@ -38,7 +38,7 @@ class Collection extends \Magento\Review\Model\Resource\Review\Collection
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Review\Helper\Data $reviewData,
\Magento\Review\Model\Rating\Option\VoteFactory $voteFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Resource\Customer $customerResource,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index 36db3840956b345199611f5e0c1a00569d82fb2c..a3e4e8f9881ce73d18e5ef03fa4f44e363ede4ad 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -3,28 +3,28 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-cms": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-widget": "0.42.0-beta6",
- "magento/module-log": "0.42.0-beta6",
- "magento/module-wishlist": "0.42.0-beta6",
- "magento/module-review": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-downloadable": "0.42.0-beta6",
- "magento/module-sales-rule": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-widget": "0.42.0-beta7",
+ "magento/module-log": "0.42.0-beta7",
+ "magento/module-wishlist": "0.42.0-beta7",
+ "magento/module-review": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-downloadable": "0.42.0-beta7",
+ "magento/module-sales-rule": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Reports/etc/acl.xml b/app/code/Magento/Reports/etc/acl.xml
index 04576d0b1cea0514487434e50f6ab8128a081718..8d159bc4ea74e371376e4a2457adb49128b14d40 100644
--- a/app/code/Magento/Reports/etc/acl.xml
+++ b/app/code/Magento/Reports/etc/acl.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_Reports::report" title="Reports" sortOrder="70">
<resource id="Magento_Reports::report_marketing" title="Marketing" sortOrder="10">
<resource id="Magento_Reports::shopcart" title="Shopping Cart" sortOrder="10">
@@ -45,9 +45,9 @@
<resource id="Magento_Reports::statistics_refresh" title="Refresh statistics" sortOrder="10"/>
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Reports::reports" title="Reports" sortOrder="70" />
</resource>
</resource>
diff --git a/app/code/Magento/Reports/etc/adminhtml/di.xml b/app/code/Magento/Reports/etc/adminhtml/di.xml
index 6bf81b306e16cf77fa62b01a9e1a73ae42ea4214..501cf4af2be2841f221c9cd7cb238c8326ed296c 100644
--- a/app/code/Magento/Reports/etc/adminhtml/di.xml
+++ b/app/code/Magento/Reports/etc/adminhtml/di.xml
@@ -11,4 +11,18 @@
<argument name="modelName" xsi:type="string">Magento\Customer\Model\Backend\Customer</argument>
</arguments>
</type>
+ <type name="Magento\Reports\Controller\Adminhtml\Report\Statistics">
+ <arguments>
+ <argument name="reportTypes" xsi:type="array">
+ <item name="sales" xsi:type="string">Magento\Sales\Model\Resource\Report\Order</item>
+ <item name="tax" xsi:type="string">Magento\Tax\Model\Resource\Report\Tax</item>
+ <item name="shipping" xsi:type="string">Magento\Sales\Model\Resource\Report\Shipping</item>
+ <item name="invoiced" xsi:type="string">Magento\Sales\Model\Resource\Report\Invoiced</item>
+ <item name="refunded" xsi:type="string">Magento\Sales\Model\Resource\Report\Refunded</item>
+ <item name="coupons" xsi:type="string">Magento\SalesRule\Model\Resource\Report\Rule</item>
+ <item name="bestsellers" xsi:type="string">Magento\Sales\Model\Resource\Report\Bestsellers</item>
+ <item name="viewed" xsi:type="string">Magento\Reports\Model\Resource\Report\Product\Viewed</item>
+ </argument>
+ </arguments>
+ </type>
</config>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index a9d38a3c202498b1ed60df4e13ec30bb23f7badd..abc4d3181918b11729ee10eb40e234221757a8ec 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -94,7 +94,7 @@ require([
</div>
</div>
<?php if ($block->canDisplayContainer()): ?>
- <script type="text/javascript">
+ <script>
require([
"jquery",
"validation",
diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json
index 6774dd61d0139795cfd8f6156a9b137f329b8000..e1d0315c4a24600205c22c556b71706d915c68e3 100644
--- a/app/code/Magento/RequireJs/composer.json
+++ b/app/code/Magento/RequireJs/composer.json
@@ -3,11 +3,11 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/framework": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
index d2eae2be459bfea0a49a03f171c17c8f40c6bda1..921dc41c0720a3c2389c16c2dcdd78855f0681c6 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -123,7 +123,7 @@ class Add extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get add new review header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index 90b62eca191fc8c1880b27e958fb10ba4f9fc2a2..6f2e129b0b6269ae75f59a539274e3774d28e194 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -211,7 +211,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get edit review header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
index ed58843a1aef8193177f507ecddf9752cf19cdcb..9f0f240b0ece9f6c66aa72f05ac4593c22b8b98d 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
@@ -16,7 +16,7 @@ class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
* Render review type
*
* @param \Magento\Framework\Object $row
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function render(\Magento\Framework\Object $row)
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php
index 53f6266f21eee4b07b5c8a722bd0057ee129ffa9..76b0b4c8d3ff2556b4443f6033b0d65a4522fb99 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php
@@ -67,7 +67,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php b/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php
index e346487443554935dfa13f09682cc69c302cf638..19a1f39858924f631782b3012111458f7b39b214 100644
--- a/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php
+++ b/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php
@@ -53,7 +53,7 @@ class ReviewTab extends TabWrapper
/**
* Return Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss.php b/app/code/Magento/Review/Block/Adminhtml/Rss.php
index b8ab6c14ed6bcfa88ebff3ad11a95fa3c841d875..42f9ef5583d60292d488c3cb571d2adc8025ce2a 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rss.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rss.php
@@ -14,7 +14,7 @@ use Magento\Framework\App\Rss\DataProviderInterface;
class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -25,13 +25,13 @@ class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderIn
/**
* @param \Magento\Backend\Block\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\Rss $rssModel
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Review\Model\Rss $rssModel,
array $data = []
) {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
index 793875f2625e6aca8aa3aca219ac8ca521d784a9..ff35713def431f606c2fa644e4d7a3d428ef81b1 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
@@ -53,7 +53,7 @@ class Link extends \Magento\Framework\View\Element\Template
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
diff --git a/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php b/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
index f7eb4d62393735354e74043aff0d64ab26c74790..a473acf9c59906504cdc3a35d0faf243d3be7be7 100644
--- a/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
+++ b/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
@@ -18,16 +18,16 @@ class Review
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\ReviewFactory $reviewFactory
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Review\Model\ReviewFactory $reviewFactory
) {
$this->storeManager = $storeManager;
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
index 70af771ccc330f6a1ac376523e6a58eba5ddef50..e5d81e63f77295b2dd6d2e1c28b55d81b770007d 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
@@ -16,8 +16,8 @@ class Post extends \Magento\Review\Controller\Adminhtml\Product
$productId = $this->getRequest()->getParam('product_id', false);
if ($data = $this->getRequest()->getPost()) {
- /** @var \Magento\Framework\Store\StoreManagerInterface $storeManagerInterface */
- $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+ /** @var \Magento\Store\Model\StoreManagerInterface $storeManagerInterface */
+ $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
if ($storeManager->hasSingleStore()) {
$data['stores'] = [
$storeManager->getStore(true)->getId(),
diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php
index 41ef48198fa57e679e434134ef246a3b9c2d2ae7..b44a29ec6c42fe188ee2cbd65ec391a4dc15fee9 100644
--- a/app/code/Magento/Review/Controller/Product.php
+++ b/app/code/Magento/Review/Controller/Product.php
@@ -84,7 +84,7 @@ class Product extends \Magento\Framework\App\Action\Action
/**
* Core model store manager interface
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -106,7 +106,7 @@ class Product extends \Magento\Framework\App\Action\Action
* @param \Magento\Review\Model\RatingFactory $ratingFactory
* @param \Magento\Catalog\Model\Design $catalogDesign
* @param \Magento\Framework\Session\Generic $reviewSession
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -121,7 +121,7 @@ class Product extends \Magento\Framework\App\Action\Action
\Magento\Review\Model\RatingFactory $ratingFactory,
\Magento\Catalog\Model\Design $catalogDesign,
\Magento\Framework\Session\Generic $reviewSession,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Review/Helper/Data.php b/app/code/Magento/Review/Helper/Data.php
index ed72aea2966b2cf5425f61a32515b1d907eeb3ff..a514519405b270e5de710f611917be9dc4f179f7 100644
--- a/app/code/Magento/Review/Helper/Data.php
+++ b/app/code/Magento/Review/Helper/Data.php
@@ -84,7 +84,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getIsGuestAllowToWrite()
{
- return $this->_scopeConfig->isSetFlag(self::XML_REVIEW_GUETS_ALLOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->isSetFlag(self::XML_REVIEW_GUETS_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Review/Model/Resource/Rating.php b/app/code/Magento/Review/Model/Resource/Rating.php
index 6d067d4167ddc08672f9d15576ed145a4da7244f..1d203bebe666b3a6377ad0b5cba2d84770047f4b 100644
--- a/app/code/Magento/Review/Model/Resource/Rating.php
+++ b/app/code/Magento/Review/Model/Resource/Rating.php
@@ -17,7 +17,7 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -35,14 +35,14 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Framework\App\Resource $resource
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Module\Manager $moduleManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\Resource\Review\Summary $reviewSummary
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Module\Manager $moduleManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Review\Model\Resource\Review\Summary $reviewSummary
) {
$this->moduleManager = $moduleManager;
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Collection.php
index bdb6821cc6c0bfaa88a8e128bf194a87f51ac6a2..f46f7b3dfbeb14ad591dd608fbe903f1d901ef22 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Collection.php
@@ -13,7 +13,7 @@ namespace Magento\Review\Model\Resource\Rating;
class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -33,7 +33,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
@@ -43,7 +43,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
index 993e7307d4d70af997d28c0f2d0aee6542b5b8fe..a13591bfc54eb7fa6ac8fe7d14252bb34f6219b8 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
@@ -24,7 +24,7 @@ class Collection extends \Magento\Review\Model\Resource\Rating\Collection
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF
* @param \Magento\Framework\Registry $coreRegistry
* @param mixed $connection
@@ -35,7 +35,7 @@ class Collection extends \Magento\Review\Model\Resource\Rating\Collection
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF,
\Magento\Framework\Registry $coreRegistry,
$connection = null,
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
index d2db4048b8d1ffd4753a15a66c9f9dd38bdc4b78..6a0b67dc11e90e028db81a5483e1ca86f38a2171 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
@@ -15,7 +15,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store list manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -29,7 +29,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
@@ -39,7 +39,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Review/Model/Resource/Review.php b/app/code/Magento/Review/Model/Resource/Review.php
index 3060a7072f74762e32e77018f73265a757ddd846..c6383852b817b165c89b5cf7537a25f8cb9f8ba5 100644
--- a/app/code/Magento/Review/Model/Resource/Review.php
+++ b/app/code/Magento/Review/Model/Resource/Review.php
@@ -71,7 +71,7 @@ class Review extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Core model store manager interface
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -92,14 +92,14 @@ class Review extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Review\Model\RatingFactory $ratingFactory
* @param \Magento\Review\Model\Resource\Rating\Option $ratingOptions
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Review\Model\RatingFactory $ratingFactory,
Rating\Option $ratingOptions
) {
diff --git a/app/code/Magento/Review/Model/Resource/Review/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Collection.php
index 9fbdcecf2026c4ce050463e8f949e851fb6825de..7bd2de244b7adb3bdff739d5782cb681e832c41b 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Collection.php
@@ -70,7 +70,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Core model store manager interface
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -81,7 +81,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Review\Helper\Data $reviewData
* @param \Magento\Review\Model\Rating\Option\VoteFactory $voteFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -92,7 +92,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Review\Helper\Data $reviewData,
\Magento\Review\Model\Rating\Option\VoteFactory $voteFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
index 0c5d9e603fb94b781665859fbeda0aeedb961a44..7ecc591ef53b1b4b9dae80b3ec504e41b1c6f857 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
@@ -67,7 +67,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
* @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
* @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
* @param \Magento\Framework\Validator\UniversalFactory $universalFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Module\Manager $moduleManager
* @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -93,7 +93,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
\Magento\Eav\Model\EntityFactory $eavEntityFactory,
\Magento\Catalog\Model\Resource\Helper $resourceHelper,
\Magento\Framework\Validator\UniversalFactory $universalFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Module\Manager $moduleManager,
\Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Review/Model/Review.php b/app/code/Magento/Review/Model/Review.php
index e7658eb8a5a5b1654ef448783fc3ffa3c0d8d4f4..3660815cf0249498575242fc03feea81a36ef0a7 100644
--- a/app/code/Magento/Review/Model/Review.php
+++ b/app/code/Magento/Review/Model/Review.php
@@ -98,7 +98,7 @@ class Review extends \Magento\Framework\Model\AbstractModel
/**
* Core model store manager interface
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -117,7 +117,7 @@ class Review extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Review\Model\Resource\Review\Summary\CollectionFactory $summaryFactory
* @param \Magento\Review\Model\Review\SummaryFactory $summaryModFactory
* @param \Magento\Review\Model\Review\Summary $reviewSummary
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\UrlInterface $urlModel
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -132,7 +132,7 @@ class Review extends \Magento\Framework\Model\AbstractModel
\Magento\Review\Model\Resource\Review\Summary\CollectionFactory $summaryFactory,
\Magento\Review\Model\Review\SummaryFactory $summaryModFactory,
\Magento\Review\Model\Review\Summary $reviewSummary,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\UrlInterface $urlModel,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index 782205ca73b841a1ba87078befb3663dc4ef253d..e940ecb5c8ce7588136b2c152ba69651964c6934 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -3,23 +3,23 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-newsletter": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-ui": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-newsletter": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-ui": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"suggest": {
- "magento/module-cookie": "0.42.0-beta6"
+ "magento/module-cookie": "0.42.0-beta7"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Review/etc/acl.xml b/app/code/Magento/Review/etc/acl.xml
index c4ccbf934a13f8dea8ffa1b0484fff58682eb5e9..cee078f9e9bac481dc10ed1f5411b41f4326cd91 100644
--- a/app/code/Magento/Review/etc/acl.xml
+++ b/app/code/Magento/Review/etc/acl.xml
@@ -8,14 +8,14 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_attributes">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_attributes">
<resource id="Magento_Review::ratings" title="Ratings" sortOrder="60" />
</resource>
</resource>
- <resource id="Magento_Adminhtml::marketing">
- <resource id="Magento_Adminhtml::marketing_user_content">
+ <resource id="Magento_Backend::marketing">
+ <resource id="Magento_Backend::marketing_user_content">
<resource id="Magento_Review::reviews_all" title="Reviews" sortOrder="10"/>
</resource>
</resource>
diff --git a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
index d2a1572b1991952bffd92a476f382cf8a0430816..ee2379d4e143c63e6af028c9eb1ba2a5ee50db36 100644
--- a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
+++ b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
@@ -22,7 +22,7 @@ class Index extends \Magento\Rss\Controller\Adminhtml\Feed
*/
public function execute()
{
- if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+ if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
throw new NotFoundException();
}
diff --git a/app/code/Magento/Rss/Controller/Feed/Index.php b/app/code/Magento/Rss/Controller/Feed/Index.php
index 86bceaedc1b0369e0b2798dfb18bb34b06719d65..e6bba8d7424c4047ed7e2c9ac5da8d01f1f9566f 100644
--- a/app/code/Magento/Rss/Controller/Feed/Index.php
+++ b/app/code/Magento/Rss/Controller/Feed/Index.php
@@ -22,7 +22,7 @@ class Index extends \Magento\Rss\Controller\Feed
*/
public function execute()
{
- if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+ if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
throw new NotFoundException();
}
diff --git a/app/code/Magento/Rss/Controller/Index/Index.php b/app/code/Magento/Rss/Controller/Index/Index.php
index 1c38af252a541633e790636b67039dbb306602d2..4df5440a1700ae0753abe724763d0637d62041c8 100644
--- a/app/code/Magento/Rss/Controller/Index/Index.php
+++ b/app/code/Magento/Rss/Controller/Index/Index.php
@@ -18,7 +18,7 @@ class Index extends \Magento\Rss\Controller\Index
*/
public function execute()
{
- if ($this->_scopeConfig->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+ if ($this->_scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
$this->_view->loadLayout();
$this->_view->renderLayout();
} else {
diff --git a/app/code/Magento/Rss/Model/UrlBuilder.php b/app/code/Magento/Rss/Model/UrlBuilder.php
index 4d6174093a8cb3981eaecb7672ef46d78960638b..42c7aa502bde2babcd6dfc779e1cad6591d7c3d6 100644
--- a/app/code/Magento/Rss/Model/UrlBuilder.php
+++ b/app/code/Magento/Rss/Model/UrlBuilder.php
@@ -41,7 +41,7 @@ class UrlBuilder implements UrlBuilderInterface
*/
public function getUrl(array $queryParams = [])
{
- if (!$this->config->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+ if (!$this->config->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
return '';
}
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index f65bda76495e4692c5d706d7bcd0fda0f0a61975..23eca1b0bbc847de1becffbb4bb7de41468c5b08 100644
--- a/app/code/Magento/Rss/composer.json
+++ b/app/code/Magento/Rss/composer.json
@@ -3,13 +3,14 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Rss/etc/acl.xml b/app/code/Magento/Rss/etc/acl.xml
index f95f1a905057fd88136e11c16807327138d24d64..db722e153bb2e94b8b9f73de0afa73c78737b5cd 100644
--- a/app/code/Magento/Rss/etc/acl.xml
+++ b/app/code/Magento/Rss/etc/acl.xml
@@ -8,10 +8,10 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Rss::rss" title="RSS Feeds Section" sortOrder="135" />
</resource>
</resource>
diff --git a/app/code/Magento/Rss/etc/adminhtml/routes.xml b/app/code/Magento/Rss/etc/adminhtml/routes.xml
index 3e3eec5048e4d6e2125c4af86c6770b1a9fb707e..ccb2f2ebc18e03f8f623d9eb1fda5b889d4cbe4c 100644
--- a/app/code/Magento/Rss/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Rss/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="rss" frontName="rss">
- <module name="Magento_Rss" before="Magento_Adminhtml" />
+ <module name="Magento_Rss" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json
index f0248707f84c36619660766cbbc92936e9a11977..c0a8e4f04437f0392ec0b9939484bcdd3fd2b1ca 100644
--- a/app/code/Magento/Rule/composer.json
+++ b/app/code/Magento/Rule/composer.json
@@ -3,16 +3,16 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"lib-libxml": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php b/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php
index 55572c8ac896ae3ec4e7dc9dad39ec4c4f2c1dc0..622a547e3d8254c50b9f39527b75eea46534eda6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php
@@ -53,7 +53,7 @@ class CustomerOrdersTab extends TabWrapper
/**
* Return Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
index bb857a0b812a2e413c7be734f26fea2ad7de70c1..a3be8dcd152f6886e55689e92a91bf61c94bf5b8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
@@ -49,7 +49,7 @@ class Address extends \Magento\Backend\Block\Widget\Form\Container
/**
* Retrieve text for header element depending on loaded page
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index c2b04646e891dc815a62624b3819162dd7944be7..ca5f98286d6b92d9e8053b8006c58032c1598f77 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -119,7 +119,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
/**
* Form header text getter
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
index a72cf38445f4ccf07f6332b5d5509403676942ca..0ed970dd74cd420367a38ed6f2bd8e891f14cb72 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
@@ -16,7 +16,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
/**
* Return header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
index b638bdfff23b463a4dc4e624776d6e5b957f19b0..31bbb781d6a987450fd686fdb9ed9b9c2c8a93c7 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
@@ -26,7 +26,7 @@ class Method extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
index 854cc5e519b4010f06b82683fccb63155971ae6d..729ad53647ed2f10cabf136789892b7bc281a0a5 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
@@ -32,7 +32,7 @@ class Comment extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
index a22f8aee07f2caf4ca96e6970983025c1a6f5e24..2a2b62e896d85462f504a3bff4838af8b606e96d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
@@ -36,7 +36,7 @@ class Coupons extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
index fbfe0c0fca60d5929fc3a28ec07b355a91af6b34..15f41844176a89290459fb4f018af7e314056a49 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
@@ -26,7 +26,7 @@ class Customer extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreat
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index 08137358bf707fcf9fd251f21c9d2c9e0dd1f152..480d8900659d6015578bd0e70bc597adc32d01da 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -90,7 +90,7 @@ class Account extends AbstractForm
/**
* Return header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index 1b0d6bbc4fe6d1487cb81a10599c7467635e7943..b139f0314352608c075dbf379ffcea3215aa345d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -144,7 +144,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\AbstractF
*/
public function getConfig($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
index 0dcf68c9a64370d39759b513fe66d85ac044bb6b..295226fcf0a186f3bd936e915bd63b29e90d1cce 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
@@ -35,7 +35,7 @@ class Items extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
/**
* Accordion header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
index 6d53e62c71ab36b157551a929ffe97997acf6228..9feb4b05070fac34847483a29932b4c70c118cc9 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
@@ -342,7 +342,7 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
* Get qty title
*
* @param Item $item
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getQtyTitle($item)
{
@@ -502,7 +502,7 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
/**
* Get including/excluding tax message
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getInclExclTaxMessage()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
index fecb73b90642bb53c2a1853d9ff7ad681df24bea..add96720785beadd4ef2868f7c901554265eb2aa 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
@@ -26,7 +26,7 @@ class Newsletter extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCre
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
index 7721c66f8938e8fc069c7cee0c09459bef2de029..cf3225dcb8eecc9188c12d16b3836de166b2dad3 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
@@ -26,7 +26,7 @@ class Search extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
index e6c03f666a8e8f05024e0d4b7ccc4c3405c189e4..01084b387a68047eda53a42be22bed1e44846984 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
@@ -16,7 +16,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
/**
* Return header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
index 347885d75331d60116a217aa021e5e197f53237b..569ef920e8ab121e422aa71b9fb5c08578877c7b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
@@ -26,7 +26,7 @@ class Method extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
index b3a7c1a15355bae744235360ddfa71662d847542..8d448af893d0e7a5569a46127c4009429b423cc4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
@@ -97,7 +97,7 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
{
if ($name = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()->getId()
)
) {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
index c943808fb716ec1a2d113541b02c4b07cac656e3..b9ec00f5c015f0971637133349ff33f7612d3927 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
@@ -34,7 +34,7 @@ class Cart extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractS
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
index 941c14498bb52338731cbd474a46c1c30e70ca5d..a81eaea0a337f2df1617051295aa9f24b459c8ae 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
@@ -27,7 +27,7 @@ class Compared extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstr
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
index bb3b26ae14b2ef89b75b8bd8758bd56d24c3feb3..1daef9546a181c6ad07c58d0b91b5d5a610538ce 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
@@ -68,7 +68,7 @@ class Pcompared extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abst
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
index b38deb232eab0893f0aa8d06b2ba60b23b32da4b..635c5e7ee4f64d2bf6da6761c697b6888b713c7c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
@@ -68,7 +68,7 @@ class Pviewed extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstra
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
index bdb949f46fe83a745bf88255c77f0c7aefa52f65..b58e7e482c5cc129f14d4a8dda549cf5c0d9a261 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
@@ -65,7 +65,7 @@ class Reorder extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstra
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
index 6353e12817e5cd3fa4796c7583bc30483883f9e5..bde3e5ce218c24d75df10a80e4dfc22ec8953284 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
@@ -47,7 +47,7 @@ class Viewed extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstrac
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
index f1883402416c6c2033fa6d75eb452815a38c00c9..9a4fe79415a783f51021b719410bdeef925efaf0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
@@ -34,7 +34,7 @@ class Wishlist extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\Abstr
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
index 781b39dcc0dcbd87bf8c59b1cc340f4cc9dce6d1..908dabf48c15cc5f7e4cdaec3eec7c08431fd7a3 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
@@ -26,7 +26,7 @@ class Store extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
index 66dc3274dd4def11ae4837029ed03419e7091c6e..99753aeafa16bb42af8dcc56b912a6cb9707914d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
@@ -89,7 +89,7 @@ class Totals extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
index 1d00dad06c8c553ee7a0d63fb561c800a7fb2d07..476a33c185b0c5e04eeccffdc0e3c3293f550d20 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
@@ -97,7 +97,7 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
/**
* Get label for shipping include tax
*
- * @return float
+ * @return \Magento\Framework\Phrase
*/
public function getIncludeTaxLabel()
{
@@ -110,7 +110,7 @@ class Shipping extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Defaul
/**
* Get label for shipping exclude tax
*
- * @return float
+ * @return \Magento\Framework\Phrase
*/
public function getExcludeTaxLabel()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
index 62be3871c776762d1d18a88f677fd8c77a638399..ae12ef9bb44dead928fea0a4509fe53b1cf9b1e0 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
@@ -125,7 +125,7 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
/**
* Retrieve text for header
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
index 598eed53a15d6aa25d0e5b7768a606a0c35e2a43..10732ed47b941bce313c3ed0c71111ab9855d309 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
@@ -184,7 +184,7 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
index 1b5ac5fa8485ec0ff531495e49ae9dc0ed7bd275..c0e17475e76b6e0781f04186dcf403eed332fafc 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
@@ -25,7 +25,7 @@ class Assign extends \Magento\Backend\Block\Widget\Form\Container
/**
* Retrieve text for header element depending on loaded page
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
index 5d1057467227c479a0ddc0b5c96c3ccecd9b0812..932092f310ea2963a26cabde58b292d4c6605b1d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
@@ -22,7 +22,7 @@ class Edit extends \Magento\Sales\Block\Adminhtml\Order\Status\NewStatus
/**
* Retrieve text for header element depending on loaded page
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
index c56dfd0815a1fa94d89c85288070e734ab8ca447..e951943f72ef54eebbcf6d73d265289490b1d37a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
@@ -27,7 +27,7 @@ class NewStatus extends \Magento\Backend\Block\Widget\Form\Container
/**
* Retrieve text for header element depending on loaded page
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
index 79020e2a0c59067cc3569df62efee82bc9a5257e..b295e9a275f211d005768a55b5cef9e8b89dbb8f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -273,7 +273,7 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
@@ -452,7 +452,7 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
/**
* @param \Magento\Sales\Model\Order $order
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function getEditMessage($order)
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
index 20e2d6732c0c8d547457f61530f9f41f22acfa68..9994c1b8b3d866b9e753b2abc841c02767bd82c2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
@@ -228,7 +228,7 @@ class Info extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
{
return !$this->_scopeConfig->isSetFlag(
'sales/general/hide_customer_ip',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getOrder()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
index 3619d8fc8c15ec8f187b18c4fb96c016596ccf01..99a9ac9af58774412f49f9051688613662e57270 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
@@ -44,7 +44,7 @@ class Link extends \Magento\Framework\View\Element\Template
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
index 85df1fdba85658a239a1dead6814331c4fa77419..04882426490e8275ed64312142c4ac334b093c76 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
@@ -75,7 +75,7 @@ class Detail extends \Magento\Backend\Block\Widget\Container
/**
* Retrieve header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sales/Block/Order/Creditmemo.php b/app/code/Magento/Sales/Block/Order/Creditmemo.php
index a40ee9a1471fb961d6c198da0ee9a415b55515e5..e0bc7646fd75afaf5b207ca8d665d6f221d05a5f 100644
--- a/app/code/Magento/Sales/Block/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Block/Order/Creditmemo.php
@@ -93,7 +93,7 @@ class Creditmemo extends \Magento\Sales\Block\Order\Creditmemo\Items
/**
* Return back title for logged in and guest users
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getBackTitle()
{
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
index f22e8621595cc323f62883baeb302786f5d033a7..935f3f37a3e23873b62898704b39c0fa301b65a2 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
@@ -51,7 +51,7 @@ class Rss extends \Magento\Framework\View\Element\Template
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
@@ -67,7 +67,7 @@ class Rss extends \Magento\Framework\View\Element\Template
{
return $this->_scopeConfig->isSetFlag(
'rss/order/status',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Sales/Block/Order/Invoice.php b/app/code/Magento/Sales/Block/Order/Invoice.php
index 134a8df7c507f2998074a92c5517ca55ee9e06ff..fd4b1a0c9e6a1332ff12a10be4da9e786bc13879 100644
--- a/app/code/Magento/Sales/Block/Order/Invoice.php
+++ b/app/code/Magento/Sales/Block/Order/Invoice.php
@@ -91,7 +91,7 @@ class Invoice extends \Magento\Sales\Block\Order\Invoice\Items
/**
* Return back title for logged in and guest users
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getBackTitle()
{
diff --git a/app/code/Magento/Sales/Block/Order/View.php b/app/code/Magento/Sales/Block/Order/View.php
index d026152cccb8d38cc483d6165e65abc336ded4ec..28c6ed8bbc73367e061c2c7df3794fb3ab0e47bf 100644
--- a/app/code/Magento/Sales/Block/Order/View.php
+++ b/app/code/Magento/Sales/Block/Order/View.php
@@ -99,7 +99,7 @@ class View extends \Magento\Framework\View\Element\Template
/**
* Return back title for logged in and guest users
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getBackTitle()
{
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
index 97b717690f250dd7efa21e7278067069deee72e0..3aca5adcd8320004e31656e8ace26e730d14288a 100644
--- a/app/code/Magento/Sales/Helper/Admin.php
+++ b/app/code/Magento/Sales/Helper/Admin.php
@@ -13,7 +13,7 @@ class Admin extends \Magento\Framework\App\Helper\AbstractHelper
protected $_salesConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -24,13 +24,13 @@ class Admin extends \Magento\Framework\App\Helper\AbstractHelper
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Sales\Model\Config $salesConfig
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Sales\Model\Config $salesConfig,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
) {
diff --git a/app/code/Magento/Sales/Helper/Data.php b/app/code/Magento/Sales/Helper/Data.php
index c03ef874107cd127d9b5ec11da23ce2696e99d65..80a5f59a03e2cf3f07197b1fcde5db2080a7aaf9 100644
--- a/app/code/Magento/Sales/Helper/Data.php
+++ b/app/code/Magento/Sales/Helper/Data.php
@@ -24,7 +24,7 @@ class Data extends \Magento\Core\Helper\Data
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\OrderIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -50,7 +50,7 @@ class Data extends \Magento\Core\Helper\Data
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -65,7 +65,7 @@ class Data extends \Magento\Core\Helper\Data
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\ShipmentIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -80,7 +80,7 @@ class Data extends \Magento\Core\Helper\Data
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -95,7 +95,7 @@ class Data extends \Magento\Core\Helper\Data
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\InvoiceIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -110,7 +110,7 @@ class Data extends \Magento\Core\Helper\Data
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -125,7 +125,7 @@ class Data extends \Magento\Core\Helper\Data
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -140,7 +140,7 @@ class Data extends \Magento\Core\Helper\Data
{
return $this->_scopeConfig->isSetFlag(
\Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index c88aed402b8aaf19808b5a7efeeb453667a85fda..48424133a19811e7063ca14670894ae4709c4021 100644
--- a/app/code/Magento/Sales/Helper/Guest.php
+++ b/app/code/Magento/Sales/Helper/Guest.php
@@ -69,7 +69,7 @@ class Guest extends \Magento\Core\Helper\Data
/**
* @param App\Helper\Context $context
* @param App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\Registry $coreRegistry
@@ -86,7 +86,7 @@ class Guest extends \Magento\Core\Helper\Data
public function __construct(
App\Helper\Context $context,
App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Framework\Registry $coreRegistry,
diff --git a/app/code/Magento/Sales/Helper/Reorder.php b/app/code/Magento/Sales/Helper/Reorder.php
index b8430c7ac845997821550862527cfe2d4b81df79..f93c02fccdef0da47c54ca7b6ad1d6b8ca447af3 100644
--- a/app/code/Magento/Sales/Helper/Reorder.php
+++ b/app/code/Magento/Sales/Helper/Reorder.php
@@ -23,7 +23,7 @@ class Reorder extends \Magento\Core\Helper\Data
/**
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
* @param \Magento\Customer\Model\Session $customerSession
@@ -32,7 +32,7 @@ class Reorder extends \Magento\Core\Helper\Data
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\State $appState,
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
\Magento\Customer\Model\Session $customerSession,
@@ -65,7 +65,7 @@ class Reorder extends \Magento\Core\Helper\Data
*/
public function isAllowed($store = null)
{
- if ($this->_scopeConfig->getValue(self::XML_PATH_SALES_REORDER_ALLOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)) {
+ if ($this->_scopeConfig->getValue(self::XML_PATH_SALES_REORDER_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)) {
return true;
}
return false;
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 43b515834eca8073fabb3863f59abad97e6a80e1..a0ff1d95c62ae93ab84919acf3758e81ab18f0a8 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1932,7 +1932,7 @@ class Create extends \Magento\Framework\Object implements \Magento\Checkout\Mode
if (empty($email)) {
$host = $this->_scopeConfig->getValue(
self::XML_PATH_DEFAULT_EMAIL_DOMAIN,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$account = time();
$email = $account . '@' . $host;
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 30d142566592a5382ef5f5296f20e89e173365d0..72ee75a0ca0be2d107712254dca19046192a717b 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -304,7 +304,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
protected $entityType = 'order';
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -395,7 +395,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
* @param AttributeValueFactory $customAttributeFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Order\Config $orderConfig
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param Resource\Order\Item\CollectionFactory $orderItemCollectionFactory
@@ -425,7 +425,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
AttributeValueFactory $customAttributeFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Sales\Model\Order\Config $orderConfig,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Sales\Model\Resource\Order\Item\CollectionFactory $orderItemCollectionFactory,
diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index 861fc76ef34467c75999830785213099e116a4ac..aa34d1b3d2f80480d42bb27101cfb918804c53c3 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -109,7 +109,7 @@ class Config
* State label getter
*
* @param string $state
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getStateLabel($state)
{
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 2054fb154f9e8b4fca7b8ca4044f877f80762207..713a4c4826bbd0aee6ef3f144f47cc047729d2bd 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -134,7 +134,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
protected $_calculatorFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -164,7 +164,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory $cmItemCollectionFactory
* @param \Magento\Framework\Math\CalculatorFactory $calculatorFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Creditmemo\CommentFactory $commentFactory
* @param \Magento\Sales\Model\Resource\Order\Creditmemo\Comment\CollectionFactory $commentCollectionFactory
* @param PriceCurrencyInterface $priceCurrency
@@ -184,7 +184,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory $cmItemCollectionFactory,
\Magento\Framework\Math\CalculatorFactory $calculatorFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Sales\Model\Order\Creditmemo\CommentFactory $commentFactory,
\Magento\Sales\Model\Resource\Order\Creditmemo\Comment\CollectionFactory $commentCollectionFactory,
PriceCurrencyInterface $priceCurrency,
@@ -643,7 +643,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
* Retrieve Creditmemo state name by state identifier
*
* @param int $stateId
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getStateName($stateId = null)
{
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
index 5484ca05db058d67bd436d4ea735a2943a550d27..6324ae356a6cd6a65275a939ed8879ea8dd0d1dd 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
@@ -28,7 +28,7 @@ class Comment extends AbstractModel implements CreditmemoCommentInterface
protected $_creditmemo;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -39,7 +39,7 @@ class Comment extends AbstractModel implements CreditmemoCommentInterface
* @param AttributeValueFactory $customAttributeFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -52,7 +52,7 @@ class Comment extends AbstractModel implements CreditmemoCommentInterface
AttributeValueFactory $customAttributeFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
index a4849a4644a33132b446095d6d2ca839cc4eaab6..23d7edf6dfc1876ba4c68f85f1cec3a57a989104 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
@@ -13,7 +13,7 @@ use Magento\Framework\Pricing\PriceCurrencyInterface;
class Shipping extends AbstractTotal
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -28,13 +28,13 @@ class Shipping extends AbstractTotal
protected $priceCurrency;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Tax\Model\Config $taxConfig
* @param PriceCurrencyInterface $priceCurrency
* @param array $data
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Tax\Model\Config $taxConfig,
PriceCurrencyInterface $priceCurrency,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/Container.php b/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
index e3c49b6b4a587ed744b096225d3ad1c639e22fb1..bb6c98f1519758049eace66e99c5af264e17316a 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Sales\Model\Order\Email\Container;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Store\Model\Store;
use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -60,7 +60,7 @@ abstract class Container implements IdentityInterface
{
return $this->scopeConfig->getValue(
$path,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
index 9e9258bc0e1a3a412cbaf266a5266b7fffd308be..dbcfd57d968c9fe189e468bfca61f1e8f5ce67c2 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
@@ -21,7 +21,7 @@ class CreditmemoCommentIdentity extends Container implements IdentityInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
index a0734f725bc07bacc7f680fefa2c8abf5d76777a..adb032dc1c8641654893b8d604bbcb8f47cbe542 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
@@ -21,7 +21,7 @@ class CreditmemoIdentity extends Container implements IdentityInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
index 2b8d5f9dda298a594cdc82be043faa63a3d0f77c..650b6a74db806ae8275a745a2f5d4cb1508f99d5 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
@@ -21,7 +21,7 @@ class InvoiceCommentIdentity extends Container implements IdentityInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
index 6553b32dc9591a8950eeabec90e53de495d2f86a..c233cb397e5a3baabcbfc96ed44408b5eb22caf0 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
@@ -21,7 +21,7 @@ class InvoiceIdentity extends Container implements IdentityInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
index ea8f8e92b36499a1231081e4f895d94c6071ce00..d965f8eb5b1266eb53bad4eca836edcd1fd55c1e 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
@@ -21,7 +21,7 @@ class OrderCommentIdentity extends Container implements IdentityInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
index ed5464cdf5a298d7900c645267813945b30fbd93..13b31fe6265b544e889146890f8d6244d95dfdf6 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
@@ -24,7 +24,7 @@ class OrderIdentity extends Container implements IdentityInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
index 1390ad69027b974d30756d164b665b9828bc0eb8..4bef0bf311b974dfda7899df0a3726cd088362b8 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
@@ -21,7 +21,7 @@ class ShipmentCommentIdentity extends Container implements IdentityInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
index 287f07c08623b336dab8d84b43e6d8a82e29885c..e70d5963c596d55a383bae00a95681fb50a9f9e9 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
@@ -27,7 +27,7 @@ class ShipmentIdentity extends Container implements IdentityInterface
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_EMAIL_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()->getStoreId()
);
}
diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php
index 6a64cb5e1b125523c83c6c8eea930ddc5d18e353..8ba52dfecc72e8b51af40f4d8b53b33d99f163b5 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice.php
@@ -597,7 +597,7 @@ class Invoice extends AbstractModel implements EntityInterface, InvoiceInterface
* Retrieve invoice state name by state identifier
*
* @param int|null $stateId
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getStateName($stateId = null)
{
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
index f6c7d74bb3a5de459eb1421eeb12a7208f3e1123..bcecafbd7a3197d6d633598cbe14a1f02f0d9715 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
@@ -28,7 +28,7 @@ class Comment extends AbstractModel implements InvoiceCommentInterface
protected $_invoice;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -39,7 +39,7 @@ class Comment extends AbstractModel implements InvoiceCommentInterface
* @param AttributeValueFactory $customAttributeFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -52,7 +52,7 @@ class Comment extends AbstractModel implements InvoiceCommentInterface
AttributeValueFactory $customAttributeFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index 10eaf76529232f892c96bce3a007af5a86239306..41841e00f19c22d799b0443ec44139054eccabe3 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -167,7 +167,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
protected $productRepository;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -182,7 +182,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
@@ -192,7 +192,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
\Magento\Framework\Api\MetadataServiceInterface $metadataService,
AttributeValueFactory $customAttributeFactory,
\Magento\Sales\Model\OrderFactory $orderFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -451,7 +451,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
* Retrieve status name
*
* @param string $statusId
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public static function getStatusName($statusId)
{
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index c2cb292d9ce6bb5cc32d38939cc9215cf83cd1c7..c4b9cacc98079e0c3d33e7a6e408f275429a6841 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -141,7 +141,7 @@ class Payment extends Info implements OrderPaymentInterface
protected $_transactionCollectionFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -160,7 +160,7 @@ class Payment extends Info implements OrderPaymentInterface
* @param \Magento\Sales\Model\Service\OrderFactory $serviceOrderFactory
* @param Payment\TransactionFactory $transactionFactory
* @param \Magento\Sales\Model\Resource\Order\Payment\Transaction\CollectionFactory $transactionCollectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param PriceCurrencyInterface $priceCurrency
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -177,7 +177,7 @@ class Payment extends Info implements OrderPaymentInterface
\Magento\Sales\Model\Service\OrderFactory $serviceOrderFactory,
\Magento\Sales\Model\Order\Payment\TransactionFactory $transactionFactory,
\Magento\Sales\Model\Resource\Order\Payment\Transaction\CollectionFactory $transactionCollectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
PriceCurrencyInterface $priceCurrency,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index 2dce8244dc739e9944e42d3e765060c4dcd40782..a2c0b3de2f296987d0b30c15b6e07744b246d2c6 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -231,7 +231,7 @@ abstract class AbstractPdf extends \Magento\Framework\Object
$this->y = $this->y ? $this->y : 815;
$image = $this->_scopeConfig->getValue(
'sales/identity/logo',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
if ($image) {
@@ -291,7 +291,7 @@ abstract class AbstractPdf extends \Magento\Framework\Object
"\n",
$this->_scopeConfig->getValue(
'sales/identity/address',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
) as $value) {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
index 9340fd423d1c7865463fc66840582cbb524c5e06..acd8d3f9b6d78474726192cf53fa521f997b935c 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
@@ -12,7 +12,7 @@ namespace Magento\Sales\Model\Order\Pdf;
class Creditmemo extends AbstractPdf
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -26,7 +26,7 @@ class Creditmemo extends AbstractPdf
* @param \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param array $data
*
@@ -43,7 +43,7 @@ class Creditmemo extends AbstractPdf
\Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
array $data = []
) {
@@ -158,7 +158,7 @@ class Creditmemo extends AbstractPdf
$order,
$this->_scopeConfig->isSetFlag(
self::XML_PATH_SALES_PDF_CREDITMEMO_PUT_ORDER_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$order->getStoreId()
)
);
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
index e260c2b044d74602a0cee84e1d7e937d8fb33f25..79b3130b684496b306b556ac7a089651960137f5 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
@@ -12,7 +12,7 @@ namespace Magento\Sales\Model\Order\Pdf;
class Invoice extends AbstractPdf
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -30,7 +30,7 @@ class Invoice extends AbstractPdf
* @param \Magento\Sales\Model\Order\Pdf\Total\Factory $pdfTotalFactory
* @param \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param array $data
@@ -47,7 +47,7 @@ class Invoice extends AbstractPdf
\Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
array $data = []
) {
@@ -137,7 +137,7 @@ class Invoice extends AbstractPdf
$order,
$this->_scopeConfig->isSetFlag(
self::XML_PATH_SALES_PDF_INVOICE_PUT_ORDER_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$order->getStoreId()
)
);
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
index a7a2d4a03259aa3b46565ddfbbd322f30ab23dc1..46594554ba69d203c2f2215dd2cdbac639d0c53b 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
@@ -12,7 +12,7 @@ namespace Magento\Sales\Model\Order\Pdf;
class Shipment extends AbstractPdf
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -31,7 +31,7 @@ class Shipment extends AbstractPdf
* @param \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param array $data
*
@@ -47,7 +47,7 @@ class Shipment extends AbstractPdf
\Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
array $data = []
) {
@@ -130,7 +130,7 @@ class Shipment extends AbstractPdf
$shipment,
$this->_scopeConfig->isSetFlag(
self::XML_PATH_SALES_PDF_SHIPMENT_PUT_ORDER_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$order->getStoreId()
)
);
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
index c81870b6fe8cb06ed17c4d788f02c78f1fab7ded..f390d0b6d439b19ce3fbc1d81f7704920b60ebcb 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
@@ -28,7 +28,7 @@ class Comment extends AbstractModel implements ShipmentCommentInterface
protected $_shipment;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -39,7 +39,7 @@ class Comment extends AbstractModel implements ShipmentCommentInterface
* @param AttributeValueFactory $customAttributeFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -52,7 +52,7 @@ class Comment extends AbstractModel implements ShipmentCommentInterface
AttributeValueFactory $customAttributeFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
index 1544bdcf142e7f8770a74eb974de5a84dc938027..383de9275a0bc055879f8a43495c8cdb26e69571 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Track.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
@@ -48,7 +48,7 @@ class Track extends AbstractModel implements ShipmentTrackInterface
protected $_eventObject = 'track';
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -64,7 +64,7 @@ class Track extends AbstractModel implements ShipmentTrackInterface
* @param AttributeValueFactory $customAttributeFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -78,7 +78,7 @@ class Track extends AbstractModel implements ShipmentTrackInterface
AttributeValueFactory $customAttributeFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php
index 756a8063cab3f1c2afcf8c834d5991d6546311ad..66397c68af5202b762f8e5bbcf6655395d754131 100644
--- a/app/code/Magento/Sales/Model/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Order/Status.php
@@ -16,14 +16,14 @@ use Magento\Framework\Model\Exception;
class Status extends \Magento\Framework\Model\AbstractModel
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -31,7 +31,7 @@ class Status extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
@@ -127,7 +127,7 @@ class Status extends \Magento\Framework\Model\AbstractModel
* Get status label by store
*
* @param null|string|bool|int|\Magento\Store\Model\Store $store
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getStoreLabel($store = null)
{
diff --git a/app/code/Magento/Sales/Model/Order/Status/History.php b/app/code/Magento/Sales/Model/Order/Status/History.php
index 85ddf3ed47928078162e44d1ba0c392bb33a0cd5..9a69714a8452e437a37cba621c570097116d7cd4 100644
--- a/app/code/Magento/Sales/Model/Order/Status/History.php
+++ b/app/code/Magento/Sales/Model/Order/Status/History.php
@@ -42,7 +42,7 @@ class History extends AbstractModel implements OrderStatusHistoryInterface
protected $_eventObject = 'status_history';
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -53,7 +53,7 @@ class History extends AbstractModel implements OrderStatusHistoryInterface
* @param AttributeValueFactory $customAttributeFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -66,7 +66,7 @@ class History extends AbstractModel implements OrderStatusHistoryInterface
AttributeValueFactory $customAttributeFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/Sales/Model/Resource/Sale/Collection.php b/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
index 84f01cc9e9404b1f518b2e586469ec36adc0249f..ad3d7ddaf8a83f133d55a9c3384edd003f085b3a 100644
--- a/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
@@ -6,7 +6,7 @@
namespace Magento\Sales\Model\Resource\Sale;
use Magento\Framework\Data\Collection\EntityFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
use Magento\Framework\Event\ManagerInterface;
use Psr\Log\LoggerInterface as Logger;
@@ -74,7 +74,7 @@ class Collection extends \Magento\Framework\Data\Collection\Db
* @param ManagerInterface $eventManager
* @param Order $resource
* @param \Magento\Store\Model\Resource\Store\CollectionFactory $storeCollectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
index ae0eed109f1d3a5e43327029f6e2cbe9b1302422..a7ae287c8bf48b6fd073d6e0212c623efdd36825 100644
--- a/app/code/Magento/Sales/Model/Rss/OrderStatus.php
+++ b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
@@ -89,7 +89,7 @@ class OrderStatus implements DataProviderInterface
*/
public function isAllowed()
{
- if ($this->config->getValue('rss/order/status', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+ if ($this->config->getValue('rss/order/status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
return true;
}
return false;
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index cb9e5510a894bb9c16f1cbde085a91717cf62292..cc4959c01b2af9cb077e03d77373391949a60e42 100644
--- a/app/code/Magento/Sales/composer.json
+++ b/app/code/Magento/Sales/composer.json
@@ -3,33 +3,33 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-authorization": "0.42.0-beta6",
- "magento/module-payment": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-sales-rule": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-widget": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-gift-message": "0.42.0-beta6",
- "magento/module-reports": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-wishlist": "0.42.0-beta6",
- "magento/module-email": "0.42.0-beta6",
- "magento/module-shipping": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-ui": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-authorization": "0.42.0-beta7",
+ "magento/module-payment": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-sales-rule": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-widget": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-gift-message": "0.42.0-beta7",
+ "magento/module-reports": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-wishlist": "0.42.0-beta7",
+ "magento/module-email": "0.42.0-beta7",
+ "magento/module-shipping": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-ui": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Sales/etc/acl.xml b/app/code/Magento/Sales/etc/acl.xml
index dc3657bebc27fe9dff252dc511e11d30e43d09f2..9d1911d695cbc38831fef878e9d95b41a37b7f4c 100644
--- a/app/code/Magento/Sales/etc/acl.xml
+++ b/app/code/Magento/Sales/etc/acl.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_Sales::sales" title="Sales" sortOrder="20">
<resource id="Magento_Sales::sales_operation" title="Operations" sortOrder="10">
<resource id="Magento_Sales::sales_order" title="Orders" sortOrder="10">
@@ -38,10 +38,10 @@
</resource>
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
<resource id="Magento_Sales::order_statuses" title="Order Status" sortOrder="40" />
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Sales::config_sales" title="Sales Section" sortOrder="60" />
<resource id="Magento_Sales::sales_email" title="Sales Emails Section" sortOrder="65" />
<resource id="Magento_Sales::sales_pdf" title="PDF Print-outs" sortOrder="66" />
diff --git a/app/code/Magento/Sales/etc/adminhtml/routes.xml b/app/code/Magento/Sales/etc/adminhtml/routes.xml
index b7c900daea3a4cfc969b60c37a413036cbe49179..8e9b6be88593dcee9f16eea91fad636a3c59b515 100644
--- a/app/code/Magento/Sales/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="sales" frontName="sales">
- <module name="Magento_Sales" before="Magento_Adminhtml" />
+ <module name="Magento_Sales" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
index c48c4ae275c0106d9f5f966b1b1e4b935ff52873..1ff0f10b343809274aab54f356416e00f0adcf40 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
@@ -9,7 +9,7 @@
<update handle="sales_order_create_customer_block"/>
<head>
<link src="Magento_Sales::js/bootstrap/order-create-index.js"/>
- <css src="Magento_Core::prototype/magento.css"/>
+ <css src="Magento_Theme::prototype/magento.css"/>
</head>
<update handle="sales_order_create_item_price"/>
<body>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
index 57c948bf768edbed1e4b398f1d34fe957089d9fe..3e8d8c5b8c8d2227c1021bde513ece5a95dd2a1b 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
@@ -19,6 +19,6 @@
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
index 57db7242d0462258054f3ffcf9e5fcd699baa94b..7b033f1b5bd249695aaa3c6cc486b96308acdbed 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
@@ -19,6 +19,6 @@
<block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
</block>
</block>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
index 4aade444c27d50c60066e08031b8703e61ebe9b3..e199fe989535fd5a97f1cc58eee7a0731a4f0bdc 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
@@ -23,6 +23,6 @@
</block>
</block>
</block>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
index 81f0de61c6924a5b15841040a253ec925326fb75..37738d058f564b27cc657d9bb269edad86c80c37 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
@@ -11,6 +11,6 @@
<block class="Magento\Sales\Block\Order\Email\Shipment\Items" name="items" template="email/shipment/items.phtml">
<block class="Magento\Framework\View\Element\RendererList" name="sales.email.order.shipment.renderers" as="renderer.list"/>
</block>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
index d4b114ec15c04ed3e329222a17d1951111cb0572..7937d5af75729835f6ca73d41a972bd414e7dca7 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
@@ -36,6 +36,6 @@
<referenceContainer name="sales.order.info.buttons">
<block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
index b07327bdf208b13928f5470359e82c0b15b1a529..8e8e25bebbdfe7309ba7e2190b43ec9e33e85459 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
@@ -37,6 +37,6 @@
<referenceContainer name="sales.order.info.buttons">
<block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
index 48d7e0f843521e19152118f6f454591ce80ea544..d0b200edd474c325a3eb00217da3f9473c53783a 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
@@ -34,6 +34,6 @@
</block>
<block class="Magento\Sales\Block\Order\PrintShipment" as="sales.order.print.info" name="sales.order.print.info" template="order/info.phtml"/>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml
index f545c7fd8c6f650cc6009b4abf0986286264fae1..1f2c3f089151f2f8b56d217e60bff65b30c104e1 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml
@@ -27,6 +27,6 @@
</block>
</block>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
index 91cffc3c4cd233329ce979552d6784ac8bcb3932..f9d0eaa07265365b6d96bce00d8636318e2ff4d3 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
@@ -27,6 +27,6 @@
</block>
</block>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
index 49f19a8396ed9bb44464cc950fe2ab39dfcab72a..5851807afa72f6303f20a06a70379ecd846f08fc 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
@@ -19,6 +19,6 @@
<block class="Magento\Framework\View\Element\RendererList" name="sales.order.print.shipment.renderers" as="renderer.list"/>
</block>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml
index 11fe2123fbeb7365699f72713e566e8aa572dc24..9876d1e42a5d87507d0e38f439dfd41cd7c49331 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml
@@ -22,6 +22,6 @@
<referenceContainer name="content">
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info" after="sales.order.shipment"/>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
index ac830e79cbe5149ca18a59185bcc3e9cab21f460..11fdcef7991ef94ccc8be84ca95711dc40719380 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
@@ -37,6 +37,6 @@
</block>
<block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info" after="sales.order.view"/>
</referenceContainer>
- <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+ <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
</body>
</page>
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit.php
index 54c95c52558fc630a37cf2688ea03502c4eb9ad1..b1da3755b33d7fe035d06e26b8fa110b4a791636 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit.php
@@ -62,7 +62,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Getter for form header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/SalesRule/Block/Rss/Discounts.php b/app/code/Magento/SalesRule/Block/Rss/Discounts.php
index fb6558e7992a29ce1fd4861411f2e33249c03b5f..8227baf46e6a117128ab9af7b52e919e7e6a2199 100644
--- a/app/code/Magento/SalesRule/Block/Rss/Discounts.php
+++ b/app/code/Magento/SalesRule/Block/Rss/Discounts.php
@@ -14,7 +14,7 @@ use Magento\Framework\App\Rss\DataProviderInterface;
class Discounts extends \Magento\Framework\View\Element\AbstractBlock implements DataProviderInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -76,7 +76,7 @@ class Discounts extends \Magento\Framework\View\Element\AbstractBlock implements
$title = __('%1 - Discounts and Coupons', $storeModel->getFrontendName());
$lang = $this->_scopeConfig->getValue(
'general/locale/code',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeModel
);
@@ -150,7 +150,7 @@ class Discounts extends \Magento\Framework\View\Element\AbstractBlock implements
{
return $this->_scopeConfig->isSetFlag(
'rss/catalog/discounts',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/SalesRule/Helper/Coupon.php b/app/code/Magento/SalesRule/Helper/Coupon.php
index 6724f2f9768bc65673c77c54dd7a17d5a0ba26ba..2b3282ae12e647e3cc765233625359ac83710cbd 100644
--- a/app/code/Magento/SalesRule/Helper/Coupon.php
+++ b/app/code/Magento/SalesRule/Helper/Coupon.php
@@ -90,7 +90,7 @@ class Coupon extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getDefaultLength()
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -100,7 +100,7 @@ class Coupon extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getDefaultFormat()
{
- return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -110,7 +110,7 @@ class Coupon extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getDefaultPrefix()
{
- return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -120,7 +120,7 @@ class Coupon extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getDefaultSuffix()
{
- return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -130,7 +130,7 @@ class Coupon extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getDefaultDashInterval()
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
diff --git a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
index 0f59da5f8cedac6fd347d55a9483d8fda307c5c2..7ad693c280c26382c8011eb7f2186710bc12ca5b 100644
--- a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
+++ b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
@@ -5,7 +5,7 @@
*/
namespace Magento\SalesRule\Model\Plugin;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Customer\Model\Session;
use Magento\SalesRule\Model\Resource\Rule;
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
index 19900252c073d8116bbd5d56819da1692acfa297..d108bb891e6ec7e6f4a684f55b6443a702a8c925 100644
--- a/app/code/Magento/SalesRule/Model/Quote/Discount.php
+++ b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -26,7 +26,7 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
protected $_eventManager = null;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -37,13 +37,13 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
/**
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\SalesRule\Model\Validator $validator
* @param PriceCurrencyInterface $priceCurrency
*/
public function __construct(
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\SalesRule\Model\Validator $validator,
PriceCurrencyInterface $priceCurrency
) {
diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
index 669ab16528b83053be913c88fe79485c34042b61..66dd6c7f054fcfadfab0166b17bf026c89052994 100644
--- a/app/code/Magento/SalesRule/Model/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Rule.php
@@ -168,7 +168,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
protected $_couponCollection;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -182,7 +182,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
* @param \Magento\SalesRule\Model\Rule\Condition\CombineFactory $condCombineFactory
* @param \Magento\SalesRule\Model\Rule\Condition\Product\CombineFactory $condProdCombineF
* @param \Magento\SalesRule\Model\Resource\Coupon\Collection $couponCollection
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -198,7 +198,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
\Magento\SalesRule\Model\Rule\Condition\CombineFactory $condCombineFactory,
\Magento\SalesRule\Model\Rule\Condition\Product\CombineFactory $condProdCombineF,
\Magento\SalesRule\Model\Resource\Coupon\Collection $couponCollection,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
index d686cb47ce92f44c0fd44866da83634c3b9a5b65..e53098782eaad3f56c3fad4a8732930da2e2dacf 100644
--- a/app/code/Magento/SalesRule/composer.json
+++ b/app/code/Magento/SalesRule/composer.json
@@ -3,26 +3,26 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-rule": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-shipping": "0.42.0-beta6",
- "magento/module-payment": "0.42.0-beta6",
- "magento/module-reports": "0.42.0-beta6",
- "magento/module-catalog-rule": "0.42.0-beta6",
- "magento/module-widget": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-rule": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-shipping": "0.42.0-beta7",
+ "magento/module-payment": "0.42.0-beta7",
+ "magento/module-reports": "0.42.0-beta7",
+ "magento/module-catalog-rule": "0.42.0-beta7",
+ "magento/module-widget": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/SalesRule/etc/acl.xml b/app/code/Magento/SalesRule/etc/acl.xml
index eae627c3208548fd8e84d17fb75e54ea9e4560d2..af385c56d4cba7d2c2f787ea33698255579c9e75 100644
--- a/app/code/Magento/SalesRule/etc/acl.xml
+++ b/app/code/Magento/SalesRule/etc/acl.xml
@@ -8,15 +8,15 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::marketing">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::marketing">
<resource id="Magento_CatalogRule::promo">
<resource id="Magento_SalesRule::quote" sortOrder="30" title="Cart Price Rules" />
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_SalesRule::config_promo" title="Promotion" sortOrder="90"/>
</resource>
</resource>
diff --git a/app/code/Magento/SalesRule/etc/adminhtml/routes.xml b/app/code/Magento/SalesRule/etc/adminhtml/routes.xml
index daf9ef1b8586c69cd3f09a4b79d908da2c2cd911..6de4f577cd2d9a38e77f686aeb2202f8171ef743 100644
--- a/app/code/Magento/SalesRule/etc/adminhtml/routes.xml
+++ b/app/code/Magento/SalesRule/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="sales_rule" frontName="sales_rule">
- <module name="Magento_SalesRule" before="Magento_Adminhtml" />
+ <module name="Magento_SalesRule" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
index b222ecb88e7e3e13821fae18d34858013e7e30d5..60c101114dd17882591d466389d0a1b11b39846d 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
@@ -47,7 +47,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Search/Controller/Term/Popular.php b/app/code/Magento/Search/Controller/Term/Popular.php
index 32a3e0d41aab1a7b52df7a4607ea3b699218dc0f..8e4687542e2ffdae4f2b707bfde911154178fe02 100644
--- a/app/code/Magento/Search/Controller/Term/Popular.php
+++ b/app/code/Magento/Search/Controller/Term/Popular.php
@@ -36,7 +36,7 @@ class Popular extends \Magento\Framework\App\Action\Action
{
$searchTerms = $this->scopeConfig->getValue(
'catalog/seo/search_terms',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (!$searchTerms) {
$this->_redirect('noroute');
diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php
index 378b5bb1683467ee998294f3998f63b181f44568..603f9317fe2b39d7b4776bbd63a84ef471b9f908 100644
--- a/app/code/Magento/Search/Helper/Data.php
+++ b/app/code/Magento/Search/Helper/Data.php
@@ -11,7 +11,7 @@ use Magento\Framework\App\Helper\Context;
use Magento\Framework\Escaper;
use Magento\Framework\Filter\FilterManager;
use Magento\Framework\Stdlib\String;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Search\Model\Query as SearchQuery;
use Magento\Search\Model\QueryFactory;
use Magento\Search\Model\Resource\Query\Collection;
@@ -79,7 +79,7 @@ class Data extends AbstractHelper
protected $filter;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -92,7 +92,7 @@ class Data extends AbstractHelper
* @param QueryFactory $queryFactory
* @param Escaper $escaper
* @param FilterManager $filter
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
*/
public function __construct(
Context $context,
@@ -192,7 +192,7 @@ class Data extends AbstractHelper
{
return $this->_scopeConfig->getValue(
SearchQuery::XML_PATH_MIN_QUERY_LENGTH,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -207,7 +207,7 @@ class Data extends AbstractHelper
{
return $this->_scopeConfig->getValue(
SearchQuery::XML_PATH_MAX_QUERY_LENGTH,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Search/Model/Query.php b/app/code/Magento/Search/Model/Query.php
index 7da98d6eaec7986ff12cb0030ac0fa9d7fe4aec6..917abf841a7da2b22d9cf1096863efbff0f86fac 100644
--- a/app/code/Magento/Search/Model/Query.php
+++ b/app/code/Magento/Search/Model/Query.php
@@ -14,7 +14,7 @@ use Magento\Framework\Data\Collection\Db;
use Magento\Framework\Model\AbstractModel;
use Magento\Framework\Model\Resource\AbstractResource;
use Magento\Framework\Registry;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Search query model
@@ -74,7 +74,7 @@ class Query extends AbstractModel implements QueryInterface
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var StoreManagerInterface
*/
protected $_storeManager;
@@ -99,7 +99,7 @@ class Query extends AbstractModel implements QueryInterface
* @param Registry $registry
* @param QueryCollectionFactory $queryCollectionFactory
* @param CollectionFactory $searchCollectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param StoreManagerInterface $storeManager
* @param Config $scopeConfig
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param Db $resourceCollection
@@ -110,7 +110,7 @@ class Query extends AbstractModel implements QueryInterface
Registry $registry,
QueryCollectionFactory $queryCollectionFactory,
CollectionFactory $searchCollectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ StoreManagerInterface $storeManager,
ScopeConfigInterface $scopeConfig,
AbstractResource $resource = null,
Db $resourceCollection = null,
@@ -240,7 +240,7 @@ class Query extends AbstractModel implements QueryInterface
{
return $this->_scopeConfig->getValue(
self::XML_PATH_MIN_QUERY_LENGTH,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStoreId()
);
}
@@ -254,7 +254,7 @@ class Query extends AbstractModel implements QueryInterface
{
return $this->_scopeConfig->getValue(
self::XML_PATH_MAX_QUERY_LENGTH,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStoreId()
);
}
diff --git a/app/code/Magento/Search/Model/QueryFactory.php b/app/code/Magento/Search/Model/QueryFactory.php
index 4aeb2208139d15be5f80e6f5ee34b35bffab9094..0a68112d86f64142ff27fe1aa78939b1190f01ea 100644
--- a/app/code/Magento/Search/Model/QueryFactory.php
+++ b/app/code/Magento/Search/Model/QueryFactory.php
@@ -9,7 +9,7 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\Helper\Context;
use Magento\Framework\ObjectManagerInterface;
use Magento\Framework\Stdlib\String as StdlibString;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class QueryFactory implements QueryFactoryInterface
{
diff --git a/app/code/Magento/Search/Model/Resource/Query/Collection.php b/app/code/Magento/Search/Model/Resource/Query/Collection.php
index a7f3a12d99f825c853552f784841020b3a7687ce..c441ac7b760cc07f0b486a06cef0d09ded9a13a5 100644
--- a/app/code/Magento/Search/Model/Resource/Query/Collection.php
+++ b/app/code/Magento/Search/Model/Resource/Query/Collection.php
@@ -23,7 +23,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -39,7 +39,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Search\Model\Resource\Helper $resourceHelper
* @param \Zend_Db_Adapter_Abstract $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
@@ -49,7 +49,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Search\Model\Resource\Helper $resourceHelper,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index 59a471ed4b6a9ae1946a09056de35464dd552731..0fa3e794ceec1c2be0119fdde25723958483f133 100644
--- a/app/code/Magento/Search/composer.json
+++ b/app/code/Magento/Search/composer.json
@@ -3,14 +3,14 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/framework": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-reports": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-reports": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Search/etc/acl.xml b/app/code/Magento/Search/etc/acl.xml
index 176d259a61afd6d460cc9929084e05af8f95ee25..6280c716af0a3375da7f4b6de399b5a5c758fa81 100644
--- a/app/code/Magento/Search/etc/acl.xml
+++ b/app/code/Magento/Search/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::marketing">
- <resource id="Magento_Adminhtml::marketing_seo">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::marketing">
+ <resource id="Magento_Backend::marketing_seo">
<resource id="Magento_Search::search" title="Search Terms" sortOrder="10" />
</resource>
</resource>
diff --git a/app/code/Magento/Search/etc/adminhtml/routes.xml b/app/code/Magento/Search/etc/adminhtml/routes.xml
index 2a7f9cd6312e89f0df8e901e7ebf13e0bf9734f6..bdeee326f35c5f2453c8f9edaca1ceb53a93d131 100644
--- a/app/code/Magento/Search/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Search/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="search" frontName="search">
- <module name="Magento_Search" before="Magento_Adminhtml" />
+ <module name="Magento_Search" before="Magento_Backend" />
</route>
</router>
</config>
\ No newline at end of file
diff --git a/app/code/Magento/Sendfriend/Helper/Data.php b/app/code/Magento/Sendfriend/Helper/Data.php
index e1a4248f7486f32f3346c529cde07689e16017d1..e7befbc90105faea6729863e522ca7121ccab82e 100644
--- a/app/code/Magento/Sendfriend/Helper/Data.php
+++ b/app/code/Magento/Sendfriend/Helper/Data.php
@@ -60,7 +60,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function isEnabled($store = null)
{
- return $this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
/**
@@ -71,7 +71,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function isAllowForGuest($store = null)
{
- return $this->_scopeConfig->isSetFlag(self::XML_PATH_ALLOW_FOR_GUEST, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->isSetFlag(self::XML_PATH_ALLOW_FOR_GUEST, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
/**
@@ -82,7 +82,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getMaxRecipients($store = null)
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_RECIPIENTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_RECIPIENTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
/**
@@ -93,7 +93,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getMaxEmailPerPeriod($store = null)
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_PER_HOUR, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_PER_HOUR, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
/**
@@ -114,7 +114,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getLimitBy($store = null)
{
- return (int)$this->_scopeConfig->getValue(self::XML_PATH_LIMIT_BY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return (int)$this->_scopeConfig->getValue(self::XML_PATH_LIMIT_BY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
/**
@@ -125,7 +125,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function getEmailTemplate($store = null)
{
- return $this->_scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
/**
diff --git a/app/code/Magento/Sendfriend/Model/Sendfriend.php b/app/code/Magento/Sendfriend/Model/Sendfriend.php
index ee9afe9ed397e4e1776b978a316d8206f98ad252..5090b29eb94e6f9f8219b7f66eaf126d2693620a 100644
--- a/app/code/Magento/Sendfriend/Model/Sendfriend.php
+++ b/app/code/Magento/Sendfriend/Model/Sendfriend.php
@@ -84,7 +84,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
protected $_transportBuilder;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -111,7 +111,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
* @param \Magento\Catalog\Helper\Image $catalogImage
* @param \Magento\Sendfriend\Helper\Data $sendfriendData
@@ -127,7 +127,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Catalog\Helper\Image $catalogImage,
\Magento\Sendfriend\Helper\Data $sendfriendData,
diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json
index b8ffed85185380e85329bb4139df891d263ca237..1ee7f403f0ac856a75f3ef534f62649fcbf5d948 100644
--- a/app/code/Magento/Sendfriend/composer.json
+++ b/app/code/Magento/Sendfriend/composer.json
@@ -3,15 +3,16 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Sendfriend/etc/adminhtml/system.xml b/app/code/Magento/Sendfriend/etc/adminhtml/system.xml
index 5d86402c57b1af7d5e0d2864947aeb89407e5fb3..5b59675f2aff555b3e1bce2d392888ace5671b66 100644
--- a/app/code/Magento/Sendfriend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Sendfriend/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
<section id="sendfriend" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Email to a Friend</label>
<tab>catalog</tab>
- <resource>Magento_Adminhtml::sendfriend</resource>
+ <resource>Magento_Backend::sendfriend</resource>
<group id="email" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Email Templates</label>
<field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
index 74cbd5e918853d5b2fd92e622f82effbbdb39ed2..1a325851978638636279c73a51c4ddb9bbcc7afd 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
@@ -144,7 +144,7 @@ class Packaging extends \Magento\Backend\Block\Template
$carrier = $this->_carrierFactory->create($order->getShippingMethod(true)->getCarrierCode());
$countryShipper = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
if ($carrier) {
@@ -272,7 +272,7 @@ class Packaging extends \Magento\Backend\Block\Template
$address = $order->getShippingAddress();
$shipperAddressCountryCode = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$recipientAddressCountryCode = $address->getCountryId();
@@ -350,7 +350,7 @@ class Packaging extends \Magento\Backend\Block\Template
$carrier = $this->_carrierFactory->create($order->getShippingMethod(true)->getCarrierCode());
$countryShipper = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
if ($carrier) {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
index 913e4ce36dfd199a14b763cf5214f322a7eae886..6167bc0292a1cdd9f2ba6359b467279719cc2584 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
@@ -80,7 +80,7 @@ class Grid extends \Magento\Backend\Block\Template
$address = $order->getShippingAddress();
$shipperAddressCountryCode = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$recipientAddressCountryCode = $address->getCountryId();
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
index 21322f5bc89ca9848b5da685206b1b5e0b6ee165..c537188fd1e66ad6c512debd92f3fbac2cbd0534 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
@@ -85,7 +85,7 @@ class View extends \Magento\Shipping\Block\Adminhtml\Order\Tracking
/**
* @param string $code
- * @return false|string
+ * @return \Magento\Framework\Phrase|string|bool
*/
public function getCarrierTitle($code)
{
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View.php b/app/code/Magento/Shipping/Block/Adminhtml/View.php
index d2ad4c75d78c7b484a4b0778b6d98b325d648812..70885bfe1de7e4edd45a6802ceed4686f8456624 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/View.php
@@ -83,7 +83,7 @@ class View extends \Magento\Backend\Block\Widget\Form\Container
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Shipping/Block/Order/Shipment.php b/app/code/Magento/Shipping/Block/Order/Shipment.php
index 1dbeae6472e2786b2568382ea06514300bcd5096..d8ab31cad12207aa0719c7d481ec15ea9fe45186 100644
--- a/app/code/Magento/Shipping/Block/Order/Shipment.php
+++ b/app/code/Magento/Shipping/Block/Order/Shipment.php
@@ -99,7 +99,7 @@ class Shipment extends \Magento\Framework\View\Element\Template
/**
* Return back title for logged in and guest users
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getBackTitle()
{
diff --git a/app/code/Magento/Shipping/Block/Tracking/Popup.php b/app/code/Magento/Shipping/Block/Tracking/Popup.php
index 66559ec405fb069141c9aabab12269c7a1daeeac..2959384a80acd7377399d80ca1a36fa266619e9b 100644
--- a/app/code/Magento/Shipping/Block/Tracking/Popup.php
+++ b/app/code/Magento/Shipping/Block/Tracking/Popup.php
@@ -95,7 +95,7 @@ class Popup extends \Magento\Framework\View\Element\Template
{
return (bool)$this->_scopeConfig->getValue(
'contacts/contacts/enabled',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -106,7 +106,7 @@ class Popup extends \Magento\Framework\View\Element\Template
{
return $this->_scopeConfig->getValue(
'trans_email/ident_support/email',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Shipping/Helper/Carrier.php b/app/code/Magento/Shipping/Helper/Carrier.php
index 72a107fbe2d9ed23977064b573462aeb35aacd3f..370c083fbe0c8cdd8e4130d11e2756a40fe42a99 100644
--- a/app/code/Magento/Shipping/Helper/Carrier.php
+++ b/app/code/Magento/Shipping/Helper/Carrier.php
@@ -55,7 +55,7 @@ class Carrier extends \Magento\Framework\App\Helper\AbstractHelper
$carriersCodes = [];
foreach ($this->scopeConfig->getValue(
self::XML_PATH_CARRIERS_ROOT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) as $carrierCode => $carrier) {
if (isset($carrier['is_online']) && $carrier['is_online']) {
@@ -77,7 +77,7 @@ class Carrier extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->scopeConfig->getValue(
sprintf('%s/%s/%s', self::XML_PATH_CARRIERS_ROOT, $carrierCode, $configPath),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Shipping/Helper/Data.php b/app/code/Magento/Shipping/Helper/Data.php
index cf252a35c37b94dd56ae17d1a12b71ae84518529..c7cddf2cab81c15c62b9dffc4fb6accb44f43d39 100644
--- a/app/code/Magento/Shipping/Helper/Data.php
+++ b/app/code/Magento/Shipping/Helper/Data.php
@@ -35,7 +35,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -43,13 +43,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\App\Helper\Context $context
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
\Magento\Core\Helper\Data $coreData,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_coreData = $coreData;
$this->_scopeConfig = $scopeConfig;
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index b8a55919a2fbbce6cd1699272068174293e820fd..fd793ff3d03a7945feee7850449a192985b97485 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -126,7 +126,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
$path = 'carriers/' . $this->_code . '/' . $field;
return $this->_scopeConfig->getValue(
$path,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()
);
}
@@ -146,7 +146,7 @@ abstract class AbstractCarrier extends \Magento\Framework\Object implements Abst
$path = 'carriers/' . $this->_code . '/' . $field;
return $this->_scopeConfig->isSetFlag(
$path,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getStore()
);
}
diff --git a/app/code/Magento/Shipping/Model/CarrierFactory.php b/app/code/Magento/Shipping/Model/CarrierFactory.php
index 9f7e9d45ae0034c8122f9b6dda52415ff4d80589..ac7dcc25146347f60e41e5e6696a02b171dc1c1a 100644
--- a/app/code/Magento/Shipping/Model/CarrierFactory.php
+++ b/app/code/Magento/Shipping/Model/CarrierFactory.php
@@ -43,7 +43,7 @@ class CarrierFactory implements CarrierFactoryInterface
{
$className = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/model',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (!$className) {
return false;
@@ -64,7 +64,7 @@ class CarrierFactory implements CarrierFactoryInterface
{
$className = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/model',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
if (!$className) {
@@ -88,7 +88,7 @@ class CarrierFactory implements CarrierFactoryInterface
{
return $this->_scopeConfig->isSetFlag(
'carriers/' . $carrierCode . '/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) ? $this->get(
$carrierCode
) : false;
@@ -105,7 +105,7 @@ class CarrierFactory implements CarrierFactoryInterface
{
return $this->_scopeConfig->isSetFlag(
'carriers/' . $carrierCode . '/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) ? $this->create(
$carrierCode,
$storeId
diff --git a/app/code/Magento/Shipping/Model/Config.php b/app/code/Magento/Shipping/Model/Config.php
index 409d5b0ed551aef4187b5dc162a6409434bdbeb1..c5ac94f1ef5b3c51c82073bd1f07388fddd38694 100644
--- a/app/code/Magento/Shipping/Model/Config.php
+++ b/app/code/Magento/Shipping/Model/Config.php
@@ -59,9 +59,9 @@ class Config extends \Magento\Framework\Object
public function getActiveCarriers($store = null)
{
$carriers = [];
- $config = $this->_scopeConfig->getValue('carriers', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ $config = $this->_scopeConfig->getValue('carriers', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
foreach (array_keys($config) as $carrierCode) {
- if ($this->_scopeConfig->isSetFlag('carriers/' . $carrierCode . '/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)) {
+ if ($this->_scopeConfig->isSetFlag('carriers/' . $carrierCode . '/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)) {
$carrierModel = $this->_carrierFactory->create($carrierCode, $store);
if ($carrierModel) {
$carriers[$carrierCode] = $carrierModel;
@@ -80,7 +80,7 @@ class Config extends \Magento\Framework\Object
public function getAllCarriers($store = null)
{
$carriers = [];
- $config = $this->_scopeConfig->getValue('carriers', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ $config = $this->_scopeConfig->getValue('carriers', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
foreach (array_keys($config) as $carrierCode) {
$model = $this->_carrierFactory->create($carrierCode, $store);
if ($model) {
diff --git a/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php b/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
index 865607c0b5d38ffdd970125f72977660670169ce..00a7689b3ab4a72402b9ad0992504ce7dc08d898 100644
--- a/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
+++ b/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
@@ -52,7 +52,7 @@ class Allmethods implements \Magento\Framework\Option\ArrayInterface
}
$carrierTitle = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$methods[$carrierCode] = ['label' => $carrierTitle, 'value' => []];
foreach ($carrierMethods as $methodCode => $methodTitle) {
diff --git a/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php b/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
index 149a44bea9b23e350bbf2a1b1890154cf98357d8..2e481201d7f10cb6f2718eff22e947ddf4c48488 100644
--- a/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
+++ b/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
@@ -20,7 +20,7 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
protected $_carrierHelper;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -45,7 +45,7 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
* @param \Magento\Shipping\Helper\Carrier $carrierHelper
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param array $data
@@ -63,7 +63,7 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
Carrier $carrierHelper,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\Framework\Locale\ResolverInterface $localeResolver,
array $data = []
diff --git a/app/code/Magento/Shipping/Model/Order/Track.php b/app/code/Magento/Shipping/Model/Order/Track.php
index 1edb0e3647946f2263be93cb07b7472822391b7c..0c31d5fdd33186f6b07966df4278c91b984c5493 100644
--- a/app/code/Magento/Shipping/Model/Order/Track.php
+++ b/app/code/Magento/Shipping/Model/Order/Track.php
@@ -45,7 +45,7 @@ class Track extends \Magento\Sales\Model\Order\Shipment\Track
* @param AttributeValueFactory $customAttributeFactory
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
* @param \Magento\Framework\Stdlib\DateTime $dateTime
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory
* @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -61,7 +61,7 @@ class Track extends \Magento\Sales\Model\Order\Shipment\Track
AttributeValueFactory $customAttributeFactory,
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory,
\Magento\Shipping\Model\CarrierFactory $carrierFactory,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
@@ -87,7 +87,7 @@ class Track extends \Magento\Sales\Model\Order\Shipment\Track
/**
* Retrieve detail for shipment track
*
- * @return string
+ * @return \Magento\Framework\Phrase|string
*/
public function getNumberDetail()
{
diff --git a/app/code/Magento/Shipping/Model/Rate/Result.php b/app/code/Magento/Shipping/Model/Rate/Result.php
index 1d851271b3289a2563a54c2d8273f7774496f166..697b91b4d5941629c46b1caf9d4bffdbbecf0fb9 100644
--- a/app/code/Magento/Shipping/Model/Rate/Result.php
+++ b/app/code/Magento/Shipping/Model/Rate/Result.php
@@ -22,14 +22,14 @@ class Result
protected $_error = null;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index a1345b2c49bb798964d77c892b48e7152157f2f5..bcb067aba82ed22e0984fe47e43f52287ade8c48 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -42,7 +42,7 @@ class Shipping implements RateCollectorInterface
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -84,7 +84,7 @@ class Shipping implements RateCollectorInterface
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Shipping\Model\Config $shippingConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
* @param \Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory
@@ -95,7 +95,7 @@ class Shipping implements RateCollectorInterface
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Shipping\Model\Config $shippingConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Shipping\Model\CarrierFactory $carrierFactory,
\Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
\Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory,
@@ -173,25 +173,25 @@ class Shipping implements RateCollectorInterface
$request->setCountryId(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStore()
)
)->setRegionId(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_REGION_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStore()
)
)->setCity(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_CITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStore()
)
)->setPostcode(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ZIP,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStore()
)
);
@@ -201,7 +201,7 @@ class Shipping implements RateCollectorInterface
if (!$limitCarrier) {
$carriers = $this->_scopeConfig->getValue(
'carriers',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
@@ -215,7 +215,7 @@ class Shipping implements RateCollectorInterface
foreach ($limitCarrier as $carrierCode) {
$carrierConfig = $this->_scopeConfig->getValue(
'carriers/' . $carrierCode,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
if (!$carrierConfig) {
diff --git a/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php b/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
index a8c01d74f9930565f8c1be73c32d09c5f81ca699..e51a5eb891f07b31598f2cbe03c30d5d4829c0e0 100644
--- a/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
+++ b/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
@@ -95,7 +95,7 @@ class LabelGenerator
$carrierCode = $carrier->getCarrierCode();
$carrierTitle = $this->scopeConfig->getValue(
'carriers/' . $carrierCode . '/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipment->getStoreId()
);
if (!empty($trackingNumbers)) {
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
index aae0b8c863dfc4376e22f65e80b3afc61b2a7827..40b7add661e011da1e88900076c500ef482f6865 100644
--- a/app/code/Magento/Shipping/Model/Shipping/Labels.php
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -29,7 +29,7 @@ class Labels extends \Magento\Shipping\Model\Shipping
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Shipping\Model\Config $shippingConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
* @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
* @param \Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory
@@ -43,7 +43,7 @@ class Labels extends \Magento\Shipping\Model\Shipping
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Shipping\Model\Config $shippingConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Shipping\Model\CarrierFactory $carrierFactory,
\Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
\Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory,
@@ -91,7 +91,7 @@ class Labels extends \Magento\Shipping\Model\Shipping
}
$shipperRegionCode = $this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_REGION_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
);
if (is_numeric($shipperRegionCode)) {
@@ -102,18 +102,18 @@ class Labels extends \Magento\Shipping\Model\Shipping
$originStreet1 = $this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ADDRESS1,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
);
$originStreet2 = $this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ADDRESS2,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
);
$storeInfo = new \Magento\Framework\Object(
(array)$this->_scopeConfig->getValue(
'general/store_information',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
);
@@ -126,17 +126,17 @@ class Labels extends \Magento\Shipping\Model\Shipping
|| !$shipperRegionCode
|| !$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_CITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
|| !$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ZIP,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
|| !$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
) {
@@ -162,7 +162,7 @@ class Labels extends \Magento\Shipping\Model\Shipping
$request->setShipperAddressCity(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_CITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
);
@@ -170,14 +170,14 @@ class Labels extends \Magento\Shipping\Model\Shipping
$request->setShipperAddressPostalCode(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_ZIP,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
);
$request->setShipperAddressCountryCode(
$this->_scopeConfig->getValue(
Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$shipmentStoreId
)
);
diff --git a/app/code/Magento/Shipping/Model/Tracking/Result/Error.php b/app/code/Magento/Shipping/Model/Tracking/Result/Error.php
index a13d075b5289612a320f10dff69f383cc74d6919..e358d27e262b1c868356fbf8436c01e95c83a473 100644
--- a/app/code/Magento/Shipping/Model/Tracking/Result/Error.php
+++ b/app/code/Magento/Shipping/Model/Tracking/Result/Error.php
@@ -16,7 +16,7 @@ class Error extends \Magento\Shipping\Model\Tracking\Result\AbstractResult
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getErrorMessage()
{
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index e31d90f6f33972892a9bd47bdc1fae939ecf37e7..77dc03aa13c11f1c058c3416787acfeaa5944746 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -3,27 +3,28 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-contact": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-payment": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-contact": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-payment": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"ext-gd": "*",
"magento/magento-composer-installer": "*"
},
"suggest": {
- "magento/module-fedex": "0.42.0-beta6",
- "magento/module-ups": "0.42.0-beta6"
+ "magento/module-fedex": "0.42.0-beta7",
+ "magento/module-ups": "0.42.0-beta7"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Shipping/etc/acl.xml b/app/code/Magento/Shipping/etc/acl.xml
index 688f440c72ff2ff0f301b5736727e063648b77c2..33ba4f281af9380955cd4f211caad2375d7d00c6 100644
--- a/app/code/Magento/Shipping/etc/acl.xml
+++ b/app/code/Magento/Shipping/etc/acl.xml
@@ -8,10 +8,10 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Shipping::config_shipping" title="Shipping Settings Section" sortOrder="5" />
<resource id="Magento_Shipping::carriers" title="Shipping Methods Section" sortOrder="5" />
</resource>
diff --git a/app/code/Magento/Shipping/etc/adminhtml/routes.xml b/app/code/Magento/Shipping/etc/adminhtml/routes.xml
index 3386f25e4279604288f05c8b7c199f0bfb52a918..84ec0473a9dd43d4119edfa21ea0d264e56671fb 100644
--- a/app/code/Magento/Shipping/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Shipping/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_Shipping" before="Magento_Adminhtml" />
+ <module name="Magento_Shipping" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Shipping/etc/module.xml b/app/code/Magento/Shipping/etc/module.xml
index 866bf77d0bb5ed00260f3b5a1891ca4a6afebc43..f5eded937589818203e4e6528277d82548d2401e 100644
--- a/app/code/Magento/Shipping/etc/module.xml
+++ b/app/code/Magento/Shipping/etc/module.xml
@@ -9,6 +9,7 @@
<module name="Magento_Shipping" schema_version="2.0.0">
<sequence>
<module name="Magento_Core"/>
+ <module name="Magento_Store"/>
<module name="Magento_Catalog"/>
</sequence>
</module>
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
index 7ff683263067299f8efb6acbfaf53dd013687b7a..12dd3a36b8de3dda2df62cf8c2aca0ed5cca86bc 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
@@ -67,7 +67,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Get edit form container header text
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Sitemap/Helper/Data.php b/app/code/Magento/Sitemap/Helper/Data.php
index f0797809c1c0721ec01471ede4a97a6f2c3a216c..2f126755503755c60bad283ac3f5f93bd5c2b460 100644
--- a/app/code/Magento/Sitemap/Helper/Data.php
+++ b/app/code/Magento/Sitemap/Helper/Data.php
@@ -10,7 +10,7 @@
*/
namespace Magento\Sitemap\Helper;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index 42b33a2aebc33376a1e5bc8cadba35fb87ddaf07..f0f7066e7091ecca43e48db61813d9b5adf4c622 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -55,7 +55,7 @@ class Observer
protected $_transportBuilder;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -67,14 +67,14 @@ class Observer
/**
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param Resource\Sitemap\CollectionFactory $collectionFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
*/
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Sitemap\Model\Resource\Sitemap\CollectionFactory $collectionFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
) {
@@ -100,7 +100,7 @@ class Observer
// check if scheduled generation enabled
if (!$this->_scopeConfig->isSetFlag(
self::XML_PATH_GENERATION_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return;
@@ -120,7 +120,7 @@ class Observer
if ($errors && $this->_scopeConfig->getValue(
self::XML_PATH_ERROR_RECIPIENT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
$translate = $this->_translateModel->getTranslateInline();
@@ -129,7 +129,7 @@ class Observer
$this->_transportBuilder->setTemplateIdentifier(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_TEMPLATE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -141,12 +141,12 @@ class Observer
)->setFrom(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_IDENTITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->addTo(
$this->_scopeConfig->getValue(
self::XML_PATH_ERROR_RECIPIENT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$transport = $this->_transportBuilder->getTransport();
diff --git a/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php b/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php
index 5b617eb4be1a3e37dce1df06e7bda1ffad9f5ad7..acb50839e3132a80c9c7b484a7bdfa1fdd9cc3cc 100644
--- a/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php
+++ b/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php
@@ -29,7 +29,7 @@ class Category extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_attributesCache = [];
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -40,12 +40,12 @@ class Category extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Resource\Category $categoryResource
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Resource\Category $categoryResource
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
index 3e6f958844a9c65719efc5fecebb3d3f0c63e50e..bd3741d3f5f416e92d896f10ed3053b97ba5f6df 100644
--- a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
@@ -53,7 +53,7 @@ class Product extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_productResource;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -86,7 +86,7 @@ class Product extends \Magento\Framework\Model\Resource\Db\AbstractDb
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Sitemap\Helper\Data $sitemapData
* @param \Magento\Catalog\Model\Resource\Product $productResource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Model\Product\Visibility $productVisibility
* @param \Magento\Catalog\Model\Product\Attribute\Source\Status $productStatus
* @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media $mediaAttribute
@@ -97,7 +97,7 @@ class Product extends \Magento\Framework\Model\Resource\Db\AbstractDb
\Magento\Framework\App\Resource $resource,
\Magento\Sitemap\Helper\Data $sitemapData,
\Magento\Catalog\Model\Resource\Product $productResource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Model\Product\Visibility $productVisibility,
\Magento\Catalog\Model\Product\Attribute\Source\Status $productStatus,
\Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media $mediaAttribute,
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 40647aa6460a149125d4861cb029c8ce0ac42924..4baabe60a907eb0d60984115ce3e29cb3ad54142 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -132,7 +132,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel
protected $_dateModel;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -156,7 +156,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Sitemap\Model\Resource\Catalog\ProductFactory $productFactory
* @param \Magento\Sitemap\Model\Resource\Cms\PageFactory $cmsFactory
* @param \Magento\Framework\Stdlib\DateTime\DateTime $modelDate
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -174,7 +174,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel
\Magento\Sitemap\Model\Resource\Catalog\ProductFactory $productFactory,
\Magento\Sitemap\Model\Resource\Cms\PageFactory $cmsFactory,
\Magento\Framework\Stdlib\DateTime\DateTime $modelDate,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\RequestInterface $request,
\Magento\Framework\Stdlib\DateTime $dateTime,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index 302c45bb4bdc54da6be792afc9a83488687c26fb..7dd2df20a1306b5506c87299ec851ef0a51f42d1 100644
--- a/app/code/Magento/Sitemap/composer.json
+++ b/app/code/Magento/Sitemap/composer.json
@@ -3,18 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-cms": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-catalog-url-rewrite": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-catalog-url-rewrite": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Sitemap/etc/acl.xml b/app/code/Magento/Sitemap/etc/acl.xml
index a56ca7b98979d25b061345f759b7a626f602e828..f1435275d08de3296e1f212adaf3271fe3ffb7d5 100644
--- a/app/code/Magento/Sitemap/etc/acl.xml
+++ b/app/code/Magento/Sitemap/etc/acl.xml
@@ -8,15 +8,15 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::marketing">
- <resource id="Magento_Adminhtml::marketing_seo">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::marketing">
+ <resource id="Magento_Backend::marketing_seo">
<resource id="Magento_Sitemap::sitemap" title="Site Map" sortOrder="30" />
</resource>
</resource>
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Sitemap::config_sitemap" title="XML Sitemap Section" sortOrder="70"/>
</resource>
</resource>
diff --git a/app/code/Magento/Sitemap/etc/adminhtml/routes.xml b/app/code/Magento/Sitemap/etc/adminhtml/routes.xml
index e1184e5afa51962a8990a0796e8e45a96cb060cb..1ed96642095991b7195ef8658f86956bb7ff349a 100644
--- a/app/code/Magento/Sitemap/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Sitemap/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_Sitemap" before="Magento_Adminhtml" />
+ <module name="Magento_Sitemap" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php
index 072b69c077e6104e2c1acef6b3a41d86942173f9..9ac06a3058ba99fbf04e3fe211ad8e6e1e835e6d 100644
--- a/app/code/Magento/Store/App/Action/Plugin/Context.php
+++ b/app/code/Magento/Store/App/Action/Plugin/Context.php
@@ -27,7 +27,7 @@ class Context
protected $httpRequest;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -35,13 +35,13 @@ class Context
* @param \Magento\Framework\Session\SessionManagerInterface $session
* @param \Magento\Framework\App\Http\Context $httpContext
* @param \Magento\Framework\App\Request\Http $httpRequest
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\Session\SessionManagerInterface $session,
\Magento\Framework\App\Http\Context $httpContext,
\Magento\Framework\App\Request\Http $httpRequest,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->session = $session;
$this->httpContext = $httpContext;
diff --git a/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php b/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
index fef3ede1122188f73441e21a7085e8aa9ec63025..048f66b3a145133ccfba8169ba58c5fd259df35a 100644
--- a/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
+++ b/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
@@ -9,15 +9,15 @@ namespace Magento\Store\App\Action\Plugin;
class StoreCheck
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php b/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
index 629a9fba8c317dbed8ed2822f0e4eeae8a90d8be..57307c083d01246894146ce4e3aa865a172bee20 100644
--- a/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
+++ b/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
@@ -23,18 +23,18 @@ class RequestPreprocessor
protected $_url;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\UrlInterface $url
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Framework\App\ResponseFactory $responseFactory
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\UrlInterface $url,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Framework\App\ResponseFactory $responseFactory
@@ -74,7 +74,7 @@ class RequestPreprocessor
);
$redirectCode = (int)$this->_scopeConfig->getValue(
'web/url/redirect_to_base',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) !== 301 ? 302 : 301;
$response = $this->_responseFactory->create();
@@ -97,7 +97,7 @@ class RequestPreprocessor
{
return (bool)$this->_scopeConfig->getValue(
'web/url/redirect_to_base',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
index 1a9491e3f60feadc3cd2142e6301588b1319cacb..2868f27a9dd7a3f56182afa9eb9feda29e4196c3 100644
--- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php
+++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
@@ -8,14 +8,14 @@ namespace Magento\Store\App\Request;
class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
private $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php
index 3254ec7f20656e80e064a9347e9df938c7d5c964..6c156523c881a0adeebad20a078ba58f3346b6a6 100644
--- a/app/code/Magento/Store/App/Response/Redirect.php
+++ b/app/code/Magento/Store/App/Response/Redirect.php
@@ -15,7 +15,7 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
protected $_request;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -48,7 +48,7 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
* Constructor
*
* @param \Magento\Framework\App\RequestInterface $request
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Encryption\UrlCoder $urlCoder
* @param \Magento\Framework\Session\SessionManagerInterface $session
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -57,7 +57,7 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
*/
public function __construct(
\Magento\Framework\App\RequestInterface $request,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Encryption\UrlCoder $urlCoder,
\Magento\Framework\Session\SessionManagerInterface $session,
\Magento\Framework\Session\SidResolverInterface $sidResolver,
diff --git a/app/code/Magento/Store/Block/Store/Switcher.php b/app/code/Magento/Store/Block/Store/Switcher.php
index 9c76ffce016705bb8384336573f06c8c22e300d8..81cba0a463f1841002f71b0a60390d2684864941 100644
--- a/app/code/Magento/Store/Block/Store/Switcher.php
+++ b/app/code/Magento/Store/Block/Store/Switcher.php
@@ -89,7 +89,7 @@ class Switcher extends \Magento\Framework\View\Element\Template
}
$store->setLocaleCode($this->_scopeConfig->getValue(
\Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store->getId()
));
$this->_stores[$store->getGroupId()][$store->getId()] = $store;
@@ -108,7 +108,7 @@ class Switcher extends \Magento\Framework\View\Element\Template
$stores = [];
$localeCode = $this->_scopeConfig->getValue(
\Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
foreach ($this->_groups as $group) {
if (!isset($this->_stores[$group->getId()])) {
diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index 4e0afa2811524fb9af4c3090037762ee3d909cc0..ffbcfec3868b8659efa5cacb64699ef96d5f4b01 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -95,7 +95,7 @@ class Switcher extends \Magento\Framework\View\Element\Template
}
$localeCode = $this->_scopeConfig->getValue(
\Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
$store->setLocaleCode($localeCode);
@@ -127,7 +127,7 @@ class Switcher extends \Magento\Framework\View\Element\Template
$groups = [];
$localeCode = $this->_scopeConfig->getValue(
\Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
foreach ($rawGroups as $group) {
/* @var $group Group */
diff --git a/app/code/Magento/Store/Model/App/Emulation.php b/app/code/Magento/Store/Model/App/Emulation.php
index 131a7a270db2cb00a8ad9b1c073b141a793c69ed..5b64511218ac279cc0bc1bb8c56a4e73436d9f8a 100644
--- a/app/code/Magento/Store/Model/App/Emulation.php
+++ b/app/code/Magento/Store/Model/App/Emulation.php
@@ -17,7 +17,7 @@ use Magento\Framework\Translate\Inline\ConfigInterface;
class Emulation extends \Magento\Framework\Object
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -61,7 +61,7 @@ class Emulation extends \Magento\Framework\Object
private $initialEnvironmentInfo;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\DesignInterface $viewDesign
* @param \Magento\Framework\App\DesignInterface $design
* @param \Magento\Framework\TranslateInterface $translate
@@ -72,7 +72,7 @@ class Emulation extends \Magento\Framework\Object
* @param array $data
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\DesignInterface $viewDesign,
\Magento\Framework\App\DesignInterface $design,
\Magento\Framework\TranslateInterface $translate,
@@ -131,7 +131,7 @@ class Emulation extends \Magento\Framework\Object
// emulate locale
$newLocaleCode = $this->_scopeConfig->getValue(
$this->_localeResolver->getDefaultLocalePath(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
);
$this->_localeResolver->setLocaleCode($newLocaleCode);
diff --git a/app/code/Magento/Store/Model/Config/Reader/Store.php b/app/code/Magento/Store/Model/Config/Reader/Store.php
index d505a38b7820bda6591dac4f943fb75dd5d7910f..c5456bcb102f9ad2952c17f33ac41f48c1ae777a 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Store.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Store.php
@@ -35,7 +35,7 @@ class Store implements \Magento\Framework\App\Config\Scope\ReaderInterface
protected $_storeFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -45,7 +45,7 @@ class Store implements \Magento\Framework\App\Config\Scope\ReaderInterface
* @param \Magento\Store\Model\Config\Converter $converter
* @param \Magento\Store\Model\Resource\Config\Collection\ScopedFactory $collectionFactory
* @param \Magento\Store\Model\StoreFactory $storeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Config\Initial $initialConfig,
@@ -53,7 +53,7 @@ class Store implements \Magento\Framework\App\Config\Scope\ReaderInterface
\Magento\Store\Model\Config\Converter $converter,
\Magento\Store\Model\Resource\Config\Collection\ScopedFactory $collectionFactory,
\Magento\Store\Model\StoreFactory $storeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_initialConfig = $initialConfig;
$this->_scopePool = $scopePool;
@@ -85,13 +85,13 @@ class Store implements \Magento\Framework\App\Config\Scope\ReaderInterface
throw NoSuchEntityException::singleField('storeCode', $code);
}
$websiteConfig = $this->_scopePool->getScope(
- \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE,
$store->getWebsite()->getCode()
)->getSource();
$config = array_replace_recursive($websiteConfig, $this->_initialConfig->getData("stores|{$code}"));
$collection = $this->_collectionFactory->create(
- ['scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORES, 'scopeId' => $store->getId()]
+ ['scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORES, 'scopeId' => $store->getId()]
);
$dbStoreConfig = [];
foreach ($collection as $item) {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Website.php b/app/code/Magento/Store/Model/Config/Reader/Website.php
index 1f67c4276b79e56425490c4dd9453a157bcf841f..1448b04bf9afbf5e6b49b5e223f53b9ec2a52f69 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Website.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Website.php
@@ -69,7 +69,7 @@ class Website implements \Magento\Framework\App\Config\Scope\ReaderInterface
$website = $this->_websiteFactory->create();
$website->load($code);
$collection = $this->_collectionFactory->create(
- ['scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES, 'scopeId' => $website->getId()]
+ ['scope' => \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES, 'scopeId' => $website->getId()]
);
$dbWebsiteConfig = [];
foreach ($collection as $configValue) {
diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index 4cc2707ee3bb80a727e22ebf92082eeda486468a..03c7fdfd4206a741c9eb880aa4feeba3db3c6288 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -90,7 +90,7 @@ class Group extends \Magento\Framework\Model\AbstractModel implements \Magento\F
protected $_storeListFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -99,7 +99,7 @@ class Group extends \Magento\Framework\Model\AbstractModel implements \Magento\F
* @param \Magento\Framework\Registry $registry
* @param \Magento\Core\Model\Resource\Config\Data $configDataResource
* @param \Magento\Store\Model\Store $store
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
* @param array $data
@@ -109,7 +109,7 @@ class Group extends \Magento\Framework\Model\AbstractModel implements \Magento\F
\Magento\Framework\Registry $registry,
\Magento\Core\Model\Resource\Config\Data $configDataResource,
\Magento\Store\Model\Resource\Store\CollectionFactory $storeListFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
@@ -355,7 +355,7 @@ class Group extends \Magento\Framework\Model\AbstractModel implements \Magento\F
public function beforeDelete()
{
$this->_configDataResource->clearScopeData(
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
$this->getStoreIds()
);
return parent::beforeDelete();
diff --git a/app/code/Magento/Store/Model/Resolver/Store.php b/app/code/Magento/Store/Model/Resolver/Store.php
index 39f285b914b5c6083be803bfaf1425e16b173758..2acf0aedb21cbdc2dae145f6c9d9e1cd77a33322 100644
--- a/app/code/Magento/Store/Model/Resolver/Store.php
+++ b/app/code/Magento/Store/Model/Resolver/Store.php
@@ -8,14 +8,14 @@ namespace Magento\Store\Model\Resolver;
class Store implements \Magento\Framework\App\ScopeResolverInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
}
@@ -33,4 +33,14 @@ class Store implements \Magento\Framework\App\ScopeResolverInterface
return $scope;
}
+
+ /**
+ * Retrieve a list of available stores
+ *
+ * @return \Magento\Store\Model\Store[]
+ */
+ public function getScopes()
+ {
+ return $this->_storeManager->getStores();
+ }
}
diff --git a/app/code/Magento/Store/Model/Resolver/Website.php b/app/code/Magento/Store/Model/Resolver/Website.php
index 3fd696712b028643cd836018d892da2e4cbac559..cdfb825fc025c4609d8e7e668025ac6360438386 100644
--- a/app/code/Magento/Store/Model/Resolver/Website.php
+++ b/app/code/Magento/Store/Model/Resolver/Website.php
@@ -8,15 +8,15 @@ namespace Magento\Store\Model\Resolver;
class Website implements \Magento\Framework\App\ScopeResolverInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_storeManager = $storeManager;
}
@@ -34,4 +34,14 @@ class Website implements \Magento\Framework\App\ScopeResolverInterface
return $scope;
}
+
+ /**
+ * Retrieve a list of available websites
+ *
+ * @return \Magento\Store\Model\Website[]
+ */
+ public function getScopes()
+ {
+ return $this->_storeManager->getWebsites();
+ }
}
diff --git a/app/code/Magento/Store/Model/Resource/Store.php b/app/code/Magento/Store/Model/Resource/Store.php
index e7c3a0336ddfb41dbcba7fad23d22f4f22064355..6add5aff1e6600c9f5030659cd089c034d100995 100644
--- a/app/code/Magento/Store/Model/Resource/Store.php
+++ b/app/code/Magento/Store/Model/Resource/Store.php
@@ -73,7 +73,7 @@ class Store extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
{
$where = [
- 'scope = ?' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
+ 'scope = ?' => \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
'scope_id = ?' => $model->getStoreId(),
];
diff --git a/app/code/Magento/Store/Model/Resource/Website.php b/app/code/Magento/Store/Model/Resource/Website.php
index 82bd6f6ce9b2b82624225f8f2f88fc14a087ef65..1213b6c8de7eb359b7eb8ef6a36a4aaa69c0145a 100644
--- a/app/code/Magento/Store/Model/Resource/Website.php
+++ b/app/code/Magento/Store/Model/Resource/Website.php
@@ -79,7 +79,7 @@ class Website extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
{
$where = [
- 'scope = ?' => \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES,
+ 'scope = ?' => \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
'scope_id = ?' => $model->getWebsiteId(),
];
diff --git a/lib/internal/Magento/Framework/Store/ScopeInterface.php b/app/code/Magento/Store/Model/ScopeInterface.php
similarity index 91%
rename from lib/internal/Magento/Framework/Store/ScopeInterface.php
rename to app/code/Magento/Store/Model/ScopeInterface.php
index 0f1cfc677ff6ac62dab64e8d891c07cb28d5bc72..4699d335e899687696c3914402e166fd059c8665 100644
--- a/lib/internal/Magento/Framework/Store/ScopeInterface.php
+++ b/app/code/Magento/Store/Model/ScopeInterface.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Framework\Store;
+namespace Magento\Store\Model;
interface ScopeInterface
{
diff --git a/app/code/Magento/Store/Model/Storage/Db.php b/app/code/Magento/Store/Model/Storage/Db.php
index c6713738d24596c082fd5c6cd5e97e20859c892d..f9cd545b5b1e740fa844a6c6cc336a6bda61766e 100644
--- a/app/code/Magento/Store/Model/Storage/Db.php
+++ b/app/code/Magento/Store/Model/Storage/Db.php
@@ -18,7 +18,7 @@ use Magento\Store\Model\WebsiteFactory as WebsiteFactory;
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Db implements \Magento\Framework\Store\StoreManagerInterface
+class Db implements \Magento\Store\Model\StoreManagerInterface
{
/**
* Flag that shows that system has only one store view
@@ -534,7 +534,7 @@ class Db implements \Magento\Framework\Store\StoreManagerInterface
{
return (bool)$this->_scopeConfig->getValue(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Store/Model/Storage/DefaultStorage.php b/app/code/Magento/Store/Model/Storage/DefaultStorage.php
index 5afca24a7086f8f9c0f59aa24cd6baab93390873..1a55f0eef7cd3313df2564dbc70f8a53e5547058 100644
--- a/app/code/Magento/Store/Model/Storage/DefaultStorage.php
+++ b/app/code/Magento/Store/Model/Storage/DefaultStorage.php
@@ -7,7 +7,7 @@
*/
namespace Magento\Store\Model\Storage;
-class DefaultStorage implements \Magento\Framework\Store\StoreManagerInterface
+class DefaultStorage implements \Magento\Store\Model\StoreManagerInterface
{
/**
* Application store object
diff --git a/app/code/Magento/Store/Model/StorageFactory.php b/app/code/Magento/Store/Model/StorageFactory.php
index a8ade74ca0bc10af39ffde014bc9e4d30d3ed56b..cf53216bd169cd611b88f46838345831bef4bfaf 100644
--- a/app/code/Magento/Store/Model/StorageFactory.php
+++ b/app/code/Magento/Store/Model/StorageFactory.php
@@ -6,8 +6,6 @@
namespace Magento\Store\Model;
use Magento\Framework\Profiler;
-use Magento\Framework\Store\ScopeInterface;
-use Magento\Framework\Store\StoreManagerInterface;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -27,7 +25,7 @@ class StorageFactory
protected $_storageClassName;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface[]
+ * @var \Magento\Store\Model\StoreManagerInterface[]
*/
protected $_cache = [];
@@ -98,7 +96,7 @@ class StorageFactory
* Get storage instance
*
* @param array $arguments
- * @return \Magento\Framework\Store\StoreManagerInterface
+ * @return \Magento\Store\Model\StoreManagerInterface
* @throws \InvalidArgumentException
*/
public function get(array $arguments = [])
@@ -106,12 +104,12 @@ class StorageFactory
$className = $this->_storageClassName;
if (false == isset($this->_cache[$className])) {
- /** @var $storage \Magento\Framework\Store\StoreManagerInterface */
+ /** @var $storage \Magento\Store\Model\StoreManagerInterface */
$storage = $this->_objectManager->create($className, $arguments);
- if (false === ($storage instanceof \Magento\Framework\Store\StoreManagerInterface)) {
+ if (false === ($storage instanceof \Magento\Store\Model\StoreManagerInterface)) {
throw new \InvalidArgumentException(
- $className . ' doesn\'t implement \Magento\Framework\Store\StoreManagerInterface'
+ $className . ' doesn\'t implement \Magento\Store\Model\StoreManagerInterface'
);
}
$this->_cache[$className] = $storage;
@@ -119,7 +117,7 @@ class StorageFactory
$this->_reinitStores($storage, $arguments);
$useSid = $this->_scopeConfig->isSetFlag(
\Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storage->getStore()
);
$this->_sidResolver->setUseSessionInUrl($useSid);
@@ -133,12 +131,12 @@ class StorageFactory
/**
* Initialize currently ran store
*
- * @param \Magento\Framework\Store\StoreManagerInterface $storage
+ * @param \Magento\Store\Model\StoreManagerInterface $storage
* @param array $arguments
* @return void
* @throws \Magento\Framework\App\InitException
*/
- protected function _reinitStores(\Magento\Framework\Store\StoreManagerInterface $storage, $arguments)
+ protected function _reinitStores(\Magento\Store\Model\StoreManagerInterface $storage, $arguments)
{
Profiler::start('init_stores');
$storage->reinitStores();
@@ -174,11 +172,11 @@ class StorageFactory
}
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storage
+ * @param \Magento\Store\Model\StoreManagerInterface $storage
* @param string $scopeCode
* @return null|string
*/
- protected function _getStoreByGroup(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode)
+ protected function _getStoreByGroup(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
{
$groups = $storage->getGroups(true);
$stores = $storage->getStores(true);
@@ -192,11 +190,11 @@ class StorageFactory
}
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storage
+ * @param \Magento\Store\Model\StoreManagerInterface $storage
* @param string $scopeCode
* @return null|string
*/
- protected function _getStoreByWebsite(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode)
+ protected function _getStoreByWebsite(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
{
$websites = $storage->getWebsites(true, true);
if (!isset($websites[$scopeCode])) {
@@ -209,11 +207,11 @@ class StorageFactory
}
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storage
+ * @param \Magento\Store\Model\StoreManagerInterface $storage
* @param string $scopeType
* @return void
*/
- protected function _checkCookieStore(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeType)
+ protected function _checkCookieStore(\Magento\Store\Model\StoreManagerInterface $storage, $scopeType)
{
$storeCode = $storage->getStore()->getStoreCodeFromCookie();
if (null != $storeCode) {
@@ -222,11 +220,11 @@ class StorageFactory
}
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storage
+ * @param \Magento\Store\Model\StoreManagerInterface $storage
* @param string $scopeType
* @return void
*/
- protected function _checkRequestStore(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeType)
+ protected function _checkRequestStore(\Magento\Store\Model\StoreManagerInterface $storage, $scopeType)
{
$storeCode = $this->request->getParam('___store');
if (empty($storeCode)) {
@@ -261,7 +259,7 @@ class StorageFactory
* @param string $scopeCode
* @return bool|Store
*/
- protected function getActiveStoreByCode(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode)
+ protected function getActiveStoreByCode(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
{
$stores = $storage->getStores(true, true);
if ($scopeCode && isset($stores[$scopeCode])
@@ -276,12 +274,12 @@ class StorageFactory
/**
* Set current store
*
- * @param \Magento\Framework\Store\StoreManagerInterface $storage
+ * @param \Magento\Store\Model\StoreManagerInterface $storage
* @param string $scopeCode
* @param string $scopeType
* @return bool
*/
- protected function setCurrentStore(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode, $scopeType)
+ protected function setCurrentStore(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode, $scopeType)
{
$store = $this->getActiveStoreByCode($storage, $scopeCode);
if (!$store) {
@@ -295,13 +293,13 @@ class StorageFactory
*/
$setStore = false;
switch ($scopeType) {
- case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE:
+ case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
$setStore = $store->getWebsiteId() == $curStoreObj->getWebsiteId();
break;
- case \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP:
+ case \Magento\Store\Model\ScopeInterface::SCOPE_GROUP:
$setStore = $store->getGroupId() == $curStoreObj->getGroupId();
break;
- case \Magento\Framework\Store\ScopeInterface::SCOPE_STORE:
+ case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
$setStore = true;
break;
}
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index 89beeac16ebd1df696c5033486bb0dbb486b96c2..a3e374c9d3cde943acbee06aef3e2a0c4f1ab6b2 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -7,7 +7,6 @@ namespace Magento\Store\Model;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\Store\ScopeInterface;
/**
* Store model
@@ -311,7 +310,7 @@ class Store extends AbstractModel implements
* @param \Magento\Core\Model\Resource\Config\Data $configDataResource
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
* @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
* @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
@@ -335,7 +334,7 @@ class Store extends AbstractModel implements
\Magento\Core\Model\Resource\Config\Data $configDataResource,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\App\Config\ReinitableConfigInterface $config,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Session\SidResolverInterface $sidResolver,
\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
\Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
@@ -721,7 +720,7 @@ class Store extends AbstractModel implements
if ($this->_isFrontSecure === null) {
$this->_isFrontSecure = $this->_config->isSetFlag(
self::XML_PATH_SECURE_IN_FRONTEND,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->getId()
);
}
@@ -749,7 +748,7 @@ class Store extends AbstractModel implements
$secureBaseUrl = $this->_config->getValue(
self::XML_PATH_SECURE_BASE_URL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (!$secureBaseUrl) {
@@ -1126,7 +1125,7 @@ class Store extends AbstractModel implements
public function beforeDelete()
{
$this->_configDataResource->clearScopeData(
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
$this->getId()
);
@@ -1184,7 +1183,7 @@ class Store extends AbstractModel implements
if (null === $this->_frontendName) {
$storeGroupName = (string)$this->_config->getValue(
'general/store_information/name',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this
);
$this->_frontendName = !empty($storeGroupName) ? $storeGroupName : $this->getGroup()->getName();
diff --git a/app/code/Magento/Store/Model/StoreManager.php b/app/code/Magento/Store/Model/StoreManager.php
index bc3184809baaa50bbbad87de123d13a13fe363e9..44e953feb846935a57fdf1b4a8562224395ff83c 100644
--- a/app/code/Magento/Store/Model/StoreManager.php
+++ b/app/code/Magento/Store/Model/StoreManager.php
@@ -5,9 +5,7 @@
*/
namespace Magento\Store\Model;
-use Magento\Framework\Store\ScopeInterface;
-
-class StoreManager implements \Magento\Framework\Store\StoreManagerInterface
+class StoreManager implements \Magento\Store\Model\StoreManagerInterface
{
/**
* Application run code
@@ -81,7 +79,7 @@ class StoreManager implements \Magento\Framework\Store\StoreManagerInterface
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storage;
@@ -109,11 +107,11 @@ class StoreManager implements \Magento\Framework\Store\StoreManagerInterface
/**
* Get storage instance
*
- * @return \Magento\Framework\Store\StoreManagerInterface
+ * @return \Magento\Store\Model\StoreManagerInterface
*/
protected function _getStorage()
{
- if (!$this->_storage instanceof \Magento\Framework\Store\StoreManagerInterface) {
+ if (!$this->_storage instanceof \Magento\Store\Model\StoreManagerInterface) {
$arguments = [
'isSingleStoreAllowed' => $this->_isSingleStoreAllowed,
'currentStore' => $this->_currentStore,
@@ -278,7 +276,7 @@ class StoreManager implements \Magento\Framework\Store\StoreManagerInterface
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/lib/internal/Magento/Framework/Store/StoreManagerInterface.php b/app/code/Magento/Store/Model/StoreManagerInterface.php
similarity index 98%
rename from lib/internal/Magento/Framework/Store/StoreManagerInterface.php
rename to app/code/Magento/Store/Model/StoreManagerInterface.php
index 44ea779d287f69dcd2cf2564b8824f836754febb..e0f9be67a13a97f28b4a1bf4b515c6c3bc6b155d 100644
--- a/lib/internal/Magento/Framework/Store/StoreManagerInterface.php
+++ b/app/code/Magento/Store/Model/StoreManagerInterface.php
@@ -4,7 +4,7 @@
* See COPYING.txt for license details.
*/
-namespace Magento\Framework\Store;
+namespace Magento\Store\Model;
interface StoreManagerInterface
{
diff --git a/app/code/Magento/Store/Model/StoresConfig.php b/app/code/Magento/Store/Model/StoresConfig.php
index d5b9ce046574e9c4feec7841ed7f5dcf24dd0a31..139c2ad56522af4208d60bb93bdfb071bc06d0e0 100644
--- a/app/code/Magento/Store/Model/StoresConfig.php
+++ b/app/code/Magento/Store/Model/StoresConfig.php
@@ -7,12 +7,11 @@
namespace Magento\Store\Model;
use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Store\ScopeInterface;
class StoresConfig
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -22,11 +21,11 @@ class StoresConfig
protected $_config;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $config
) {
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Store/Model/System/Store.php b/app/code/Magento/Store/Model/System/Store.php
index 9cc19538e0c70333d8472496c434b6aef70e10ea..d12f4d791e310915f62055ac738d48120815d0b8 100644
--- a/app/code/Magento/Store/Model/System/Store.php
+++ b/app/code/Magento/Store/Model/System/Store.php
@@ -40,7 +40,7 @@ class Store extends \Magento\Framework\Object
private $_isAdminScopeAllowed = true;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -48,9 +48,9 @@ class Store extends \Magento\Framework\Object
* Init model
* Load Website, Group and Store collections
*
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->_storeManager = $storeManager;
return $this->reload();
@@ -406,13 +406,13 @@ class Store extends \Magento\Framework\Object
$this->_loadStoreCollection();
} else {
switch ($type) {
- case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE:
+ case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
$this->_loadWebsiteCollection();
break;
- case \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP:
+ case \Magento\Store\Model\ScopeInterface::SCOPE_GROUP:
$this->_loadGroupCollection();
break;
- case \Magento\Framework\Store\ScopeInterface::SCOPE_STORE:
+ case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
$this->_loadStoreCollection();
break;
default:
diff --git a/app/code/Magento/Store/Model/Website.php b/app/code/Magento/Store/Model/Website.php
index 458d0d84e6f192e1e6c7e8e2d3d4e8e50589b7a0..6299b99237f2014b79cade78d25fc19bf2763ce8 100644
--- a/app/code/Magento/Store/Model/Website.php
+++ b/app/code/Magento/Store/Model/Website.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Store\Model;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
/**
* Core Website model
@@ -172,7 +172,7 @@ class Website extends \Magento\Framework\Model\AbstractModel implements
* @param \Magento\Store\Model\StoreFactory $storeFactory
* @param \Magento\Store\Model\GroupFactory $storeGroupFactory
* @param \Magento\Store\Model\WebsiteFactory $websiteFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -187,7 +187,7 @@ class Website extends \Magento\Framework\Model\AbstractModel implements
\Magento\Store\Model\StoreFactory $storeFactory,
\Magento\Store\Model\GroupFactory $storeGroupFactory,
\Magento\Store\Model\WebsiteFactory $websiteFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -240,7 +240,7 @@ class Website extends \Magento\Framework\Model\AbstractModel implements
if (!isset($this->_configCache[$path])) {
$config = $this->_coreConfig->getValue(
$path,
- \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE,
$this->getCode()
);
if (!$config) {
@@ -508,11 +508,11 @@ class Website extends \Magento\Framework\Model\AbstractModel implements
public function beforeDelete()
{
$this->_configDataResource->clearScopeData(
- \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES,
+ \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
$this->getId()
);
$this->_configDataResource->clearScopeData(
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
$this->getStoreIds()
);
return parent::beforeDelete();
diff --git a/app/code/Magento/Store/Ui/DataProvider/Options.php b/app/code/Magento/Store/Ui/DataProvider/Options.php
index 25f61ba7698124fb06e372cebb058275b53dad94..950f5bbb606932f456bbeccf859580d3af187639 100644
--- a/app/code/Magento/Store/Ui/DataProvider/Options.php
+++ b/app/code/Magento/Store/Ui/DataProvider/Options.php
@@ -53,7 +53,7 @@ class Options implements OptionsInterface
$storeCollection = $this->systemStore->getStoreCollection();
$currentOptions = [
- __('All Store Views') => [
+ (string)__('All Store Views') => [
'label' => __('All Store Views'),
'value' => 0,
],
diff --git a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
new file mode 100644
index 0000000000000000000000000000000000000000..ba211003e53b2d5f2db0ee27bdae655f96a39e20
--- /dev/null
+++ b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Url\Plugin;
+
+use \Magento\Store\Model\Store;
+use \Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+
+/**
+ * Plugin for \Magento\Framework\Url\RouteParamsResolver
+ */
+class RouteParamsResolver
+{
+ /**
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ */
+ protected $scopeConfig;
+
+ /**
+ * @var \Magento\Store\Model\StoreManagerInterface
+ */
+ protected $storeManager;
+
+ /**
+ * @var \Magento\Framework\Url\QueryParamsResolverInterface
+ */
+ protected $queryParamsResolver;
+
+ /**
+ * Initialize dependencies.
+ *
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
+ */
+ public function __construct(
+ \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
+ \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
+ ) {
+ $this->scopeConfig = $scopeConfig;
+ $this->storeManager = $storeManager;
+ $this->queryParamsResolver = $queryParamsResolver;
+ }
+
+ /**
+ * Process scope query parameters.
+ *
+ * @param \Magento\Framework\Url\RouteParamsResolver $subject
+ * @param callable $proceed
+ * @param array $data
+ * @param bool $unsetOldParams
+ * @return \Magento\Framework\Url\RouteParamsResolver
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function aroundSetRouteParams(
+ \Magento\Framework\Url\RouteParamsResolver $subject,
+ \Closure $proceed,
+ array $data,
+ $unsetOldParams = true
+ ) {
+ if (isset($data['_scope'])) {
+ $subject->setScope($data['_scope']);
+ unset($data['_scope']);
+ }
+ if (isset($data['_scope_to_url']) && (bool)$data['_scope_to_url'] === true) {
+ $storeCode = $subject->getScope() ?: $this->storeManager->getStore()->getCode();
+ $useStoreInUrl = $this->scopeConfig->getValue(
+ Store::XML_PATH_STORE_IN_URL,
+ StoreScopeInterface::SCOPE_STORE,
+ $storeCode
+ );
+ if (!$useStoreInUrl && !$this->storeManager->hasSingleStore()) {
+ $this->queryParamsResolver->setQueryParam('___store', $storeCode);
+ }
+ }
+ unset($data['_scope_to_url']);
+
+ return $proceed($data, $unsetOldParams);
+ }
+}
diff --git a/app/code/Magento/Store/Url/Plugin/SecurityInfo.php b/app/code/Magento/Store/Url/Plugin/SecurityInfo.php
new file mode 100644
index 0000000000000000000000000000000000000000..3387c888f11dfa8b548eec3215fa721f43ebc409
--- /dev/null
+++ b/app/code/Magento/Store/Url/Plugin/SecurityInfo.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Url\Plugin;
+
+use \Magento\Store\Model\Store;
+use \Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+
+/**
+ * Plugin for \Magento\Framework\Url\SecurityInfo
+ */
+class SecurityInfo
+{
+ /**
+ * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ */
+ protected $scopeConfig;
+
+ /**
+ * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+ */
+ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
+ {
+ $this->scopeConfig = $scopeConfig;
+ }
+
+ /**
+ * Check if secure URLs are enabled.
+ *
+ * @param \Magento\Framework\Url\SecurityInfo $subject
+ * @param callable $proceed
+ * @param string $url
+ * @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function aroundIsSecure(\Magento\Framework\Url\SecurityInfo $subject, \Closure $proceed, $url)
+ {
+ if ($this->scopeConfig->getValue(Store::XML_PATH_SECURE_IN_FRONTEND, StoreScopeInterface::SCOPE_STORE)) {
+ return $proceed($url);
+ } else {
+ return false;
+ }
+ }
+}
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index 4b051e3259553f6bf150289714ac626d9707d0d3..986cfc2da8db7d1ea1f8f67449dcac1a2de930e2 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -3,14 +3,14 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-ui": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-ui": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
index 801973c00ad665c92758ce44e613b57509b376a6..bdb2be6dbf61fc82d303abfa9c6d5def1a94a125 100644
--- a/app/code/Magento/Store/etc/di.xml
+++ b/app/code/Magento/Store/etc/di.xml
@@ -6,6 +6,9 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+ <preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
+ <preference for="Magento\Store\Model\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
+ <preference for="Magento\Framework\App\Response\RedirectInterface" type="Magento\Store\App\Response\Redirect" />
<type name="Magento\Framework\Module\Updater\SetupFactory">
<arguments>
<argument name="resourceTypes" xsi:type="array">
@@ -16,6 +19,7 @@
<type name="Magento\Framework\App\Config\ScopePool">
<arguments>
<argument name="readerPool" xsi:type="object">Magento\Store\Model\Config\Reader\ReaderPool\Proxy</argument>
+ <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
</arguments>
</type>
<type name="Magento\Store\Model\Config\Reader\Website">
@@ -26,17 +30,17 @@
<type name="Magento\Store\Model\Config\Reader\Store">
<arguments>
<argument name="scopePool" xsi:type="object">Magento\Framework\App\Config\ScopePool\Proxy</argument>
- <argument name="storeManager" xsi:type="object">Magento\Framework\Store\StoreManagerInterface\Proxy</argument>
+ <argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
</arguments>
</type>
<type name="Magento\Store\Model\Resolver\Store">
<arguments>
- <argument name="storeManager" xsi:type="object">Magento\Framework\Store\StoreManagerInterface\Proxy</argument>
+ <argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
</arguments>
</type>
<type name="Magento\Store\Model\Resolver\Website">
<arguments>
- <argument name="storeManager" xsi:type="object">Magento\Framework\Store\StoreManagerInterface\Proxy</argument>
+ <argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
</arguments>
</type>
<type name="Magento\Store\Model\Config\Reader\ReaderPool">
@@ -52,10 +56,15 @@
</type>
<preference for="Magento\Framework\App\Config\Scope\ReaderPoolInterface" type="Magento\Store\Model\Config\Reader\ReaderPool"/>
<preference for="Magento\Framework\App\ScopeResolverInterface" type="Magento\Store\Model\Resolver\Store" />
- <preference for="Magento\Framework\Stdlib\CookieManagerInterface" type="Magento\Framework\Stdlib\Cookie\PhpCookieManager" />
<type name="Magento\Framework\App\Action\Action">
<plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck" sortOrder="10"/>
</type>
+ <type name="Magento\Framework\Url\SecurityInfo">
+ <plugin name="storeUrlSecurityInfo" type="Magento\Store\Url\Plugin\SecurityInfo"/>
+ </type>
+ <type name="Magento\Framework\Url\RouteParamsResolver">
+ <plugin name="storeUrlRouteParamsResolver" type="Magento\Store\Url\Plugin\RouteParamsResolver"/>
+ </type>
<type name="Magento\Store\Model\Resource\Website\Collection">
<arguments>
<argument name="fetchStrategy" xsi:type="object">Magento\Store\Model\Resource\Website\Collection\FetchStrategy</argument>
@@ -126,33 +135,28 @@
</type>
<type name="Magento\Framework\Module\Output\Config">
<arguments>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\Framework\Session\Config">
<arguments>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\Framework\Session\SidResolver">
<arguments>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
- </arguments>
- </type>
- <type name="Magento\Framework\Session\Validator">
- <arguments>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\Framework\View\Layout\Element\Layout">
<arguments>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\Framework\View\DesignExceptions">
<arguments>
<argument name="exceptionConfigPath" xsi:type="string">design/theme/ua_regexp</argument>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\Framework\View\TemplateEngineFactory">
@@ -162,4 +166,83 @@
</argument>
</arguments>
</type>
+ <type name="Magento\Framework\App\AreaList">
+ <arguments>
+ <argument name="areas" xsi:type="array">
+ <item name="frontend" xsi:type="array">
+ <item name="frontName" xsi:type="null" />
+ <item name="router" xsi:type="string">standard</item>
+ </item>
+ </argument>
+ <argument name="default" xsi:type="string">frontend</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Acl\Cache">
+ <arguments>
+ <argument name="cacheKey" xsi:type="string">global_acl_resources</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\App\Config\Initial\Converter">
+ <arguments>
+ <argument name="nodeMap" xsi:type="array">
+ <item name="default" xsi:type="string">/config/default</item>
+ <item name="stores" xsi:type="string">/config/stores</item>
+ <item name="websites" xsi:type="string">/config/websites</item>
+ </argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Url">
+ <arguments>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\App\ScopeResolverPool">
+ <arguments>
+ <argument name="scopeResolvers" xsi:type="array">
+ <item name="store" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
+ <item name="stores" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
+ <item name="website" xsi:type="object">Magento\Store\Model\Resolver\Website</item>
+ <item name="websites" xsi:type="object">Magento\Store\Model\Resolver\Website</item>
+ </argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Model\ActionValidator\RemoveAction">
+ <arguments>
+ <argument name="protectedModels" xsi:type="array">
+ <item name="store" xsi:type="string">Magento\Store\Model\Store</item>
+ <item name="website" xsi:type="string">Magento\Store\Model\Website</item>
+ <item name="storeGroup" xsi:type="string">Magento\Store\Model\Group</item>
+ </argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Module\Setup\MigrationData">
+ <arguments>
+ <argument name="data" xsi:type="array">
+ <item name="plain" xsi:type="string"><![CDATA[/^(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)::.*?$/sui]]></item>
+ <item name="wiki" xsi:type="string"><![CDATA[/{{(block|widget).*?(class|type)=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?}}/sui]]></item>
+ <item name="xml" xsi:type="string"><![CDATA[/<block.*?class=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?>/sui]]></item>
+ <item name="serialized" xsi:type="string"><![CDATA[#(?P<string>s:\d+:"(?P<alias>[a-z]+[_a-z\d]*?/[a-z]+[_a-z\d]*?)")#sui]]></item>
+ </argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Module\DataSetup">
+ <arguments>
+ <argument name="resourceName" xsi:type="string">core_setup</argument>
+ <argument name="connectionName" xsi:type="string">Magento\Framework\Module\Updater::DEFAULT_SETUP_CONNECTION</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\App\Helper\Context">
+ <arguments>
+ <argument name="urlBuilder" xsi:type="object">Magento\Framework\UrlInterface\Proxy</argument>
+ <argument name="httpRequest" xsi:type="object">Magento\Framework\App\Request\Http\Proxy</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\App\FrontController">
+ <plugin name="install" type="Magento\Framework\Module\Plugin\DbStatusValidator" sortOrder="40"/>
+ </type>
+ <type name="Magento\Framework\Module\Plugin\DbStatusValidator">
+ <arguments>
+ <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
+ </arguments>
+ </type>
</config>
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 8acd7cc3591f8edc3e667daab03bd16defbd9804..7886702d51034b7e92ca5dbee59f4484ceed7bdc 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -143,14 +143,14 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
if (!isset($formData['tax_country_id'])) {
$formData['tax_country_id'] = $this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
if (!isset($formData['tax_region_id'])) {
$formData['tax_region_id'] = $this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -197,7 +197,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
if (!isset($formData['tax_postcode'])) {
$formData['tax_postcode'] = $this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_POSTCODE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Tax/Block/Checkout/Shipping.php b/app/code/Magento/Tax/Block/Checkout/Shipping.php
index d2da39ae3a85d45cefd108b7be3a8da9ea8f8102..8813b2a5525639640c0c36d9f72a57e91f5a758a 100644
--- a/app/code/Magento/Tax/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Tax/Block/Checkout/Shipping.php
@@ -86,7 +86,7 @@ class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
/**
* Get label for shipping include tax
*
- * @return float
+ * @return \Magento\Framework\Phrase
*/
public function getIncludeTaxLabel()
{
@@ -99,7 +99,7 @@ class Shipping extends \Magento\Checkout\Block\Total\DefaultTotal
/**
* Get label for shipping exclude tax
*
- * @return float
+ * @return \Magento\Framework\Phrase
*/
public function getExcludeTaxLabel()
{
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 5295a21c3037d961a10702dc874f779f97a7e24b..003b0dc7fac1f2f7ebda4a33a33197f9aa81d0a8 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -73,7 +73,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -137,7 +137,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param Config $taxConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Locale\FormatInterface $localeFormat
* @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
* @param \Magento\Tax\Model\Resource\Sales\Order\Tax\ItemFactory $taxItemFactory
@@ -156,7 +156,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
\Magento\Framework\Registry $coreRegistry,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
Config $taxConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Locale\FormatInterface $localeFormat,
\Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
\Magento\Tax\Model\Resource\Sales\Order\Tax\ItemFactory $taxItemFactory,
@@ -547,7 +547,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
Config::CONFIG_XML_PATH_BASED_ON,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -562,7 +562,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return (int) $this->_scopeConfig->getValue(
Config::CONFIG_XML_PATH_APPLY_ON,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == 0;
}
@@ -577,7 +577,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return (int) $this->_scopeConfig->getValue(
Config::CONFIG_XML_PATH_APPLY_ON,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == 1;
}
@@ -710,7 +710,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::CONFIG_DEFAULT_CUSTOMER_TAX_CLASS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -723,7 +723,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::CONFIG_DEFAULT_PRODUCT_TAX_CLASS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Tax/Model/Calculation.php b/app/code/Magento/Tax/Model/Calculation.php
index 1c04f6f5fb9f4b86212ac85d7c981fa68f94f277..649fa87a3286ce80d782e57df8e5a9b278fbdd87 100644
--- a/app/code/Magento/Tax/Model/Calculation.php
+++ b/app/code/Magento/Tax/Model/Calculation.php
@@ -114,7 +114,7 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
protected $_scopeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -170,7 +170,7 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param Config $taxConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Customer\Model\CustomerFactory $customerFactory
* @param Resource\TaxClass\CollectionFactory $classesFactory
@@ -189,7 +189,7 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
\Magento\Framework\Registry $registry,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
Config $taxConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Customer\Model\Session $customerSession,
\Magento\Customer\Model\CustomerFactory $customerFactory,
\Magento\Tax\Model\Resource\TaxClass\CollectionFactory $classesFactory,
@@ -397,19 +397,19 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
$request->setCountryId(
$this->_scopeConfig->getValue(
\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
)->setRegionId(
$this->_scopeConfig->getValue(
\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_REGION_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
)->setPostcode(
$this->_scopeConfig->getValue(
\Magento\Shipping\Model\Config::XML_PATH_ORIGIN_POSTCODE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
)->setCustomerClassId(
@@ -481,7 +481,7 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
$address = new \Magento\Framework\Object();
$basedOn = $this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_BASED_ON,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
@@ -533,19 +533,19 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
$address->setCountryId(
$this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
)->setRegionId(
$this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
)->setPostcode(
$this->_scopeConfig->getValue(
\Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_POSTCODE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
);
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index 3c19011bd328abb26781dd42a2d38918e219dd65..116529a13b55162195607487539b4400fd1f29ff 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -156,7 +156,7 @@ class Config
}
return (bool)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_PRICE_INCLUDES_TAX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -187,7 +187,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -205,7 +205,7 @@ class Config
{
return (int)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -220,7 +220,7 @@ class Config
{
return (int)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_DISCOUNT_TAX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == 1;
}
@@ -283,7 +283,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_ALGORITHM,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -298,7 +298,7 @@ class Config
{
return (int)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_SHIPPING_TAX_CLASS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -313,7 +313,7 @@ class Config
{
return (int)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_DISPLAY_SHIPPING,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -329,7 +329,7 @@ class Config
if ($this->_shippingPriceIncludeTax === null) {
$this->_shippingPriceIncludeTax = (bool)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_SHIPPING_INCLUDES_TAX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -356,7 +356,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_PRICE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -369,7 +369,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_PRICE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -382,7 +382,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_PRICE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -395,7 +395,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SUBTOTAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -408,7 +408,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SUBTOTAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -421,7 +421,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SUBTOTAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -434,7 +434,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SHIPPING,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -447,7 +447,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SHIPPING,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -460,7 +460,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_SHIPPING,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -473,7 +473,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_DISCOUNT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -486,7 +486,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_DISCOUNT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -499,7 +499,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_DISCOUNT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -512,7 +512,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_GRANDTOTAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -525,7 +525,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_FULL_SUMMARY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -538,7 +538,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_CART_ZERO_TAX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -551,7 +551,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_PRICE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -564,7 +564,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_PRICE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -577,7 +577,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_PRICE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -590,7 +590,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SUBTOTAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -603,7 +603,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SUBTOTAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -616,7 +616,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SUBTOTAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -629,7 +629,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SHIPPING,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -642,7 +642,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SHIPPING,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -655,7 +655,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_SHIPPING,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -668,7 +668,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_DISCOUNT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_INCLUDING_TAX;
}
@@ -681,7 +681,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_DISCOUNT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_EXCLUDING_TAX;
}
@@ -694,7 +694,7 @@ class Config
{
return $this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_DISCOUNT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
) == self::DISPLAY_TYPE_BOTH;
}
@@ -707,7 +707,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_GRANDTOTAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -720,7 +720,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_FULL_SUMMARY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -733,7 +733,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_DISPLAY_SALES_ZERO_TAX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -748,7 +748,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::CONFIG_XML_PATH_CROSS_BORDER_TRADE_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -763,7 +763,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_TAX_NOTIFICATION_IGNORE_PRICE_DISPLAY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -778,7 +778,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_TAX_NOTIFICATION_IGNORE_DISCOUNT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -794,7 +794,7 @@ class Config
{
return (bool)$this->_scopeConfig->getValue(
self::XML_PATH_TAX_NOTIFICATION_INFO_URL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Tax/Model/Resource/Calculation.php b/app/code/Magento/Tax/Model/Resource/Calculation.php
index bbaf80242bfd498fc9169d89805478f19ea11995..160bea26fe1f9c5e03fd3cd6f1d58a4672305f33 100644
--- a/app/code/Magento/Tax/Model/Resource/Calculation.php
+++ b/app/code/Magento/Tax/Model/Resource/Calculation.php
@@ -39,19 +39,19 @@ class Calculation extends \Magento\Framework\Model\Resource\Db\AbstractDb
protected $_taxData;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
* @param \Magento\Tax\Helper\Data $taxData
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
\Magento\Tax\Helper\Data $taxData,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_taxData = $taxData;
$this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php b/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
index 67cbe339981ea54f1d2a7c59a7ca1bd47deaedcd..ac4b99b02345e688ba1d371b3ea4422424cc62ea 100644
--- a/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
+++ b/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
@@ -17,7 +17,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
const TAX_RULES_CHUNK_SIZE = 1000;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -26,7 +26,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -35,7 +35,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
index bf89d95705e9701dd8e07b9e34ac8864fb0b2864..58202c2dd403f2063ffb5ed6ea8fa9f50c6bbc95 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -365,7 +365,7 @@ class Tax extends CommonTaxCollector
/**
* Get Tax label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
diff --git a/app/code/Magento/Tax/Model/System/Message/Notifications.php b/app/code/Magento/Tax/Model/System/Message/Notifications.php
index 5ce6b7dea38afaecc842b2f5f464ef1f1e7b84ec..ae214839b1171ae4dbe5896670ceb20f52b29925 100644
--- a/app/code/Magento/Tax/Model/System/Message/Notifications.php
+++ b/app/code/Magento/Tax/Model/System/Message/Notifications.php
@@ -13,7 +13,7 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
/**
* Store manager object
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -44,12 +44,12 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
protected $storesWithInvalidDiscountSettings;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\UrlInterface $urlBuilder
* @param \Magento\Tax\Model\Config $taxConfig
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\UrlInterface $urlBuilder,
\Magento\Tax\Model\Config $taxConfig
) {
diff --git a/app/code/Magento/Tax/Model/TaxCalculation.php b/app/code/Magento/Tax/Model/TaxCalculation.php
index c4a2471d62689d33c29af24c0fb52cf9e4a78e53..4c465ca55d9b602527a25674e420332bd677af4c 100644
--- a/app/code/Magento/Tax/Model/TaxCalculation.php
+++ b/app/code/Magento/Tax/Model/TaxCalculation.php
@@ -17,7 +17,7 @@ use Magento\Tax\Api\TaxClassManagementInterface;
use Magento\Tax\Model\Calculation\CalculatorFactory;
use Magento\Tax\Model\Config;
use Magento\Tax\Model\Calculation\AbstractCalculator;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Tax\Api\TaxCalculationInterface;
/**
@@ -61,7 +61,7 @@ class TaxCalculation implements TaxCalculationInterface
protected $taxDetailsItemDataObjectFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
diff --git a/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php b/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php
index 771ba0af3cc8e91cc9e61b519f07f9c1c6de5b9b..a46d45fc4a0e33cb85b78b20be4ce981fca9ca2a 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php
@@ -75,7 +75,7 @@ class Customer extends \Magento\Tax\Model\TaxClass\AbstractType
/**
* Get Name of Objects that use this Tax Class Type
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getObjectTypeName()
{
diff --git a/app/code/Magento/Tax/Model/TaxClass/Type/Product.php b/app/code/Magento/Tax/Model/TaxClass/Type/Product.php
index aab30c5a14932c26a03407b0d75ba46bb3911bec..bbd1696b78cd4c9348e83b2a8cf55377ef3c8e56 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Type/Product.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Type/Product.php
@@ -49,7 +49,7 @@ class Product extends \Magento\Tax\Model\TaxClass\AbstractType
/**
* Get Name of Objects that use this Tax Class Type
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getObjectTypeName()
{
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index 97713b6ec2561ce1919514ed2e65c5ca827f938d..9ba6eb9660332ecb0e017c2725eeef26f4486793 100644
--- a/app/code/Magento/Tax/composer.json
+++ b/app/code/Magento/Tax/composer.json
@@ -3,23 +3,23 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-shipping": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-reports": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-shipping": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-reports": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Tax/etc/acl.xml b/app/code/Magento/Tax/etc/acl.xml
index cb6de9574885e4ed3592fcde650adfe1bdf36e87..e84396889f4dcae3d4f8356fe85738daff672709 100644
--- a/app/code/Magento/Tax/etc/acl.xml
+++ b/app/code/Magento/Tax/etc/acl.xml
@@ -8,11 +8,11 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
<resource id="Magento_Tax::manage_tax" title="Taxes" sortOrder="20" />
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Tax::config_tax" title="Tax Section" sortOrder="55" />
</resource>
</resource>
diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml
index 171d492c915dbecb14e37502e6232bded4a790d4..fa67d8474a7e93779edc1e22485e3c0825e56fca 100644
--- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml
+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml
@@ -9,7 +9,7 @@
<head>
<link src="Magento_Tax::js/bootstrap.js"/>
<css src="jquery/editableMultiselect/css/jquery.multiselect.css"/>
- <css src="Magento_Core::prototype/magento.css"/>
+ <css src="Magento_Theme::prototype/magento.css"/>
</head>
<body>
<referenceContainer name="content">
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index d2e80e84a75012c6325941cfe54262d597e48477..4f151696892971c384b6e05c49e0ed4ec7859d02 100644
--- a/app/code/Magento/TaxImportExport/composer.json
+++ b/app/code/Magento/TaxImportExport/composer.json
@@ -3,15 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-store": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/TaxImportExport/etc/acl.xml b/app/code/Magento/TaxImportExport/etc/acl.xml
index a5edf66dac85125d931af4666efe57145da6775a..6a5ea83cbcb198a765d13d85473712702ad7919b 100644
--- a/app/code/Magento/TaxImportExport/etc/acl.xml
+++ b/app/code/Magento/TaxImportExport/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::system">
- <resource id="Magento_Adminhtml::convert">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::system">
+ <resource id="Magento_Backend::convert">
<resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" sortOrder="30" />
</resource>
</resource>
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
index 98fc687b13418a4cfc5bd55fa2ebc13f681a81e4..9528fcb4220f14d48c693a2f9ea37e51959e2326 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
@@ -30,7 +30,7 @@ class Theme extends \Magento\Backend\Block\Widget\Grid\Container
/**
* Prepare header for container
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index 6fcc083b3af156849bc9f5217dccadbb2cead088..e2502f7d8507f3137e4291e55daeec481c55ab5d 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -277,7 +277,7 @@ class Css extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstra
/**
* Return Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
index 9301643c54f828955606c60a4b40cc45ddb9b903..4e5fefacaf47a8331fc4975a425721abae3f7abb 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
@@ -245,7 +245,7 @@ class General extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Ab
/**
* Prepare label for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -300,7 +300,7 @@ class General extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Ab
/**
* Get note string for theme's preview image
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _getPreviewImageNote()
{
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
index 2154fe1fe66d597c450478180a25876930d1899b..d2f2a3c811dbe2d4e979db45235695edfd1a7049 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
@@ -86,7 +86,7 @@ class Js extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstrac
/**
* Return Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -109,7 +109,7 @@ class Js extends \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Abstrac
/**
* Get note string for js file to Upload
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _getUploadJsFileNote()
{
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
index 21d0f4e1958bf617b78c7772ca60b52c6d8ae462..28f8272443f22669a6b781f947b8fd2c570ec16a 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
@@ -63,7 +63,7 @@ class Tree extends \Magento\Backend\Block\Template
/**
* Get root node name of tree
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getRootNodeName()
{
diff --git a/app/code/Magento/Theme/Block/Html/Footer.php b/app/code/Magento/Theme/Block/Html/Footer.php
index 86ecbf7177c7d38f2df6720bcd2fcc444d12c001..f5dac383b3a8fa4207d2e8d7d73b3ea39cad2341 100644
--- a/app/code/Magento/Theme/Block/Html/Footer.php
+++ b/app/code/Magento/Theme/Block/Html/Footer.php
@@ -79,7 +79,7 @@ class Footer extends \Magento\Framework\View\Element\Template implements \Magent
if (!$this->_copyright) {
$this->_copyright = $this->_scopeConfig->getValue(
'design/footer/copyright',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $this->_copyright;
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
index b880ea217ae6d4b13aff7be7ef2195783ff0ea70..dd74a7e49e8bc19eb33cd8a6a2895ad83a0acdee 100644
--- a/app/code/Magento/Theme/Block/Html/Header.php
+++ b/app/code/Magento/Theme/Block/Html/Header.php
@@ -76,7 +76,7 @@ class Header extends \Magento\Framework\View\Element\Template
} else {
$this->_data['welcome'] = $this->_scopeConfig->getValue(
'design/header/welcome',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index 4610f2bb1973ae6266be5ec1544807fd54ea19c2..2956d9426b1972ddb812b2d79f6fd43ea6de6c49 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -72,7 +72,7 @@ class Logo extends \Magento\Framework\View\Element\Template
if (empty($this->_data['logo_alt'])) {
$this->_data['logo_alt'] = $this->_scopeConfig->getValue(
'design/header/logo_alt',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $this->_data['logo_alt'];
@@ -88,7 +88,7 @@ class Logo extends \Magento\Framework\View\Element\Template
$folderName = \Magento\Backend\Model\Config\Backend\Image\Logo::UPLOAD_DIR;
$storeLogoPath = $this->_scopeConfig->getValue(
'design/header/logo_src',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$path = $folderName . '/' . $storeLogoPath;
$logoUrl = $this->_urlBuilder
diff --git a/app/code/Magento/Theme/Block/Html/Notices.php b/app/code/Magento/Theme/Block/Html/Notices.php
index 6cd8ef5ac95fbbabeaf2d0d4a5669433c128408c..8702634c39a2c8a560e5865d4b6ab0d05bfb9532 100644
--- a/app/code/Magento/Theme/Block/Html/Notices.php
+++ b/app/code/Magento/Theme/Block/Html/Notices.php
@@ -28,7 +28,7 @@ class Notices extends \Magento\Framework\View\Element\Template
{
return $this->_scopeConfig->getValue(
'web/browser_capabilities/javascript',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -41,7 +41,7 @@ class Notices extends \Magento\Framework\View\Element\Template
{
return $this->_scopeConfig->getValue(
'web/browser_capabilities/local_storage',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -54,7 +54,7 @@ class Notices extends \Magento\Framework\View\Element\Template
{
return $this->_scopeConfig->getValue(
'design/head/demonotice',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Theme/Block/Html/Pager.php b/app/code/Magento/Theme/Block/Html/Pager.php
index bb67af11ba6ca4e79d61e36dd491db3b10a189b7..30f416f7fcd23e9b5ca52771ce9b78d7822d1ad6 100644
--- a/app/code/Magento/Theme/Block/Html/Pager.php
+++ b/app/code/Magento/Theme/Block/Html/Pager.php
@@ -95,6 +95,13 @@ class Pager extends \Magento\Framework\View\Element\Template
*/
protected $_frameEnd;
+ /**
+ * Url Fragment for pagination
+ *
+ * @var string|null
+ */
+ protected $_fragment = null;
+
/**
* Set pager data
*
@@ -246,11 +253,12 @@ class Pager extends \Magento\Framework\View\Element\Template
* Set pager limit
*
* @param array $limits
- * @return void
+ * @return $this
*/
public function setAvailableLimit(array $limits)
{
$this->_availableLimit = $limits;
+ return $this;
}
/**
@@ -435,6 +443,7 @@ class Pager extends \Magento\Framework\View\Element\Template
$urlParams['_current'] = true;
$urlParams['_escape'] = true;
$urlParams['_use_rewrite'] = true;
+ $urlParams['_fragment'] = $this->getFragment();
$urlParams['_query'] = $params;
return $this->getUrl('*/*/*', $urlParams);
@@ -699,7 +708,7 @@ class Pager extends \Magento\Framework\View\Element\Template
{
return $this->_scopeConfig->getValue(
'design/pagination/anchor_text_for_previous',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -712,7 +721,7 @@ class Pager extends \Magento\Framework\View\Element\Template
{
return $this->_scopeConfig->getValue(
'design/pagination/anchor_text_for_next',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -740,4 +749,26 @@ class Pager extends \Magento\Framework\View\Element\Template
}
return '';
}
+
+ /**
+ * Get the URL fragment
+ *
+ * @return string|null
+ */
+ public function getFragment()
+ {
+ return $this->_fragment;
+ }
+
+ /**
+ * Set the URL fragment
+ *
+ * @param string|null $fragment
+ * @return $this
+ */
+ public function setFragment($fragment)
+ {
+ $this->_fragment = $fragment;
+ return $this;
+ }
}
diff --git a/app/code/Magento/Theme/Model/Config.php b/app/code/Magento/Theme/Model/Config.php
index d6204807af1170d2c92b5486c3b2ce14c6d4c90f..5d7c6cab55f37134da60920ff51ee46fbaecd6aa 100644
--- a/app/code/Magento/Theme/Model/Config.php
+++ b/app/code/Magento/Theme/Model/Config.php
@@ -22,7 +22,7 @@ class Config
protected $_configData;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -46,7 +46,7 @@ class Config
/**
* @param \Magento\Framework\App\Config\ValueInterface $configData
* @param \Magento\Framework\App\Config\Storage\WriterInterface $configWriter
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\Cache\FrontendInterface $configCache
* @param \Magento\Framework\Cache\FrontendInterface $layoutCache
@@ -54,7 +54,7 @@ class Config
public function __construct(
\Magento\Framework\App\Config\ValueInterface $configData,
\Magento\Framework\App\Config\Storage\WriterInterface $configWriter,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\Cache\FrontendInterface $configCache,
\Magento\Framework\Cache\FrontendInterface $layoutCache
@@ -78,7 +78,7 @@ class Config
public function assignToStore(
$theme,
array $stores = [],
- $scope = \Magento\Framework\Store\ScopeInterface::SCOPE_STORES
+ $scope = \Magento\Store\Model\ScopeInterface::SCOPE_STORES
) {
$isReassigned = false;
diff --git a/app/code/Magento/Theme/Model/Config/Customization.php b/app/code/Magento/Theme/Model/Config/Customization.php
index f3c2b4888c4f265618095bbc78610d7371f2e133..c0c02830ffb80e01c3810b15b37744737099c8d4 100644
--- a/app/code/Magento/Theme/Model/Config/Customization.php
+++ b/app/code/Magento/Theme/Model/Config/Customization.php
@@ -11,7 +11,7 @@ namespace Magento\Theme\Model\Config;
class Customization
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -42,12 +42,12 @@ class Customization
protected $_unassignedTheme;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\DesignInterface $design
* @param \Magento\Framework\View\Design\Theme\ThemeProviderInterface $themeProvider
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\DesignInterface $design,
\Magento\Framework\View\Design\Theme\ThemeProviderInterface $themeProvider
) {
diff --git a/app/code/Magento/Theme/Model/CopyService.php b/app/code/Magento/Theme/Model/CopyService.php
index be128b44af1fe0eb2e17e89a9ee82785f07336cf..5fd2cea5f78e5e69cbddbbc9781ef94d0d86bf86 100644
--- a/app/code/Magento/Theme/Model/CopyService.php
+++ b/app/code/Magento/Theme/Model/CopyService.php
@@ -25,12 +25,12 @@ class CopyService
protected $_fileFactory;
/**
- * @var \Magento\Core\Model\Layout\Link
+ * @var \Magento\Widget\Model\Layout\Link
*/
protected $_link;
/**
- * @var \Magento\Core\Model\Layout\UpdateFactory
+ * @var \Magento\Widget\Model\Layout\UpdateFactory
*/
protected $_updateFactory;
@@ -47,16 +47,16 @@ class CopyService
/**
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Design\Theme\FileFactory $fileFactory
- * @param \Magento\Core\Model\Layout\Link $link
- * @param \Magento\Core\Model\Layout\UpdateFactory $updateFactory
+ * @param \Magento\Widget\Model\Layout\Link $link
+ * @param \Magento\Widget\Model\Layout\UpdateFactory $updateFactory
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\View\Design\Theme\Customization\Path $customization
*/
public function __construct(
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\View\Design\Theme\FileFactory $fileFactory,
- \Magento\Core\Model\Layout\Link $link,
- \Magento\Core\Model\Layout\UpdateFactory $updateFactory,
+ \Magento\Widget\Model\Layout\Link $link,
+ \Magento\Widget\Model\Layout\UpdateFactory $updateFactory,
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\Framework\View\Design\Theme\Customization\Path $customization
) {
@@ -122,17 +122,17 @@ class CopyService
protected function _copyLayoutCustomization(ThemeInterface $source, ThemeInterface $target)
{
$update = $this->_updateFactory->create();
- /** @var $targetUpdates \Magento\Core\Model\Resource\Layout\Update\Collection */
+ /** @var $targetUpdates \Magento\Widget\Model\Resource\Layout\Update\Collection */
$targetUpdates = $update->getCollection();
$targetUpdates->addThemeFilter($target->getId());
$targetUpdates->delete();
- /** @var $sourceCollection \Magento\Core\Model\Resource\Layout\Link\Collection */
+ /** @var $sourceCollection \Magento\Widget\Model\Resource\Layout\Link\Collection */
$sourceCollection = $this->_link->getCollection();
$sourceCollection->addThemeFilter($source->getId());
- /** @var $layoutLink \Magento\Core\Model\Layout\Link */
+ /** @var $layoutLink \Magento\Widget\Model\Layout\Link */
foreach ($sourceCollection as $layoutLink) {
- /** @var $update \Magento\Core\Model\Layout\Update */
+ /** @var $update \Magento\Widget\Model\Layout\Update */
$update = $this->_updateFactory->create();
$update->load($layoutLink->getLayoutUpdateId());
if ($update->getId()) {
diff --git a/app/code/Magento/Theme/Model/Favicon/Favicon.php b/app/code/Magento/Theme/Model/Favicon/Favicon.php
index b4536ca8a59fd76fc1cbede3c074141cb7c8ffd9..38b655cad853b15b8b778cd2de20ace14037f478 100644
--- a/app/code/Magento/Theme/Model/Favicon/Favicon.php
+++ b/app/code/Magento/Theme/Model/Favicon/Favicon.php
@@ -18,7 +18,7 @@ class Favicon implements \Magento\Framework\View\Page\FaviconInterface
protected $faviconFile;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -38,13 +38,13 @@ class Favicon implements \Magento\Framework\View\Page\FaviconInterface
protected $mediaDirectory;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDatabase
* @param \Magento\Framework\Filesystem $filesystem
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Core\Helper\File\Storage\Database $fileStorageDatabase,
\Magento\Framework\Filesystem $filesystem
@@ -82,7 +82,7 @@ class Favicon implements \Magento\Framework\View\Page\FaviconInterface
$folderName = \Magento\Backend\Model\Config\Backend\Image\Favicon::UPLOAD_DIR;
$scopeConfig = $this->scopeConfig->getValue(
'design/head/shortcut_icon',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$path = $folderName . '/' . $scopeConfig;
$faviconUrl = $this->storeManager->getStore()
diff --git a/app/code/Magento/Theme/Model/Observer.php b/app/code/Magento/Theme/Model/Observer.php
index 6a471d81b69a0a72a3e02636f0f4bc02d78cd364..29a8eb7c42deb71394985ce10eba91cbd739393e 100644
--- a/app/code/Magento/Theme/Model/Observer.php
+++ b/app/code/Magento/Theme/Model/Observer.php
@@ -23,7 +23,7 @@ class Observer
protected $themeImageFactory;
/**
- * @var \Magento\Core\Model\Resource\Layout\Update\Collection
+ * @var \Magento\Widget\Model\Resource\Layout\Update\Collection
*/
protected $updateCollection;
@@ -66,7 +66,7 @@ class Observer
* Initialize dependencies.
*
* @param \Magento\Framework\View\Design\Theme\ImageFactory $themeImageFactory
- * @param \Magento\Core\Model\Resource\Layout\Update\Collection $updateCollection
+ * @param \Magento\Widget\Model\Resource\Layout\Update\Collection $updateCollection
* @param \Magento\Theme\Model\Config\Customization $themeConfig
* @param \Magento\Framework\Event\ManagerInterface $eventDispatcher
* @param \Magento\Framework\View\DesignInterface $design
@@ -77,7 +77,7 @@ class Observer
*/
public function __construct(
\Magento\Framework\View\Design\Theme\ImageFactory $themeImageFactory,
- \Magento\Core\Model\Resource\Layout\Update\Collection $updateCollection,
+ \Magento\Widget\Model\Resource\Layout\Update\Collection $updateCollection,
\Magento\Theme\Model\Config\Customization $themeConfig,
\Magento\Framework\Event\ManagerInterface $eventDispatcher,
\Magento\Framework\View\DesignInterface $design,
diff --git a/app/code/Magento/Core/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
similarity index 92%
rename from app/code/Magento/Core/Model/PageLayout/Config/Builder.php
rename to app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
index 1b00180a709adedac495829fa384d485ab418ed3..795740b042a18109b34e15c2e74003c4968dc20b 100644
--- a/app/code/Magento/Core/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
@@ -5,12 +5,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\PageLayout\Config;
+namespace Magento\Theme\Model\PageLayout\Config;
/**
* Page layout config builder
*/
-class Builder
+class Builder implements \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
{
/**
* @var \Magento\Framework\ObjectManagerInterface
diff --git a/app/code/Magento/Theme/Model/Theme/Image/Path.php b/app/code/Magento/Theme/Model/Theme/Image/Path.php
index 55453dc27c21ea6ae2a8a313002fcf431a3a9349..d5815ea78c9970d9762a181c5e743ded8cdcdabf 100644
--- a/app/code/Magento/Theme/Model/Theme/Image/Path.php
+++ b/app/code/Magento/Theme/Model/Theme/Image/Path.php
@@ -17,7 +17,7 @@ class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
/**
* Default theme preview image
*/
- const DEFAULT_PREVIEW_IMAGE = 'Magento_Core::theme/default_preview.jpg';
+ const DEFAULT_PREVIEW_IMAGE = 'Magento_Theme::theme/default_preview.jpg';
/**
* Media Directory
@@ -32,7 +32,7 @@ class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
protected $assetRepo;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -41,12 +41,12 @@ class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
*
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Asset\Repository $assetRepo
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\View\Asset\Repository $assetRepo,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->mediaDirectory = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
$this->assetRepo = $assetRepo;
diff --git a/app/code/Magento/Theme/Model/View/Design.php b/app/code/Magento/Theme/Model/View/Design.php
index cbccc25cba247aa72834145953d9a518e7d4712f..3d7e2067cc3c8f42f39bcc009ed507496d5c2704 100644
--- a/app/code/Magento/Theme/Model/View/Design.php
+++ b/app/code/Magento/Theme/Model/View/Design.php
@@ -36,7 +36,7 @@ class Design implements \Magento\Framework\View\DesignInterface
/**
* Store list manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -71,7 +71,7 @@ class Design implements \Magento\Framework\View\DesignInterface
protected $_appState;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\Design\Theme\FlyweightFactory $flyweightFactory
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Theme\Model\ThemeFactory $themeFactory
@@ -80,7 +80,7 @@ class Design implements \Magento\Framework\View\DesignInterface
* @param array $themes
*/
public function __construct(
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\Design\Theme\FlyweightFactory $flyweightFactory,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Theme\Model\ThemeFactory $themeFactory,
@@ -172,7 +172,7 @@ class Design implements \Magento\Framework\View\DesignInterface
} else {
$theme = (string) $this->_scopeConfig->getValue(
self::XML_PATH_THEME_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index e29a11bbc649644a69e3b01d02a3d59eb67381fc..f6aeea48f1a1d719fa3a728845d3e84cb5d923ba 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -3,21 +3,22 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-cms": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-require-js": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-widget": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-require-js": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"suggest": {
- "magento/module-translation": "0.42.0-beta6"
+ "magento/module-translation": "0.42.0-beta7"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Theme/etc/acl.xml b/app/code/Magento/Theme/etc/acl.xml
index eea2ab2debd562f724f7ee753a528b541f2ece0a..d2f3368a23312458f8eee39a3a7da4873812e09c 100644
--- a/app/code/Magento/Theme/etc/acl.xml
+++ b/app/code/Magento/Theme/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::content">
- <resource id="Magento_Adminhtml::design">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::content">
+ <resource id="Magento_Backend::design">
<resource id="Magento_Theme::theme" title="Themes" sortOrder="20" />
</resource>
</resource>
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index f7444ee959e3205f3b7ce35ead5a2b9c31ed8676..e2a768983af84854939f4069264e688860df502f 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -6,6 +6,13 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+ <preference for="Magento\Framework\View\Design\Theme\FileInterface" type="Magento\Theme\Model\Theme\File" />
+ <preference for="Magento\Framework\View\Design\Theme\ThemeProviderInterface" type="Magento\Theme\Model\Theme\ThemeProvider" />
+ <preference for="Magento\Framework\View\Design\Theme\FileProviderInterface" type="Magento\Theme\Model\Theme\FileProvider" />
+ <preference for="Magento\Framework\View\Design\Theme\Customization\ConfigInterface" type="Magento\Theme\Model\Theme\Customization\Config" />
+ <preference for="Magento\Framework\App\DesignInterface" type="Magento\Theme\Model\Design" />
+ <preference for="Magento\Framework\View\Page\FaviconInterface" type="Magento\Theme\Model\Favicon\Favicon" />
+ <preference for="Magento\Framework\View\Design\Theme\ListInterface" type="Magento\Theme\Model\Theme\Collection" />
<type name="Magento\Theme\Model\Config">
<arguments>
<argument name="configCache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
@@ -60,4 +67,20 @@
<type name="Magento\Framework\Url\ScopeInterface">
<plugin name="urlSignature" type="Magento\Theme\Model\Url\Plugin\Signature"/>
</type>
+ <type name="Magento\Theme\Model\Theme\Collection" shared="false" />
+ <type name="Magento\Theme\Model\View\Design">
+ <arguments>
+ <argument name="themes" xsi:type="array">
+ <item name="frontend" xsi:type="string">Magento/blank</item>
+ <item name="adminhtml" xsi:type="string">Magento/backend</item>
+ </argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\App\Area">
+ <arguments>
+ <argument name="translator" xsi:type="object">Magento\Framework\Translate</argument>
+ <argument name="design" xsi:type="object">Magento\Theme\Model\Design\Proxy</argument>
+ </arguments>
+ </type>
+ <preference for="Magento\Framework\View\Model\PageLayout\Config\BuilderInterface" type="Magento\Theme\Model\PageLayout\Config\Builder"/>
</config>
diff --git a/app/code/Magento/Core/etc/frontend/events.xml b/app/code/Magento/Theme/etc/frontend/events.xml
similarity index 100%
rename from app/code/Magento/Core/etc/frontend/events.xml
rename to app/code/Magento/Theme/etc/frontend/events.xml
diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml
index c1b40f0519c6e241df6af6ee871d1e298293547e..6df539955bce215d2d936aa46874982f87579706 100644
--- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml
+++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml
@@ -10,7 +10,7 @@
<css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/>
<css src="Magento_Theme::css/theme.css"/>
<css src="prototype/windows/themes/default.css"/>
- <css src="Magento_Core::prototype/magento.css"/>
+ <css src="Magento_Theme::prototype/magento.css"/>
<link src="Magento_Theme::js/bootstrap.js"/>
</head>
<body>
diff --git a/app/code/Magento/Core/view/adminhtml/web/calendar.png b/app/code/Magento/Theme/view/adminhtml/web/calendar.png
similarity index 100%
rename from app/code/Magento/Core/view/adminhtml/web/calendar.png
rename to app/code/Magento/Theme/view/adminhtml/web/calendar.png
diff --git a/app/code/Magento/Core/view/adminhtml/web/fam_book_open.png b/app/code/Magento/Theme/view/adminhtml/web/fam_book_open.png
similarity index 100%
rename from app/code/Magento/Core/view/adminhtml/web/fam_book_open.png
rename to app/code/Magento/Theme/view/adminhtml/web/fam_book_open.png
diff --git a/app/code/Magento/Core/view/adminhtml/web/prototype/magento.css b/app/code/Magento/Theme/view/adminhtml/web/prototype/magento.css
similarity index 100%
rename from app/code/Magento/Core/view/adminhtml/web/prototype/magento.css
rename to app/code/Magento/Theme/view/adminhtml/web/prototype/magento.css
diff --git a/app/code/Magento/Core/view/adminhtml/web/theme/default_preview.jpg b/app/code/Magento/Theme/view/adminhtml/web/theme/default_preview.jpg
similarity index 100%
rename from app/code/Magento/Core/view/adminhtml/web/theme/default_preview.jpg
rename to app/code/Magento/Theme/view/adminhtml/web/theme/default_preview.jpg
diff --git a/app/code/Magento/Core/view/frontend/templates/template.phtml b/app/code/Magento/Theme/view/frontend/templates/template.phtml
similarity index 100%
rename from app/code/Magento/Core/view/frontend/templates/template.phtml
rename to app/code/Magento/Theme/view/frontend/templates/template.phtml
diff --git a/app/code/Magento/Core/view/frontend/templates/text.phtml b/app/code/Magento/Theme/view/frontend/templates/text.phtml
similarity index 100%
rename from app/code/Magento/Core/view/frontend/templates/text.phtml
rename to app/code/Magento/Theme/view/frontend/templates/text.phtml
diff --git a/app/code/Magento/Core/view/frontend/web/calendar.png b/app/code/Magento/Theme/view/frontend/web/calendar.png
similarity index 100%
rename from app/code/Magento/Core/view/frontend/web/calendar.png
rename to app/code/Magento/Theme/view/frontend/web/calendar.png
diff --git a/app/code/Magento/Core/view/frontend/web/fam_book_open.png b/app/code/Magento/Theme/view/frontend/web/fam_book_open.png
similarity index 100%
rename from app/code/Magento/Core/view/frontend/web/fam_book_open.png
rename to app/code/Magento/Theme/view/frontend/web/fam_book_open.png
diff --git a/app/code/Magento/Core/view/frontend/web/prototype/magento.css b/app/code/Magento/Theme/view/frontend/web/prototype/magento.css
similarity index 100%
rename from app/code/Magento/Core/view/frontend/web/prototype/magento.css
rename to app/code/Magento/Theme/view/frontend/web/prototype/magento.css
diff --git a/app/code/Magento/Translation/Model/Inline/Config.php b/app/code/Magento/Translation/Model/Inline/Config.php
index a1b17671b574cdcd63be39536d512170a616c600..9545445dd9651ba5f57a3f3322a24f35a121fa95 100644
--- a/app/code/Magento/Translation/Model/Inline/Config.php
+++ b/app/code/Magento/Translation/Model/Inline/Config.php
@@ -41,7 +41,7 @@ class Config implements \Magento\Framework\Translate\Inline\ConfigInterface
{
return $this->_scopeConfig->isSetFlag(
'dev/translate_inline/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$scope
);
}
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
index 02eade209c3ff3d08998a0470558a972e511bfbc..a7e7016904b11e21406dd2db9c2e43b1cb1830a4 100644
--- a/app/code/Magento/Translation/Model/Inline/Parser.php
+++ b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -4,12 +4,12 @@
* See COPYING.txt for license details.
*/
+namespace Magento\Translation\Model\Inline;
+
/**
* This class is responsible for parsing content and applying necessary html element
* wrapping and client scripts for inline translation.
*/
-namespace Magento\Translation\Model\Inline;
-
class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
{
/**
@@ -95,7 +95,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
protected $_resourceFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -122,7 +122,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
/**
* Initialize base inline translation model
*
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Translation\Model\Resource\StringFactory $resource
* @param \Zend_Filter_Interface $inputFilter
* @param \Magento\Framework\App\State $appState
@@ -131,7 +131,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
*/
public function __construct(
\Magento\Translation\Model\Resource\StringFactory $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Zend_Filter_Interface $inputFilter,
\Magento\Framework\App\State $appState,
\Magento\Framework\App\Cache\TypeListInterface $appCache,
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index 23a6c893a0e880c22e2c1c9e3b002139b7ce76fc..299e8e76b34e0faaa62fc03ac1240b305093622d 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -3,14 +3,15 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
index df1f13ded13f007557887def4764bc2f43fb8baf..b537bf115636c854b4b25e253d0358e26d6d4259 100644
--- a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
+++ b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
@@ -9,7 +9,7 @@
?>
<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Magento_Core::prototype/magento.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Magento_Theme::prototype/magento.css') ?>"/>
<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('mage/translate-inline.css') ?>"/>
<script id="translate-inline-icon" type="text/x-jQuery-tmpl">
@@ -52,7 +52,7 @@ require([
"mage/edit-trigger",
"mage/translate-inline"
], function($){
- $('body').editTrigger({img: '<?php echo $block->getViewFileUrl('Magento_Core::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
+ $('body').editTrigger({img: '<?php echo $block->getViewFileUrl('Magento_Theme::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
$('body').addClass('trnslate-inline-area');
});
</script>
diff --git a/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml b/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
index a624247ed934e4dcdef59dfec67e822d45a598bb..4f2eb872f5142febd1697bea71f71de1831118f7 100644
--- a/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
+++ b/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
@@ -9,7 +9,7 @@
?>
<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Magento_Core::prototype/magento.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Magento_Theme::prototype/magento.css') ?>"/>
<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('mage/translate-inline.css') ?>"/>
<script id="translate-inline-icon" type="text/x-jQuery-tmpl">
@@ -52,7 +52,7 @@
"mage/edit-trigger",
"mage/translate-inline"
], function($){
- $('body').editTrigger({img: '<?php echo $block->getViewFileUrl('Magento_Core::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
+ $('body').editTrigger({img: '<?php echo $block->getViewFileUrl('Magento_Theme::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
$('body').addClass('trnslate-inline-area');
});
</script>
diff --git a/app/code/Magento/Core/view/frontend/web/translate_edit_icon.png b/app/code/Magento/Translation/view/frontend/web/translate_edit_icon.png
similarity index 100%
rename from app/code/Magento/Core/view/frontend/web/translate_edit_icon.png
rename to app/code/Magento/Translation/view/frontend/web/translate_edit_icon.png
diff --git a/app/code/Magento/Core/view/frontend/web/translate_edit_icon_hover.png b/app/code/Magento/Translation/view/frontend/web/translate_edit_icon_hover.png
similarity index 100%
rename from app/code/Magento/Core/view/frontend/web/translate_edit_icon_hover.png
rename to app/code/Magento/Translation/view/frontend/web/translate_edit_icon_hover.png
diff --git a/app/code/Magento/Ui/Component/Filter/Type/Date.php b/app/code/Magento/Ui/Component/Filter/Type/Date.php
index 30e269adc3d72d2e62b853bdd9788866e719ae1c..fa7a9564032774cf76e01c3078f7a403d7251ed9 100644
--- a/app/code/Magento/Ui/Component/Filter/Type/Date.php
+++ b/app/code/Magento/Ui/Component/Filter/Type/Date.php
@@ -141,7 +141,7 @@ class Date extends FilterAbstract
$dateObj->setTimezone(
$this->scopeConfig->getValue(
$this->localeDate->getDefaultTimezonePath(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index 7983140044a18088e5c801b1286efaf31f9ef40c..7e8147c03b23c4d655d16460b7ece047512c6c8c 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -3,13 +3,14 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Ui/etc/adminhtml/routes.xml b/app/code/Magento/Ui/etc/adminhtml/routes.xml
index b8709c0996f4cc127c2d32f7f289686437530ec2..5bf72e1b3a1f6e64c0c4d06d7d393270282505ca 100644
--- a/app/code/Magento/Ui/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Ui/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="mui" frontName="mui">
- <module name="Magento_Ui" before="Magento_Adminhtml" />
+ <module name="Magento_Ui" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
index 3ec3e633a68846c605cd9498ee2d7a756404c728..ccdd22cf7b447254f4e655650bd6b09640cb07ba 100644
--- a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
+++ b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
@@ -73,6 +73,6 @@ class CarrierConfig extends Template
*/
public function getConfig($path, $store = null)
{
- return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+ return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
}
}
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index b256f0b19c2d7931410a0c6764997c50b9b9262c..e88b68ea433cafc08dba11c7c4dbec7547c6aaf8 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -250,7 +250,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
} else {
$origCountry = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
);
}
@@ -262,7 +262,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
} else {
$origRegionCode = $this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_REGION_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
);
}
@@ -277,7 +277,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
$rowRequest->setOrigPostal(
$this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
@@ -289,7 +289,7 @@ class Carrier extends AbstractCarrierOnline implements CarrierInterface
$rowRequest->setOrigCity(
$this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_CITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json
index f24632c7e0221fbd917a9f7dfcfcf72ba8e551bf..39d780a7614b336ce8796904c68acd44b6a6f470 100644
--- a/app/code/Magento/Ups/composer.json
+++ b/app/code/Magento/Ups/composer.json
@@ -3,19 +3,19 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-shipping": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-shipping": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/UrlRewrite/Block/Selector.php b/app/code/Magento/UrlRewrite/Block/Selector.php
index 179225d1b20d9d69b1e92fb8ea76ff532d67040d..5ad0d7239fc053e90537c9a4129be2b4759ba5c8 100644
--- a/app/code/Magento/UrlRewrite/Block/Selector.php
+++ b/app/code/Magento/UrlRewrite/Block/Selector.php
@@ -48,7 +48,7 @@ class Selector extends \Magento\Backend\Block\Template
/**
* Label getter
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getSelectorLabel()
{
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
index 64d646e9fd48ff41704edeb657a441012c2fa6a5..ce2f31fc0d2a23af6fd36b0deb657e0c220a66dc 100644
--- a/app/code/Magento/UrlRewrite/Controller/Router.php
+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -21,7 +21,7 @@ class Router implements \Magento\Framework\App\RouterInterface
/** @var \Magento\Framework\UrlInterface */
protected $url;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $storeManager;
/** @var \Magento\Framework\App\ResponseInterface */
@@ -33,14 +33,14 @@ class Router implements \Magento\Framework\App\RouterInterface
/**
* @param \Magento\Framework\App\ActionFactory $actionFactory
* @param \Magento\Framework\UrlInterface $url
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\App\ResponseInterface $response
* @param UrlFinderInterface $urlFinder
*/
public function __construct(
\Magento\Framework\App\ActionFactory $actionFactory,
\Magento\Framework\UrlInterface $url,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\App\ResponseInterface $response,
UrlFinderInterface $urlFinder
) {
diff --git a/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php b/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
index ee1c4b2a839875be7ec91c55d01393589845e7bd..aa9747a8ea73c9381d0cf4b801833afead082133 100644
--- a/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
+++ b/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
@@ -12,7 +12,7 @@ class UrlRewriteCollection extends \Magento\Framework\Model\Resource\Db\Collecti
/**
* Store Manager Model
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -21,7 +21,7 @@ class UrlRewriteCollection extends \Magento\Framework\Model\Resource\Db\Collecti
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Framework\Event\ManagerInterface $eventManager
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param mixed $connection
* @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
*/
@@ -30,7 +30,7 @@ class UrlRewriteCollection extends \Magento\Framework\Model\Resource\Db\Collecti
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Framework\Event\ManagerInterface $eventManager,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
$connection = null,
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
) {
diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json
index f1923a72da9e8dac42c709a54cdf6dddfe456060..62075020e1c54806d992355a19a9514ff86adca6 100644
--- a/app/code/Magento/UrlRewrite/composer.json
+++ b/app/code/Magento/UrlRewrite/composer.json
@@ -3,18 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-store": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-catalog-url-rewrite": "0.42.0-beta6",
- "magento/module-cms": "0.42.0-beta6",
- "magento/module-cms-url-rewrite": "0.42.0-beta6",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-catalog-url-rewrite": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/module-cms-url-rewrite": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml b/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml
index 8ca263630f4e965c22329038226006442a82d6af..89c9f80c44cddbf09dc1a5e46f83570399e954cb 100644
--- a/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml
+++ b/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::marketing">
- <resource id="Magento_Adminhtml::marketing_seo">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::marketing">
+ <resource id="Magento_Backend::marketing_seo">
<resource id="Magento_UrlRewrite::urlrewrite" title="URL Rewrites" sortOrder="20" />
</resource>
</resource>
diff --git a/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml b/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml
index 87715c984cd7ecac190688daafe6682e636ad37c..848ef0869d9e8e6f095926c1ddfd2e7729b4c103 100644
--- a/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml
+++ b/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_UrlRewrite" before="Magento_Adminhtml" />
+ <module name="Magento_UrlRewrite" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/User/Block/Role/Tab/Edit.php b/app/code/Magento/User/Block/Role/Tab/Edit.php
index 9939d364cc01840f89e43cb591ccb1a0363dddcc..e78fb534fe2999092ffb4c44a1a554988f07bea3 100644
--- a/app/code/Magento/User/Block/Role/Tab/Edit.php
+++ b/app/code/Magento/User/Block/Role/Tab/Edit.php
@@ -78,7 +78,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form implements \Magento\Backen
/**
* Get tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
diff --git a/app/code/Magento/User/Block/Role/Tab/Info.php b/app/code/Magento/User/Block/Role/Tab/Info.php
index a9f9b8659f4d821b91009344adb35f10318c626a..f820aedbfc3edb645f50e43e144d7c2246db42e8 100644
--- a/app/code/Magento/User/Block/Role/Tab/Info.php
+++ b/app/code/Magento/User/Block/Role/Tab/Info.php
@@ -13,7 +13,7 @@ namespace Magento\User\Block\Role\Tab;
class Info extends \Magento\Backend\Block\Widget\Form\Generic implements \Magento\Backend\Block\Widget\Tab\TabInterface
{
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
diff --git a/app/code/Magento/User/Block/User/Edit.php b/app/code/Magento/User/Block/User/Edit.php
index 57d1b0670443ee4bbe2acd41b52de4300a5fa55e..e514b5c3e0c3d06943febae8f3538fe4686ecceb 100644
--- a/app/code/Magento/User/Block/User/Edit.php
+++ b/app/code/Magento/User/Block/User/Edit.php
@@ -66,7 +66,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index e6dc2de80badc067aeca0bef5da7c3285b076ef3..08bf907613175c8fcbe9390abdf5503cde219843 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -120,7 +120,7 @@ class User extends AbstractModel implements StorageInterface
protected $_transportBuilder;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -136,7 +136,7 @@ class User extends AbstractModel implements StorageInterface
* @param \Magento\Framework\Stdlib\DateTime $dateTime
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param array $data
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -151,7 +151,7 @@ class User extends AbstractModel implements StorageInterface
\Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
\Magento\Framework\Encryption\EncryptorInterface $encryptor,
\Magento\Framework\Stdlib\DateTime $dateTime,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
array $data = []
@@ -214,7 +214,7 @@ class User extends AbstractModel implements StorageInterface
$this->_roleFactory = $objectManager->get('Magento\Authorization\Model\RoleFactory');
$this->_encryptor = $objectManager->get('Magento\Framework\Encryption\EncryptorInterface');
$this->_transportBuilder = $objectManager->get('Magento\Framework\Mail\Template\TransportBuilder');
- $this->_storeManager = $objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface');
}
/**
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index b1706e9edd8f3423ebb027e7678a232ec9e68d97..7858879fc9c4f379b52668efb40ff6ff7fb8557e 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -3,17 +3,18 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-authorization": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-integration": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-require-js": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-authorization": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-integration": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-require-js": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/User/etc/acl.xml b/app/code/Magento/User/etc/acl.xml
index 2d30e0c2670ee9fa944f98e8dda3437e7814b91e..502b706e138568b31d8208dfcc9c3e2f9ebef236 100644
--- a/app/code/Magento/User/etc/acl.xml
+++ b/app/code/Magento/User/etc/acl.xml
@@ -8,8 +8,8 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::system">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::system">
<resource id="Magento_User::acl" title="Permissions" sortOrder="60">
<resource id="Magento_User::acl_users" title="All Users" sortOrder="10" />
<resource id="Magento_User::acl_roles" title="User Roles" sortOrder="30" />
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index adfb7e8a7586ccd3f851c5979c701bb062f05dca..efccb26521a6358956bfc189fe02a4039dc5686a 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -278,7 +278,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
$r->setOrigPostal(
$this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
@@ -290,7 +290,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
$r->setOrigCountryId(
$this->_scopeConfig->getValue(
\Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$request->getStoreId()
)
);
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index 808002705705605fe6313435c66075c1e1bdf3d2..5bd497072b8ac5dee946e2930dda25721d028cbe 100644
--- a/app/code/Magento/Usps/composer.json
+++ b/app/code/Magento/Usps/composer.json
@@ -3,19 +3,20 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-shipping": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-shipping": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"lib-libxml": "*",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php b/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
index b6e3b1fe2913d8ee95aca3df36b2c68a1fdb3388..5c4d8056bc398c691f07bbc8ebe6327c931efad4 100644
--- a/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
+++ b/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
@@ -68,7 +68,7 @@ class Webapi extends \Magento\Backend\Block\Widget\Form\Generic implements
/**
* Set the selected resources, which is an array of resource ids. If everything is allowed, the
- * array will contain just the root resource id, which is "Magento_Adminhtml::all".
+ * array will contain just the root resource id, which is "Magento_Backend::all".
*
* @return void
*/
@@ -139,7 +139,7 @@ class Webapi extends \Magento\Backend\Block\Widget\Form\Generic implements
/**
* Return an array of selected resource ids. If everything is allowed then iterate through all
* available resources to generate a comprehensive array of all resource ids, rather than just
- * returning "Magento_Adminhtml::all".
+ * returning "Magento_Backend::all".
*
* @return string
*/
diff --git a/app/code/Magento/Webapi/Block/Adminhtml/Integration/Edit/Tab/Webapi.php b/app/code/Magento/Webapi/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
index 3da36c235c95df5c64e154613048ebdf62bb29ad..fce49d9ea92039ccdea634096faa05f432a952cf 100644
--- a/app/code/Magento/Webapi/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
+++ b/app/code/Magento/Webapi/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
@@ -69,7 +69,7 @@ class Webapi extends \Magento\Backend\Block\Widget\Form\Generic implements
/**
* Get tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
diff --git a/app/code/Magento/Webapi/Controller/Request.php b/app/code/Magento/Webapi/Controller/Request.php
index 2e845d6a579f6558521333c5a7eb40b7868fe882..cc262a3a8ae90a7c1a580c916add35bc0f56737b 100644
--- a/app/code/Magento/Webapi/Controller/Request.php
+++ b/app/code/Magento/Webapi/Controller/Request.php
@@ -52,22 +52,4 @@ class Request extends \Zend_Controller_Request_Http implements \Magento\Framewor
{
return $this->_cookieReader->getCookie($name, $default);
}
-
- /**
- * {@inheritdoc}
- *
- * Added CGI environment support.
- */
- public function getHeader($header)
- {
- $headerValue = parent::getHeader($header);
- if ($headerValue == false) {
- /** Workaround for php-fpm environment */
- $header = strtoupper(str_replace('-', '_', $header));
- if (isset($_SERVER[$header]) && in_array($header, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
- $headerValue = $_SERVER[$header];
- }
- }
- return $headerValue;
- }
}
diff --git a/app/code/Magento/Webapi/Model/PathProcessor.php b/app/code/Magento/Webapi/Model/PathProcessor.php
index c52baf7ffa80273bbf1c327530889672d7996566..243e2940e8cf4081f1ab0b9c513e0f4593ba4e8a 100644
--- a/app/code/Magento/Webapi/Model/PathProcessor.php
+++ b/app/code/Magento/Webapi/Model/PathProcessor.php
@@ -11,14 +11,14 @@ use Magento\Framework\Exception\NoSuchEntityException;
class PathProcessor
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
private $storeManager;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+ public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
{
$this->storeManager = $storeManager;
}
diff --git a/app/code/Magento/Webapi/Model/Soap/Server.php b/app/code/Magento/Webapi/Model/Soap/Server.php
index 7d8c5e01a46e0d485ad051a95ed3b76bc4eac9e1..af0160985783c090e79bf3e5c76ecb53c45210be 100644
--- a/app/code/Magento/Webapi/Model/Soap/Server.php
+++ b/app/code/Magento/Webapi/Model/Soap/Server.php
@@ -44,7 +44,7 @@ class Server
protected $_request;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -70,7 +70,7 @@ class Server
* @param \Magento\Framework\Config\ScopeInterface $configScope
* @param \Magento\Webapi\Controller\Soap\Request $request
* @param \Magento\Framework\DomDocument\Factory $domDocumentFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Webapi\Model\Soap\Server\Factory $soapServerFactory
* @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -81,7 +81,7 @@ class Server
\Magento\Framework\Config\ScopeInterface $configScope,
\Magento\Webapi\Controller\Soap\Request $request,
\Magento\Framework\DomDocument\Factory $domDocumentFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Webapi\Model\Soap\Server\Factory $soapServerFactory,
\Magento\Framework\Reflection\TypeProcessor $typeProcessor,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -104,7 +104,7 @@ class Server
/** Enable or disable SOAP extension WSDL cache depending on Magento configuration. */
$wsdlCacheEnabled = $this->_scopeConfig->isSetFlag(
self::CONFIG_PATH_WSDL_CACHE_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if ($wsdlCacheEnabled) {
ini_set('soap.wsdl_cache_enabled', '1');
@@ -136,7 +136,7 @@ class Server
{
$charset = $this->_scopeConfig->getValue(
self::CONFIG_PATH_SOAP_CHARSET,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return $charset ? $charset : self::SOAP_DEFAULT_ENCODING;
}
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
index 7ac161b8213b6d36bbb0ef73cc08d5eceef14d2f..53788ac0df13fcb78a495d2920223bbfd4c290b4 100644
--- a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
+++ b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
@@ -44,7 +44,7 @@ class Generator
protected $_registeredTypes = [];
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -55,14 +55,14 @@ class Generator
* @param Factory $wsdlFactory
* @param \Magento\Webapi\Model\Cache\Type $cache
* @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Webapi\Model\Soap\Config $apiConfig,
Factory $wsdlFactory,
\Magento\Webapi\Model\Cache\Type $cache,
\Magento\Framework\Reflection\TypeProcessor $typeProcessor,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_apiConfig = $apiConfig;
$this->_wsdlFactory = $wsdlFactory;
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
index fae3f56eedeffed7784d8d5cc341acef85e14d93..06973cf298087f76ca24e8b722a7ce15fd788471 100644
--- a/app/code/Magento/Webapi/composer.json
+++ b/app/code/Magento/Webapi/composer.json
@@ -3,19 +3,19 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-authorization": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-integration": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-authorization": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-integration": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"suggest": {
- "magento/module-user": "0.42.0-beta6"
+ "magento/module-user": "0.42.0-beta7"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Weee/Helper/Data.php b/app/code/Magento/Weee/Helper/Data.php
index 60331dc441fc2fc30e8ba58f0898c95b62c25063..aa6ac7d19875fd67ac0243e09a2815835a37ca7d 100644
--- a/app/code/Magento/Weee/Helper/Data.php
+++ b/app/code/Magento/Weee/Helper/Data.php
@@ -64,13 +64,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_weeeConfig;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Helper\Context $context
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Weee\Model\Tax $weeeTax
* @param \Magento\Weee\Model\Config $weeeConfig
* @param \Magento\Tax\Helper\Data $taxData
@@ -78,7 +78,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
*/
public function __construct(
\Magento\Framework\App\Helper\Context $context,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Weee\Model\Tax $weeeTax,
\Magento\Weee\Model\Config $weeeConfig,
\Magento\Tax\Helper\Data $taxData,
diff --git a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
index 80f129ee5315742161d5d9c0f4ba693faf543e93..284593f0d3cfd2d57be62fd4803def7210fa592f 100644
--- a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -15,7 +15,7 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
protected $_attributeTax;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -26,7 +26,7 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
/**
* @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Catalog\Helper\Data $catalogData
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Directory\Helper\Data $directoryHelper
@@ -34,7 +34,7 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
*/
public function __construct(
\Magento\Directory\Model\CurrencyFactory $currencyFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Catalog\Helper\Data $catalogData,
\Magento\Framework\App\Config\ScopeConfigInterface $config,
\Magento\Directory\Helper\Data $directoryHelper,
diff --git a/app/code/Magento/Weee/Model/Config.php b/app/code/Magento/Weee/Model/Config.php
index bb29336adea74eef10716f7251441ea332f8dd22..aebe98ed8d72fc5883fb538614795ad9c4f5e400 100644
--- a/app/code/Magento/Weee/Model/Config.php
+++ b/app/code/Magento/Weee/Model/Config.php
@@ -60,7 +60,7 @@ class Config
{
return $this->scopeConfig->getValue(
self::XML_PATH_FPT_DISPLAY_PRODUCT_VIEW,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -75,7 +75,7 @@ class Config
{
return $this->scopeConfig->getValue(
self::XML_PATH_FPT_DISPLAY_PRODUCT_LIST,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -90,7 +90,7 @@ class Config
{
return $this->scopeConfig->getValue(
self::XML_PATH_FPT_DISPLAY_SALES,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -105,7 +105,7 @@ class Config
{
return $this->scopeConfig->getValue(
self::XML_PATH_FPT_DISPLAY_EMAIL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -120,7 +120,7 @@ class Config
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_FPT_INCLUDE_IN_SUBTOTAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -135,7 +135,7 @@ class Config
{
return $this->scopeConfig->isSetFlag(
self::XML_PATH_FPT_TAXABLE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
@@ -150,7 +150,7 @@ class Config
{
return $this->scopeConfig->getValue(
self::XML_PATH_FPT_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
);
}
diff --git a/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
index eeae9174af042a243153dfbc0d9571f98ffcc540..ee2d81eaa9ae676c5ee1d90b32b1b6ce74b343c5 100644
--- a/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
@@ -13,17 +13,17 @@ namespace Magento\Weee\Model\Resource\Attribute\Backend\Weee;
class Tax extends \Magento\Framework\Model\Resource\Db\AbstractDb
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
/**
* @param \Magento\Framework\App\Resource $resource
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
*/
public function __construct(
\Magento\Framework\App\Resource $resource,
- \Magento\Framework\Store\StoreManagerInterface $storeManager
+ \Magento\Store\Model\StoreManagerInterface $storeManager
) {
$this->_storeManager = $storeManager;
parent::__construct($resource);
diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php
index 0af28c388398539426e8c6d0a14b396a316bd98a..7eab12df0722dbead3edf7667a66d52aab10a2c8 100644
--- a/app/code/Magento/Weee/Model/Tax.php
+++ b/app/code/Magento/Weee/Model/Tax.php
@@ -54,7 +54,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
protected $_attributeFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -89,7 +89,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Tax\Model\CalculationFactory $calculationFactory
* @param \Magento\Customer\Model\Session $customerSession
* @param AccountManagementInterface $accountManagement
@@ -105,7 +105,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Tax\Model\CalculationFactory $calculationFactory,
\Magento\Customer\Model\Session $customerSession,
AccountManagementInterface $accountManagement,
diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json
index 4c52f254b6c484cf0d11a3dfd947874c8cd9f175..d9016f01105ec54496608c993d2ae3b0dd654b52 100644
--- a/app/code/Magento/Weee/composer.json
+++ b/app/code/Magento/Weee/composer.json
@@ -3,21 +3,22 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-tax": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-directory": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-eav": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-quote": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-tax": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-directory": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-eav": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-quote": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
+ "conflict": {"magento/module-usps": "0.42.0-beta7"},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
index ead0009cb3d3eca1848a9532c6492d6feda5e1be..17d92e42cdd4ff5d5ace0af3a3fea5e361cfcd6e 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
@@ -88,7 +88,7 @@ class Edit extends \Magento\Backend\Block\Widget\Form\Container
/**
* Return translated header text depending on creating/editing action
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeaderText()
{
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
index 409741cec2280a23401a8a7a6e69341c305788f7..23b609a0e5b35e99f59a39a9b90fbb52cebe282e 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
@@ -58,7 +58,7 @@ class Main extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
/**
* Prepare label for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -68,7 +68,7 @@ class Main extends \Magento\Backend\Block\Widget\Form\Generic implements \Magent
/**
* Prepare title for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
index 665a0dcda716301b26052fc149e075c91b2d4a08..0e8bf775c48a133a5b9381765bb233c6c756dade 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
@@ -29,7 +29,7 @@ class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implemen
/**
* Prepare label for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -39,7 +39,7 @@ class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implemen
/**
* Prepare title for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
index 8a0e920f9b4b5c0d0f730de66b7adf92f6e9e80c..e09cf07bcbc12701e48fdd8f2278009e2e27dad9 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
@@ -56,7 +56,7 @@ class Settings extends \Magento\Backend\Block\Widget\Form\Generic implements
/**
* Prepare label for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
@@ -66,7 +66,7 @@ class Settings extends \Magento\Backend\Block\Widget\Form\Generic implements
/**
* Prepare title for tab
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabTitle()
{
diff --git a/app/code/Magento/Core/Model/Layout/Link.php b/app/code/Magento/Widget/Model/Layout/Link.php
similarity index 59%
rename from app/code/Magento/Core/Model/Layout/Link.php
rename to app/code/Magento/Widget/Model/Layout/Link.php
index a2b4251c1c9a4f9b164f9feb60a53e3cf0d98dea..7c93d913fa0a6a7afd42a5a787f569c29e997f2f 100644
--- a/app/code/Magento/Core/Model/Layout/Link.php
+++ b/app/code/Magento/Widget/Model/Layout/Link.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout;
+namespace Magento\Widget\Model\Layout;
/**
* Layout Link model class
@@ -11,9 +11,9 @@ namespace Magento\Core\Model\Layout;
* @method int getStoreId()
* @method int getThemeId()
* @method int getLayoutUpdateId()
- * @method \Magento\Core\Model\Layout\Link setStoreId($id)
- * @method \Magento\Core\Model\Layout\Link setThemeId($id)
- * @method \Magento\Core\Model\Layout\Link setLayoutUpdateId($id)
+ * @method \Magento\Widget\Model\Layout\Link setStoreId($id)
+ * @method \Magento\Widget\Model\Layout\Link setThemeId($id)
+ * @method \Magento\Widget\Model\Layout\Link setLayoutUpdateId($id)
*/
class Link extends \Magento\Framework\Model\AbstractModel
{
@@ -24,6 +24,6 @@ class Link extends \Magento\Framework\Model\AbstractModel
*/
protected function _construct()
{
- $this->_init('Magento\Core\Model\Resource\Layout\Link');
+ $this->_init('Magento\Widget\Model\Resource\Layout\Link');
}
}
diff --git a/app/code/Magento/Core/Model/Layout/Update.php b/app/code/Magento/Widget/Model/Layout/Update.php
similarity index 70%
rename from app/code/Magento/Core/Model/Layout/Update.php
rename to app/code/Magento/Widget/Model/Layout/Update.php
index 4ebe6bff17f6bde6e471f680ca977eee2a1ca420..b8d6e965c2f8ed219890eae8cd3a52e89868c287 100644
--- a/app/code/Magento/Core/Model/Layout/Update.php
+++ b/app/code/Magento/Widget/Model/Layout/Update.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout;
+namespace Magento\Widget\Model\Layout;
/**
* Layout Update model class
@@ -12,13 +12,13 @@ namespace Magento\Core\Model\Layout;
* @method int getLayoutLinkId() getLayoutLinkId()
* @method string getUpdatedAt() getUpdatedAt()
* @method string getXml() getXml()
- * @method \Magento\Core\Model\Layout\Update setIsTemporary() setIsTemporary(int $isTemporary)
- * @method \Magento\Core\Model\Layout\Update setHandle() setHandle(string $handle)
- * @method \Magento\Core\Model\Layout\Update setXml() setXml(string $xml)
- * @method \Magento\Core\Model\Layout\Update setStoreId() setStoreId(int $storeId)
- * @method \Magento\Core\Model\Layout\Update setThemeId() setThemeId(int $themeId)
- * @method \Magento\Core\Model\Layout\Update setUpdatedAt() setUpdatedAt(string $updateDateTime)
- * @method \Magento\Core\Model\Resource\Layout\Update\Collection getCollection()
+ * @method \Magento\Widget\Model\Layout\Update setIsTemporary() setIsTemporary(int $isTemporary)
+ * @method \Magento\Widget\Model\Layout\Update setHandle() setHandle(string $handle)
+ * @method \Magento\Widget\Model\Layout\Update setXml() setXml(string $xml)
+ * @method \Magento\Widget\Model\Layout\Update setStoreId() setStoreId(int $storeId)
+ * @method \Magento\Widget\Model\Layout\Update setThemeId() setThemeId(int $themeId)
+ * @method \Magento\Widget\Model\Layout\Update setUpdatedAt() setUpdatedAt(string $updateDateTime)
+ * @method \Magento\Widget\Model\Resource\Layout\Update\Collection getCollection()
*/
class Update extends \Magento\Framework\Model\AbstractModel
{
@@ -54,7 +54,7 @@ class Update extends \Magento\Framework\Model\AbstractModel
*/
protected function _construct()
{
- $this->_init('Magento\Core\Model\Resource\Layout\Update');
+ $this->_init('Magento\Widget\Model\Resource\Layout\Update');
}
/**
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Link.php b/app/code/Magento/Widget/Model/Resource/Layout/Link.php
similarity index 75%
rename from app/code/Magento/Core/Model/Resource/Layout/Link.php
rename to app/code/Magento/Widget/Model/Resource/Layout/Link.php
index 3b42628a192cad9eea1f57f4104ba78165d4d697..c8bd107d58d0f2281d26c37c6f70c8beb592ac5b 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Link.php
+++ b/app/code/Magento/Widget/Model/Resource/Layout/Link.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Layout;
+namespace Magento\Widget\Model\Resource\Layout;
/**
* Layout Link resource model
@@ -17,6 +17,6 @@ class Link extends \Magento\Framework\Model\Resource\Db\AbstractDb
*/
protected function _construct()
{
- $this->_init('core_layout_link', 'layout_link_id');
+ $this->_init('layout_link', 'layout_link_id');
}
}
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php b/app/code/Magento/Widget/Model/Resource/Layout/Link/Collection.php
similarity index 93%
rename from app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php
rename to app/code/Magento/Widget/Model/Resource/Layout/Link/Collection.php
index 4498e969f1a8c631baa421b2df89027bfe164524..6da9307ea445bb8a70732c0e3f9f2605b37401e6 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php
+++ b/app/code/Magento/Widget/Model/Resource/Layout/Link/Collection.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Layout\Link;
+namespace Magento\Widget\Model\Resource\Layout\Link;
/**
* Layout update collection model
@@ -45,7 +45,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected function _construct()
{
parent::_construct();
- $this->_init('Magento\Core\Model\Layout\Link', 'Magento\Core\Model\Resource\Layout\Link');
+ $this->_init('Magento\Widget\Model\Layout\Link', 'Magento\Widget\Model\Resource\Layout\Link');
}
/**
@@ -71,7 +71,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
$flagName = 'joined_with_update_table';
if (!$this->getFlag($flagName)) {
$this->getSelect()->join(
- ['update' => $this->getTable('core_layout_update')],
+ ['update' => $this->getTable('layout_update')],
'update.layout_update_id = main_table.layout_update_id',
[$fields]
);
diff --git a/app/code/Magento/Widget/Model/Resource/Layout/Plugin.php b/app/code/Magento/Widget/Model/Resource/Layout/Plugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..64595658c41464646f614be827f0a55f8e2ee7e2
--- /dev/null
+++ b/app/code/Magento/Widget/Model/Resource/Layout/Plugin.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Model\Resource\Layout;
+
+/**
+ * Class Plugin
+ *
+ * @package Magento\Widget\Model\Resource\Layout
+ */
+class Plugin
+{
+ /**
+ * @var \Magento\Widget\Model\Resource\Layout\Update
+ */
+ private $update;
+
+ /**
+ * @var \Magento\Framework\View\Design\ThemeInterface
+ */
+ private $theme;
+
+ /**
+ * @var \Magento\Framework\App\ScopeInterface
+ */
+ private $store;
+
+ /**
+ * @param \Magento\Widget\Model\Resource\Layout\Update $update
+ */
+ public function __construct(
+ \Magento\Widget\Model\Resource\Layout\Update $update
+ ) {
+ $this->update = $update;
+ }
+
+ /**
+ * Around getDbUpdateString
+ *
+ * @param \Magento\Framework\View\Model\Layout\Merge $subject
+ * @param callable $proceed
+ * @param string $handle
+ * @return string
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function aroundGetDbUpdateString(
+ \Magento\Framework\View\Model\Layout\Merge $subject,
+ \Closure $proceed,
+ $handle
+ ) {
+ return $this->update->fetchUpdatesByHandle($handle, $subject->getTheme(), $subject->getScope());
+ }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Update.php b/app/code/Magento/Widget/Model/Resource/Layout/Update.php
similarity index 88%
rename from app/code/Magento/Core/Model/Resource/Layout/Update.php
rename to app/code/Magento/Widget/Model/Resource/Layout/Update.php
index 00d3e0eff82816fc674d7c1fc3360fb6514b85a6..5da0de6c0477a81afe0de00b3da986e8fe75af17 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Update.php
+++ b/app/code/Magento/Widget/Model/Resource/Layout/Update.php
@@ -6,7 +6,7 @@
// @codingStandardsIgnoreFile
-namespace Magento\Core\Model\Resource\Layout;
+namespace Magento\Widget\Model\Resource\Layout;
/**
* Layout update resource model
@@ -35,7 +35,7 @@ class Update extends \Magento\Framework\Model\Resource\Db\AbstractDb
*/
protected function _construct()
{
- $this->_init('core_layout_update', 'layout_update_id');
+ $this->_init('layout_update', 'layout_update_id');
}
/**
@@ -43,13 +43,13 @@ class Update extends \Magento\Framework\Model\Resource\Db\AbstractDb
*
* @param string $handle
* @param \Magento\Framework\View\Design\ThemeInterface $theme
- * @param \Magento\Store\Model\Store $store
+ * @param \Magento\Framework\App\ScopeInterface $store
* @return string
*/
public function fetchUpdatesByHandle(
$handle,
\Magento\Framework\View\Design\ThemeInterface $theme,
- \Magento\Store\Model\Store $store
+ \Magento\Framework\App\ScopeInterface $store
) {
$bind = ['layout_update_handle' => $handle, 'theme_id' => $theme->getId(), 'store_id' => $store->getId()];
$result = '';
@@ -77,7 +77,7 @@ class Update extends \Magento\Framework\Model\Resource\Db\AbstractDb
['layout_update' => $this->getMainTable()],
['xml']
)->join(
- ['link' => $this->getTable('core_layout_link')],
+ ['link' => $this->getTable('layout_link')],
'link.layout_update_id=layout_update.layout_update_id',
''
)->where(
@@ -100,7 +100,7 @@ class Update extends \Magento\Framework\Model\Resource\Db\AbstractDb
/**
* Update a "layout update link" if relevant data is provided
*
- * @param \Magento\Core\Model\Layout\Update|\Magento\Framework\Model\AbstractModel $object
+ * @param \Magento\Widget\Model\Layout\Update|\Magento\Framework\Model\AbstractModel $object
* @return $this
*/
protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
@@ -108,7 +108,7 @@ class Update extends \Magento\Framework\Model\Resource\Db\AbstractDb
$data = $object->getData();
if (isset($data['store_id']) && isset($data['theme_id'])) {
$this->_getWriteAdapter()->insertOnDuplicate(
- $this->getTable('core_layout_link'),
+ $this->getTable('layout_link'),
[
'store_id' => $data['store_id'],
'theme_id' => $data['theme_id'],
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php b/app/code/Magento/Widget/Model/Resource/Layout/Update/Collection.php
similarity index 92%
rename from app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php
rename to app/code/Magento/Widget/Model/Resource/Layout/Update/Collection.php
index 1404d2e57826c4cbad677d2aba4f47fd1f451e5f..e918a9d2dec430b9714e58402f08d26ff8f2a804 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php
+++ b/app/code/Magento/Widget/Model/Resource/Layout/Update/Collection.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Layout\Update;
+namespace Magento\Widget\Model\Resource\Layout\Update;
/**
* Layout update collection model
@@ -59,7 +59,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected function _construct()
{
parent::_construct();
- $this->_init('Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Resource\Layout\Update');
+ $this->_init('Magento\Widget\Model\Layout\Update', 'Magento\Widget\Model\Resource\Layout\Update');
}
/**
@@ -100,7 +100,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
$flagName = 'joined_with_link_table';
if (!$this->getFlag($flagName)) {
$this->getSelect()->join(
- ['link' => $this->getTable('core_layout_link')],
+ ['link' => $this->getTable('layout_link')],
'link.layout_update_id = main_table.layout_update_id',
['store_id', 'theme_id']
);
@@ -122,7 +122,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
$flagName = 'joined_left_with_link_table';
if (!$this->getFlag($flagName)) {
$this->getSelect()->joinLeft(
- ['link' => $this->getTable('core_layout_link')],
+ ['link' => $this->getTable('layout_link')],
'link.layout_update_id = main_table.layout_update_id',
[$fields]
);
@@ -176,7 +176,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
*/
public function delete()
{
- /** @var $update \Magento\Core\Model\Layout\Update */
+ /** @var $update \Magento\Widget\Model\Layout\Update */
foreach ($this->getItems() as $update) {
$update->delete();
}
diff --git a/app/code/Magento/Widget/Model/Resource/Widget/Instance.php b/app/code/Magento/Widget/Model/Resource/Widget/Instance.php
index b01f5eef1712f6d07b4a938fa5ad9a4a6586c3d9..d27659f3c83be1d645f73f4881c85a0d75951883 100644
--- a/app/code/Magento/Widget/Model/Resource/Widget/Instance.php
+++ b/app/code/Magento/Widget/Model/Resource/Widget/Instance.php
@@ -115,8 +115,8 @@ class Instance extends \Magento\Framework\Model\Resource\Db\AbstractDb
$writeAdapter = $this->_getWriteAdapter();
$pageLayoutUpdateIds = [];
$storeIds = $this->_prepareStoreIds($widgetInstance->getStoreIds());
- $layoutUpdateTable = $this->getTable('core_layout_update');
- $layoutUpdateLinkTable = $this->getTable('core_layout_link');
+ $layoutUpdateTable = $this->getTable('layout_update');
+ $layoutUpdateLinkTable = $this->getTable('layout_link');
foreach ($pageGroupData['layout_handle_updates'] as $handle) {
$xml = $widgetInstance->generateLayoutUpdateXml(
@@ -226,7 +226,7 @@ class Instance extends \Magento\Framework\Model\Resource\Db\AbstractDb
$writeAdapter = $this->_getWriteAdapter();
if ($layoutUpdateIds) {
$inCond = $writeAdapter->prepareSqlCondition('layout_update_id', ['in' => $layoutUpdateIds]);
- $writeAdapter->delete($this->getTable('core_layout_update'), $inCond);
+ $writeAdapter->delete($this->getTable('layout_update'), $inCond);
}
return $this;
}
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
old mode 100644
new mode 100755
index a4fed3b151e13931ba01eee8207123574a0902aa..7b5df0165051e16a226591376a17b798ca8712cc
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -28,7 +28,7 @@ class Filter extends \Magento\Cms\Model\Template\Filter
* @param \Magento\Framework\View\Asset\Repository $assetRepo
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Core\Model\VariableFactory $coreVariableFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\LayoutInterface $layout
* @param \Magento\Framework\View\LayoutFactory $layoutFactory
* @param \Magento\Framework\App\State $appState
@@ -44,7 +44,7 @@ class Filter extends \Magento\Cms\Model\Template\Filter
\Magento\Framework\View\Asset\Repository $assetRepo,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Core\Model\VariableFactory $coreVariableFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\LayoutInterface $layout,
\Magento\Framework\View\LayoutFactory $layoutFactory,
\Magento\Framework\App\State $appState,
@@ -110,4 +110,17 @@ class Filter extends \Magento\Cms\Model\Template\Filter
return $widget->toHtml();
}
+
+ /**
+ * Retrieve media file URL directive
+ *
+ * @param string[] $construction
+ * @return string
+ */
+ public function mediaDirective($construction)
+ {
+ $params = $this->_getIncludeParameters($construction[2]);
+ return $this->_storeManager->getStore()
+ ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
+ }
}
diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php
index f0344e35cc13a04ec4977057cb3e1d2cb3b32a83..8d0d1590e99ea894a8b49b560381474a269625dc 100644
--- a/app/code/Magento/Widget/Model/Widget/Instance.php
+++ b/app/code/Magento/Widget/Model/Widget/Instance.php
@@ -253,7 +253,7 @@ class Instance extends \Magento\Framework\Model\AbstractModel
/**
* Validate widget instance data
*
- * @return string|boolean
+ * @return \Magento\Framework\Phrase|bool
*/
public function validate()
{
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index 2dd8d9e40b27e7030290dcf1c06523f5fd771443..dd05e45228bbb3db7993b20e6c40b0621e305af7 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -3,17 +3,17 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-cms": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-cms": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Widget/data/widget_setup/data-install-2.0.0.php b/app/code/Magento/Widget/data/widget_setup/data-install-2.0.0.php
index cd8b76e54949b3c2b326727e4f2b9fd99f0677c0..7f6b89ef9846b5a9f8e1c623ab6c612ef2accb49 100644
--- a/app/code/Magento/Widget/data/widget_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Widget/data/widget_setup/data-install-2.0.0.php
@@ -15,6 +15,15 @@ $installer->appendClassAliasReplace(
\Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
['instance_id']
);
+
+$installer->appendClassAliasReplace(
+ 'layout_update',
+ 'xml',
+ \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
+ \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
+ ['layout_update_id']
+);
+
$installer->doUpdateClassAliases();
$installer->endSetup();
diff --git a/app/code/Magento/Widget/etc/acl.xml b/app/code/Magento/Widget/etc/acl.xml
index 493c0633ad436fe4eb86ef3da848af8f43a391d9..25ca84c0203c26d007fd0d935608cbcb833b6c76 100644
--- a/app/code/Magento/Widget/etc/acl.xml
+++ b/app/code/Magento/Widget/etc/acl.xml
@@ -8,9 +8,9 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::content">
- <resource id="Magento_Adminhtml::content_elements">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::content">
+ <resource id="Magento_Backend::content_elements">
<resource id="Magento_Widget::widget_instance" title="Frontend Apps" sortOrder="50" />
</resource>
</resource>
diff --git a/app/code/Magento/Widget/etc/adminhtml/routes.xml b/app/code/Magento/Widget/etc/adminhtml/routes.xml
index b2503700382389f4ac6453f35e049d1d231cc1b9..4c9134c0803663183be4aecdbee350403b712435 100644
--- a/app/code/Magento/Widget/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Widget/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
<router id="admin">
<route id="adminhtml">
- <module name="Magento_Widget" before="Magento_Adminhtml" />
+ <module name="Magento_Widget" before="Magento_Backend" />
</route>
</router>
</config>
diff --git a/app/code/Magento/Widget/etc/di.xml b/app/code/Magento/Widget/etc/di.xml
index 1efde5645dcb33b906d652f83532eb52a81ec332..a6fa351baaba7c4300e068866be469389cb17ed9 100644
--- a/app/code/Magento/Widget/etc/di.xml
+++ b/app/code/Magento/Widget/etc/di.xml
@@ -19,10 +19,19 @@
<argument name="cacheId" xsi:type="string">widget_config</argument>
</arguments>
</type>
+ <type name="Magento\Widget\Model\Resource\Layout\Update">
+ <arguments>
+ <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Layout</argument>
+ </arguments>
+ </type>
<type name="Magento\Cms\Model\Template\FilterProvider">
<arguments>
<argument name="pageFilter" xsi:type="string">Magento\Widget\Model\Template\Filter</argument>
<argument name="blockFilter" xsi:type="string">Magento\Widget\Model\Template\Filter</argument>
</arguments>
</type>
+ <type name="Magento\Framework\View\Model\Layout\Merge">
+ <plugin name="widget-layout-update-plugin"
+ type="Magento\Widget\Model\Resource\Layout\Plugin" sortOrder="10"/>
+ </type>
</config>
diff --git a/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php b/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php
index 3f91b5008df1ead8e492e541f03f26364270de32..cb550f6dd990fd09d6f517593c020152d9e1e780 100644
--- a/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php
+++ b/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php
@@ -7,6 +7,9 @@
/* @var $installer \Magento\Setup\Module\SetupModule */
$installer = $this;
+/* @var $connection \Magento\Framework\DB\Adapter\AdapterInterface */
+$connection = $installer->getConnection();
+
$installer->startSetup();
/**
@@ -45,9 +48,9 @@ if (!$installer->getConnection()->isTableExists($installer->getTable('widget')))
)->setComment(
'Preconfigured Widgets'
);
- $installer->getConnection()->createTable($table);
+ $connection->createTable($table);
} else {
- $installer->getConnection()->dropIndex($installer->getTable('widget'), 'IDX_CODE');
+ $connection->dropIndex($installer->getTable('widget'), 'IDX_CODE');
$tables = [
$installer->getTable(
@@ -72,9 +75,9 @@ if (!$installer->getConnection()->isTableExists($installer->getTable('widget')))
],
];
- $installer->getConnection()->modifyTables($tables);
+ $connection->modifyTables($tables);
- $installer->getConnection()->changeColumn(
+ $connection->changeColumn(
$installer->getTable('widget'),
'code',
'widget_code',
@@ -85,14 +88,14 @@ if (!$installer->getConnection()->isTableExists($installer->getTable('widget')))
]
);
- $installer->getConnection()->changeColumn(
+ $connection->changeColumn(
$installer->getTable('widget'),
'type',
'widget_type',
['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, 'length' => 255, 'comment' => 'Widget Type']
);
- $installer->getConnection()->addIndex(
+ $connection->addIndex(
$installer->getTable('widget'),
$installer->getIdxName('widget', ['widget_code']),
['widget_code']
@@ -102,7 +105,7 @@ if (!$installer->getConnection()->isTableExists($installer->getTable('widget')))
/**
* Create table 'widget_instance'
*/
-$table = $installer->getConnection()->newTable(
+$table = $connection->newTable(
$installer->getTable('widget_instance')
)->addColumn(
'instance_id',
@@ -156,12 +159,12 @@ $table = $installer->getConnection()->newTable(
)->setComment(
'Instances of Widget for Package Theme'
);
-$installer->getConnection()->createTable($table);
+$connection->createTable($table);
/**
* Create table 'widget_instance_page'
*/
-$table = $installer->getConnection()->newTable(
+$table = $connection->newTable(
$installer->getTable('widget_instance_page')
)->addColumn(
'page_id',
@@ -224,12 +227,12 @@ $table = $installer->getConnection()->newTable(
)->setComment(
'Instance of Widget on Page'
);
-$installer->getConnection()->createTable($table);
+$connection->createTable($table);
/**
* Create table 'widget_instance_page_layout'
*/
-$table = $installer->getConnection()->newTable(
+$table = $connection->newTable(
$installer->getTable('widget_instance_page_layout')
)->addColumn(
'page_id',
@@ -262,15 +265,129 @@ $table = $installer->getConnection()->newTable(
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->addForeignKey(
- $installer->getFkName('widget_instance_page_layout', 'layout_update_id', 'core_layout_update', 'layout_update_id'),
+ $installer->getFkName('widget_instance_page_layout', 'layout_update_id', 'layout_update', 'layout_update_id'),
'layout_update_id',
- $installer->getTable('core_layout_update'),
+ $installer->getTable('layout_update'),
'layout_update_id',
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
\Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
)->setComment(
'Layout updates'
);
-$installer->getConnection()->createTable($table);
+$connection->createTable($table);
+
+/**
+ * Create table 'layout_update'
+ */
+$table = $connection->newTable(
+ $installer->getTable('layout_update')
+)->addColumn(
+ 'layout_update_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+ 'Layout Update Id'
+)->addColumn(
+ 'handle',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ 255,
+ [],
+ 'Handle'
+)->addColumn(
+ 'xml',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+ '64k',
+ [],
+ 'Xml'
+)->addColumn(
+ 'sort_order',
+ \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+ null,
+ ['nullable' => false, 'default' => '0'],
+ 'Sort Order'
+)->addColumn(
+ 'updated_at',
+ \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+ null,
+ ['nullable' => true],
+ 'Last Update Timestamp'
+)->addIndex(
+ $installer->getIdxName('layout_update', ['handle']),
+ ['handle']
+)->setComment(
+ 'Layout Updates'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'layout_link'
+ */
+$table = $connection->newTable(
+ $installer->getTable('layout_link')
+)->addColumn(
+ 'layout_link_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+ 'Link Id'
+)->addColumn(
+ 'store_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+ null,
+ ['unsigned' => true, 'nullable' => false, 'default' => '0'],
+ 'Store Id'
+)->addColumn(
+ 'theme_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['unsigned' => true, 'nullable' => false],
+ 'Theme id'
+)->addColumn(
+ 'layout_update_id',
+ \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+ null,
+ ['unsigned' => true, 'nullable' => false, 'default' => '0'],
+ 'Layout Update Id'
+)->addColumn(
+ 'is_temporary',
+ \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+ null,
+ ['nullable' => false, 'default' => '0'],
+ 'Defines whether Layout Update is Temporary'
+)->addIndex(
+ $installer->getIdxName('layout_link', ['layout_update_id']),
+ ['layout_update_id']
+)->addForeignKey(
+ $installer->getFkName('layout_link', 'layout_update_id', 'layout_update', 'layout_update_id'),
+ 'layout_update_id',
+ $installer->getTable('layout_update'),
+ 'layout_update_id',
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->addIndex(
+ $installer->getIdxName(
+ 'layout_link',
+ ['store_id', 'theme_id', 'layout_update_id', 'is_temporary'],
+ \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+ ),
+ ['store_id', 'theme_id', 'layout_update_id', 'is_temporary']
+)->addForeignKey(
+ $installer->getFkName('layout_link', 'store_id', 'store', 'store_id'),
+ 'store_id',
+ $installer->getTable('store'),
+ 'store_id',
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->addForeignKey(
+ $installer->getFkName('layout_link', 'theme_id', 'theme', 'theme_id'),
+ 'theme_id',
+ $installer->getTable('theme'),
+ 'theme_id',
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+ \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->setComment(
+ 'Layout Link'
+);
+$connection->createTable($table);
$installer->endSetup();
diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
index bea500d52e677f6177a9a560c93d8e0a1352ef33..2763ef2c440967b3cbee665e1cdd12d68fff7a0e 100644
--- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
+++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
@@ -9,7 +9,7 @@
<head>
<link src="prototype/window.js"/>
<css src="prototype/windows/themes/default.css"/>
- <css src="Magento_Core::prototype/magento.css"/>
+ <css src="Magento_Theme::prototype/magento.css"/>
</head>
<body>
<referenceContainer name="content">
diff --git a/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php b/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
index e091f7eea83aec4b29cdfeed5194858ec00c827a..2f393bf6d2c40e0d1e80974d5854187c8bd994df 100644
--- a/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
+++ b/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
@@ -53,7 +53,7 @@ class WishlistTab extends TabWrapper
/**
* Return Tab label
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTabLabel()
{
diff --git a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
index 1898c981c239bb2616dcf44b9fe9f9a9929cf0cc..0489106ea8e5c611d4ef1052c466e2b076308b18 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
@@ -18,7 +18,7 @@ class Sidebar extends \Magento\Wishlist\Block\AbstractBlock implements \Magento\
/**
* Retrieve block title
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getTitle()
{
diff --git a/app/code/Magento/Wishlist/Block/Link.php b/app/code/Magento/Wishlist/Block/Link.php
index 6318cf1406e1b80848f2a258a6c6f74f13fb7dd5..d399db34a59917d133376773e4e6eadb21aa7252 100644
--- a/app/code/Magento/Wishlist/Block/Link.php
+++ b/app/code/Magento/Wishlist/Block/Link.php
@@ -63,7 +63,7 @@ class Link extends \Magento\Framework\View\Element\Html\Link
}
/**
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getLabel()
{
@@ -100,7 +100,7 @@ class Link extends \Magento\Framework\View\Element\Html\Link
* Create button label based on wishlist item quantity
*
* @param int $count
- * @return string|void
+ * @return \Magento\Framework\Phrase|void
*/
protected function _createCounter($count)
{
diff --git a/app/code/Magento/Wishlist/Block/Rss/Link.php b/app/code/Magento/Wishlist/Block/Rss/Link.php
index ef711ecfe392af6cf2db4e5f4c4eff132dcd143b..bc5ae6908cba82d71548c8f48e325fc9dcbf8f7c 100644
--- a/app/code/Magento/Wishlist/Block/Rss/Link.php
+++ b/app/code/Magento/Wishlist/Block/Rss/Link.php
@@ -64,7 +64,7 @@ class Link extends \Magento\Framework\View\Element\Template
{
return $this->_scopeConfig->isSetFlag(
'rss/wishlist/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Wishlist/Block/Share/Wishlist.php b/app/code/Magento/Wishlist/Block/Share/Wishlist.php
index be45d44da4aa48ef04ea7eb18163c5f889bb5b77..a53c422bb7ac59e6e7c0fe7d5f74d7f40b7d8dc0 100644
--- a/app/code/Magento/Wishlist/Block/Share/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Share/Wishlist.php
@@ -78,7 +78,7 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
/**
* Retrieve Page Header
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getHeader()
{
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index 3eea28afb56dcd0de3ae16c0436a505aa8763646..c989d815bda47004d0eb6a2ed73395160cb34152 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -155,12 +155,12 @@ class Send extends Action\Action implements IndexInterface
try {
$scopeConfig = $this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
- $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
foreach ($emails as $email) {
$transport = $this->_transportBuilder->setTemplateIdentifier(
$scopeConfig->getValue(
'wishlist/email/email_template',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->setTemplateOptions(
[
@@ -181,7 +181,7 @@ class Send extends Action\Action implements IndexInterface
)->setFrom(
$scopeConfig->getValue(
'wishlist/email/email_identity',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)->addTo(
$email
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index 5e6e7fd83428c3d7c11a7890148bd123623d383c..d0216995de92aec9986857abda0bcbd01de60aaf 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -78,7 +78,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_wishlistFactory;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -103,7 +103,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Helper\PostData $postDataHelper
* @param \Magento\Customer\Helper\View $customerViewHelper
* @param WishlistProviderInterface $wishlistProvider
@@ -114,7 +114,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Customer\Model\Session $customerSession,
\Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Core\Helper\PostData $postDataHelper,
\Magento\Customer\Helper\View $customerViewHelper,
WishlistProviderInterface $wishlistProvider
@@ -202,13 +202,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
$storedDisplayType = $this->_customerSession->getWishlistDisplayType();
$currentDisplayType = $this->_scopeConfig->getValue(
self::XML_PATH_WISHLIST_LINK_USE_QTY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$storedDisplayOutOfStockProducts = $this->_customerSession->getDisplayOutOfStockProducts();
$currentDisplayOutOfStockProducts = $this->_scopeConfig->getValue(
self::XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
if (!$this->_customerSession->hasWishlistItemCount() ||
$currentDisplayType != $storedDisplayType ||
@@ -430,7 +430,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
if ($this->_moduleManager->isOutputEnabled($this->_getModuleName()) && $this->_scopeConfig->getValue(
'wishlist/general/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
return true;
@@ -482,7 +482,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* Retrieve default empty comment message
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function defaultCommentString()
{
@@ -492,7 +492,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
/**
* Retrieve default empty comment message
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getDefaultWishlistName()
{
@@ -513,7 +513,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
$collection = $this->getWishlistItemCollection()->setInStockFilter(true);
if ($this->_scopeConfig->getValue(
self::XML_PATH_WISHLIST_LINK_USE_QTY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
) {
$count = $collection->getItemsQty();
@@ -523,13 +523,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
$this->_customerSession->setWishlistDisplayType(
$this->_scopeConfig->getValue(
self::XML_PATH_WISHLIST_LINK_USE_QTY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$this->_customerSession->setDisplayOutOfStockProducts(
$this->_scopeConfig->getValue(
self::XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
}
@@ -547,7 +547,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
{
return $this->_scopeConfig->getValue(
self::XML_PATH_WISHLIST_LINK_USE_QTY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Wishlist/Helper/Rss.php b/app/code/Magento/Wishlist/Helper/Rss.php
index e627c7743dbd2f9de1780f19ea0eb1855389039a..511e865aa5934f9d8bd22420a7e387fb7ec313e2 100644
--- a/app/code/Magento/Wishlist/Helper/Rss.php
+++ b/app/code/Magento/Wishlist/Helper/Rss.php
@@ -32,7 +32,7 @@ class Rss extends \Magento\Wishlist\Helper\Data
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Helper\PostData $postDataHelper
* @param \Magento\Customer\Helper\View $customerViewHelper
* @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
@@ -46,7 +46,7 @@ class Rss extends \Magento\Wishlist\Helper\Data
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
\Magento\Customer\Model\Session $customerSession,
\Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Core\Helper\PostData $postDataHelper,
\Magento\Customer\Helper\View $customerViewHelper,
\Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider,
@@ -122,7 +122,7 @@ class Rss extends \Magento\Wishlist\Helper\Data
return $this->_moduleManager->isEnabled('Magento_Rss')
&& $this->_scopeConfig->isSetFlag(
'rss/wishlist/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/app/code/Magento/Wishlist/Model/Config.php b/app/code/Magento/Wishlist/Model/Config.php
index a8789a30d62dbc75b98f2295e30444fee8aed9a7..de0e315021c11c7f4ccca07c65aa67afa9288670 100644
--- a/app/code/Magento/Wishlist/Model/Config.php
+++ b/app/code/Magento/Wishlist/Model/Config.php
@@ -44,11 +44,11 @@ class Config
) {
$emailLimitInConfig = (int)$scopeConfig->getValue(
self::XML_PATH_SHARING_EMAIL_LIMIT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$textLimitInConfig = (int)$scopeConfig->getValue(
self::XML_PATH_SHARING_TEXT_LIMIT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->_sharingEmailLimit = $emailLimitInConfig ?: self::SHARING_EMAIL_LIMIT;
$this->_sharignTextLimit = $textLimitInConfig ?: self::SHARING_TEXT_LIMIT;
diff --git a/app/code/Magento/Wishlist/Model/Item.php b/app/code/Magento/Wishlist/Model/Item.php
index 33fb1733c7c206efd4ff8f388aa37f3f86ad02ce..314afecc70465724a6fccaa2c92a8c1b9b39e01a 100644
--- a/app/code/Magento/Wishlist/Model/Item.php
+++ b/app/code/Magento/Wishlist/Model/Item.php
@@ -89,7 +89,7 @@ class Item extends AbstractModel implements ItemInterface
protected $_flagOptionsSaved = null;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -126,7 +126,7 @@ class Item extends AbstractModel implements ItemInterface
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
* @param \Magento\Catalog\Model\Resource\Url $catalogUrl
* @param OptionFactory $wishlistOptFactory
@@ -141,7 +141,7 @@ class Item extends AbstractModel implements ItemInterface
public function __construct(
\Magento\Framework\Model\Context $context,
\Magento\Framework\Registry $registry,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
\Magento\Catalog\Model\Resource\Url $catalogUrl,
OptionFactory $wishlistOptFactory,
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
index fe98c8dbf5745e68fbf90a0871543585d4d7ae8e..6552345f30f3dff942846b789708c352caf9cdf7 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
@@ -83,7 +83,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
protected $stockConfiguration = null;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -139,7 +139,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
* @param \Magento\Sales\Helper\Admin $adminhtmlSales
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
* @param \Magento\Wishlist\Model\Config $wishlistConfig
* @param \Magento\Catalog\Model\Product\Visibility $productVisibility
@@ -161,7 +161,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
\Magento\Sales\Helper\Admin $adminhtmlSales,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
\Magento\Wishlist\Model\Config $wishlistConfig,
\Magento\Catalog\Model\Product\Visibility $productVisibility,
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
index 41cf27e9b5bf1e3f4228b39ce9af6cf3647dae87..45eff464866a6645b1c9e55e2a50c23630ec3395 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
@@ -28,7 +28,7 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
* @param \Magento\Sales\Helper\Admin $adminhtmlSales
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
* @param \Magento\Wishlist\Model\Config $wishlistConfig
* @param \Magento\Catalog\Model\Product\Visibility $productVisibility
@@ -51,7 +51,7 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
\Magento\Sales\Helper\Admin $adminhtmlSales,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
\Magento\Wishlist\Model\Config $wishlistConfig,
\Magento\Catalog\Model\Product\Visibility $productVisibility,
diff --git a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
index a481a648414de1cf3e0349ab30cb4d6bf5ec7d20..88f6ab4487f088b9742e0d1f9ec78a8224b3bbac 100644
--- a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
@@ -116,7 +116,7 @@ class Wishlist implements DataProviderInterface
{
return (bool)$this->scopeConfig->getValue(
'rss/wishlist/active',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 53f1365e38a8ea8b64f99c03d565339dfc0f75bd..45933e31a1a7f4d255f5fac6d298f35e011adaf0 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -75,7 +75,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
protected $_catalogProduct;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -126,7 +126,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
* @param \Magento\Wishlist\Helper\Data $wishlistData
* @param ResourceWishlist $resource
* @param Collection $resourceCollection
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\Stdlib\DateTime\DateTime $date
* @param ItemFactory $wishlistItemFactory
* @param CollectionFactory $wishlistCollectionFactory
@@ -145,7 +145,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
\Magento\Wishlist\Helper\Data $wishlistData,
ResourceWishlist $resource,
Collection $resourceCollection,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Stdlib\DateTime\DateTime $date,
ItemFactory $wishlistItemFactory,
CollectionFactory $wishlistCollectionFactory,
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index 93451395bc59043b1e33ec84ad8212034257bc80..f9ba23824d5380257c21f3476e0bb64e1a259efd 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -3,29 +3,29 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/module-store": "0.42.0-beta6",
- "magento/module-customer": "0.42.0-beta6",
- "magento/module-catalog": "0.42.0-beta6",
- "magento/module-core": "0.42.0-beta6",
- "magento/module-checkout": "0.42.0-beta6",
- "magento/module-theme": "0.42.0-beta6",
- "magento/module-catalog-inventory": "0.42.0-beta6",
- "magento/module-rss": "0.42.0-beta6",
- "magento/module-backend": "0.42.0-beta6",
- "magento/module-sales": "0.42.0-beta6",
- "magento/module-grouped-product": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
- "magento/module-ui": "0.42.0-beta6",
+ "magento/module-store": "0.42.0-beta7",
+ "magento/module-customer": "0.42.0-beta7",
+ "magento/module-catalog": "0.42.0-beta7",
+ "magento/module-core": "0.42.0-beta7",
+ "magento/module-checkout": "0.42.0-beta7",
+ "magento/module-theme": "0.42.0-beta7",
+ "magento/module-catalog-inventory": "0.42.0-beta7",
+ "magento/module-rss": "0.42.0-beta7",
+ "magento/module-backend": "0.42.0-beta7",
+ "magento/module-sales": "0.42.0-beta7",
+ "magento/module-grouped-product": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
+ "magento/module-ui": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"suggest": {
- "magento/module-configurable-product": "0.42.0-beta6",
- "magento/module-downloadable": "0.42.0-beta6",
- "magento/module-bundle": "0.42.0-beta6",
- "magento/module-cookie": "0.42.0-beta6"
+ "magento/module-configurable-product": "0.42.0-beta7",
+ "magento/module-downloadable": "0.42.0-beta7",
+ "magento/module-bundle": "0.42.0-beta7",
+ "magento/module-cookie": "0.42.0-beta7"
},
"type": "magento2-module",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Wishlist/etc/acl.xml b/app/code/Magento/Wishlist/etc/acl.xml
index fa928acbe59ffa4ec3ea0be922865f5a57048b22..a3bf442d6da72392295de58a7b8b5fcb9216c6da 100644
--- a/app/code/Magento/Wishlist/etc/acl.xml
+++ b/app/code/Magento/Wishlist/etc/acl.xml
@@ -8,10 +8,10 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
- <resource id="Magento_Adminhtml::stores">
- <resource id="Magento_Adminhtml::stores_settings">
- <resource id="Magento_Adminhtml::config">
+ <resource id="Magento_Backend::admin">
+ <resource id="Magento_Backend::stores">
+ <resource id="Magento_Backend::stores_settings">
+ <resource id="Magento_Backend::config">
<resource id="Magento_Wishlist::config_wishlist" title="Wish List Section" sortOrder="80" />
</resource>
</resource>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
index c9e46104eb566e56bb1c3905a8ad1293bb1fb713..bbad15a0bd0227e9a8c1505a8921d2c62c2aafe3 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
@@ -16,7 +16,7 @@
<css src="css/pages.css"/>
<css src="css/styles-old.css"/>
<css src="mui/utils.css"/>
- <css src="Magento_Core::prototype/magento.css"/>
+ <css src="Magento_Theme::prototype/magento.css"/>
<css src="mui/print.css" media="print"/>
</head>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml
index 7fe3ce52af9f7e4a5012ccb6855be0ee725bcb25..8d7bc28aa03f8c5d1c663da778619d209a1dec93 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml
@@ -17,7 +17,7 @@
<remove src="css/styles-old.css"/>
<remove src="jquery/farbtastic/css/farbtastic.css"/>
<remove src="mui/utils.css"/>
- <remove src="Magento_Core::prototype/magento.css"/>
+ <remove src="Magento_Theme::prototype/magento.css"/>
<remove src="mui/print.css"/>
<css src="css/styles.css"/>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_dashboard.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_dashboard.less
new file mode 100644
index 0000000000000000000000000000000000000000..18f8053ace9d57f925a7d681b6c3c50d7a55b5de
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_dashboard.less
@@ -0,0 +1,252 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Dashboard
+// _____________________________________________
+
+@dashboard__font-size-base: 1.3rem;
+@dashboard__font-size-l: 2.4rem;
+@dashboard-tabs__padding: 2rem;
+@dashboard-tabs__background-color: @color-white;
+
+//
+// Tables
+// ---------------------------------------------
+
+.dashboard-data {
+ background: @dashboard-tabs__background-color;
+ font-size: @dashboard__font-size-base;
+ width: 100%;
+ th,
+ td {
+ padding: 1rem 0 1rem 1rem;
+ &:first-child {
+ padding-left: 0;
+ }
+ }
+ th {
+ border-top: 0;
+ }
+
+ // Primary column
+ .dashboard-main & {
+
+ @dashboard-table__width-px: 560px;
+ @dashboard-table-col-product__width-px: 392px;
+ @dashboard-table-col-name__width-px: 308px;
+ @dashboard-table-col-value__width-px: 84px;
+
+ @dashboard-table-col-product__width-pct: @dashboard-table-col-product__width-px * 100% / @dashboard-table__width-px; // 70%
+ @dashboard-table-col-name__width-pct: @dashboard-table-col-name__width-px * 100% / @dashboard-table__width-px; // 55%
+ @dashboard-table-col-value__width-pct: @dashboard-table-col-value__width-px * 100% / @dashboard-table__width-px; // 15%
+
+ th,
+ td {
+ text-align: right;
+ white-space: nowrap;
+ width: @dashboard-table-col-value__width-pct;
+ }
+ .col-name {
+ text-align: left;
+ white-space: normal;
+ width: @dashboard-table-col-name__width-pct;
+ }
+ .col-product {
+ width: @dashboard-table-col-product__width-pct;
+ }
+ .col-orders_count {
+ text-align: left;
+ }
+ }
+
+ // Secondary column
+
+ @dashboard-secondary-table__width-px: 235px;
+ @dashboard-secondary-table-col-name__width-px: 135px;
+ @dashboard-secondary-table-col-value__width-px: 50px;
+
+ @dashboard-secondary-table-col-name__width-pct: @dashboard-secondary-table-col-name__width-px * 100% / @dashboard-secondary-table__width-px; // 57.44680851%
+ @dashboard-secondary-table-col-value__width-pct: @dashboard-secondary-table-col-value__width-px * 100% / @dashboard-secondary-table__width-px; // 21.27659574%
+
+ .dashboard-secondary & {
+ .col-popularity,
+ .col-total {
+ text-align: right;
+ width: @dashboard-secondary-table-col-value__width-pct;
+ }
+ .col-customer,
+ .col-search_query {
+ width: @dashboard-secondary-table-col-name__width-pct;
+ }
+ }
+}
+
+.dashboard-container {
+ .empty-text {
+ background: @dashboard-tabs__background-color;
+ font-size: @dashboard__font-size-base;
+ }
+}
+
+//
+// Primary column
+// _____________________________________________
+
+//
+// Diagram
+// ---------------------------------------------
+
+// Diagram disabled
+.dashboard-diagram-disabled {
+ padding: .5rem 2rem 2rem;
+}
+
+// Range switcher
+.dashboard-diagram-switcher {
+ margin-bottom: 2rem;
+ .label {
+ .extend__visually-hidden();
+ }
+ .form-select-label {
+ display: inline-block;
+ }
+}
+
+// Chart
+.dashboard-diagram-image {
+ max-width: 100%;
+}
+
+//
+// Totals: Revenue, Tax, Shipping, Quantity
+// ---------------------------------------------
+
+.dashboard-totals {
+ margin: 1rem 2rem 6rem;
+}
+
+.dashboard-totals-list {
+ display: table;
+ .extend__clearfix();
+ .extend__list-reset-styles();
+ width: 100%;
+}
+
+.dashboard-totals-item {
+ display: table-cell;
+ padding: 0 1rem 0 0;
+ width: 25%;
+ &:first-child {
+ .price {
+ color: @color-phoenix;
+ }
+ }
+}
+
+.dashboard-totals-label {
+ display: block;
+ font-size: @dashboard__font-size-base;
+ font-weight: @font-weight-bold;
+}
+
+.dashboard-totals-value {
+ font-size: @dashboard__font-size-l;
+ font-weight: @font-weight-semibold;
+}
+
+//
+// Tabs
+// ---------------------------------------------
+
+.dashboard-store-stats {
+ .ui-tabs {
+ .extend__clearfix();
+ position: relative;
+ &:before {
+ .background-gradient(
+ @_background-gradient: true,
+ @_background-gradient-direction: horizontal,
+ @_background-gradient-start-color: rgba(255,255,255,0),
+ @_background-gradient-end-color: @color-white,
+ @_background-gradient-color-position: false
+ );
+ content: '';
+ height: 4.8rem;
+ position: absolute;
+ right: 0;
+ top: 0;
+ width: 2rem;
+ }
+ }
+
+ .ui-tabs-panel {
+ // ToDo UI: change the picture to html after loaders refactoring
+ background: url(../images/ajax-loader-small.gif) no-repeat 50% 50%;
+ min-height: 6rem;
+ }
+
+ .tabs-horiz {
+ border-right: 1px solid @color-white; // IE9 fix
+ float: left; // IE9 fix
+ overflow-x: auto;
+ white-space: nowrap;
+ width: 100%; // IE9 fix
+ .ui-state-default {
+ display: inline-block;
+ float: none;
+ margin-right: .1rem;
+ }
+ }
+}
+
+//
+// Secondary column
+// _____________________________________________
+
+.dashboard-container {
+ .dashboard-secondary {
+ padding-right: 3.5rem;
+ }
+}
+
+.dashboard-item {
+ margin-bottom: 3rem;
+}
+
+.dashboard-item-title {
+ font-size: 1.8rem;
+ font-weight: @font-weight-bold;
+}
+
+.dashboard-item-primary {
+ &:first-child {
+ .dashboard-sales-value {
+ color: @color-phoenix;
+ }
+ }
+}
+
+.dashboard-sales-value {
+ font-size: @dashboard__font-size-l;
+ font-weight: @font-weight-semibold;
+}
+
+//
+// Mobile
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-m) {
+
+ //
+ // Totals: Revenue, Tax, Shipping, Quantity
+ // ---------------------------------------------
+
+ .dashboard-totals-item {
+ float: left;
+ margin-bottom: 1rem;
+ width: 50%;
+ }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module.less
new file mode 100644
index 0000000000000000000000000000000000000000..b291bbc08a55bbb4ecd2244e50a0147175ec1363
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module.less
@@ -0,0 +1,6 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+@import '_dashboard'; // Import dashboard styles
diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json
index b6346138c4733e35723133263b45f72831fefe02..1b508d27cab65881700c98b7a2d9c519edfaa593 100644
--- a/app/design/adminhtml/Magento/backend/composer.json
+++ b/app/design/adminhtml/Magento/backend/composer.json
@@ -3,11 +3,11 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/framework": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-theme",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/design/adminhtml/Magento/backend/web/css/admin.less b/app/design/adminhtml/Magento/backend/web/css/admin.less
index fca6307f8ac77b35b153ac48a2745bc8df92360b..7dd47b3fd0e73b8ffe7b7f99f63e671d66cb3efc 100644
--- a/app/design/adminhtml/Magento/backend/web/css/admin.less
+++ b/app/design/adminhtml/Magento/backend/web/css/admin.less
@@ -3191,6 +3191,10 @@ tr.dynamic-grid input.input-text {
background: none;
}
+.attribute-popup #edit_form {
+ padding-bottom: 80px;
+}
+
.attribute-popup #edit_form > .fieldset > .legend {
display: none;
}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_buttons.less b/app/design/adminhtml/Magento/backend/web/css/source/_buttons.less
index 904f945a9580c11658e4c94483cf1d7936744f4f..8d899ee0eb9237754123cc4354c9573138f3d16f 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_buttons.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_buttons.less
@@ -25,7 +25,7 @@
@button-tertiary__color: @color-gray20;
@button-tertiary__bg-color: @color-gray89;
-@button-tertiary__border-color: @color-dark-grayish;
+@button-tertiary__border-color: @color-gray68;
// States
@button-base__large__font-size: 1.6rem;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
similarity index 60%
rename from app/design/adminhtml/Magento/backend/web/css/source/_extend.less
rename to app/design/adminhtml/Magento/backend/web/css/source/_extends.less
index e5acb06f41c5a02346c608164e60769d3a99ca91..dda17efcc78a66ac59e33d088ece3626be1fc482 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_extend.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
@@ -33,3 +33,30 @@ button {
margin-left: 3px;
}
}
+
+// Visually hidden
+.abs-visually-hidden {
+ .visually-hidden();
+}
+
+.extend__visually-hidden() {
+ &:extend(.abs-visually-hidden all);
+}
+
+// Clearfix
+.abs-clearfix {
+ .clearfix();
+}
+
+.extend__clearfix() {
+ &:extend(.abs-clearfix all);
+}
+
+// Reset list styles
+.abs-list-reset-styles {
+ .list-reset-styles();
+}
+
+.extend__list-reset-styles() {
+ &:extend(.abs-list-reset-styles all);
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_forms.less b/app/design/adminhtml/Magento/backend/web/css/source/_forms.less
index 875ca7f32f40974d8caf661ebaa531a29baad98d..8b726a648e8be92318f35f2c3f359595b820429c 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_forms.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_forms.less
@@ -4,3 +4,4 @@
// */
@import 'forms/_forms';
+@import 'forms/_selects';
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_sources.less b/app/design/adminhtml/Magento/backend/web/css/source/_sources.less
index a9ec8b707d37909692b5fc837045913a673ee21b..9d310406f51f668ca144ba4706c07a060665da9a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_sources.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_sources.less
@@ -18,7 +18,8 @@
@import '_tables';
@import '_alerts';
@import '_grid';
-@import '_extend';
+@import '_extends';
+@import '_tabs';
//
// Components
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_tables.less b/app/design/adminhtml/Magento/backend/web/css/source/_tables.less
index 78ffa6bcabffeb0f93e1661b393e401052d831b2..846e1b2531725df74aedd4b65fe5102aaa77377a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_tables.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_tables.less
@@ -8,7 +8,7 @@
// _____________________________________________
@base-table-color: @color-very-dark-gray-black;
-@base-table-border-th-color: @color-gray80;
+@base-table-border-th-color: @color-gray89;
@base-table-border-td-color: @color-gray89;
@base-table-background-tfoot: @color-white-fog;
@@ -19,7 +19,7 @@
table {
color: @base-table-color;
> caption {
- margin-bottom: 5px;
+ margin-bottom: .5rem;
}
tfoot {
background: @base-table-background-tfoot;
@@ -30,15 +30,15 @@ table {
}
th {
background: transparent;
- border-bottom: 1px solid @base-table-border-th-color;
- border-top: 1px solid @base-table-border-th-color;
+ border-bottom: .1rem solid @base-table-border-th-color;
+ border-top: .1rem solid @base-table-border-th-color;
font-weight: 700;
- padding: 10px 15px;
+ padding: 1rem 1.5rem;
text-align: left;
}
td {
- border-bottom: 1px solid @base-table-border-td-color;
- padding: 10px 15px;
+ border-bottom: .1rem solid @base-table-border-td-color;
+ padding: 1rem 1.5rem;
vertical-align: top;
}
tbody {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less b/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
new file mode 100644
index 0000000000000000000000000000000000000000..705701be69dd283bb16cb2c94ab332d601ee4323
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_tabs.less
@@ -0,0 +1,59 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Horizontal tabs
+// _____________________________________________
+
+// Are used in dashboard
+
+.tabs-horiz {
+ .extend__clearfix();
+ margin: 0;
+ padding: 0;
+
+ // Default tab
+ .ui-state-default {
+ background: @color-gray89;
+ border: .1rem solid @color-gray68;
+ float: left;
+ letter-spacing: .0183em; // For tab width fixing depending on normal-semibold font-weight
+ list-style: none;
+ margin-right: .4rem;
+ }
+
+ // Hovered tab
+ .ui-state-hover {
+ background: @color-gray84;
+ }
+
+ // Active tab
+ .ui-state-active {
+ background: @color-white;
+ border-bottom: 0;
+ font-weight: @font-weight-semibold;
+ letter-spacing: normal;
+ margin-bottom: -.1rem;
+ .ui-tabs-anchor {
+ border-bottom: .1rem solid @color-white;
+ border-top: .4rem solid @color-phoenix;
+ padding-top: 1.1rem;
+ }
+ }
+
+ .ui-tabs-anchor {
+ color: @color-dark-brownie;
+ display: block;
+ padding: 1.5rem 1.8rem 1.3rem;
+ text-decoration: none;
+ }
+}
+
+// Tabs content
+.ui-tabs-panel {
+ border-top: .1rem solid @color-gray68;
+ margin-top: -.1rem;
+ padding: 2rem;
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_theme.less b/app/design/adminhtml/Magento/backend/web/css/source/_theme.less
index 25305cd2f17cd0fbbfc418460db947d0144a8a34..d384c78c592545d4dc6ce3ef205b8d7675553850 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_theme.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_theme.less
@@ -13,8 +13,6 @@
@color-very-dark-gray2: #555;
@color-lighter-grayish: #cacaca;
@color-lighter-gray: #e9e9e9;
-@color-dark-grayish-orange: #afadac;
-@color-dark-grayish: #aeaeae;
@color-gray20: #333;
@color-gray52: #858585;
@color-gray56: #8f8f8f;
@@ -23,10 +21,7 @@
@color-gray68: #adadad;
@color-gray75: #bfbfbf;
@color-gray80: #ccc;
-@color-gray82: #d1d1d1;
-@color-gray83: #d4d4d4;
@color-gray84: #d6d6d6;
-@color-gray85: #d9d9d9;
@color-gray89: #e3e3e3;
@color-gray98: #fafafa;
@color-very-light-gray: #fcfcfc;
@@ -54,7 +49,7 @@
// ---------------------------------------------
// Font
-@color-base: @color-gray19;
+@color-base: @color-dark-brownie;
@font-family-base: 'Open Sans', @font-family-sans-serif;
@font-family-console: 'Courier New', Courier, monospace;
@font-size-base: 1.4rem;
@@ -85,7 +80,6 @@
@icon-font-mui-name: 'MUI-Icons';
@icon-font-mui-path: '@{baseDir}fonts/@{icon-font-mui-name}/@{icon-font-mui-name}';
-
//
// Validation
// ---------------------------------------------
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/dashboard.less b/app/design/adminhtml/Magento/backend/web/css/source/dashboard.less
index 257219e93ef0509371bdfb4380ccb5282beb8857..9d61b147f4edd7edc64d5957c889cb8087bf2cde 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/dashboard.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/dashboard.less
@@ -21,7 +21,7 @@
background: @dashboard-bg; // resets global styles
}
-.dashboard-inner {
+.dashboard-container {
.clearfix();
padding-top: 35px;
}
@@ -52,6 +52,12 @@
&-image {
background: @dashboard-tab-content-bg url(../mui/images/ajax-loader-small.gif) no-repeat 50% 50%;
}
+ .form-select-label {
+ display: inline-block;
+ }
+ &-disabled {
+ padding: 10px;
+ }
}
/*
@@ -63,6 +69,10 @@
min-height: 40px;
padding: 15px;
}
+ .empty-text {
+ padding: 10px 12px;
+ text-align: center;
+ }
}
.dashboard-store-stats {
@@ -70,16 +80,20 @@
.ui-tabs-panel {
background: @dashboard-tab-content-bg url(../mui/images/ajax-loader-small.gif) no-repeat 50% 50%;
}
+ .empty-text { // "no data" messages
+ background: #f7f3eb;
+ }
}
.dashboard-item {
margin-bottom: 30px;
- &-header {
+ &-title {
+ font-weight: 700;
margin-left: 5px;
}
&.dashboard-item-primary {
margin-bottom: 35px;
- .title {
+ .dashboard-item-title {
font-size: 22px;
margin-bottom: 5px;
}
@@ -93,9 +107,6 @@
}
&:first-child {
color: @dashboard-active-color;
- .title {
- color: @dashboard-active-color;
- }
}
}
.dashboard-secondary & {
@@ -104,6 +115,9 @@
&:extend(.ellipsis all);
}
}
+ .empty-text {
+ background: #e1dbcf;
+ }
}
.dashboard-totals {
@@ -174,9 +188,6 @@
}
}
}
- td.empty-text { // "no data" messages
- text-align: center;
- }
.ui-tabs-panel & {
background-color: @dashboard-tab-content-bg;
.col-name {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_forms.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_forms.less
index 4356272546c8a49623062006ca40231e3d080cb1..4abb805a1307983890245a8755dae1c65f5daab7 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_forms.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_forms.less
@@ -11,6 +11,22 @@
// Variables
// ---------------------------------------------
+// Form element
+
+@form-el__color: @color-very-dark-gray-black;
+@form-el__border-radius: 0;
+@form-el__indent-top: .6rem;
+@form-el__padding-bottom: .35em;
+@form-el__padding-side: .55em;
+@form-el__padding-top: .35em;
+
+@form-el__border-color: @color-gray68;
+@form-el__color: @color-very-dark-gray-black;
+@form-el__hover__border-color: darken(@form-el__border-color, 10%);
+@form-el__focus__border-color: @color-pure-blue;
+
+// Form field
+
@field-control__border-color: @color-gray68;
@field-control__color: @color-very-dark-gray-black;
@field-control__bg-color: @color-white;
@@ -137,10 +153,10 @@ fieldset.field [class^='fields-group-'] .field .control {
> input {
width: 100%;
}
- > input[type="button"],
- > input[type="radio"],
- > input[type="checkbox"],
- > input[type="file"]{
+ > input[type='button'],
+ > input[type='radio'],
+ > input[type='checkbox'],
+ > input[type='file'] {
width: auto;
}
> input.hasDatepicker {
@@ -211,11 +227,12 @@ fieldset.field [class^='fields-group-'] .field .control {
}
&-content {
@_shadow: 0 2px 8px 0 rgba(0, 0, 0, .3);
- .css(box-shadow, @_shadow);
+
background: @field-tooltip-content__bg-color;
border: 1px solid @field-tooltip-content__border-color;
border-radius: 1px;
bottom: 42px;
+ .css(box-shadow, @_shadow);
display: none;
padding: 15px 25px;
position: absolute;
@@ -461,7 +478,6 @@ fieldset.field [class^='fields-group-'] .field .control {
.control-range {
& > .form__field:nth-child(2) {
&:before {
- content: ':';
content: '\2014';
display: inline-block;
float: left;
@@ -519,7 +535,6 @@ fieldset.field [class^='fields-group-'] .field .control {
cursor: pointer;
}
.label:before {
- .url('images/choice_bkg.png', 'Magento_Ui');
background: url('@{url}') no-repeat -100% -100%;
border: 1px solid @field-control__border-color;
border-radius: 2px;
@@ -528,6 +543,7 @@ fieldset.field [class^='fields-group-'] .field .control {
left: 0;
position: absolute;
top: 10px;
+ .url('images/choice_bkg.png', 'Magento_Ui');
width: 14px;
z-index: 1;
}
@@ -689,7 +705,6 @@ fieldset.form__field {
.control-text + .ui-datepicker-trigger {
.button-reset();
display: inline-block;
- margin-left: -40px;
.icon-font(
@icon-calendar,
@_icon-font-size: 38px,
@@ -698,6 +713,7 @@ fieldset.form__field {
@_icon-font-position: after,
@_icon-font-color: @field-date-icon__color
);
+ margin-left: -40px;
img {
display: none;
}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_selects.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_selects.less
new file mode 100644
index 0000000000000000000000000000000000000000..0ab41b9e54321a240b09ea2a50dedfdf0efd09ca
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_selects.less
@@ -0,0 +1,98 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@select-check__background-color: @color-gray89;
+@select-check__arrow__color: @color-brownie;
+@select-check__height: 5px;
+@select-check__size: 2.36em;
+@select-check__width: 8px;
+
+//
+// Customized select with label wrap
+// ---------------------------------------------
+
+.form-select-label {
+ border: 1px solid @form-el__border-color;
+ border-radius: @form-el__border-radius;
+ color: @form-el__color;
+ cursor: pointer;
+ display: inline-block;
+ overflow: hidden;
+ position: relative;
+ &:hover,
+ &:hover:after {
+ border-color: @form-el__hover__border-color;
+ }
+ &:focus,
+ &:focus:after,
+ &:active,
+ &:active:after {
+ border-color: @form-el__focus__border-color;
+ }
+ &:after {
+ background: @select-check__background-color;
+ border-left: 1px solid @form-el__border-color;
+ bottom: 0;
+ content: '';
+ position: absolute;
+ right: 0;
+ top: 0;
+ width: @select-check__size;
+ z-index: -2;
+ .ie9 & {
+ display: none;
+ }
+ }
+ &:before {
+ border-color: @select-check__arrow__color transparent transparent transparent;
+ border-style: solid;
+ border-width: @select-check__height @select-check__width / 2 0 @select-check__width / 2;
+ content: '';
+ height: 0;
+ margin-right: -(@select-check__width / 2);
+ margin-top: -(@select-check__height / 2);
+ position: absolute;
+ right: @select-check__size / 2;
+ top: 50%;
+ width: 0;
+ z-index: -1;
+ .ie9 & {
+ display: none;
+ }
+ }
+ .form-el-select {
+ background: transparent;
+ border: none;
+ border-radius: 0;
+ content: '';
+ display: block;
+ margin: 0;
+ padding: @form-el__padding-top ~'calc(@{select-check__size} + 10%)' @form-el__padding-bottom @form-el__padding-side;
+ width: 110%;
+ .ie9 & {
+ padding-right: @form-el__padding-side;
+ width: 100%;
+ }
+ }
+
+ // ToDo UI: use .form-select-label { display block; } for grid tables. Consider, that [class*="col-"] includes grids, so use other specific selector
+}
+
+//
+// Light customized select
+// ---------------------------------------------
+
+.form-el-select {
+ background: @color-white;
+ border: 1px solid @form-el__border-color;
+ border-radius: @form-el__border-radius;
+ color: @form-el__color;
+ display: block;
+ padding: @form-el__padding-top @form-el__padding-side;
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles.less b/app/design/adminhtml/Magento/backend/web/css/styles.less
index 006006473aeaa5522d0b92f538acf6cb345d6c82..f7844fb7eb7ca1bd130d002974379b484f3fad8a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles.less
@@ -3,9 +3,10 @@
* See COPYING.txt for license details.
*/
-@import 'source/lib/lib.less'; // Import all lib files
-@import 'source/_theme.less'; // Import theme variables
-@import 'source/_sources.less'; // Import theme files
+@import 'source/lib/lib.less'; // Import all lib files
+@import 'source/_theme.less'; // Import theme variables
-// Magento Import instructions
-//@magento_import "source/_module.less"; // import theme styles
+// Magento Import instructions
+//@magento_import "source/_module.less"; // Import theme styles
+
+@import 'source/_sources.less'; // Import theme files
diff --git a/app/design/adminhtml/Magento/backend/web/images/ajax-loader-small.gif b/app/design/adminhtml/Magento/backend/web/images/ajax-loader-small.gif
new file mode 100644
index 0000000000000000000000000000000000000000..82d06cc97f0b9f32eaf1705a88a19a0d642dad57
Binary files /dev/null and b/app/design/adminhtml/Magento/backend/web/images/ajax-loader-small.gif differ
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
index fe90d5af22934b435664418344d62c27a280358f..427bca31bbc005a94c7efa00dcfef5b3429ea5f1 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
@@ -10,7 +10,7 @@
<referenceContainer name="checkout.cart.items">
<container name="checkout.cart.container" htmlTag="div" htmlClass="cart-container" before="-">
<container name="cart.summary" label="Cart Summary Container" htmlTag="div" htmlClass="cart-summary" after="-">
- <block class="Magento\Framework\View\Element\Template" name="checkout.cart.summary.title" before="-" template="Magento_Core::text.phtml">
+ <block class="Magento\Framework\View\Element\Template" name="checkout.cart.summary.title" before="-" template="Magento_Theme::text.phtml">
<arguments>
<argument translate="true" name="text" xsi:type="string">Summary</argument>
<argument name="tag" xsi:type="string">strong</argument>
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index 2ca4fc9f3fab7462f1ed1737b31ae6f60849ae5f..bec001cfc732dad66be6b4c0c2382daeb9b6e026 100644
--- a/app/design/frontend/Magento/blank/composer.json
+++ b/app/design/frontend/Magento/blank/composer.json
@@ -3,11 +3,11 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/framework": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-theme",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
index c54823bc741216c615ff3ed65ea4b95327be7001..494974d19d8ac865e021cc9a26f5b6974bb4d8a5 100644
--- a/app/design/frontend/Magento/luma/composer.json
+++ b/app/design/frontend/Magento/luma/composer.json
@@ -3,12 +3,12 @@
"description": "N/A",
"require": {
"php": "~5.5.0|~5.6.0",
- "magento/theme-frontend-blank": "0.42.0-beta6",
- "magento/framework": "0.42.0-beta6",
+ "magento/theme-frontend-blank": "0.42.0-beta7",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-theme",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/etc/di.xml b/app/etc/di.xml
old mode 100644
new mode 100755
index af058c9dc4aafd24f770ac77ff91cfaf9917a47a..1b304901026025af38b1f0949a681de13254947b
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -13,14 +13,13 @@
<preference for="Magento\Framework\Search\Request\Aggregation\StatusInterface" type="Magento\Framework\Search\Request\Aggregation\Status" />
<preference for="Magento\Framework\App\RequestInterface" type="Magento\Framework\App\Request\Http" />
<preference for="Magento\Framework\App\Http\RequestInterface" type="Magento\Framework\App\Request\Http" />
- <preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
<preference for="Magento\Framework\App\ResponseInterface" type="Magento\Framework\App\Response\Http" />
<preference for="Magento\Framework\App\RouterListInterface" type="Magento\Framework\App\RouterList" />
<preference for="Magento\Framework\App\FrontControllerInterface" type="Magento\Framework\App\FrontController" />
<preference for="Magento\Framework\App\CacheInterface" type="Magento\Framework\App\Cache\Proxy" />
<preference for="Magento\Framework\App\Cache\StateInterface" type="Magento\Framework\App\Cache\State" />
<preference for="Magento\Framework\App\Cache\TypeListInterface" type="Magento\Framework\App\Cache\TypeList" />
- <preference for="Magento\Framework\Store\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
+ <preference for="Magento\Store\Model\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
<preference for="Magento\Framework\View\DesignInterface" type="Magento\Theme\Model\View\Design\Proxy" />
<preference for="Magento\Framework\View\Design\ThemeInterface" type="Magento\Theme\Model\Theme" />
<preference for="Magento\Framework\View\Design\Theme\ResolverInterface" type="Magento\Theme\Model\Theme\Resolver" />
@@ -48,7 +47,7 @@
<preference for="Magento\Framework\Interception\PluginListInterface" type="Magento\Framework\Interception\PluginList\PluginList" />
<preference for="Magento\Framework\Event\ManagerInterface" type="Magento\Framework\Event\Manager\Proxy" />
<preference for="Magento\Framework\View\LayoutInterface" type="Magento\Framework\View\Layout" />
- <preference for="Magento\Framework\View\Layout\ProcessorInterface" type="Magento\Core\Model\Layout\Merge" />
+ <preference for="Magento\Framework\View\Layout\ProcessorInterface" type="Magento\Framework\View\Model\Layout\Merge" />
<preference for="Magento\Framework\View\Url\ConfigInterface" type="Magento\Framework\View\Url\Config" />
<preference for="Magento\Framework\App\Route\ConfigInterface" type="Magento\Framework\App\Route\Config" />
<preference for="Magento\Framework\App\Resource\ConfigInterface" type="Magento\Framework\App\Resource\Config\Proxy" />
@@ -63,6 +62,7 @@
<preference for="Magento\Framework\Interception\ChainInterface" type="Magento\Framework\Interception\Chain\Chain" />
<preference for="Magento\Framework\Module\Output\ConfigInterface" type="Magento\Framework\Module\Output\Config" />
<preference for="Magento\Framework\View\Design\Theme\CustomizationInterface" type="Magento\Framework\View\Design\Theme\Customization" />
+ <preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />
<preference for="Magento\Framework\Image\Adapter\ConfigInterface" type="Magento\Framework\Image\Adapter\Config" />
<preference for="Magento\Framework\View\Design\Theme\Image\PathInterface" type="Magento\Theme\Model\Theme\Image\Path" />
<preference for="Magento\Framework\Session\Config\ConfigInterface" type="Magento\Framework\Session\Config" />
@@ -87,6 +87,46 @@
<preference for="Magento\Framework\DB\LoggerInterface" type="Magento\Framework\DB\Logger\Null"/>
<preference for="Magento\Framework\App\Resource\ConnectionAdapterInterface" type="Magento\Framework\Model\Resource\Type\Db\Pdo\Mysql"/>
<preference for="Magento\Framework\DB\QueryInterface" type="Magento\Framework\DB\Query"/>
+ <preference for="Magento\Framework\Acl\CacheInterface" type="Magento\Framework\Acl\Cache" />
+ <preference for="Magento\Framework\App\AreaInterface" type="Magento\Framework\App\Area" />
+ <preference for="Magento\Framework\Module\Updater\SetupInterface" type="Magento\Framework\Module\DataSetup" />
+ <preference for="Magento\Framework\Module\ResourceResolverInterface" type="Magento\Framework\Module\ResourceResolver" />
+ <preference for="Magento\Framework\AuthorizationInterface" type="Magento\Framework\Authorization" />
+ <preference for="Magento\Framework\Authorization\PolicyInterface" type="Magento\Framework\Authorization\Policy\DefaultPolicy" />
+ <preference for="Magento\Framework\Authorization\RoleLocatorInterface" type="Magento\Framework\Authorization\RoleLocator\DefaultRoleLocator" />
+ <preference for="Magento\Framework\Session\SessionManagerInterface" type="Magento\Framework\Session\Generic" />
+ <preference for="Magento\Framework\App\Config\ScopeConfigInterface" type="Magento\Framework\App\Config" />
+ <preference for="Magento\Framework\App\Config\ReinitableConfigInterface" type="Magento\Framework\App\ReinitableConfig" />
+ <preference for="Magento\Framework\App\Config\MutableScopeConfigInterface" type="Magento\Framework\App\MutableScopeConfig" />
+ <preference for="Magento\Framework\App\Config\Storage\WriterInterface" type="Magento\Framework\App\Config\Storage\Writer" />
+ <preference for="Magento\Framework\Config\ConverterInterface" type="Magento\Framework\Config\Converter\Dom"/>
+ <preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Framework\App\DefaultPath\DefaultPath" />
+ <preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Framework\Encryption\Encryptor" />
+ <preference for="Magento\Framework\Filter\Encrypt\AdapterInterface" type="Magento\Framework\Filter\Encrypt\Basic" />
+ <preference for="Magento\Framework\Cache\ConfigInterface" type="Magento\Framework\Cache\Config" />
+ <preference for="Magento\Framework\View\Asset\MergeStrategyInterface" type="Magento\Framework\View\Asset\MergeStrategy\Direct" />
+ <preference for="Magento\Framework\App\ViewInterface" type="Magento\Framework\App\View" />
+ <preference for="Magento\Framework\Data\Collection\EntityFactoryInterface" type="Magento\Framework\Data\Collection\EntityFactory" />
+ <preference for="Magento\Framework\Translate\InlineInterface" type="Magento\Framework\Translate\Inline" />
+ <preference for="Magento\Framework\Session\ValidatorInterface" type="Magento\Framework\Session\Validator" />
+ <preference for="Magento\Framework\Session\StorageInterface" type="Magento\Framework\Session\Storage" />
+ <preference for="Magento\Framework\Url\RouteParamsResolverInterface" type="Magento\Framework\Url\RouteParamsResolver" />
+ <preference for="Magento\Framework\Url\QueryParamsResolverInterface" type="Magento\Framework\Url\QueryParamsResolver" />
+ <preference for="Magento\Framework\Url\ScopeResolverInterface" type="Magento\Framework\Url\ScopeResolver" />
+ <preference for="Magento\Framework\Url\SecurityInfoInterface" type="Magento\Framework\Url\SecurityInfo\Proxy" />
+ <preference for="Magento\Framework\Css\PreProcessor\AdapterInterface" type="Magento\Framework\Css\PreProcessor\Adapter\Oyejorge" />
+ <preference for="Magento\Framework\LocaleInterface" type="Magento\Framework\Locale" />
+ <preference for="Magento\Framework\Locale\CurrencyInterface" type="Magento\Framework\Locale\Currency" />
+ <preference for="Magento\Framework\CurrencyInterface" type="Magento\Framework\Currency" />
+ <preference for="Magento\Framework\Locale\FormatInterface" type="Magento\Framework\Locale\Format" />
+ <preference for="Magento\Framework\Locale\ResolverInterface" type="Magento\Framework\Locale\Resolver" />
+ <preference for="Magento\Framework\Stdlib\DateTime\TimezoneInterface" type="Magento\Framework\Stdlib\DateTime\Timezone" />
+ <preference for="Magento\Framework\Stdlib\DateTime\DateInterface" type="Magento\Framework\Stdlib\DateTime\Date" />
+ <preference for="Magento\Framework\Less\PreProcessor\ErrorHandlerInterface" type="Magento\Framework\Less\PreProcessor\ErrorHandler" />
+ <preference for="Magento\Framework\Module\ResourceInterface" type="Magento\Framework\Module\Resource" />
+ <preference for="Magento\Framework\Pricing\Amount\AmountInterface" type="Magento\Framework\Pricing\Amount\Base" />
+ <preference for="Magento\Framework\Api\SearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+ <preference for="Magento\Framework\Api\AttributeInterface" type="Magento\Framework\Api\AttributeValue" />
<type name="Magento\Framework\Logger\Handler\Base">
<arguments>
<argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
@@ -265,6 +305,7 @@
<type name="Magento\Framework\Url">
<arguments>
<argument name="session" xsi:type="object">Magento\Framework\Session\Generic\Proxy</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<virtualType name="layoutArgumentInterpreterInternal" type="Magento\Framework\Data\Argument\Interpreter\Composite">
@@ -280,7 +321,7 @@
<item name="string" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\String</item>
<item name="null" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\NullType</item>
</argument>
- <argument name="discriminator" xsi:type="const">Magento\Core\Model\Layout\Merge::TYPE_ATTRIBUTE</argument>
+ <argument name="discriminator" xsi:type="const">Magento\Framework\View\Model\Layout\Merge::TYPE_ATTRIBUTE</argument>
</arguments>
</virtualType>
<virtualType name="layoutArgumentInterpreter" type="Magento\Framework\View\Layout\Argument\Interpreter\Decorator\Updater">
@@ -340,12 +381,12 @@
<type name="Magento\Framework\View\Layout\Reader\Block">
<arguments>
<argument name="readerPool" xsi:type="object">blockRenderPool</argument>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\Framework\View\Layout\Reader\UiComponent">
<arguments>
- <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<virtualType name="bodyRenderPool" type="Magento\Framework\View\Layout\ReaderPool">
@@ -556,9 +597,402 @@
</argument>
</arguments>
</type>
+ <type name="Magento\Framework\View\Model\Layout\Merge">
+ <arguments>
+ <argument name="fileSource" xsi:type="object">Magento\Framework\View\Layout\File\Collector\Aggregated\Proxy</argument>
+ <argument name="pageLayoutFileSource" xsi:type="object">pageLayoutFileCollectorAggregated</argument>
+ <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Layout</argument>
+ </arguments>
+ </type>
<type name="CSSmin">
<arguments>
<argument name="raise_php_limits" xsi:type="boolean">false</argument>
</arguments>
</type>
+ <type name="Magento\Framework\App\DefaultPath\DefaultPath">
+ <arguments>
+ <argument name="parts" xsi:type="array">
+ <item name="module" xsi:type="string">core</item>
+ <item name="controller" xsi:type="string">index</item>
+ <item name="action" xsi:type="string">index</item>
+ </argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Data\Collection\Db\FetchStrategy\Cache">
+ <arguments>
+ <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Collection</argument>
+ <argument name="cacheIdPrefix" xsi:type="string">collection_</argument>
+ <argument name="cacheLifetime" xsi:type="string">86400</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Event\Config\Data">
+ <arguments>
+ <argument name="reader" xsi:type="object">Magento\Framework\Event\Config\Reader\Proxy</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\View\Asset\Collection" shared="false" />
+ <virtualType name="layoutFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
+ <arguments>
+ <argument name="subDir" xsi:type="string">layout</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="layoutFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">layoutFileSourceBase</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="layoutFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">layoutFileSourceBaseFiltered</argument>
+ </arguments>
+ </virtualType>
+
+ <virtualType name="layoutFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular">
+ <arguments>
+ <argument name="subDir" xsi:type="string">layout</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="layoutFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">layoutFileSourceTheme</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="layoutFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">layoutFileSourceThemeFiltered</argument>
+ </arguments>
+ </virtualType>
+
+ <virtualType name="layoutFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
+ <arguments>
+ <argument name="subDir" xsi:type="string">layout/override/base</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="layoutFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">layoutFileSourceOverrideBase</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="layoutFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">layoutFileSourceOverrideBaseFiltered</argument>
+ </arguments>
+ </virtualType>
+
+ <virtualType name="layoutFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
+ <arguments>
+ <argument name="subDir" xsi:type="string">layout/override/theme</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="layoutFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">layoutFileSourceOverrideTheme</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="layoutFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">layoutFileSourceOverrideThemeFiltered</argument>
+ </arguments>
+ </virtualType>
+ <type name="Magento\Framework\View\Layout\File\Collector\Aggregated">
+ <arguments>
+ <argument name="baseFiles" xsi:type="object">layoutFileSourceBaseSorted</argument>
+ <argument name="themeFiles" xsi:type="object">layoutFileSourceThemeSorted</argument>
+ <argument name="overrideBaseFiles" xsi:type="object">layoutFileSourceOverrideBaseSorted</argument>
+ <argument name="overrideThemeFiles" xsi:type="object">layoutFileSourceOverrideThemeSorted</argument>
+ </arguments>
+ </type>
+ <virtualType name="pageLayoutFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
+ <arguments>
+ <argument name="subDir" xsi:type="string">page_layout</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageLayoutFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageLayoutFileSourceBase</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageLayoutFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageLayoutFileSourceBaseFiltered</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageLayoutFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular">
+ <arguments>
+ <argument name="subDir" xsi:type="string">page_layout</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageLayoutFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageLayoutFileSourceTheme</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageLayoutFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageLayoutFileSourceThemeFiltered</argument>
+ </arguments>
+ </virtualType>
+
+ <virtualType name="pageLayoutFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
+ <arguments>
+ <argument name="subDir" xsi:type="string">page_layout/override/base</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageLayoutFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideBase</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageLayoutFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideBaseFiltered</argument>
+ </arguments>
+ </virtualType>
+
+ <virtualType name="pageLayoutFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
+ <arguments>
+ <argument name="subDir" xsi:type="string">page_layout/override/theme</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageLayoutFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideTheme</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageLayoutFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideThemeFiltered</argument>
+ </arguments>
+ </virtualType>
+
+ <virtualType name="pageLayoutFileCollectorAggregated" type="Magento\Framework\View\Layout\File\Collector\Aggregated">
+ <arguments>
+ <argument name="baseFiles" xsi:type="object">pageLayoutFileSourceBaseSorted</argument>
+ <argument name="themeFiles" xsi:type="object">pageLayoutFileSourceThemeSorted</argument>
+ <argument name="overrideBaseFiles" xsi:type="object">pageLayoutFileSourceOverrideBaseSorted</argument>
+ <argument name="overrideThemeFiles" xsi:type="object">pageLayoutFileSourceOverrideThemeSorted</argument>
+ </arguments>
+ </virtualType>
+
+ <virtualType name="pageFileSourceBase" type="Magento\Framework\View\File\Collector\Base"/>
+ <virtualType name="pageFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageFileSourceBase</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageFileSourceBaseFiltered</argument>
+ </arguments>
+ </virtualType>
+
+ <virtualType name="pageFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular"/>
+ <virtualType name="pageFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageFileSourceTheme</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageFileSourceThemeFiltered</argument>
+ </arguments>
+ </virtualType>
+
+ <virtualType name="pageFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
+ <arguments>
+ <argument name="subDir" xsi:type="string">page/override</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageFileSourceOverrideBase</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageFileSourceOverrideBaseFiltered</argument>
+ </arguments>
+ </virtualType>
+
+ <virtualType name="pageFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
+ <arguments>
+ <argument name="subDir" xsi:type="string">override/theme</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageFileSourceOverrideTheme</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">pageFileSourceOverrideThemeFiltered</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="pageLayoutRenderPool" type="Magento\Framework\View\Layout\ReaderPool">
+ <arguments>
+ <argument name="readers" xsi:type="array">
+ <item name="container" xsi:type="string">Magento\Framework\View\Layout\Reader\Container</item>
+ <item name="move" xsi:type="string">Magento\Framework\View\Layout\Reader\Move</item>
+ <item name="remove" xsi:type="string">Magento\Framework\View\Layout\Reader\Remove</item>
+ </argument>
+ </arguments>
+ </virtualType>
+ <type name="Magento\Framework\View\Page\Layout\Reader">
+ <arguments>
+ <argument name="pageLayoutFileSource" xsi:type="object">pageLayoutFileCollectorAggregated</argument>
+ <argument name="reader" xsi:type="object">pageLayoutRenderPool</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\View\PageLayout\File\Collector\Aggregated">
+ <arguments>
+ <argument name="baseFiles" xsi:type="object">pageFileSourceBaseSorted</argument>
+ <argument name="themeFiles" xsi:type="object">pageFileSourceThemeSorted</argument>
+ <argument name="overrideBaseFiles" xsi:type="object">pageFileSourceOverrideBaseSorted</argument>
+ <argument name="overrideThemeFiles" xsi:type="object">pageFileSourceOverrideThemeSorted</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\View\Design\Theme\Image">
+ <arguments>
+ <argument name="uploader" xsi:type="object">Magento\Framework\View\Design\Theme\Image\Uploader\Proxy</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\App\Config\ScopePool">
+ <arguments>
+ <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\App\Config\Initial">
+ <arguments>
+ <argument name="reader" xsi:type="object">Magento\Framework\App\Config\Initial\Reader\Proxy</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\App\Config\Initial\Reader">
+ <arguments>
+ <argument name="converter" xsi:type="object">Magento\Framework\App\Config\Initial\Converter</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\App\Route\Config">
+ <arguments>
+ <argument name="reader" xsi:type="object">Magento\Framework\App\Route\Config\Reader\Proxy</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Session\Validator">
+ <arguments>
+ <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
+ <argument name="skippedUserAgentList" xsi:type="array">
+ <item name="flash" xsi:type="string">Shockwave Flash</item>
+ <item name="flash_mac" xsi:type="string"><![CDATA[Adobe Flash Player\s{1,}\w{1,10}]]></item>
+ </argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Object\Copy\Config\Reader">
+ <arguments>
+ <argument name="fileName" xsi:type="string">fieldset.xml</argument>
+ <argument name="schemaLocator" xsi:type="object">Magento\Framework\Object\Copy\Config\SchemaLocator</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Object\Copy\Config\SchemaLocator">
+ <arguments>
+ <argument name="schema" xsi:type="string">lib/internal/Magento/Framework/Object/etc/fieldset.xsd</argument>
+ <argument name="perFileSchema" xsi:type="string">lib/internal/Magento/Framework/Object/etc/fieldset_file.xsd</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Object\Copy\Config\Data">
+ <arguments>
+ <argument name="reader" xsi:type="object">Magento\Framework\Object\Copy\Config\Reader\Proxy</argument>
+ <argument name="cacheId" xsi:type="string">fieldset_config</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Image">
+ <arguments>
+ <argument name="adapter" xsi:type="object">Magento\Framework\Image\Adapter\Gd2</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\View\Layout\PageType\Config\Reader">
+ <arguments>
+ <argument name="fileName" xsi:type="string">page_types.xml</argument>
+ <argument name="converter" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Converter</argument>
+ <argument name="schemaLocator" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\SchemaLocator</argument>
+ <argument name="defaultScope" xsi:type="string">frontend</argument>
+ </arguments>
+ </type>
+ <virtualType name="Magento\Framework\View\Layout\PageType\Config\Data" type="Magento\Framework\Config\Data">
+ <arguments>
+ <argument name="reader" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Reader</argument>
+ <argument name="cacheId" xsi:type="string">page_types_config</argument>
+ </arguments>
+ </virtualType>
+ <type name="Magento\Framework\View\Layout\PageType\Config">
+ <arguments>
+ <argument name="dataStorage" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Data</argument>
+ </arguments>
+ </type>
+ <virtualType name="Magento\Framework\Message\Session\Storage" type="Magento\Framework\Session\Storage">
+ <arguments>
+ <argument name="namespace" xsi:type="string">message</argument>
+ </arguments>
+ </virtualType>
+ <type name="Magento\Framework\Message\Session">
+ <arguments>
+ <argument name="storage" xsi:type="object">Magento\Framework\Message\Session\Storage</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Url\ScopeResolver">
+ <arguments>
+ <argument name="areaCode" xsi:type="string">frontend</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Less\PreProcessor\Instruction\MagentoImport">
+ <arguments>
+ <argument name="fileSource" xsi:type="object">Magento\Framework\Less\File\Collector\Aggregated</argument>
+ </arguments>
+ </type>
+ <virtualType name="lessFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
+ <arguments>
+ <argument name="subDir" xsi:type="string">web</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="lessFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">lessFileSourceBase</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="lessFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">lessFileSourceBaseFiltered</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="lessFileOverriddenBase" type="Magento\Framework\View\File\Collector\Override\Base">
+ <arguments>
+ <argument name="subDir" xsi:type="string">web</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="lessFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+ <arguments>
+ <argument name="subject" xsi:type="object">lessFileSourceTheme</argument>
+ </arguments>
+ </virtualType>
+ <virtualType name="lessFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+ <arguments>
+ <argument name="subject" xsi:type="object">lessFileSourceThemeFiltered</argument>
+ </arguments>
+ </virtualType>
+ <type name="Magento\Framework\Less\File\Collector\Aggregated">
+ <arguments>
+ <argument name="libraryFiles" xsi:type="object">Magento\Framework\Less\File\Collector\Library</argument>
+ <argument name="baseFiles" xsi:type="object">lessFileSourceBaseSorted</argument>
+ <argument name="overriddenBaseFiles" xsi:type="object">lessFileOverriddenBase</argument>
+ </arguments>
+ </type>
+ <type name="Magento\Framework\Module\Setup\MigrationData">
+ <arguments>
+ <argument name="data" xsi:type="array">
+ <item name="plain" xsi:type="string"><![CDATA[/^(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)::.*?$/sui]]></item>
+ <item name="wiki" xsi:type="string"><![CDATA[/{{(block|widget).*?(class|type)=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?}}/sui]]></item>
+ <item name="xml" xsi:type="string"><![CDATA[/<block.*?class=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?>/sui]]></item>
+ <item name="serialized" xsi:type="string"><![CDATA[#(?P<string>s:\d+:"(?P<alias>[a-z]+[_a-z\d]*?/[a-z]+[_a-z\d]*?)")#sui]]></item>
+ </argument>
+ </arguments>
+ </type>
</config>
diff --git a/app/etc/vendor_path.php b/app/etc/vendor_path.php
old mode 100644
new mode 100755
diff --git a/app/functions.php b/app/functions.php
index 03a3b3cab885dc2642521080f6e0169878fb1293..fd363310d8e85b9ea23cf1829074efa031bc3736 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -7,7 +7,7 @@
/**
* Create value-object \Magento\Framework\Phrase
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
function __()
{
@@ -18,11 +18,5 @@ function __()
$argc = $argc[0];
}
- /**
- * Type casting to string is a workaround.
- * Many places in client code at the moment are unable to handle the \Magento\Framework\Phrase object properly.
- * The intended behavior is to use __toString(),
- * so that rendering of the phrase happens only at the last moment when needed
- */
- return (string)new \Magento\Framework\Phrase($text, $argc);
+ return new \Magento\Framework\Phrase($text, $argc);
}
diff --git a/app/i18n/magento/de_de/composer.json b/app/i18n/magento/de_de/composer.json
index d2f9af6d37cc531848910d9d6c7395627ff203d3..5126ca30019e9caaec91402fa2e8fe9f96bdcf1d 100644
--- a/app/i18n/magento/de_de/composer.json
+++ b/app/i18n/magento/de_de/composer.json
@@ -1,13 +1,13 @@
{
"name": "magento/language-de_de",
"description": "German (Germany) language",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"require": {
- "magento/framework": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-language",
diff --git a/app/i18n/magento/en_us/composer.json b/app/i18n/magento/en_us/composer.json
index 35497a5278b484068bd97abe3cde510cbdaf29b4..e868204f722db0a23973b44c47cb91904a196e2c 100644
--- a/app/i18n/magento/en_us/composer.json
+++ b/app/i18n/magento/en_us/composer.json
@@ -1,13 +1,13 @@
{
"name": "magento/language-en_us",
"description": "English (United States) language",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"require": {
- "magento/framework": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-language",
diff --git a/app/i18n/magento/es_es/composer.json b/app/i18n/magento/es_es/composer.json
index 9d38bc1cdbcb52e437520656df4249631404d6ab..1f9e4edab351a42500347a7780b1c2073784856f 100644
--- a/app/i18n/magento/es_es/composer.json
+++ b/app/i18n/magento/es_es/composer.json
@@ -1,13 +1,13 @@
{
"name": "magento/language-es_es",
"description": "Spanish (Spain) language",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"require": {
- "magento/framework": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-language",
diff --git a/app/i18n/magento/fr_fr/composer.json b/app/i18n/magento/fr_fr/composer.json
index 813eb20903c88bdceeffc18b4e29cd5af29441e0..9d5019f36bfaf8ba5f36a31526951ab2f42ccab9 100644
--- a/app/i18n/magento/fr_fr/composer.json
+++ b/app/i18n/magento/fr_fr/composer.json
@@ -1,13 +1,13 @@
{
"name": "magento/language-fr_fr",
"description": "French (France) language",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"require": {
- "magento/framework": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-language",
diff --git a/app/i18n/magento/nl_nl/composer.json b/app/i18n/magento/nl_nl/composer.json
index da68599c77408f92df79e6784e8fb75532ae9f52..d251eab77a87b12835bfe860e984070d0124f178 100644
--- a/app/i18n/magento/nl_nl/composer.json
+++ b/app/i18n/magento/nl_nl/composer.json
@@ -1,13 +1,13 @@
{
"name": "magento/language-nl_nl",
"description": "Dutch (Netherlands) language",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"require": {
- "magento/framework": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-language",
diff --git a/app/i18n/magento/pt_br/composer.json b/app/i18n/magento/pt_br/composer.json
index b7cd530fc4a09bcf9ebe469c4f20395a6c32dd26..a6de799dfa0fbc6cef05ec8f3e880c374b66dfcf 100644
--- a/app/i18n/magento/pt_br/composer.json
+++ b/app/i18n/magento/pt_br/composer.json
@@ -1,13 +1,13 @@
{
"name": "magento/language-pt_br",
"description": "Portuguese (Brazil) language",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"require": {
- "magento/framework": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-language",
diff --git a/app/i18n/magento/zh_cn/composer.json b/app/i18n/magento/zh_cn/composer.json
index b7c5dbbfeeca16f73b57f72d66d107f2dc4df21e..8e31bc61f282c27f78986384ad6cdfef86f02429 100644
--- a/app/i18n/magento/zh_cn/composer.json
+++ b/app/i18n/magento/zh_cn/composer.json
@@ -1,13 +1,13 @@
{
"name": "magento/language-zh_cn",
"description": "Chinese (China) language",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"require": {
- "magento/framework": "0.42.0-beta6",
+ "magento/framework": "0.42.0-beta7",
"magento/magento-composer-installer": "*"
},
"type": "magento2-language",
diff --git a/composer.json b/composer.json
index d7527aa56bfb51bc601c53a988659f29db6f6d7e..594e90909b5275ef688e55f8470b7670bb84ae49 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "magento/project-community-edition",
"description": "Magento project (Community Edition)",
"type": "project",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
@@ -29,7 +29,7 @@
"zendframework/zend-serializer": "2.3.1",
"zendframework/zend-log": "2.3.1",
"zendframework/zend-http": "2.3.1",
- "magento/zendframework1": "1.12.9-patch1",
+ "magento/zendframework1": "1.12.10",
"composer/composer": "1.0.0-alpha8",
"monolog/monolog": "1.11.0",
"tubalmartin/cssmin": "2.4.8-p4"
diff --git a/composer.lock b/composer.lock
index 2559c3367491de302078a14c1300614959a87bd8..54839e423847b6f8aa61f186f0e334af4b793b70 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "d846c53787f01625cc9fe558afdd5371",
+ "hash": "a3f5234e881705dc2e2705f7393be1c5",
"packages": [
{
"name": "composer/composer",
@@ -133,16 +133,16 @@
},
{
"name": "magento/zendframework1",
- "version": "1.12.9-patch1",
+ "version": "1.12.10",
"source": {
"type": "git",
"url": "https://github.com/magento/zf1.git",
- "reference": "956e87daf5bfde66357b70365d42a484c6b7728b"
+ "reference": "d1e5cd8c9f83229bcdd9bb485c3ce25259c77884"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/magento/zf1/zipball/956e87daf5bfde66357b70365d42a484c6b7728b",
- "reference": "956e87daf5bfde66357b70365d42a484c6b7728b",
+ "url": "https://api.github.com/repos/magento/zf1/zipball/d1e5cd8c9f83229bcdd9bb485c3ce25259c77884",
+ "reference": "d1e5cd8c9f83229bcdd9bb485c3ce25259c77884",
"shasum": ""
},
"require": {
@@ -176,7 +176,7 @@
"ZF1",
"framework"
],
- "time": "2014-12-12 15:28:16"
+ "time": "2015-02-06 17:25:45"
},
{
"name": "monolog/monolog",
@@ -3263,6 +3263,7 @@
"phpmd/phpmd": 0
},
"prefer-stable": false,
+ "prefer-lowest": false,
"platform": {
"php": "~5.5.0|~5.6.0"
},
diff --git a/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml
index 13a6a24cf6a50cba1ce14a0a21a367020a2d9f8e..848e3a8f36a28b9bb427da914b3046dbd2781d85 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_TestModule1::all" title="TestModule1" sortOrder="1">
<resource id="Magento_TestModule1::resource1" title="Resource1" sortOrder="20"/>
<resource id="Magento_TestModule1::resource2" title="Resource2" sortOrder="10"/>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml
index 3903f959b007c5c92bc782b579b5801a3aa3f12d..5b34b73575eb5afccd717a4815daffb21989f57d 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_TestModule2::all" title="TestModule2" sortOrder="1">
<resource id="Magento_TestModule2::resource1" title="Resource1" sortOrder="20"/>
<resource id="Magento_TestModule2::resource2" title="Resource2" sortOrder="10"/>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml
index 214aef766e954add720ebb831e25b5c80c7fe693..18b20140d5d66614b77cfe4090358025085f642a 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_TestModule3::all" title="TestModule3" sortOrder="1">
<resource id="Magento_TestModule3::resource1" title="Resource1" sortOrder="20"/>
</resource>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml
index c9ddd19a89bf17a2007572bb16c8030c5fc4040a..a33f6a119464d114971946268bc702fd391b515a 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_TestModule4::all" title="TestModule4" sortOrder="1">
<resource id="Magento_TestModule4::resource1" title="Resource1" sortOrder="20"/>
<resource id="Magento_TestModule4::resource2" title="Resource2" sortOrder="10"/>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml
index 55d512c6c148a3d107aa597ee67183f8aa39cb8b..13985075d96f2a739b404c482d5c0a5e53d4d6fb 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_TestModule5::all" title="TestModule5" sortOrder="1">
<resource id="Magento_TestModule5::resource1" title="Resource1" sortOrder="20"/>
<resource id="Magento_TestModule5::resource2" title="Resource2" sortOrder="10"/>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml
index d78741690573d5d5accd533b63d8511570740670..556e568f1a61ca0118ce47707882422b74c822b1 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml
@@ -8,7 +8,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::admin">
+ <resource id="Magento_Backend::admin">
<resource id="Magento_TestModuleMSC::all" title="TestModuleMSC" sortOrder="1">
<resource id="Magento_TestModuleMSC::resource1" title="Resource1" sortOrder="20"/>
<resource id="Magento_TestModuleMSC::resource2" title="Resource2" sortOrder="10"/>
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
index 4923269ead4cdc7389439989846d628fc19174ff..ae4604fd1c322d09f41da047fc23ae9fcff6934f 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
@@ -83,7 +83,7 @@ class OauthClient extends AbstractService
*/
public function getTestApiEndpoint()
{
- $defaultStoreCode = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')
+ $defaultStoreCode = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
->getStore()->getCode();
return new Uri(TESTS_BASE_URL . '/rest/' . $defaultStoreCode . '/V1/testmodule1');
}
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
index d645edf62d1116f7698eb95662198aac3866202a..7488f42ae06740f31bbb0723920220e1edd51239 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
@@ -53,7 +53,7 @@ class Rest implements \Magento\TestFramework\TestCase\Webapi\AdapterInterface
'Magento\TestFramework\TestCase\Webapi\Adapter\Rest\DocumentationGenerator'
);
$this->defaultStoreCode = Bootstrap::getObjectManager()
- ->get('Magento\Framework\Store\StoreManagerInterface')
+ ->get('Magento\Store\Model\StoreManagerInterface')
->getStore()
->getCode();
}
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
index c219a84439f0c4f3787481e16ec379eb17c65d11..5936421cf67b9fe34b832bc2109c05fd47437ec4 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
@@ -127,11 +127,11 @@ class Soap implements \Magento\TestFramework\TestCase\Webapi\AdapterInterface
/** Sort list of services to avoid having different WSDL URLs for the identical lists of services. */
//TODO: This may change since same resource of multiple versions may be allowed after namespace changes
ksort($services);
- /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+ /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
$storeCode = !is_null($storeCode)
? (string)$storeCode
: Bootstrap::getObjectManager()
- ->get('Magento\Framework\Store\StoreManagerInterface')
+ ->get('Magento\Store\Model\StoreManagerInterface')
->getStore()
->getCode();
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
index f62e6944d50758638e12fef98f817dc9c5149839..50cd00f7497f0d5a6bf4f801b01d00828f875772 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
@@ -490,7 +490,7 @@ abstract class WebapiAbstract extends \PHPUnit_Framework_TestCase
if ($cleanAppCache) {
if ($updateLocalConfig) {
$objectManager->get('Magento\Framework\App\Config\ReinitableConfigInterface')->reinit();
- $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->reinitStores();
+ $objectManager->get('Magento\Store\Model\StoreManagerInterface')->reinitStores();
}
if (!$this->_cleanAppConfigCache()) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
index 611d08e922dc06ad392fb18b6fd6f295557e6167..aedba2b6b94486a63a736b240d3f5036a1a1c839 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
@@ -27,7 +27,7 @@ class WsdlGenerationFromDataObjectTest extends \Magento\TestFramework\TestCase\W
protected function setUp()
{
$this->_markTestAsSoapOnly("WSDL generation tests are intended to be executed for SOAP adapter only.");
- $this->_storeCode = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')
+ $this->_storeCode = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
->getStore()->getCode();
$this->_soapUrl = "{$this->_baseUrl}/soap/{$this->_storeCode}?services=testModule5AllSoapAndRestV1%2CtestModule5AllSoapAndRestV2";
parent::setUp();
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
new file mode 100644
index 0000000000000000000000000000000000000000..278fd8973f3bc91f5672d0b0cec27338ea45634b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\Block\Dashboard;
+
+class StoreStats extends \Magento\Backend\Test\Block\Widget\FormTabs
+{
+ /**
+ * Refresh data button
+ *
+ * @var string
+ */
+ protected $refreshData = 'button';
+
+ /**
+ * Click Refresh Data button
+ *
+ * return void
+ */
+ public function refreshData()
+ {
+ $this->_rootElement->find($this->refreshData)->click();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5a5a5b86dae9118741c6461670f27cc9ce0104b2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<tabs>
+ <bestsellers>
+ <class>\Magento\Backend\Test\Block\Dashboard\Tab\Products</class>
+ <selector>#grid_tab_ordered_products</selector>
+ <strategy>css selector</strategy>
+ </bestsellers>
+</tabs>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
new file mode 100644
index 0000000000000000000000000000000000000000..a2ae34fdf9155021d81625fb2dbbb0cc900f3cd6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\Block\Dashboard\Tab;
+
+use Magento\Mtf\Client\Element;
+use Magento\Backend\Test\Block\Widget\Tab;
+
+class Products extends Tab
+{
+ /**
+ * Locator for ordered products grid
+ *
+ * @var string
+ */
+ protected $orderedProductsGrid = '#grid_tab_ordered_products_content';
+
+ /**
+ * Get bestsellers grid
+ *
+ * @return \Magento\Backend\Test\Block\Dashboard\Tab\Products\Ordered
+ */
+ public function getBestsellersGrid()
+ {
+ return $this->blockFactory->create(
+ '\Magento\Backend\Test\Block\Dashboard\Tab\Products\Ordered',
+ ['element' => $this->browser->find($this->orderedProductsGrid)]
+ );
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d505680a261c0b71fd9d87ba4d7b7022b8f0a26
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\Block\Dashboard\Tab\Products;
+
+use Magento\Mtf\Client\Locator;
+use Magento\Backend\Test\Block\Widget\Grid;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+
+/**
+ * Ordered products grid on bestsellers tab on Dashboard
+ */
+class Ordered extends Grid
+{
+ /**
+ * Base part of row locator template
+ *
+ * @var string
+ */
+ protected $location = '//table[@id="productsOrderedGrid_table"]/tbody/tr';
+
+ /**
+ * Secondary part of row locator template
+ *
+ * @var string
+ */
+ protected $rowTemplate = 'td[contains(., "%s")]';
+
+ /**
+ * Check if ordered product is in grid
+ *
+ * @param CatalogProductSimple $product
+ * @return bool
+ */
+ public function isProductVisible(CatalogProductSimple $product)
+ {
+ $filter = [
+ $product->getName(),
+ $product->getPrice(),
+ $product->getCheckoutData()['qty'],
+ ];
+ $rows = [];
+ foreach ($filter as $value) {
+ $rows[] = sprintf($this->rowTemplate, $value);
+ }
+ $location = $this->location . '[' . implode(' and ', $rows) . ']';
+
+ return $this->_rootElement->find($location, Locator::SELECTOR_XPATH)->isVisible();
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
new file mode 100644
index 0000000000000000000000000000000000000000..2db5fe1018056c19944cf804c6d6b46df843db32
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+
+/**
+ * Assert that bestsellers tab content on Dashboard successfully refreshed after clicking on Refreshing data button
+ */
+class AssertBestsellersOnDashboard extends AbstractConstraint
+{
+ /* tags */
+ const SEVERITY = 'low';
+ /* end tags */
+
+ /**
+ * Assert that ordered products in bestsellers on Dashboard successfully refreshed.
+ *
+ * @param OrderInjectable $order
+ * @param Dashboard $dashboard
+ * @return void
+ */
+ public function processAssert(OrderInjectable $order, Dashboard $dashboard)
+ {
+ $dashboard->open();
+ $dashboard->getStoreStatsBlock()->refreshData();
+ /** @var \Magento\Backend\Test\Block\Dashboard\Tab\Products\Ordered $bestsellersGrid */
+ $bestsellersGrid = $dashboard->getStoreStatsBlock()->getTabElement('bestsellers')->getBestsellersGrid();
+ $products = $order->getEntityId()['products'];
+ foreach ($products as $product) {
+ \PHPUnit_Framework_Assert::assertTrue(
+ $bestsellersGrid->isProductVisible($product),
+ 'Bestseller ' . $product->getName() . ' is not present in report grid after refresh data.'
+ );
+ }
+ }
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return string
+ */
+ public function toString()
+ {
+ return 'Bestsellers successfully updated after Refreshing data.';
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
index 9fb97cb577d97445b18582f5179d1275e5047234..9b003e378bc626638b4fb0c8b63620a5a55738f7 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
@@ -27,5 +27,10 @@
<locator>.navigation</locator>
<strategy>css selector</strategy>
</menuBlock>
+ <storeStatsBlock>
+ <class>Magento\Backend\Test\Block\Dashboard\StoreStats</class>
+ <locator>.dashboard-store-stats</locator>
+ <strategy>css selector</strategy>
+ </storeStatsBlock>
</blocks>
</page>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml
index c5ef837ad7d9d225e32af6fe0122fecf2daba9c8..ecc562248fa41e8288bfd4d89dd1d0da445b21e5 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml
@@ -18,4 +18,7 @@
<assertGlobalSearchCustomerName module="Magento_Backend">
<severity>low</severity>
</assertGlobalSearchCustomerName>
+ <assertBestsellersOnDashboard module="Magento_Backend">
+ <severity>low</severity>
+ </assertBestsellersOnDashboard>
</constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
index 40ae967bfd54c2625a437282902df31fefc8c057..760da7356e94fbb5f4f9b8c64276bc012771e31b 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
@@ -26,21 +26,21 @@ class Install extends Block
*
* @var string
*/
- protected $adminInfo = "//*[@id='admin-info']";
+ protected $adminInfo = '#admin-info';
/**
* Database info block.
*
* @var string
*/
- protected $dbInfo = "//*[@id='db-info']";
+ protected $dbInfo = '#db-info';
/**
* 'Launch Magento Admin' button.
*
* @var string
*/
- protected $launchAdmin = "//*[@type='button']";
+ protected $launchAdmin = '.btn-large.btn-prime';
/**
* Click on 'Install Now' button.
@@ -50,43 +50,53 @@ class Install extends Block
public function clickInstallNow()
{
$this->_rootElement->find($this->installNow, Locator::SELECTOR_XPATH)->click();
- $this->waitForElementVisible($this->launchAdmin, Locator::SELECTOR_XPATH);
+ $this->waitForElementVisible($this->launchAdmin, Locator::SELECTOR_CSS);
}
/**
* Get admin info.
*
- * @return string
+ * @return array
*/
public function getAdminInfo()
{
- $adminData = [];
- $rows = $this->_rootElement->getElements('#admin-info .row');
- foreach ($rows as $row) {
- $dataRow = $row->getElements('div');
- $key = strtolower(str_replace(' ', '_', str_replace(':', '', $dataRow[0]->getText())));
- $adminData[$key] = $dataRow[1]->getText();
- }
-
- return $adminData;
+ return $this->getTableDataByCssLocator($this->adminInfo);
}
/**
* Get database info.
*
- * @return string
+ * @return array
*/
public function getDbInfo()
{
- $dbData = [];
- $rows = $this->_rootElement->getElements('#db-info .row');
- foreach ($rows as $row) {
- $dataRow = $row->getElements('div');
- $key = strtolower(str_replace(' ', '_', str_replace(':', '', $dataRow[0]->getText())));
- $dbData[$key] = $dataRow[1]->getText();
+ return $this->getTableDataByCssLocator($this->dbInfo);
+ }
+
+ /**
+ * Get table data by correspondent div css selector.
+ * Data inside the table must be presented via <dt>/<dd>/<dl> tags due to actual HTML5 standard.
+ *
+ * @param string $selector
+ * @return array
+ */
+ protected function getTableDataByCssLocator($selector)
+ {
+ $data = [];
+ $keys = [];
+ $definitionTitles = $this->_rootElement->getElements($selector . ' dt');
+ foreach ($definitionTitles as $dt) {
+ $keys[] = strtolower(str_replace(' ', '_', str_replace(':', '', $dt->getText())));
+ }
+ reset($keys);
+
+ $definitionDescriptions = $this->_rootElement->getElements($selector . ' dd');
+ foreach ($definitionDescriptions as $dd) {
+ $data[current($keys)] = $dd->getText();
+ next($keys);
}
- return $dbData;
+ return $data;
}
/**
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
index 8f3ddadef7e8d49b309de7069fd5e0c4071f1b41..a85e4e428f4c700897d969757cf350bc63f4b132 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
@@ -19,7 +19,7 @@ class Landing extends Block
*
* @var string
*/
- protected $agreeAndSetup = '.btn-lg.btn-primary';
+ protected $agreeAndSetup = '.btn-prime.btn-submit';
/**
* 'Terms & Agreement' link.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
index 08f7f40dbffbf9d436989ba3ddb007ab5f3fcbd6..848b9ac33f0de49edc8324f559d6725e50b4e9fe 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
@@ -19,7 +19,7 @@ class License extends Block
*
* @var string
*/
- protected $back = '.btn.btn-primary';
+ protected $back = '[ng-click="nextState()"]';
/**
* License text.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
index d9e1c4638eea02eb4a9bf6458a91e912ca5a71bc..89e81d3e7b73db217e8e7f1b95a0d37d2af8192b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
@@ -20,7 +20,7 @@ class Resource extends DataFixture
* @var array
*/
protected $resources = [
- 'Magento_Adminhtml::dashboard' => null,
+ 'Magento_Backend::dashboard' => null,
'Magento_Sales::sales' => null,
'Magento_Sales::sales_operation' => 'Magento_Sales::sales',
'Magento_Sales::sales_order' => 'Magento_Sales::sales_operation',
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
index f64460972aaca59c22ec98185eb3b09440f3019b..9854602a507fcc0045fcc2f5be86a85f96073b0d 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
@@ -48,7 +48,7 @@ class ConfigFixture
$scopeConfig = $objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
$result = $scopeConfig->getValue(
$configPath,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$scopeCode
);
}
@@ -82,7 +82,7 @@ class ConfigFixture
)->setValue(
$configPath,
$value,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeCode
);
}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php
index 68171fa53f9db9bb0d972ee7ac177fb093e46074..6cb6d83f78dc936b2a22c76781e1941bf842b68d 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php
@@ -18,7 +18,7 @@ class Eav
public static function setIncrementIdPrefix($entityType, $prefix)
{
$website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getWebsite();
$storeId = $website->getDefaultStore()->getId();
$entityTypeModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
diff --git a/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php b/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php
index 53b69bf15c0f647265da5b19b732b50af34c9651..cc9f6456e586cd483f28b83b7c0da0038e33f63d 100644
--- a/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php
@@ -29,7 +29,7 @@ class RulesTest extends \PHPUnit_Framework_TestCase
{
$this->_model
->setRoleType('G')
- ->setResourceId('Magento_Adminhtml::all')
+ ->setResourceId('Magento_Backend::all')
->setPrivileges("")
->setAssertId(0)
->setRoleId(1)
@@ -44,7 +44,7 @@ class RulesTest extends \PHPUnit_Framework_TestCase
*/
public function testInitialUserPermissions()
{
- $expectedDefaultPermissions = ['Magento_Adminhtml::all'];
+ $expectedDefaultPermissions = ['Magento_Backend::all'];
$this->_checkExistingPermissions($expectedDefaultPermissions);
}
@@ -54,9 +54,9 @@ class RulesTest extends \PHPUnit_Framework_TestCase
*/
public function testSetAllowForAllResources()
{
- $resources = ['Magento_Adminhtml::all'];
+ $resources = ['Magento_Backend::all'];
$this->_model->setRoleId(1)->setResources($resources)->saveRel();
- $expectedPermissions = ['Magento_Adminhtml::all'];
+ $expectedPermissions = ['Magento_Backend::all'];
$this->_checkExistingPermissions($expectedPermissions);
}
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
index a48dbc77a7f1ebcd393d9c4d561ed5ed11751fec..7d57800fb17632328cb160f9919ef4bd4309a97d 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
@@ -32,7 +32,7 @@ class ObserverTest extends \Magento\TestFramework\TestCase\AbstractController
];
$this->getRequest()->setPost($post);
$this->dispatch('backend/admin');
- $this->assertContains(__('Incorrect CAPTCHA'), $this->getResponse()->getBody());
+ $this->assertContains((string)__('Incorrect CAPTCHA'), $this->getResponse()->getBody());
}
/**
@@ -46,7 +46,7 @@ class ObserverTest extends \Magento\TestFramework\TestCase\AbstractController
public function testCaptchaIsRequiredAfterFailedLoginAttempts()
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->setCurrentStore(
0
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
index d5a5a01937fcd96b7b7e71ffcbc6059dfcf24a31..0801e8bccbcdac6a31dcc23323e075f75a3d6ddb 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
@@ -54,7 +54,7 @@ class NewTest extends \PHPUnit_Framework_TestCase
$this->assertSame(1, array_shift($keys));
$this->assertEquals(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId(),
$info[1]
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
index 222e9429230883fe46cddb72b48a3f595ff6c6eb..121f6b025393e375bee0ea7468ab6c25c49238e8 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
@@ -5,7 +5,7 @@
*/
namespace Magento\Catalog\Helper;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\Tax\Model\ClassModel;
use Magento\Tax\Model\Config;
use Magento\Tax\Model\TaxRuleFixtureFactory;
@@ -204,7 +204,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($this->helper->isUsingStaticUrlsAllowed());
$this->helper->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
);
$this->assertTrue($this->helper->isUsingStaticUrlsAllowed());
@@ -225,7 +225,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($this->helper->isUrlDirectivesParsingAllowed());
$this->helper->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
);
$this->assertFalse($this->helper->isUrlDirectivesParsingAllowed());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php
index b311d6d29cd226b6cd9c7938049c6be4f1db6ff3..8c73b9779c88380a15d14d8fd7a0e2ae76a19abc 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php
@@ -47,7 +47,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
// watermark fixture
mkdir(
$fixtureMediaDir . '/watermark/stores/' . $objectManager->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId(),
0777,
true
@@ -55,7 +55,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
copy(
"{$fixtureDir}/watermark.jpg",
$fixtureMediaDir . '/watermark/stores/' . $objectManager->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId() . '/watermark.jpg'
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php
index 012c01e5233c5c908823db04bb528144f476a965..b45e05df43559ce9e92d08809fc1995cda7397cf 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php
@@ -137,7 +137,7 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
$this->assertSame(
$store,
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()
);
}
@@ -146,7 +146,7 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
{
$ids = $this->_model->getWebsiteStoreIds();
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId();
$this->assertEquals([$storeId => $storeId], $ids);
}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php
index fce29e9ddddf657d6477f4dc54a0636c937aac98..c5fb7029403420ca3d8baab544de34dc6e6d6f28 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php
@@ -29,12 +29,12 @@ class CategoryImageTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_oldLogActive = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getConfig(
'dev/log/active'
);
$this->_oldExceptionFile = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getConfig(
'dev/log/exception_file'
);
@@ -47,7 +47,7 @@ class CategoryImageTest extends \PHPUnit_Framework_TestCase
)->setValue(
'dev/log/active',
$this->_oldLogActive,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->_oldLogActive = null;
@@ -57,7 +57,7 @@ class CategoryImageTest extends \PHPUnit_Framework_TestCase
)->setValue(
'dev/log/exception_file',
$this->_oldExceptionFile,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->_oldExceptionFile = null;
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php
index 6780850add53069216d0aa9ec37ffe0cfe1ea343..667241e2d64f03eafbc6c363b51b53008bc30270 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php
@@ -10,7 +10,7 @@ namespace Magento\Catalog\Model\Category\CategoryImageTest;
)->setValue(
'dev/log/active',
1,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -18,7 +18,7 @@ namespace Magento\Catalog\Model\Category\CategoryImageTest;
)->setValue(
'dev/log/exception_file',
'save_category_without_image.log',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
class StubZendLogWriterStream extends \Zend_Log_Writer_Stream
{
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
index 42f25fa8110aa75b27cd138c074ee71afc7635f6..72a723413d214a205e9004f35185f0861dbc488d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -27,8 +27,8 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- /** @var $storeManager \Magento\Framework\Store\StoreManagerInterface */
- $storeManager = $objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+ /** @var $storeManager \Magento\Store\Model\StoreManagerInterface */
+ $storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface');
$this->_store = $storeManager->getStore();
$this->_model = $objectManager->create('Magento\Catalog\Model\Category');
}
@@ -96,7 +96,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
/* id from fixture */
$this->assertContains(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId(),
$this->_model->getStoreIds()
);
@@ -106,7 +106,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId(),
$this->_model->getStoreId()
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
index 0f06fae7c13e77cc8a128c2b67d3a8fa2427d322..e9fed1bf4d723884ce01d9920e0485e856dc5daf 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
@@ -150,7 +150,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
{
$this->assertSame(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(),
$this->_model->getCurrentStore()
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
index 20cb539091c77c4c1d269189175cbd8a4bf0df4e..7b46196b1238bbf0222c91e084e525f9ea03d557 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
@@ -79,7 +79,7 @@ class PriceTest extends \PHPUnit_Framework_TestCase
$product->getId(),
$this->_model->getAttribute()->getId(),
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
index 026dd9dac902e30786c9cd992f9f25c2dc7ee798..231b6fc7c3cf9c590f5b3089b17ed1fc0e6e8fe4 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
@@ -141,10 +141,10 @@ class TierpriceTest extends \PHPUnit_Framework_TestCase
public function testAfterSaveEmpty()
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->setCurrentStore(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
\Magento\Store\Model\Store::DEFAULT_STORE_ID
)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
index 29b25636b310733c509ecec3d6fe7e65b0282ef4..197d9efa5595f5072536a862d926aa9893a80ce1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
@@ -31,7 +31,7 @@ class ProductExternalTest extends \PHPUnit_Framework_TestCase
{
$this->assertEquals(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId(),
$this->_model->getStoreId()
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index 62e2ae63f8cba113e937158a7027fb8c2a52decd..db9cfaa872bdad22de26acce3d13936390b3dafb 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -202,7 +202,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase
protected function _undo($duplicate)
{
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->setId(
\Magento\Store\Model\Store::DEFAULT_STORE_ID
);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
index 60d88b22736c992e4fa920edaad5ee5ca4fb66b4..ab28f1432590a5e9457098091e54a01c2fc4f77f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
@@ -28,7 +28,7 @@ $productOne->setId(
)->setAttributeSetId(
4
)->setWebsiteIds(
- [$obectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()]
+ [$obectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()]
)->setSku(
'simple_product_1'
)->setName(
@@ -69,7 +69,7 @@ $productTwo->setId(
)->setAttributeSetId(
4
)->setWebsiteIds(
- [$obectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()]
+ [$obectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()]
)->setSku(
'simple_product_2'
)->setName(
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index daab88995bb84221c01a078b07036f179797d995..6c0af79022f8487e2a6da9fb0307d57275bf9b41 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -809,7 +809,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase
$product->load($id);
$this->assertEquals('1', $product->getHasOptions());
- $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->setCurrentStore('fixturestore');
+ $objectManager->get('Magento\Store\Model\StoreManagerInterface')->setCurrentStore('fixturestore');
/** @var \Magento\Catalog\Model\Product $simpleProduct */
$simpleProduct = $objectManager->create('Magento\Catalog\Model\Product');
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/Type/OnepageTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
index fdd5a18ba45e7a0e66059cc399402782b91c27b1..aa5dc67e9dfaec6f29bb46f33ddf82a78d88c390 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
@@ -482,7 +482,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
$this->assertArrayHasKey('message', $result, 'Error message was expected to be set');
$this->assertStringStartsWith(
'There is already a registered customer using this email address',
- $result['message'],
+ (string)$result['message'],
'Validation error is invalid.'
);
}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php
index aec9d9c02d1523bd26057386cc20d87b6349ed94..cd139fa8b271c5d41551ed68e8d8ccb6701ab325 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php
@@ -14,7 +14,7 @@ $data = [
'is_active' => true,
'website_ids' => [
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getWebsiteId()
],
'customer_group_ids' => [\Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID],
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
index 687923eb5a46a7ce0d91dc2b623fdfcf8fddd941..69e7ee649b9a3fe42006d772ba3c613c3a4ff23f 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
@@ -29,10 +29,10 @@ class RouterTest extends \PHPUnit_Framework_TestCase
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\UrlInterface'),
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Cms\Model\PageFactory'),
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
),
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)
);
}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Helper/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Helper/PageTest.php
old mode 100644
new mode 100755
index 915586fea097c074b87e5b65873d4b4cf7630cf9..8a486813071ca6a94f60308e6b09b791dd9387f8
--- a/dev/tests/integration/testsuite/Magento/Cms/Helper/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Helper/PageTest.php
@@ -36,7 +36,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
// fixture
/** @var $pageHelper \Magento\Cms\Helper\Page */
$pageHelper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Cms\Helper\Page');
- $result = $pageHelper->renderPage(
+ $result = $pageHelper->prepareResultPage(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
'Magento\Framework\App\Action\Action',
['context' => $context]
@@ -47,6 +47,6 @@ class PageTest extends \PHPUnit_Framework_TestCase
'Magento\Framework\View\DesignInterface'
);
$this->assertEquals('Magento/blank', $design->getDesignTheme()->getThemePath());
- $this->assertTrue($result);
+ $this->assertInstanceOf('Magento\Framework\View\Result\Page', $result);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/block.php b/dev/tests/integration/testsuite/Magento/Cms/_files/block.php
index b5a791a7bd7406df46afb02f3ad74e15623fc9dc..bd641ff387ff84770dcd6553e7c141d7163e0442 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/_files/block.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/block.php
@@ -21,7 +21,7 @@ $block->setTitle(
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
]
)->save();
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
index c6bee612e4b4973a37d29d34b96b121713464134..2a99dede484227e4b7bc38fd9040e78573584869 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
@@ -291,7 +291,10 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
public function testGetSpecifyOptionMessage()
{
- $this->assertEquals('Please specify the product\'s option(s).', $this->_model->getSpecifyOptionMessage());
+ $this->assertEquals(
+ 'Please specify the product\'s option(s).',
+ (string)$this->_model->getSpecifyOptionMessage()
+ );
}
/**
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php b/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php
index 385f755a67e2fbd54db0a34b459536127e63dd48..c8702a075693272b1c7771540348c6c2d3da4ca2 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php
+++ b/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php
@@ -30,5 +30,5 @@ $store->save();
/* Refresh stores memory cache */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/store.php b/dev/tests/integration/testsuite/Magento/Core/_files/store.php
index eb7df4f2fdaa2278e5207096b833a04743bb92a9..dcb4f52e6722d73710e06d762038cd3387c4bf54 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/store.php
+++ b/dev/tests/integration/testsuite/Magento/Core/_files/store.php
@@ -8,10 +8,10 @@ $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Ma
$storeCode = 'fixturestore';
if (!$store->load($storeCode)->getId()) {
$websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getWebsite()->getId();
$groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getWebsite()->getDefaultGroupId();
$store->setCode(
$storeCode
@@ -30,6 +30,6 @@ if (!$store->load($storeCode)->getId()) {
/* Refresh stores memory cache */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->reinitStores();
}
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
index 17d13af9fb7d7e9e3e8347bd71e789c1050fdb7f..24fc61e53b2124d061416b3e4fcb650ef3c6f0ba 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
@@ -52,7 +52,7 @@ class SaveRatesTest extends \Magento\Backend\Utility\Controller
$this->dispatch('backend/admin/system_currency/saveRates');
$this->assertSessionMessages(
- $this->contains(__('All valid rates have been saved.')),
+ $this->contains((string)__('All valid rates have been saved.')),
\Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
);
@@ -84,7 +84,7 @@ class SaveRatesTest extends \Magento\Backend\Utility\Controller
$this->dispatch('backend/admin/system_currency/saveRates');
$this->assertSessionMessages(
- $this->contains(__('Please correct the input data for %1 => %2 rate', $currencyCode, $currencyTo)),
+ $this->contains((string)__('Please correct the input data for %1 => %2 rate', $currencyCode, $currencyTo)),
\Magento\Framework\Message\MessageInterface::TYPE_WARNING
);
}
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php
index eb6b0856d4ad0d8b752b02c9c7d9930c6ca4c8f5..f4bbd8d197d07ddb73c1b4444f5db91d003e7247 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php
@@ -31,7 +31,7 @@ class CurrencysymbolTest extends \PHPUnit_Framework_TestCase
{
$this->currencySymbolModel = null;
Bootstrap::getObjectManager()->get('Magento\Framework\App\Config\ReinitableConfigInterface')->reinit();
- Bootstrap::getObjectManager()->create('Magento\Framework\Store\StoreManagerInterface')->reinitStores();
+ Bootstrap::getObjectManager()->create('Magento\Store\Model\StoreManagerInterface')->reinitStores();
}
public function testGetCurrencySymbolsData()
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
index 425bee97ddaa6d34f95465add8d0c033ddbce7e1..f7160adb6c3af86ac19d8854a1e75f100163d462 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
@@ -22,7 +22,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Registry */
private $_coreRegistry;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
private $_storeManager;
/** @var Cart */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
index 937c36c5101ba18efc4fe62b3feeb71888de3546..d43e59c6c79b3fdb12e57f706b66859d7675e78e 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
@@ -31,7 +31,7 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Customer\Api\GroupRepositoryInterface */
private $_groupRepository;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
private $_storeManager;
/** @var \Magento\Framework\ObjectManagerInterface */
@@ -52,7 +52,7 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
{
$this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- $this->_storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
$this->_context = $this->_objectManager->get(
'Magento\Backend\Block\Template\Context',
['storeManager' => $this->_storeManager]
@@ -162,7 +162,7 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
->getDefaultTimezonePath();
$timezone = $this->_context->getScopeConfig()->getValue(
$defaultTimeZonePath,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->_loadCustomer()->getStoreId()
);
$this->assertEquals($timezone, $this->_block->getStoreCreateDateTimezone());
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php
index 6fd17aa638fc6033a7cdf861b2d7190647d77b87..6a4c5c9127877e3d4426d098746a94cacd6bf502 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php
@@ -29,7 +29,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
/** @var CustomerRepositoryInterface */
private $_customerRepository;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
private $_storeManager;
/** @var \Magento\Framework\ObjectManagerInterface */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
index 0f8d9fe72cedd42c1a1e511ae2f8899013cd4426..92b884b1d254d8a8848a8a7061e6e4b2b5d2a774 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
@@ -6,7 +6,7 @@
namespace Magento\Customer\Model;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\Bootstrap;
/**
@@ -45,8 +45,8 @@ class GroupManagementTest extends \PHPUnit_Framework_TestCase
* @magentoDataFixture Magento/Core/_files/second_third_store.php
*/
public function testGetDefaultGroupWithNonDefaultStoreId()
- { /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
- $storeManager = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface');
+ { /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+ $storeManager = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface');
$nonDefaultStore = $storeManager->getStore('secondstore');
$nonDefaultStoreId = $nonDefaultStore->getId();
/** @var \Magento\Framework\App\MutableScopeConfig $scopeConfig */
@@ -54,7 +54,7 @@ class GroupManagementTest extends \PHPUnit_Framework_TestCase
$scopeConfig->setValue(
\Magento\Customer\Model\GroupManagement::XML_PATH_DEFAULT_ID,
2,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
'secondstore'
);
$testGroup = ['id' => 2, 'code' => 'Wholesale', 'tax_class_id' => 3, 'tax_class_name' => 'Retail Customer'];
@@ -111,8 +111,8 @@ class GroupManagementTest extends \PHPUnit_Framework_TestCase
*/
public function getDefaultGroupDataProvider()
{
- /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
- $storeManager = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface');
+ /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+ $storeManager = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface');
$defaultStoreId = $storeManager->getStore()->getId();
return [
'no store id' => [
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php b/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php
index 7175a2f5c599c1217268165ab6e53a34fe4f4d42..d40823b6573ef71808a5c525c7455e8ddde2b1b7 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php
@@ -39,7 +39,7 @@ $quoteItem = $quote->setCustomerId(
1
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)->setReservedOrderId(
'test01'
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
index baf260103a378cd9e3ae982a0913bfc9c3aad528..73012c62e5cfde76deba26e987bca4e5f12ea609 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
@@ -36,7 +36,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
);
$websites = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getWebsites(
true
);
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
index 88da061d8948eed0bc9794a90a2ab8e84c4c8de9..9dac322d762f6a16df55b2b3d6401f06c1c41a36 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
@@ -182,7 +182,7 @@ class CustomerTest extends \PHPUnit_Framework_TestCase
'email' => 'example.com',
'created_at' => [$createdAtDate, ''],
'store_id' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
]
];
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
index 3601d7b0fac0db0e9dee2a898d7418b04c3771a7..018c8b1c71e89679b86a824bafccf0a881dd1dd0 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
@@ -9,7 +9,7 @@
namespace Magento\Directory\Model;
use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\Bootstrap;
/**
@@ -43,23 +43,15 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$this->objectManager = Bootstrap::getObjectManager();
$this->scopeConfig = $this->objectManager->create('Magento\Framework\App\MutableScopeConfig');
- $this->scopeConfig->setValue(Observer::IMPORT_ENABLE, 1, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
- $this->scopeConfig->setValue(
- Observer::CRON_STRING_PATH,
- 'cron-string-path',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- );
- $this->scopeConfig->setValue(
- Observer::IMPORT_SERVICE,
- 'webservicex',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- );
+ $this->scopeConfig->setValue(Observer::IMPORT_ENABLE, 1, ScopeInterface::SCOPE_STORE);
+ $this->scopeConfig->setValue(Observer::CRON_STRING_PATH, 'cron-string-path', ScopeInterface::SCOPE_STORE);
+ $this->scopeConfig->setValue(Observer::IMPORT_SERVICE, 'webservicex', ScopeInterface::SCOPE_STORE);
$this->configResource = $this->objectManager->get('Magento\Core\Model\Resource\Config');
$this->configResource->saveConfig(
$this->baseCurrencyPath,
$this->baseCurrency,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
0
);
@@ -82,7 +74,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$this->configResource->saveConfig(
$this->allowedCurrenciesPath,
$allowedCurrencies,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ ScopeInterface::SCOPE_STORE,
0
);
$this->observer->scheduledUpdateCurrencyRates(null);
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
index 81529277542fd0cb7419ecb6aaedc5928077d876..eeea37be4c2828f7c2aacda436d1697a9751faa3 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
@@ -139,7 +139,7 @@ class FilterTest extends \PHPUnit_Framework_TestCase
)->setValue(
\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
$themeId,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
/** @var $layout \Magento\Framework\View\LayoutInterface */
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
index ea2d858bd222497388489439e3a230e27f7c29bf..5ffaed0005fadfe797d43b1753b32e13c1c35903 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -65,7 +65,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
$this->assertSame($filter, $this->_model->getTemplateFilter());
$this->assertEquals(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId(),
$filter->getStoreId()
);
@@ -106,7 +106,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
[
'area' => 'frontend',
'store' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
'fixturestore'
)->getId()
@@ -130,7 +130,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
)->setValue(
\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
$theme->getId(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
'fixturestore'
);
}
@@ -154,7 +154,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
[
'area' => 'frontend',
'store' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
'fixturestore'
)->getId()
@@ -194,7 +194,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase
public function setDesignConfigExceptionDataProvider()
{
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
+ ->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
return [
[[]],
[['area' => 'frontend']],
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringTest.php
index 3b80aa24c6495cdd0956634f6eead08e56880b61..dc05ddf35d3391a04fb7eeed4ccddb8b1292b94e 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringTest.php
@@ -48,7 +48,7 @@ class StringTest extends \PHPUnit_Framework_TestCase
public function testEvaluate($input, $expected)
{
$actual = $this->_model->evaluate($input);
- $this->assertSame($expected, $actual);
+ $this->assertSame($expected, (string)$actual);
}
public function evaluateDataProvider()
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/ImageTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/ImageTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..885210800ed137e67264f5ffa160cdf368b1b4b7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/ImageTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/**
+ * Tests for \Magento\Framework\Data\Form\Element\Image
+ */
+namespace Magento\Framework\Data\Form\Element;
+
+class ImageTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Framework\Data\Form\Element\Image
+ */
+ protected $imageElement;
+
+ protected function setUp()
+ {
+ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+ /** @var $elementFactory \Magento\Framework\Data\Form\ElementFactory */
+ $elementFactory = $objectManager->create('Magento\Framework\Data\Form\ElementFactory');
+ $this->imageElement = $elementFactory->create('Magento\Framework\Data\Form\Element\Image', []);
+ $form = $objectManager->create('Magento\Framework\Data\Form');
+ $this->imageElement->setForm($form);
+ }
+
+ public function testGetElementHtml()
+ {
+ $filePath = 'some/path/to/file.jpg';
+ $this->imageElement->setValue($filePath);
+ $html = $this->imageElement->getElementHtml();
+
+ $this->assertContains('media/' . $filePath, $html);
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
index e3a45563f3b8b58ff73898b6ca9f45e3dc878b6f..14f9874a7378c3d1b6fffe5ce6c9dc5760a69027 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
@@ -93,7 +93,7 @@ class SidResolverTest extends \PHPUnit_Framework_TestCase
'getValue'
)->with(
\Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue($useFrontedSid)
);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php b/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php
index 063f55ebb7a76b23e19cb88f27ac735456381a23..ae0d6cc07a19993948ee5b0dfa29f233859f2920 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php
@@ -43,7 +43,7 @@ class InlineTest extends \PHPUnit_Framework_TestCase
);
/* Called getConfig as workaround for setConfig bug */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
$this->_storeId
)->getConfig(
@@ -54,7 +54,7 @@ class InlineTest extends \PHPUnit_Framework_TestCase
)->setValue(
'dev/translate_inline/active',
true,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->_storeId
);
}
@@ -66,7 +66,7 @@ class InlineTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(
$this->_model->isAllowed(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
$this->_storeId
)
@@ -78,7 +78,7 @@ class InlineTest extends \PHPUnit_Framework_TestCase
$this->assertFalse(
$this->_model->isAllowed(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
$this->_storeId
)
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_inline_page_expected.html b/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_inline_page_expected.html
index 494c89457156dc4035a292a3c2ff10b06b9e4e8d..605506449099adbad1cd716cd1de742a7d4dfa0b 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_inline_page_expected.html
+++ b/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_inline_page_expected.html
@@ -16,7 +16,7 @@
</div>
<script type="text/javascript" src="http://localhost/pub/static/frontend/Magento/luma/en_US/prototype/window.js"></script>
<link rel="stylesheet" type="text/css" href="http://localhost/pub/static/frontend/Magento/luma/en_US/prototype/windows/themes/default.css"/>
-<link rel="stylesheet" type="text/css" href="http://localhost/pub/media/theme/static/frontend/{{design_package}}/default/en_US/Magento_Core/prototype/magento.css"/>
+<link rel="stylesheet" type="text/css" href="http://localhost/pub/media/theme/static/frontend/{{design_package}}/default/en_US/Magento_Theme/prototype/magento.css"/>
<script type="text/javascript" src="http://localhost/pub/static/frontend/Magento/luma/en_US/mage/edit-trigger.js"></script>
<script type="text/javascript" src="http://localhost/pub/static/frontend/Magento/luma/en_US/mage/translate-inline.js"></script>
<link rel="stylesheet" type="text/css" href="http://localhost/pub/static/frontend/Magento/luma/en_US/mage/translate-inline.css"/>
@@ -27,7 +27,7 @@
$(this).translateInline({
ajaxUrl: 'http://localhost/index.php/translation/ajax/index/',
area: 'frontend',
- editTrigger: {img: 'http://localhost/pub/media/theme/static/frontend/{{design_package}}/default/en_US/Magento_Core/fam_book_open.png'}
+ editTrigger: {img: 'http://localhost/pub/media/theme/static/frontend/{{design_package}}/default/en_US/Magento_Theme/fam_book_open.png'}
});
});
})(jQuery);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
index 43f836a8443978e4ec15c04b4cdcbc322abb1ba1..44d7f7ab3c101a65c1a98ba1f62fbf30d126d5d9 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
@@ -52,7 +52,7 @@ class TranslateTest extends \PHPUnit_Framework_TestCase
'Magento\Theme\Model\View\Design',
['getDesignTheme'],
[
- $objectManager->get('Magento\Framework\Store\StoreManagerInterface'),
+ $objectManager->get('Magento\Store\Model\StoreManagerInterface'),
$objectManager->get('Magento\Framework\View\Design\Theme\FlyweightFactory'),
$objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface'),
$objectManager->get('Magento\Theme\Model\ThemeFactory'),
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
index 689068525611c6c026dc1eb3d1228a6d7eeaee7d..14abd695c7adbf6c9e63e64919c349a4bd47e294 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
@@ -9,7 +9,7 @@
*
* Note that some methods are not covered here, see the \Magento\Framework\View\LayoutDirectivesTest
*
- * @see \Magento\Core\Model\LayoutDirectivesTest
+ * @see \Magento\Framework\View\LayoutDirectivesTest
*/
namespace Magento\Framework\View;
@@ -91,7 +91,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
* A smoke test for generating elements
*
* See sophisticated tests at \Magento\Framework\View\LayoutDirectivesTest
- * @see \Magento\Core\Model\LayoutDirectivesTest
+ * @see \Magento\Framework\View\LayoutDirectivesTest
* @magentoAppIsolation enabled
*/
public function testGenerateGetAllBlocks()
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..758e4b4de28d3cef177aa62be2e624ddb6529389
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\View\Model\Layout;
+
+class MergeTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * Fixture XML instruction(s) to be used in tests
+ */
+ const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="fixture.phtml"/>';
+
+ /**
+ * @var \Magento\Framework\View\Model\Layout\Merge
+ */
+ protected $model;
+
+ protected function setUp()
+ {
+ $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+ /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+ $theme = $objectManager->create('Magento\Framework\View\Design\ThemeInterface');
+ $theme->load(1);
+
+ /** @var $layoutUpdate1 \Magento\Widget\Model\Layout\Update */
+ $layoutUpdate1 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\Widget\Model\Layout\Update'
+ );
+ $layoutUpdate1->setHandle('fixture_handle_one');
+ $layoutUpdate1->setXml('
+ <body>
+ <block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>
+ </body>
+ ');
+ $layoutUpdate1->setHasDataChanges(true);
+ $layoutUpdate1->save();
+ $link1 = $objectManager->create('Magento\Widget\Model\Layout\Link');
+ $link1->setThemeId($theme->getId());
+ $link1->setLayoutUpdateId($layoutUpdate1->getId());
+ $link1->save();
+
+ /** @var $layoutUpdate2 \Magento\Widget\Model\Layout\Update */
+ $layoutUpdate2 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\Widget\Model\Layout\Update'
+ );
+ $layoutUpdate2->setHandle('fixture_handle_two');
+ $layoutUpdate2->setXml('
+ <body>
+ <block class="Magento\Framework\View\Element\Template" template="fixture_template_two.phtml"/>
+ </body>
+ ');
+ $layoutUpdate2->setHasDataChanges(true);
+ $layoutUpdate2->save($layoutUpdate2);
+ $link2 = $objectManager->create('Magento\Widget\Model\Layout\Link');
+ $link2->setThemeId($theme->getId());
+ $link2->setLayoutUpdateId($layoutUpdate2->getId());
+ $link2->save();
+
+ $this->model = $objectManager->create('Magento\Framework\View\Model\Layout\Merge',
+ [
+ 'theme' => $theme
+ ]);
+ }
+
+ public function testLoadDbApp()
+ {
+ $this->assertEmpty($this->model->getHandles());
+ $this->assertEmpty($this->model->asString());
+ $handles = ['fixture_handle_one', 'fixture_handle_two'];
+ $this->model->load($handles);
+ $expectedResult = '
+ <root>
+ <body>
+ <block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>
+ </body>
+ <body>
+ <block class="Magento\Framework\View\Element\Template" template="fixture_template_two.phtml"/>
+ </body>
+ </root>
+ ';
+ $actualResult = '<root>' . $this->model->asString() . '</root>';
+ $this->assertXmlStringEqualsXmlString($expectedResult, $actualResult);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_one.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_one.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_one.xml
rename to dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_one.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_two.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_two.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_two.xml
rename to dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_two.xml
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php
index 031d37ec7a649d180e44e503c1257e7ace053e08..8cfb1a015e9cb87964c68534dbeda3faaf7d28b6 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php
@@ -13,7 +13,7 @@ abstract class AbstractStubEntity extends \Magento\ImportExport\Model\Export\Abs
{
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
array $data = []
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
index 8166c915ae479bfe94edd63c1d90c252fa5a6877..3c445575a6fdaff22b07b36ebe0a5bf565769369 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
@@ -109,7 +109,7 @@ abstract class Stub_Magento_ImportExport_Model_Export_AbstractEntity
{
public function __construct(
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\ImportExport\Model\Export\Factory $collectionFactory,
\Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
array $data = []
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/Model/ShellTest.php b/dev/tests/integration/testsuite/Magento/Indexer/Model/ShellTest.php
index c2e913b4fa1845aaac46190041d798619e0d1eb6..9d2a1e7d0e183992397f5fa7dba6d1354dc6b1de 100644
--- a/dev/tests/integration/testsuite/Magento/Indexer/Model/ShellTest.php
+++ b/dev/tests/integration/testsuite/Magento/Indexer/Model/ShellTest.php
@@ -65,7 +65,7 @@ class ShellTest extends \PHPUnit_Framework_TestCase
);
foreach ($indexerCollection->getItems() as $indexer) {
/** @var \Magento\Indexer\Model\IndexerInterface $indexer */
- $this->assertContains($indexer->getTitle(), $result);
+ $this->assertContains((string)$indexer->getTitle(), $result);
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php b/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
index 9553a4a858d2d1494949c4dba6d6ef4c6ddb5799..5f801e011092106c81af54bb3d0abb333ad693f9 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
@@ -56,7 +56,7 @@ class AuthorizationServiceTest extends \PHPUnit_Framework_TestCase
public function testGrantPermissions()
{
$integrationId = rand(1, 1000);
- $resources = ['Magento_Sales::create', 'Magento_Cms::page', 'Magento_Adminhtml::dashboard'];
+ $resources = ['Magento_Sales::create', 'Magento_Cms::page', 'Magento_Backend::dashboard'];
/** Preconditions check */
$this->_ensurePermissionsAreNotGranted($integrationId, $resources);
@@ -92,7 +92,7 @@ class AuthorizationServiceTest extends \PHPUnit_Framework_TestCase
return [
'integration' => [
'integrationId' => rand(1, 1000),
- 'initialResources' => ['Magento_Cms::page', 'Magento_Adminhtml::dashboard'],
+ 'initialResources' => ['Magento_Cms::page', 'Magento_Backend::dashboard'],
'newResources' => ['Magento_Sales::cancel', 'Magento_Cms::page_delete'],
],
'integration clear permissions' => [
@@ -110,7 +110,7 @@ class AuthorizationServiceTest extends \PHPUnit_Framework_TestCase
{
$integrationId = rand(1, 1000);
$this->_service->grantAllPermissions($integrationId);
- $this->_ensurePermissionsAreGranted($integrationId, ['Magento_Adminhtml::all']);
+ $this->_ensurePermissionsAreGranted($integrationId, ['Magento_Backend::all']);
}
/**
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php
index db3b3ba683ee89306a220094fe961e90a553435d..58529e1a5650061499fb9c312e29a9235ae14aa5 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php
@@ -14,8 +14,8 @@ $template = $objectManager->create('Magento\Newsletter\Model\Template');
$template->load('fixture_tpl', 'template_code');
$templateId = $template->getId();
-$currentStore = $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
-$otherStore = $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore('fixturestore')->getId();
+$currentStore = $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
+$otherStore = $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore('fixturestore')->getId();
/** @var $queue \Magento\Newsletter\Model\Queue */
$queue = $objectManager->create('Magento\Newsletter\Model\Queue');
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
index 3a5b36d59e16ba39e6f0ec35649c4e9f707f51a4..fe3cc067ec3e18690865de39ee50aaf7c9e90988 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
@@ -8,10 +8,10 @@ require __DIR__ . '/../../../Magento/Core/_files/store.php';
require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
$currentStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId();
$otherStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
'fixturestore'
)->getId();
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
index 1f44e5c0481d4c3d731cb2b7e62000c9392ca2fe..94ea3cb8e6e501e7920830b5aebdc35d14161da6 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
@@ -60,7 +60,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$scopeConfig = $this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
$defaultStatus = (string)$scopeConfig->getValue(
'payment/checkmo/order_status',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
/** @var \Magento\Core\Model\Resource\Config $config */
@@ -76,7 +76,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$newStatus = (string)$scopeConfig->getValue(
'payment/checkmo/order_status',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$status->unassignState(\Magento\Sales\Model\Order::STATE_NEW);
@@ -85,7 +85,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$unassignedStatus = $scopeConfig->getValue(
'payment/checkmo/order_status',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->assertEquals('pending', $defaultStatus);
@@ -116,7 +116,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$scopeConfig = $this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
$unassignedStatus = (string)$scopeConfig->getValue(
'payment/checkmo/order_status',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->assertEquals('pending', $unassignedStatus);
}
@@ -140,6 +140,6 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
protected function _resetConfig()
{
$this->_objectManager->get('Magento\Framework\App\Config\ReinitableConfigInterface')->reinit();
- $this->_objectManager->create('Magento\Framework\Store\StoreManagerInterface')->reinitStores();
+ $this->_objectManager->create('Magento\Store\Model\StoreManagerInterface')->reinitStores();
}
}
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php b/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php
index 19ece27a66e1a5b606d2f41301013a445e4177be..547516ebfcbf7ce7f19902119cfcd1959c935d72 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php
@@ -26,19 +26,13 @@ $review
->setEntityPkValue($product->getId())
->setStatusId(\Magento\Review\Model\Review::STATUS_PENDING)
->setStoreId(
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Framework\Store\StoreManagerInterface')
- ->getStore()
- ->getId()
- )
- ->setStores(
- [
- \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get('Magento\Framework\Store\StoreManagerInterface')
- ->getStore()
- ->getId()
- ]
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
+ ->getStore()->getId()
)
+ ->setStores([
+ \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
+ ->getStore()->getId()
+ ])
->save();
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry')->register(
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
index e92f3c6183c21dffbcdf43fcfba6a49f9d8751b1..a5e5fa9104b6d2d458d30ed8accb64cf144e1c55 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
@@ -18,12 +18,12 @@ $review->setEntityId(
\Magento\Review\Model\Review::STATUS_PENDING
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
]
)->save();
@@ -40,12 +40,12 @@ $review->setEntityId(
\Magento\Review\Model\Review::STATUS_APPROVED
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
]
)->save();
@@ -62,12 +62,12 @@ $review->setEntityId(
\Magento\Review\Model\Review::STATUS_APPROVED
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
]
)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php b/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php
index e7497306d0f59d6539fe5d33f90710be91eeee69..76976691452fcdb5e4e7d9527cbd9cd575193e2e 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php
@@ -15,12 +15,12 @@ $review->setEntityId(
\Magento\Review\Model\Review::STATUS_PENDING
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
]
)->setNickname(
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php b/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php
index 8f8c6acdfcb6abc332e2d5078fc79fb9ad946029..7f8202978fc971d9a23b7b305ca9b40ac04abd6d 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php
@@ -18,12 +18,12 @@ $review->setEntityId(
\Magento\Review\Model\Review::STATUS_PENDING
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)->setStores(
[
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
]
)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
index 21a3ab71070cc42bb9bdbe722f8e73828a284534..890462879d0be989965d84112ad7c398ff0af1d6 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
@@ -93,7 +93,7 @@ class OrderTest extends \PHPUnit_Framework_TestCase
->setShippingAddress($shippingAddress)
->setStoreId(
$this->objectManager
- ->get('Magento\Framework\Store\StoreManagerInterface')
+ ->get('Magento\Store\Model\StoreManagerInterface')
->getStore()
->getId()
)
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
index 6d9497bc2c37236ae5e86f8bd64992955851da96..dfd4511b37c4b6e3becded198d8ab4f1191f023a 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -51,7 +51,7 @@ $order->setIncrementId(
)->setShippingAddress(
$shippingAddress
)->setStoreId(
- $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId()
+ $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId()
)->addItem(
$orderItem
)->setPayment(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
index 1f0759c65b3f81a494c7deee979de9a551135bd8..6bbd0430c0bfc3f3a637465ea1aa9d5b30ea0d55 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
@@ -47,7 +47,7 @@ $order->setIncrementId(
)->setShippingAddress(
$shippingAddress
)->setStoreId(
- $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore('fixturestore')->getId()
+ $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore('fixturestore')->getId()
)->addItem(
$orderItem
)->setPayment(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
index 9cf0caca1f276fabaae99385f47c03f3dc2dd4b9..1862adfcee81f7a0d9a509e88b0d51b9febd2b05 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
@@ -45,7 +45,7 @@ $quote->setCustomerIsGuest(
true
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)->setReservedOrderId(
'test01'
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php
index 356ca3a7298877e0d0e2060b44a82430a7d7c35a..130ace4811f7e3b2866c64a782ee70983dee270c 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php
@@ -35,7 +35,7 @@ $order->setIncrementId(
$shippingAddress
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)->setPayment(
$payment
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
index b4d418c387eec789e07cbbd7adb19b0a72f5f943..8bdafe16f41aa3263b3a75e208e2a8545efbaa5d 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
@@ -50,7 +50,7 @@ $quote->setCustomerIsGuest(
true
)->setStoreId(
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId()
)->setReservedOrderId(
'test01'
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php
index 4c7173aa924592273a13294902743f7f2c6aa283..c9a49409c7e8e912110fc9bb6001fe610afd5512 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php
@@ -25,7 +25,7 @@ $salesRule->setData(
'stop_rules_processing' => 1,
'website_ids' => [
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getWebsite()->getId()
]
]
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php
index 2c6f6460c8462123a1d05047f4e82e0538ab9369..3aa0026f5a48b70fb1cedb00178029fb80c6f118 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php
@@ -25,7 +25,7 @@ $salesRule->setData(
'stop_rules_processing' => 1,
'website_ids' => [
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getWebsite()->getId()
]
]
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php
index 5310ecab43bc0c8ce7484341e6326b084611aae8..33faa758e8e3030f6138cd9be9970bd0a89a029b 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php
@@ -22,7 +22,7 @@ class GroupTest extends \PHPUnit_Framework_TestCase
public function testSetGetWebsite()
{
$this->assertFalse($this->_model->getWebsite());
- $website = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite();
+ $website = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->getWebsite();
$this->_model->setWebsite($website);
$actualResult = $this->_model->getWebsite();
$this->assertSame($website, $actualResult);
@@ -34,7 +34,7 @@ class GroupTest extends \PHPUnit_Framework_TestCase
public function testGetWebsiteDefault()
{
$this->assertFalse($this->_model->getWebsite());
- $website = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite();
+ $website = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->getWebsite();
$this->_model->setWebsite($website);
// Empty string should get treated like no parameter
$actualResult = $this->_model->getWebsite('');
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
index 961873bc56359bcd8f956de7f5709567733b4cf1..af24b2b206fb178470dab6329e7e8d18dc1c4b9a 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -120,7 +120,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
{
$this->assertFalse($this->model->getWebsite());
$website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getWebsite();
$this->model->setWebsite($website);
$actualResult = $this->model->getWebsite();
@@ -157,14 +157,14 @@ class StoreTest extends \PHPUnit_Framework_TestCase
)->setValue(
\Magento\Store\Model\Store::XML_PATH_USE_REWRITES,
$useRewrites,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
'Magento\Framework\App\Config\MutableScopeConfigInterface'
)->setValue(
\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
$useStoreCode,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$actual = $this->model->getBaseUrl($type);
@@ -244,14 +244,14 @@ class StoreTest extends \PHPUnit_Framework_TestCase
)->setValue(
\Magento\Store\Model\Store::XML_PATH_USE_REWRITES,
false,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
'Magento\Framework\App\Config\MutableScopeConfigInterface'
)->setValue(
\Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
$useStoreCode,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
// emulate custom entry point
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
index a8ee6095554517c9a1eca99b3409b01ee345678e..ac1a841589326b5d4e4761009a931079deb13556 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
@@ -6,10 +6,10 @@
$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Store\Model\Store');
$websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getWebsite()->getId();
$groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getWebsite()->getDefaultGroupId();
$store->setCode(
'fixture_second_store'
@@ -28,5 +28,5 @@ $store->save();
/* Refresh stores memory cache */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
index 3b8ab45122e45b928476e17d84e0be381f5dacf5..b64ede3b8286313ff6b3c2021bfe82849daa7d71 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
@@ -138,7 +138,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
function (\Magento\Framework\View\File $layout) {
$content = simplexml_load_file($layout->getFilename());
$this->assertEmpty(
- $content->xpath(\Magento\Core\Model\Layout\Merge::XPATH_HANDLE_DECLARATION),
+ $content->xpath(\Magento\Framework\View\Model\Layout\Merge::XPATH_HANDLE_DECLARATION),
"Theme layout update '" . $layout->getFilename() . "' contains page type declaration(s)"
);
},
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
index 83e7bf3ed795112bbfbeab40c42c63e454d0da21..4a578a6020c643a7038ac8be538e0efa63e1c4a0 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
@@ -25,7 +25,7 @@ class MethodsTest extends \PHPUnit_Framework_TestCase
'Magento\Framework\View\Element\BlockFactory'
);
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId();
/** @var $model \Magento\Payment\Model\MethodInterface */
if (empty($methodClass)) {
@@ -60,20 +60,20 @@ class MethodsTest extends \PHPUnit_Framework_TestCase
if ($model->canUseInternal()) {
try {
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->setId(
\Magento\Store\Model\Store::DEFAULT_STORE_ID
);
$block->setArea('adminhtml');
$this->assertFileExists($block->getTemplateFile(), $message);
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->setId(
$storeId
);
} catch (\Exception $e) {
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->setId(
$storeId
);
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php
index 520ca3b4682427089802bd76f75085dc56c881c0..5f9ec25ebbcf23d3a3d6d5b6108a0286e1c3e61a 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php
@@ -57,7 +57,7 @@ class BlockInstantiationTest extends \Magento\TestFramework\TestCase\AbstractInt
try {
/** @var $website \Magento\Store\Model\Website */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->setWebsiteId(
0
);
@@ -111,7 +111,7 @@ class BlockInstantiationTest extends \Magento\TestFramework\TestCase\AbstractInt
private function _addBlock($module, $blockClass, $class, $templateBlocks)
{
$area = 'frontend';
- if ($module == 'Magento_Adminhtml' || strpos(
+ if ($module == 'Magento_Backend' || strpos(
$blockClass,
'\\Adminhtml\\'
) || strpos(
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
index e86d024abf5ad43d86634cd7cebaa7c581baa862..2f6b5f00e500d2b38d0ae2087d1f9b6ececb3fda 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
@@ -84,7 +84,7 @@ class LayoutFilesTest extends \PHPUnit_Framework_TestCase
unset($argumentData['updater']);
// Arguments, evaluation of which causes a run-time error, because of unsafe assumptions to the environment
- $typeAttr = \Magento\Core\Model\Layout\Merge::TYPE_ATTRIBUTE;
+ $typeAttr = \Magento\Framework\View\Model\Layout\Merge::TYPE_ATTRIBUTE;
$ignoredArguments = [
[
$typeAttr => 'object',
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
index b5551a59d44eb4f2470a7d60cc1dcb90f0063e06..80d126976c80b21d36d69fbdcd1ed9d70b870d6d 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
@@ -51,7 +51,7 @@ class TemplateFilesTest extends \Magento\TestFramework\TestCase\AbstractIntegrit
try {
/** @var $website \Magento\Store\Model\Website */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->setWebsiteId(
0
);
@@ -68,7 +68,7 @@ class TemplateFilesTest extends \Magento\TestFramework\TestCase\AbstractIntegrit
}
$area = 'frontend';
- if ($module == 'Magento_Adminhtml' || strpos(
+ if ($module == 'Magento_Backend' || strpos(
$blockClass,
'\\Adminhtml\\'
) || strpos(
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e0f91b9e91b53e38d5f4db838bd1ade388a43a5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Test\Tools\I18n\Parser\Adapter\Php\Tokenizer;
+
+use Magento\Framework\ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector;
+
+/**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector
+ */
+class PhraseCollectorTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var PhraseCollector
+ */
+ protected $phraseCollector;
+
+ /**
+ * @var ObjectManager
+ */
+ protected $objectManager;
+
+ protected function setUp()
+ {
+ $this->objectManager = Bootstrap::getObjectManager();
+ $this->phraseCollector = $this->objectManager->create(
+ 'Magento\\Tools\\I18n\\Parser\\Adapter\\Php\\Tokenizer\\PhraseCollector'
+ );
+ }
+
+ /**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector::parse
+ */
+ public function testParse()
+ {
+ $file = __DIR__.'/_files/objectsCode.php.txt';
+ $this->phraseCollector->setIncludeObjects();
+ $this->phraseCollector->parse($file);
+ $expectation = [
+ [
+ 'phrase' => '\'Testing\'',
+ 'arguments' => 0,
+ 'file' => $file,
+ 'line' => 3
+ ],
+ [
+ 'phrase' => '\'More testing\'',
+ 'arguments' => 0,
+ 'file' => $file,
+ 'line' => 4
+ ]
+ ];
+ $this->assertEquals($expectation, $this->phraseCollector->getPhrases());
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d401f7ce7ee767f8875d0014d13c29f330a56c6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Test\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate;
+
+use Magento\Framework\ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate\MethodCollector;
+
+/**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate\MethodCollector
+ */
+class MethodCollectorTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var MethodCollector
+ */
+ protected $methodCollector;
+
+ /**
+ * @var ObjectManager
+ */
+ protected $objectManager;
+
+ protected function setUp()
+ {
+ $this->objectManager = Bootstrap::getObjectManager();
+ $this->methodCollector = $this->objectManager->create(
+ 'Magento\\Tools\\I18n\\Parser\\Adapter\\Php\\Tokenizer\\Translate\\MethodCollector'
+ );
+ }
+
+ /**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate\MethodCollector::parse
+ */
+ public function testParse()
+ {
+ $file = __DIR__.'/../_files/methodsCode.php.txt';
+ $this->methodCollector->parse($file);
+ $expectation = [
+ [
+ 'phrase' => '\'Some string\'',
+ 'arguments' => 0,
+ 'file' => $file,
+ 'line' => 4
+ ],
+ [
+ 'phrase' => '\'One more string\'',
+ 'arguments' => 0,
+ 'file' => $file,
+ 'line' => 5
+ ]
+ ];
+ $this->assertEquals($expectation, $this->methodCollector->getPhrases());
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/methodsCode.php.txt b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/methodsCode.php.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d3b427d0be4c7f0a4bc81339db3a9d29522bea38
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/methodsCode.php.txt
@@ -0,0 +1,5 @@
+<?php
+
+$obj1->___toString('Irrelevant string');
+$obj2->__('Some string');
+$obj3->__('One more string');
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/objectsCode.php.txt b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/objectsCode.php.txt
new file mode 100644
index 0000000000000000000000000000000000000000..72b351197a11a7aec8868c3b7066163cc42c158c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/objectsCode.php.txt
@@ -0,0 +1,5 @@
+<?php
+
+new \Magento\Framework\Phrase('Testing');
+new Phrase('More testing');
+new \Magento\Framework\Object();
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php b/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php
index b9353ea075ea7962851140d6b071b1e039590a3e..c4d4c5bb6b32c66f75e3432f1f9302b4870496ee 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php
@@ -31,7 +31,7 @@ class FooterTest extends \PHPUnit_Framework_TestCase
$context->setValue(Context::CONTEXT_AUTH, false, false);
$block = $objectManager->get('Magento\Framework\View\LayoutInterface')
->createBlock('Magento\Theme\Block\Html\Footer');
- $storeId = $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
+ $storeId = $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
$this->assertEquals(
['PAGE_FOOTER', $storeId, 0, $this->_theme->getId(), null],
$block->getCacheKeyInfo()
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php
index 24b8a4e7b3dc9777fb1ca6324ec5db5b34fee03e..22673156c835359c55bd5f49ec808fa87f53f6ef 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php
@@ -36,7 +36,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
'Magento\Framework\View\DesignInterface'
);
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getDefaultStoreView()->getId();
// fixture design_change
$designChange = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -103,7 +103,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
->create('Magento\Framework\Stdlib\DateTime');
$date = $dateTime->now(true);
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getDefaultStoreView()->getId();
// fixture design_change
@@ -166,7 +166,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
}
$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
$storeCode
);
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
index 44dae02dfb119eedbaf1899f69835da3dd9c6d41..2fe398ded09e7e0de078b09ffbb481f0f927fd22 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -131,7 +131,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
public function testGetConfigurationDesignThemeStore()
{
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getId();
$this->assertEquals('one', $this->_model->getConfigurationDesignTheme());
$this->assertEquals('one', $this->_model->getConfigurationDesignTheme(null, ['store' => $storeId]));
diff --git a/dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php
index bce3e85d2b19e59d9ee9d3eb2c09ffc95a46eb9f..6a3f64a7d928f50577417ef6024195eef986f9e3 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php
@@ -5,7 +5,7 @@
*/
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getDefaultStoreView()->getId();
/** @var $change \Magento\Theme\Model\Design */
$change = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Theme\Model\Design');
diff --git a/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php
index c9de37565586343539988efb96cd32a8b64d67a7..9426331a7c705a5ea82a68291330e26b48947270 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php
@@ -14,7 +14,7 @@ $designChanges = [
];
foreach ($designChanges as $designChangeData) {
$storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
$designChangeData['store']
)->getId();
diff --git a/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php b/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
index 34e234cde3f9d4061ede2e300147bbb30113d441..da9e72ff099061f20a98bfe415fd15f1a5355fa2 100644
--- a/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
+++ b/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
@@ -26,7 +26,7 @@ class InlineParserTest extends \PHPUnit_Framework_TestCase
);
/* Called getConfig as workaround for setConfig bug */
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
$this->_storeId
)->getConfig(
@@ -37,7 +37,7 @@ class InlineParserTest extends \PHPUnit_Framework_TestCase
)->setValue(
'dev/translate_inline/active',
true,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->_storeId
);
}
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
index 2cbcdf0cec9f75318cf0325fbae10bf9bd390cb8..18382c4b69f1ee450254ff283e22e4535c406aeb 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
@@ -105,7 +105,7 @@ class FormTest extends \PHPUnit_Framework_TestCase
// Check that store value set correctly
$defaultStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore(
true
)->getId();
diff --git a/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php b/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php
index 718225e6c1cdc6b7c0cfa4cd34fca78363fca267..45d3cd224403427ab767c82e08e8b68ed74bd4df 100644
--- a/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php
@@ -35,7 +35,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
public function testConstructor()
{
$this->assertNotEmpty($this->_block->getSelectedResources());
- $this->assertContains('Magento_Adminhtml::all', $this->_block->getSelectedResources());
+ $this->assertContains('Magento_Backend::all', $this->_block->getSelectedResources());
}
public function testGetTree()
diff --git a/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php b/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php
index 591ee5153ba50a89ffde140d3318ba97141ab855..e5668373aa5f05cebfeb36d9dd51edfe88ae169d 100644
--- a/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php
+++ b/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php
@@ -16,7 +16,7 @@ $model->setFirstname("John")
->setPassword(\Magento\TestFramework\Bootstrap::ADMIN_PASSWORD)
->setEmail('adminUser@example.com')
->setRoleType('G')
- ->setResourceId('Magento_Adminhtml::all')
+ ->setResourceId('Magento_Backend::all')
->setPrivileges("")
->setAssertId(0)
->setRoleId(1)
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
index eeae74762e0f1292f58278c2c00e056fe3c6350a..23031143f514ce4e4bd4bf800c6d104b7726bf70 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
@@ -9,7 +9,7 @@ namespace Magento\Webapi\Model;
class PathProcessorTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -21,7 +21,7 @@ class PathProcessorTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
- $this->storeManager = $objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface');
$this->pathProcessor = $objectManager->get('Magento\Webapi\Model\PathProcessor');
}
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
index 76adf000633611d5892f78a14e2f3f8f429b8068..5d8bf16ecb1cc223e88d0b0c6d128e2a6a7aa27f 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
@@ -28,7 +28,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Store\Model\Store */
protected $_storeMock;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $_storeManagerMock;
/** @var \Magento\Webapi\Model\Soap\Server\Factory */
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Layout/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
similarity index 75%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Layout/UpdateTest.php
rename to dev/tests/integration/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
index 8ab18f1a86d33084d4f7a8b244389f1adc58fafe..c422c8a6ed262884fde794f4a32e7392bddb8ab6 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Layout/UpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
@@ -3,28 +3,28 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout;
+namespace Magento\Widget\Model\Layout;
class UpdateTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\Update
+ * @var \Magento\Widget\Model\Layout\Update
*/
protected $_model;
protected function setUp()
{
$this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Layout\Update'
+ 'Magento\Widget\Model\Layout\Update'
);
}
public function testConstructor()
{
$this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Layout\Update'
+ 'Magento\Widget\Model\Layout\Update'
);
- $this->assertInstanceOf('Magento\Core\Model\Resource\Layout\Update', $this->_model->getResource());
+ $this->assertInstanceOf('Magento\Widget\Model\Resource\Layout\Update', $this->_model->getResource());
}
/**
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Resource/Layout/UpdateTest.php
similarity index 81%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
rename to dev/tests/integration/testsuite/Magento/Widget/Model/Resource/Layout/UpdateTest.php
index 487a1dd895b053c813ca4207ee624d50a3d8801b..258dd874ce6063ba5db1a8680cd64fa0146ed8f8 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Resource/Layout/UpdateTest.php
@@ -3,24 +3,24 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Layout;
+namespace Magento\Widget\Model\Resource\Layout;
class UpdateTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Resource\Layout\Update
+ * @var \Magento\Widget\Model\Resource\Layout\Update
*/
protected $_resourceModel;
protected function setUp()
{
$this->_resourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Resource\Layout\Update'
+ 'Magento\Widget\Model\Resource\Layout\Update'
);
}
/**
- * @magentoDataFixture Magento/Core/_files/layout_update.php
+ * @magentoDataFixture Magento/Widget/_files/layout_update.php
*/
public function testFetchUpdatesByHandle()
{
@@ -33,7 +33,7 @@ class UpdateTest extends \PHPUnit_Framework_TestCase
'test_handle',
$theme,
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()
);
$this->assertEquals('not_temporary', $result);
@@ -41,7 +41,7 @@ class UpdateTest extends \PHPUnit_Framework_TestCase
/**
* @magentoDataFixture Magento/Backend/controllers/_files/cache/application_cache.php
- * @magentoDataFixture Magento/Core/_files/layout_cache.php
+ * @magentoDataFixture Magento/Widget/_files/layout_cache.php
*/
public function testSaveAfterClearCache()
{
@@ -55,9 +55,9 @@ class UpdateTest extends \PHPUnit_Framework_TestCase
$this->assertNotEmpty($appCache->load('APPLICATION_FIXTURE'));
$this->assertNotEmpty($layoutCache->load('LAYOUT_CACHE_FIXTURE'));
- /** @var $layoutUpdate \Magento\Core\Model\Layout\Update */
+ /** @var $layoutUpdate \Magento\Widget\Model\Layout\Update */
$layoutUpdate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
- 'Magento\Core\Model\Layout\Update'
+ 'Magento\Widget\Model\Layout\Update'
);
$layoutUpdate->setHasDataChanges(true);
$this->_resourceModel->save($layoutUpdate);
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
new file mode 100755
index 0000000000000000000000000000000000000000..e777b48a76c5701414a9ca60d2f2a2903e977375
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Model\Template;
+
+class FilterTest extends \PHPUnit_Framework_TestCase
+{
+ public function testMediaDirective()
+ {
+ $image = 'wysiwyg/VB.png';
+ $construction = ['{{media url="' . $image . '"}}', 'media', ' url="' . $image . '"'];
+ $baseUrl = 'http://localhost/pub/media/';
+
+ /** @var \Magento\Widget\Model\Template\Filter $filter */
+ $filter = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+ 'Magento\Widget\Model\Template\Filter'
+ );
+ $result = $filter->mediaDirective($construction);
+ $this->assertEquals($baseUrl . $image, $result);
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/layout_cache.php b/dev/tests/integration/testsuite/Magento/Widget/_files/layout_cache.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/_files/layout_cache.php
rename to dev/tests/integration/testsuite/Magento/Widget/_files/layout_cache.php
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/layout_update.php b/dev/tests/integration/testsuite/Magento/Widget/_files/layout_update.php
similarity index 78%
rename from dev/tests/integration/testsuite/Magento/Core/_files/layout_update.php
rename to dev/tests/integration/testsuite/Magento/Widget/_files/layout_update.php
index 123dad3d52a08202f6811f19befe52ad2aa607a8..425b1697659a403b920898470a75b4a32d72b894 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/layout_update.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/_files/layout_update.php
@@ -21,8 +21,8 @@ $theme->setThemePath(
\Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL
)->save();
-/** @var $updateNotTemporary \Magento\Core\Model\Layout\Update */
-$updateNotTemporary = $objectManager->create('Magento\Core\Model\Layout\Update');
+/** @var $updateNotTemporary \Magento\Widget\Model\Layout\Update */
+$updateNotTemporary = $objectManager->create('Magento\Widget\Model\Layout\Update');
$updateNotTemporary->setHandle(
'test_handle'
)->setXml(
@@ -33,8 +33,8 @@ $updateNotTemporary->setHandle(
$theme->getId()
)->save();
-/** @var $updateTemporary \Magento\Core\Model\Layout\Update */
-$updateTemporary = $objectManager->create('Magento\Core\Model\Layout\Update');
+/** @var $updateTemporary \Magento\Widget\Model\Layout\Update */
+$updateTemporary = $objectManager->create('Magento\Widget\Model\Layout\Update');
$updateTemporary->setHandle(
'test_handle'
)->setIsTemporary(
diff --git a/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php b/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php
index f467c451e6689ee86b5a1210c3a9c6f8a3bdf04b..84427ea9f19cac5f51ecbae59f41fb997f9b39b6 100644
--- a/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php
+++ b/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php
@@ -15,7 +15,7 @@ $anchorStep = 2;
$nestingLevel = 1;
$parentCategoryId = $defaultParentCategoryId = $this->getObjectManager()->get(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->getStore()->getRootCategoryId();
$nestingPath = "1/{$parentCategoryId}";
$categoryPath = '';
diff --git a/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php b/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php
index fc48c71952496819485ae855fdae9fa48920eecb..e5a666c78a2ca2b3033399367aa09a2c512933a9 100644
--- a/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php
+++ b/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php
@@ -43,7 +43,7 @@ $order->setBaseSubtotal(
\Magento\Sales\Model\Order::STATE_NEW,
true
)->setStoreId(
- $this->getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId()
+ $this->getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId()
);
for ($i = 1; $i <= 100000; $i++) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
index 62d92d5606b107554c0e3d6b6a55a7907adb6c5a..6d91b472c35f5c3c2b09e91480dc9c8c596d62f5 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
@@ -6,6 +6,7 @@
namespace Magento\Test\Integrity\Library;
use Magento\Framework\Test\Utility\Files;
+use Magento\Framework\Test\Utility\AggregateInvoker;
use Magento\TestFramework\Integrity\Library\Injectable;
use Magento\TestFramework\Integrity\Library\PhpParser\ParserFactory;
use Magento\TestFramework\Integrity\Library\PhpParser\Tokens;
@@ -67,6 +68,27 @@ class DependencyTest extends \PHPUnit_Framework_TestCase
);
}
+ public function testAppCodeUsage()
+ {
+ $files = Files::init();
+ $path = $files->getPathToSource();
+ $invoker = new AggregateInvoker($this);
+ $invoker(
+ function ($file) use ($path) {
+ $content = file_get_contents($file);
+ if (strpos($file, $path . '/lib/') === 0) {
+ $this->assertSame(
+ 0,
+ preg_match('~(?<![a-z\\d_:]|->|function\\s)__\\s*\\(~iS', $content),
+ 'Function __() is defined outside of the library and must not be used there. ' .
+ 'Replacement suggestion: new \\Magento\\Framework\\Phrase()'
+ );
+ }
+ },
+ $files->getPhpFiles(false, true, false)
+ );
+ }
+
/**
* @inheritdoc
*/
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt
index 53770b9f92ec4e21101ab98779daa10d8b76a27b..6a8dcbc9a4e7928b8d7f34241885e89eca712292 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt
@@ -78,3 +78,4 @@ lib/internal/Magento/Framework/Url/ScopeResolver.php
lib/internal/Magento/Framework/Url/SecurityInfo.php
lib/internal/Magento/Framework/Url/RouteParamsResolver.php
lib/internal/Magento/Framework/View/Url/Config.php
+lib/internal/Magento/Framework/View/Asset/Config.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
index 07c64e4180cf110dc016c19f05464d35a5643203..366964138a05f3daee1a68a2e48cd703223a60cf 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
@@ -32,7 +32,6 @@ lib/internal/Magento/Framework/RequireJs
lib/internal/Magento/Framework/Search
lib/internal/Magento/Framework/Serialization
lib/internal/Magento/Framework/Simplexml
-lib/internal/Magento/Framework/Store
lib/internal/Magento/Framework/System
lib/internal/Magento/Framework/Test
lib/internal/Magento/Framework/Url
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
index 07767f5c8d8cdd53cc8004618baff9056ea2f832..ce5a5fc429bc4da76eb883b301e0d9fa3ec73c6c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
@@ -4,10 +4,10 @@
* See COPYING.txt for license details.
*/
return [
- 'admin_assert' => 'Magento_Adminhtml',
+ 'admin_assert' => 'Magento_Backend',
'authorization_role' => 'Magento_Authorization',
'authorization_rule' => 'Magento_Authorization',
- 'admin_user' => 'Magento_Adminhtml',
+ 'admin_user' => 'Magento_Backend',
'adminnotification_inbox' => 'Magento_AdminNotification',
'catalog_category_entity_datetime' => 'Magento_Catalog',
'catalog_category_entity_decimal' => 'Magento_Catalog',
@@ -115,8 +115,6 @@ return [
'core_email_template' => 'Magento_Core',
'core_file_storage' => 'Magento_Core',
'core_flag' => 'Magento_Core',
- 'core_layout_link' => 'Magento_Core',
- 'core_layout_update' => 'Magento_Core',
'core_resource' => 'Magento_Core',
'core_variable' => 'Magento_Core',
'core_variable_value' => 'Magento_Core',
@@ -189,6 +187,8 @@ return [
'googleshopping_types' => 'Magento_GoogleShopping',
'importexport_importdata' => 'Magento_ImportExport',
'integration' => 'Magento_Integration',
+ 'layout_link' => 'Magento_Widget',
+ 'layout_update' => 'Magento_Widget',
'log_customer' => 'Magento_Log',
'log_quote' => 'Magento_Log',
'log_summary' => 'Magento_Log',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..46ad16317e8a93b4b8c5fde0846695d0299c4d6d
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Test\Legacy;
+
+/**
+ * Temporary test that will be removed in scope of MAGETWO-28356.
+ * Test verifies obsolete usages in modules that were refactored to work with ResultInterface.
+ */
+class ObsoleteResponseTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var array
+ */
+ protected $obsoleteMethods = [];
+
+ /**
+ * @var array
+ */
+ protected $filesBlackList = [];
+
+ /**
+ * @var string
+ */
+ protected $appPath;
+
+ protected function setUp()
+ {
+ $this->appPath = \Magento\Framework\Test\Utility\Files::init()->getPathToSource();
+ $this->obsoleteMethods = include __DIR__ . '/_files/response/obsolete_response_methods.php';
+ $this->filesBlackList = $this->getBlackList();
+ }
+
+ /**
+ * Test verify that obsolete methods do not appear in refactored folders
+ */
+ public function testObsoleteResponseMethods()
+ {
+ $invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
+ $invoker(
+ function ($file) {
+ $content = file_get_contents($file);
+ foreach ($this->obsoleteMethods as $method) {
+ $quotedMethod = preg_quote($method, '/');
+ $this->assertSame(
+ 0,
+ preg_match('/(?<=[a-z\\d_:]|->|function\\s)' . $quotedMethod . '\\s*\\(/iS', $content),
+ "File: $file\nContains obsolete method: $method . "
+ );
+ }
+ },
+ $this->modulesFilesDataProvider()
+ );
+ }
+
+ /**
+ * Return refactored files
+ *
+ * @return array
+ */
+ public function modulesFilesDataProvider()
+ {
+ $filesList = [];
+
+ foreach ($this->getFilesData('whitelist/refactored_modules*') as $refactoredFolder) {
+ $files = \Magento\Framework\Test\Utility\Files::init()->getFiles(
+ [$this->appPath . $refactoredFolder],
+ '*.php'
+ );
+ $filesList = array_merge($filesList, $files);
+ }
+
+ $result = array_map('realpath', $filesList);
+ $result = array_diff($result, $this->filesBlackList);
+ return \Magento\Framework\Test\Utility\Files::composeDataSets($result);
+ }
+
+ /**
+ * @return array
+ */
+ protected function getBlackList()
+ {
+ $blackListFiles = [];
+ foreach ($this->getFilesData('blacklist/files_list*') as $file) {
+ $blackListFiles[] = realpath($this->appPath . $file);
+ }
+ return $blackListFiles;
+ }
+
+ /**
+ * @param string $filePattern
+ * @return array
+ */
+ protected function getFilesData($filePattern)
+ {
+ $result = [];
+ foreach (glob(__DIR__ . '/_files/response/' . $filePattern) as $file) {
+ $fileData = include $file;
+ $result = array_merge($result, $fileData);
+ }
+ return $result;
+ }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php
index d8aa1f642f774490e354c859e223f1fe4fc406fc..5c2d7500c016fd37ec04aac9a222edca03870079 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php
@@ -14,7 +14,7 @@ class PhtmlTemplateTest extends \PHPUnit_Framework_TestCase
$invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
$invoker(
/**
- * Test usage of methods and variables in template throught $this
+ * Test usage of methods and variables in template through $this
*
* @param string $file
*/
@@ -22,7 +22,7 @@ class PhtmlTemplateTest extends \PHPUnit_Framework_TestCase
$this->assertNotRegExp(
'/this->(?!helper)\S*/iS',
file_get_contents($file),
- 'Access to members and methods of Block class throught $this is ' .
+ 'Access to members and methods of Block class through $this is ' .
'obsolete in phtml templates. Use only $block instead of $this.'
);
},
@@ -56,4 +56,25 @@ class PhtmlTemplateTest extends \PHPUnit_Framework_TestCase
\Magento\Framework\Test\Utility\Files::init()->getPhtmlFiles()
);
}
+
+ public function testObsoleteJavascriptAttributeType()
+ {
+ $invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
+ $invoker(
+ /**
+ * "text/javascript" type attribute in not obligatory to use in templates due to HTML5 standards.
+ * For more details please go to "http://www.w3.org/TR/html5/scripting-1.html".
+ *
+ * @param string $file
+ */
+ function ($file) {
+ $this->assertNotRegexp(
+ '/type="text\/javascript"/',
+ file_get_contents($file),
+ 'Please do not use "text/javascript" type attribute.'
+ );
+ },
+ \Magento\Framework\Test\Utility\Files::init()->getPhtmlFiles()
+ );
+ }
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 6a4f0deb2e3e354ebd9b3c11290811de8afa01ef..8b0bdbd20c1590e885c05bc180e363b27ed21a93 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -823,13 +823,13 @@ return [
['Mage_Core_Model_Session_Abstract_Varien'],
['Mage_Core_Model_Session_Abstract_Zend'],
['Magento\Core\Model\Source\Email\Variables', 'Magento\Email\Model\Source\Variables'],
- ['Magento\Core\Model\Store\ListInterface', 'Magento\Framework\Store\StoreManagerInterface'],
- ['Magento\Core\Model\Store\StorageInterface', 'Magento\Framework\Store\StoreManagerInterface'],
+ ['Magento\Core\Model\Store\ListInterface', 'Magento\Store\Model\StoreManagerInterface'],
+ ['Magento\Core\Model\Store\StorageInterface', 'Magento\Store\Model\StoreManagerInterface'],
['Mage_Core_Model_Store_Group_Limitation'],
['Mage_Core_Model_Store_Limitation'],
['Magento\Core\Model\Variable\Observer'],
['Mage_Core_Model_Website_Limitation'],
- ['Mage_Core_Model_Layout_Data', 'Magento\Core\Model\Layout\Update'],
+ ['Mage_Core_Model_Layout_Data', 'Magento\Widget\Model\Layout\Update'],
['Mage_Core_Model_Theme_Customization_Link'],
['Mage_Customer_Block_Account'],
['Mage_Customer_Block_Account_Navigation'],
@@ -1594,7 +1594,6 @@ return [
['Magento\Core\Model\View\Url\Config', 'Magento\Framework\View\Url\Config'],
['Magento\Core\Model\View\Config', 'Magento\Framework\View\Config'],
['Magento\Core\Model\Image\Factory', 'Magento\Framework\Image\Factory'],
- ['Magento\Store\Model\StoreManagerInterface', 'Magento\Framework\Store\StoreManagerInterface'],
['Magento\Core\Model\Theme\Image', 'Magento\Framework\View\Design\Theme\Image'],
['Magento\Core\Model\Theme\FlyweightFactory', 'Magento\Framework\View\Design\Theme\FlyweightFactory'],
['Magento\Core\Model\Image\AdapterFactory', 'Magento\Framework\Image\AdapterFactory'],
@@ -2227,8 +2226,7 @@ return [
['Magento\Core\Model\Resource\Website', 'Magento\Store\Model\Resource\Website'],
['Magento\Core\Model\Resource\Website\Collection', 'Magento\Store\Model\Resource\Website\Collection'],
['Magento\Core\Model\Resource\Website\Grid\Collection', 'Magento\Store\Model\Resource\Website\Grid\Collection'],
- ['Magento\Core\Model\ScopeInterface', 'Magento\Framework\Store\ScopeInterface'],
- ['Magento\Store\Model\ScopeInterface', 'Magento\Framework\Store\ScopeInterface'],
+ ['Magento\Core\Model\ScopeInterface', 'Magento\Store\Model\ScopeInterface'],
['Magento\Core\Model\Store', 'Magento\Store\Model\Store'],
['Magento\Store\Model\Exception', 'Magento\Framework\Model\Exception, Magento\Framework\App\InitException'],
['Magento\Core\Model\Store\Group', 'Magento\Store\Model\Group'],
@@ -2244,7 +2242,9 @@ return [
['Magento\BaseScopeInterface', 'Magento\Framework\App\ScopeInterface'],
['Magento\BaseScopeResolverInterface', 'Magento\Framework\App\ScopeResolverInterface'],
['Magento\Framework\Locale\ScopeConfigInterface'],
- ['Magento\Framework\StoreManagerInterface', 'Magento\Framework\Store\StoreManagerInterface'],
+ ['Magento\Framework\StoreManagerInterface', 'Magento\Store\Model\StoreManagerInterface'],
+ ['Magento\Framework\Store\StoreManagerInterface', 'Magento\Store\Model\StoreManagerInterface'],
+ ['Magento\Framework\Store\ScopeInterface', 'Magento\Store\Model\ScopeInterface'],
['Magento\Core\Model\Module\Output\Config', 'Magento\Framework\Module\Output\Config'],
['Magento\Core\Model\Resource\Setup\Context', 'Magento\Framework\Module\Setup\Context'],
['Magento\Core\Model\Resource\Setup\Migration', 'Magento\Framework\Module\Setup\Migration'],
@@ -2917,4 +2917,15 @@ return [
['Magento\Core\Block\RequireCookie', 'Magento\Cookie\Block\RequireCookie'],
['Magento\Core\Controller\Index\NoCookies', 'Magento\Cookie\Controller\Index\NoCookies'],
['Magento\Core\Model\Asset\Config', 'Magento\Framework\View\Asset\Config'],
+ ['Magento\Core\Model\Layout\Merge', 'Magento\Framework\View\Model\Layout\Merge'],
+ ['Magento\Core\Model\Layout\Translator', 'Magento\Framework\View\Model\Layout\Translator'],
+ ['Magento\Core\Model\Layout\Update\Validator', 'Magento\Framework\View\Model\Layout\Update\Validator'],
+ ['Magento\Core\Model\PageLayout\Config\Builder', 'Magento\Theme\Model\PageLayout\Config\Builder'],
+ ['Magento\Core\Model\Layout\DepersonalizePlugin', 'Magento\PageCache\Model\Layout\DepersonalizePlugin'],
+ ['Magento\Core\Model\Layout\Link', 'Magento\Widget\Model\Layout\Link'],
+ ['Magento\Core\Model\Layout\Update', 'Magento\Widget\Model\Layout\Update'],
+ ['Magento\Core\Model\Resource\Layout\Link', 'Magento\Widget\Model\Resource\Layout\Link'],
+ ['Magento\Core\Model\Resource\Layout\Link\Collection', 'Magento\Widget\Model\Resource\Layout\Link\Collection'],
+ ['Magento\Core\Model\Resource\Layout\Update', 'Magento\Widget\Model\Resource\Layout\Update'],
+ ['Magento\Core\Model\Resource\Layout\Update\Collection', 'Magento\Widget\Model\Resource\Layout\Update\Collection'],
];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index bcffdfd411409d581a1a4aa7428592ca7e8da5ce..a648097786fb8e93016e61b84a4612753a0eab63 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -115,12 +115,12 @@ return [
['RULE_PERM_ALLOW', '\Magento\Framework\Math\Random'],
['RULE_PERM_DENY', '\Magento\Framework\Math\Random'],
['RULE_PERM_INHERIT', '\Magento\Framework\Math\Random'],
- ['SCOPE_TYPE_GROUP', 'Magento\Core\Model\App', 'Magento\Framework\Store\ScopeInterface::SCOPE_GROUP'],
- ['SCOPE_TYPE_STORE', 'Magento\Core\Model\App', 'Magento\Framework\Store\ScopeInterface::SCOPE_STORE'],
+ ['SCOPE_TYPE_GROUP', 'Magento\Core\Model\App', 'Magento\Store\Model\ScopeInterface::SCOPE_GROUP'],
+ ['SCOPE_TYPE_STORE', 'Magento\Core\Model\App', 'Magento\Store\Model\ScopeInterface::SCOPE_STORE'],
[
'SCOPE_TYPE_WEBSITE',
'Magento\Core\Model\App',
- 'Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE'
+ 'Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE'
],
['SEESION_MAX_COOKIE_LIFETIME'],
['TYPE_BINARY', null, 'Magento_DB_Ddl_Table::TYPE_BLOB'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
old mode 100644
new mode 100755
index 3efaaeaa5e577cfca8236a7b461f5f9384feec2c..07b606d3e7878a3e9052c5e855823c514367319f
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -216,7 +216,7 @@ return [
['addCustomerData', 'Magento\Catalog\Model\Product\Item', 'setCustomerId'],
['addCustomersToAlertQueueAction'],
['addCustomerToSegments'],
- ['addHandle', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['addHandle', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['addItemPriceBlockType'],
['addItemRender', 'Magento\Sales\Block\Adminhtml\Items\AbstractItems'],
['addItemRender', 'Magento\Checkout\Block\Cart\AbstractCart'],
@@ -229,7 +229,7 @@ return [
['addModule', 'Magento\Core\App\Router\Base'],
['addRouter', 'Magento\Framework\App\FrontController'],
['addOptionRenderer', 'Magento\Catalog\Block\Product\View\Options'],
- ['addPageHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['addPageHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['addPagerLimit', 'Magento\Catalog\Block\Product\ProductList\Toolbar'],
['addRegisterLink', 'Magento\Customer\Block\Account\Link'],
['addRenderer', 'Magento\Bundle\Block\Catalog\Product\View\Type\Bundle'],
@@ -241,7 +241,7 @@ return [
['addToAlersAction'],
['addToChildGroup'],
['addToParentGroup', '\Magento\Core\Block\AbstractBlock'],
- ['addUpdate', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['addUpdate', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['addVisibleFilterToCollection', 'Magento\Catalog\Model\Product\Status'],
[
'addVisibleInCatalogFilterToCollection',
@@ -268,9 +268,9 @@ return [
['applyAllDataUpdates', 'Magento\Core\Model\Resource\Setup'],
['applyAllUpdates', 'Magento\Core\Model\Resource\Setup'],
['applyDesign', 'Magento\Catalog\Model\Design'],
- ['asArray', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
- ['asSimplexml', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
- ['asString', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['asArray', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
+ ['asSimplexml', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
+ ['asString', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['authAdmin'],
['authFailed', '', '\Magento\Framework\HTTP\Authentication::setAuthenticationFailed'],
['authFrontend'],
@@ -346,7 +346,7 @@ return [
['exportOrderedExcelAction'],
['fetchItemsCount', 'Magento\Wishlist\Model\Resource\Wishlist'],
['fetchRuleRatesForCustomerTaxClass'],
- ['fetchUpdatesByHandle', 'Magento\Core\Model\Resource\Layout', 'Magento\Core\Model\Resource\Layout\Update'],
+ ['fetchUpdatesByHandle', 'Magento\Core\Model\Resource\Layout', 'Magento\Widget\Model\Resource\Layout\Update'],
['flush', 'Magento\Framework\App\Cache', 'Magento_Cache_FrontendInterface::clean()'],
['flush', 'Magento\Framework\App\Cache\Proxy', 'Magento_Cache_FrontendInterface::clean()'],
['flush', 'Magento\Framework\App\CacheInterface', 'Magento_Cache_FrontendInterface::clean()'],
@@ -407,7 +407,7 @@ return [
['getConfigData', 'Magento\Cms\Model\Wysiwyg\Images\Storage'],
['getConfigDataModel', 'Magento\Core\Model\Config'],
['getConnectionTypeInstance', 'Magento\Framework\App\Resource'],
- ['getContainers', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['getContainers', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['getCurrentUrl', 'Magento\Core\Helper\Url', 'Magento\Framework\Url'],
['getCustomerData', 'Magento\Sales\Block\Adminhtml\Order\Create\Form\Account'],
['getDataForSave', 'Magento\Wishlist\Model\Item'],
@@ -439,11 +439,11 @@ return [
['getExtensionsForCheck'],
['getFacets'],
['getFallbackTheme'],
- ['getFileLayoutUpdatesXml', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['getFileLayoutUpdatesXml', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['getFormated', '', "getFormated(true) -> format('html'), getFormated() -> format('text')"],
['getFormObject', 'Magento\Backend\Block\Widget\Form'],
['getGiftmessageHtml', 'Magento\Sales\Block\Adminhtml\Order\View\Tab\Info'],
- ['getHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['getHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['getHeaderCssClass', 'Magento_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Search'],
['getHeaderText', 'Magento_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Search'],
['getHelperClassName', 'Magento\Core\Model\Config'],
@@ -512,9 +512,9 @@ return [
['getOriginalRequest', 'Magento\Framework\App\Request\Http'],
['getPackage', 'Magento\Widget\Model\Widget\Instance'],
['getPackageTheme', 'Magento\Widget\Model\Widget\Instance', 'getThemeId'],
- ['getPageHandleLabel', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
- ['getPageHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
- ['getPageHandleType', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['getPageHandleLabel', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
+ ['getPageHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
+ ['getPageHandleType', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['getPageTemplateProcessor', 'Magento\Cms\Helper\Data'],
['getBlockTemplateProcessor', 'Magento\Cms\Helper\Data'],
['getPathAsArray', '', 'direct explode by /'],
@@ -709,7 +709,7 @@ return [
['isVerbose', 'Magento\Framework\Shell'],
['isWindowsOs', 'Magento\TestFramework\Helper\Memory'],
['joinTaxClass', 'Magento\Tax\Helper\Data'],
- ['load', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['load', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['loadBaseContents', 'Magento\Email\Model\Template'],
['loadBase', 'Magento\Core\Model\Config'],
['loadByCustomer', 'Magento\Newsletter\Model\Resource\Subscriber', 'loadByCustomerData'],
@@ -746,7 +746,7 @@ return [
['order_success_page_view', 'Magento\GoogleAnalytics\Model\Observer'],
['orderedAction', 'Magento\Backend\Controller\Report\Product'],
['output', 'Magento\Framework\Shell'],
- ['pageHandleExists', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['pageHandleExists', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['parseDateTime', 'Magento\Framework\Stdlib\DateTime\DateTime'],
['postDispatchMyAccountSave'],
['postDispatchSystemImportExportRun'],
@@ -771,7 +771,7 @@ return [
['removeAuthLink', 'Magento\Customer\Block\Account\Link'],
['removeItem', 'Magento\Theme\Block\Html\Head'],
['removeCustomerFromSegments'],
- ['removeHandle', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+ ['removeHandle', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
['removeParentCartLink', 'Magento\Checkout\Block\Links'],
['removeRegisterLink', 'Magento\Customer\Block\Account\Link'],
['renderView', '', 'Magento_Core_Block_Template::_toHtml()'],
@@ -1625,9 +1625,9 @@ return [
'getRatingSummary',
'Magento\Catalog\Model\Product'
],
- ['getCurrentStore', 'Magento\Framework\Store\StoreManagerInterface'],
- ['getAnyStoreView', 'Magento\Framework\Store\StoreManagerInterface'],
- ['throwStoreException', 'Magento\Framework\Store\StoreManagerInterface'],
+ ['getCurrentStore', 'Magento\Store\Model\StoreManagerInterface'],
+ ['getAnyStoreView', 'Magento\Store\Model\StoreManagerInterface'],
+ ['throwStoreException', 'Magento\Store\Model\StoreManagerInterface'],
['getCustomer', 'Magento\ProductAlert\Helper\Data'],
['addCustomerFilter', 'Magento\ProductAlert\Model\Resource\Stock\Collection'],
['addCustomerFilter', 'Magento\ProductAlert\Model\Resource\Price\Collection'],
@@ -2046,4 +2046,7 @@ return [
['_initSendToFriendModel', 'Magento\Sendfriend\Controller\Product'],
['register', 'Magento\Sendfriend\Model\Sendfriend'],
['_getImageHelper', 'Magento\Catalog\Model\Product'],
+ ['renderPage', 'Magento\Cms\Helper\Page'],
+ ['renderPageExtended', 'Magento\Cms\Helper\Page'],
+ ['_renderPage', 'Magento\Cms\Helper\Page'],
];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
old mode 100644
new mode 100755
index 89dcd2f0e9bbb0a65e3a0a24ffa95b62af6346bd..e9c1cb5a8d170c9e984b811579675568974d8cda
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
@@ -368,4 +368,5 @@ return [
['_catalogData', 'Magento\Catalog\Block\Product\AbstractProduct'],
['_env', 'Magento\Rule\Model\Resource\Rule\Collection\AbstractCollection'],
['_catalogImage', 'Magento\Catalog\Model\Product'],
+ ['_view', 'Magento\Cms\Helper\Page'],
];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php
new file mode 100644
index 0000000000000000000000000000000000000000..8102968e13d82e8add9872e278a956a607cd48b1
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary implementation that will be removed in scope of MAGETWO-28356.
+ *
+ * Obsolete methods for controllers
+ */
+return [
+ 'loadLayout',
+ 'renderLayout',
+ '_redirect',
+ '_setActiveMenu',
+ '_addBreadcrumb',
+ '_addContent',
+ '_addLeft',
+ '_addJs',
+ '_moveBlockToContainer',
+];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php
new file mode 100644
index 0000000000000000000000000000000000000000..07dff1f7785dfadc6a4484106d329a7b40e154cc
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary implementation that will be removed in scope of MAGETWO-28356.
+ *
+ * Files that temporary excluded from results
+ */
+return [
+ '/app/code/Magento/Backend/Model/View.php',
+ '/app/code/Magento/Backend/App/AbstractAction.php',
+ '/app/code/Magento/Backend/App/Response/Http/FileFactory.php',
+ '/app/code/Magento/Backend/Block/Widget.php',
+ '/app/code/Magento/Backend/Block/System/Config/Dwstree.php',
+];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/obsolete_response_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/obsolete_response_methods.php
new file mode 100644
index 0000000000000000000000000000000000000000..c3af8f0806516c3c98ba175c8429fb523b877c34
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/obsolete_response_methods.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary implementation that will be removed in scope of MAGETWO-28356.
+ *
+ * Obsolete methods for refactored modules
+ */
+return [
+ 'loadLayout',
+ 'renderLayout',
+ '_redirect',
+ '_forward',
+ '_setActiveMenu',
+ '_addBreadcrumb',
+ '_addContent',
+ '_addLeft',
+ '_addJs',
+ '_moveBlockToContainer',
+];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/whitelist/refactored_modules.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/whitelist/refactored_modules.php
new file mode 100644
index 0000000000000000000000000000000000000000..8605007ce7b9c088439b72451420da633e4634df
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/whitelist/refactored_modules.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary implementation that will be removed in scope of MAGETWO-28356.
+ *
+ * Modules that were refactored and use ResultInterface
+ */
+return [
+ '/app/code/Magento/Catalog',
+ '/app/code/Magento/Backend',
+ '/app/code/Magento/Sales',
+ '/app/code/Magento/Customer',
+];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php
new file mode 100644
index 0000000000000000000000000000000000000000..e75568b7125f0c040e29ebc1c3fa0bc400cad0c9
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary implementation that will be removed in scope of MAGETWO-28356.
+ *
+ * Controllers that were refactored and use ResultInterface
+ */
+return [
+ '/app/code/Magento/Catalog/Controller',
+ '/app/code/Magento/Backend/Controller',
+ '/app/code/Magento/Sales/Controller',
+ '/app/code/Magento/Customer/Controller',
+];
diff --git a/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php b/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
index d2271e2cdcd9efa92db8c33b99ec49e43ffc4dbb..290d926e37e6cb62ec46427ba407b6acd16afeba 100644
--- a/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
+++ b/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
@@ -48,7 +48,7 @@ class BaseurlTest extends \PHPUnit_Framework_TestCase
$this->_configMock = $this->getMock('Magento\Framework\App\Config', [], [], '', false);
$this->_urlBuilderMock = $this->getMock('Magento\Framework\UrlInterface');
- $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$configFactoryMock = $this->getMock(
'Magento\Framework\App\Config\ValueFactory',
['create'],
diff --git a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php
index 12514a57463d9a87f4c1bce74c31abe3feac16e4..f9687b8ef551fac2248e2cec06d0f1d4780a3cde 100644
--- a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php
@@ -66,7 +66,7 @@ class AclRetrieverTest extends \PHPUnit_Framework_TestCase
public function testGetAllowedResourcesByUser()
{
$this->roleMock->expects($this->any())->method('getId')->will($this->returnValue(1));
- $expectedResources = ['Magento_Adminhtml::dashboard', 'Magento_Cms::page'];
+ $expectedResources = ['Magento_Backend::dashboard', 'Magento_Cms::page'];
$this->assertEquals(
$expectedResources,
$this->aclRetriever->getAllowedResourcesByUser(UserContextInterface::USER_TYPE_INTEGRATION, 1)
@@ -115,7 +115,7 @@ class AclRetrieverTest extends \PHPUnit_Framework_TestCase
false
);
$rulesMock1->expects($this->any())->method('getResourceId')->will(
- $this->returnValue('Magento_Adminhtml::dashboard')
+ $this->returnValue('Magento_Backend::dashboard')
);
/** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Authorization\Model\Rules $rulesMock1 */
$rulesMock2 = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php
index 2f2d9d64db6c3840f8530a2cf89a03a78d06a00f..ad2ea32befc80151a61be2a593237211cfb5a01e 100644
--- a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php
@@ -25,7 +25,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_resourceMock = $this->getMock('Magento\Framework\App\Resource', [], [], '', false, false);
- $this->_rootResourceMock = new \Magento\Framework\Acl\RootResource('Magento_Adminhtml::all');
+ $this->_rootResourceMock = new \Magento\Framework\Acl\RootResource('Magento_Backend::all');
$this->_model = new \Magento\Authorization\Model\Acl\Loader\Rule(
$this->_rootResourceMock,
$this->_resourceMock
@@ -48,7 +48,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase
)->will(
$this->returnValue(
[
- ['role_id' => 1, 'resource_id' => 'Magento_Adminhtml::all', 'permission' => 'allow'],
+ ['role_id' => 1, 'resource_id' => 'Magento_Backend::all', 'permission' => 'allow'],
['role_id' => 2, 'resource_id' => 1, 'permission' => 'allow'],
['role_id' => 3, 'resource_id' => 1, 'permission' => 'deny'],
]
@@ -60,7 +60,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase
$aclMock = $this->getMock('Magento\Framework\Acl');
$aclMock->expects($this->any())->method('has')->will($this->returnValue(true));
$aclMock->expects($this->at(1))->method('allow')->with('1', null, null);
- $aclMock->expects($this->at(2))->method('allow')->with('1', 'Magento_Adminhtml::all', null);
+ $aclMock->expects($this->at(2))->method('allow')->with('1', 'Magento_Backend::all', null);
$aclMock->expects($this->at(4))->method('allow')->with('2', 1, null);
$aclMock->expects($this->at(6))->method('deny')->with('3', 1, null);
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
index 3606e9ba1afbb34057d22b36232163fb726b6bf1..46bbce1b13e90ca04d2966eb3c0388a06658248e 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
@@ -49,7 +49,7 @@ class CurrencyTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->_localeMock = $this->getMock('Magento\Framework\Locale\CurrencyInterface');
$this->_requestMock = $this->getMock('Magento\Framework\App\RequestInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..0a7835a0ae3fe0afef74cb798d7ce4d77189c048
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Controller\Adminhtml\Dashboard;
+
+/**
+ * Test for \Magento\Backend\Controller\Adminhtml\Dashboard\RefreshStatistics
+ */
+class RefreshStatisticsTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $resultRedirect;
+
+ /**
+ * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $resultRedirectFactory;
+
+ /**
+ * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $request;
+
+ /**
+ * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $response;
+
+ /**
+ * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $messageManager;
+
+ /**
+ * @var \Magento\Sales\Model\Resource\Report\Order|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $order;
+
+ /**
+ * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $objectManager;
+
+ /**
+ * @var \Magento\Backend\Controller\Adminhtml\Dashboard\RefreshStatistics
+ */
+ protected $refreshStatisticsController;
+
+ /**
+ * @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $context;
+
+ public function setUp()
+ {
+ $reportTypes = [
+ 'sales' => 'Magento\Sales\Model\Resource\Report\Order'
+ ];
+
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->resultRedirectFactory = $this->getMock(
+ 'Magento\Backend\Model\View\Result\RedirectFactory',
+ ['create'],
+ [],
+ '',
+ false
+ );
+ $this->resultRedirect = $this->getMock('Magento\Backend\Model\View\Result\Redirect', [], [], '', false);
+
+ $this->request = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false);
+ $this->response = $this->getMock(
+ 'Magento\Framework\App\ResponseInterface',
+ ['setRedirect', 'sendResponse'],
+ [],
+ '',
+ false
+ );
+
+ $this->messageManager = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
+
+ $this->order = $this->getMock('Magento\Sales\Model\Resource\Report\Order', [], [], '', false);
+
+ $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface', [], [], '', false);
+
+ $this->context = $this->getMock('Magento\Backend\App\Action\Context', [], [], '', false);
+ $this->context->expects($this->once())->method('getRequest')->willReturn($this->request);
+ $this->context->expects($this->once())->method('getResponse')->willReturn($this->response);
+ $this->context->expects($this->once())->method('getMessageManager')->willReturn($this->messageManager);
+ $this->context->expects($this->any())->method('getObjectManager')->willReturn($this->objectManager);
+
+ $this->refreshStatisticsController = $objectManagerHelper->getObject(
+ 'Magento\Backend\Controller\Adminhtml\Dashboard\RefreshStatistics',
+ [
+ 'context' => $this->context,
+ 'resultRedirectFactory' => $this->resultRedirectFactory,
+ 'reportTypes' => $reportTypes
+ ]
+ );
+ }
+
+ public function testExecute()
+ {
+ $path = '*/*';
+
+ $this->resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirect);
+
+ $this->messageManager->expects($this->once())
+ ->method('addSuccess')
+ ->with(__('We updated lifetime statistic.'));
+
+ $this->objectManager->expects($this->any())
+ ->method('create')
+ ->with('Magento\Sales\Model\Resource\Report\Order')
+ ->willReturn($this->order);
+
+ $this->resultRedirect->expects($this->once())
+ ->method('setPath')
+ ->with($path)
+ ->willReturnSelf();
+
+ $this->assertInstanceOf(
+ 'Magento\Backend\Model\View\Result\Redirect',
+ $this->refreshStatisticsController->execute()
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php
index 498149ba64b1a7cf89bad100cdb3f711421c5cf4..4b6a50dcf2fd48d471c69582a89a888a6b18721f 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php
@@ -37,7 +37,7 @@ class ScopeDefinerTest extends \PHPUnit_Framework_TestCase
)->will(
$this->returnValueMap([['website', null, 'someWebsite'], ['store', null, 'someStore']])
);
- $this->assertEquals(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $this->_model->getScope());
+ $this->assertEquals(\Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->_model->getScope());
}
public function testGetScopeReturnsWebsiteScopeIfWebsiteIsSpecified()
@@ -49,6 +49,6 @@ class ScopeDefinerTest extends \PHPUnit_Framework_TestCase
)->will(
$this->returnValueMap([['website', null, 'someWebsite'], ['store', null, null]])
);
- $this->assertEquals(\Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, $this->_model->getScope());
+ $this->assertEquals(\Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, $this->_model->getScope());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php
index cd4b3cacf534e1bb867fb68d470f05fc8af20869..f41efd6524af4d89d12d2aab2bda4cc6aada49fb 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php
@@ -125,11 +125,11 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
],
[
['showInDefault' => 0, 'showInStore' => 1, 'showInWebsite' => 0],
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
],
[
['showInDefault' => 0, 'showInStore' => 0, 'showInWebsite' => 1],
- \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE
+ \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
]
];
}
@@ -154,11 +154,11 @@ class AbstractElementTest extends \PHPUnit_Framework_TestCase
],
[
['showInDefault' => 1, 'showInStore' => 0, 'showInWebsite' => 1],
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
],
[
['showInDefault' => 1, 'showInStore' => 1, 'showInWebsite' => 0],
- \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE
+ \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
]
];
}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php
index 942caa54c5dd0c3e29fd99097835d871dec26c2a..13366a5d68c3fa63a1ab720f5096808d1e6d28e0 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php
@@ -136,7 +136,7 @@ class MapperTest extends \PHPUnit_Framework_TestCase
'getValue'
)->with(
$dependentPath,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
self::STORE_CODE
)->will(
$this->returnValue(self::VALUE_IN_STORE)
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php
index dfb1f51660154973f05253f66eececfd7c3f2b7f..a8973f0050b66d1bc9063bcc277e3efa41a453cb 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php
@@ -85,7 +85,7 @@ class SectionTest extends \PHPUnit_Framework_TestCase
{
$this->_authorizationMock->expects($this->any())->method('isAllowed')->will($this->returnValue(true));
$this->_storeManagerMock->expects($this->once())->method('isSingleStoreMode')->will($this->returnValue(true));
- $this->_model->setData(['resource' => 'Magento_Adminhtml::all'], 'scope');
+ $this->_model->setData(['resource' => 'Magento_Backend::all'], 'scope');
$this->_model->isVisible();
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php
index 305790efadf79692d3f9f5aad257935ef743f903..cf4017fb0e782d3aa28da4ed8e10284c34f0370c 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php
@@ -48,7 +48,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
protected $_dataFactoryMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -112,7 +112,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
false
);
- $this->_storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
$this->_model = new \Magento\Backend\Model\Config(
$this->_appConfigMock,
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/invalidMenuXmlArray.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/invalidMenuXmlArray.php
index 5ce31bbd979eeb99021912577af4a766ec0f5b23..a187bc629dcbbfa39e88ba2aa935604ff9812d67 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/invalidMenuXmlArray.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/invalidMenuXmlArray.php
@@ -209,7 +209,7 @@ return [
'resource="test_Value::value"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'test_Value::value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'test_Value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -220,7 +220,7 @@ return [
'resource="Test_value::value"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'Test_value::value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'Test_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -231,7 +231,7 @@ return [
'resource="M#$%23_value::value"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'M#$%23_value::value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'M#$%23_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -242,7 +242,7 @@ return [
'resource="_value::value"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value '_value::value' is not accepted by " .
- "the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': '_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -253,7 +253,7 @@ return [
'</menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'Magento_::value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'Magento_::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -264,7 +264,7 @@ return [
'resource="Test_Value:value"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'Test_Value:value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'Test_Value:value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -275,7 +275,7 @@ return [
'resource="Test_Value::"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'Test_Value::' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'Test_Value::' " .
"is not a valid value of the atomic type 'typeResource'."
],
@@ -608,7 +608,7 @@ return [
'resource="test_Value::value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'test_Value::value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'test_Value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -618,7 +618,7 @@ return [
'resource="Test_value::value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'Test_value::value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'Test_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -628,7 +628,7 @@ return [
'resource="M#$%23_value::value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'M#$%23_value::value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'M#$%23_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -638,7 +638,7 @@ return [
'resource="_value::value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value '_value::value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': '_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -648,7 +648,7 @@ return [
'resource="Magento_::value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'Magento_::value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'Magento_::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -658,7 +658,7 @@ return [
'resource="Test_Value:value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'Test_Value:value' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'Test_Value:value' is not a valid value of the atomic " .
"type 'typeResource'."
],
@@ -668,7 +668,7 @@ return [
'resource="Test_Value::"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'Test_Value::' is not " .
- "accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
+ "accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'Test_Value::' is not a valid value of the atomic " .
"type 'typeResource'."
],
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/valid_menu.xml b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/valid_menu.xml
index f579f7d1fed2301cfad1a3318d9b7f8c812b5681..a0358a1dfbf89397cdedfcbe63cdad77106f25eb 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/valid_menu.xml
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/valid_menu.xml
@@ -7,7 +7,7 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../app/code/Magento/Backend/etc/menu.xsd">
<menu>
- <add id="Some_TestName::catalog_some_events" title="Events" module="Some_Value" sortOrder="10" parent="Some_Value::test_test" action="action/actions" resource="Some_Value::events" dependsOnModule="Some_Value" dependsOnConfig="catalog/Some_valuet/enabled" toolTip="some tool tip" />
+ <add id="Some_TestName::catalog_some_events" title="Events" module="SomeTest_TestValue" sortOrder="10" parent="SomeTest_TestValue::someTest_testValue" action="action/actions" resource="SomeTest_TestValue::eventsTest_value" dependsOnModule="SomeTest_TestValue" dependsOnConfig="catalog/SomeTest_TestValue/enabled" toolTip="some tool tip" />
<update id="Module_Name::system_config" title="some title" sortOrder="12" action="some_action" resource="Some_Test::events" dependsOnModule="Some_Test" dependsOnConfig="catalog/Some_value/enabled" module="Some_Module" parent="Some_Test::test_value" toolTip="some toolTip" />
<remove id="Some_Adminhtml::system_currency" />
</menu>
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php
index 660a720d13ff30170733b188279df66dcb240b2b..e419e13a938ee476aabe069038535e6b2c9c73af 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php
@@ -29,7 +29,7 @@ class AdminConfigTest extends \PHPUnit_Framework_TestCase
private $objectManager;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
*/
private $storeManagerMock;
@@ -61,7 +61,7 @@ class AdminConfigTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$storeMock->expects($this->once())->method('getBaseUrl')->will($this->returnValue('/'));
- $this->storeManagerMock = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
$this->storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock));
$this->filesystemMock = $this->getMock('\Magento\Framework\Filesystem', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
index 5fa83e855b285cc85df70456e70026f3770a2a7b..ac801cd35c338ef38ae42c970d6bed179b8b6b8e 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
@@ -12,7 +12,7 @@ namespace Magento\Backend\Model\Session;
class QuoteTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -183,7 +183,7 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
false
);
$this->storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
'',
false
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
index 0108acedf986a982f6c413087fe29d9b3f385078..d0383a4eda34eb9709e8a07f341c3a3b8db9ad27 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
@@ -102,7 +102,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
)->method(
'getId'
)->will(
- $this->returnValue('Magento_Adminhtml::system_acl_roles')
+ $this->returnValue('Magento_Backend::system_acl_roles')
);
$mockItem->expects($this->any())->method('getAction')->will($this->returnValue('adminhtml/user_role'));
@@ -111,7 +111,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
)->method(
'get'
)->with(
- $this->equalTo('Magento_Adminhtml::system_acl_roles')
+ $this->equalTo('Magento_Backend::system_acl_roles')
)->will(
$this->returnValue($mockItem)
);
@@ -132,7 +132,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
)->with(
\Magento\Backend\Model\Url::XML_PATH_STARTUP_MENU_ITEM
)->will(
- $this->returnValue('Magento_Adminhtml::system_acl_roles')
+ $this->returnValue('Magento_Backend::system_acl_roles')
);
$this->_coreDataMock = $this->getMock('Magento\Core\Helper\Data', ['getHash'], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml b/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml
index f89c58f0dffdd7fd40b055a7170051007f25a4db..d5f11c7fb1a4c101e8ca162e2be03f657100df89 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml
@@ -8,11 +8,11 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
<acl>
<resources>
- <resource id="Magento_Adminhtml::all" title="Allow everything" />
- <resource id="Magento_Adminhtml::admin" title="Magento Admin">
- <resource id="Magento_Adminhtml::dashboard" title="Dashboard" sortOrder="0" />
- <resource id="Magento_Adminhtml::system" title="System" sortOrder="90">
- <resource id="Magento_Adminhtml::store" title="Manage Stores" />
+ <resource id="Magento_Backend::all" title="Allow everything" />
+ <resource id="Magento_Backend::admin" title="Magento Admin">
+ <resource id="Magento_Backend::dashboard" title="Dashboard" sortOrder="0" />
+ <resource id="Magento_Backend::system" title="System" sortOrder="90">
+ <resource id="Magento_Backend::store" title="Manage Stores" />
</resource>
</resource>
</resources>
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
index 9d1f3e7b650ecbb6cb9d207ebc6085b8ed58219d..723814408cadc4b7889116c6403c9e6e4aa2557a 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
@@ -69,7 +69,7 @@ class LinkManagementTest extends \PHPUnit_Framework_TestCase
protected $optionCollectionFactoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Store\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -141,7 +141,7 @@ class LinkManagementTest extends \PHPUnit_Framework_TestCase
$this->optionCollectionFactoryMock = $this->getMock(
'\Magento\Bundle\Model\Resource\Option\CollectionFactory', ['create'], [], '', false
);
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
$this->model = $helper->getObject(
'\Magento\Bundle\Model\LinkManagement',
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
index 093571a535ee5703967934556eb649da0140f71b..7bff3de04713e455b38ba66d0e10c9d2f4fa8a11 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
@@ -84,7 +84,7 @@ class OptionRepositoryTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->linkManagementMock = $this->getMock('\Magento\Bundle\Api\ProductLinkManagementInterface');
$this->optionListMock = $this->getMock('\Magento\Bundle\Model\Product\OptionList', [], [], '', false);
$this->linkListMock = $this->getMock('\Magento\Bundle\Model\Product\LinksList', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php
index a27774900aa33bdb339db0a239a7692a00fb470c..a5362ac9be5e6022d77b13f438af3de9688c3f2e 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php
@@ -74,7 +74,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
{
$existValue = 1;
- $this->assertInternalType('string', $this->model->getOptionText($existValue));
+ $this->assertInstanceOf('Magento\Framework\Phrase', $this->model->getOptionText($existValue));
}
/**
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php
index c82c12bb55c902c6244590ffef8aeb720d0c23ec..96b005e33439ea8c4505c84a19f265b0baa54a73 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php
@@ -39,7 +39,7 @@ class CatalogPriceTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->commonPriceMock = $this->getMock(
'Magento\Catalog\Model\Product\CatalogPrice',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php
index 01b99cd72d0a7c8a7b628ed5ddea23eeebde1490..656aafc5baf03c7271af5fb455ae7c616d8b75f6 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php
@@ -66,7 +66,7 @@ class PriceTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->localeDateMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
$this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
$this->eventManagerMock = $this->getMock('\Magento\Framework\Event\ManagerInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php
index c915ace0f5c2e8f94030f8a1c5a4ec1998cf60b3..11bcf428e513ef9650e0340051fe34e34be8cb61 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php
@@ -32,7 +32,7 @@ class TypeTest extends \PHPUnit_Framework_TestCase
protected $catalogData;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -70,7 +70,7 @@ class TypeTest extends \PHPUnit_Framework_TestCase
$this->catalogData = $this->getMockBuilder('Magento\Catalog\Helper\Data')
->disableOriginalConstructor()
->getMock();
- $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->bundleOptionFactory = $this->getMockBuilder('Magento\Bundle\Model\OptionFactory')
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
index 4662e60bb7ab2b5d6ebc747643a40c2c02f20328..0e4c592978aa52d3fd0f136fa35fee453eeddfcc 100644
--- a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
@@ -84,7 +84,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
'getValue'
)->with(
'customer/captcha/enable',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue('1')
);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
index c5071cc170d54d290a9a9d21997974f263f4b8ee..067a798dec8dc8a001a76435698acf630677bdae 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
@@ -69,7 +69,7 @@ class AbstractCategoryTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
index d2a0f1b8747f7779f86bad5cec35ccdf25f891fa..e2a0f4918ffb92a8ace57fc35681e690338743d4 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
@@ -40,13 +40,13 @@ class AlertsTest extends \PHPUnit_Framework_TestCase
$valueMap = [
[
'catalog/productalert/allow_price',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
$priceAllow,
],
[
'catalog/productalert/allow_stock',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
$stockAllow
],
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
index bef24530adc9063f6fa10a5df1ebdbc7c43c2d95..800477edfff34d56f6d81c432d08e46ab747eda5 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
@@ -46,7 +46,7 @@ class InventoryTest extends \PHPUnit_Framework_TestCase
protected $contextMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -112,7 +112,7 @@ class InventoryTest extends \PHPUnit_Framework_TestCase
false
);
$this->storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
'',
false
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php
index 36f76a7b3c41f1e0ff37c9183d19e1c5c7a3decc..9058281e07d078bc2833ac1556eb7d7361df04c7 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php
@@ -34,7 +34,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
protected $scopeConfigInterface;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerInterface;
@@ -47,7 +47,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
{
$this->urlBuilderInterface = $this->getMock('Magento\Framework\App\Rss\UrlBuilderInterface');
$this->scopeConfigInterface = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->registry = $this->getMock('Magento\Framework\Registry');
$this->objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php
index 1bfe887439116d2dba395769e1938176166690a3..6032a4afbffabe32b8a0258890ad5f80f0d99e36 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php
@@ -54,7 +54,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
protected $customerSession;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -105,7 +105,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
$this->imageHelper = $this->getMock('Magento\Catalog\Helper\Image', [], [], '', false);
$this->customerSession = $this->getMock('Magento\Customer\Model\Session', ['getId'], [], '', false);
$this->customerSession->expects($this->any())->method('getId')->will($this->returnValue(1));
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$store = $this->getMockBuilder('\Magento\Store\Model\Store')
->setMethods(['getId', '__wakeup'])->disableOriginalConstructor()->getMock();
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
@@ -194,7 +194,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
public function testIsAllowed()
{
$this->scopeConfig->expects($this->once())->method('isSetFlag')
- ->with('rss/catalog/category', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('rss/catalog/category', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertEquals(true, $this->block->isAllowed());
}
@@ -202,7 +202,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
public function testGetFeeds()
{
$this->scopeConfig->expects($this->once())->method('isSetFlag')
- ->with('rss/catalog/category', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('rss/catalog/category', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$category = $this->getMockBuilder('\Magento\Catalog\Model\Category')
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php
index 23ddf2db094e1f7e3c287a40adc5ebdf0f05584b..5ab728554a13e558d0792b4a89da9e104403fd26 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php
@@ -44,7 +44,7 @@ class NewProductsTest extends \PHPUnit_Framework_TestCase
protected $rssUrlBuilder;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php
index b497f057e72ca24835f7f8bec06117453760e933..49707aaca9b3351b1c52a7bcb149033bc5f3d361 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php
@@ -54,7 +54,7 @@ class SpecialTest extends \PHPUnit_Framework_TestCase
protected $rssUrlBuilder;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -95,7 +95,7 @@ class SpecialTest extends \PHPUnit_Framework_TestCase
$this->rssModel = $this->getMock('Magento\Catalog\Model\Rss\Product\Special', [], [], '', false);
$this->rssUrlBuilder = $this->getMock('Magento\Framework\App\Rss\UrlBuilderInterface');
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$store = $this->getMockBuilder('\Magento\Store\Model\Store')
->setMethods(['getId', 'getFrontendName', '__wakeup'])->disableOriginalConstructor()->getMock();
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
@@ -209,7 +209,7 @@ class SpecialTest extends \PHPUnit_Framework_TestCase
public function testIsAllowed()
{
$this->scopeConfig->expects($this->once())->method('isSetFlag')
- ->with('rss/catalog/special', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('rss/catalog/special', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertEquals(true, $this->block->isAllowed());
}
@@ -222,7 +222,7 @@ class SpecialTest extends \PHPUnit_Framework_TestCase
public function testGetFeeds()
{
$this->scopeConfig->expects($this->once())->method('isSetFlag')
- ->with('rss/catalog/special', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('rss/catalog/special', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->rssUrlBuilder->expects($this->once())->method('getUrl')
->with(['type' => 'special_products'])
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php
index 6cf427a930bf04e47c945e7b8c71a61e66d57b2c..3028f4a437b9d69dedadf43eabbcf74c7f98d8d7 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php
@@ -12,7 +12,7 @@ use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
class LinkTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
*/
protected $storeManager;
@@ -33,7 +33,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->urlFinder = $this->getMock('Magento\UrlRewrite\Model\UrlFinderInterface');
$context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
index 473b20cc9f0a5b9198edff4c3138035c10bab895..9e484f562bb08123cadec8eddd78dd23d956beaf 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
@@ -328,11 +328,11 @@ class SaveTest extends \PHPUnit_Framework_TestCase
false
);
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
* |\PHPUnit_Framework_MockObject_MockObject $storeManagerMock
*/
$storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
'',
false,
@@ -408,7 +408,7 @@ class SaveTest extends \PHPUnit_Framework_TestCase
['Magento\Backend\Model\Auth\Session', $sessionMock],
['Magento\Framework\Registry', $registryMock],
['Magento\Cms\Model\Wysiwyg\Config', $wysiwygConfigMock],
- ['Magento\Framework\Store\StoreManagerInterface', $storeManagerMock],
+ ['Magento\Store\Model\StoreManagerInterface', $storeManagerMock],
]
)
);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php
index 13653fcab211b966830e17e652903415833a0c0a..3278dbc452c726be889f50d7311df0e8aa287b5d 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php
@@ -42,7 +42,7 @@ class CategoriesJsonTest extends \PHPUnit_Framework_TestCase
protected $chooserBlockMock;
/**
- * @var \Magento\Core\Model\Layout|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject
*/
protected $layoutMock;
@@ -95,7 +95,7 @@ class CategoriesJsonTest extends \PHPUnit_Framework_TestCase
->method('create')
->willReturn($this->resultJson);
- $this->layoutMock = $this->getMock('Magento\Core\Model\Layout', ['createBlock'], [], '', false);
+ $this->layoutMock = $this->getMock('Magento\Framework\View\Layout', ['createBlock'], [], '', false);
$layoutFactory = $this->getMockBuilder('Magento\Framework\View\LayoutFactory')
->disableOriginalConstructor()
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php
index e8fbd0e48984574c4777584a8d6b3e17207ee017..513ea409282e6d4bc6c58a34e707f080941bbbb2 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php
@@ -37,7 +37,7 @@ class ChooserTest extends \PHPUnit_Framework_TestCase
protected $chooserBlockMock;
/**
- * @var \Magento\Core\Model\Layout|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject
*/
protected $layoutMock;
@@ -90,7 +90,7 @@ class ChooserTest extends \PHPUnit_Framework_TestCase
->method('create')
->willReturn($this->resultRaw);
- $this->layoutMock = $this->getMock('Magento\Core\Model\Layout', ['createBlock'], [], '', false);
+ $this->layoutMock = $this->getMock('Magento\Framework\View\Layout', ['createBlock'], [], '', false);
$layoutFactory = $this->getMockBuilder('Magento\Framework\View\LayoutFactory')
->disableOriginalConstructor()
->setMethods(['create'])
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php
index 8d0497c35212890645c374d9e0d28e931d408abd..0eb89b9f1735de8f2e3c84ae6277c1166726a904 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -63,7 +63,7 @@ class HelperTest extends \PHPUnit_Framework_TestCase
$this->jsHelperMock = $this->getMock('Magento\Backend\Helper\Js', [], [], '', false);
$this->storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->websiteMock = $this->getMock('Magento\Store\Model\Website', [], [], '', false);
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->stockFilterMock = $this->getMock(
'Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php
index d5872fa7459dc11b500cf7d7ca31b7f4aa42cf21..5cedb13bbfb0b9c040b5539ebd9e621174875786 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php
@@ -75,7 +75,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
protected $store;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -156,7 +156,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
$this->categoryRepository = $this->getMock('Magento\Catalog\Api\CategoryRepositoryInterface');
$this->store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
$this->catalogDesign = $this->getMock('Magento\Catalog\Model\Design', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
index 3152e59ba513434a29f949a790041630ccdc0595..4fbc2520073e6ae996e19915e3867e0054b62aa2 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
@@ -41,7 +41,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
protected $catalogSession;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerMock;
/** @var \Magento\Core\App\Action\FormKeyValidator|\PHPUnit_Framework_MockObject_MockObject */
@@ -94,7 +94,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
$this->visitorMock = $this->getMock('Magento\Customer\Model\Visitor', [], [], '', false);
$this->listCompareMock = $this->getMock('Magento\Catalog\Model\Product\Compare\ListCompare', [], [], '', false);
$this->catalogSession = $this->getMock('Magento\Catalog\Model\Session', ['setBeforeCompareUrl'], [], '', false);
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->formKeyValidatorMock = $this->getMock('Magento\Core\App\Action\FormKeyValidator', [], [], '', false);
$this->redirectFactoryMock = $this->getMock(
'Magento\Framework\Controller\Result\RedirectFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php
index 35d41e0f46b2bca0f898d68d9be155a1753fe214..97cf8bd59a454474ff873d725ef6cf9872718a10 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php
@@ -11,7 +11,7 @@ namespace Magento\Catalog\Helper\Product\Edit\Action;
class AttributeTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -30,7 +30,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
'',
false
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php
index 4cb9c96a4d73a3a20ccb96e5da3f7ab087bfd6f1..853094b5a1940bc0ac8bd0f789647aca551362f2 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php
@@ -18,7 +18,7 @@ class IndexerTest extends \PHPUnit_Framework_TestCase
protected $_model;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_storeManagerMock;
@@ -73,7 +73,7 @@ class IndexerTest extends \PHPUnit_Framework_TestCase
$eavFactoryMock = $this->getMock('Magento\Eav\Model\Entity\AttributeFactory', [], [], '', false);
- $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->_connectionMock = $this->getMock(
'Magento\Framework\DB\Adapter\Pdo\Mysql',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
index d81f994ac651139f5d067f2d1fbecabf0980858b..40a76c01be56413c331c627961741d4e476d6f3e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
@@ -67,11 +67,11 @@ class CustomlayoutupdateTest extends \PHPUnit_Framework_TestCase
}
/**
- * @return \Magento\Core\Model\Layout\Update\ValidatorFactory
+ * @return \Magento\Framework\View\Model\Layout\Update\ValidatorFactory
*/
private function getMockedLayoutUpdateValidatorFactory()
{
- $mockBuilder = $this->getMockBuilder('\Magento\Core\Model\Layout\Update\ValidatorFactory');
+ $mockBuilder = $this->getMockBuilder('\Magento\Framework\View\Model\Layout\Update\ValidatorFactory');
$mockBuilder->disableOriginalConstructor();
$mockBuilder->setMethods(['create']);
$mock = $mockBuilder->getMock();
@@ -84,11 +84,11 @@ class CustomlayoutupdateTest extends \PHPUnit_Framework_TestCase
}
/**
- * @return \Magento\Core\Model\Layout\Update\Validator
+ * @return \Magento\Framework\View\Model\Layout\Update\Validator
*/
private function getMockedValidator()
{
- $mockBuilder = $this->getMockBuilder('\Magento\Core\Model\Layout\Update\Validator');
+ $mockBuilder = $this->getMockBuilder('\Magento\Framework\View\Model\Layout\Update\Validator');
$mockBuilder->disableOriginalConstructor();
$mock = $mockBuilder->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Source/LayoutTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Source/LayoutTest.php
index ead7edbde897fec521f4b0a31a053e44750876c6..8965116af3ff8e9a96352f379ff60ad7c9c83930 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Source/LayoutTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Source/LayoutTest.php
@@ -34,7 +34,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
}
/**
- * @return \Magento\Core\Model\PageLayout\Config\Builder
+ * @return \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
*/
private function getMockedPageLayoutBuilder()
{
@@ -45,9 +45,9 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
->method('toOptionArray')
->will($this->returnValue($this->testArray));
- $mockPageLayoutBuilder = $this->getMockBuilder('Magento\Core\Model\PageLayout\Config\Builder')
- ->disableOriginalConstructor()
- ->getMock();
+ $mockPageLayoutBuilder = $this->getMockBuilder(
+ 'Magento\Framework\View\Model\PageLayout\Config\BuilderInterface'
+ )->disableOriginalConstructor()->getMock();
$mockPageLayoutBuilder->expects($this->once())
->method('getPageLayoutsConfig')
->will($this->returnValue($mockPageLayoutConfig));
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
index 07dbf1a28ec7efcc77426eb929e946a68145a0cf..8b38af7d56cf11789780bb23e96598f7e90ec2cf 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
@@ -16,7 +16,7 @@ class TreeTest extends \PHPUnit_Framework_TestCase
protected $categoryTreeMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Store\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -60,7 +60,7 @@ class TreeTest extends \PHPUnit_Framework_TestCase
->getMock();
$this->storeManagerMock = $this->getMockBuilder(
- '\Magento\Framework\Store\StoreManagerInterface'
+ '\Magento\Store\Model\StoreManagerInterface'
)->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
index 615c06b20bb097616ae4e2d6308a39682ad03c15..f6f9d8fa22d6a0c2c2b62b5090c89dc13b4edbd0 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
@@ -49,7 +49,7 @@ class CategoryRepositoryTest extends \PHPUnit_Framework_TestCase
false
);
$this->categoryResourceMock = $this->getMock('\Magento\Catalog\Model\Resource\Category', [], [], '', false);
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->model = new \Magento\Catalog\Model\CategoryRepository(
$this->categoryFactoryMock,
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
index 5bb59398af2198c2a9366ab1e2d71a9e18ac73da..5967ad9f59abdd2883c876a80284c031f6656a66 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -29,7 +29,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */
protected $registry;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Catalog\Model\Resource\Category\Tree|\PHPUnit_Framework_MockObject_MockObject */
@@ -95,7 +95,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue($this->cacheManager));
$this->registry = $this->getMock('Magento\Framework\Registry');
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->categoryTreeResource = $this->getMock('Magento\Catalog\Model\Resource\Category\Tree', [], [], '', false);
$this->categoryTreeFactory = $this->getMock(
'Magento\Catalog\Model\Resource\Category\TreeFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
index 00b5c4639d7c51efe7d0a970f176248b65607349..a18df7aeb95faa83cb08a8178b630d218c3776a5 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
@@ -222,7 +222,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$attribute->expects($this->any())->method('getStoreLabel')->will($this->returnValue($storeLabel));
$attribute->expects($this->any())->method('getAttributeCode')->will($this->returnValue($attributeCode));
- $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$store = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$store->expects($this->any())->method('getId')->will($this->returnValue($storeId));
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
index 8cc520a832084cc2ae5384f1cbf0fd2e8262db6e..c666bd8fe562aea22d4df06cc205bb1497bea873 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
@@ -47,7 +47,7 @@ class EraserTest extends \PHPUnit_Framework_TestCase
[2, 'store_2_flat'],
]));
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->model = new \Magento\Catalog\Model\Indexer\Product\Flat\Action\Eraser(
$resource,
$this->indexerHelper,
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
index c61db945fa33c9f43922d628eaec150e4fbb3758..70146267648875adab1acefe84c4b871c907e9c5 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -66,7 +66,7 @@ class RowTest extends \PHPUnit_Framework_TestCase
$this->resource->expects($this->any())->method('getConnection')
->with('default')
->will($this->returnValue($this->connection));
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->store->expects($this->any())->method('getId')->will($this->returnValue('store_id_1'));
$this->storeManager->expects($this->any())->method('getStores')->will($this->returnValue([$this->store]));
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
index 8ac88371f39e671e4123a97c8da09985a428b324..0789115e201847cc1ea7cb953f864047e81aafad 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
@@ -66,7 +66,7 @@ class RowsTest extends \PHPUnit_Framework_TestCase
$this->_resource->expects($this->any())->method('getConnection')
->with('default')
->will($this->returnValue($this->_connection));
- $this->_storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->_store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->_store->expects($this->any())->method('getId')->will($this->returnValue('store_id_1'));
$this->_storeManager->expects($this->any())->method('getStores')->will(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php
index 0615e954a4e09dbc0f613d4fb8f6ef58ee36959d..1373adaf475bb2e3ba65d755e2110aaf516a8e59 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php
@@ -18,7 +18,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
protected $_model;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_storeManagerMock;
@@ -52,7 +52,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->_storeManagerMock = $this->getMock(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php
index d775de563f8647c19342e2eed32ef1e5cb41d9b5..e3418ae001718992da7cc15b774ad834c9d45c1c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php
@@ -42,7 +42,7 @@ class PriceScopeTest extends \PHPUnit_Framework_TestCase
$contextMock = $this->getMock('Magento\Framework\Model\Context', [], [], '', false);
$registryMock = $this->getMock('Magento\Framework\Registry', [], [], '', false);
- $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+ $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
$configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
index 893d39009226f747f468bf6e206025ff8042a846..dae378983bc9369da81837fd2e629605034e1494 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
@@ -21,7 +21,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
protected $collectionFactoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -36,7 +36,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
'\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory', ['create'], [], '', false);
$this->storeManagerMock = $this->getMock(
- '\Magento\Framework\Store\StoreManagerInterface', [], [], '', false
+ '\Magento\Store\Model\StoreManagerInterface', [], [], '', false
);
$this->layerMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php
index b57c96109df0492a1479b97a090ae6f288911a2e..4dc836c0be5bb06b38e8a45882f96e07179b7176 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php
@@ -25,7 +25,7 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
$this->model = new StateKey($this->storeManagerMock, $this->customerSessionMock);
}
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
index dd7cc714be674732247b21891eb9cd527da491c6..74725687834c145cdc0e3676272f0eed0a8d3364 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
@@ -40,7 +40,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Catalog\Model\Layer\Filter\ItemFactory|MockObject */
private $filterItemFactory;
- /** @var \Magento\Framework\Store\StoreManagerInterface|MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|MockObject */
private $storeManager;
/** @var \Magento\Catalog\Model\Layer|MockObject */
@@ -60,8 +60,8 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
->setMethods(['create'])
->getMock();
- /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
- $this->storeManager = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
+ /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+ $this->storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->setMethods([])
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
index 27a78d73f12ef5febc8c1ee9427a71362b293dad..500dd8dd0415111be4b1efa18a7c20bb01216efc 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
@@ -199,23 +199,23 @@ class PriceTest extends \PHPUnit_Framework_TestCase
{
return [
Price::XML_PATH_RANGE_CALCULATION => [
- 'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ 'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
'value' => 111,
],
Price::XML_PATH_RANGE_STEP => [
- 'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ 'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
'value' => 222,
],
Price::XML_PATH_ONE_PRICE_INTERVAL => [
- 'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ 'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
'value' => 333,
],
Price::XML_PATH_INTERVAL_DIVISION_LIMIT => [
- 'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ 'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
'value' => 444,
],
Price::XML_PATH_RANGE_MAX_INTERVALS => [
- 'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ 'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
'value' => 555,
],
];
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php
index 4c1cba95e7409070bb0dccf12f0ed2b2eb067e40..8b527c450c5292467839101042e8a10f6d233360 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php
@@ -36,7 +36,7 @@ class CollectionFilterTest extends \PHPUnit_Framework_TestCase
$this->visibilityMock = $this->getMock('Magento\Catalog\Model\Product\Visibility', [], [], '', false);
$this->catalogConfigMock = $this->getMock('\Magento\Catalog\Model\Config', [], [], '', false);
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->model = $objectManager->getObject(
'Magento\Catalog\Model\Layer\Search\CollectionFilter',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
index f1cbd1b6e995cb251ecbd144abf65f233a43f66e..2afb8894af13f6b52dcbd0cb8086abf1e88498d1 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
@@ -21,7 +21,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
protected $collectionFactoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -36,7 +36,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
'\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory', ['create'], [], '', false);
$this->storeManagerMock = $this->getMock(
- '\Magento\Framework\Store\StoreManagerInterface', [], [], '', false
+ '\Magento\Store\Model\StoreManagerInterface', [], [], '', false
);
$this->layerMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php
index 2c2cfc3367298ec69e5230f7aa99d416ead83921..fec85625a7bdf5aa8d8c40ed2e5c77be86afb205 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php
@@ -32,7 +32,7 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
$this->queryFactoryMock = $this->getMock(
'\Magento\Search\Model\QueryFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
index ed1218a621e26b5ed5e4b2bf9d2e71d23b33237a..10a9fad9e999486018759af27d1f192ed99e2795 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
@@ -30,7 +30,7 @@ class LayerTest extends \PHPUnit_Framework_TestCase
private $registry;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
private $storeManager;
@@ -113,7 +113,7 @@ class LayerTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMockForAbstractClass();
- $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->setMethods(['getStore'])
->disableOriginalConstructor()
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php
index ec274d371280d15230c09916137bbee9e53e6497..5228841640a9143317defef911a9f654ba837992 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php
@@ -36,7 +36,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
protected $_categoryFlatState;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -58,7 +58,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
false
);
- $this->_storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->_storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
index 74ad52b9b7c10ef2739e48d1f477bcb03d6fc4fe..67f5e0b62d3e4b4b810c88e0d359d2533593db47 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
@@ -25,7 +25,7 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
$this->_helper->expects($this->any())->method('isPriceGlobal')->will($this->returnValue(true));
$currencyFactoryMock = $this->getMock('Magento\Directory\Model\CurrencyFactory', [], [], '', false);
- $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+ $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
$productTypeMock = $this->getMock('Magento\Catalog\Model\Product\Type', [], [], '', false);
$configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$groupManagement = $this->getMock('Magento\Customer\Api\GroupManagementInterface', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php
index a05773d718f3906f6ccf8a4676d3e9142c097fad..e63adaac7399732e4efd8394a3bbebf1560a31c5 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php
@@ -50,13 +50,13 @@ class ImageTest extends \PHPUnit_Framework_TestCase
}
/**
- * @return \Magento\Framework\Store\StoreManagerInterface
+ * @return \Magento\Store\Model\StoreManagerInterface
*/
private function getMockedStoreManager()
{
$mockedStore = $this->getMockedStore();
- $mockBuilder = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface');
+ $mockBuilder = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface');
$mock = $mockBuilder->setMethods(['getStore'])
->disableOriginalConstructor()
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php
index 0439a06ca072f57d465034ec8a570661159e7824..fd6081a924b9bf9edb1f1fac5d4f321d951b5c0f 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php
@@ -8,7 +8,7 @@ namespace Magento\Catalog\Model\Product\Attribute\Source;
class CountryofmanufactureTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -29,7 +29,7 @@ class CountryofmanufactureTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
$this->cacheConfig = $this->getMock('\Magento\Framework\App\Cache\Type\Config', [], [], '', false);
$this->objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/LayoutTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/LayoutTest.php
index 3295f59e5ea5db105e1f996bf09cf96389d88c87..fdcc3ba53d9cc765a5d073fa916e9f44324fc4af 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/LayoutTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/LayoutTest.php
@@ -16,14 +16,15 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
/** @var ObjectManagerHelper */
protected $objectManagerHelper;
- /** @var \Magento\Core\Model\PageLayout\Config\Builder|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
+ * |\PHPUnit_Framework_MockObject_MockObject */
protected $pageLayoutBuilder;
protected function setUp()
{
- $this->pageLayoutBuilder = $this->getMockBuilder('Magento\Core\Model\PageLayout\Config\Builder')
- ->disableOriginalConstructor()
- ->getMock();
+ $this->pageLayoutBuilder = $this->getMockBuilder(
+ 'Magento\Framework\View\Model\PageLayout\Config\BuilderInterface'
+ )->disableOriginalConstructor()->getMock();
$this->objectManagerHelper = new ObjectManagerHelper($this);
$this->layoutModel = $this->objectManagerHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php
index 3a37b1a9e63f38d1e8703a788f060b0efff1a79e..7acab9fb41df663362bef19f844210d98b0eec2d 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php
@@ -65,7 +65,7 @@ class GalleryManagementTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->productRepositoryMock = $this->getMock('\Magento\Catalog\Api\ProductRepositoryInterface');
$this->attributeRepositoryMock = $this->getMock('\Magento\Catalog\Api\ProductAttributeRepositoryInterface');
$this->mediaConfigMock = $this->getMock('\Magento\Catalog\Model\Product\Media\Config', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php
index 85843f457590b28027c2321a54a60617db048a66..7969e5c4096ad28cffc008ee07466d6a541c9914 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php
@@ -70,7 +70,7 @@ class GroupPriceManagementTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->storeManagerMock = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
->setMethods(['getWebsite'])
->disableOriginalConstructor()
->getMockForAbstractClass();
@@ -92,7 +92,7 @@ class GroupPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->productRepositoryMock->expects($this->any())->method('get')->with('product_sku')
->will($this->returnValue($this->productMock));
$this->configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->groupPriceManagement = new GroupPriceManagement(
$this->productRepositoryMock,
$this->priceBuilderMock,
@@ -121,7 +121,7 @@ class GroupPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue($configValue));
$this->priceBuilderMock
->expects($this->once())
@@ -160,7 +160,7 @@ class GroupPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(0));
$this->priceModifierMock->expects($this->once())->method('removeGroupPrice')->with($this->productMock, 4, 0);
@@ -192,7 +192,7 @@ class GroupPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(1));
$this->priceModifierMock->expects($this->once())->method('removeGroupPrice')->with($this->productMock, 4, 1);
@@ -212,7 +212,7 @@ class GroupPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(1));
$this->productMock->expects($this->once())->method('setData')->with(
@@ -244,7 +244,7 @@ class GroupPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(0));
$this->productMock->expects($this->once())->method('setData')->with(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php
index d2ac450321d555ccb80655880258a677acc767cc..b2f78dd741feeb6fee1e4a233b9c4060bb48408e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php
@@ -31,7 +31,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
protected $registry;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php
index d31a79c6fa0c9adf89968703d04a6c5fa41f7933..c188c4997faa0dfb34e0ac3fe1efee05d12b85f7 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php
@@ -39,7 +39,7 @@ class AttributeManagementTest extends \PHPUnit_Framework_TestCase
false
);
$this->storeId = 1;
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
$storeMock->expects($this->any())
->method('getId')
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
index 3867bafcf987fad09e94b4dac77a9010ed7de2a8..42e114740a7ace570859a3a2b7659ce25c16c62e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
@@ -79,7 +79,7 @@ class TierPriceManagementTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->websiteMock =
$this->getMock('Magento\Store\Model\Website', ['getId', '__wakeup'], [], '', false);
$this->productMock = $this->getMock(
@@ -129,7 +129,7 @@ class TierPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue($configValue));
if ($expected) {
$this->priceBuilderMock
@@ -182,7 +182,7 @@ class TierPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(0));
$this->priceModifierMock->expects($this->once())->method('removeTierPrice')->with($this->productMock, 4, 5, 0);
@@ -214,7 +214,7 @@ class TierPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(1));
$this->priceModifierMock->expects($this->once())->method('removeTierPrice')->with($this->productMock, 4, 5, 1);
@@ -243,7 +243,7 @@ class TierPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(1));
$this->productMock->expects($this->once())->method('setData')->with(
@@ -289,7 +289,7 @@ class TierPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(0));
$this->productMock->expects($this->once())->method('setData')->with(
@@ -317,7 +317,7 @@ class TierPriceManagementTest extends \PHPUnit_Framework_TestCase
$this->configMock
->expects($this->once())
->method('getValue')
- ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+ ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
->will($this->returnValue(0));
$this->productMock->expects($this->once())->method('setData')->with(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php
index 32ea31a22a5f25c009c766ae9e8313d3cbdbc557..d6adddac76b3f88b31ff705e9f4dcc50f4127a90 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php
@@ -65,7 +65,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
$store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false);
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
- $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
index 6a5c305ee7559288294848dbc391b008518bbd31..ded753edb1deff8880dce5d8841980194389be0a 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -211,7 +211,7 @@ class ProductTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMockForAbstractClass();
$storeManager->expects($this->any())
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php
index c1f98152156970b9f892d842408eae8eea0d79d7..0a8c04067abc72a012ec8379831a0e366802bc6c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php
@@ -88,7 +88,7 @@ class AbstractTest extends \PHPUnit_Framework_TestCase
$this->getMock('Magento\Framework\Locale\FormatInterface'),
$this->getMock('Magento\Eav\Model\Resource\Helper', [], [], '', false, false),
$this->getMock('Magento\Framework\Validator\UniversalFactory', [], [], '', false, false),
- $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
+ $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
$this->getMock('Magento\Catalog\Model\Factory', [], [], '', false),
[]
]
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
index 81b93bac76a08108656b18eafcc97c6452f1a615..a9421ac5ce0cc73ffac53060695692526b654e9d 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
@@ -179,7 +179,7 @@ class TreeTest extends \PHPUnit_Framework_TestCase
$store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
- $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$model = $objectHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php
index dcc7de50a43c69b5122f513aca69319a4cf586f2..1f17b422ce1bc40973ca9f2b94f011cbeb0c94d3 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php
@@ -18,7 +18,7 @@ class FlatTest extends \PHPUnit_Framework_TestCase
protected $_store;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManagerInterface;
@@ -26,7 +26,7 @@ class FlatTest extends \PHPUnit_Framework_TestCase
{
$this->_store = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
- $this->_storeManagerInterface = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManagerInterface = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->_storeManagerInterface->expects(
$this->any()
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
index 5aac658f62f1b1d3ed3e3bbdedc242bd5728198e..e433ed52fea448d300300a7193fb737cf86d70f5 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
@@ -47,7 +47,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Validator\UniversalFactory|\PHPUnit_Framework_MockObject_MockObject */
protected $universalFactoryMock;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerMock;
/** @var \Magento\Catalog\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
@@ -90,7 +90,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
$entity->expects($this->any())->method('getDefaultAttributes')->will($this->returnValue([]));
$this->universalFactoryMock = $this->getMock('Magento\Framework\Validator\UniversalFactory', [], [], '', false);
$this->universalFactoryMock->expects($this->any())->method('create')->will($this->returnValue($entity));
- $this->storeManagerMock = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
$this->storeManagerMock
->expects($this->any())
->method('getStore')
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
index 6a8fa9447c6172f8d72d6f9cdec907ba4772c017..f1d5c9a562af5785492e2f72169c784dfb3c5d60 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
@@ -41,7 +41,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $optionsFactoryMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php
index a660645a399b89282a3ea4971441d1972be85cd5..90ef1470e5404c92efd86e473bdf1c1f8b6d66e3 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php
@@ -34,7 +34,7 @@ class SpecialTest extends \PHPUnit_Framework_TestCase
protected $product;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
diff --git a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
index 85282bf88352e8496533433d708ed528f9dd7254..3f01380ce3679c2f9dd32842fdc2a8b03c241c12 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
@@ -227,7 +227,7 @@ class OptionTest extends \PHPUnit_Framework_TestCase
$this->getMock('Magento\ImportExport\Model\Resource\Import\Data', [], [], '', false),
$this->getMock('Magento\Framework\App\Resource', [], [], '', false),
$this->getMock('Magento\ImportExport\Model\Resource\Helper', [], [], '', false),
- $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
+ $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
$this->getMock('Magento\Catalog\Model\ProductFactory', [], [], '', false),
$this->getMock(
'Magento\Catalog\Model\Resource\Product\Option\CollectionFactory',
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php
index b9f12e0da909392c5bd006c7a637e17ae4b0cdbe..f17c621f516cc9d76631cc8e3c08f009188f8272 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php
@@ -91,7 +91,7 @@ class StockConfigurationTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue(true));
@@ -105,7 +105,7 @@ class StockConfigurationTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_ITEM_AUTO_RETURN,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue(true));
@@ -119,7 +119,7 @@ class StockConfigurationTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
\Magento\CatalogInventory\Model\Configuration::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue(true));
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php
index 18a631ac3c7da8c25352b8d3ac3d4c384e590eb9..7f58b91dd74c48596bc9c505eafe42ad74d02c60 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php
@@ -74,7 +74,7 @@ class MinsaleqtyTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(\Magento\CatalogInventory\Model\Configuration::XML_PATH_MIN_SALE_QTY),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($store)
)
->will($this->returnValue($minSaleQty));
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php
index 5bde5faa49a2f31fa45d6f812cc609d62a92e12a..c604ab66bfb48270fea1e88372bdc18d59c7dd99 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php
@@ -47,7 +47,7 @@ class StockTest extends \PHPUnit_Framework_TestCase
)
->disableOriginalConstructor()
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php
index 38c2c55877b0f9b87e29673e3ae728e76739b1ca..3228670da37635bbe26f00218f5074f483722715 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php
@@ -46,7 +46,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$this->minSaleQtyHelperMock = $this->getMockBuilder('Magento\CatalogInventory\Helper\Minsaleqty')
->disableOriginalConstructor()
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->model = new Configuration(
@@ -99,7 +99,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
{
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(Configuration::XML_PATH_CAN_SUBTRACT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, 1)
+ ->with(Configuration::XML_PATH_CAN_SUBTRACT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, 1)
->willReturn(true);
$this->assertTrue($this->model->canSubtractQty(1));
}
@@ -109,7 +109,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$qty = 1;
$this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with(Configuration::XML_PATH_MIN_QTY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, 1)
+ ->with(Configuration::XML_PATH_MIN_QTY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, 1)
->willReturn($qty);
$this->assertEquals($qty, $this->model->getMinQty(1));
}
@@ -132,7 +132,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$store = 1;
$this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with(Configuration::XML_PATH_MAX_SALE_QTY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+ ->with(Configuration::XML_PATH_MAX_SALE_QTY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
->willReturn(1);
$this->assertEquals(1, $this->model->getMaxSaleQty($store));
}
@@ -143,11 +143,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with(
- Configuration::XML_PATH_NOTIFY_STOCK_QTY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $store
- )
+ ->with(Configuration::XML_PATH_NOTIFY_STOCK_QTY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
->willReturn(1);
$this->assertEquals(1, $this->model->getNotifyStockQty($store));
}
@@ -160,7 +156,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
Configuration::XML_PATH_ENABLE_QTY_INCREMENTS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)->willReturn(1);
$this->assertEquals(1, $this->model->getEnableQtyIncrements($store));
@@ -172,7 +168,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with(Configuration::XML_PATH_QTY_INCREMENTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+ ->with(Configuration::XML_PATH_QTY_INCREMENTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
->willReturn(1);
$this->assertEquals(1, $this->model->getQtyIncrements($store));
}
@@ -182,7 +178,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$store = 1;
$this->scopeConfigMock->expects($this->once())
->method('getValue')
- ->with(Configuration::XML_PATH_BACKORDERS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+ ->with(Configuration::XML_PATH_BACKORDERS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
->willReturn(1);
$this->model->getBackorders($store);
}
@@ -192,11 +188,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$store = 1;
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(
- Configuration::XML_PATH_CAN_BACK_IN_STOCK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $store
- )
+ ->with(Configuration::XML_PATH_CAN_BACK_IN_STOCK, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
->willReturn(1);
$this->assertEquals(1, $this->model->getCanBackInStock($store));
}
@@ -206,11 +198,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$store = 1;
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(
- Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $store
- )
+ ->with(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
->willReturn(1);
$this->assertEquals(1, $this->model->isShowOutOfStock($store));
}
@@ -220,11 +208,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$store = 1;
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(
- Configuration::XML_PATH_ITEM_AUTO_RETURN,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $store
- )
+ ->with(Configuration::XML_PATH_ITEM_AUTO_RETURN, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
->willReturn(1);
$this->assertEquals(1, $this->model->isAutoReturnEnabled($store));
}
@@ -236,7 +220,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
Configuration::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
->willReturn(1);
@@ -252,7 +236,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
Configuration::XML_PATH_ITEM . $field,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
->willReturn(1);
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
index 0d0ba7eac63f713abb42034d0117b5e2d1e7fb57..64225ea390a2824b5a5dd5ce3433d420b43d852d 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
@@ -43,7 +43,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
protected $customerSession;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -94,10 +94,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
$store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false);
$store->expects($this->any())->method('getId')->willReturn($this->storeId);
- $this->storeManager = $this->getMockForAbstractClass(
- 'Magento\Framework\Store\StoreManagerInterface',
- ['getStore']
- );
+ $this->storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface', ['getStore']);
$this->storeManager->expects($this->any())->method('getStore')->willReturn($store);
$this->stockConfiguration = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
index 6e7b8187a7f1f003302e4a2d04d42afe204f4f79..61941e3f63dfe9ce82fb75df0381a7cc9de902d0 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
@@ -16,7 +16,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase
/** @var ObjectManagerHelper */
protected $objectManagerHelper;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \PHPUnit_Framework_MockObject_MockObject */
@@ -33,7 +33,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->storeModel = $this->getMock('Magento\Store\Model\Store', ['__wakeup', 'getId'], [], '', false);
$this->combineFactory = $this->getMock(
'Magento\CatalogRule\Model\Rule\Condition\CombineFactory',
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
index dd36f3bbd302a05ef063b6c738d45b5b1998d92a..5a10ccecd87ef9babdead2df5247412a361845a5 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
@@ -46,7 +46,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
protected $_filterManagerMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_storeManagerMock;
@@ -58,7 +58,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
$this->_scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->_escaperMock = $this->getMock('Magento\Framework\Escaper');
$this->_filterManagerMock = $this->getMock('Magento\Framework\Filter\FilterManager', [], [], '', false);
- $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->_model = new \Magento\CatalogSearch\Helper\Data(
$this->_contextMock,
@@ -88,7 +88,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Search\Model\Query::XML_PATH_MIN_QUERY_LENGTH,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null
)
->will($this->returnValue($return));
@@ -102,7 +102,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Search\Model\Query::XML_PATH_MAX_QUERY_LENGTH,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null
)
->will($this->returnValue($return));
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
index a8f70211a849ef500157f33ec6ec17a48b397534..92e61845b9e34a1adf88820c6c30b02fc570ae4e 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
@@ -10,7 +10,7 @@ class FullTest extends \PHPUnit_Framework_TestCase
{
/** @var \Magento\Framework\Search\Request\Config|\PHPUnit_Framework_MockObject_MockObject */
protected $searchRequestConfig;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full */
protected $object;
@@ -45,7 +45,7 @@ class FullTest extends \PHPUnit_Framework_TestCase
$scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
->disableOriginalConstructor()
->getMock();
- $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$dateTime = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime')
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
index 74025239397a8f57c2c18d938ae6087d34ba1036..32ee450a8f41c247e4efac52822f14b11bd523cd 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
@@ -40,7 +40,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Catalog\Model\Layer\Filter\ItemFactory|MockObject */
private $filterItemFactory;
- /** @var \Magento\Framework\Store\StoreManagerInterface|MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|MockObject */
private $storeManager;
/** @var \Magento\Catalog\Model\Layer|MockObject */
@@ -57,8 +57,8 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
->setMethods(['create'])
->getMock();
- /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
- $this->storeManager = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
+ /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+ $this->storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->setMethods([])
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php
index 99c9dda315bd094b16de78d317292492e2b59bf6..dd4284e6a4a5843fa1866e9d4410aae3f9fe99de 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php
@@ -74,7 +74,7 @@ class AdvancedTest extends PHPUnit_Framework_TestCase
->method('getId')
->willReturn(1);
- $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->setMethods(['getStore'])
->disableOriginalConstructor()
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
index 002ce5621efcd91a99949fd20fc0a8e6c252fc1c..86ec8ae378200fedabca1f63f6fe52f21b6ff61a 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
@@ -61,7 +61,7 @@ class CollectionTest extends PHPUnit_Framework_TestCase
->method('getId')
->willReturn(1);
- $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->setMethods(['getStore'])
->disableOriginalConstructor()
->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php
index e99d676fbecb338eadbb0127a19e49cc81d05d94..42883d442a9619bb736d3edce40a2d740a3e3c8b 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php
@@ -23,7 +23,7 @@ class IndexBuilderTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|MockObject */
private $config;
- /** @var \Magento\Framework\Store\StoreManagerInterface|MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|MockObject */
private $storeManager;
/** @var \Magento\Framework\Search\RequestInterface|MockObject */
@@ -71,7 +71,7 @@ class IndexBuilderTest extends \PHPUnit_Framework_TestCase
->setMethods(['isSetFlag'])
->getMockForAbstractClass();
- $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
+ $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')->getMock();
$objectManagerHelper = new ObjectManagerHelper($this);
$this->target = $objectManagerHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
index 72b2c124c6499de5c9fd1e2d0b1682f435a82bf1..894f7e1c6cf46bf9eecc7a888523230407f3e1f4 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
@@ -6,7 +6,7 @@
namespace Magento\CatalogUrlRewrite\Model;
use Magento\Catalog\Model\Category;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
class CategoryUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
@@ -14,7 +14,7 @@ class CategoryUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator */
protected $categoryUrlPathGenerator;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -42,7 +42,7 @@ class CategoryUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
'isObjectNew'
];
$this->category = $this->getMock('Magento\Catalog\Model\Category', $categoryMethods, [], '', false);
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->categoryRepository = $this->getMock('Magento\Catalog\Api\CategoryRepositoryInterface');
@@ -185,11 +185,7 @@ class CategoryUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
$passedStoreId = $storeId ? $storeId : $categoryStoreId;
$this->scopeConfig->expects($this->once())->method('getValue')
- ->with(
- CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $passedStoreId
- )
+ ->with(CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX, ScopeInterface::SCOPE_STORE, $passedStoreId)
->will($this->returnValue($suffix));
$this->assertEquals(
@@ -216,11 +212,7 @@ class CategoryUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
$store->expects($this->once())->method('getId')->will($this->returnValue($currentStoreId));
$this->storeManager->expects($this->once())->method('getStore')->will($this->returnValue($store));
$this->scopeConfig->expects($this->once())->method('getValue')
- ->with(
- CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $currentStoreId
- )
+ ->with(CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX, ScopeInterface::SCOPE_STORE, $currentStoreId)
->will($this->returnValue($suffix));
$this->assertEquals(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php
index e9e01c85e5e4582406460783386dca581f6195b5..57648b02f04712ac5376e1a0126241c7f6a8e51f 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CatalogUrlRewrite\Model;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
class ProductUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
@@ -13,7 +13,7 @@ class ProductUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator */
protected $productUrlPathGenerator;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -33,7 +33,7 @@ class ProductUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
$this->category = $this->getMock('Magento\Catalog\Model\Category', [], [], '', false);
$productMethods = ['__wakeup', 'getData', 'getUrlKey', 'getName', 'formatUrlKey', 'getId'];
$this->product = $this->getMock('Magento\Catalog\Model\Product', $productMethods, [], '', false);
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->categoryUrlPathGenerator = $this->getMock(
'Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator',
@@ -131,11 +131,7 @@ class ProductUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue('category-url-path'));
$this->storeManager->expects($this->never())->method('getStore');
$this->scopeConfig->expects($this->once())->method('getValue')
- ->with(
- ProductUrlPathGenerator::XML_PATH_PRODUCT_URL_SUFFIX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $storeId
- )
+ ->with(ProductUrlPathGenerator::XML_PATH_PRODUCT_URL_SUFFIX, ScopeInterface::SCOPE_STORE, $storeId)
->will($this->returnValue('.html'));
$this->assertEquals(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
index 446f743b26da7c180e6cff7b51067ef3025cd9ec..06f44a1e65f3f315aee9a3d304ed42d24cfec9ce 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
@@ -31,7 +31,7 @@ class ProductUrlRewriteGeneratorTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory|\PHPUnit_Framework_MockObject_MockObject */
protected $objectRegistryFactory;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Catalog\Model\Resource\Category\Collection|\PHPUnit_Framework_MockObject_MockObject */
@@ -44,7 +44,7 @@ class ProductUrlRewriteGeneratorTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()->getMock();
$this->product->expects($this->any())->method('getCategoryCollection')
->will($this->returnValue($this->categoriesCollection));
- $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()->getMock();
$this->categoriesCollection->expects($this->exactly(2))->method('addAttributeToSelect')
->will($this->returnSelf());
diff --git a/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php b/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
index 5a16e6709d4c833d208f63b354fc6da3a304c441..2a2886db769f865ebc6bbd98ad2b25684beece55 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
@@ -51,7 +51,7 @@ class ProductsListTest extends \PHPUnit_Framework_TestCase
protected $widgetConditionsHelper;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -83,7 +83,7 @@ class ProductsListTest extends \PHPUnit_Framework_TestCase
$this->builder = $this->getMock('Magento\Rule\Model\Condition\Sql\Builder', [], [], '', false);
$this->rule = $this->getMock('Magento\CatalogWidget\Model\Rule', [], [], '', false);
$this->widgetConditionsHelper = $this->getMock('Magento\Widget\Helper\Conditions');
- $this->storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->design = $this->getMock('\Magento\Framework\View\DesignInterface');
$objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php b/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php
index 687146ce8b6075896ad3dcb8075a200d514cc1dd..c5271a11a4ce96806707e0d1f065fa12fe750f4f 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php
@@ -44,10 +44,10 @@ class CombineTest extends \PHPUnit_Framework_TestCase
public function testGetNewChildSelectOptions()
{
- $options = [
- ['value' => '', 'label' => 'Please choose a condition to add.'],
- ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Combine', 'label' => 'Conditions Combination'],
- ['label' => 'Product Attribute', 'value' => [
+ $expectedOptions = [
+ ['value' => '', 'label' => __('Please choose a condition to add.')],
+ ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Combine', 'label' => __('Conditions Combination')],
+ ['label' => __('Product Attribute'), 'value' => [
['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|sku', 'label' => 'SKU'],
['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|category', 'label' => 'Category'],
]],
@@ -65,9 +65,9 @@ class CombineTest extends \PHPUnit_Framework_TestCase
$productCondition->expects($this->any())->method('getAttributeOption')
->will($this->returnValue($attributeOptions));
- $this->conditionFactory->expects($this->once())->method('create')->will($this->returnValue($productCondition));
+ $this->conditionFactory->expects($this->atLeastOnce())->method('create')->willReturn($productCondition);
- $this->assertSame($options, $this->condition->getNewChildSelectOptions());
+ $this->assertEquals($expectedOptions, $this->condition->getNewChildSelectOptions());
}
public function testCollectValidatedAttributes()
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
index 2f19f6dbe952a0d5dbd9cd21173b4d62b87eba41..676aff1fa2829990c87336249ccf4f83c3224a34 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -10,7 +10,6 @@ namespace Magento\Checkout\Controller\Cart;
*/
class ConfigureTest extends \PHPUnit_Framework_TestCase
{
-
/**
* @var \Magento\Framework\ObjectManagerInterface | \PHPUnit_Framework_MockObject_MockObject
*/
@@ -21,6 +20,11 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
*/
protected $resultPageFactoryMock;
+ /**
+ * @var \Magento\Framework\Controller\Result\Redirect | \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $resultRedirectMock;
+
/**
* @var \Magento\Framework\App\ResponseInterface | \PHPUnit_Framework_MockObject_MockObject
*/
@@ -36,11 +40,6 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
*/
protected $messageManagerMock;
- /**
- * @var \Magento\Framework\App\Response\RedirectInterface | \PHPUnit_Framework_MockObject_MockObject
- */
- protected $redirectMock;
-
/**
* @var \Magento\Checkout\Controller\Cart\Configure | \PHPUnit_Framework_MockObject_MockObject
*/
@@ -58,91 +57,40 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
- $eventManagerMock = $this->getMockBuilder('Magento\Framework\Event\ManagerInterface')
- ->disableOriginalConstructor()
- ->setMethods([])
- ->getMockForAbstractClass();
- $urlMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
- ->disableOriginalConstructor()
- ->setMethods([])
- ->getMockForAbstractClass();
- $actionFlagMock = $this->getMockBuilder('Magento\Framework\App\ActionFlag')
- ->disableOriginalConstructor()
- ->setMethods([])
- ->getMockForAbstractClass();
- $viewMock = $this->getMockBuilder('Magento\Framework\App\ViewInterface')
- ->disableOriginalConstructor()
- ->setMethods([])
- ->getMockForAbstractClass();
- $this->objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManagerInterface')
- ->disableOriginalConstructor()
- ->setMethods([])
- ->getMockForAbstractClass();
- $this->responseMock = $this->getMockBuilder('Magento\Framework\App\ResponseInterface')
- ->disableOriginalConstructor()
- ->setMethods([])
- ->getMockForAbstractClass();
- $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
- ->disableOriginalConstructor()
- ->setMethods(['getParam'])
- ->getMockForAbstractClass();
- $this->messageManagerMock = $this->getMockBuilder('Magento\Framework\Message\ManagerInterface')
- ->disableOriginalConstructor()
- ->setMethods([])
- ->getMockForAbstractClass();
- $this->redirectMock = $this->getMockBuilder('Magento\Framework\App\Response\RedirectInterface')
- ->disableOriginalConstructor()
- ->setMethods([])
- ->getMock();
-
- $this->contextMock = $this->getMockBuilder('Magento\Framework\App\Action\Context')
- ->setConstructorArgs(
- [
- $this->requestMock,
- $this->responseMock,
- $this->objectManagerMock,
- $eventManagerMock,
- $urlMock,
- $this->redirectMock,
- $actionFlagMock,
- $viewMock,
- $this->messageManagerMock
- ]
- )
- ->setMethods([])
- ->getMock();
- $this->contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock);
- $this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
- $this->contextMock->expects($this->any())->method('getResponse')->willReturn($this->responseMock);
- $this->contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->messageManagerMock);
- $this->contextMock->expects($this->any())->method('getRedirect')->willReturn($this->redirectMock);
- $scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+ $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+ $this->responseMock = $this->getMock('Magento\Framework\App\ResponseInterface');
+ $this->requestMock = $this->getMock('Magento\Framework\App\RequestInterface');
+ $this->messageManagerMock = $this->getMock('Magento\Framework\Message\ManagerInterface');
+ $this->cartMock = $this->getMockBuilder('Magento\Checkout\Model\Cart')
->disableOriginalConstructor()
->getMock();
- $session = $this->getMockBuilder('Magento\Checkout\Model\Session')
+ $this->resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
->disableOriginalConstructor()
->getMock();
- $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
- ->disableOriginalConstructor()
- ->getMockForAbstractClass();
- $formKeyValidator = $this->getMockBuilder('Magento\Core\App\Action\FormKeyValidator')
- ->disableOriginalConstructor()
- ->getMockForAbstractClass();
- $this->cartMock = $this->getMockBuilder('Magento\Checkout\Model\Cart')
+ $this->resultRedirectMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Redirect')
->disableOriginalConstructor()
->getMock();
- $this->resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
+ $resultRedirectFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RedirectFactory')
->disableOriginalConstructor()
+ ->setMethods(['create'])
->getMock();
-
- $this->configureController = new \Magento\Checkout\Controller\Cart\Configure(
- $this->contextMock,
- $scopeConfig,
- $session,
- $storeManager,
- $formKeyValidator,
- $this->cartMock,
- $this->resultPageFactoryMock
+ $resultRedirectFactoryMock->expects($this->any())
+ ->method('create')
+ ->willReturn($this->resultRedirectMock);
+
+ $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+ $this->configureController = $objectManagerHelper->getObject(
+ 'Magento\Checkout\Controller\Cart\Configure',
+ [
+ 'request' => $this->requestMock,
+ 'response' => $this->responseMock,
+ 'objectManager' => $this->objectManagerMock,
+ 'messageManager' => $this->messageManagerMock,
+ 'cart' => $this->cartMock,
+ 'resultPageFactory' => $this->resultPageFactoryMock,
+ 'resultRedirectFactory' => $resultRedirectFactoryMock
+ ]
);
}
@@ -231,20 +179,23 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
$productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
->disableOriginalConstructor()
->getMock();
- $this->requestMock->expects($this->at(0))
+ $this->requestMock->expects($this->any())
->method('getParam')
- ->with('id')
- ->willReturn($quotaId);
- $this->requestMock->expects($this->at(1))
- ->method('getParam')
- ->with('product_id')
- ->willReturn($productIdInRequest);
+ ->willReturnMap([
+ ['id', null, $quotaId],
+ ['product_id', null, $productIdInRequest]
+ ]);
$this->cartMock->expects($this->any())->method('getQuote')->willReturn($quoteMock);
$quoteMock->expects($this->once())->method('getItemById')->willReturn($quoteItemMock);
- $quoteItemMock->expects($this->exactly(1))->method('getProduct')->willReturn($productMock);
- $productMock->expects($this->exactly(1))->method('getId')->willReturn($productIdInQuota);
- $this->messageManagerMock->expects($this->once())->method('addError');
- $this->redirectMock->expects($this->once())->method('redirect')->with($this->responseMock, 'checkout/cart', []);
- $this->configureController->execute();
+ $quoteItemMock->expects($this->once())->method('getProduct')->willReturn($productMock);
+ $productMock->expects($this->once())->method('getId')->willReturn($productIdInQuota);
+ $this->messageManagerMock->expects($this->once())
+ ->method('addError')
+ ->willReturn('');
+ $this->resultRedirectMock->expects($this->once())
+ ->method('setPath')
+ ->with('checkout/cart', [])
+ ->willReturnSelf();
+ $this->assertSame($this->resultRedirectMock, $this->configureController->execute());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
index 208015c54eb9c18a1541d40cc13fd83ff79098d4..aa6eaad579e312647db2d36ed7c3aad44b75415c 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
@@ -18,31 +18,22 @@ class CartTest extends \PHPUnit_Framework_TestCase
public function testGoBack()
{
$helper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
$responseMock->headersSentThrowsException = false;
$requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
$requestMock->expects($this->any())->method('getActionName')->will($this->returnValue('add'));
- $requestMock->expects(
- $this->at(0)
- )->method(
- 'getParam'
- )->with(
- 'return_url'
- )->will(
- $this->returnValue('http://malicious.com/')
- );
+ $requestMock->expects($this->at(0))
+ ->method('getParam')
+ ->with('return_url')
+ ->will($this->returnValue('http://malicious.com/'));
$requestMock->expects($this->any())->method('getParam')->will($this->returnValue(null));
$redirect = $this->getMock('Magento\Framework\App\Response\RedirectInterface');
- $redirect->expects(
- $this->any()
- )->method(
- 'getRefererUrl'
- )->will(
- $this->returnValue('http://some-url/index.php/product.html')
- );
+ $redirect->expects($this->any())
+ ->method('getRefererUrl')
+ ->will($this->returnValue('http://some-url/index.php/product.html'));
$checkoutSessionMock = $this->getMock(
'Magento\Checkout\Model\Session',
@@ -51,38 +42,36 @@ class CartTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $checkoutSessionMock->expects(
- $this->once()
- )->method(
- 'setContinueShoppingUrl'
- )->with(
- 'http://some-url/index.php/product.html'
- )->will(
- $this->returnSelf()
- );
-
- $redirect->expects(
- $this->once()
- )->method(
- 'redirect'
- )->will(
- $this->returnValue('http://some-url/index.php/checkout/cart/')
- );
+ $checkoutSessionMock->expects($this->once())
+ ->method('setContinueShoppingUrl')
+ ->with('http://some-url/index.php/product.html')
+ ->will($this->returnSelf());
$storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$storeMock->expects($this->any())->method('getBaseUrl')->will($this->returnValue('http://some-url/'));
$configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $configMock->expects(
- $this->once()
- )->method(
- 'getValue'
- )->with(
- 'checkout/cart/redirect_to_cart'
- )->will(
- $this->returnValue('1')
- );
+ $configMock->expects($this->once())
+ ->method('getValue')
+ ->with('checkout/cart/redirect_to_cart')
+ ->will($this->returnValue('1'));
$storeManagerMock->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
+
+ $resultRedirectMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Redirect')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $resultRedirectFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RedirectFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $resultRedirectFactoryMock->expects($this->any())
+ ->method('create')
+ ->willReturn($resultRedirectMock);
+ $resultRedirectMock->expects($this->once())
+ ->method('setPath')
+ ->with('checkout/cart')
+ ->willReturnSelf();
+
$arguments = [
'response' => $responseMock,
'request' => $requestMock,
@@ -90,6 +79,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
'scopeConfig' => $configMock,
'redirect' => $redirect,
'storeManager' => $storeManagerMock,
+ 'resultRedirectFactory' => $resultRedirectFactoryMock
];
$controller = $helper->getObject('Magento\Checkout\Controller\Cart', $arguments);
@@ -97,6 +87,6 @@ class CartTest extends \PHPUnit_Framework_TestCase
$reflectionObject = new \ReflectionObject($controller);
$reflectionMethod = $reflectionObject->getMethod('_goBack');
$reflectionMethod->setAccessible(true);
- $reflectionMethod->invoke($controller);
+ $this->assertSame($resultRedirectMock, $reflectionMethod->invoke($controller));
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
index 1fd79006a5b2246281f0eead91c956d616fd6b5a..2cc5744a793b43b01e02b384b8d329fb0ef4ae49 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
@@ -45,11 +45,6 @@ class IndexTest extends \PHPUnit_Framework_TestCase
*/
private $sessionMock;
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- private $viewMock;
-
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
@@ -81,7 +76,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
private $model;
/**
- * @var \Magento\Framework\View\Result\Page
+ * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
*/
protected $resultPageMock;
@@ -95,6 +90,16 @@ class IndexTest extends \PHPUnit_Framework_TestCase
*/
protected $titleMock;
+ /**
+ * @var \Magento\Framework\UrlInterface
+ */
+ protected $url;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $resultRedirectMock;
+
public function setUp()
{
// mock objects
@@ -105,7 +110,6 @@ class IndexTest extends \PHPUnit_Framework_TestCase
$this->contextMock = $this->basicMock('\Magento\Framework\App\Action\Context');
$this->sessionMock = $this->basicMock('\Magento\Customer\Model\Session');
$this->onepageMock = $this->basicMock('\Magento\Checkout\Model\Type\Onepage');
- $this->viewMock = $this->basicMock('\Magento\Framework\App\ViewInterface');
$this->layoutMock = $this->basicMock('\Magento\Framework\View\Layout');
$this->requestMock = $this->basicMock('\Magento\Framework\App\RequestInterface');
$this->responseMock = $this->basicMock('\Magento\Framework\App\ResponseInterface');
@@ -113,11 +117,29 @@ class IndexTest extends \PHPUnit_Framework_TestCase
$this->resultPageMock = $this->basicMock('\Magento\Framework\View\Result\Page');
$this->pageConfigMock = $this->basicMock('\Magento\Framework\View\Page\Config');
$this->titleMock = $this->basicMock('\Magento\Framework\View\Page\Title');
+ $this->url = $this->getMock('Magento\Framework\UrlInterface');
+ $this->resultRedirectMock = $this->basicMock('Magento\Framework\Controller\Result\Redirect');
+
+ $resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $resultPageFactoryMock->expects($this->any())
+ ->method('create')
+ ->willReturn($this->resultPageMock);
+
+ $resultRedirectFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RedirectFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $resultRedirectFactoryMock->expects($this->any())
+ ->method('create')
+ ->willReturn($this->resultRedirectMock);
// stubs
$this->basicStub($this->onepageMock, 'getQuote')->willReturn($this->quoteMock);
- $this->basicStub($this->viewMock, 'getLayout')->willReturn($this->layoutMock);
- $this->basicStub($this->viewMock, 'getPage')->willReturn($this->resultPageMock);
+ $this->basicStub($this->resultPageMock, 'getLayout')->willReturn($this->layoutMock);
+
$this->basicStub($this->layoutMock, 'getBlock')
->willReturn($this->basicMock('Magento\Theme\Block\Html\Head'));
$this->basicStub($this->resultPageMock, 'getConfig')->willReturn($this->pageConfigMock);
@@ -139,12 +161,12 @@ class IndexTest extends \PHPUnit_Framework_TestCase
->willReturn($this->basicMock('Magento\Framework\UrlInterface'));
// context stubs
$this->basicStub($this->contextMock, 'getObjectManager')->willReturn($this->objectManagerMock);
- $this->basicStub($this->contextMock, 'getView')->willReturn($this->viewMock);
$this->basicStub($this->contextMock, 'getRequest')->willReturn($this->requestMock);
$this->basicStub($this->contextMock, 'getResponse')->willReturn($this->responseMock);
$this->basicStub($this->contextMock, 'getMessageManager')
->willReturn($this->basicMock('\Magento\Framework\Message\ManagerInterface'));
$this->basicStub($this->contextMock, 'getRedirect')->willReturn($this->redirectMock);
+ $this->basicStub($this->contextMock, 'getUrl')->willReturn($this->url);
// SUT
$this->model = $this->objectManager->getObject(
@@ -152,6 +174,8 @@ class IndexTest extends \PHPUnit_Framework_TestCase
[
'context' => $this->contextMock,
'customerSession' => $this->sessionMock,
+ 'resultPageFactory' => $resultPageFactoryMock,
+ 'resultRedirectFactory' => $resultRedirectFactoryMock
]
);
}
@@ -165,24 +189,23 @@ class IndexTest extends \PHPUnit_Framework_TestCase
$this->basicStub($this->quoteMock, 'validateMinimumAmount')->willReturn(true);
//Expected outcomes
- $this->sessionMock->expects($this->once())
- ->method('regenerateId');
- $this->viewMock->expects($this->once())
- ->method('renderLayout');
-
- $this->model->execute();
+ $this->sessionMock->expects($this->once())->method('regenerateId');
+ $this->layoutMock->expects($this->once())
+ ->method('initMessages');
+ $this->assertSame($this->resultPageMock, $this->model->execute());
}
public function testOnepageCheckoutNotAvailable()
{
$this->basicStub($this->dataMock, 'canOnepageCheckout')->willReturn(false);
-
$expectedPath = 'checkout/cart';
- $this->redirectMock->expects($this->once())
- ->method('redirect')
- ->with($this->responseMock, $expectedPath, []);
- $this->model->execute();
+ $this->resultRedirectMock->expects($this->once())
+ ->method('setPath')
+ ->with($expectedPath)
+ ->willReturnSelf();
+
+ $this->assertSame($this->resultRedirectMock, $this->model->execute());
}
public function testInvalidQuote()
@@ -190,11 +213,12 @@ class IndexTest extends \PHPUnit_Framework_TestCase
$this->basicStub($this->quoteMock, 'hasError')->willReturn(true);
$expectedPath = 'checkout/cart';
- $this->redirectMock->expects($this->once())
- ->method('redirect')
- ->with($this->responseMock, $expectedPath, []);
+ $this->resultRedirectMock->expects($this->once())
+ ->method('setPath')
+ ->with($expectedPath)
+ ->willReturnSelf();
- $this->model->execute();
+ $this->assertSame($this->resultRedirectMock, $this->model->execute());
}
/**
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
index f94a6f7a7165928a593dee7774344b23c26c0921..d0a0ad3d1285a3f65bc4e4b2410eb7c19001a360 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
@@ -58,34 +58,32 @@ class SaveBillingTest extends \PHPUnit_Framework_TestCase
protected $objectManagerMock;
/**
- * @var \Magento\Framework\App\View | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
*/
- protected $view;
+ protected $scopeConfig;
/**
- * @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\View\LayoutFactory | \PHPUnit_Framework_MockObject_MockObject
*/
- protected $scopeConfig;
+ protected $layoutFactory;
/**
- * @var \Magento\Core\Helper\Data | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Controller\Result\Raw | \PHPUnit_Framework_MockObject_MockObject
*/
- protected $coreHelper;
+ protected $resultRaw;
/**
- * @var \Magento\Framework\View\LayoutFactory | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Controller\Result\Json | \PHPUnit_Framework_MockObject_MockObject
*/
- protected $layoutFactory;
+ protected $resultJson;
protected function setUp()
{
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->coreHelper = $this->getMock('Magento\Core\Helper\Data', [], [], '', false);
$this->scopeConfig = $this->getMock('Magento\Framework\App\Config', [], [], '', false);
$this->request = $this->getMock('Magento\Framework\App\Request\Http', ['getPost', 'isPost'], [], '', false);
$this->response = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
- $this->view = $this->getMock('Magento\Framework\App\View', [], [], '', false);
$this->quote = $this->getMock(
'Magento\Quote\Model\Quote',
['__wakeup', 'getHasError', 'hasItems', 'validateMinimumAmount', 'isVirtual', 'getStoreId'],
@@ -109,7 +107,6 @@ class SaveBillingTest extends \PHPUnit_Framework_TestCase
$valueMap = [
['Magento\Checkout\Model\Type\Onepage', $this->onePage],
['Magento\Checkout\Model\Session', $this->checkoutSession],
- ['Magento\Core\Helper\Data', $this->coreHelper],
];
$this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManager\ObjectManager', [], [], '', false);
$this->objectManagerMock->expects($this->any())
@@ -131,16 +128,37 @@ class SaveBillingTest extends \PHPUnit_Framework_TestCase
$context->expects($this->once())
->method('getEventManager')
->will($this->returnValue($this->eventManager));
- $context->expects($this->once())
- ->method('getView')
- ->will($this->returnValue($this->view));
+
+ $this->resultRaw = $this->getMockBuilder('Magento\Framework\Controller\Result\Raw')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $resultRawFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\RawFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $resultRawFactory->expects($this->any())
+ ->method('create')
+ ->willReturn($this->resultRaw);
+
+ $this->resultJson = $this->getMockBuilder('Magento\Framework\Controller\Result\Json')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $resultJsonFactory->expects($this->any())
+ ->method('create')
+ ->willReturn($this->resultJson);
$this->controller = $objectManager->getObject(
'Magento\Checkout\Controller\Onepage\SaveBilling',
[
'context' => $context,
'scopeConfig' => $this->scopeConfig,
- 'layoutFactory' => $this->layoutFactory
+ 'layoutFactory' => $this->layoutFactory,
+ 'resultRawFactory' => $resultRawFactory,
+ 'resultJsonFactory' => $resultJsonFactory
]
);
}
@@ -150,7 +168,13 @@ class SaveBillingTest extends \PHPUnit_Framework_TestCase
$this->request->expects($this->once())
->method('isPost')
->willReturn(false);
- $this->controller->execute();
+ $this->resultRaw->expects($this->exactly(2))
+ ->method('setHeader')
+ ->willReturnMap([
+ ['HTTP/1.1', '403 Session Expired', false, $this->resultRaw],
+ ['Login-Required', 'true', false, $this->resultRaw]
+ ]);
+ $this->assertSame($this->resultRaw, $this->controller->execute());
}
public function testValidateMinimumAmount()
@@ -207,23 +231,22 @@ class SaveBillingTest extends \PHPUnit_Framework_TestCase
->method('toHtml')
->willReturn('some_html');
- $update = $this->getMock('Magento\Core\Model\Layout\Merge', ['load'], [], '', false);
+ $update = $this->getMock('Magento\Framework\View\Model\Layout\Merge', ['load'], [], '', false);
$layout->expects($this->any())
->method('getUpdate')
->willReturn($update);
$update->expects($this->any())
->method('load');
- $this->coreHelper->expects($this->once())
- ->method('jsonEncode')
- ->with($expectedResult);
- $this->view->expects($this->any())
- ->method('getLayout')
- ->willReturn($layout);
$layout->expects($this->any())
->method('getBlock')
->willReturn($block);
- $this->controller->execute();
+ $this->resultJson->expects($this->once())
+ ->method('setData')
+ ->with($expectedResult)
+ ->willReturnSelf();
+
+ $this->assertSame($this->resultJson, $this->controller->execute());
}
public function testValidateMinimumAmountNegative()
@@ -258,10 +281,11 @@ class SaveBillingTest extends \PHPUnit_Framework_TestCase
->method('getPost')
->willReturn($data);
- $this->coreHelper->expects($this->once())
- ->method('jsonEncode')
- ->with($expectedResult);
+ $this->resultJson->expects($this->once())
+ ->method('setData')
+ ->with($expectedResult)
+ ->willReturnSelf();
- $this->controller->execute();
+ $this->assertSame($this->resultJson, $this->controller->execute());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
index a7f0903aee63dfbfff00aef50de9838781a5108d..f8a35fa0d335fc5a0c800d34c26e5cca38757705 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
@@ -58,24 +58,24 @@ class SaveShippingTest extends \PHPUnit_Framework_TestCase
protected $objectManagerMock;
/**
- * @var \Magento\Framework\App\View | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
*/
- protected $view;
+ protected $scopeConfig;
/**
- * @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\View\LayoutFactory | \PHPUnit_Framework_MockObject_MockObject
*/
- protected $scopeConfig;
+ protected $layoutFactory;
/**
- * @var \Magento\Core\Helper\Data | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Controller\Result\Raw | \PHPUnit_Framework_MockObject_MockObject
*/
- protected $coreHelper;
+ protected $resultRaw;
/**
- * @var \Magento\Framework\View\LayoutFactory | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\Controller\Result\Json | \PHPUnit_Framework_MockObject_MockObject
*/
- protected $layoutFactory;
+ protected $resultJson;
protected function setUp()
{
@@ -85,7 +85,6 @@ class SaveShippingTest extends \PHPUnit_Framework_TestCase
$this->scopeConfig = $this->getMock('Magento\Framework\App\Config', [], [], '', false);
$this->request = $this->getMock('Magento\Framework\App\Request\Http', ['getPost', 'isPost'], [], '', false);
$this->response = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
- $this->view = $this->getMock('Magento\Framework\App\View', [], [], '', false);
$this->quote = $this->getMock(
'Magento\Quote\Model\Quote',
['__wakeup', 'getHasError', 'hasItems', 'validateMinimumAmount', 'isVirtual', 'getStoreId'],
@@ -109,7 +108,6 @@ class SaveShippingTest extends \PHPUnit_Framework_TestCase
$valueMap = [
['Magento\Checkout\Model\Type\Onepage', $this->onePage],
['Magento\Checkout\Model\Session', $this->checkoutSession],
- ['Magento\Core\Helper\Data', $this->coreHelper],
];
$this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManager\ObjectManager', [], [], '', false);
$this->objectManagerMock->expects($this->any())
@@ -131,16 +129,37 @@ class SaveShippingTest extends \PHPUnit_Framework_TestCase
$context->expects($this->once())
->method('getEventManager')
->will($this->returnValue($this->eventManager));
- $context->expects($this->once())
- ->method('getView')
- ->will($this->returnValue($this->view));
+
+ $this->resultRaw = $this->getMockBuilder('Magento\Framework\Controller\Result\Raw')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $resultRawFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\RawFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $resultRawFactory->expects($this->any())
+ ->method('create')
+ ->willReturn($this->resultRaw);
+
+ $this->resultJson = $this->getMockBuilder('Magento\Framework\Controller\Result\Json')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory')
+ ->disableOriginalConstructor()
+ ->setMethods(['create'])
+ ->getMock();
+ $resultJsonFactory->expects($this->any())
+ ->method('create')
+ ->willReturn($this->resultJson);
$this->controller = $objectManager->getObject(
'Magento\Checkout\Controller\Onepage\SaveShipping',
[
'context' => $context,
'scopeConfig' => $this->scopeConfig,
- 'layoutFactory' => $this->layoutFactory
+ 'layoutFactory' => $this->layoutFactory,
+ 'resultRawFactory' => $resultRawFactory,
+ 'resultJsonFactory' => $resultJsonFactory
]
);
}
@@ -150,7 +169,13 @@ class SaveShippingTest extends \PHPUnit_Framework_TestCase
$this->request->expects($this->once())
->method('isPost')
->willReturn(false);
- $this->controller->execute();
+ $this->resultRaw->expects($this->exactly(2))
+ ->method('setHeader')
+ ->willReturnMap([
+ ['HTTP/1.1', '403 Session Expired', false, $this->resultRaw],
+ ['Login-Required', 'true', false, $this->resultRaw]
+ ]);
+ $this->assertSame($this->resultRaw, $this->controller->execute());
}
public function testValidateMinimumAmount()
@@ -183,9 +208,6 @@ class SaveShippingTest extends \PHPUnit_Framework_TestCase
->method('getPost')
->willReturn($data);
- $this->coreHelper->expects($this->once())
- ->method('jsonEncode')
- ->with($expectedResult);
$layout = $this->getMock(
'Magento\Framework\View\Layout',
['getUpdate', 'generateXml', 'generateElements', 'getOutput', 'getBlock'],
@@ -208,20 +230,22 @@ class SaveShippingTest extends \PHPUnit_Framework_TestCase
->method('toHtml')
->willReturn('some_html');
- $update = $this->getMock('Magento\Core\Model\Layout\Merge', [], [], '', false);
+ $update = $this->getMock('Magento\Framework\View\Model\Layout\Merge', [], [], '', false);
$layout->expects($this->any())
->method('getUpdate')
->willReturn($update);
$update->expects($this->any())
->method('load');
- $this->view->expects($this->any())
- ->method('getLayout')
- ->willReturn($layout);
$layout->expects($this->any())
->method('getBlock')
->willReturn($block);
- $this->controller->execute();
+ $this->resultJson->expects($this->once())
+ ->method('setData')
+ ->with($expectedResult)
+ ->willReturnSelf();
+
+ $this->assertSame($this->resultJson, $this->controller->execute());
}
public function testValidateMinimumAmountNegative()
@@ -256,10 +280,11 @@ class SaveShippingTest extends \PHPUnit_Framework_TestCase
->method('getPost')
->willReturn($data);
- $this->coreHelper->expects($this->once())
- ->method('jsonEncode')
- ->with($expectedResult);
+ $this->resultJson->expects($this->once())
+ ->method('setData')
+ ->with($expectedResult)
+ ->willReturnSelf();
- $this->controller->execute();
+ $this->assertSame($this->resultJson, $this->controller->execute());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
index c5ecb1d1dd72fc92f9be1b778227cb3b77774d91..c01449d988414ee12b160f2281910f6a9efed3e6 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
@@ -80,7 +80,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
$contextMock->expects($this->any())->method('getUrlBuilder')->will($this->returnValue($this->urlBuilderMock));
$contextMock->expects($this->any())->method('getRequest')->will($this->returnValue($this->requestMock));
$contextMock->expects($this->any())->method('getUrlEncoder')->will($this->returnValue($this->urlEncoder));
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->coreHelperMock = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
$this->scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
$this->cartMock = $this->getMock('\Magento\Checkout\Model\Cart', [], [], '', false);
@@ -162,7 +162,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
{
$storeId = 1;
$this->scopeConfigMock->expects($this->once())->method('isSetFlag')
- ->with(Cart::XML_PATH_REDIRECT_TO_CART, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
+ ->with(Cart::XML_PATH_REDIRECT_TO_CART, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
->will($this->returnValue(true));
$this->assertTrue($this->helper->getShouldRedirectToCart($storeId));
}
@@ -208,7 +208,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
*/
public function testGetDeletePostJson($id, $url, $isAjax, $expectedPostData)
{
- $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
$coreData = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
$scopeConfig = $this->getMockForAbstractClass('\Magento\Framework\App\Config\ScopeConfigInterface');
$checkoutCart = $this->getMock('\Magento\Checkout\Model\Cart', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
index 321ddd9406e61648ae8522cfc3db4a36a6c7ef83..9e88e7178acf602aaff791e8baed99a763aa46c0 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
@@ -9,7 +9,7 @@
namespace Magento\Checkout\Helper;
use Magento\TestFramework\Helper\ObjectManager;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class DataTest extends \PHPUnit_Framework_TestCase
{
@@ -81,49 +81,49 @@ class DataTest extends \PHPUnit_Framework_TestCase
[
[
'checkout/payment_failed/template',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
8,
'fixture_email_template_payment_failed'
],
[
'checkout/payment_failed/receiver',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
8,
'sysadmin'
],
[
'trans_email/ident_sysadmin/email',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
8,
'sysadmin@example.com'
],
[
'trans_email/ident_sysadmin/name',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
8,
'System Administrator'
],
[
'checkout/payment_failed/identity',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
8,
'noreply@example.com'
],
[
'carriers/ground/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
'Ground Shipping'
],
[
'payment/fixture-payment-method/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
'Check Money Order'
],
[
'checkout/options/onepage_checkout_enabled',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
'One Page Checkout'
]
@@ -131,7 +131,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
)
);
- $this->_storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
$this->_checkoutSession = $this->getMock('\Magento\Checkout\Model\Session', [], [], '', false);
@@ -342,7 +342,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
{
$this->_scopeConfig->expects($this->once())->method('isSetFlag')->with(
'checkout/options/customer_must_be_logged',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(true));
$this->assertTrue($this->_helper->isCustomerMustBeLogged());
}
@@ -362,7 +362,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
$rowTotal = 15;
$roundPrice = 17;
$expected = 17;
- $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+ $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
$objectManagerHelper = new ObjectManager($this);
$helper = $objectManagerHelper->getObject(
'\Magento\Checkout\Helper\Data',
@@ -421,7 +421,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
public function testGetBasePriceInclTaxWithoutQty()
{
- $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+ $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
$objectManagerHelper = new ObjectManager($this);
$helper = $objectManagerHelper->getObject(
'\Magento\Checkout\Helper\Data',
@@ -438,7 +438,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
public function testGetBasePriceInclTax()
{
- $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+ $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
$objectManagerHelper = new ObjectManager($this);
$helper = $objectManagerHelper->getObject(
'\Magento\Checkout\Helper\Data',
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php
index 8f948deeb2aec91e66c266903666db7638fe526a..60df3067b5e9f5da9a656218fe2e77f65958aa65 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php
@@ -234,7 +234,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
$this->customerSessionMock->expects($this->any())->method('isLoggedIn')->will($this->returnValue(true));
$this->scopeConfigMock->expects($this->once())->method('getValue')
- ->with('checkout/cart_link/use_qty', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('checkout/cart_link/use_qty', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($useQty));
$qtyMethodName = ($useQty) ? 'getItemsQty' : 'getItemsCount';
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
index 887bac6e9af6c0c5d498965d2e105120a431e54f..4151d9b246801171593acec670da372c0d8d9dc1 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
@@ -167,7 +167,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
);
$storage = $this->getMock('Magento\Framework\Session\Storage', null);
$store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
- $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$eventManager = $this->getMockForAbstractClass('Magento\Framework\Event\ManagerInterface');
@@ -286,7 +286,7 @@ class SessionTest extends \PHPUnit_Framework_TestCase
->method('getWebsiteId')
->will($this->returnValue($websiteId));
- $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())
->method('getStore')
->will($this->returnValue($store));
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
index 3d8bab9affbafe56b08b967c9e549f42163b4543..e6300c92b29fd989b9adfbe96626a8f9c3440b29 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
@@ -40,7 +40,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
protected $customerSessionMock;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerMock;
/** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -131,7 +131,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->requestMock = $this->getMock(
'Magento\Framework\App\RequestInterface',
['isAjax', 'getModuleName', 'setModuleName', 'getActionName', 'setActionName', 'getParam', 'getCookie']
diff --git a/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php b/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php
index b5ff93a8d721025f05515aa7cf640e156bcc72fe..24541f489f6e398f2e262d2de67de6df2c66f14b 100644
--- a/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php
@@ -5,7 +5,7 @@
*/
namespace Magento\CheckoutAgreements\Model;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
class CheckoutAgreementsRepositoryTest extends \PHPUnit_Framework_TestCase
@@ -46,7 +46,7 @@ class CheckoutAgreementsRepositoryTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->model = new CheckoutAgreementsRepository(
$this->factoryMock,
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php b/dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php
index c03ec9610ae03c7906172f6bc4c6df95398fcc4a..bec202285f24db4b956987d4f5cf8b208445c3ad 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php
@@ -84,7 +84,7 @@ class EditTest extends \PHPUnit_Framework_TestCase
->with($title)
->willReturn($escapedTitle);
- $this->assertInternalType('string', $this->this->getHeaderText());
+ $this->assertInstanceOf('Magento\Framework\Phrase', $this->this->getHeaderText());
}
public function getHeaderTextDataProvider()
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
index ffd990dfc3bfbc2b084c699cdc090269c08b5ec1..322d671dce6b8da24c3bf5e68dcf9d5248b9637f 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
@@ -68,6 +68,16 @@ class DirectiveTest extends \PHPUnit_Framework_TestCase
*/
protected $loggerMock;
+ /**
+ * @var \Magento\Framework\Controller\Result\RawFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $rawFactoryMock;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\Raw|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $rawMock;
+
protected function setUp()
{
$this->actionContextMock = $this->getMockBuilder('Magento\Backend\App\Action\Context')
@@ -117,6 +127,13 @@ class DirectiveTest extends \PHPUnit_Framework_TestCase
$this->loggerMock = $this->getMockBuilder('Psr\Log\LoggerInterface')
->disableOriginalConstructor()
->getMock();
+ $this->rawFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RawFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->rawMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Raw')
+ ->disableOriginalConstructor()
+ ->getMock();
$this->actionContextMock->expects($this->any())
->method('getRequest')
@@ -133,7 +150,8 @@ class DirectiveTest extends \PHPUnit_Framework_TestCase
'Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive',
[
'context' => $this->actionContextMock,
- 'urlDecoder' => $this->urlDecoderMock
+ 'urlDecoder' => $this->urlDecoderMock,
+ 'resultRawFactory' => $this->rawFactoryMock
]
);
}
@@ -153,19 +171,25 @@ class DirectiveTest extends \PHPUnit_Framework_TestCase
$this->imageAdapterMock->expects($this->once())
->method('getMimeType')
->willReturn($mimeType);
- $this->responseMock->expects($this->once())
+ $this->rawMock->expects($this->once())
->method('setHeader')
->with('Content-Type', $mimeType)
->willReturnSelf();
+ $this->rawMock->expects($this->once())
+ ->method('setContents')
+ ->with($imageBody)
+ ->willReturnSelf();
$this->imageAdapterMock->expects($this->once())
->method('getImage')
->willReturn($imageBody);
- $this->responseMock->expects($this->once())
- ->method('setBody')
- ->with($imageBody)
- ->willReturnSelf();
+ $this->rawFactoryMock->expects($this->any())
+ ->method('create')
+ ->willReturn($this->rawMock);
- $this->wysiwygDirective->execute();
+ $this->assertSame(
+ $this->rawMock,
+ $this->wysiwygDirective->execute()
+ );
}
/**
@@ -192,22 +216,28 @@ class DirectiveTest extends \PHPUnit_Framework_TestCase
$this->imageAdapterMock->expects($this->once())
->method('getMimeType')
->willReturn($mimeType);
- $this->responseMock->expects($this->once())
+ $this->rawMock->expects($this->once())
->method('setHeader')
->with('Content-Type', $mimeType)
->willReturnSelf();
+ $this->rawMock->expects($this->once())
+ ->method('setContents')
+ ->with($imageBody)
+ ->willReturnSelf();
$this->imageAdapterMock->expects($this->once())
->method('getImage')
->willReturn($imageBody);
- $this->responseMock->expects($this->once())
- ->method('setBody')
- ->with($imageBody)
- ->willReturnSelf();
$this->loggerMock->expects($this->once())
->method('critical')
->with($exception);
+ $this->rawFactoryMock->expects($this->any())
+ ->method('create')
+ ->willReturn($this->rawMock);
- $this->wysiwygDirective->execute();
+ $this->assertSame(
+ $this->rawMock,
+ $this->wysiwygDirective->execute()
+ );
}
protected function prepareExecuteTest()
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..73cd48691b01d6192e0cb3f7905127579988562e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Controller\Noroute;
+
+class IndexTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Cms\Controller\Noroute\Index
+ */
+ protected $_controller;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_cmsHelperMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_requestMock;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\ForwardFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $forwardFactoryMock;
+
+ /**
+ * @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $forwardMock;
+
+ /**
+ * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $resultPageMock;
+
+ protected function setUp()
+ {
+ $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+ $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+ $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
+ $this->resultPageMock = $this->getMockBuilder('\Magento\Framework\View\Result\Page')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->forwardFactoryMock = $this->getMockBuilder('\Magento\Framework\Controller\Result\ForwardFactory')
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->forwardMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Forward')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->forwardFactoryMock->expects($this->any())
+ ->method('create')
+ ->willReturn($this->forwardMock);
+
+ $scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
+ $this->_requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
+ $this->_cmsHelperMock = $this->getMock('Magento\Cms\Helper\Page', [], [], '', false);
+ $valueMap = [
+ [
+ 'Magento\Framework\App\Config\ScopeConfigInterface',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $scopeConfigMock,
+ ],
+ ['Magento\Cms\Helper\Page', $this->_cmsHelperMock],
+ ];
+ $objectManagerMock->expects($this->any())->method('get')->will($this->returnValueMap($valueMap));
+ $scopeConfigMock->expects(
+ $this->once()
+ )->method(
+ 'getValue'
+ )->with(
+ \Magento\Cms\Helper\Page::XML_PATH_NO_ROUTE_PAGE
+ )->will(
+ $this->returnValue('pageId')
+ );
+ $this->_controller = $helper->getObject(
+ 'Magento\Cms\Controller\Noroute\Index',
+ ['response' => $responseMock, 'objectManager' => $objectManagerMock, 'request' => $this->_requestMock,
+ 'resultForwardFactory' => $this->forwardFactoryMock
+ ]
+ );
+ }
+
+ public function testExecuteResultPage()
+ {
+ $this->resultPageMock->expects(
+ $this->at(0)
+ )->method(
+ 'setHeader'
+ )->with(
+ 'HTTP/1.1',
+ '404 Not Found'
+ )->will(
+ $this->returnSelf()
+ );
+ $this->resultPageMock->expects(
+ $this->at(1)
+ )->method(
+ 'setHeader'
+ )->with(
+ 'Status',
+ '404 File not found'
+ )->will(
+ $this->returnSelf()
+ );
+ $this->_cmsHelperMock->expects(
+ $this->once()
+ )->method(
+ 'prepareResultPage'
+ )->will(
+ $this->returnValue($this->resultPageMock)
+ );
+ $this->assertSame(
+ $this->resultPageMock,
+ $this->_controller->execute()
+ );
+ }
+
+ public function testExecuteResultForward()
+ {
+ $this->forwardMock->expects(
+ $this->once()
+ )->method(
+ 'setController'
+ )->with(
+ 'index'
+ )->will(
+ $this->returnSelf()
+ );
+ $this->forwardMock->expects(
+ $this->once()
+ )->method(
+ 'forward'
+ )->with(
+ 'defaultNoRoute'
+ )->will(
+ $this->returnSelf()
+ );
+ $this->_cmsHelperMock->expects(
+ $this->once()
+ )->method(
+ 'prepareResultPage'
+ )->will(
+ $this->returnValue(false)
+ );
+ $this->assertSame(
+ $this->forwardMock,
+ $this->_controller->execute()
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php
deleted file mode 100644
index 53d1117b9d9c7f0c064cfd9e625aefd0d13199fd..0000000000000000000000000000000000000000
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Cms\Controller;
-
-class NorouteTest extends \PHPUnit_Framework_TestCase
-{
- /**
- * @var \Magento\Cms\Controller\Noroute
- */
- protected $_controller;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_cmsHelperMock;
-
- /**
- * @var \PHPUnit_Framework_MockObject_MockObject
- */
- protected $_requestMock;
-
- protected function setUp()
- {
- $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
- $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
- $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
- $responseMock->expects(
- $this->at(0)
- )->method(
- 'setHeader'
- )->with(
- 'HTTP/1.1',
- '404 Not Found'
- )->will(
- $this->returnValue($responseMock)
- );
- $responseMock->expects(
- $this->at(1)
- )->method(
- 'setHeader'
- )->with(
- 'Status',
- '404 File not found'
- )->will(
- $this->returnValue($responseMock)
- );
-
- $scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $this->_requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
- $this->_cmsHelperMock = $this->getMock('Magento\Cms\Helper\Page', [], [], '', false);
- $valueMap = [
- [
- 'Magento\Framework\App\Config\ScopeConfigInterface',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $scopeConfigMock,
- ],
- ['Magento\Cms\Helper\Page', $this->_cmsHelperMock],
- ];
- $objectManagerMock->expects($this->any())->method('get')->will($this->returnValueMap($valueMap));
- $scopeConfigMock->expects(
- $this->once()
- )->method(
- 'getValue'
- )->with(
- \Magento\Cms\Helper\Page::XML_PATH_NO_ROUTE_PAGE
- )->will(
- $this->returnValue('pageId')
- );
- $this->_controller = $helper->getObject(
- 'Magento\Cms\Controller\Noroute\Index',
- ['response' => $responseMock, 'objectManager' => $objectManagerMock, 'request' => $this->_requestMock]
- );
- }
-
- /**
- * @param bool $renderPage
- * @dataProvider indexActionDataProvider
- */
- public function testIndexAction($renderPage)
- {
- $this->_cmsHelperMock->expects($this->once())->method('renderPage')->will($this->returnValue($renderPage));
- $this->_requestMock->expects($this->any())->method('setActionName')->with('defaultNoRoute');
- $this->_controller->execute();
- }
-
- public function indexActionDataProvider()
- {
- return ['renderPage_return_true' => [true], 'renderPage_return_false' => [false]];
- }
-}
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php b/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
old mode 100644
new mode 100755
index f8d59563ce77dba7e5289da5408a81f0f8d99860..e8b54125d1933ca75ac6953944d7f3979d4a5bb2
--- a/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
@@ -34,7 +34,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
protected $pageMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -53,11 +53,6 @@ class PageTest extends \PHPUnit_Framework_TestCase
*/
protected $pageConfigMock;
- /**
- * @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $viewMock;
-
/**
* @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
*/
@@ -113,6 +108,11 @@ class PageTest extends \PHPUnit_Framework_TestCase
*/
protected $messageCollectionMock;
+ /**
+ * @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $resultPageFactory;
+
protected function setUp()
{
$this->actionMock = $this->getMockBuilder('Magento\Framework\App\Action\Action')
@@ -141,7 +141,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
]
)
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->getMockForAbstractClass();
$this->localeDateMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\TimezoneInterface')
->getMockForAbstractClass();
@@ -150,8 +150,6 @@ class PageTest extends \PHPUnit_Framework_TestCase
$this->pageConfigMock = $this->getMockBuilder('Magento\Framework\View\Page\Config')
->disableOriginalConstructor()
->getMock();
- $this->viewMock = $this->getMockBuilder('Magento\Framework\App\ViewInterface')
- ->getMockForAbstractClass();
$this->escaperMock = $this->getMockBuilder('Magento\Framework\Escaper')
->disableOriginalConstructor()
->getMock();
@@ -189,6 +187,9 @@ class PageTest extends \PHPUnit_Framework_TestCase
'urlBuilder' => $this->urlBuilderMock
]
);
+
+ $this->resultPageFactory = $this->getMock('Magento\Framework\View\Result\PageFactory', [], [], '', false);
+
$this->object = $objectManager->getObject(
'Magento\Cms\Helper\Page',
[
@@ -199,9 +200,9 @@ class PageTest extends \PHPUnit_Framework_TestCase
'localeDate' => $this->localeDateMock,
'design' => $this->designMock,
'pageConfig' => $this->pageConfigMock,
- 'view' => $this->viewMock,
'escaper' => $this->escaperMock,
- 'messageManager' => $this->messageManagerMock
+ 'messageManager' => $this->messageManagerMock,
+ 'resultPageFactory' => $this->resultPageFactory
]
);
}
@@ -221,7 +222,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
*
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
- public function testRenderPageExtended(
+ public function testPrepareResultPage(
$pageId,
$internalPageId,
$pageLoadResultIndex,
@@ -287,6 +288,8 @@ class PageTest extends \PHPUnit_Framework_TestCase
$this->pageMock->expects($this->any())
->method('getCustomPageLayout')
->willReturn($customPageLayout);
+ $this->resultPageFactory->expects($this->any())->method('create')
+ ->will($this->returnValue($this->resultPageMock));
$this->resultPageMock->expects($this->any())
->method('getConfig')
->willReturn($this->pageConfigMock);
@@ -294,9 +297,6 @@ class PageTest extends \PHPUnit_Framework_TestCase
->method('setPageLayout')
->with($handle)
->willReturnSelf();
- $this->viewMock->expects($this->any())
- ->method('getPage')
- ->willReturn($this->resultPageMock);
$this->resultPageMock->expects($this->any())
->method('initLayout')
->willReturnSelf();
@@ -313,10 +313,6 @@ class PageTest extends \PHPUnit_Framework_TestCase
$this->pageMock->expects($this->any())
->method('getIdentifier')
->willReturn($pageIdentifier);
- $this->viewMock->expects($this->any())
- ->method('addPageLayoutHandles')
- ->with(['id' => $pageIdentifier])
- ->willReturn(true);
$this->eventManagerMock->expects($this->any())
->method('dispatch')
->with(
@@ -326,9 +322,6 @@ class PageTest extends \PHPUnit_Framework_TestCase
'controller_action' => $this->actionMock
]
);
- $this->viewMock->expects($this->any())
- ->method('loadLayoutUpdates')
- ->willReturnSelf();
$this->pageMock->expects($this->any())
->method('getCustomLayoutUpdateXml')
->willReturn($customLayoutUpdateXml);
@@ -339,12 +332,6 @@ class PageTest extends \PHPUnit_Framework_TestCase
->method('addUpdate')
->with($layoutUpdate)
->willReturnSelf();
- $this->viewMock->expects($this->any())
- ->method('generateLayoutXml')
- ->willReturnSelf();
- $this->viewMock->expects($this->any())
- ->method('generateLayoutBlocks')
- ->willReturnSelf();
$this->layoutMock->expects($this->any())
->method('getBlock')
->with('page_content_heading')
@@ -377,13 +364,14 @@ class PageTest extends \PHPUnit_Framework_TestCase
->method('addMessages')
->with($this->messageCollectionMock)
->willReturnSelf();
- $this->viewMock->expects($this->any())
- ->method('renderLayout')
- ->willReturnSelf();
- $this->assertEquals(
+ if ($expectedResult) {
+ $expectedResult = $this->resultPageMock;
+ }
+
+ $this->assertSame(
$expectedResult,
- $this->object->renderPageExtended($this->actionMock, $pageId)
+ $this->object->prepareResultPage($this->actionMock, $pageId)
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php
index f857bdfbe581df4c216543a4829b86f4c988a317..6c6ac15177ba4cb35750be1f4e2be989d72667dc 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php
@@ -11,7 +11,7 @@ namespace Magento\Cms\Model\Resource\Page;
class CollectionTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -107,7 +107,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
->withAnyParameters()
->willReturn($this->searchResultProcessorMock);
$this->storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
'',
false,
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php b/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php
index fded796ee9b77882d6bf44836745d2c3931b9520..b8e32ba2f1a7427349e81b982dd6a550718cafd8 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php
@@ -11,7 +11,7 @@ namespace Magento\Cms\Model\Template;
class FilterTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -27,7 +27,7 @@ class FilterTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
index a9d3696dc7b2992a9981d344cc420406e846eefb..b2e5d8fb32b6195e69f973097c844d65775d20ee 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
@@ -46,7 +46,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
protected $scopeConfigMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -85,7 +85,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
->disableOriginalConstructor()
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php
index f0ebded1855a6aa17d54fb0f6def35a7acc70810..a0e3bdc23a2da4884f7934e47df6bf0d63fbda64 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php
@@ -18,7 +18,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
protected $catalogData;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -36,7 +36,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
->setMethods(['isPriceGlobal'])
->disableOriginalConstructor()
->getMock();
- $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
index dea736872b6c646c5c828f3477401c8724e32b63..5d88d7b9e3158528d6d018c023e34d48c8fae2eb 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
@@ -47,7 +47,7 @@ class AttributePriceTest extends \PHPUnit_Framework_TestCase
protected $regularPriceMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
index 0569cfade91f042ec2da7b215f002088ab347750..77f1a5a81b5d889dd8948326df68e4ade00ef482 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
@@ -79,7 +79,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
$this->getMock('\Magento\Framework\Mail\Template\TransportBuilder', [], [], '', false),
$this->getMockForAbstractClass('\Magento\Framework\Translate\Inline\StateInterface', [], '', false),
$this->_scopeConfig,
- $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface', [], '', false)
+ $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface', [], '', false)
);
}
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php
index 4f9e857f11091caad6ef116fffd438b16ccfae91..d26a9f6206941c848a5345d05223284bd478afca 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php
@@ -54,7 +54,7 @@ class PostTest extends \PHPUnit_Framework_TestCase
protected $_messageManager;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $_storeManager;
@@ -78,7 +78,7 @@ class PostTest extends \PHPUnit_Framework_TestCase
$this->_request = $this->getMock('\Magento\Framework\App\Request\Http', ['getPost'], [], '', false);
$this->_redirect = $this->getMock('\Magento\Framework\App\Response\RedirectInterface', [], [], '', false);
$this->_view = $this->getMock('\Magento\Framework\App\ViewInterface', [], [], '', false);
- $this->_storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+ $this->_storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
$this->_transportBuilder = $this->getMock(
'\Magento\Framework\Mail\Template\TransportBuilder',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
index 170308652dbe3acc2ab68958d49fa046105a05fc..26e655449859b80fca1855cd426d19c7e0a2db1e 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
@@ -56,7 +56,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
$this->getMock('\Magento\Framework\Mail\Template\TransportBuilder', [], [], '', false),
$this->getMockForAbstractClass('\Magento\Framework\Translate\Inline\StateInterface', [], '', false),
$this->_scopeConfig,
- $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface', [], '', false)
+ $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface', [], '', false)
);
}
@@ -71,7 +71,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
'isSetFlag'
)->with(
\Magento\Contact\Controller\Index::XML_PATH_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue(false)
);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
index 679108ffc167435dcd3ff3197374620e24d750a8..94808003006c069ac366d7d97509681834622916 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
@@ -138,7 +138,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
Data::XML_PATH_DEV_ALLOW_IPS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
)->will($this->returnValue($allowedIps));
@@ -269,7 +269,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
Data::XML_PATH_DEFAULT_COUNTRY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
)->will($this->returnValue($country));
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php b/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php
index 4805b2bdc54bbac1790dc2a61213db231ff88934..40e0dc69eef74d245aa1ce4fae0913247ebc39b7 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php
@@ -19,7 +19,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
public function testGetCurrentBase64Url()
{
- $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$urlBuilderMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
@@ -55,7 +55,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
*/
public function testGetEncodedUrl($url, $callNum)
{
- $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$urlBuilderMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
@@ -96,7 +96,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
public function testGetHomeUrl()
{
- $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
index 4986a88c4ab0452cb8dbf920ceaeae6dedbb0ad6..57e4613c9e5c694f713c61d5f61ba183651e74d6 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
@@ -367,13 +367,7 @@ class NameTest extends \PHPUnit_Framework_TestCase
*/
public function testGetStoreLabel($attributeCode, $storeLabel, $expectedValue)
{
- $this->attribute->expects(
- $this->once()
- )->method(
- 'getStoreLabel'
- )->will(
- $this->returnValue($storeLabel)
- );
+ $this->attribute->expects($this->atLeastOnce())->method('getStoreLabel')->willReturn($storeLabel);
$this->assertEquals($expectedValue, $this->_block->getStoreLabel($attributeCode));
}
@@ -405,7 +399,7 @@ class NameTest extends \PHPUnit_Framework_TestCase
)
)
);
- $this->assertSame('', $this->_block->getStoreLabel('attributeCode'));
+ $this->assertSame('', (string)$this->_block->getStoreLabel('attributeCode'));
}
/**
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
index c716eae071fce89d5e1d8af5dffb94b8dcac17dc..d56513e1afae5e23424f55f707c7b2705d54e5ac 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
@@ -10,7 +10,7 @@ namespace Magento\Customer\Controller\Account;
use Magento\Customer\Helper\Address;
use Magento\Customer\Model\Url;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -388,12 +388,12 @@ class ConfirmTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo('*/*/index'), ['_secure' => true])
->will($this->returnValue($successUrl));
- $this->redirectMock->expects($this->once())
+ $this->redirectMock->expects($this->never())
->method('success')
->with($this->equalTo($resultUrl))
->will($this->returnValue($resultUrl));
- $this->scopeConfigMock->expects($this->once())
+ $this->scopeConfigMock->expects($this->never())
->method('isSetFlag')
->with(
$this->equalTo(Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD),
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
index c0630ada0897f385c66e4ec9b3641121a2afa766..52f5f4714ac1033a31165dc1cbc24b8fb3f7dbba 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
@@ -12,7 +12,7 @@ namespace Magento\Customer\Controller\Account;
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Customer\Helper\Address;
use Magento\Customer\Model\Url;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* @SuppressWarnings(PHPMD.TooManyFields)
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php b/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
index ad9936c78ebdfbac046adbc1708f9286485acbeb..667fdb0779dddcb798dd3d9fae586a237c990638 100755
--- a/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
@@ -20,7 +20,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\View\Element\BlockFactory|\PHPUnit_Framework_MockObject_MockObject */
protected $blockFactory;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -44,7 +44,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
'Magento\Framework\View\Element\BlockFactory'
)->disableOriginalConstructor()->getMock();
$this->storeManager = $this->getMockBuilder(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->disableOriginalConstructor()->getMock();
$this->scopeConfig = $this->getMockBuilder(
'Magento\Framework\App\Config\ScopeConfigInterface'
@@ -155,7 +155,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
->will($this->returnValue('1'));
$this->scopeConfig->expects($this->once())//test method cache
->method('getValue')
- ->with('customer/address', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+ ->with('customer/address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
->will($this->returnValue($result));
$this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$this->assertNull($this->helper->getConfig('unavailable_key'));
@@ -231,7 +231,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Customer\Helper\Address::XML_PATH_VAT_VALIDATION_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue($result));
@@ -261,7 +261,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Customer\Helper\Address::XML_PATH_VIV_ON_EACH_TRANSACTION,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue($result));
@@ -291,7 +291,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Customer\Helper\Address::XML_PATH_VIV_TAX_CALCULATION_ADDRESS_TYPE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)
->will($this->returnValue($result));
@@ -316,7 +316,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Customer\Helper\Address::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
->will($this->returnValue(true));
$this->assertTrue($this->helper->isDisableAutoGroupAssignDefaultValue());
@@ -328,7 +328,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Customer\Helper\Address::XML_PATH_VAT_FRONTEND_VISIBILITY,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
->will($this->returnValue(true));
$this->assertTrue($this->helper->isVatAttributeVisible());
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php
index 003b676169497e7c2cba418baa92ced38063060c..db0879fb5fc653495e0348351c380ea1198b8c14 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php
@@ -14,15 +14,15 @@ class StoreTest extends \PHPUnit_Framework_TestCase
protected $testable;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
public function setUp()
{
- $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->getMock();
- /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+ /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
$this->testable = new Store($storeManager);
}
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php
index f328441dc5714f3975cea330d40f42117ae4467b..3d99d9375f764c3358df7296e45b07679d6bd018 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php
@@ -14,15 +14,15 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
protected $testable;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
public function setUp()
{
- $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->getMock();
- /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+ /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
$this->testable = new Website($storeManager);
}
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/BooleanTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/BooleanTest.php
index ac61fbeb7c60c980304d5b34d934f737bc8a6164..eb9b41a3ec66f37d99791c6fb823e7e6ddbcb022 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/BooleanTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/BooleanTest.php
@@ -25,7 +25,7 @@ class BooleanTest extends AbstractFormTestCase
$value,
0
);
- $this->assertSame($expected, $boolean->outputValue());
+ $this->assertSame($expected, (string)$boolean->outputValue());
}
public function getOptionTextDataProvider()
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
index 2b38c3849543a44edd1f252d1bddf884c3f2c03b..6059ff2f89d4ad865d6ae78cc929529cc9c3018c 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
@@ -20,7 +20,7 @@ class StateTest extends \PHPUnit_Framework_TestCase
/**#@+
* Layout update resource models
*/
- const LAYOUT_UPDATE_RESOURCE_MODEL_CORE_CLASS_NAME = 'Magento\Core\Model\Resource\Layout\Update';
+ const LAYOUT_UPDATE_RESOURCE_MODEL_CORE_CLASS_NAME = 'Magento\Widget\Model\Resource\Layout\Update';
const LAYOUT_UPDATE_RESOURCE_MODEL_VDE_CLASS_NAME = 'Magento\DesignEditor\Model\Resource\Layout\Update';
@@ -149,7 +149,7 @@ class StateTest extends \PHPUnit_Framework_TestCase
)->with(
$this->equalTo(\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID),
$this->equalTo(self::THEME_ID),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE)
)->will(
$this->returnSelf()
);
diff --git a/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php b/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
index 6b292fb6e5658f9ed8c2421e56d9739d6fb19985..9e576c4d8e069c7dee86ae5a89a96d80122b9fa6 100644
--- a/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
@@ -115,13 +115,13 @@ class DebugHintsTest extends \PHPUnit_Framework_TestCase
[
[
DebugHints::XML_PATH_DEBUG_TEMPLATE_HINTS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
$showTemplateHints,
],
[
DebugHints::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
$showBlockHints
],
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
index 62708a4d0332d7456dbb60a21c39df5186346044..e5c2914f3651339ec12cc2a7957caa16ce079e7a 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
@@ -77,7 +77,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
$this->_coreHelper = $this->getMock('Magento\Core\Helper\Data', [], [], '', false);
$this->_store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
- $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+ $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->_store));
$currencyFactory = $this->getMock('Magento\Directory\Model\CurrencyFactory', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php
index 8b31ca2c35059944efddaa62f8a2fd64c3a1e122..cf7afd8f96ffb9813863177102db84fbb7a2ef82 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php
@@ -6,7 +6,7 @@
namespace Magento\Directory\Model;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
class ObserverTest extends \PHPUnit_Framework_TestCase
@@ -26,7 +26,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject */
protected $transportBuilder;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject */
@@ -79,7 +79,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$this->scopeConfig
->expects($this->at(0))
->method('getValue')
- ->with(Observer::IMPORT_ENABLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with(Observer::IMPORT_ENABLE, ScopeInterface::SCOPE_STORE)
->will($this->returnValue(1));
$this->scopeConfig
->expects($this->at(1))
@@ -89,7 +89,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$this->scopeConfig
->expects($this->at(2))
->method('getValue')
- ->with(Observer::IMPORT_SERVICE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with(Observer::IMPORT_SERVICE, ScopeInterface::SCOPE_STORE)
->will($this->returnValue('import-service'));
$importInterfaceMock = $this->getMockBuilder('Magento\Directory\Model\Currency\Import\Webservicex')
->disableOriginalConstructor()
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php b/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
index 67b21e1aeccb5b8edff90fe6e3ed9cb82b6ba0dd..522c50d4ce45d6684785d968c49948188fbe3b6b 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
@@ -14,7 +14,7 @@ class PriceCurrencyTest extends \PHPUnit_Framework_TestCase
protected $priceCurrency;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
diff --git a/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php
index 727661e6d3b1f5f5f02abb755faafc99a49fe4b3..eafee58aba50099123f8238946428532ddbb3b90 100644
--- a/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php
@@ -10,7 +10,7 @@ use Magento\Downloadable\Model\Product\Type;
use Magento\Downloadable\Model\Product\Type as DownloadableProductType;
use Magento\Downloadable\Model\Resource\Link\Purchased\Item\Collection as LinkItemCollection;
use Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
class ObserverTest extends \PHPUnit_Framework_TestCase
@@ -223,11 +223,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$this->scopeConfig->expects($this->once())
->method('isSetFlag')
- ->with(
- Observer::XML_PATH_DISABLE_GUEST_CHECKOUT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $this->storeMock
- )
+ ->with(Observer::XML_PATH_DISABLE_GUEST_CHECKOUT, ScopeInterface::SCOPE_STORE, $this->storeMock)
->willReturn(true);
$this->observerMock->expects($this->exactly(3))
@@ -270,11 +266,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$this->scopeConfig->expects($this->once())
->method('isSetFlag')
- ->with(
- Observer::XML_PATH_DISABLE_GUEST_CHECKOUT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $this->storeMock
- )
+ ->with(Observer::XML_PATH_DISABLE_GUEST_CHECKOUT, ScopeInterface::SCOPE_STORE, $this->storeMock)
->willReturn(false);
$this->observerMock->expects($this->exactly(2))
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
index 27ab79c97be4b42f8a3e4acc899731963061562a..f14a99bfc6aaf3822b0dbe2706eb753e81d9f456 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
@@ -46,7 +46,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $entityTypeMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -79,7 +79,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
->method('getEntityType')
->will($this->returnValue($this->entityTypeMock));
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->storeManagerMock->expects($this->any())
->method('getStore')
->will($this->returnSelf());
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
index cf7d5d61967dfd366c43bc25b6dfe9bc2197bf7d..b3e15125f0632b525d2cb74ea40ca35a0d1728e2 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
@@ -38,7 +38,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
protected $coreResourceMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -83,7 +83,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
false
);
$this->storeManagerMock = $this->getMock(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
index 4f0f2f650124d7fad870240bfc37a793d5686723..fe240f2422bde4758f769f8d73f56257fff19446 100644
--- a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
@@ -54,7 +54,7 @@ class PreviewTest extends \PHPUnit_Framework_TestCase
$design = $this->getMock('Magento\Framework\View\DesignInterface');
$store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false);
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
- $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())->method('getDefaultStoreView')->will($this->returnValue(null));
$storeManager->expects($this->any())->method('getStores')->will($this->returnValue([$store]));
@@ -140,7 +140,7 @@ class PreviewTest extends \PHPUnit_Framework_TestCase
$eventManage = $this->getMock('Magento\Framework\Event\ManagerInterface');
$scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$design = $this->getMock('Magento\Framework\View\DesignInterface');
- $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())->method('getDefaultStoreView')->will($this->returnValue(null));
$storeManager->expects($this->any())->method('getStores')->will($this->returnValue([]));
diff --git a/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
index 7054c045d028fd8f663e086211c0e4d44d5202ec..a9c8534c2f270114c6076a6c7f02dd254097192a 100644
--- a/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
@@ -48,7 +48,7 @@ class CarrierTest extends \PHPUnit_Framework_TestCase
$rateFactory->expects($this->any())->method('create')->will($this->returnValue($rate));
$store = $this->getMock('Magento\Store\Model\Store', ['getBaseCurrencyCode', '__wakeup'], [], '', false);
- $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
$priceCurrency->expects($this->once())
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/ViewTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/ViewTest.php
index 2201b46fe20e20de95e9046e1385ada87edf275f..4502bfbfc8c28c4265e2a0c7d05052a7baf04d09 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/ViewTest.php
@@ -58,7 +58,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
$this->_layoutMock = $this->getMock('Magento\Framework\View\Layout', [], [], '', false);
$this->_requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
$this->_configScopeMock = $this->getMock('Magento\Framework\Config\ScopeInterface');
- $this->_layoutProcessor = $this->getMock('Magento\Core\Model\Layout\Merge', [], [], '', false);
+ $this->_layoutProcessor = $this->getMock('Magento\Framework\View\Model\Layout\Merge', [], [], '', false);
$this->_layoutMock->expects($this->any())->method('getUpdate')
->will($this->returnValue($this->_layoutProcessor));
$this->_actionFlagMock = $this->getMock('Magento\Framework\App\ActionFlag', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php
index 970377a81108b4a76af066f7886c62db1cdf9d2f..05f63c59fc8cc5e6da814cfd39b462bba45e212c 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php
@@ -33,7 +33,7 @@ class NotProtectedExtensionTest extends \PHPUnit_Framework_TestCase
$this->equalTo(
\Magento\Core\Model\File\Validator\NotProtectedExtension::XML_PATH_PROTECTED_FILE_EXTENSIONS
),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo(null)
)->will(
$this->returnValue($this->_protectedList)
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/ImageTest.php b/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/ImageTest.php
index a48451fca5acd580c737d08d558ee228e0af41c4..aae483343d502fbc4feeab9ff3633f820819ffaf 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Data/Form/Element/ImageTest.php
@@ -9,6 +9,8 @@
*/
namespace Magento\Framework\Data\Form\Element;
+use Magento\Framework\UrlInterface;
+
class ImageTest extends \PHPUnit_Framework_TestCase
{
/**
@@ -16,6 +18,11 @@ class ImageTest extends \PHPUnit_Framework_TestCase
*/
protected $_objectManagerMock;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $urlBuilder;
+
/**
* @var \Magento\Framework\Data\Form\Element\Image
*/
@@ -32,12 +39,12 @@ class ImageTest extends \PHPUnit_Framework_TestCase
false
);
$escaperMock = $this->getMock('\Magento\Framework\Escaper', [], [], '', false);
- $urlBuilderMock = $this->getMock('\Magento\Framework\Url', [], [], '', false);
+ $this->urlBuilder = $this->getMock('\Magento\Framework\Url', [], [], '', false);
$this->_image = new \Magento\Framework\Data\Form\Element\Image(
$factoryMock,
$collectionFactoryMock,
$escaperMock,
- $urlBuilderMock
+ $this->urlBuilder
);
$formMock = new \Magento\Framework\Object();
$formMock->getHtmlIdPrefix('id_prefix');
@@ -81,12 +88,16 @@ class ImageTest extends \PHPUnit_Framework_TestCase
public function testGetElementHtmlWithValue()
{
$this->_image->setValue('test_value');
+ $this->urlBuilder->expects($this->once())
+ ->method('getBaseUrl')
+ ->with(['_type' => UrlInterface::URL_TYPE_MEDIA])
+ ->willReturn('http://localhost/media/');
$html = $this->_image->getElementHtml();
$this->assertContains('class="input-file"', $html);
$this->assertContains('<input', $html);
$this->assertContains('type="file"', $html);
$this->assertContains('value="test_value"', $html);
- $this->assertContains('<a href="test_value" onclick="imagePreview(\'_image\'); return false;"', $html);
+ $this->assertContains('<a href="http://localhost/media/test_value" onclick="imagePreview(\'_image\'); return false;"', $html);
$this->assertContains('<input type="checkbox"', $html);
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Exception/InputExceptionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Exception/InputExceptionTest.php
index e2e4b827741835a33b35a5f2d09c8674b80fdfb8..b5c79b274badab4b7ab58c001bd7d327fe6bfda8 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Exception/InputExceptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Exception/InputExceptionTest.php
@@ -3,161 +3,130 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-// @codingStandardsIgnoreStart
-namespace {
- $mockTranslate = false;
-}
+namespace Magento\Framework\Exception;
-namespace Magento\Framework\Exception {
- // @codingStandardsIgnoreEnd
+/**
+ * @covers \Magento\Framework\Exception\InputException
+ */
+class InputExceptionTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * Verify that the constructor creates a single instance of InputException with the proper
+ * message and array of parameters.
+ *
+ * @return void
+ */
+ public function testConstructor()
+ {
+ $params = ['fieldName' => 'quantity', 'value' => -100, 'minValue' => 0];
+ $inputException = new InputException(InputException::INVALID_FIELD_MIN_VALUE, $params);
+
+ $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $inputException->getRawMessage());
+ $this->assertStringMatchesFormat('%s greater than or equal to %s', $inputException->getMessage());
+ $this->assertEquals(
+ 'The quantity value of "-100" must be greater than or equal to 0.',
+ $inputException->getLogMessage()
+ );
+ }
/**
- * @SuppressWarnings(PHPMD.ShortMethodName)
- * @return string
+ * Verify that adding multiple errors works correctly.
+ *
+ * @return void
*/
- function __()
+ public function testAddError()
{
- global $mockTranslate;
- $prefix = '';
- if (isset($mockTranslate) && $mockTranslate === true) {
- $prefix = 'TRANSLATED: ';
- }
- return $prefix . call_user_func_array('\__', func_get_args());
+ $inputException = new InputException();
+
+ $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getRawMessage());
+ $this->assertEquals(
+ InputException::DEFAULT_MESSAGE,
+ $inputException->getMessage()
+ );
+ $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getLogMessage());
+
+ $this->assertFalse($inputException->wasErrorAdded());
+ $this->assertCount(0, $inputException->getErrors());
+
+ $inputException->addError(
+ InputException::INVALID_FIELD_MIN_VALUE,
+ ['fieldName' => 'weight', 'value' => -100, 'minValue' => 1]
+ );
+ $this->assertTrue($inputException->wasErrorAdded());
+ $this->assertCount(0, $inputException->getErrors());
+
+ $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $inputException->getRawMessage());
+ $this->assertEquals(
+ 'The weight value of "-100" must be greater than or equal to 1.',
+ $inputException->getMessage()
+ );
+ $this->assertEquals(
+ 'The weight value of "-100" must be greater than or equal to 1.',
+ $inputException->getLogMessage()
+ );
+
+ $inputException->addError(InputException::REQUIRED_FIELD, ['fieldName' => 'name']);
+ $this->assertTrue($inputException->wasErrorAdded());
+ $this->assertCount(2, $inputException->getErrors());
+
+ $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getRawMessage());
+ $this->assertEquals(
+ InputException::DEFAULT_MESSAGE,
+ $inputException->getMessage()
+ );
+ $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getLogMessage());
+
+ $errors = $inputException->getErrors();
+ $this->assertCount(2, $errors);
+
+ $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $errors[0]->getRawMessage());
+ $this->assertEquals(
+ 'The weight value of "-100" must be greater than or equal to 1.',
+ $errors[0]->getMessage()
+ );
+ $this->assertEquals(
+ 'The weight value of "-100" must be greater than or equal to 1.',
+ $errors[0]->getLogMessage()
+ );
+
+ $this->assertEquals(InputException::REQUIRED_FIELD, $errors[1]->getRawMessage());
+ $this->assertEquals('name is a required field.', $errors[1]->getMessage());
+ $this->assertEquals('name is a required field.', $errors[1]->getLogMessage());
}
/**
- * Class InputExceptionTest
+ * Verify the message and params are not used to determine the call count
+ *
+ * @return void
*/
- class InputExceptionTest extends \PHPUnit_Framework_TestCase
+ public function testAddErrorWithSameMessage()
{
- const TRANSLATED_PREFIX = 'TRANSLATED: ';
-
- public function setUp()
- {
- global $mockTranslate;
- $mockTranslate = true;
- }
-
- /**
- * Verify that the constructor creates a single instance of InputException with the proper
- * message and array of parameters.
- *
- * @return void
- */
- public function testConstructor()
- {
- $params = ['fieldName' => 'quantity', 'value' => -100, 'minValue' => 0];
- $inputException = new InputException(InputException::INVALID_FIELD_MIN_VALUE, $params);
-
- $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $inputException->getRawMessage());
- $this->assertStringMatchesFormat('%s greater than or equal to %s', $inputException->getMessage());
- $this->assertEquals(
- 'The quantity value of "-100" must be greater than or equal to 0.',
- $inputException->getLogMessage()
- );
- }
-
- /**
- * Verify that adding multiple errors works correctly.
- *
- * @return void
- */
- public function testAddError()
- {
- $inputException = new InputException();
-
- $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getRawMessage());
- $this->assertEquals(
- self::TRANSLATED_PREFIX . InputException::DEFAULT_MESSAGE,
- $inputException->getMessage()
- );
- $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getLogMessage());
-
- $this->assertFalse($inputException->wasErrorAdded());
- $this->assertCount(0, $inputException->getErrors());
-
- $inputException->addError(
- InputException::INVALID_FIELD_MIN_VALUE,
- ['fieldName' => 'weight', 'value' => -100, 'minValue' => 1]
- );
- $this->assertTrue($inputException->wasErrorAdded());
- $this->assertCount(0, $inputException->getErrors());
-
- $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $inputException->getRawMessage());
- $this->assertEquals(
- self::TRANSLATED_PREFIX .
- 'The weight value of "-100" must be greater than or equal to 1.',
- $inputException->getMessage()
- );
- $this->assertEquals(
- 'The weight value of "-100" must be greater than or equal to 1.',
- $inputException->getLogMessage()
- );
-
- $inputException->addError(InputException::REQUIRED_FIELD, ['fieldName' => 'name']);
- $this->assertTrue($inputException->wasErrorAdded());
- $this->assertCount(2, $inputException->getErrors());
-
- $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getRawMessage());
- $this->assertEquals(
- self::TRANSLATED_PREFIX . InputException::DEFAULT_MESSAGE,
- $inputException->getMessage()
- );
- $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getLogMessage());
-
- $errors = $inputException->getErrors();
- $this->assertCount(2, $errors);
-
- $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $errors[0]->getRawMessage());
- $this->assertEquals(
- self::TRANSLATED_PREFIX .
- 'The weight value of "-100" must be greater than or equal to 1.',
- $errors[0]->getMessage()
- );
- $this->assertEquals(
- 'The weight value of "-100" must be greater than or equal to 1.',
- $errors[0]->getLogMessage()
- );
-
- $this->assertEquals(InputException::REQUIRED_FIELD, $errors[1]->getRawMessage());
- $this->assertEquals(self::TRANSLATED_PREFIX . 'name is a required field.', $errors[1]->getMessage());
- $this->assertEquals('name is a required field.', $errors[1]->getLogMessage());
- }
-
- /**
- * Verify the message and params are not used to determine the call count
- *
- * @return void
- */
- public function testAddErrorWithSameMessage()
- {
- $rawMessage = 'Foo "%var"';
- $params = ['var' => 'Bar'];
- $expectedProcessedMessage = 'Foo "Bar"';
- $inputException = new InputException($rawMessage, $params);
- $this->assertEquals($rawMessage, $inputException->getRawMessage());
- $this->assertEquals(self::TRANSLATED_PREFIX . $expectedProcessedMessage, $inputException->getMessage());
- $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
- $this->assertFalse($inputException->wasErrorAdded());
- $this->assertCount(0, $inputException->getErrors());
-
- $inputException->addError($rawMessage, $params);
- $this->assertEquals(self::TRANSLATED_PREFIX . $expectedProcessedMessage, $inputException->getMessage());
- $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
- $this->assertTrue($inputException->wasErrorAdded());
- $this->assertCount(0, $inputException->getErrors());
-
- $inputException->addError($rawMessage, $params);
- $this->assertEquals(self::TRANSLATED_PREFIX . $expectedProcessedMessage, $inputException->getMessage());
- $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
- $this->assertTrue($inputException->wasErrorAdded());
-
- $errors = $inputException->getErrors();
- $this->assertCount(2, $errors);
- $this->assertEquals(self::TRANSLATED_PREFIX . $expectedProcessedMessage, $errors[0]->getMessage());
- $this->assertEquals($expectedProcessedMessage, $errors[0]->getLogMessage());
- $this->assertEquals(self::TRANSLATED_PREFIX . $expectedProcessedMessage, $errors[1]->getMessage());
- $this->assertEquals($expectedProcessedMessage, $errors[1]->getLogMessage());
- }
+ $rawMessage = 'Foo "%var"';
+ $params = ['var' => 'Bar'];
+ $expectedProcessedMessage = 'Foo "Bar"';
+ $inputException = new InputException($rawMessage, $params);
+ $this->assertEquals($rawMessage, $inputException->getRawMessage());
+ $this->assertEquals($expectedProcessedMessage, $inputException->getMessage());
+ $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
+ $this->assertFalse($inputException->wasErrorAdded());
+ $this->assertCount(0, $inputException->getErrors());
+
+ $inputException->addError($rawMessage, $params);
+ $this->assertEquals($expectedProcessedMessage, $inputException->getMessage());
+ $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
+ $this->assertTrue($inputException->wasErrorAdded());
+ $this->assertCount(0, $inputException->getErrors());
+
+ $inputException->addError($rawMessage, $params);
+ $this->assertEquals($expectedProcessedMessage, $inputException->getMessage());
+ $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
+ $this->assertTrue($inputException->wasErrorAdded());
+
+ $errors = $inputException->getErrors();
+ $this->assertCount(2, $errors);
+ $this->assertEquals($expectedProcessedMessage, $errors[0]->getMessage());
+ $this->assertEquals($expectedProcessedMessage, $errors[0]->getLogMessage());
+ $this->assertEquals($expectedProcessedMessage, $errors[1]->getMessage());
+ $this->assertEquals($expectedProcessedMessage, $errors[1]->getLogMessage());
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Pricing/Render/RendererPoolTest.php b/dev/tests/unit/testsuite/Magento/Framework/Pricing/Render/RendererPoolTest.php
index 1a5ed42fd59beb53407acdc6955a8b33a73719d7..2179bb5b7df5fd32e24e6cae5aee36981594d545 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Pricing/Render/RendererPoolTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Pricing/Render/RendererPoolTest.php
@@ -16,7 +16,7 @@ class RendererPoolTest extends \PHPUnit_Framework_TestCase
protected $object;
/**
- * @var \Magento\Core\Model\Layout | \PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\View\Layout | \PHPUnit_Framework_MockObject_MockObject
*/
protected $layoutMock;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
index 67a8190b83e7aa630d2114bd36043defc3465d53..e51b345024e437f48a4fe454538ee3ecc5fdb550 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
@@ -465,7 +465,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
[
'scopeConfig' => $this->configMock,
'validatorFactory' => $this->validatorFactoryMock,
- 'scopeType' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ 'scopeType' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
'cacheLimiter' => \Magento\Framework\Session\SaveHandlerInterface::DEFAULT_HANDLER,
'lifetimePath' => 'test_web/test_cookie/test_cookie_lifetime',
'request' => $this->requestMock,
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php b/dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php
index 3e55494ff58094740faeb45ce5c6a257d6ce6a2b..38aaa5d1fb6d68b0522dbf2d73103ccebb504fe1 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php
@@ -10,7 +10,7 @@ class ScopeResolverTest extends \PHPUnit_Framework_TestCase
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- protected $_storeManagerMock;
+ protected $scopeResolverMock;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
@@ -20,10 +20,10 @@ class ScopeResolverTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->_storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
+ $this->scopeResolverMock = $this->getMockBuilder('Magento\Framework\App\ScopeResolverInterface')->getMock();
$this->_object = $objectManager->getObject(
'Magento\Framework\Url\ScopeResolver',
- ['storeManager' => $this->_storeManagerMock]
+ ['scopeResolver' => $this->scopeResolverMock]
);
}
@@ -33,11 +33,11 @@ class ScopeResolverTest extends \PHPUnit_Framework_TestCase
*/
public function testGetScope($scopeId)
{
- $scopeMock = $this->getMockBuilder('\Magento\Framework\Url\ScopeInterface')->getMock();
- $this->_storeManagerMock->expects(
+ $scopeMock = $this->getMockBuilder('Magento\Framework\Url\ScopeInterface')->getMock();
+ $this->scopeResolverMock->expects(
$this->at(0)
)->method(
- 'getStore'
+ 'getScope'
)->with(
$scopeId
)->will(
@@ -65,7 +65,7 @@ class ScopeResolverTest extends \PHPUnit_Framework_TestCase
public function testGetScopes()
{
- $this->_storeManagerMock->expects($this->once())->method('getStores');
+ $this->scopeResolverMock->expects($this->once())->method('getScopes');
$this->_object->getScopes();
}
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php b/dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php
index ba44579221dc96f34e805c6ef36e7143d6e357ae..ca3263b8eb9e7803940db771ef24a818fdf751b3 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php
@@ -19,14 +19,7 @@ class SecurityInfoTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
- $this->_model = new \Magento\Framework\Url\SecurityInfo($this->_scopeConfigMock, ['/account', '/cart']);
- }
-
- public function testIsSecureReturnsFalseIfDisabledInConfig()
- {
- $this->_scopeConfigMock->expects($this->once())->method('getValue')->will($this->returnValue(false));
- $this->assertFalse($this->_model->isSecure('http://example.com/account'));
+ $this->_model = new \Magento\Framework\Url\SecurityInfo(['/account', '/cart']);
}
/**
@@ -36,7 +29,6 @@ class SecurityInfoTest extends \PHPUnit_Framework_TestCase
*/
public function testIsSecureChecksIfUrlIsInSecureList($url, $expected)
{
- $this->_scopeConfigMock->expects($this->once())->method('getValue')->will($this->returnValue(true));
$this->assertEquals($expected, $this->_model->isSecure($url));
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php b/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
index 62606668601aa5a5108d84c628c50710c5c45714..84dccffe3d6e5cdec5de7b3e5fe399055328be70 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
@@ -106,7 +106,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
*/
protected function getUrlModel($arguments = [])
{
- $arguments = array_merge($arguments, ['scopeType' => Store\ScopeInterface::SCOPE_STORE]);
+ $arguments = array_merge($arguments, ['scopeType' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE]);
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
return $objectManager->getObject('Magento\Framework\Url', $arguments);
}
@@ -499,7 +499,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
$this->scopeConfig->expects($this->any())
->method('getValue')
- ->with($this->equalTo($configPath), Store\ScopeInterface::SCOPE_STORE, $this->scopeMock)
+ ->with($this->equalTo($configPath), \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->scopeMock)
->will($this->returnValue('http://localhost/'));
$this->routeParamsResolverMock->expects($this->at(0))->method('hasData')->with('secure_is_forced')
->will($this->returnValue(false));
@@ -546,7 +546,7 @@ class UrlTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
'web/secure/base_url_secure_forced',
- Store\ScopeInterface::SCOPE_STORE, $this->scopeMock
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->scopeMock
)
->will($this->returnValue('http://localhost/'));
$this->routeParamsResolverMock->expects($this->once())->method('hasData')->with('secure_is_forced')
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ConfigTest.php
index cf83ec7fdbb627515712d7a889139af363fc911f..f4eb83ceae526ef58a0fc2a13882ad6b79205792 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ConfigTest.php
@@ -38,7 +38,7 @@ class ConfigTest extends \Magento\Test\BaseTestCase
{
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(Config::XML_PATH_MERGE_CSS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with(Config::XML_PATH_MERGE_CSS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->willReturn($booleanData);
$this->assertSame($booleanData, $this->model->isMergeCssFiles());
}
@@ -50,7 +50,7 @@ class ConfigTest extends \Magento\Test\BaseTestCase
{
$this->scopeConfigMock->expects($this->once())
->method('isSetFlag')
- ->with(Config::XML_PATH_MERGE_JS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with(Config::XML_PATH_MERGE_JS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->willReturn($booleanData);
$this->assertSame($booleanData, $this->model->isMergeJsFiles());
}
@@ -62,7 +62,7 @@ class ConfigTest extends \Magento\Test\BaseTestCase
->method('isSetFlag')
->with(
sprintf(Config::XML_PATH_MINIFICATION_ENABLED, $contentType),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->willReturn(true);
$this->assertTrue($this->model->isAssetMinification($contentType));
}
@@ -75,7 +75,7 @@ class ConfigTest extends \Magento\Test\BaseTestCase
->method('getValue')
->with(
sprintf(Config::XML_PATH_MINIFICATION_ADAPTER, $contentType),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->willReturn($adapter);
$this->assertSame($adapter, $this->model->getAssetMinificationAdapter($contentType));
}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/LayoutTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/LayoutTest.php
index 07792d1add264fd50a7cb1eeb0b7a8d055a84266..7327807f51ebc3e1807303816c6ee76e395426e7 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/LayoutTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/LayoutTest.php
@@ -36,7 +36,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
protected $themeResolverMock;
/**
- * @var \Magento\Core\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\View\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject
*/
protected $processorMock;
@@ -76,7 +76,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
$this->themeResolverMock = $this->getMockForAbstractClass(
'Magento\Framework\View\Design\Theme\ResolverInterface'
);
- $this->processorMock = $this->getMock('Magento\Core\Model\Layout\Merge', [], [], '', false);
+ $this->processorMock = $this->getMock('Magento\Framework\View\Model\Layout\Merge', [], [], '', false);
$this->schStructureMock = $this->getMock('Magento\Framework\View\Layout\ScheduledStructure', [], [], '', false);
$this->eventManagerMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
$this->generatorBlockMock = $this->getMockBuilder('Magento\Framework\View\Layout\Generator\Block')
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
similarity index 91%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
index 817190736493d3fdbb574b92e8f91ee8caa6dfb0..1a319c9856ef82ffd4bf41134bc053dc3f3bc402 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
@@ -3,17 +3,17 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout;
+namespace Magento\Framework\View\Model\Layout;
class MergeTest extends \PHPUnit_Framework_TestCase
{
/**
* Fixture XML instruction(s) to be used in tests
*/
- const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="fixture.phtml"/>';
+ const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>';
/**
- * @var \Magento\Core\Model\Layout\Merge
+ * @var \Magento\Framework\View\Model\Layout\Merge
*/
protected $_model;
@@ -40,7 +40,7 @@ class MergeTest extends \PHPUnit_Framework_TestCase
/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
- protected $_store;
+ protected $scope;
/**
* @var \PHPUnit_Framework_MockObject_MockObject
@@ -61,7 +61,7 @@ class MergeTest extends \PHPUnit_Framework_TestCase
{
$files = [];
foreach (glob(__DIR__ . '/_files/layout/*.xml') as $filename) {
- $files[] = new \Magento\Framework\View\File($filename, 'Magento_Core');
+ $files[] = new \Magento\Framework\View\File($filename, 'Magento_Widget');
}
$fileSource = $this->getMockForAbstractClass('Magento\Framework\View\File\CollectorInterface');
$fileSource->expects($this->any())->method('getFiles')->will($this->returnValue($files));
@@ -71,19 +71,19 @@ class MergeTest extends \PHPUnit_Framework_TestCase
$design = $this->getMockForAbstractClass('Magento\Framework\View\DesignInterface');
- $this->_store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
- $this->_store->expects($this->any())->method('getId')->will($this->returnValue(20));
- $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
- $storeManager->expects($this->once())->method('getStore')->with(null)->will($this->returnValue($this->_store));
+ $this->scope = $this->getMock('Magento\Framework\Url\ScopeInterface', [], [], '', false);
+ $this->scope->expects($this->any())->method('getId')->will($this->returnValue(20));
+ $scopeResolver = $this->getMockForAbstractClass('Magento\Framework\Url\ScopeResolverInterface');
+ $scopeResolver->expects($this->once())->method('getScope')->with(null)->will($this->returnValue($this->scope));
- $this->_resource = $this->getMock('Magento\Core\Model\Resource\Layout\Update', [], [], '', false);
+ $this->_resource = $this->getMock('Magento\Widget\Model\Resource\Layout\Update', [], [], '', false);
$this->_appState = $this->getMock('Magento\Framework\App\State', [], [], '', false);
$this->_logger = $this->getMock('Psr\Log\LoggerInterface');
$this->_layoutValidator = $this->getMock(
- 'Magento\Core\Model\Layout\Update\Validator',
+ 'Magento\Framework\View\Model\Layout\Update\Validator',
[],
[],
'',
@@ -118,10 +118,10 @@ class MergeTest extends \PHPUnit_Framework_TestCase
->getMock();
$this->_model = $objectHelper->getObject(
- 'Magento\Core\Model\Layout\Merge',
+ 'Magento\Framework\View\Model\Layout\Merge',
[
'design' => $design,
- 'storeManager' => $storeManager,
+ 'scopeResolver' => $scopeResolver,
'fileSource' => $fileSource,
'pageLayoutFileSource' => $pageLayoutFileSource,
'resource' => $this->_resource,
@@ -274,22 +274,22 @@ class MergeTest extends \PHPUnit_Framework_TestCase
public function testLoadDbApp()
{
$this->_resource->expects(
- $this->once()
+ $this->any()
)->method(
'fetchUpdatesByHandle'
)->with(
'fixture_handle',
$this->_theme,
- $this->_store
+ $this->scope
)->will(
$this->returnValue(self::FIXTURE_LAYOUT_XML)
);
$this->assertEmpty($this->_model->getHandles());
$this->assertEmpty($this->_model->asString());
- $handles = ['fixture_handle'];
+ $handles = ['fixture_handle_one'];
$this->_model->load($handles);
$this->assertEquals($handles, $this->_model->getHandles());
- $this->assertXmlStringEqualsXmlString(self::FIXTURE_LAYOUT_XML, $this->_model->asString());
+ $this->assertXmlStringEqualsXmlString('<body>' . self::FIXTURE_LAYOUT_XML . '</body>', $this->_model->asString());
}
public function testGetFileLayoutUpdatesXml()
@@ -321,17 +321,17 @@ class MergeTest extends \PHPUnit_Framework_TestCase
$expected = [
'customer_account' => [
'name' => 'customer_account',
- 'label' => 'Customer My Account (All Pages)',
+ 'label' => __('Customer My Account (All Pages)'),
'design_abstraction' => 'custom',
],
'page_empty' => [
'name' => 'page_empty',
- 'label' => 'All Empty Layout Pages',
+ 'label' => __('All Empty Layout Pages'),
'design_abstraction' => 'page_layout',
],
];
- $this->assertSame($expected, $this->_model->getAllDesignAbstractions());
+ $this->assertEquals($expected, $this->_model->getAllDesignAbstractions());
}
public function testIsPageLayoutDesignAbstractions()
@@ -399,7 +399,7 @@ class MergeTest extends \PHPUnit_Framework_TestCase
$this->_layoutValidator->expects($this->any())->method('isValid')->will($this->returnValue(false));
$suffix = md5(implode('|', $this->_model->getHandles()));
- $cacheId = "LAYOUT_{$this->_theme->getArea()}_STORE{$this->_store->getId()}_{$this->_theme->getId()}{$suffix}";
+ $cacheId = "LAYOUT_{$this->_theme->getArea()}_STORE{$this->scope->getId()}_{$this->_theme->getId()}{$suffix}";
$messages = $this->_layoutValidator->getMessages();
// Testing error message is logged with logger
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/TranslatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/TranslatorTest.php
similarity index 80%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/TranslatorTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/TranslatorTest.php
index 81b1f45c1ceb49ccf1b6bd949bb34ed30c87ce3c..3ca1601dfa45ac1e53e354264811d98e39978be1 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/TranslatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/TranslatorTest.php
@@ -3,12 +3,12 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout;
+namespace Magento\Framework\View\Model\Layout;
class TranslatorTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\Translator
+ * @var \Magento\Framework\View\Model\Layout\Translator
*/
protected $_object;
@@ -45,11 +45,11 @@ XML;
$this->_xmlDocument = simplexml_load_string($string, 'Magento\Framework\Simplexml\Element');
- $this->_object = new \Magento\Core\Model\Layout\Translator();
+ $this->_object = new \Magento\Framework\View\Model\Layout\Translator();
}
/**
- * @covers \Magento\Core\Model\Layout\Translator::translateActionParameters
+ * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
*/
public function testTranslateActionParametersWithNonTranslatedArgument()
{
@@ -60,7 +60,7 @@ XML;
}
/**
- * @covers \Magento\Core\Model\Layout\Translator::translateActionParameters
+ * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
*/
public function testTranslateActionParametersWithTranslatedArgument()
{
@@ -72,7 +72,7 @@ XML;
}
/**
- * @covers \Magento\Core\Model\Layout\Translator::translateActionParameters
+ * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
*/
public function testTranslateActionParametersWithHierarchyTranslatedArgumentAndNonStringParam()
{
@@ -84,7 +84,7 @@ XML;
}
/**
- * @covers \Magento\Core\Model\Layout\Translator::translateActionParameters
+ * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
*/
public function testTranslateActionParametersWithoutModule()
{
@@ -96,7 +96,7 @@ XML;
}
/**
- * @covers \Magento\Core\Model\Layout\Translator::translateArgument
+ * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
*/
public function testTranslateArgumentWithDefaultModuleAndSelfTranslatedMode()
{
@@ -105,7 +105,7 @@ XML;
}
/**
- * @covers \Magento\Core\Model\Layout\Translator::translateArgument
+ * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
*/
public function testTranslateArgumentWithoutModuleAndNoSelfTranslatedMode()
{
@@ -114,7 +114,7 @@ XML;
}
/**
- * @covers \Magento\Core\Model\Layout\Translator::translateArgument
+ * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
*/
public function testTranslateArgumentViaParentNodeWithParentModule()
{
@@ -123,7 +123,7 @@ XML;
}
/**
- * @covers \Magento\Core\Model\Layout\Translator::translateArgument
+ * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
*/
public function testTranslateArgumentViaParentNodeWithOwnModule()
{
@@ -132,7 +132,7 @@ XML;
}
/**
- * @covers \Magento\Core\Model\Layout\Translator::translateArgument
+ * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
*/
public function testTranslateArgumentViaParentWithNodeThatIsNotInTranslateList()
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/Update/ValidatorTest.php
similarity index 96%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/Update/ValidatorTest.php
index cc4950fa16edcf4e3b3b122d8aac8467f217e0d8..8c16998fe6aedf03ad3c517145d8ac4ce4428e9e 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/Update/ValidatorTest.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout\Update;
+namespace Magento\Framework\View\Model\Layout\Update;
-use Magento\Core\Model\Layout\Update\Validator;
+use Magento\Framework\View\Model\Layout\Update\Validator;
class ValidatorTest extends \PHPUnit_Framework_TestCase
{
@@ -62,7 +62,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
);
$model = $this->_objectHelper->getObject(
- 'Magento\Core\Model\Layout\Update\Validator',
+ 'Magento\Framework\View\Model\Layout\Update\Validator',
['dirList' => $dirList, 'domConfigFactory' => $domConfigFactory]
);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_default.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_category_default.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_default.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_category_default.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_layered.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_category_layered.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_layered.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_category_layered.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_simple.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view_type_simple.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_simple.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view_type_simple.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_index.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/checkout_onepage_index.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_index.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/checkout_onepage_index.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/customer_account.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/customer_account.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/customer_account.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/customer_account.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/default.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/default.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/default.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/default.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/file_wrong.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/file_wrong.xml
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_one.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_one.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c259187703f184c46ffb13137c86b4c13096e772
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_one.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page>
+ <body>
+ <block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>
+ </body>
+</page>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_page_layout.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_page_layout.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_page_layout.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_page_layout.xml
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_two.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_two.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9e3196c69b2941674cdc8609eba9d146b4ccfe1f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_two.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page>
+ <body>
+ <block class="Magento\Framework\View\Element\Template" template="fixture_template_two.phtml"/>
+ </body>
+</page>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_with_page_layout.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_with_page_layout.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_with_page_layout.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_with_page_layout.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/not_a_page_type.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/not_a_page_type.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/not_a_page_type.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/not_a_page_type.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/page_empty.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/page_empty.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/page_empty.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/page_empty.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/print.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/print.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/print.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/print.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_guest_print.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/sales_guest_print.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_guest_print.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/sales_guest_print.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_order_print.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/sales_order_print.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_order_print.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/sales_order_print.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/merged.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/merged.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/merged.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/merged.xml
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php
index 526a8a3f3aa411845875e9ffec63012700fa5410..cf259b68d3b07c33733f4250c47f2de61000eae7 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php
@@ -9,7 +9,7 @@
*/
namespace Magento\Framework\View\Page;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
class TitleTest extends \PHPUnit_Framework_TestCase
{
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Result/PageTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Result/PageTest.php
index 84d9b346355be2a2a3a9d10bc9680fec2c91e37a..be6f534564ed7c82ebab967e9dd0a7f8d38876bb 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Result/PageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Result/PageTest.php
@@ -33,7 +33,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
protected $layout;
/**
- * @var \Magento\Core\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Framework\View\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject
*/
protected $layoutMerge;
@@ -73,7 +73,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$this->layoutFactory->expects($this->any())->method('create')->will($this->returnValue($this->layout));
- $this->layoutMerge = $this->getMockBuilder('Magento\Core\Model\Layout\Merge')
+ $this->layoutMerge = $this->getMockBuilder('Magento\Framework\View\Model\Layout\Merge')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php
index 6055ad43c5fd41826bcfbd9b3b60b3aa876cecf5..c2712492bba77c1d6250553f368de9b7c4d43a3d 100644
--- a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php
@@ -101,7 +101,7 @@ class CartRepositoryTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->giftMessageManagerMock =
$this->getMock('Magento\GiftMessage\Model\GiftMessageManager', [], [], '', false);
$this->helperMock = $this->getMock('Magento\GiftMessage\Helper\Message', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php
index a90156cb497ffd911aa4926d1eb9a629e00a5dd4..18fb89322ce346894f8746baa0650c205634bb02 100644
--- a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php
@@ -100,7 +100,7 @@ class ItemRepositoryTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->giftMessageManagerMock =
$this->getMock('Magento\GiftMessage\Model\GiftMessageManager', [], [], '', false);
$this->helperMock = $this->getMock('Magento\GiftMessage\Helper\Message', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
index 40f5bd711289876f308ce56ae05f59123bfea3ed..bc2c747e6d2eff79daf1d192b44de49f2621dd31 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
@@ -63,7 +63,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
'isSetFlag'
)->with(
\Magento\GoogleOptimizer\Helper\Data::XML_PATH_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)->will(
$this->returnValue($isExperimentsEnabled)
@@ -95,7 +95,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
'isSetFlag'
)->with(
\Magento\GoogleOptimizer\Helper\Data::XML_PATH_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$store
)->will(
$this->returnValue($isExperimentsEnabled)
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
index bf809208479cd156fb0b9a246a782209c77759d8..db475eaf54019d64591e3eb705a84246c7f58131 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
@@ -53,14 +53,14 @@ class MassAddTest extends \PHPUnit_Framework_TestCase
->setMethods(['getId', '__sleep', '__wakeup'])->getMock();
$store->expects($this->exactly(2))->method('getId')->will($this->returnValue(1));
- $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->once())->method('getStore')->will($this->returnValue($store));
$this->controllerArguments['context']->getObjectManager()
->expects($this->at(0))->method('get')->with('Magento\GoogleShopping\Model\Flag')
->will($this->returnValue($this->flag));
$this->controllerArguments['context']->getObjectManager()
- ->expects($this->at(1))->method('get')->with('Magento\Framework\Store\StoreManagerInterface')
+ ->expects($this->at(1))->method('get')->with('Magento\Store\Model\StoreManagerInterface')
->will($this->returnValue($storeManager));
$this->controller = $this->objectManagerHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php
index e48388469be4473683950d6ab0dd5ad85b23f0e5..f005bf9c109125847325c9f8324962af0c5c88c7 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php
@@ -22,7 +22,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Stdlib\String|\PHPUnit_Framework_MockObject_MockObject */
protected $string;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerInterface;
protected function setUp()
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php
index d87417d789c6fd7f89382a10cee43464419f882f..2a4e858daf9cf649022ccb2e28014794ca7295f4 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php
@@ -47,7 +47,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
'google/googleshopping/' . $configPasswordKey,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$storeId
)->will($this->returnValue($password));
$this->assertEquals($password, $this->model->getAccountPassword($storeId));
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
index d14ae8351bba88603e3b39825bc532fa1e5b9bba..fd30bf370848c9f29b279c471f689fe0cfa6a119 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
@@ -28,7 +28,7 @@ class MassOperationsTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Notification\NotifierInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $notificationInterface;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerInterface;
/** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -58,7 +58,7 @@ class MassOperationsTest extends \PHPUnit_Framework_TestCase
false
);
$this->notificationInterface = $this->getMock('Magento\Framework\Notification\NotifierInterface');
- $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->logger = $this->getMock('Psr\Log\LoggerInterface');
$this->googleShoppingHelper = $this->getMock('Magento\GoogleShopping\Helper\Data', [], [], '', false);
$this->googleShoppingCategoryHelper = $this->getMock('Magento\GoogleShopping\Helper\Category');
diff --git a/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php b/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
index e5d7cc11403250d5aaa02e8854afd0abf5f3ae22..796207b6750678058b75543c4170a2f59c85fd3d 100644
--- a/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
+++ b/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
@@ -38,7 +38,7 @@ class GroupedTest extends \PHPUnit_Framework_TestCase
$this->productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
$this->coreHelperMock = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
$this->storeManagerMock = $this->getMock(
- '\Magento\Framework\Store\StoreManagerInterface',
+ '\Magento\Store\Model\StoreManagerInterface',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php b/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php
index f22bcbcb95dc8a3fd1ccd9c381988a4078d903d0..d469332820303bfa4a0c6afffd207e3c9be4e0a4 100644
--- a/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php
@@ -44,7 +44,7 @@ class CatalogPriceTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->commonPriceMock = $this->getMock(
'Magento\Catalog\Model\Product\CatalogPrice',
[],
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php
index 1a23367cd52989e2fc04a9c28d41655f2960aa6b..288782ca318d4b3803a0df0856f2d10a47921aac 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php
@@ -49,7 +49,7 @@ class EavAbstractTest extends \PHPUnit_Framework_TestCase
protected $_resourceHelper;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
index a9a2c2fff6880c6b797d59dbc5873f7297bee290..681c9593b52838fede078f6b2633aa1d90ae3a2f 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
@@ -70,7 +70,7 @@ abstract class IntegrationTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $_viewMock;
- /** @var \Magento\Core\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Framework\View\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject */
protected $_layoutMergeMock;
/** @var \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -174,7 +174,7 @@ abstract class IntegrationTest extends \PHPUnit_Framework_TestCase
->getMock();
$this->_layoutMock = $this->getMock('Magento\Framework\View\LayoutInterface');
$this->_layoutMergeMock = $this->getMockBuilder(
- 'Magento\Core\Model\Layout\Merge'
+ 'Magento\Framework\View\Model\Layout\Merge'
)->disableOriginalConstructor()->getMock();
$this->_layoutMock->expects(
$this->any()
@@ -263,7 +263,7 @@ abstract class IntegrationTest extends \PHPUnit_Framework_TestCase
{
$map = [
['Magento\Framework\App\Config\ScopeConfigInterface', $this->_configMock],
- ['Magento\Core\Model\Layout\Filter\Acl', $this->_layoutFilterMock],
+ ['Magento\Backend\Model\Layout\Filter\Acl', $this->_layoutFilterMock],
['Magento\Backend\Model\Session', $this->_backendSessionMock],
['Magento\Framework\TranslateInterface', $this->_translateModelMock],
['Magento\Framework\Config\ScopeInterface', $this->_configScopeMock],
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php b/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
index 3a4eb3e10c0405f4bc38fd89d18b410606b79a7a..6374b23bec308df617b20174d60897b8e4b9aff9 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
@@ -7,7 +7,7 @@ namespace Magento\Integration\Helper\Oauth;
class ConsumerTest extends \PHPUnit_Framework_TestCase
{
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $_storeManagerMock;
/** @var \Magento\Integration\Model\Oauth\Consumer\Factory */
@@ -62,7 +62,7 @@ class ConsumerTest extends \PHPUnit_Framework_TestCase
$this->_tokenFactory->expects($this->any())->method('create')->will($this->returnValue($this->_tokenMock));
$this->_storeManagerMock = $this->getMockBuilder(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->disableOriginalConstructor()->getMockForAbstractClass();
$this->_storeMock = $this->getMockBuilder(
'Magento\Store\Model\Store'
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
index 2c9abbacc23bd61fb2cf8587fae0b7418d6dc281..b86c45b3bb617762587b65a13e24c8ac8d78a63f 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
@@ -91,7 +91,7 @@ class OauthTest extends \PHPUnit_Framework_TestCase
);
$this->_service = new \Magento\Integration\Service\V1\Oauth(
- $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
+ $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
$this->_consumerFactory,
$this->_tokenFactoryMock,
$this->getMock('Magento\Integration\Helper\Oauth\Data', [], [], '', false),
diff --git a/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php b/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php
index 49e48d08d29a515006b850dff35a1e5328f65aad..d6442da9d999d9d0253fea908bf0542b83c111c6 100644
--- a/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php
+++ b/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php
@@ -61,7 +61,7 @@ class LogTest extends \PHPUnit_Framework_TestCase
public function testGetLogCleanTime()
{
$this->scopeConfig->expects($this->once())->method('getValue')
- ->with(Log::XML_LOG_CLEAN_DAYS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with(Log::XML_LOG_CLEAN_DAYS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(30));
$this->assertEquals(2592000, $this->log->getLogCleanTime());
}
@@ -76,7 +76,7 @@ class LogTest extends \PHPUnit_Framework_TestCase
$this->scopeConfig->expects($this->once())->method('getValue')
->with(
'customer/online_customers/online_minutes_interval',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(10));
$this->assertEquals(10, $this->log->getOnlineMinutesInterval());
diff --git a/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php b/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php
index fe1b7ebb70bde3ff47544dcb4aa9a46515eaaf0e..ab7d9737d3a02c9e4dc29d36d607c2c5d53dcb1b 100644
--- a/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php
+++ b/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php
@@ -46,7 +46,7 @@ class CleanTest extends \PHPUnit_Framework_TestCase
->with(
\Magento\Log\Model\Log::XML_LOG_CLEAN_DAYS,
10,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
$this->_logMock->expects($this->once())->method('clean');
diff --git a/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php b/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php
index b8e542f9844a67eace5d4bff1ede4515105cd5e5..c67c65d2876dd930cf1195b00ffe1e2551b72804 100644
--- a/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php
@@ -26,7 +26,7 @@ class VisitorTest extends \PHPUnit_Framework_TestCase
protected $sessionManagerInterface;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerInterface;
@@ -59,7 +59,7 @@ class VisitorTest extends \PHPUnit_Framework_TestCase
{
$this->registry = $this->getMock('Magento\Framework\Registry');
$this->sessionManagerInterface = $this->getMock('Magento\Framework\Session\SessionManagerInterface');
- $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->header = $this->getMock('Magento\Framework\HTTP\Header', [], [], '', false);
$this->remoteAddress = $this->getMock('Magento\Framework\HTTP\PhpEnvironment\RemoteAddress', [], [], '', false);
$this->serverAddress = $this->getMock('Magento\Framework\HTTP\PhpEnvironment\ServerAddress', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
index b1726bfa8f1f952e75162dfce141c626abee7871..931c92190cb8d621371c405e7f4c3cdbc053919c 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
@@ -101,7 +101,7 @@ class ShippingTest extends \PHPUnit_Framework_TestCase
$carrierCode = 'some carrier code';
$name = 'some name';
$this->scopeConfigMock->expects($this->once())->method('getValue')->with('carriers/' . $carrierCode . '/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)->will($this->returnValue($name));
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE)->will($this->returnValue($name));
$this->assertEquals($name, $this->model->getCarrierName($carrierCode));
}
@@ -110,7 +110,7 @@ class ShippingTest extends \PHPUnit_Framework_TestCase
{
$carrierCode = 'some carrier code';
$this->scopeConfigMock->expects($this->once())->method('getValue')->with('carriers/' . $carrierCode . '/title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)->will($this->returnValue(null));
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE)->will($this->returnValue(null));
$this->assertEquals($carrierCode, $this->model->getCarrierName($carrierCode));
}
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
index a594804f3974cc175cbde43cc6561de4fb5143d7..411eaaa51d40aabd62361670a293902ec914f7df 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
@@ -45,7 +45,7 @@ class SuccessTest extends \PHPUnit_Framework_TestCase
false
);
$this->contextMock = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->contextMock->expects($this->once())->method('getSession')->will($this->returnValue($this->sessionMock));
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
index 46064a69ed282f85088b8edbe10cb9055eaea354..09434687725e98ae388fb66f649e57ed92a31ff8 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
@@ -13,7 +13,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
protected $model;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -41,7 +41,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
{
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
- $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
index 880214f645ec96bdee12b63aff4659fe1b3deb8e..e73c4b377411caf4438f23798385faa079b82131 100644
--- a/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
@@ -66,25 +66,25 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
[
[
\Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_BACKEND_HOST,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
'example.com',
],
[
\Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_BACKEND_PORT,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
'8080'
],
[
\Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_ACCESS_LIST,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
'127.0.0.1, 192.168.0.1,127.0.0.2'
],
[
\Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_DESIGN_THEME_REGEX,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
serialize([['regexp' => '(?i)pattern', 'value' => 'value_for_pattern']])
],
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/DepersonalizePluginTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Model/Layout/DepersonalizePluginTest.php
similarity index 97%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/DepersonalizePluginTest.php
rename to dev/tests/unit/testsuite/Magento/PageCache/Model/Layout/DepersonalizePluginTest.php
index 9f9fa70be441ebce8409c996fbd80078a26ecbee..c3630097d53cdb59f4e1fa64d948fd0edb12b7ae 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/DepersonalizePluginTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Model/Layout/DepersonalizePluginTest.php
@@ -6,7 +6,7 @@
// @codingStandardsIgnoreFile
-namespace Magento\Core\Model\Layout;
+namespace Magento\PageCache\Model\Layout;
/**
* Class DepersonalizePluginTest
@@ -14,7 +14,7 @@ namespace Magento\Core\Model\Layout;
class DepersonalizePluginTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Core\Model\Layout\DepersonalizePluginTest
+ * @var \Magento\PageCache\Model\Layout\DepersonalizePlugin
*/
protected $plugin;
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
index 601e8ba418f9ab93476db5a4664120868dc75820..82ad3a3460298fb8e902b4c6cd435284ca41ca2f 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
@@ -54,7 +54,7 @@ class SubstitutionTest extends \PHPUnit_Framework_TestCase
$this->stringContains(
'advanced/modules_disable_output/'
),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue(
false
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
index 6c30760a3c22d034e8eeda6f5239182231ee4f03..d62c4c2b960f6854c0c5861bc54b15b155e548b6 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
@@ -8,7 +8,7 @@
namespace Magento\Payment\Model;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
class ConfigTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
index 978b902b4ad1d880b3a627dcdd38be4ce5c6f2e5..41518982f168da6aac78cd7d680b29460e7b19a1 100644
--- a/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
+++ b/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
@@ -268,7 +268,7 @@ class AdditionalTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
'advanced/modules_disable_output/Magento_Persistent',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->willReturn(false);
// get cache
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
index 187fda56b30fa4186905141943ad43705decc1a5..6bd008cd8e640a757c020c690f8ffca666feb4f5 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
@@ -56,7 +56,7 @@ class ShippingMethodConverterTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->currencyMock = $this->getMock('\Magento\Directory\Model\Currency', [], [], '', false);
$this->shippingMethodMock =
$this->getMock('\Magento\Quote\Api\Data\ShippingMethodInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php
index 214f03f25d0cf0071f1fd07053465064a1b8aaaf..c1e59dbfd91ce85f9c1bea837717f40fa19583ce 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php
@@ -16,7 +16,7 @@ class CustomerQuoteTest extends \PHPUnit_Framework_TestCase
protected $customerQuote;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
*/
protected $storeManagerMock;
@@ -42,7 +42,7 @@ class CustomerQuoteTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->configMock = $this->getMockBuilder('Magento\Customer\Model\Config\Share')
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php
index 9a3678812e0373f36b943285ca6f96ce5f447620..6d45948f758f97ab288da9546093ae7b1d8eb97c 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php
@@ -8,7 +8,7 @@
namespace Magento\Quote\Model\Quote;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
/**
* Test class for \Magento\Sales\Model\Order
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php
index c41d81debcb831c0e007c3fbae34b04ff9af8cc2..940dd0f57106e35b41c542d7896b6beb8bf05d18 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php
@@ -8,7 +8,7 @@ namespace Magento\Quote\Model\Quote\Item;
use \Magento\Catalog\Model\Product;
use Magento\Quote\Model\Quote\ItemFactory;
use Magento\Quote\Model\Quote\Item;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
use Magento\Store\Model\Store;
use Magento\Framework\App\State;
use Magento\Framework\Object;
@@ -29,7 +29,7 @@ class ProcessorTest extends \PHPUnit_Framework_TestCase
protected $quoteItemFactoryMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface |\PHPUnit_Framework_MockObject_MockObject
+ * @var StoreManagerInterface |\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
index 4b772d50afc65ba84afec32f3b66ad95c68fc5d2..451d2281e49646a03b5bd2c690e62f79686f59b4 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
@@ -51,7 +51,7 @@ class QuoteRepositoryTest extends \PHPUnit_Framework_TestCase
$objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->quoteFactoryMock = $this->getMock('\Magento\Quote\Model\QuoteFactory', ['create'], [], '', false);
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->quoteMock = $this->getMock(
'\Magento\Quote\Model\Quote',
['load', 'loadByCustomer', 'getIsActive', 'getId', '__wakeup', 'setSharedStoreIds', 'save', 'delete',
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
index 50c471073b7fcb54e169d71c33cd465a40cf0192..d9e89ae07e385afa83455cad11a4bbc074f49c24 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -9,7 +9,7 @@
namespace Magento\Quote\Model;
use Magento\Quote\Model\Quote\Address;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
/**
@@ -887,10 +887,10 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
$this->quote->setStoreId($storeId);
$valueMap = [
- ['sales/minimum_order/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
- ['sales/minimum_order/multi_address', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
- ['sales/minimum_order/tax_including', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
];
$this->scopeConfig->expects($this->any())
->method('isSetFlag')
@@ -913,10 +913,10 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
$this->quote->setStoreId($storeId);
$valueMap = [
- ['sales/minimum_order/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
- ['sales/minimum_order/multi_address', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
- ['sales/minimum_order/amount', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, 20],
- ['sales/minimum_order/tax_including', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
+ ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+ ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
];
$this->scopeConfig->expects($this->any())
->method('isSetFlag')
diff --git a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
index 276b1c0daffac708cb40c9e523c996d863fc158c..8ab0afa7100c439640b9c773c3c22d23489241fc 100644
--- a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
@@ -76,7 +76,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
->willReturn($this->reportEventMock);
/** @var \Magento\Store\Model\StoreManagerInterfac|\PHPUnit_Framework_MockObject_MockObject $storeManager */
- $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->storeMock = $this->getMockBuilder('\Magento\Store\Model\Store')
->disableOriginalConstructor()->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php b/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php
index 396c0c691006d3d37034ef343f0f95d2a523f328..123a4cfa8af603a2954fce11aaca0568c1ae0ba0 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php
@@ -21,7 +21,7 @@ class RssTest extends \PHPUnit_Framework_TestCase
protected $objectManagerHelper;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerInterface;
@@ -37,7 +37,7 @@ class RssTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->rss = $this->getMock('Magento\Review\Model\Rss', ['__wakeUp', 'getProductCollection'], [], '', false);
$this->urlBuilder = $this->getMock('Magento\Framework\UrlInterface');
$this->objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php b/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php
index 6ac10c180951422c28029382c07c0b93b04890d7..ec6ff0e55f3e7bff837adc8a165bafdf730c8f4b 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php
@@ -27,12 +27,12 @@ class RecentTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Customer\Helper\Session\CurrentCustomer|\PHPUnit_Framework_MockObject_MockObject */
protected $currentCustomer;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
protected function setUp()
{
- $this->storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
$this->context->expects(
$this->any()
diff --git a/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php b/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
index 097f6abc1b94ce0de1a7ecdc22f679c71ebac677..1dd384080fc18d6f4dd3b9620d7a65178a7b2582 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
@@ -135,9 +135,7 @@ class PostTest extends \PHPUnit_Framework_TestCase
);
$this->_objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
$this->_messageManagerMock = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
- $this->_storeManagerInterfaceMock = $this->getMockForAbstractClass(
- 'Magento\Framework\Store\StoreManagerInterface'
- );
+ $this->_storeManagerInterfaceMock = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
$this->_storeModelMock = $this->getMock(
'Magento\Store\Model\Store', ['__wakeup', 'getId'], [], '', false
);
@@ -187,7 +185,7 @@ class PostTest extends \PHPUnit_Framework_TestCase
$this->_requestMock->expects($this->once())->method('getPost')
->will($this->returnValue(['status_id' => 1]));
$this->_objectManagerMock->expects($this->at(0))->method('get')
- ->with('Magento\Framework\Store\StoreManagerInterface')
+ ->with('Magento\Store\Model\StoreManagerInterface')
->will($this->returnValue($this->_storeManagerInterfaceMock));
$this->_reviewFactoryMock->expects($this->once())->method('create')
->will($this->returnValue($this->_reviewModelMock));
diff --git a/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php b/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
index 4102ac00348834b78905d59a065f3d5232ee2324..4644157c0f9eebdd1d131ff61d70345d31f1cc9b 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
@@ -148,7 +148,7 @@ class PostTest extends \PHPUnit_Framework_TestCase
$this->messageManager = $this->getMock('\Magento\Framework\Message\ManagerInterface');
$this->store = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
- $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
$this->model = (new \Magento\TestFramework\Helper\ObjectManager($this))
->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php
index 0f33ada38c0b460cd85db46593e50dea8a193f8a..ce455c7886c9918f07ac553d3404b304785773a0 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php
@@ -55,7 +55,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
$universalFactory->expects($this->any())->method('create')->will($this->returnValue($entity));
$store = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
$store->expects($this->any())->method('getId')->will($this->returnValue(1));
- $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
$fetchStrategy = $this->getMock(
'\Magento\Framework\Data\Collection\Db\FetchStrategy\Query',
diff --git a/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php b/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php
index 785eee86bd48ae9299d016878097ace7071892c2..20a385e193ae5d4d77b51b8b08dcc6b2c9994faa 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php
@@ -37,7 +37,7 @@ class ReviewTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Review\Model\Review\Summary|\PHPUnit_Framework_MockObject_MockObject */
protected $summaryMock;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerMock;
/** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -82,7 +82,7 @@ class ReviewTest extends \PHPUnit_Framework_TestCase
false
);
$this->summaryMock = $this->getMock('Magento\Review\Model\Review\Summary', [], [], '', false);
- $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->urlInterfaceMock = $this->getMock('Magento\Framework\UrlInterface');
$this->resource = $this->getMock('Magento\Review\Model\Resource\Review', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php b/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
index 119f682b59af11b6900cada12e4ab9c3c4e47e28..d4f72b1f046ffef32b2800c8dc197fce871badad 100644
--- a/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
@@ -49,7 +49,7 @@ class UrlBuilderTest extends \PHPUnit_Framework_TestCase
public function testGetUrlEmpty()
{
$this->scopeConfigInterface->expects($this->once())->method('getValue')
- ->with('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(false));
$this->assertEquals('', $this->urlBuilder->getUrl());
}
@@ -57,7 +57,7 @@ class UrlBuilderTest extends \PHPUnit_Framework_TestCase
public function testGetUrl()
{
$this->scopeConfigInterface->expects($this->once())->method('getValue')
- ->with('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->urlInterface->expects($this->once())->method('getUrl')
->with('rss/feed/index', ['type' => 'rss_feed'])
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php
index 7d7432fe5a58759f05716effa782233902c59a54..d8e94b601068d08f5eb7e0cb84dd03c48725f4c1 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php
@@ -95,7 +95,7 @@ class RssTest extends \PHPUnit_Framework_TestCase
public function testIsRssAllowed()
{
$this->scopeConfigInterface->expects($this->once())->method('isSetFlag')
- ->with('rss/order/status', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('rss/order/status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertTrue($this->rss->isRssAllowed());
}
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/RecentTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/RecentTest.php
index 33946edd7a3c9177baff18ab5d7ea851b7bf333c..6afae0681a8f7a8f654a44ce42f1a8202f8aca6e 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/RecentTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/RecentTest.php
@@ -66,7 +66,7 @@ class RecentTest extends \PHPUnit_Framework_TestCase
$data = [];
$attribute = ['customer_id', 'status'];
$customerId = 25;
- $layout = $this->getMock('Magento\Core\Model\Layout', ['getBlock'], [], '', false, false);
+ $layout = $this->getMock('Magento\Framework\View\Layout', ['getBlock'], [], '', false, false);
$this->context->expects($this->once())
->method('getLayout')
->will($this->returnValue($layout));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php
index 383078880447a76833acb9be65c4b6aeb95de0c0..2f4573684267da5ff0b9f3ae48f84d5de65406bf 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php
@@ -15,7 +15,7 @@ class AdminTest extends \PHPUnit_Framework_TestCase
protected $contextMock;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerMock;
@@ -49,7 +49,7 @@ class AdminTest extends \PHPUnit_Framework_TestCase
$this->contextMock = $this->getMockBuilder('Magento\Framework\App\Helper\Context')
->disableOriginalConstructor()
->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$this->salesConfigMock = $this->getMockBuilder('Magento\Sales\Model\Config')
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
index 542ef36e9e6023c2c233c4eeeef47fc1b2a5b23c..7cf3a0bb028147f95ec46fa70e55dc2bdfb3d314 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
@@ -37,7 +37,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
@@ -198,7 +198,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
$flagName,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->storeMock
)
->will($this->returnValue($returnValue));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
index 9ec31888e2df3683bc10bff2c1e27a6c50602ec8..87c343c1d6e178998f25cc2f6a2d8e75319c9795 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
@@ -26,7 +26,7 @@ class GuestTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $scopeConfigInterfaceMock;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerInterfaceMock;
/** @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject */
@@ -57,7 +57,7 @@ class GuestTest extends \PHPUnit_Framework_TestCase
{
$this->appContextHelperMock = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
$this->scopeConfigInterfaceMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
- $this->storeManagerInterfaceMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerInterfaceMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->stateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
$this->registryMock = $this->getMock('Magento\Framework\Registry');
$this->sessionMock = $this->getMock('Magento\Customer\Model\Session', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
index 5f23a54fc1a3017912e33671e6ac3f50e7053b54..e79ed2fb06a6ed0bbdd772fb85c8f357d939781f 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
@@ -47,7 +47,7 @@ class ReorderTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
@@ -129,7 +129,7 @@ class ReorderTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
Reorder::XML_PATH_SALES_REORDER_ALLOW,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->storeParam
)
->will($this->returnValue($returnValue));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
index c49c6b7caa1859799a4d36e9ece162e37f8ccebb..7e9d43e006f81036f76a525c1b00a28d5cd23974 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
@@ -59,7 +59,7 @@ class CreditmemoTest extends \PHPUnit_Framework_TestCase
'orderFactory' => $this->orderFactory,
'cmItemCollectionFactory' => $this->cmItemCollectionFactoryMock,
'calculatorFactory' => $this->getMock('Magento\Framework\Math\CalculatorFactory', [], [], '', false),
- 'storeManager' => $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
+ 'storeManager' => $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
'commentFactory' => $this->getMock(
'Magento\Sales\Model\Order\Creditmemo\CommentFactory',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
index 5b48505ed9bf43a79bdc988a3d134b2ac1d6d2da..5288da8be24f9c8d1909950b16514a7ec977e94d 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
@@ -64,7 +64,7 @@ class CreditmemoCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ class CreditmemoCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ class CreditmemoCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ class CreditmemoCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ class CreditmemoCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ class CreditmemoCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ class CreditmemoCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php
index ffc42b708bc79a99f6c40289b542b217e62146c3..b09bdecb125477f9cf9ad1dd72bd44bbbb7b59b6 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php
@@ -64,7 +64,7 @@ class CreditmemoIdentityTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ class CreditmemoIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ class CreditmemoIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ class CreditmemoIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ class CreditmemoIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ class CreditmemoIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ class CreditmemoIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
index 8c5bde878b000a7503c42a43867eead62f7d1512..97aaaf4a4294a10d5f37eb8995ccbe7bc9d43c4e 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
@@ -64,7 +64,7 @@ class InvoiceCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ class InvoiceCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ class InvoiceCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ class InvoiceCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ class InvoiceCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ class InvoiceCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ class InvoiceCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php
index 3e9db0321790738f65c740170eb6170b8c43826c..f580011c94f41c418ab83cf7df19caa54d68aaa7 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php
@@ -64,7 +64,7 @@ class InvoiceIdentityTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ class InvoiceIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ class InvoiceIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ class InvoiceIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ class InvoiceIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ class InvoiceIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ class InvoiceIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php
index 2e97be743c17d7c11c70f3220cce791f4104e691..5e9957e09e94010da355611e0115ff823d36003c 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php
@@ -64,7 +64,7 @@ class OrderCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ class OrderCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ class OrderCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ class OrderCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ class OrderCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ class OrderCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ class OrderCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php
index 42832d4810530e5b7e4d183b58aa00499ddd72cf..577952abc4e3074f512c151aedf8ff26190748ab 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php
@@ -64,7 +64,7 @@ class OrderIdentityTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ class OrderIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ class OrderIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ class OrderIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ class OrderIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ class OrderIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ class OrderIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(OrderIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
index 489a14bef4dfbfff93ccb3bc0828ccf9fc6827b4..90a0b371317e50d96ae218181a3862f2cb776060 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
@@ -64,7 +64,7 @@ class ShipmentCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ class ShipmentCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ class ShipmentCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ class ShipmentCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ class ShipmentCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ class ShipmentCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ class ShipmentCommentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php
index 4fb9c6f9986246b980b90ae94a167179dbc6cd84..6e75e356665835d1f8026c05198a5ab13ddb7a34 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php
@@ -64,7 +64,7 @@ class ShipmentIdentityTest extends \PHPUnit_Framework_TestCase
->method('isSetFlag')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_ENABLED),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(true));
@@ -79,7 +79,7 @@ class ShipmentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ class ShipmentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_COPY_TO),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue(null));
@@ -109,7 +109,7 @@ class ShipmentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_COPY_METHOD),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ class ShipmentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ class ShipmentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_TEMPLATE),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ class ShipmentIdentityTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
$this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_IDENTITY),
- $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+ $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
$this->equalTo($this->storeId)
)
->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php
index 6673480ef20181aec695e9d524ea15a5d90f6ea2..22a46782391953d3525813dc3d4380739171abe1 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php
@@ -159,7 +159,7 @@ class OrderStatusTest extends \PHPUnit_Framework_TestCase
public function testIsAllowed()
{
$this->scopeConfigInterface->expects($this->once())->method('getValue')
- ->with('rss/order/status', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('rss/order/status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertTrue($this->model->isAllowed());
}
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php
index 4203a3b3ec1f632ca6624133d1bb79dd63fad91a..0628db698dee17f04f36d282e1775bfd7ef65652 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php
@@ -24,7 +24,7 @@ class DiscountsTest extends \PHPUnit_Framework_TestCase
protected $objectManagerHelper;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManagerInterface;
@@ -70,7 +70,7 @@ class DiscountsTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->requestInterface = $this->getMock('Magento\Framework\App\RequestInterface');
$this->rssBuilderInterface = $this->getMock('Magento\Framework\App\Rss\UrlBuilderInterface');
$this->urlBuilderInterface = $this->getMock('Magento\Framework\UrlInterface');
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
index 6b448768f5e7eccb61914f1165320179b5c96cb5..77848fbbd917b41c11489b951028dad11d254b03 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
@@ -81,7 +81,7 @@ class CouponTest extends \PHPUnit_Framework_TestCase
$defaultLength = 100;
$this->scopeConfig->expects($this->once())
->method('getValue')
- ->with($helper::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with($helper::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($defaultLength));
$this->assertEquals($defaultLength, $helper->getDefaultLength());
@@ -93,7 +93,7 @@ class CouponTest extends \PHPUnit_Framework_TestCase
$defaultFormat = 'format';
$this->scopeConfig->expects($this->once())
->method('getValue')
- ->with($helper::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with($helper::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($defaultFormat));
$this->assertEquals($defaultFormat, $helper->getDefaultFormat());
@@ -105,7 +105,7 @@ class CouponTest extends \PHPUnit_Framework_TestCase
$defaultPrefix = 'prefix';
$this->scopeConfig->expects($this->once())
->method('getValue')
- ->with($helper::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with($helper::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($defaultPrefix));
$this->assertEquals($defaultPrefix, $helper->getDefaultPrefix());
@@ -117,7 +117,7 @@ class CouponTest extends \PHPUnit_Framework_TestCase
$defaultSuffix = 'suffix';
$this->scopeConfig->expects($this->once())
->method('getValue')
- ->with($helper::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with($helper::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($defaultSuffix));
$this->assertEquals($defaultSuffix, $helper->getDefaultSuffix());
@@ -129,10 +129,7 @@ class CouponTest extends \PHPUnit_Framework_TestCase
$defaultDashInterval = 4;
$this->scopeConfig->expects($this->once())
->method('getValue')
- ->with(
- $helper::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- )
+ ->with($helper::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue($defaultDashInterval));
$this->assertEquals($defaultDashInterval, $helper->getDefaultDashInterval());
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
index b796111a3c8356dc6e3fbd2527cdc607df2cf3a0..2c291891ef642c04398a76bb029d14e16be8c580 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
@@ -49,7 +49,7 @@ class CarrierTest extends \PHPUnit_Framework_TestCase
'getValue'
)->with(
'carriers',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue($carriers)
);
@@ -84,7 +84,7 @@ class CarrierTest extends \PHPUnit_Framework_TestCase
'getValue'
)->with(
sprintf('carriers/%s/%s', $carrierCode, $configPath),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue($configValue)
);
diff --git a/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
index 258d6c942457b97bbd9a0466dad53c7253d81b98..90531e21b3ec2bbf3ee62e691701238faaaaf3e9 100644
--- a/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
@@ -6,7 +6,7 @@
namespace Magento\Sitemap\Helper;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
use Magento\TestFramework\Helper\ObjectManager;
class DataTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
index 93fa00f0d3cce4ac3e8c2569701ed25ed517df2e..1d37e60cee1d1ed01c0ef12ab3a7930bf1a6d8f2 100644
--- a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
@@ -42,7 +42,7 @@ class StoreCheckTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->_storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->_storeManagerMock->expects(
$this->any()
diff --git a/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php b/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php
index fbec5b5792df88943b988cea382d72a02cc3b2d2..9e1c20d4bdcd426c9fe560e3a2b58e6d7c489ee2 100644
--- a/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php
@@ -58,7 +58,7 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
'getCookie'
]
);
- $this->_storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->_urlCoderMock = $this->getMock(
'\Magento\Framework\Encryption\UrlCoder',
[],
diff --git a/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php b/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php
index 5a35ba020947f4306893a0a47f5dd4d72cc0bb97..ea22d7f770013b84745779445b5e331613abd052 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php
@@ -19,12 +19,12 @@ class SwitcherTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Core\Helper\PostData|\PHPUnit_Framework_MockObject_MockObject */
protected $corePostDataHelper;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
protected function setUp()
{
- $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
+ $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')->getMock();
$this->context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
$this->context->expects($this->any())->method('getStoreManager')->will($this->returnValue($this->storeManager));
$this->corePostDataHelper = $this->getMock('Magento\Core\Helper\PostData', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
index 76e710f51033e66f2a6c65cff5da2c2395fb240b..94086ec908bce0547a75caf9bc4a3ac3d13def0a 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
@@ -13,7 +13,7 @@ namespace Magento\Store\Model\App;
class EmulationTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
*/
private $storeManagerMock;
@@ -79,7 +79,7 @@ class EmulationTest extends \PHPUnit_Framework_TestCase
$this->designMock = $this->getMockBuilder('Magento\Theme\Model\Design')
->disableOriginalConstructor()
->setMethods([])->getMock();
- $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->setMethods([])->getMock();
$this->translateMock = $this->getMockBuilder('Magento\Framework\TranslateInterface')
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php
index 8e50450f2e488b071e580fc54f23f62ea11f78d8..ae7ed0a039ced00380b1e1090da61f4cca769c3b 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php
@@ -35,7 +35,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_scopePullMock = $this->getMock('Magento\Framework\App\Config\ScopePool', [], [], '', false);
- $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->_initialConfigMock = $this->getMock('Magento\Framework\App\Config\Initial', [], [], '', false);
$this->_collectionFactory = $this->getMock(
'Magento\Store\Model\Resource\Config\Collection\ScopedFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php
index 60ebf91b2053ce63f4557551020d584e422d9be1..1112cc695c47380f5ef7a441d16667f4dd0bb4b6 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php
@@ -24,7 +24,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_storeManagerMock = $this->getMock(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php
index 113414dfeb52974c8e5e572dc8530352441f0e40..a618b5e7096c6ce9f4b37df99d44af6468dba0b1 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php
@@ -24,7 +24,7 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_storeManagerMock = $this->getMock(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
index 432026e92e5a933da6c17d07324038293b8c398d..ac869a0ecaa3fdc69edc7d462517c3ce974d5f84 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
@@ -344,7 +344,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(true));
$this->assertFalse($this->_model->isSingleStoreMode());
@@ -353,7 +353,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(false));
$this->assertFalse($this->_model->isSingleStoreMode());
@@ -362,7 +362,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(true));
//set $this->hasSingleStore() to true
$this->prepareMockForReinit();
@@ -374,7 +374,7 @@ class DbTest extends \PHPUnit_Framework_TestCase
->method('getValue')
->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will($this->returnValue(false));
$this->assertTrue($this->_model->isSingleStoreMode());
}
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
index 04042d67ce8d975499ddd835579ac6ad0af550f8..d1b60f61bd71439be1a2a263819aabffd342587e 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
@@ -130,7 +130,7 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
$this->helper = new \Magento\TestFramework\Helper\ObjectManager($this);
$this->_appStateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
- $this->_storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->_httpContext = $this->getMock('Magento\Framework\App\Http\Context', [], [], '', false);
$this->_scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->request = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false);
@@ -190,7 +190,7 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
'isSetFlag'
)->with(
\Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue(true)
);
@@ -290,12 +290,12 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
{
return [
['', '', 21, 11, 'store1'],
- ['11', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP, 21, null, 'store1'],
- ['12', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP, 22, null, null],
- ['11', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP, null, null, null],
- ['website1', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, 21, 11, 'store1'],
- ['31', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, 22, null, null],
- ['website1', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, null, 0, null],
+ ['11', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP, 21, null, 'store1'],
+ ['12', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP, 22, null, null],
+ ['11', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP, null, null, null],
+ ['website1', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, 21, 11, 'store1'],
+ ['31', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, 22, null, null],
+ ['website1', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, null, 0, null],
];
}
@@ -345,9 +345,9 @@ class StorageFactoryTest extends \PHPUnit_Framework_TestCase
public function getFromCookieDataProvider()
{
return [
- ['website1', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE],
- ['11', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP],
- ['store1', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE],
+ ['website1', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE],
+ ['11', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP],
+ ['store1', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
];
}
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php
index 403b10de640cd08c612f35066a97a494241d4468..aef8fbeab9509d6ce64c683b0f30aef29a61ce2f 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php
@@ -45,7 +45,7 @@ class StoreManagerTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->_storage = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storage = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->_model = new \Magento\Store\Model\StoreManager(
$this->_factoryMock,
@@ -146,7 +146,7 @@ class StoreManagerTest extends \PHPUnit_Framework_TestCase
'getValue'
)->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue(true)
);
@@ -165,7 +165,7 @@ class StoreManagerTest extends \PHPUnit_Framework_TestCase
'getValue'
)->with(
\Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)->will(
$this->returnValue(false)
);
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
index 09cd47f8017eda54ad658e622da7f28932e58947..86b2436be1fe13a79581fc56df11d767a8d45a2c 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
@@ -9,7 +9,6 @@
namespace Magento\Store\Model;
use Magento\Framework\App\Config\ReinitableConfigInterface;
-use Magento\Framework\Store\ScopeInterface;
/**
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -130,7 +129,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
*/
public function testGetWebsite($websiteId, $website)
{
- $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())
->method('getWebsite')
->with($websiteId)
@@ -166,7 +165,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
->with($this->equalTo('test/route'), $this->equalTo($params))
->will($this->returnValue('http://test/url'));
- $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())
->method('getStore')
->will($this->returnValue($defaultStore));
@@ -353,7 +352,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
$urlMock->expects($this->any())->method('getUrl')
->will($this->returnValue($url));
- $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
$storeManager->expects($this->any())
->method('getStore')
->will($this->returnValue($defaultStore));
@@ -403,7 +402,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
],
[
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
'scope_code',
'UAH'
],
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php
index 3ef527069bd84155f82325d8023fae45210c40d7..b99ffd42208e8244ba26c81575ce7c487753b2e1 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php
@@ -39,7 +39,7 @@ class StoresConfigTest extends \PHPUnit_Framework_TestCase
{
$this->_storeOne = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
$this->_storeTwo = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
- $this->_storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->_storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->_config = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
$this->_model = new \Magento\Store\Model\StoresConfig(
diff --git a/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/RouteParamsResolverTest.php b/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/RouteParamsResolverTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..0a424695c8b802c51d491ab59a647004067174fb
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/RouteParamsResolverTest.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Url\Plugin;
+
+class RouteParamsResolverTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Config\ScopeConfigInterface
+ */
+ protected $scopeConfigMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
+ */
+ protected $storeManagerMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Url\QueryParamsResolverInterface
+ */
+ protected $queryParamsResolverMock;
+
+ /**
+ * @var \Magento\Store\Url\Plugin\RouteParamsResolver
+ */
+ protected $model;
+
+ protected function setUp()
+ {
+ $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
+ $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+ $this->queryParamsResolverMock = $this->getMock('Magento\Framework\Url\QueryParamsResolverInterface');
+ $this->model = new \Magento\Store\Url\Plugin\RouteParamsResolver(
+ $this->scopeConfigMock,
+ $this->storeManagerMock,
+ $this->queryParamsResolverMock
+ );
+ }
+
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
+ public function testAroundSetRouteParamsScopeInParams()
+ {
+ $storeCode = 'custom_store';
+ $this->scopeConfigMock
+ ->expects($this->once())
+ ->method('getValue')
+ ->with(
+ \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $storeCode
+ )
+ ->will($this->returnValue(false));
+ $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
+ $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+ /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
+ $routeParamsResolverMock = $this->getMockBuilder('Magento\Framework\Url\RouteParamsResolver')
+ ->setMethods(['setScope', 'getScope'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
+ $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
+
+ $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
+
+ $this->model->aroundSetRouteParams(
+ $routeParamsResolverMock,
+ function ($data, $unsetOldParams) {
+ $this->assertArrayNotHasKey('_scope_to_url', $data, 'This data item should have been unset.');
+ $this->assertArrayNotHasKey('_scope', $data, 'This data item should have been unset.');
+ },
+ $data
+ );
+ }
+
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
+ public function testAroundSetRouteParamsScopeUseStoreInUrl()
+ {
+ $storeCode = 'custom_store';
+ $this->scopeConfigMock
+ ->expects($this->once())
+ ->method('getValue')
+ ->with(
+ \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $storeCode
+ )
+ ->will($this->returnValue(true));
+ $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
+ $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+ /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
+ $routeParamsResolverMock = $this->getMockBuilder('Magento\Framework\Url\RouteParamsResolver')
+ ->setMethods(['setScope', 'getScope'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
+ $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
+
+ $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam');
+
+ $this->model->aroundSetRouteParams(
+ $routeParamsResolverMock,
+ function ($data, $unsetOldParams) {
+ $this->assertArrayNotHasKey('_scope_to_url', $data, 'This data item should have been unset.');
+ $this->assertArrayNotHasKey('_scope', $data, 'This data item should have been unset.');
+ },
+ $data
+ );
+ }
+
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
+ public function testAroundSetRouteParamsSingleStore()
+ {
+ $storeCode = 'custom_store';
+ $this->scopeConfigMock
+ ->expects($this->once())
+ ->method('getValue')
+ ->with(
+ \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $storeCode
+ )
+ ->will($this->returnValue(false));
+ $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(true);
+ $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+ /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
+ $routeParamsResolverMock = $this->getMockBuilder('Magento\Framework\Url\RouteParamsResolver')
+ ->setMethods(['setScope', 'getScope'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
+ $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
+
+ $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam');
+
+ $this->model->aroundSetRouteParams(
+ $routeParamsResolverMock,
+ function ($data, $unsetOldParams) {
+ $this->assertArrayNotHasKey('_scope_to_url', $data, 'This data item should have been unset.');
+ $this->assertArrayNotHasKey('_scope', $data, 'This data item should have been unset.');
+ },
+ $data
+ );
+ }
+
+ /**
+ * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+ */
+ public function testAroundSetRouteParamsNoScopeInParams()
+ {
+ $storeCode = 'custom_store';
+ $this->scopeConfigMock
+ ->expects($this->once())
+ ->method('getValue')
+ ->with(
+ \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+ $storeCode
+ )
+ ->will($this->returnValue(false));
+ $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
+ /** @var \PHPUnit_Framework_MockObject_MockObject| $routeParamsResolverMock */
+ $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+ ->setMethods(['getCode'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $storeMock->expects($this->any())->method('getCode')->willReturn($storeCode);
+ $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
+
+ $data = ['_scope_to_url' => true];
+ /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
+ $routeParamsResolverMock = $this->getMockBuilder('Magento\Framework\Url\RouteParamsResolver')
+ ->setMethods(['setScope', 'getScope'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $routeParamsResolverMock->expects($this->never())->method('setScope');
+ $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn(false);
+
+ $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
+
+ $this->model->aroundSetRouteParams(
+ $routeParamsResolverMock,
+ function ($data, $unsetOldParams) {
+ $this->assertArrayNotHasKey('_scope_to_url', $data, 'This data item should have been unset.');
+ },
+ $data
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/SecurityInfoTest.php b/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/SecurityInfoTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..b873c5be0845e64e7764415ae303e1ef62669760
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/SecurityInfoTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Url\Plugin;
+
+class SecurityInfoTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $_scopeConfigMock;
+
+ /**
+ * @var \Magento\Store\Url\Plugin\SecurityInfo
+ */
+ protected $_model;
+
+ protected function setUp()
+ {
+ $this->_scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
+ $this->_model = new \Magento\Store\Url\Plugin\SecurityInfo($this->_scopeConfigMock);
+ }
+
+ public function testAroundIsSecureDisabledInConfig()
+ {
+ $this->_scopeConfigMock
+ ->expects($this->once())
+ ->method('getValue')
+ ->with(
+ \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ )
+ ->will($this->returnValue(false));
+ $this->assertFalse(
+ $this->_model->aroundIsSecure(
+ $this->getMock('Magento\Framework\Url\SecurityInfo'),
+ function () {
+ },
+ 'http://example.com/account'
+ )
+ );
+ }
+
+ public function testAroundIsSecureEnabledInConfig()
+ {
+ $this->_scopeConfigMock
+ ->expects($this->once())
+ ->method('getValue')
+ ->with(
+ \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ )
+ ->will($this->returnValue(true));
+ $this->assertTrue(
+ $this->_model->aroundIsSecure(
+ $this->getMock('Magento\Framework\Url\SecurityInfo'),
+ function () {
+ return true;
+ },
+ 'https://example.com/account'
+ )
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
index 5ad3bbed4ae672198ffc7665fd74275dfde8f71e..81a26c41c488c2a8332fbbb71a1dc729e506ac4d 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
@@ -97,7 +97,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$scopeConfigMock = $this->getMockForAbstractClass('Magento\Framework\App\Config\ScopeConfigInterface');
$scopeConfigMock->expects($this->once())
->method('getValue')
- ->with($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, null)
+ ->with($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
->will($this->returnValue($configValue));
/** @var \Magento\Tax\Model\Config */
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php
index d2c3690cf75cb0cf89eb50c0dbf6320a3d2ac7c7..bf4baed61a3566f8a04a0511142fa6e87a793e49 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php
@@ -20,7 +20,7 @@ class CalculationTest extends \PHPUnit_Framework_TestCase
{
// create the mocks
$resource = $this->getMock('Magento\Framework\App\Resource', [], [], '', false);
- $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+ $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
$taxData = $this->getMock('Magento\Tax\Helper\Data', ['getPostCodeSubStringLength'], [], '', false);
$taxData
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
index 129235bc36914bb6c47387b7552b1893751aaa0e..9973a6014f1db07303819492df1a85ddf5b4e59e 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -88,7 +88,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase
->method('getItems')
->will($this->returnValue($items));
- $storeManager = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->setMethods(['getStore', 'hasSingleStore', 'isSingleStoreMode', 'getStores', 'getWebsite', 'getWebsites',
'reinitStores', 'getDefaultStoreView', 'setIsSingleStoreModeAllowed', 'getGroup', 'getGroups',
@@ -668,7 +668,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase
{
$objectManager = new ObjectManager($this);
$taxTotalsCalcModel = $objectManager->getObject('Magento\Tax\Model\Sales\Total\Quote\Tax');
- $this->assertSame($taxTotalsCalcModel->getLabel(), __('Tax'));
+ $this->assertEquals($taxTotalsCalcModel->getLabel(), __('Tax'));
}
/**
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php
index d58bbd4c217636ab58a36b2e7259342c33c3fa89..722e3b228a73e9579cbab438489539f647d782f1 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php
@@ -80,7 +80,7 @@ class TaxCalculationTest extends \PHPUnit_Framework_TestCase
'',
false
);
- $this->storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->dataObjectHelperMock = $this->getMockBuilder('\Magento\Framework\Api\DataObjectHelper')
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
index 00c5f3f70b44c6f96cc6eaf7880a1a049f032a98..6e3e06437f6fbd0b1c77c2e2e9c7971a6e4ff01e 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
@@ -12,7 +12,7 @@ namespace Magento\Theme\Model\Config;
class CustomizationTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -39,7 +39,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
$this->_storeManager = $this->getMockForAbstractClass(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
'',
true,
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
index 0a68104437d23960b10221c40d4fd239c28ca5b6..13b27ebeeb8036e7b1e4cc10fde8cb0549bffe87 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
@@ -51,7 +51,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
/** @var $this->_themeMock \Magento\Theme\Model\Theme */
$this->_themeMock = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
$this->_storeManagerMock = $this->getMockForAbstractClass(
- 'Magento\Framework\Store\StoreManagerInterface',
+ 'Magento\Store\Model\StoreManagerInterface',
[],
'',
true,
@@ -119,7 +119,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
'addFieldToFilter'
)->with(
'scope',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORES
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORES
)->will(
$this->returnValue($this->_configData)
);
@@ -170,7 +170,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
'addFieldToFilter'
)->with(
'scope',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORES
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORES
)->will(
$this->returnValue($this->_configData)
);
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
index 7f8538a8c619bcb2229c8bcbedc46b83a8316490..dab6123e55544bf5c0823cbd667834cbacd6524e 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
@@ -170,14 +170,14 @@ class CopyServiceTest extends \PHPUnit_Framework_TestCase
/* Init \Magento\Core\Model\Resource\Layout\Collection model */
$this->_updateFactory = $this->getMock(
- 'Magento\Core\Model\Layout\UpdateFactory',
+ 'Magento\Widget\Model\Layout\UpdateFactory',
['create'],
[],
'',
false
);
$this->_update = $this->getMock(
- 'Magento\Core\Model\Layout\Update',
+ 'Magento\Widget\Model\Layout\Update',
['__wakeup', 'getCollection'],
[],
'',
@@ -185,7 +185,7 @@ class CopyServiceTest extends \PHPUnit_Framework_TestCase
);
$this->_updateFactory->expects($this->at(0))->method('create')->will($this->returnValue($this->_update));
$this->_updateCollection = $this->getMock(
- 'Magento\Core\Model\Resource\Layout\Collection',
+ 'Magento\Widget\Model\Resource\Layout\Update\Collection',
['addThemeFilter', 'delete', 'getIterator'],
[],
'',
@@ -201,14 +201,14 @@ class CopyServiceTest extends \PHPUnit_Framework_TestCase
/* Init Link an Link_Collection model */
$this->_link = $this->getMock(
- 'Magento\Core\Model\Layout\Link',
+ 'Magento\Widget\Model\Layout\Link',
['__wakeup', 'getCollection'],
[],
'',
false
);
$this->_linkCollection = $this->getMock(
- 'Magento\Core\Model\Resource\Layout\Link\Collection',
+ 'Magento\Widget\Model\Resource\Layout\Link\Collection',
['addThemeFilter', 'getIterator'],
[],
'',
@@ -281,7 +281,7 @@ class CopyServiceTest extends \PHPUnit_Framework_TestCase
$this->_linkCollection->expects($this->once())->method('addThemeFilter');
$targetLinkOne = $this->getMock(
- 'Magento\Core\Model\Layout\Link',
+ 'Magento\Widget\Model\Layout\Link',
['__wakeup', 'setId', 'setThemeId', 'save', 'setLayoutUpdateId'],
[],
'',
@@ -289,7 +289,7 @@ class CopyServiceTest extends \PHPUnit_Framework_TestCase
);
$targetLinkOne->setData(['id' => 1, 'layout_update_id' => 1]);
$targetLinkTwo = $this->getMock(
- 'Magento\Core\Model\Layout\Link',
+ 'Magento\Widget\Model\Layout\Link',
['__wakeup', 'setId', 'setThemeId', 'save', 'setLayoutUpdateId'],
[],
'',
@@ -311,7 +311,7 @@ class CopyServiceTest extends \PHPUnit_Framework_TestCase
$this->_linkCollection->expects($this->any())->method('getIterator')->will($linkReturnValues);
$targetUpdateOne = $this->getMock(
- 'Magento\Core\Model\Layout\Update',
+ 'Magento\Widget\Model\Layout\Update',
['__wakeup', 'setId', 'load', 'save'],
[],
'',
@@ -319,7 +319,7 @@ class CopyServiceTest extends \PHPUnit_Framework_TestCase
);
$targetUpdateOne->setData(['id' => 1]);
$targetUpdateTwo = $this->getMock(
- 'Magento\Core\Model\Layout\Update',
+ 'Magento\Widget\Model\Layout\Update',
['__wakeup', 'setId', 'load', 'save'],
[],
'',
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php
index 954a20598b876164955b3f3961fd42ff87075626..7a74ae54dd83ff49c601982e99eec015fd697e74 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php
@@ -34,7 +34,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
protected $themeImageFactory;
/**
- * @var \Magento\Core\Model\Resource\Layout\Update\Collection|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Widget\Model\Resource\Layout\Update\Collection|\PHPUnit_Framework_MockObject_MockObject
*/
protected $updateCollection;
@@ -103,7 +103,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
- $this->updateCollection = $this->getMockBuilder('Magento\Core\Model\Resource\Layout\Update\Collection')
+ $this->updateCollection = $this->getMockBuilder('Magento\Widget\Model\Resource\Layout\Update\Collection')
->setMethods(['addThemeFilter', 'delete'])
->disableOriginalConstructor()
->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php
index 1e558461a9d4587147b081d7bdd150a3cbd2a450..d8b98208089ce6f1142eaac8c85116e8e175dd3c 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -22,7 +22,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+ $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
$flyweightThemeFactory = $this->getMock(
'\Magento\Framework\View\Design\Theme\FlyweightFactory', [], [], '', false
);
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml b/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml
index 3207b4a1666c6ed3e9ea14671ac96145e89f658b..deda396f9b3a77d6ffc017c3e7257a340d6a53ce 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
<section id="advanced" translate="label" type="text" sortOrder="910" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Advanced</label>
<tab>advanced</tab>
- <resource>Magento_Adminhtml::advanced</resource>
+ <resource>Magento_Backend::advanced</resource>
<group id="modules_disable_output" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Disable Modules Output</label>
<frontend_model>Magento\Backend\Block\System\Config\Form\Fieldset\Modules\DisableOutput\Proxy</frontend_model>
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..674838f7482539ee3e78c01b3f1e59d74e4347e3
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer;
+
+use Magento\TestFramework\Helper\ObjectManager;
+use Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer;
+
+/**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector
+ */
+class PhraseCollectorTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var PhraseCollector
+ */
+ protected $phraseCollector;
+
+ /**
+ * @var ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * @var Tokenizer|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $tokenizerMock;
+
+ protected function setUp()
+ {
+ $this->objectManager = new ObjectManager($this);
+ $this->tokenizerMock = $this->getMockBuilder('Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->phraseCollector = $this->objectManager->getObject(
+ 'Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector',
+ [
+ 'tokenizer' => $this->tokenizerMock
+ ]
+ );
+ }
+
+ /**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector::parse
+ *
+ * @param string $file
+ * @param array $isEndOfLoopReturnValues
+ * @param array $getNextRealTokenReturnValues
+ * @param array $getFunctionArgumentsTokensReturnValues
+ * @param array $isMatchingClassReturnValues
+ * @param array $result
+ * @dataProvider testParseDataProvider
+ */
+ public function testParse(
+ $file,
+ array $isEndOfLoopReturnValues,
+ array $getNextRealTokenReturnValues,
+ array $getFunctionArgumentsTokensReturnValues,
+ array $isMatchingClassReturnValues,
+ array $result
+ ) {
+ $matchingClass = 'Phrase';
+
+ $this->tokenizerMock->expects($this->once())
+ ->method('parse')
+ ->with($file);
+ $this->tokenizerMock->expects($this->atLeastOnce())
+ ->method('isEndOfLoop')
+ ->will(call_user_func_array(
+ [$this, 'onConsecutiveCalls'],
+ $isEndOfLoopReturnValues
+ ));
+ $this->tokenizerMock->expects($this->any())
+ ->method('getNextRealToken')
+ ->will(call_user_func_array(
+ [$this, 'onConsecutiveCalls'],
+ $getNextRealTokenReturnValues
+ ));
+ $this->tokenizerMock->expects($this->any())
+ ->method('getFunctionArgumentsTokens')
+ ->will(call_user_func_array(
+ [$this, 'onConsecutiveCalls'],
+ $getFunctionArgumentsTokensReturnValues
+ ));
+ $this->tokenizerMock->expects($this->any())
+ ->method('isMatchingClass')
+ ->with($matchingClass)
+ ->will(call_user_func_array(
+ [$this, 'onConsecutiveCalls'],
+ $isMatchingClassReturnValues
+ ));
+
+ $this->phraseCollector->setIncludeObjects();
+ $this->phraseCollector->parse($file);
+ $this->assertEquals($result, $this->phraseCollector->getPhrases());
+ }
+
+ /**
+ * @return array
+ */
+ public function testParseDataProvider()
+ {
+ $file = 'path/to/file.php';
+ $line = 110;
+ return [
+ /* Test simulates parsing of the following code:
+ *
+ * $phrase1 = new \Magento\Framework\Phrase('Testing');
+ * $phrase2 = __('More testing');
+ */
+ 'two phrases' => [
+ 'file' => $file,
+ 'isEndOfLoopReturnValues' => [
+ false, //before $phrase1
+ false, //at $phrase1
+ false, //at =
+ false, //at new
+ false, //at ;
+ false, //at $phrase2
+ false, //at =
+ false, //at __
+ false, //at ;
+ true //after ;
+ ],
+ 'getNextRealTokenReturnValues' => [
+ $this->createToken(false, false, false, false, '$phrase1'),
+ $this->createToken(false, false, false, false, '='),
+ $this->createToken(false, false, true, false, 'new', $line),
+ $this->createToken(false, false, false, false, ';'),
+ $this->createToken(false, false, false, false, '$phrase2'),
+ $this->createToken(false, false, false, false, '='),
+ $this->createToken(true, false, false, false, '__', $line),
+ $this->createToken(false, true, false, false, '('),
+ $this->createToken(false, false, false, false, ';'),
+ false
+ ],
+ 'getFunctionArgumentsTokensReturnValues' => [
+ [[$this->createToken(false, false, false, true, '\'Testing\'')]], // 'Testing')
+ [[$this->createToken(false, false, false, true, '\'More testing\'')]] // 'More testing')
+ ],
+ 'isMatchingClassReturnValues' => [
+ true // \Magento\Framework\Phrase(
+ ],
+ 'result' => [
+ [
+ 'phrase' => '\'Testing\'',
+ 'arguments' => 0,
+ 'file' => $file,
+ 'line' => $line
+ ],
+ [
+ 'phrase' => '\'More testing\'',
+ 'arguments' => 0,
+ 'file' => $file,
+ 'line' => $line
+ ]
+ ]
+ ]
+ ];
+ }
+
+ /**
+ * @param bool $isEqualFunctionReturnValue
+ * @param bool $isOpenBraceReturnValue
+ * @param bool $isNewReturnValue
+ * @param bool $isConstantEncapsedString
+ * @param string $value
+ * @param int|null $line
+ * @return Token|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected function createToken(
+ $isEqualFunctionReturnValue,
+ $isOpenBraceReturnValue,
+ $isNewReturnValue,
+ $isConstantEncapsedString,
+ $value,
+ $line = null
+ ) {
+ $token = $this->getMockBuilder('Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $token->expects($this->any())
+ ->method('isEqualFunction')
+ ->with('__')
+ ->willReturn($isEqualFunctionReturnValue);
+ $token->expects($this->any())
+ ->method('isOpenBrace')
+ ->willReturn($isOpenBraceReturnValue);
+ $token->expects($this->any())
+ ->method('isNew')
+ ->willReturn($isNewReturnValue);
+ $token->expects($this->any())
+ ->method('isConstantEncapsedString')
+ ->willReturn($isConstantEncapsedString);
+ $token->expects($this->any())
+ ->method('getValue')
+ ->willReturn($value);
+ $token->expects($this->any())
+ ->method('getLine')
+ ->willReturn($line);
+ return $token;
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..99ed584493f138ee53c62afd1164dbcf0d7edd60
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+/**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token
+ */
+class TokenTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var ObjectManager
+ */
+ protected $objectManager;
+
+ protected function setUp()
+ {
+ $this->objectManager = new ObjectManager($this);
+ }
+
+ /**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token::isNew
+ *
+ * @param int $name
+ * @param string $value
+ * @param bool $result
+ * @dataProvider testIsNewDataProvider
+ */
+ public function testIsNew($name, $value, $result)
+ {
+ $token = $this->createToken($name, $value);
+ $this->assertEquals($result, $token->isNew());
+ }
+
+ /**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token::isNamespaceSeparator
+ *
+ * @param int $name
+ * @param string $value
+ * @param bool $result
+ * @dataProvider testIsNamespaceSeparatorDataProvider
+ */
+ public function testIsNamespaceSeparator($name, $value, $result)
+ {
+ $token = $this->createToken($name, $value);
+ $this->assertEquals($result, $token->isNamespaceSeparator());
+ }
+
+ /**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token::isIdentifier
+ *
+ * @param int $name
+ * @param string $value
+ * @param bool $result
+ * @dataProvider testIsIdentifierDataProvider
+ */
+ public function testIsIdentifier($name, $value, $result)
+ {
+ $token = $this->createToken($name, $value);
+ $this->assertEquals($result, $token->isIdentifier());
+ }
+
+ /**
+ * @return array
+ */
+ public function testIsNewDataProvider()
+ {
+ return [
+ 'new' => ['name' => T_NEW, 'value' => 'new', 'result' => true],
+ 'namespace' => ['name' => T_NS_SEPARATOR, 'value' => '\\', 'result' => false],
+ 'identifier' => ['name' => T_STRING, 'value' => '__', 'result' => false]
+ ];
+ }
+
+ /**
+ * @return array
+ */
+ public function testIsNamespaceSeparatorDataProvider()
+ {
+ return [
+ 'new' => ['name' => T_NEW, 'value' => 'new', 'result' => false],
+ 'namespace' => ['name' => T_NS_SEPARATOR, 'value' => '\\', 'result' => true],
+ 'identifier' => ['name' => T_STRING, 'value' => '__', 'result' => false]
+ ];
+ }
+
+ /**
+ * @return array
+ */
+ public function testIsIdentifierDataProvider()
+ {
+ return [
+ 'new' => ['name' => T_NEW, 'value' => 'new', 'result' => false],
+ 'namespace' => ['name' => T_NS_SEPARATOR, 'value' => '\\', 'result' => false],
+ 'identifier' => ['name' => T_STRING, 'value' => '__', 'result' => true]
+ ];
+ }
+
+ /**
+ * @param int $name
+ * @param string $value
+ * @return Token
+ */
+ protected function createToken($name, $value)
+ {
+ $line = 110;
+ return $this->objectManager->getObject(
+ 'Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token',
+ [
+ 'name' => $name,
+ 'value' => $value,
+ 'line' => $line
+ ]
+ );
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..4520e479c5e2388593da6c704a1980fc38676de0
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Tools\I18n\Parser\Adapter\Php;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+/**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer
+ */
+class TokenizerTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var Tokenizer
+ */
+ protected $tokenizer;
+
+ /**
+ * @var ObjectManager
+ */
+ protected $objectManager;
+
+ protected function setUp()
+ {
+ $this->objectManager = new ObjectManager($this);
+ $this->tokenizer = $this->objectManager->getObject(
+ 'Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer'
+ );
+ }
+
+ /**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer::isMatchingClass
+ */
+ public function testIsMatchingClass()
+ {
+ $class = 'Phrase';
+ $this->parseFile();
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // new
+ $this->assertEquals(true, $this->tokenizer->isMatchingClass($class)); // \Magento\Framework\Phrase(
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // 'Testing'
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // )
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // ;
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // new
+ $this->assertEquals(true, $this->tokenizer->isMatchingClass($class)); // Phrase(
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // 'More testing'
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // )
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // ;
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // new
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // \Magento\Framework\Object(
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // )
+ $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // ;
+ }
+
+ /**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer::getNextRealToken
+ */
+ public function testGetNextRealToken()
+ {
+ $this->parseFile();
+ $this->assertEquals('new', $this->tokenizer->getNextRealToken()->getValue());
+ $this->assertEquals('\\', $this->tokenizer->getNextRealToken()->getValue());
+ $this->assertEquals('Magento', $this->tokenizer->getNextRealToken()->getValue());
+ $this->assertEquals('\\', $this->tokenizer->getNextRealToken()->getValue());
+ $this->assertEquals('Framework', $this->tokenizer->getNextRealToken()->getValue());
+ $this->assertEquals('\\', $this->tokenizer->getNextRealToken()->getValue());
+ $this->assertEquals('Phrase', $this->tokenizer->getNextRealToken()->getValue());
+ $this->assertEquals('(', $this->tokenizer->getNextRealToken()->getValue());
+ $this->assertEquals('\'Testing\'', $this->tokenizer->getNextRealToken()->getValue());
+ $this->assertEquals(')', $this->tokenizer->getNextRealToken()->getValue());
+ $this->assertEquals(';', $this->tokenizer->getNextRealToken()->getValue());
+ }
+
+ /**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer::isEndOfLoop
+ */
+ public function testIsEndOfLoop()
+ {
+ $this->parseFile();
+ //We have 27 total tokens in objectsCode.php file (excluding whitespaces)
+ //So the isEndOfLoop function should return true after we pick 28th non-existent token
+ for ($i = 0; $i < 28; $i += 1) {
+ $this->assertFalse($this->tokenizer->isEndOfLoop());
+ $this->tokenizer->getNextRealToken();
+ }
+ $this->assertTrue($this->tokenizer->isEndOfLoop());
+ }
+
+ protected function parseFile()
+ {
+ $file = __DIR__.'/_files/objectsCode.php.txt';
+ $this->tokenizer->parse($file);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php.txt b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php.txt
new file mode 100644
index 0000000000000000000000000000000000000000..72b351197a11a7aec8868c3b7066163cc42c158c
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php.txt
@@ -0,0 +1,5 @@
+<?php
+
+new \Magento\Framework\Phrase('Testing');
+new Phrase('More testing');
+new \Magento\Framework\Object();
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml
index 3c69a92286af4a110460b9374520bb0fe9e1e2b5..5b2a7df2bb2129b8c6574abb23bd12e8e1d46c52 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml
+++ b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml
@@ -13,7 +13,7 @@
<section id="section_1" sortOrder="10" type="text">
<class>css class</class>
<label>section label</label>
- <resource>Magento_Adminhtml::acl</resource>
+ <resource>Magento_Backend::acl</resource>
<header_css>some css class</header_css>
<tab>tab_1</tab>
<group id="group_1" sortOrder="10" type="text">
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php
index 7b4b77196cafe4574d2944ce1237ba84a6dcab80..15257c6ceb0a4c0821d0aff06a66682252b4b165 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php
@@ -18,7 +18,7 @@ return [
'parameters' => [
['name' => 'class', '#text' => 'css class'],
['name' => 'label', '#text' => 'section label'],
- ['name' => 'resource', '#text' => 'Magento_Adminhtml::acl'],
+ ['name' => 'resource', '#text' => 'Magento_Backend::acl'],
['name' => 'header_css', '#text' => 'some css class'],
['name' => 'tab', '#text' => 'tab_1'],
],
diff --git a/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
index 3f9b018dfe52905ad430dd861cb565237c2918a4..b3a3014567241a0e78b26eecf35c5c21d7a331a9 100644
--- a/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
@@ -43,7 +43,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
'isSetFlag'
)->with(
$this->equalTo('dev/translate_inline/active'),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
$this->equalTo($store)
)->will(
$this->returnValue($result)
diff --git a/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php
index 8b0ac477996c0f23dcd365026d183a99910f2287..a6cb5067125c0313e2bdadb010121328f0f7a26c 100644
--- a/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php
@@ -60,13 +60,13 @@ class CarrierTest extends \PHPUnit_Framework_TestCase
$this->config->expects($this->any())->method('getValue')->will($this->returnValueMap([
[
$path . 'free_method',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
self::FREE_METHOD_NAME,
],
[
$path . 'free_shipping_subtotal',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
$freeShippingSubtotal
],
diff --git a/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php b/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php
index 9d705dd2acb9f8d11c0e53829b791d6ef3bd9428..850e12421ef6b952ab339d5d8fb847d025518d5c 100644
--- a/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php
+++ b/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php
@@ -21,7 +21,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $url;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManager;
/** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
@@ -40,7 +40,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
{
$this->actionFactory = $this->getMock('Magento\Framework\App\ActionFactory', [], [], '', false);
$this->url = $this->getMock('Magento\Framework\UrlInterface');
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->response = $this->getMock('Magento\Framework\App\ResponseInterface', ['setRedirect', 'sendResponse']);
$this->request = $this->getMockBuilder('\Magento\Framework\App\Request\Http')
->disableOriginalConstructor()->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php b/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php
index 4446728a6dcfd28500e6a14313330a674e465ad2..8d0324fe4cb0323e8a8ec7f2227249313d904c9e 100644
--- a/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php
@@ -10,7 +10,7 @@ use Magento\TestFramework\Helper\ObjectManager;
class UrlRewriteCollectionTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -41,7 +41,7 @@ class UrlRewriteCollectionTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
$this->select = $this->getMock('Zend_Db_Select', ['from', 'where'], [], '', false);
$this->adapter = $this->getMock(
'Magento\Framework\DB\Adapter\Pdo\Mysql',
diff --git a/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php b/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php
index f099ca3793af9f541cd812fd61a0d1734461c5cb..4b9fa12f7394d4327ba11467291119e4738777e4 100644
--- a/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php
+++ b/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php
@@ -37,7 +37,7 @@ class UserTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Mail\TransportInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $_transportMock;
- /** @var \Magento\Framework\Store\StoreManagerInterface|PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|PHPUnit_Framework_MockObject_MockObject */
protected $_storeManagerMock;
/** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
@@ -115,7 +115,7 @@ class UserTest extends \PHPUnit_Framework_TestCase
[]
)->getMock();
$this->_storeManagerMock = $this->getMockBuilder(
- '\Magento\Framework\Store\StoreManagerInterface'
+ '\Magento\Store\Model\StoreManagerInterface'
)->disableOriginalConstructor()->setMethods(
[]
)->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
index 09c1e387172c08d3a2e1dbcdc2c1407bce122949..b6ef9b2528e981429b0d2458647c14aacff277ab 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
@@ -21,7 +21,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\DomDocument\Factory */
protected $_domDocumentFactory;
- /** @var \Magento\Framework\Store\StoreManagerInterface */
+ /** @var \Magento\Store\Model\StoreManagerInterface */
protected $_storeManagerMock;
/** @var \Magento\Webapi\Model\Soap\Server\Factory */
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php
index b411c829d8a5c0708c059ac3371d8d873bbfe316..af5e050ff32a43316db5eaea5486d314ee828be5 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php
@@ -24,7 +24,7 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
/** @var \Magento\Framework\Reflection\TypeProcessor|\PHPUnit_Framework_MockObject_MockObject */
protected $_typeProcessor;
- /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $storeManagerMock;
protected function setUp()
@@ -73,7 +73,7 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
);
$this->storeManagerMock = $this->getMockBuilder(
- 'Magento\Framework\Store\StoreManagerInterface'
+ 'Magento\Store\Model\StoreManagerInterface'
)->setMethods(['getStore'])->disableOriginalConstructor()->getMockForAbstractClass();
$storeMock = $this->getMockBuilder(
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php
index 7510dd47d276bb9e674e3cba800bd6423c06ec36..4fb0f76897e0f98e1f3911b10ae163ac57ad274f 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php
@@ -25,11 +25,11 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
$scopeConfigMock = $this->getMockForAbstractClass('Magento\Framework\App\Config\ScopeConfigInterface');
$scopeConfigMock->expects($this->any())
->method('getValue')
- ->with($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, null)
+ ->with($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
->will($this->returnValue($configValue));
$scopeConfigMock->expects($this->any())
->method('isSetFlag')
- ->with($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, null)
+ ->with($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
->will($this->returnValue($configValue));
$taxData = $this->getMock('Magento\Tax\Helper\Data', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php
index 28b5a759954cae903573edc6a846421a3d570db9..96cdfee93ffa55d470111325d832236848faa116 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php
@@ -29,7 +29,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase
protected function setUp()
{
- $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+ $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
$this->adapterMock = $this->getMock('\Magento\Framework\DB\Adapter\AdapterInterface');
$this->resourceMock = $this->getMock('\Magento\Framework\App\Resource', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/UpdateTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
similarity index 86%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/UpdateTest.php
rename to dev/tests/unit/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
index 01852e60d0e6ce5ea0215423fc7923c0bb7673df..9c0495df4ef589b961af142582078bbadc643c4a 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/UpdateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout;
+namespace Magento\Widget\Model\Layout;
class UpdateTest extends \PHPUnit_Framework_TestCase
{
@@ -15,7 +15,7 @@ class UpdateTest extends \PHPUnit_Framework_TestCase
public function testBeforeSave()
{
$resourceModel = $this->getMock(
- 'Magento\Core\Model\Resource\Layout\Update',
+ 'Magento\Widget\Model\Resource\Layout\Update',
[
'__wakeup',
'formatDate',
@@ -41,9 +41,9 @@ class UpdateTest extends \PHPUnit_Framework_TestCase
);
$helper = new \Magento\TestFramework\Helper\ObjectManager($this);
- /** @var $model \Magento\Core\Model\Layout\Update */
+ /** @var $model \Magento\Widget\Model\Layout\Update */
$model = $helper->getObject(
- 'Magento\Core\Model\Layout\Update',
+ 'Magento\Widget\Model\Layout\Update',
['resource' => $resourceModel, 'dateTime' => $dateTime]
);
$model->setId(0);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/AbstractTestCase.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/AbstractTestCase.php
similarity index 97%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/AbstractTestCase.php
rename to dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/AbstractTestCase.php
index f0ec6ba2e5030f80b86ff2903061e17ac4d57cf9..3e28ff445c2a419b0250c79992203ad8406795fe 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/AbstractTestCase.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/AbstractTestCase.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Layout;
+namespace Magento\Widget\Model\Resource\Layout;
abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
{
@@ -18,7 +18,7 @@ abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
const TEST_DAYS_BEFORE = 3;
/**
- * @var \Magento\Core\Model\Resource\Layout\Update\Collection
+ * @var \Magento\Widget\Model\Resource\Layout\Update\Collection
*/
protected $_collection;
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Link/CollectionTest.php
similarity index 87%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php
rename to dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Link/CollectionTest.php
index 4a5e11a66fa37d1f07599f633e7d0b0a726a694e..6f6bfca3b55bdbf9fae67411839da5c46cd60d3f 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Link/CollectionTest.php
@@ -3,14 +3,14 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Layout\Link;
+namespace Magento\Widget\Model\Resource\Layout\Link;
-class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCase
+class CollectionTest extends \Magento\Widget\Model\Resource\Layout\AbstractTestCase
{
/**
* Name of test table
*/
- const TEST_TABLE = 'core_layout_update';
+ const TEST_TABLE = 'layout_update';
/**
* Name of main table alias
@@ -21,13 +21,13 @@ class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCas
/**
* @param \Zend_Db_Select $select
- * @return \Magento\Core\Model\Resource\Layout\Link\Collection
+ * @return \Magento\Widget\Model\Resource\Layout\Link\Collection
*/
protected function _getCollection(\Zend_Db_Select $select)
{
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
- return new \Magento\Core\Model\Resource\Layout\Link\Collection(
+ return new \Magento\Widget\Model\Resource\Layout\Link\Collection(
$this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false),
$this->getMock('Psr\Log\LoggerInterface'),
$this->getMockForAbstractClass('Magento\Framework\Data\Collection\Db\FetchStrategyInterface'),
@@ -77,7 +77,7 @@ class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCas
}
/**
- * @covers \Magento\Core\Model\Resource\Layout\Link\Collection::_joinWithUpdate
+ * @covers \Magento\Widget\Model\Resource\Layout\Link\Collection::_joinWithUpdate
*/
public function testJoinWithUpdate()
{
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Update/CollectionTest.php
similarity index 86%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php
rename to dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Update/CollectionTest.php
index 6bdfad2ae10622488e3af4835ff8649c29b8df1d..9c573955cfec5a9bab4c5bc11338ad3986ff680b 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Update/CollectionTest.php
@@ -3,21 +3,21 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Resource\Layout\Update;
+namespace Magento\Widget\Model\Resource\Layout\Update;
-class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCase
+class CollectionTest extends \Magento\Widget\Model\Resource\Layout\AbstractTestCase
{
/**
* Retrieve layout update collection instance
*
* @param \Zend_Db_Select $select
- * @return \Magento\Core\Model\Resource\Layout\Update\Collection
+ * @return \Magento\Widget\Model\Resource\Layout\Update\Collection
*/
protected function _getCollection(\Zend_Db_Select $select)
{
$eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
- return new \Magento\Core\Model\Resource\Layout\Update\Collection(
+ return new \Magento\Widget\Model\Resource\Layout\Update\Collection(
$this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false),
$this->getMock('Psr\Log\LoggerInterface'),
$this->getMockForAbstractClass('Magento\Framework\Data\Collection\Db\FetchStrategyInterface'),
@@ -49,7 +49,7 @@ class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCas
}
/**
- * @covers \Magento\Core\Model\Resource\Layout\Update\Collection::_joinWithLink
+ * @covers \Magento\Widget\Model\Resource\Layout\Update\Collection::_joinWithLink
*/
public function testJoinWithLink()
{
@@ -59,7 +59,7 @@ class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCas
)->method(
'join'
)->with(
- ['link' => 'core_layout_link'],
+ ['link' => 'layout_link'],
'link.layout_update_id = main_table.layout_update_id',
$this->isType('array')
);
@@ -77,7 +77,7 @@ class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCas
)->method(
'joinLeft'
)->with(
- ['link' => 'core_layout_link'],
+ ['link' => 'layout_link'],
'link.layout_update_id = main_table.layout_update_id',
[[]]
);
diff --git a/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
new file mode 100755
index 0000000000000000000000000000000000000000..17faf17fc803d14bf1b42b9c14494412f5b11bd0
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Model\Template;
+
+use Magento\Store\Model\StoreManagerInterface;
+
+class FilterTest extends \PHPUnit_Framework_TestCase
+{
+ public function testMediaDirective()
+ {
+ $image = 'wysiwyg/VB.png';
+ $construction = ['{{media url="' . $image . '"}}', 'media', ' url="' . $image . '"'];
+ $baseUrl = 'http://localhost/pub/media/';
+
+ /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject $storeMock */
+ $storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
+ $storeMock->expects($this->once())->method('getBaseUrl')->with(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA)
+ ->willReturn($baseUrl);
+
+ /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject $storeManagerMock */
+ $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+ $storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock));
+
+ /** @var \Magento\Widget\Model\Template\Filter $filter */
+ $filter = (new \Magento\TestFramework\Helper\ObjectManager($this))
+ ->getObject(
+ 'Magento\Widget\Model\Template\Filter',
+ ['storeManager' => $storeManagerMock]
+ );
+ $result = $filter->mediaDirective($construction);
+ $this->assertEquals($baseUrl . $image, $result);
+ }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php
index ba6faf6d36d36c4143aeef7189d29e1eaa60241e..67388b2fb66f3371be30033561531c080105567d 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php
@@ -89,7 +89,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
$this->scopeConfig
->expects($this->atLeastOnce())
->method('isSetFlag')
- ->with('rss/wishlist/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertEquals(true, $this->link->isRssAllowed());
}
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php
index 01f970be96f008f48e7f048580fd510a044ec328..942f27723bbe8be83b2fddd6e0bc90ed05e987b2 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php
@@ -56,7 +56,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
->with('wishlist/index/cart', ['item' => '%item%', 'uenc' => $encoded])
->will($this->returnValue($this->url));
- $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->disableOriginalConstructor()
->getMock();
$storeManager->expects($this->any())
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php
index 976eb06aa7335acb82d9e480bc7e07a4662cc344..d9a1114eafb60d79031a094ea6887168c02547e7 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php
@@ -37,7 +37,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
protected $collection;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -74,7 +74,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
$this->registry = $this->getMockBuilder('Magento\Framework\Registry')
->disableOriginalConstructor()
->getMock();
- $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->getMock();
$this->date = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTime')
->disableOriginalConstructor()
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
index 570a389149c06320151b9d4e3672f4112ba57188..5ab6017080d670befceb66456d0b08439cbd9c70 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
@@ -161,13 +161,13 @@ class WishlistTest extends \PHPUnit_Framework_TestCase
[
[
'advanced/modules_disable_output/Magento_Rss',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
null,
],
[
\Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
null,
$locale
],
@@ -286,7 +286,7 @@ class WishlistTest extends \PHPUnit_Framework_TestCase
public function testIsAllowed()
{
$this->scopeConfig->expects($this->once())->method('getValue')
- ->with('rss/wishlist/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+ ->with('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
->will($this->returnValue(true));
$this->assertTrue($this->model->isAllowed());
}
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php
index dd9617c941202e8f503ff0947adaf8df26c69f30..70cc8df9a6c7fce2ada67d55fe838eb27bd91f8a 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -36,7 +36,7 @@ class WishlistTest extends \PHPUnit_Framework_TestCase
protected $collection;
/**
- * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $storeManager;
@@ -108,7 +108,7 @@ class WishlistTest extends \PHPUnit_Framework_TestCase
$this->collection = $this->getMockBuilder('Magento\Wishlist\Model\Resource\Wishlist\Collection')
->disableOriginalConstructor()
->getMock();
- $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+ $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
->getMock();
$this->date = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTime')
->disableOriginalConstructor()
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php
index 16768914058f86633f064064ae01dc922f187117..fa9af6e339496c263464bff74663be2050907aa5 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php
@@ -34,6 +34,7 @@ class Php extends AbstractAdapter
*/
protected function _parse()
{
+ $this->_phraseCollector->setIncludeObjects();
$this->_phraseCollector->parse($this->_file);
foreach ($this->_phraseCollector->getPhrases() as $phrase) {
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
index 683c1e51aa54e6482090d44280dd585b5b230608..c74e4db31b6dddc85a0d30da6aa44ec547988e33 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
@@ -50,6 +50,43 @@ class Tokenizer
$this->_tokensCount = count($this->_tokens);
}
+ /**
+ * Checks if the next set of tokens is a valid class identifier and it matches passed class name
+ *
+ * @param string $className
+ * @return bool
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ */
+ public function isMatchingClass($className)
+ {
+ /*
+ * 1 - beginning, class identifier can begin either with identifier or with namespace separator
+ * 2 - after namespace separator, identifier is expected
+ * 3 - after identifier, namespace separator or open brace is expected
+ * 4 - ending, tells that class identifier is valid
+ */
+ $state = 1;
+ $classString = '';
+ while ($token = $this->getNextRealToken()) {
+ if ($token->isNamespaceSeparator() && $state != 2) {
+ $classString .= $token->getValue();
+ $state = 2;
+ } elseif ($token->isIdentifier() && $state != 3) {
+ $classString .= $token->getValue();
+ $state = 3;
+ } elseif ($token->isOpenBrace() && $state == 3) {
+ $state = 4;
+ break;
+ } else {
+ return false;
+ }
+ }
+ if ($state == 4 && $className == substr($classString, -strlen($className))) {
+ return true;
+ }
+ return false;
+ }
+
/**
* Get arguments tokens of function
*
@@ -139,13 +176,26 @@ class Tokenizer
}
/**
- * Check is it last token
+ * Get next token skipping all whitespaces
+ *
+ * @return \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token|false
+ */
+ public function getNextRealToken()
+ {
+ do {
+ $token = $this->getNextToken();
+ } while ($token && $token->isWhitespace());
+ return $token;
+ }
+
+ /**
+ * Check if it is end of loop
*
* @return bool
*/
- public function isLastToken()
+ public function isEndOfLoop()
{
- return 0 == $this->_tokensCount || key($this->_tokens) + 1 == $this->_tokensCount;
+ return is_null(key($this->_tokens));
}
/**
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
index b64a2cfda54446323a953754602b7c017130fdff..297177e1071c7a2eea19118382e9ffef9a5ec97a 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
@@ -31,14 +31,23 @@ class PhraseCollector
*/
protected $_file;
+ /**
+ * Are the Phrase objects are parsed as well
+ *
+ * @var bool
+ */
+ protected $includeObjects = false;
+
/**
* Construct
*
* @param Tokenizer $tokenizer
+ * @param bool $includeObjects
*/
- public function __construct(Tokenizer $tokenizer)
+ public function __construct(Tokenizer $tokenizer, $includeObjects = false)
{
$this->_tokenizer = $tokenizer;
+ $this->includeObjects = $includeObjects;
}
/**
@@ -62,7 +71,7 @@ class PhraseCollector
$this->_phrases = [];
$this->_file = $file;
$this->_tokenizer->parse($file);
- while (!$this->_tokenizer->isLastToken()) {
+ while (!$this->_tokenizer->isEndOfLoop()) {
$this->_extractPhrases();
}
}
@@ -74,14 +83,48 @@ class PhraseCollector
*/
protected function _extractPhrases()
{
- $phraseStartToken = $this->_tokenizer->getNextToken();
- if ($phraseStartToken->isEqualFunction('__') && $this->_tokenizer->getNextToken()->isOpenBrace()) {
+ if ($firstToken = $this->_tokenizer->getNextRealToken()) {
+ if (!$this->extractMethodPhrase($firstToken) && $this->includeObjects) {
+ $this->extractObjectPhrase($firstToken);
+ }
+ }
+ }
+
+ /**
+ * @param Token $firstToken
+ * @return bool
+ */
+ protected function extractMethodPhrase(Token $firstToken)
+ {
+ if ($firstToken->isEqualFunction('__')) {
+ $secondToken = $this->_tokenizer->getNextRealToken();
+ if ($secondToken && $secondToken->isOpenBrace()) {
+ $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
+ $phrase = $this->_collectPhrase(array_shift($arguments));
+ if (null !== $phrase) {
+ $this->_addPhrase($phrase, count($arguments), $this->_file, $firstToken->getLine());
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * @param Token $firstToken
+ * @return bool
+ */
+ protected function extractObjectPhrase(Token $firstToken)
+ {
+ if ($firstToken->isNew() && $this->_tokenizer->isMatchingClass('Phrase')) {
$arguments = $this->_tokenizer->getFunctionArgumentsTokens();
$phrase = $this->_collectPhrase(array_shift($arguments));
if (null !== $phrase) {
- $this->_addPhrase($phrase, count($arguments), $this->_file, $phraseStartToken->getLine());
+ $this->_addPhrase($phrase, count($arguments), $this->_file, $firstToken->getLine());
+ return true;
}
}
+ return false;
}
/**
@@ -125,4 +168,14 @@ class PhraseCollector
'line' => $line,
];
}
+
+ /**
+ * @param bool $includeObjects
+ * @return $this
+ */
+ public function setIncludeObjects($includeObjects = true)
+ {
+ $this->includeObjects = (bool)$includeObjects;
+ return $this;
+ }
}
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Token.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Token.php
index 8b4cc4d0049aa6567eb5c395069c27c00fe6f56b..3aa9091008b5f5c163b2f2ab09e4cb4cb2c5eb40 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Token.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Token.php
@@ -75,6 +75,16 @@ class Token
return $this->_line;
}
+ /**
+ * Is "new" operator
+ *
+ * @return bool
+ */
+ public function isNew()
+ {
+ return $this->getName() == T_NEW;
+ }
+
/**
* Whenever token is equal function
*
@@ -155,4 +165,24 @@ class Token
{
return $this->getValue() == ';';
}
+
+ /**
+ * Is namespace separator
+ *
+ * @return bool
+ */
+ public function isNamespaceSeparator()
+ {
+ return $this->getName() == T_NS_SEPARATOR;
+ }
+
+ /**
+ * Is identifier
+ *
+ * @return bool
+ */
+ public function isIdentifier()
+ {
+ return $this->getName() == T_STRING;
+ }
}
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php
index 24ba20d3139d529900dd656627e87f0ddc77351d..dffc693d299dc6af8304e3c230e7087aa87741b9 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php
@@ -19,9 +19,10 @@ class MethodCollector extends PhraseCollector
*/
protected function _extractPhrases()
{
- if ($this->_tokenizer->getNextToken()->isObjectOperator()) {
- $phraseStartToken = $this->_tokenizer->getNextToken();
- if ($this->_isTranslateFunction($phraseStartToken)) {
+ $token = $this->_tokenizer->getNextRealToken();
+ if ($token && $token->isObjectOperator()) {
+ $phraseStartToken = $this->_tokenizer->getNextRealToken();
+ if ($phraseStartToken && $this->_isTranslateFunction($phraseStartToken)) {
$arguments = $this->_tokenizer->getFunctionArgumentsTokens();
$phrase = $this->_collectPhrase(array_shift($arguments));
$this->_addPhrase($phrase, count($arguments), $this->_file, $phraseStartToken->getLine());
@@ -37,10 +38,7 @@ class MethodCollector extends PhraseCollector
*/
protected function _isTranslateFunction($token)
{
- return ($token->isEqualFunction(
- '__'
- ) || $token->isWhitespace() && $this->_tokenizer->getNextToken()->isEqualFunction(
- '__'
- )) && $this->_tokenizer->getNextToken()->isOpenBrace();
+ $nextToken = $this->_tokenizer->getNextRealToken();
+ return $nextToken && $token->isEqualFunction('__') && $nextToken->isOpenBrace();
}
}
diff --git a/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php b/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php
index f386bfb6e2670e8b9e93a020c5baa7eee36d0ca7..48d2513cd8a5ffbf40bfbd0f5b2713ee800aaefc 100644
--- a/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php
+++ b/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php
@@ -132,8 +132,8 @@ return [
'core/email_template' => 'core_email_template',
'core/file_storage' => 'core_file_storage',
'core/flag' => 'core_flag',
- 'core/layout_link' => 'core_layout_link',
- 'core/layout_update' => 'core_layout_update',
+ 'core/layout_link' => 'layout_link',
+ 'core/layout_update' => 'layout_update',
'core/resource' => 'core_resource',
'core/session' => 'core_session',
'core/store' => 'store',
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
index bfe5cf299d5c3b3c2e7d076c61e0b543f46d3760..1c996157d533740a1581e850d7bf35d269dbbbc5 100644
--- a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
+++ b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -67,7 +67,7 @@ class FileFactory
$isFile = true;
$file = $content['value'];
if (!$dir->isFile($file)) {
- throw new \Exception(__('File not found'));
+ throw new \Exception((string)new \Magento\Framework\Phrase('File not found'));
}
$contentLength = $dir->stat($file)['size'];
}
diff --git a/lib/internal/Magento/Framework/App/ScopeResolverInterface.php b/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
index c4cf8ab9e4d4bbdd92a1b16b4e6f4569898ebf1a..4f1a59e63494fe3c311870c308abe034212d89dc 100644
--- a/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
+++ b/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
@@ -14,4 +14,11 @@ interface ScopeResolverInterface
* @return \Magento\Framework\App\ScopeInterface
*/
public function getScope($scopeId = null);
+
+ /**
+ * Retrieve scopes array
+ *
+ * @return \Magento\Framework\App\ScopeInterface[]
+ */
+ public function getScopes();
}
diff --git a/lib/internal/Magento/Framework/AppInterface.php b/lib/internal/Magento/Framework/AppInterface.php
index e1ea47a8d298165dedcfe0aa0e946b73cf86ece0..29a92276e1f3cdec2f42bb194a8870e743bb7704 100644
--- a/lib/internal/Magento/Framework/AppInterface.php
+++ b/lib/internal/Magento/Framework/AppInterface.php
@@ -17,7 +17,7 @@ interface AppInterface
/**
* Magento version
*/
- const VERSION = '0.42.0-beta6';
+ const VERSION = '0.42.0-beta7';
/**
* Launch application
diff --git a/lib/internal/Magento/Framework/DB/AbstractMapper.php b/lib/internal/Magento/Framework/DB/AbstractMapper.php
index 7a1206c095b87ab59a779acd070667961b1c946d..77c514541ce4c8d0ab19ca70e96f6c74b51998d5 100644
--- a/lib/internal/Magento/Framework/DB/AbstractMapper.php
+++ b/lib/internal/Magento/Framework/DB/AbstractMapper.php
@@ -290,7 +290,9 @@ abstract class AbstractMapper implements MapperInterface
{
if (!$conn instanceof \Magento\Framework\DB\Adapter\AdapterInterface) {
throw new \InvalidArgumentException(
- __('dbModel read resource does not implement \Magento\Framework\DB\Adapter\AdapterInterface')
+ (string)new \Magento\Framework\Phrase(
+ 'dbModel read resource does not implement \Magento\Framework\DB\Adapter\AdapterInterface'
+ )
);
}
$this->conn = $conn;
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 83467bf6bcc316c254cdc91f4fd5809da49d9948..c8de592f1e52fafb694b6d561ad471a1162c1e13 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -3720,7 +3720,12 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
public function createTrigger(\Magento\Framework\DB\Ddl\Trigger $trigger)
{
if (!$trigger->getStatements()) {
- throw new \Zend_Db_Exception(sprintf(__('Trigger %s has not statements available'), $trigger->getName()));
+ throw new \Zend_Db_Exception(
+ (string)new \Magento\Framework\Phrase(
+ 'Trigger %1 has not statements available',
+ [$trigger->getName()]
+ )
+ );
}
$statements = implode("\n", $trigger->getStatements());
@@ -3748,7 +3753,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
public function dropTrigger($triggerName, $schemaName = null)
{
if (empty($triggerName)) {
- throw new \InvalidArgumentException(__('Trigger name is not defined'));
+ throw new \InvalidArgumentException((string)new \Magento\Framework\Phrase('Trigger name is not defined'));
}
$triggerName = ($schemaName ? $schemaName . '.' : '') . $triggerName;
diff --git a/lib/internal/Magento/Framework/DB/Ddl/Trigger.php b/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
index 872a57c0a3b4aaf3cb053743d7c97447a0cc3aac..4c5b13b2529acd744c6c45dc63314476daafe59d 100644
--- a/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
+++ b/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
@@ -86,7 +86,9 @@ class Trigger
public function setName($name)
{
if (!is_string($name)) {
- throw new \InvalidArgumentException(__('Trigger name should be a string'));
+ throw new \InvalidArgumentException(
+ (string)new \Magento\Framework\Phrase('Trigger name should be a string')
+ );
}
$this->name = strtolower($name);
@@ -102,7 +104,7 @@ class Trigger
public function getName()
{
if (empty($this->name)) {
- throw new \Zend_Db_Exception(__('Trigger name is not defined'));
+ throw new \Zend_Db_Exception((string)new \Magento\Framework\Phrase('Trigger name is not defined'));
}
return $this->name;
}
@@ -119,7 +121,7 @@ class Trigger
if (in_array($time, self::$listOfTimes)) {
$this->time = strtoupper($time);
} else {
- throw new \InvalidArgumentException(__('Trigger unsupported time type'));
+ throw new \InvalidArgumentException((string)new \Magento\Framework\Phrase('Trigger unsupported time type'));
}
return $this;
}
@@ -133,7 +135,7 @@ class Trigger
public function getTime()
{
if (is_null($this->time)) {
- throw new \Zend_Db_Exception(__('Trigger time is not defined'));
+ throw new \Zend_Db_Exception((string)new \Magento\Framework\Phrase('Trigger time is not defined'));
}
return $this->time;
}
@@ -150,7 +152,9 @@ class Trigger
if (in_array($event, self::$listOfEvents)) {
$this->event = strtoupper($event);
} else {
- throw new \InvalidArgumentException(__('Trigger unsupported event type'));
+ throw new \InvalidArgumentException(
+ (string)new \Magento\Framework\Phrase('Trigger unsupported event type')
+ );
}
return $this;
}
@@ -164,7 +168,7 @@ class Trigger
public function getEvent()
{
if (is_null($this->event)) {
- throw new \Zend_Db_Exception(__('Trigger event is not defined'));
+ throw new \Zend_Db_Exception((string)new \Magento\Framework\Phrase('Trigger event is not defined'));
}
return $this->event;
}
@@ -179,7 +183,9 @@ class Trigger
public function setTable($name)
{
if (!is_string($name)) {
- throw new \InvalidArgumentException(__('Trigger table name should be a string'));
+ throw new \InvalidArgumentException(
+ (string)new \Magento\Framework\Phrase('Trigger table name should be a string')
+ );
}
$this->tableName = strtolower($name);
return $this;
@@ -194,7 +200,7 @@ class Trigger
public function getTable()
{
if (empty($this->tableName)) {
- throw new \Zend_Db_Exception(__('Trigger table name is not defined'));
+ throw new \Zend_Db_Exception((string)new \Magento\Framework\Phrase('Trigger table name is not defined'));
}
return $this->tableName;
}
@@ -209,7 +215,9 @@ class Trigger
public function addStatement($statement)
{
if (!is_string($statement)) {
- throw new \InvalidArgumentException(__('Trigger statement should be a string'));
+ throw new \InvalidArgumentException(
+ (string)new \Magento\Framework\Phrase('Trigger statement should be a string')
+ );
}
$statement = trim($statement);
diff --git a/lib/internal/Magento/Framework/Data/AbstractCriteria.php b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
index 32d1a7919ef2cd6f2a47cdb8f7665c712548d7b7..ced168d20efcf1a6df1d0fdc43394f4885546119 100644
--- a/lib/internal/Magento/Framework/Data/AbstractCriteria.php
+++ b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
@@ -36,7 +36,12 @@ abstract class AbstractCriteria implements \Magento\Framework\Api\CriteriaInterf
public function getMapperInterfaceName()
{
if (!$this->mapperInterfaceName) {
- throw new \Exception(__("Missed Mapper Interface for Criteria Interface: ") . get_class($this));
+ throw new \Exception(
+ (string)new \Magento\Framework\Phrase(
+ 'Missed Mapper Interface for Criteria Interface: %1',
+ [get_class($this)]
+ )
+ );
}
return $this->mapperInterfaceName;
}
@@ -111,7 +116,12 @@ abstract class AbstractCriteria implements \Magento\Framework\Api\CriteriaInterf
public function addFilter($name, $field, $condition = null, $type = 'and')
{
if (isset($this->data[self::PART_FILTERS]['list'][$name])) {
- throw new \Exception(__("Filter already exists in Criteria object: ") . $name);
+ throw new \Exception(
+ (string)new \Magento\Framework\Phrase(
+ 'Filter already exists in Criteria object: %1',
+ [$name]
+ )
+ );
}
$filter = new Object();
// implements ArrayAccess
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/String.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/String.php
index d7cc59f4edc0b97cef7317f64c3d58b616111b83..e2d1b574e8610d18465c7d6edd423b6a0abac80c 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/String.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/String.php
@@ -40,7 +40,7 @@ class String implements InterpreterInterface
}
$needTranslation = isset($data['translate']) ? $this->booleanUtils->toBoolean($data['translate']) : false;
if ($needTranslation) {
- $result = __($result);
+ $result = (string)new \Magento\Framework\Phrase($result);
}
} else {
$result = '';
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index 31844b79fe29a04fc866db8517b22650b0a57974..281f46c402bb6528d4452d26b2bc0ca5d85f9be5 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -402,11 +402,11 @@ class Editor extends Textarea
* Translate string using defined helper
*
* @param string $string String to be translated
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function translate($string)
{
- return __($string);
+ return (string)new \Magento\Framework\Phrase($string);
}
/**
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Image.php b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
index c4d143c05db84a931fd521e93c338845fce86482..7000a10dda43668af527ac797833e57fde3556ba 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Image.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
@@ -11,10 +11,12 @@
*/
namespace Magento\Framework\Data\Form\Element;
+use Magento\Framework\UrlInterface;
+
class Image extends \Magento\Framework\Data\Form\Element\AbstractElement
{
/**
- * @var \Magento\Framework\UrlInterface
+ * @var UrlInterface
*/
protected $_urlBuilder;
@@ -22,14 +24,14 @@ class Image extends \Magento\Framework\Data\Form\Element\AbstractElement
* @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
* @param \Magento\Framework\Escaper $escaper
- * @param \Magento\Framework\UrlInterface $urlBuilder
+ * @param UrlInterface $urlBuilder
* @param array $data
*/
public function __construct(
\Magento\Framework\Data\Form\Element\Factory $factoryElement,
\Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
\Magento\Framework\Escaper $escaper,
- \Magento\Framework\UrlInterface $urlBuilder,
+ UrlInterface $urlBuilder,
$data = []
) {
$this->_urlBuilder = $urlBuilder;
@@ -50,7 +52,7 @@ class Image extends \Magento\Framework\Data\Form\Element\AbstractElement
$url = $this->_getUrl();
if (!preg_match("/^http\:\/\/|https\:\/\//", $url)) {
- $url = $this->_urlBuilder->getBaseUrl('media') . $url;
+ $url = $this->_urlBuilder->getBaseUrl(['_type' => UrlInterface::URL_TYPE_MEDIA]) . $url;
}
$html = '<a href="' .
@@ -93,7 +95,7 @@ class Image extends \Magento\Framework\Data\Form\Element\AbstractElement
{
$html = '';
if ($this->getValue()) {
- $label = __('Delete Image');
+ $label = (string)new \Magento\Framework\Phrase('Delete Image');
$html .= '<span class="delete-image">';
$html .= '<input type="checkbox"' .
' name="' .
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
index ecc4062c2bbb1c90de34ffd6418df51c1460baa0..98d20f1c4f027dee625d43e5f810fd137044ecec 100644
--- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -95,7 +95,7 @@ class Encryptor implements EncryptorInterface
$version = (int)$version;
if (!in_array($version, $types, true)) {
- throw new \Exception(__('Not supported cipher version'));
+ throw new \Exception((string)new \Magento\Framework\Phrase('Not supported cipher version'));
}
return $version;
}
@@ -263,7 +263,7 @@ class Encryptor implements EncryptorInterface
public function validateKey($key)
{
if (preg_match('/\s/s', $key)) {
- throw new \Exception(__('The encryption key format is invalid.'));
+ throw new \Exception((string)new \Magento\Framework\Phrase('The encryption key format is invalid.'));
}
return $this->getCrypt($key);
}
diff --git a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
index 18079823dce972db55f66eb1d698b47b5a67362e..c63e32c6dd390ecebd989f98ec872b21ae0e8850 100644
--- a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
+++ b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
@@ -74,7 +74,7 @@ abstract class AbstractAggregateException extends LocalizedException
// First call: simply overwrite the message and params
$this->rawMessage = $rawMessage;
$this->params = $params;
- $this->message = __($rawMessage, $params);
+ $this->message = (string)new \Magento\Framework\Phrase($rawMessage, $params);
} elseif (2 === $this->addErrorCalls) {
// Second call: store the error from the first call and the second call in the array
// restore the message and params to their original value
diff --git a/lib/internal/Magento/Framework/Exception/ErrorMessage.php b/lib/internal/Magento/Framework/Exception/ErrorMessage.php
index 30308495f6a4d6a5f4ee6a345bacc316a167c4c2..0cb1c62eb184846eabfeab70cac25b4b9c4bfb39 100644
--- a/lib/internal/Magento/Framework/Exception/ErrorMessage.php
+++ b/lib/internal/Magento/Framework/Exception/ErrorMessage.php
@@ -56,11 +56,11 @@ class ErrorMessage
/**
* Return the message localized to based on the locale of the current request.
*
- * @return string
+ * @return \Magento\Framework\Phrase
*/
public function getMessage()
{
- return __($this->message, $this->params);
+ return (string)new \Magento\Framework\Phrase($this->message, $this->params);
}
/**
diff --git a/lib/internal/Magento/Framework/Exception/LocalizedException.php b/lib/internal/Magento/Framework/Exception/LocalizedException.php
index c868ed9ea470aa17c6a86a1c8215e788cc0a1336..3ecc300c5c70aeca262ccbe04d2c5209a08942f8 100644
--- a/lib/internal/Magento/Framework/Exception/LocalizedException.php
+++ b/lib/internal/Magento/Framework/Exception/LocalizedException.php
@@ -31,7 +31,7 @@ class LocalizedException extends \Exception
$this->rawMessage = $message;
$this->renderer = new Placeholder();
- parent::__construct(__($message, $params), 0, $cause);
+ parent::__construct((string)new \Magento\Framework\Phrase($message, $params), 0, $cause);
}
/**
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
index 09586e4576124964fcf01fc201fbf31a6a98e0c6..0c760c1daa45bfbfe3aae196df184ea92b2bf693 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
@@ -131,7 +131,7 @@ class Http extends File
$urlProp = $this->parseUrl($this->getScheme() . $path);
if (false === $urlProp) {
- throw new FilesystemException(__('Please correct the download URL.'));
+ throw new FilesystemException((string)new \Magento\Framework\Phrase('Please correct the download URL.'));
}
$hostname = $urlProp['host'];
@@ -236,7 +236,10 @@ class Http extends File
$result = @fsockopen($hostname, $port, $errorNumber, $errorMessage);
if ($result === false) {
throw new FilesystemException(
- __('Something went wrong connecting to the host. Error#%1 - %2.', $errorNumber, $errorMessage)
+ (string)new \Magento\Framework\Phrase(
+ 'Something went wrong connecting to the host. Error#%1 - %2.',
+ [$errorNumber, $errorMessage]
+ )
);
}
return $result;
diff --git a/lib/internal/Magento/Framework/Flag.php b/lib/internal/Magento/Framework/Flag.php
index a1a12834100601b584182d72a5feaba72d892274..f6a5d0f0f0f6a146212a3bab6a61da8cf1ca18aa 100644
--- a/lib/internal/Magento/Framework/Flag.php
+++ b/lib/internal/Magento/Framework/Flag.php
@@ -49,7 +49,9 @@ class Flag extends Model\AbstractModel
public function beforeSave()
{
if (is_null($this->_flagCode)) {
- throw new \Magento\Framework\Model\Exception(__('Please define flag code.'));
+ throw new \Magento\Framework\Model\Exception(
+ (string)new \Magento\Framework\Phrase('Please define flag code.')
+ );
}
$this->setFlagCode($this->_flagCode);
@@ -94,7 +96,9 @@ class Flag extends Model\AbstractModel
public function loadSelf()
{
if (is_null($this->_flagCode)) {
- throw new \Magento\Framework\Model\Exception(__('Please define flag code.'));
+ throw new \Magento\Framework\Model\Exception(
+ (string)new \Magento\Framework\Phrase('Please define flag code.')
+ );
}
return $this->load($this->_flagCode, 'flag_code');
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index 1701fe5d57f1911fd1fd8bf92ab8e4ee45cf0db6..d35889b915ce4441ecf005c6c58b41d163d6a614 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -233,7 +233,7 @@ abstract class AbstractModel extends \Magento\Framework\Object
protected function _getResource()
{
if (empty($this->_resourceName) && empty($this->_resource)) {
- throw new \Magento\Framework\Model\Exception(__('Resource is not set.'));
+ throw new \Magento\Framework\Model\Exception((string)new \Magento\Framework\Phrase('Resource is not set.'));
}
return $this->_resource ?: \Magento\Framework\App\ObjectManager::getInstance()->get($this->_resourceName);
@@ -260,7 +260,9 @@ abstract class AbstractModel extends \Magento\Framework\Object
public function getResourceCollection()
{
if (empty($this->_resourceCollection) && empty($this->_collectionName)) {
- throw new \Magento\Framework\Model\Exception(__('Model collection resource name is not defined.'));
+ throw new \Magento\Framework\Model\Exception(
+ (string)new \Magento\Framework\Phrase('Model collection resource name is not defined.')
+ );
}
return $this->_resourceCollection ? clone $this
->_resourceCollection : \Magento\Framework\App\ObjectManager::getInstance()
@@ -582,7 +584,9 @@ abstract class AbstractModel extends \Magento\Framework\Object
public function beforeDelete()
{
if (!$this->_actionValidator->isAllowed($this)) {
- throw new Exception(__('Delete operation is forbidden for current area'));
+ throw new Exception(
+ (string)new \Magento\Framework\Phrase('Delete operation is forbidden for current area')
+ );
}
$this->_eventManager->dispatch('model_delete_before', ['object' => $this]);
diff --git a/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php b/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
index e61f60533d5e6d0a8482f9e0c6cc49decd070a69..cedfa9cc8479ed52ce96d4bb30775a0d5800abc2 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
@@ -219,7 +219,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
public function getIdFieldName()
{
if (empty($this->_idFieldName)) {
- throw new ModelException(__('Empty identifier field name'));
+ throw new ModelException((string)new \Magento\Framework\Phrase('Empty identifier field name'));
}
return $this->_idFieldName;
}
@@ -234,7 +234,7 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
public function getMainTable()
{
if (empty($this->_mainTable)) {
- throw new ModelException(__('Empty main table name'));
+ throw new ModelException((string)new \Magento\Framework\Phrase('Empty main table name'));
}
return $this->getTable($this->_mainTable);
}
@@ -635,9 +635,9 @@ abstract class AbstractDb extends \Magento\Framework\Model\Resource\AbstractReso
if (!empty($existent)) {
if (count($existent) == 1) {
- $error = __('%1 already exists.', $existent[0]);
+ $error = (string)new \Magento\Framework\Phrase('%1 already exists.', [$existent[0]]);
} else {
- $error = __('%1 already exist.', implode(', ', $existent));
+ $error = (string)new \Magento\Framework\Phrase('%1 already exist.', [implode(', ', $existent)]);
}
throw new ModelException($error, ModelException::ERROR_CODE_ENTITY_ALREADY_EXISTS);
}
diff --git a/lib/internal/Magento/Framework/Model/Resource/Iterator.php b/lib/internal/Magento/Framework/Model/Resource/Iterator.php
index 9e6d0ff4092c6b50aab2ed99a8e90dc39a675825..58a037de443e9cf6b582b7dab70e65fd363707f9 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Iterator.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Iterator.php
@@ -59,11 +59,13 @@ class Iterator extends \Magento\Framework\Object
if (is_string($query)) {
if (!$conn instanceof \Zend_Db_Adapter_Abstract) {
- throw new \Magento\Framework\Model\Exception(__('Invalid connection'));
+ throw new \Magento\Framework\Model\Exception(
+ (string)new \Magento\Framework\Phrase('Invalid connection')
+ );
}
return $conn->query($query);
}
- throw new \Magento\Framework\Model\Exception(__('Invalid query'));
+ throw new \Magento\Framework\Model\Exception((string)new \Magento\Framework\Phrase('Invalid query'));
}
}
diff --git a/lib/internal/Magento/Framework/Phrase.php b/lib/internal/Magento/Framework/Phrase.php
index b952f8bb5b3cc4c8fc05f18b32d7c703d3ce6610..80dc48cac216579f9b412259683714f42a0bf2d0 100644
--- a/lib/internal/Magento/Framework/Phrase.php
+++ b/lib/internal/Magento/Framework/Phrase.php
@@ -7,9 +7,10 @@
*/
namespace Magento\Framework;
+use Zend\Stdlib\JsonSerializable;
use Magento\Framework\Phrase\RendererInterface;
-class Phrase
+class Phrase implements JsonSerializable
{
/**
* Default phrase renderer. Allows stacking renderers that "don't know about each other"
@@ -84,4 +85,14 @@ class Phrase
{
return $this->render();
}
+
+ /**
+ * Specify data which should be serialized to JSON
+ *
+ * @return string
+ */
+ public function jsonSerialize()
+ {
+ return $this->render();
+ }
}
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
index b29b6990e2b445de72343cd969f5cfe080cb8298..c1d58952de1c9d4006c947a6fa34de1aeb427f48 100644
--- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -6,6 +6,7 @@
namespace Magento\Framework\Reflection;
+use Magento\Framework\Phrase;
use Magento\Framework\Api\AttributeValue;
use Magento\Framework\Api\ExtensibleDataInterface;
use Magento\Framework\Api\SimpleDataObjectConverter;
@@ -109,13 +110,13 @@ class DataObjectProcessor
$key = SimpleDataObjectConverter::camelCaseToSnakeCase(substr($methodName, 3));
if ($key === ExtensibleDataInterface::CUSTOM_ATTRIBUTES) {
$value = $this->convertCustomAttributes($value, $dataObjectType);
- } elseif (is_object($value)) {
+ } elseif (is_object($value) && !($value instanceof Phrase)) {
$value = $this->buildOutputDataArray($value, $returnType);
} elseif (is_array($value)) {
$valueResult = [];
$arrayElementType = substr($returnType, 0, -2);
foreach ($value as $singleValue) {
- if (is_object($singleValue)) {
+ if (is_object($singleValue) && !($singleValue instanceof Phrase)) {
$singleValue = $this->buildOutputDataArray($singleValue, $arrayElementType);
}
$valueResult[] = $this->castValueToType($singleValue, $arrayElementType);
diff --git a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
index 7952aad49013f5db9c8562d0d7c0eb6b13309335..d5637d906e01869102c296933f2d539eead031bf 100644
--- a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
+++ b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
@@ -3,52 +3,47 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-
-// @codingStandardsIgnoreFile
-
namespace Magento\Framework\Url;
-class RouteParamsResolver extends \Magento\Framework\Object implements \Magento\Framework\Url\RouteParamsResolverInterface
+use Magento\Framework\Url\RouteParamsResolverInterface;
+
+/**
+ * Route params resolver.
+ *
+ * @method $this setType(string $type)
+ * @method string getType()
+ * @method $this setScope(string $scope)
+ * @method string getScope()
+ * @method $this setSecureIsForced(bool $isForced)
+ * @method bool getSecureIsForced()
+ * @method $this setSecure(bool $isForced)
+ * @method bool getSecure()
+ */
+class RouteParamsResolver extends \Magento\Framework\Object implements RouteParamsResolverInterface
{
/**
* @var \Magento\Framework\App\RequestInterface
*/
- protected $_request;
-
- /**
- * @var \Magento\Framework\App\Config\ScopeConfigInterface
- */
- protected $_scopeConfig;
-
- /**
- * @var \Magento\Framework\Store\StoreManagerInterface
- */
- protected $_storeManager;
+ protected $request;
/**
* @var \Magento\Framework\Url\QueryParamsResolverInterface
*/
- protected $_queryParamsResolver;
+ protected $queryParamsResolver;
/**
* @param \Magento\Framework\App\RequestInterface $request
- * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
* @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
* @param array $data
*/
public function __construct(
\Magento\Framework\App\RequestInterface $request,
- \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
\Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver,
array $data = []
) {
parent::__construct($data);
- $this->_request = $request;
- $this->_scopeConfig = $scopeConfig;
- $this->_storeManager = $storeManager;
- $this->_queryParamsResolver = $queryParamsResolver;
+ $this->request = $request;
+ $this->queryParamsResolver = $queryParamsResolver;
}
/**
@@ -63,11 +58,6 @@ class RouteParamsResolver extends \Magento\Framework\Object implements \Magento\
unset($data['_type']);
}
- if (isset($data['_scope'])) {
- $this->setScope($data['_scope']);
- unset($data['_scope']);
- }
-
if (isset($data['_forced_secure'])) {
$this->setSecure((bool)$data['_forced_secure']);
$this->setSecureIsForced(true);
@@ -88,20 +78,20 @@ class RouteParamsResolver extends \Magento\Framework\Object implements \Magento\
if (isset($data['_current'])) {
if (is_array($data['_current'])) {
foreach ($data['_current'] as $key) {
- if (array_key_exists($key, $data) || !$this->_request->getUserParam($key)) {
+ if (array_key_exists($key, $data) || !$this->request->getUserParam($key)) {
continue;
}
- $data[$key] = $this->_request->getUserParam($key);
+ $data[$key] = $this->request->getUserParam($key);
}
} elseif ($data['_current']) {
- foreach ($this->_request->getUserParams() as $key => $value) {
+ foreach ($this->request->getUserParams() as $key => $value) {
if (array_key_exists($key, $data) || $this->getRouteParam($key)) {
continue;
}
$data[$key] = $value;
}
- foreach ($this->_request->getQuery() as $key => $value) {
- $this->_queryParamsResolver->setQueryParam($key, $value);
+ foreach ($this->request->getQuery() as $key => $value) {
+ $this->queryParamsResolver->setQueryParam($key, $value);
}
}
unset($data['_current']);
@@ -111,19 +101,6 @@ class RouteParamsResolver extends \Magento\Framework\Object implements \Magento\
unset($data['_use_rewrite']);
}
- if (isset($data['_scope_to_url']) && (bool)$data['_scope_to_url'] === true) {
- $store = $this->getScope() ?: $this->_storeManager->getStore();
- if (!$this->_scopeConfig->getValue(
- \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
- $this->getScope()
- ) && !$this->_storeManager->hasSingleStore()
- ) {
- $this->_queryParamsResolver->setQueryParam('___store', $store->getCode());
- }
- }
- unset($data['_scope_to_url']);
-
foreach ($data as $key => $value) {
$this->setRouteParam($key, $value);
}
diff --git a/lib/internal/Magento/Framework/Url/ScopeResolver.php b/lib/internal/Magento/Framework/Url/ScopeResolver.php
index 2a452d8db19f9cd46a0b8886e4652d25adea78d9..e53d1dd145cbcf1a7aa40261c5eb819507c8ed36 100644
--- a/lib/internal/Magento/Framework/Url/ScopeResolver.php
+++ b/lib/internal/Magento/Framework/Url/ScopeResolver.php
@@ -5,26 +5,31 @@
*/
namespace Magento\Framework\Url;
+/**
+ * Class ScopeResolver
+ *
+ * URL scope resolver.
+ */
class ScopeResolver implements \Magento\Framework\Url\ScopeResolverInterface
{
/**
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Framework\App\ScopeResolverInterface
*/
- protected $_storeManager;
+ protected $scopeResolver;
/**
* @var null|string
*/
- protected $_areaCode;
+ protected $areaCode;
/**
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
* @param string|null $areaCode
*/
- public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager, $areaCode = null)
+ public function __construct(\Magento\Framework\App\ScopeResolverInterface $scopeResolver, $areaCode = null)
{
- $this->_storeManager = $storeManager;
- $this->_areaCode = $areaCode;
+ $this->scopeResolver = $scopeResolver;
+ $this->areaCode = $areaCode;
}
/**
@@ -32,7 +37,7 @@ class ScopeResolver implements \Magento\Framework\Url\ScopeResolverInterface
*/
public function getScope($scopeId = null)
{
- $scope = $this->_storeManager->getStore($scopeId);
+ $scope = $this->scopeResolver->getScope($scopeId);
if (!$scope instanceof \Magento\Framework\Url\ScopeInterface) {
throw new \Magento\Framework\Exception('Invalid scope object');
}
@@ -41,11 +46,13 @@ class ScopeResolver implements \Magento\Framework\Url\ScopeResolverInterface
}
/**
- * {@inheritdoc}
+ * Retrieve array of URL scopes.
+ *
+ * @return \Magento\Framework\Url\ScopeInterface[]
*/
public function getScopes()
{
- return $this->_storeManager->getStores();
+ return $this->scopeResolver->getScopes();
}
/**
@@ -53,6 +60,6 @@ class ScopeResolver implements \Magento\Framework\Url\ScopeResolverInterface
*/
public function getAreaCode()
{
- return $this->_areaCode;
+ return $this->areaCode;
}
}
diff --git a/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php b/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
index 8bdafba934fee266d56c8b3d160ca36afb022203..893443659220d4b68e5ec3514f25beb0ea3c7725 100644
--- a/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
+++ b/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
@@ -7,13 +7,6 @@ namespace Magento\Framework\Url;
interface ScopeResolverInterface extends \Magento\Framework\App\ScopeResolverInterface
{
- /**
- * Retrieve scopes array
- *
- * @return \Magento\Framework\Url\ScopeInterface[]
- */
- public function getScopes();
-
/**
* Retrieve area code
*
diff --git a/lib/internal/Magento/Framework/Url/SecurityInfo.php b/lib/internal/Magento/Framework/Url/SecurityInfo.php
index 873da1c701ca8e1e892be015522995302ba6ad5f..e868f45f5741d8ef5f20cf46d07aa4ead4e80a89 100644
--- a/lib/internal/Magento/Framework/Url/SecurityInfo.php
+++ b/lib/internal/Magento/Framework/Url/SecurityInfo.php
@@ -9,35 +9,26 @@ namespace Magento\Framework\Url;
class SecurityInfo implements \Magento\Framework\Url\SecurityInfoInterface
{
- /**
- * @var \Magento\Framework\App\Config\ScopeConfigInterface
- */
- protected $_scopeConfig;
-
/**
* List of secure url patterns
*
* @var array
*/
- protected $_secureUrlList = [];
+ protected $secureUrlsList = [];
/**
* List of already checked urls
*
* @var array
*/
- protected $_secureUrlCache = [];
+ protected $secureUrlsCache = [];
/**
- * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
- * @param array $secureUrlList
+ * @param string[] $secureUrlList
*/
- public function __construct(
- \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
- array $secureUrlList = []
- ) {
- $this->_scopeConfig = $scopeConfig;
- $this->_secureUrlList = $secureUrlList;
+ public function __construct($secureUrlList = [])
+ {
+ $this->secureUrlsList = $secureUrlList;
}
/**
@@ -48,23 +39,15 @@ class SecurityInfo implements \Magento\Framework\Url\SecurityInfoInterface
*/
public function isSecure($url)
{
- if (!$this->_scopeConfig->getValue(
- \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
- )
- ) {
- return false;
- }
-
- if (!isset($this->_secureUrlCache[$url])) {
- $this->_secureUrlCache[$url] = false;
- foreach ($this->_secureUrlList as $match) {
+ if (!isset($this->secureUrlsCache[$url])) {
+ $this->secureUrlsCache[$url] = false;
+ foreach ($this->secureUrlsList as $match) {
if (strpos($url, (string)$match) === 0) {
- $this->_secureUrlCache[$url] = true;
+ $this->secureUrlsCache[$url] = true;
break;
}
}
}
- return $this->_secureUrlCache[$url];
+ return $this->secureUrlsCache[$url];
}
}
diff --git a/lib/internal/Magento/Framework/Url/Validator.php b/lib/internal/Magento/Framework/Url/Validator.php
index 4c469394159fec97d72a12027d790c467ab857ab..4da759f727f754fb02a1fe9ed1ee5a1349986d6d 100644
--- a/lib/internal/Magento/Framework/Url/Validator.php
+++ b/lib/internal/Magento/Framework/Url/Validator.php
@@ -25,7 +25,7 @@ class Validator extends \Zend_Validate_Abstract
public function __construct()
{
// set translated message template
- $this->setMessage(__("Invalid URL '%value%'."), self::INVALID_URL);
+ $this->setMessage((string)new \Magento\Framework\Phrase("Invalid URL '%value%'."), self::INVALID_URL);
}
/**
diff --git a/lib/internal/Magento/Framework/Validator/Entity/Properties.php b/lib/internal/Magento/Framework/Validator/Entity/Properties.php
index 44a1dd3fc90e847064366b0c4f2cbd6a7650d1f4..6c96fe8bac14afc2f40dc5f5a943b1c73d41ef13 100644
--- a/lib/internal/Magento/Framework/Validator/Entity/Properties.php
+++ b/lib/internal/Magento/Framework/Validator/Entity/Properties.php
@@ -48,7 +48,9 @@ class Properties extends \Magento\Framework\Validator\AbstractValidator
}
foreach ($this->_readOnlyProperties as $property) {
if ($this->_hasChanges($value->getData($property), $value->getOrigData($property))) {
- $this->_messages[__CLASS__] = [__("Read-only property cannot be changed.")];
+ $this->_messages[__CLASS__] = [
+ (string)new \Magento\Framework\Phrase("Read-only property cannot be changed.")
+ ];
break;
}
}
diff --git a/lib/internal/Magento/Framework/View/Asset/Config.php b/lib/internal/Magento/Framework/View/Asset/Config.php
index 7a9460c23e2db7e98f5c89a675200496e123504c..53650dc6f39e89ed8e2478bbdc4025d5d2340019 100644
--- a/lib/internal/Magento/Framework/View/Asset/Config.php
+++ b/lib/internal/Magento/Framework/View/Asset/Config.php
@@ -53,7 +53,7 @@ class Config implements \Magento\Framework\View\Asset\ConfigInterface
*/
public function isMergeCssFiles()
{
- return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_CSS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_CSS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -63,7 +63,7 @@ class Config implements \Magento\Framework\View\Asset\ConfigInterface
*/
public function isMergeJsFiles()
{
- return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_JS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_JS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
/**
@@ -76,7 +76,7 @@ class Config implements \Magento\Framework\View\Asset\ConfigInterface
{
return (bool)$this->scopeConfig->isSetFlag(
sprintf(self::XML_PATH_MINIFICATION_ENABLED, $contentType),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
@@ -90,7 +90,7 @@ class Config implements \Magento\Framework\View\Asset\ConfigInterface
{
return (string)$this->scopeConfig->getValue(
sprintf(self::XML_PATH_MINIFICATION_ADAPTER, $contentType),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
}
diff --git a/lib/internal/Magento/Framework/View/BlockPool.php b/lib/internal/Magento/Framework/View/BlockPool.php
index e591dca939f0620818d3629f0fe0509805f534ec..41f51f9d28b35c1970b28a329c80e25675fc29e3 100644
--- a/lib/internal/Magento/Framework/View/BlockPool.php
+++ b/lib/internal/Magento/Framework/View/BlockPool.php
@@ -48,7 +48,9 @@ class BlockPool
public function add($name, $class, array $arguments = [])
{
if (!class_exists($class)) {
- throw new \InvalidArgumentException(__('Invalid Block class name: ' . $class));
+ throw new \InvalidArgumentException(
+ (string)new \Magento\Framework\Phrase('Invalid Block class name: %1', [$class])
+ );
}
$block = $this->blockFactory->createBlock($class, $arguments);
diff --git a/lib/internal/Magento/Framework/View/DataSourcePool.php b/lib/internal/Magento/Framework/View/DataSourcePool.php
index 6e613c891195bfbbdf6ae5606dc8bbbe3a4333cc..4d0e9f6f87e5c55cbb1e645213ba36b1219e40cf 100644
--- a/lib/internal/Magento/Framework/View/DataSourcePool.php
+++ b/lib/internal/Magento/Framework/View/DataSourcePool.php
@@ -55,7 +55,9 @@ class DataSourcePool
{
if (!isset($this->dataSources[$name])) {
if (!class_exists($class)) {
- throw new \InvalidArgumentException(__('Invalid Data Source class name: ' . $class));
+ throw new \InvalidArgumentException(
+ (string)new \Magento\Framework\Phrase('Invalid Data Source class name: %1', [$class])
+ );
}
$data = $this->blockFactory->createBlock($class);
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php b/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php
index 2a2e666e468a72cd53a2e6e1b47f60dc7724734e..da5596876a7f1197a5e01fd5a006600186726a61 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php
@@ -69,7 +69,9 @@ class Uploader
return false;
}
if (!$this->_transferAdapter->isValid($scope)) {
- throw new \Magento\Framework\Exception(__('Uploaded image is not valid'));
+ throw new \Magento\Framework\Exception(
+ (string)new \Magento\Framework\Phrase('Uploaded image is not valid')
+ );
}
$upload = $this->_uploaderFactory->create(['fileId' => $scope]);
$upload->setAllowCreateFolders(true);
@@ -78,10 +80,10 @@ class Uploader
$upload->setFilesDispersion(false);
if (!$upload->checkAllowedExtension($upload->getFileExtension())) {
- throw new \Magento\Framework\Exception(__('Invalid image file type.'));
+ throw new \Magento\Framework\Exception((string)new \Magento\Framework\Phrase('Invalid image file type.'));
}
if (!$upload->save($destinationPath)) {
- throw new \Magento\Framework\Exception(__('Image can not be saved.'));
+ throw new \Magento\Framework\Exception((string)new \Magento\Framework\Phrase('Image can not be saved.'));
}
return $destinationPath . '/' . $upload->getUploadedFileName();
}
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Label.php b/lib/internal/Magento/Framework/View/Design/Theme/Label.php
index 5d488ffc9dae7ef44db2beb4a396070c98d5d241..dd9ea1ec76954e2340f9fcdd69349fb3562acc67 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Label.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Label.php
@@ -50,6 +50,6 @@ class Label
*/
public function getLabelsCollectionForSystemConfiguration()
{
- return $this->getLabelsCollection(__('-- No Theme --'));
+ return $this->getLabelsCollection((string)new \Magento\Framework\Phrase('-- No Theme --'));
}
}
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
index fc5e10beb771803a34987ad3c99331b35e350f23..14112331a105fdae888d68c50b0539b8938acf91 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
@@ -48,7 +48,7 @@ class Validator
'class' => 'Zend_Validate_NotEmpty',
'break' => true,
'options' => [],
- 'message' => __('Field title can\'t be empty'),
+ 'message' => (string)new \Magento\Framework\Phrase('Field title can\'t be empty'),
],
];
@@ -69,7 +69,7 @@ class Validator
'class' => 'Zend_Validate_NotEmpty',
'break' => true,
'options' => [],
- 'message' => __('Theme type can\'t be empty'),
+ 'message' => (string)new \Magento\Framework\Phrase('Theme type can\'t be empty'),
],
[
'name' => 'available',
@@ -82,7 +82,7 @@ class Validator
\Magento\Framework\View\Design\ThemeInterface::TYPE_STAGING,
],
],
- 'message' => __('Theme type is invalid')
+ 'message' => (string)new \Magento\Framework\Phrase('Theme type is invalid')
],
];
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index a19115c41dc33ef03ad2e8945ebc903f20085460..73f90325de211f2ba007a0eef0125ece92d531ad 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -622,7 +622,7 @@ abstract class AbstractBlock extends \Magento\Framework\Object implements BlockI
$this->_eventManager->dispatch('view_block_abstract_to_html_before', ['block' => $this]);
if ($this->_scopeConfig->getValue(
'advanced/modules_disable_output/' . $this->getModuleName(),
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)) {
return '';
}
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
index 5eecfa73b862191b443b514cb09172f3ab8b7521..b9b7b2e4a7dfca0502d3b79f5be96b41d410c529 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
@@ -97,7 +97,7 @@ class Calendar extends \Magento\Framework\View\Element\Template
'firstDay',
(int)$this->_scopeConfig->getValue(
'general/locale/firstday',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
);
$this->assign(
@@ -105,7 +105,7 @@ class Calendar extends \Magento\Framework\View\Element\Template
$this->encoder->encode(
(string)$this->_scopeConfig->getValue(
'general/locale/weekend',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
)
)
);
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Date.php b/lib/internal/Magento/Framework/View/Element/Html/Date.php
index 9087b8c7fc0e825ad1c03d70f1992faea1631959..ec62f498840fe1e291db824ba22a3f0365b5c62c 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Date.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Date.php
@@ -46,7 +46,7 @@ class Date extends \Magento\Framework\View\Element\Template
'",' : '') .
'
buttonText: "' .
- __(
+ (string)new \Magento\Framework\Phrase(
'Select Date'
) .
'"
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
index 990690a26f6f807802da70713de97cb6f888c1db..811bea3e4eb33d05aba2d29227fe34e056b345b6 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
@@ -101,12 +101,16 @@ class Current extends \Magento\Framework\View\Element\Template
if ($this->isCurrent()) {
$html = '<li class="nav item current">';
- $html .= '<strong>' . $this->escapeHtml(__($this->getLabel())) . '</strong>';
+ $html .= '<strong>'
+ . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel()))
+ . '</strong>';
$html .= '</li>';
} else {
$html = '<li class="nav item' . $highlight . '"><a href="' . $this->escapeHtml($this->getHref()) . '"';
- $html .= $this->getTitle() ? ' title="' . $this->escapeHtml(__($this->getTitle())) . '"' : '';
- $html .= '>' . $this->escapeHtml(__($this->getLabel())) . '</a></li>';
+ $html .= $this->getTitle()
+ ? ' title="' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getTitle())) . '"'
+ : '';
+ $html .= '>' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel())) . '</a></li>';
}
return $html;
diff --git a/lib/internal/Magento/Framework/View/Element/Redirect.php b/lib/internal/Magento/Framework/View/Element/Redirect.php
index 7c0a1813e9514c8e26b91942d7b3486b03902e19..6a68b20742c587ef8c3cfa757f5d0fe4bc28e5dd 100644
--- a/lib/internal/Magento/Framework/View/Element/Redirect.php
+++ b/lib/internal/Magento/Framework/View/Element/Redirect.php
@@ -182,14 +182,19 @@ class Redirect extends Template
$html = '';
$html .= '<div class="page-title">';
- $html .= '<h1>' . __('Redirecting...') . '</h1>';
+ $html .= '<h1>' . (string)new \Magento\Framework\Phrase('Redirecting...') . '</h1>';
$html .= '</div>';
if ($this->getMessage()) {
$html .= '<p>' . $this->getMessage() . '</p>';
}
$html .= $this->getRedirectOutput();
if (!$this->isHtmlFormRedirect()) {
- $html .= '<p>' . __('Click <a href="%1">here</a> if nothing has happened', $this->getTargetURL()) . '</p>';
+ $html .= '<p>'
+ . (string)new \Magento\Framework\Phrase(
+ 'Click <a href="%1">here</a> if nothing has happened',
+ [$this->getTargetURL()]
+ )
+ . '</p>';
}
return $html;
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index 751a360cfa05600ee1a6f510317dc5527b1de579..0b2f2a0e8cb9146f32564ec1ff1d2cedd35f3fef 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -79,7 +79,7 @@ class Template extends AbstractBlock
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -322,7 +322,7 @@ class Template extends AbstractBlock
if (null === $this->_allowSymlinks) {
$this->_allowSymlinks = $this->_scopeConfig->isSetFlag(
self::XML_PATH_TEMPLATE_ALLOW_SYMLINK,
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $this->_allowSymlinks;
diff --git a/lib/internal/Magento/Framework/View/Element/Template/Context.php b/lib/internal/Magento/Framework/View/Element/Template/Context.php
index f57017f504f3d22a22f8c4c0aa96b9a09e8a0448..fab3a911e20a90b5bcd5e531e088749370455b8c 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/Context.php
@@ -52,7 +52,7 @@ class Context extends \Magento\Framework\View\Element\Context
/**
* Store manager
*
- * @var \Magento\Framework\Store\StoreManagerInterface
+ * @var \Magento\Store\Model\StoreManagerInterface
*/
protected $_storeManager;
@@ -84,7 +84,7 @@ class Context extends \Magento\Framework\View\Element\Context
* @param \Magento\Framework\View\FileSystem $viewFileSystem
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
* @param \Magento\Framework\App\State $appState
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Framework\View\Page\Config $pageConfig
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -112,7 +112,7 @@ class Context extends \Magento\Framework\View\Element\Context
\Magento\Framework\View\FileSystem $viewFileSystem,
\Magento\Framework\View\TemplateEnginePool $enginePool,
\Magento\Framework\App\State $appState,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\View\Page\Config $pageConfig
) {
parent::__construct(
@@ -198,7 +198,7 @@ class Context extends \Magento\Framework\View\Element\Context
/**
* Get store manager
*
- * @return \Magento\Framework\Store\StoreManagerInterface
+ * @return \Magento\Store\Model\StoreManagerInterface
*/
public function getStoreManager()
{
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
index 980c514431620f92b0aef14fc681b192acfab64d..90a04041387e5fc14c7dc781312dd3133baeb4e7 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
@@ -7,6 +7,10 @@ namespace Magento\Framework\View\Layout\Generator;
use Magento\Framework\View\Layout;
+/**
+ * Class Block
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class Block implements Layout\GeneratorInterface
{
/**
@@ -177,7 +181,9 @@ class Block implements Layout\GeneratorInterface
}
}
if (!$block instanceof \Magento\Framework\View\Element\AbstractBlock) {
- throw new \Magento\Framework\Model\Exception(__('Invalid block type: %1', $block));
+ throw new \Magento\Framework\Model\Exception(
+ (string)new \Magento\Framework\Phrase('Invalid block type: %1', [$block])
+ );
}
return $block;
}
diff --git a/lib/internal/Magento/Framework/View/Layout/PageType/Config.php b/lib/internal/Magento/Framework/View/Layout/PageType/Config.php
index 31d680f7b7be7687b87fd62b2d1cec83b3355325..cce01dc8b2707c3d6e52ce01554bd4e8d61ff39d 100644
--- a/lib/internal/Magento/Framework/View/Layout/PageType/Config.php
+++ b/lib/internal/Magento/Framework/View/Layout/PageType/Config.php
@@ -43,7 +43,7 @@ class Config
if ($this->_pageTypes === null) {
$this->_pageTypes = [];
foreach ($this->_dataStorage->get(null) as $pageTypeId => $pageTypeConfig) {
- $pageTypeConfig['label'] = __($pageTypeConfig['label']);
+ $pageTypeConfig['label'] = (string)new \Magento\Framework\Phrase($pageTypeConfig['label']);
$this->_pageTypes[$pageTypeId] = new \Magento\Framework\Object($pageTypeConfig);
}
}
diff --git a/app/code/Magento/Core/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
similarity index 83%
rename from app/code/Magento/Core/Model/Layout/Merge.php
rename to lib/internal/Magento/Framework/View/Model/Layout/Merge.php
index c9e81ae0953be3b4c4b00c46566f014ba6362206..c675bf6d81d07967b2cbdf35248476ad2af42ace 100644
--- a/app/code/Magento/Core/Model/Layout/Merge.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -3,9 +3,9 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout;
+namespace Magento\Framework\View\Model\Layout;
-use Magento\Core\Model\Layout\Update\Validator;
+use Magento\Framework\View\Model\Layout\Update\Validator;
use Magento\Framework\App\Filesystem\DirectoryList;
/**
@@ -41,84 +41,79 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
const PAGE_LAYOUT_CACHE_SUFFIX = 'page_layout';
/**
- * @var \Magento\Theme\Model\Theme
+ * @var \Magento\Framework\View\Design\ThemeInterface
*/
- private $_theme;
+ private $theme;
/**
- * @var \Magento\Store\Model\Store
+ * @var \Magento\Framework\Url\ScopeInterface
*/
- private $_store;
+ private $scope;
/**
* In-memory cache for loaded layout updates
*
* @var \Magento\Framework\View\Layout\Element
*/
- protected $_layoutUpdatesCache;
+ protected $layoutUpdatesCache;
/**
* Cumulative array of update XML strings
*
* @var array
*/
- protected $_updates = [];
+ protected $updates = [];
/**
* Handles used in this update
*
* @var array
*/
- protected $_handles = [];
+ protected $handles = [];
/**
* Page handle names sorted by from parent to child
*
* @var array
*/
- protected $_pageHandles = [];
+ protected $pageHandles = [];
/**
* Substitution values in structure array('from' => array(), 'to' => array())
*
* @var array|null
*/
- protected $_subst = null;
+ protected $subst = null;
/**
* @var \Magento\Framework\View\File\CollectorInterface
*/
- private $_fileSource;
+ private $fileSource;
/**
* @var \Magento\Framework\View\File\CollectorInterface
*/
private $pageLayoutFileSource;
- /**
- * @var \Magento\Core\Model\Resource\Layout\Update
- */
- private $_resource;
-
/**
* @var \Magento\Framework\App\State
*/
- private $_appState;
+ private $appState;
/**
* @var \Magento\Framework\Cache\FrontendInterface
*/
- protected $_cache;
+ protected $cache;
/**
- * @var \Magento\Core\Model\Layout\Update\Validator
+ * @var \Magento\Framework\View\Model\Layout\Update\Validator
*/
- protected $_layoutValidator;
+ protected $layoutValidator;
/**
* @var \Psr\Log\LoggerInterface
*/
- protected $_logger;
+ protected $logger;
/**
* @var \Magento\Framework\Filesystem
@@ -160,13 +155,12 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
* Init merge model
*
* @param \Magento\Framework\View\DesignInterface $design
- * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+ * @param \Magento\Framework\Url\ScopeResolverInterface $scopeResolver
* @param \Magento\Framework\View\File\CollectorInterface $fileSource
* @param \Magento\Framework\View\File\CollectorInterface $pageLayoutFileSource
- * @param \Magento\Core\Model\Resource\Layout\Update $resource
* @param \Magento\Framework\App\State $appState
* @param \Magento\Framework\Cache\FrontendInterface $cache
- * @param \Magento\Core\Model\Layout\Update\Validator $validator
+ * @param \Magento\Framework\View\Model\Layout\Update\Validator $validator
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
* @param \Magento\Framework\View\Design\ThemeInterface $theme Non-injectable theme instance
@@ -175,27 +169,25 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
public function __construct(
\Magento\Framework\View\DesignInterface $design,
- \Magento\Framework\Store\StoreManagerInterface $storeManager,
+ \Magento\Framework\Url\ScopeResolverInterface $scopeResolver,
\Magento\Framework\View\File\CollectorInterface $fileSource,
\Magento\Framework\View\File\CollectorInterface $pageLayoutFileSource,
- \Magento\Core\Model\Resource\Layout\Update $resource,
\Magento\Framework\App\State $appState,
\Magento\Framework\Cache\FrontendInterface $cache,
- \Magento\Core\Model\Layout\Update\Validator $validator,
+ \Magento\Framework\View\Model\Layout\Update\Validator $validator,
\Psr\Log\LoggerInterface $logger,
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\View\Design\ThemeInterface $theme = null,
$cacheSuffix = ''
) {
- $this->_theme = $theme ?: $design->getDesignTheme();
- $this->_store = $storeManager->getStore();
- $this->_fileSource = $fileSource;
+ $this->theme = $theme ?: $design->getDesignTheme();
+ $this->scope = $scopeResolver->getScope();
+ $this->fileSource = $fileSource;
$this->pageLayoutFileSource = $pageLayoutFileSource;
- $this->_resource = $resource;
- $this->_appState = $appState;
- $this->_cache = $cache;
- $this->_layoutValidator = $validator;
- $this->_logger = $logger;
+ $this->appState = $appState;
+ $this->cache = $cache;
+ $this->layoutValidator = $validator;
+ $this->logger = $logger;
$this->filesystem = $filesystem;
$this->cacheSuffix = $cacheSuffix;
}
@@ -208,7 +200,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
public function addUpdate($update)
{
- $this->_updates[] = $update;
+ $this->updates[] = $update;
return $this;
}
@@ -219,7 +211,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
public function asArray()
{
- return $this->_updates;
+ return $this->updates;
}
/**
@@ -229,7 +221,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
public function asString()
{
- return implode('', $this->_updates);
+ return implode('', $this->updates);
}
/**
@@ -242,10 +234,10 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
{
if (is_array($handleName)) {
foreach ($handleName as $name) {
- $this->_handles[$name] = $this->handleAdded;
+ $this->handles[$name] = $this->handleAdded;
}
} else {
- $this->_handles[$handleName] = $this->handleAdded;
+ $this->handles[$handleName] = $this->handleAdded;
}
return $this;
}
@@ -258,7 +250,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
public function removeHandle($handleName)
{
- unset($this->_handles[$handleName]);
+ unset($this->handles[$handleName]);
return $this;
}
@@ -269,7 +261,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
public function getHandles()
{
- return array_keys($this->_handles);
+ return array_keys($this->handles);
}
/**
@@ -287,7 +279,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
continue;
}
$handles[] = $handleName;
- $this->_pageHandles = $handles;
+ $this->pageHandles = $handles;
$this->addHandle($handles);
$handlesAdded = true;
}
@@ -356,7 +348,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
public function getPageHandles()
{
- return $this->_pageHandles;
+ return $this->pageHandles;
}
/**
@@ -389,7 +381,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
$name = $node->getAttribute('id');
$info = [
'name' => $name,
- 'label' => __((string)$node->getAttribute('label')),
+ 'label' => (string)new \Magento\Framework\Phrase((string)$node->getAttribute('label')),
'design_abstraction' => $node->getAttribute('design_abstraction'),
];
$result[$name] = $info;
@@ -456,12 +448,12 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
protected function _validateMergedLayout($cacheId, $layout)
{
$layoutStr = '<handle id="handle">' . $layout . '</handle>';
- if ($this->_appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER) {
- if (!$this->_layoutValidator->isValid($layoutStr, Validator::LAYOUT_SCHEMA_MERGED, false)) {
- $messages = $this->_layoutValidator->getMessages();
+ if ($this->appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER) {
+ if (!$this->layoutValidator->isValid($layoutStr, Validator::LAYOUT_SCHEMA_MERGED, false)) {
+ $messages = $this->layoutValidator->getMessages();
//Add first message to exception
$message = reset($messages);
- $this->_logger->info('Cache file with merged layout: ' . $cacheId . ': ' . $message);
+ $this->logger->info('Cache file with merged layout: ' . $cacheId . ': ' . $message);
}
}
return $this;
@@ -501,15 +493,15 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
protected function _merge($handle)
{
- if (!isset($this->_handles[$handle]) || $this->_handles[$handle] == $this->handleAdded) {
- $this->_handles[$handle] = $this->handleProcessing;
+ if (!isset($this->handles[$handle]) || $this->handles[$handle] == $this->handleAdded) {
+ $this->handles[$handle] = $this->handleProcessing;
$this->_fetchPackageLayoutUpdates($handle);
$this->_fetchDbLayoutUpdates($handle);
- $this->_handles[$handle] = $this->handleProcessed;
- } elseif ($this->_handles[$handle] == $this->handleProcessing
- && $this->_appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER
+ $this->handles[$handle] = $this->handleProcessed;
+ } elseif ($this->handles[$handle] == $this->handleProcessing
+ && $this->appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER
) {
- $this->_logger->info('Cyclic dependency in merged layout for handle: ' . $handle);
+ $this->logger->info('Cyclic dependency in merged layout for handle: ' . $handle);
}
return $this;
}
@@ -544,7 +536,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
{
$_profilerKey = 'layout_db_update: ' . $handle;
\Magento\Framework\Profiler::start($_profilerKey);
- $updateStr = $this->_getDbUpdateString($handle);
+ $updateStr = $this->getDbUpdateString($handle);
if (!$updateStr) {
\Magento\Framework\Profiler::stop($_profilerKey);
return false;
@@ -569,18 +561,18 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
protected function _substitutePlaceholders($xmlString)
{
- if ($this->_subst === null) {
+ if ($this->subst === null) {
$placeholders = [
- 'baseUrl' => $this->_store->getBaseUrl(),
- 'baseSecureUrl' => $this->_store->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_LINK, true),
+ 'baseUrl' => $this->scope->getBaseUrl(),
+ 'baseSecureUrl' => $this->scope->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_LINK, true),
];
- $this->_subst = [];
+ $this->subst = [];
foreach ($placeholders as $key => $value) {
- $this->_subst['from'][] = '{{' . $key . '}}';
- $this->_subst['to'][] = $value;
+ $this->subst['from'][] = '{{' . $key . '}}';
+ $this->subst['to'][] = $value;
}
}
- return str_replace($this->_subst['from'], $this->_subst['to'], $xmlString);
+ return str_replace($this->subst['from'], $this->subst['to'], $xmlString);
}
/**
@@ -589,9 +581,9 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
* @param string $handle
* @return string
*/
- protected function _getDbUpdateString($handle)
+ public function getDbUpdateString($handle)
{
- return $this->_resource->fetchUpdatesByHandle($handle, $this->_theme, $this->_store);
+ return null;
}
/**
@@ -620,8 +612,8 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
public function getFileLayoutUpdatesXml()
{
- if ($this->_layoutUpdatesCache) {
- return $this->_layoutUpdatesCache;
+ if ($this->layoutUpdatesCache) {
+ return $this->layoutUpdatesCache;
}
$cacheId = $this->_getCacheId($this->cacheSuffix);
$result = $this->_loadCache($cacheId);
@@ -631,7 +623,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
$result = $this->_loadFileLayoutUpdatesXml();
$this->_saveCache($result->asXml(), $cacheId);
}
- $this->_layoutUpdatesCache = $result;
+ $this->layoutUpdatesCache = $result;
return $result;
}
@@ -643,7 +635,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
protected function _getCacheId($suffix = '')
{
- return "LAYOUT_{$this->_theme->getArea()}_STORE{$this->_store->getId()}_{$this->_theme->getId()}{$suffix}";
+ return "LAYOUT_{$this->theme->getArea()}_STORE{$this->scope->getId()}_{$this->theme->getId()}{$suffix}";
}
/**
@@ -654,7 +646,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
protected function _loadCache($cacheId)
{
- return $this->_cache->load($cacheId);
+ return $this->cache->load($cacheId);
}
/**
@@ -667,7 +659,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
protected function _saveCache($data, $cacheId, array $cacheTags = [])
{
- $this->_cache->save($data, $cacheId, $cacheTags, null);
+ $this->cache->save($data, $cacheId, $cacheTags, null);
}
/**
@@ -679,8 +671,8 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
protected function _loadFileLayoutUpdatesXml()
{
$layoutStr = '';
- $theme = $this->_getPhysicalTheme($this->_theme);
- $updateFiles = $this->_fileSource->getFiles($theme, '*.xml');
+ $theme = $this->_getPhysicalTheme($this->theme);
+ $updateFiles = $this->fileSource->getFiles($theme, '*.xml');
$updateFiles = array_merge($updateFiles, $this->pageLayoutFileSource->getFiles($theme, '*.xml'));
$dir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
$useErrors = libxml_use_internal_errors(true);
@@ -727,7 +719,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
$errors[] = "{$error->message} Line: {$error->line}";
}
- $this->_logger->info(
+ $this->logger->info(
sprintf("Theme layout update file '%s' is not valid.\n%s", $fileName, implode("\n", $errors))
);
}
@@ -788,7 +780,7 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
foreach ($containerNodes as $oneContainerNode) {
$label = $oneContainerNode->getAttribute('label');
if ($label) {
- $result[$oneContainerNode->getAttribute('name')] = __($label);
+ $result[$oneContainerNode->getAttribute('name')] = (string)new \Magento\Framework\Phrase($label);
}
}
return $result;
@@ -802,8 +794,8 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
*/
public function __destruct()
{
- $this->_updates = [];
- $this->_layoutUpdatesCache = null;
+ $this->updates = [];
+ $this->layoutUpdatesCache = null;
}
/**
@@ -827,4 +819,24 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
}
return $abstraction['design_abstraction'] === self::DESIGN_ABSTRACTION_PAGE_LAYOUT;
}
+
+ /**
+ * Retrieve theme
+ *
+ * @return \Magento\Framework\View\Design\ThemeInterface
+ */
+ public function getTheme()
+ {
+ return $this->theme;
+ }
+
+ /**
+ * Retrieve current scope
+ *
+ * @return \Magento\Framework\Url\ScopeInterface
+ */
+ public function getScope()
+ {
+ return $this->scope;
+ }
}
diff --git a/app/code/Magento/Core/Model/Layout/Translator.php b/lib/internal/Magento/Framework/View/Model/Layout/Translator.php
similarity index 96%
rename from app/code/Magento/Core/Model/Layout/Translator.php
rename to lib/internal/Magento/Framework/View/Model/Layout/Translator.php
index 53399f1d34e938b81027b405cabc94e87d8144e2..b2dc025bbc647b1c97f1d9f5a0f8de39c1fbc7d4 100644
--- a/app/code/Magento/Core/Model/Layout/Translator.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Translator.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout;
+namespace Magento\Framework\View\Model\Layout;
use Magento\Framework\Simplexml\Element;
@@ -122,10 +122,10 @@ class Translator
* Translate node value
*
* @param string $value
- * @return string
+ * @return \Magento\Framework\Phrase
*/
protected function _translateValue($value)
{
- return __($value);
+ return (string)new \Magento\Framework\Phrase($value);
}
}
diff --git a/app/code/Magento/Core/Model/Layout/Update/Validator.php b/lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php
similarity index 89%
rename from app/code/Magento/Core/Model/Layout/Update/Validator.php
rename to lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php
index 3e2008165b6a4fa87b9c8d7d234b07f7b97c58f8..8721ae0be6dd04eaf9fb611164ad99088e4ba4ec 100644
--- a/app/code/Magento/Core/Model/Layout/Update/Validator.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php
@@ -3,7 +3,7 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-namespace Magento\Core\Model\Layout\Update;
+namespace Magento\Framework\View\Model\Layout\Update;
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -82,9 +82,9 @@ class Validator extends \Zend_Validate_Abstract
{
if (!$this->_messageTemplates) {
$this->_messageTemplates = [
- self::HELPER_ARGUMENT_TYPE => __('Helper arguments should not be used in custom layout updates.'),
- self::UPDATER_MODEL => __('Updater model should not be used in custom layout updates.'),
- self::XML_INVALID => __('Please correct the XML data and try again. %value%'),
+ self::HELPER_ARGUMENT_TYPE => (string)new \Magento\Framework\Phrase('Helper arguments should not be used in custom layout updates.'),
+ self::UPDATER_MODEL => (string)new \Magento\Framework\Phrase('Updater model should not be used in custom layout updates.'),
+ self::XML_INVALID => (string)new \Magento\Framework\Phrase('Please correct the XML data and try again. %value%'),
];
}
return $this;
diff --git a/lib/internal/Magento/Framework/View/Model/PageLayout/Config/BuilderInterface.php b/lib/internal/Magento/Framework/View/Model/PageLayout/Config/BuilderInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..107bd1f278605435c2e1e3f238a09dc291e61b83
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Model/PageLayout/Config/BuilderInterface.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\View\Model\PageLayout\Config;
+
+use Magento\Framework\View\LayoutInterface;
+
+/**
+ * Interface BuilderInterface
+ */
+interface BuilderInterface
+{
+ /**
+ * @return \Magento\Framework\View\PageLayout\Config
+ */
+ public function getPageLayoutsConfig();
+}
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index 56a903e20994caa1c23bd371ea9b7295928c2b99..9fe5599d6a992a40cef269d645cc203413412e50 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -234,7 +234,7 @@ class Config
if (empty($this->metadata['media_type'])) {
$this->metadata['media_type'] = $this->scopeConfig->getValue(
'design/head/default_media_type',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $this->metadata['media_type'];
@@ -260,7 +260,7 @@ class Config
if (empty($this->metadata['charset'])) {
$this->metadata['charset'] = $this->scopeConfig->getValue(
'design/head/default_charset',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $this->metadata['charset'];
@@ -286,7 +286,7 @@ class Config
if (empty($this->metadata['description'])) {
$this->metadata['description'] = $this->scopeConfig->getValue(
'design/head/default_description',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $this->metadata['description'];
@@ -312,7 +312,7 @@ class Config
if (empty($this->metadata['keywords'])) {
$this->metadata['keywords'] = $this->scopeConfig->getValue(
'design/head/default_keywords',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $this->metadata['keywords'];
@@ -338,7 +338,7 @@ class Config
if (empty($this->metadata['robots'])) {
$this->metadata['robots'] = $this->scopeConfig->getValue(
'design/search_engine_robots/default_robots',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $this->metadata['robots'];
@@ -516,7 +516,7 @@ class Config
if (empty($this->includes)) {
$this->includes = $this->scopeConfig->getValue(
'design/head/includes',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
return $this->includes;
diff --git a/lib/internal/Magento/Framework/View/Page/Title.php b/lib/internal/Magento/Framework/View/Page/Title.php
index 07a6210ec53076f817039323fa13a78286fc2cc7..05540c3607b3f04ba3dd295cbb1da1b7d364e5ae 100644
--- a/lib/internal/Magento/Framework/View/Page/Title.php
+++ b/lib/internal/Magento/Framework/View/Page/Title.php
@@ -92,10 +92,10 @@ class Title
{
$preparedTitle = $this->scopeConfig->getValue(
'design/head/title_prefix',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
) . ' ' . $title . ' ' . $this->scopeConfig->getValue(
'design/head/title_suffix',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return trim($preparedTitle);
}
@@ -109,7 +109,7 @@ class Title
{
$defaultTitle = $this->scopeConfig->getValue(
'design/head/default_title',
- \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
return $this->addConfigValues($defaultTitle);
}
diff --git a/lib/internal/Magento/Framework/View/PageLayout/Config.php b/lib/internal/Magento/Framework/View/PageLayout/Config.php
index 4386c4286abf9995aa9288ae629378291a5251bf..a6c6d9eb411c13b9cae680bfa5902a0729469d9d 100644
--- a/lib/internal/Magento/Framework/View/PageLayout/Config.php
+++ b/lib/internal/Magento/Framework/View/PageLayout/Config.php
@@ -64,7 +64,10 @@ class Config extends \Magento\Framework\Config\AbstractXml
}
if ($withEmpty) {
- array_unshift($options, ['value' => '', 'label' => __('-- Please Select --')]);
+ array_unshift($options, [
+ 'value' => '',
+ 'label' => (string)new \Magento\Framework\Phrase('-- Please Select --')
+ ]);
}
return $options;
}
diff --git a/lib/internal/Magento/Framework/View/Url/Config.php b/lib/internal/Magento/Framework/View/Url/Config.php
index 64d8fa73d1961a2651a88d3ca72641abb1fd6fcb..c70449e1e9458d1dbf0eb4e766592d6fe4fca4a1 100644
--- a/lib/internal/Magento/Framework/View/Url/Config.php
+++ b/lib/internal/Magento/Framework/View/Url/Config.php
@@ -30,6 +30,6 @@ class Config implements \Magento\Framework\View\Url\ConfigInterface
*/
public function getValue($path)
{
- return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+ return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
}
}
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index 74f488a7fdd60dc33b7d4678d61d3a245332e359..32e519e4cf8ad6081497748f59e0741e32342c59 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -2,7 +2,7 @@
"name": "magento/framework",
"description": "N/A",
"type": "magento2-library",
- "version": "0.42.0-beta6",
+ "version": "0.42.0-beta7",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/lib/web/css/docs/docs.css b/lib/web/css/docs/docs.css
index e3f078b46da9e70141cc35a03c86e85f11ad7dd5..f0103bc796a52ce891a3c688ca6caeab7ad9eb54 100644
--- a/lib/web/css/docs/docs.css
+++ b/lib/web/css/docs/docs.css
@@ -642,9 +642,9 @@
margin: 0 11px 0 0;
}
.example-breadcrumbs-3 .item a:after {
- width: 0;
- height: 0;
border: 12px solid transparent;
+ height: 0;
+ width: 0;
border-left-color: #f4f4f4;
content: "";
position: absolute;
@@ -737,14 +737,14 @@ button:focus {
font-weight: 400;
}
.example-button-10 > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-button-10:before {
font-family: 'icons-blank-theme';
@@ -1717,14 +1717,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-6 .action.toggle > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-6 .action.toggle:after {
font-family: 'icons-blank-theme';
@@ -1752,14 +1752,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-6 .action.toggle.active > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-6 .action.toggle.active:after {
font-family: 'icons-blank-theme';
@@ -1864,14 +1864,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.split.example-dropdown-7 .action.toggle > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.split.example-dropdown-7 .action.toggle:after {
font-family: 'icons-blank-theme';
@@ -1899,14 +1899,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.split.example-dropdown-7 .action.toggle.active > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.split.example-dropdown-7 .action.toggle.active:after {
font-family: 'icons-blank-theme';
@@ -2020,14 +2020,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-8 .action.toggle > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-8 .action.toggle:after {
font-family: 'icons-blank-theme';
@@ -2055,14 +2055,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-8 .action.toggle.active > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-8 .action.toggle.active:after {
font-family: 'icons-blank-theme';
@@ -2182,14 +2182,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-9 .action.toggle > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-9 .action.toggle:after {
font-family: 'icons-blank-theme';
@@ -2217,14 +2217,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-9 .action.toggle.active > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-9 .action.toggle.active:after {
font-family: 'icons-blank-theme';
@@ -2344,14 +2344,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-10 .action.toggle > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-10 .action.toggle:after {
font-family: 'icons-blank-theme';
@@ -2379,14 +2379,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-10 .action.toggle.active > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-10 .action.toggle.active:after {
font-family: 'icons-blank-theme';
@@ -2500,14 +2500,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-11 .action.toggle > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-11 .action.toggle:before {
font-family: 'icons-blank-theme';
@@ -2535,14 +2535,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-11 .action.toggle.active > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-11 .action.toggle.active:before {
font-family: 'icons-blank-theme';
@@ -2656,14 +2656,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-12 .action.toggle > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-12 .action.toggle:after {
font-family: 'icons-blank-theme';
@@ -2691,14 +2691,14 @@ fieldset[disabled] .example-button-15 {
text-decoration: none;
}
.example-dropdown-12 .action.toggle.active > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-dropdown-12 .action.toggle.active:after {
font-family: 'icons-blank-theme';
@@ -3299,14 +3299,14 @@ select {
display: inline-block;
}
.example-icon-3 > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-icon-3:before {
content: '';
@@ -3358,14 +3358,14 @@ select {
text-decoration: none;
}
.example-icon-6 > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-icon-6:before {
font-family: 'icons-blank-theme';
@@ -3520,14 +3520,14 @@ select {
text-align: center;
}
.example-icon-14 > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.icons-image-list {
list-style: none;
@@ -3688,19 +3688,16 @@ select {
}
.loader {
position: fixed;
- left: 0;
top: 0;
right: 0;
bottom: 0;
+ left: 0;
background-color: rgba(255, 255, 255, 0.5);
z-index: 9999;
}
.loader:before {
border-radius: 5px;
- background-color: transparent;
- background-image: url('/pub/static/frontend/Magento/blank/en_US/images/loader-2.gif');
- background-position: 50% 50%;
- background-repeat: no-repeat;
+ background: transparent url('/pub/static/frontend/Magento/blank/en_US/images/loader-2.gif') no-repeat 50% 50%;
box-sizing: border-box;
content: '';
position: absolute;
@@ -3722,10 +3719,7 @@ select {
top: 0;
right: 0;
bottom: 0;
- background-color: rgba(255, 255, 255, 0.5);
- background-image: url('/pub/static/frontend/Magento/blank/en_US/images/loader-2.gif');
- background-position: 50% 50%;
- background-repeat: no-repeat;
+ background: rgba(255, 255, 255, 0.5) url('/pub/static/frontend/Magento/blank/en_US/images/loader-2.gif') no-repeat 50% 50%;
}
.example-message-info {
display: block;
@@ -3917,9 +3911,9 @@ select {
right: 0;
}
.example-message-2 > *:first-child:before {
- width: 0;
- height: 0;
border: 5px solid transparent;
+ height: 0;
+ width: 0;
border-right-color: #b30000;
right: 30px;
}
@@ -3987,9 +3981,9 @@ select {
left: 0;
}
.example-message-3 > *:first-child:before {
- width: 0;
- height: 0;
border: 5px solid transparent;
+ height: 0;
+ width: 0;
border-left-color: #006400;
left: 30px;
}
@@ -4060,9 +4054,9 @@ select {
left: 0;
}
.example-message-4 > *:first-child:before {
- width: 0;
- height: 0;
border: 5px solid transparent;
+ height: 0;
+ width: 0;
border-left-color: #green;
left: 30px;
}
@@ -4217,14 +4211,14 @@ footer.footer {
order: 3;
}
.pages > .label {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.pages .items {
font-size: 0;
@@ -4246,14 +4240,14 @@ footer.footer {
display: inline-block;
}
.pages .item .label {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.pages a.page {
color: #1979c3;
@@ -4309,14 +4303,14 @@ footer.footer {
color: #7d7d7d;
}
.pages .action.next > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.pages .action.next:before {
font-family: 'icons-blank-theme';
@@ -4350,14 +4344,14 @@ footer.footer {
color: #7d7d7d;
}
.pages .action.previous > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.pages .action.previous:before {
font-family: 'icons-blank-theme';
@@ -4411,14 +4405,14 @@ footer.footer {
display: inline-block;
}
.example-pages-1 .item .label {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-pages-1 a.page {
background-color: #cccccc;
@@ -4498,14 +4492,14 @@ footer.footer {
color: #7d7d7d;
}
.example-pages-1 .action.next > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-pages-1 .action.next:before {
font-family: 'icons-blank-theme';
@@ -4539,14 +4533,14 @@ footer.footer {
color: #7d7d7d;
}
.example-pages-1 .action.previous > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-pages-1 .action.previous:before {
font-family: 'icons-blank-theme';
@@ -4600,14 +4594,14 @@ footer.footer {
display: inline-block;
}
.example-pages-2 .item .label {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-pages-2 a.page {
color: #1979c3;
@@ -4653,14 +4647,14 @@ footer.footer {
color: #7d7d7d;
}
.example-pages-3 > .label {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-pages-3 .items {
font-size: 0;
@@ -4682,14 +4676,14 @@ footer.footer {
display: inline-block;
}
.example-pages-3 .item .label {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-pages-3 a.page {
background: #1979c3;
@@ -4754,14 +4748,14 @@ footer.footer {
color: #ffffff;
}
.example-pages-3 .action.next > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-pages-3 .action.next:before {
font-family: 'icons-blank-theme';
@@ -4795,14 +4789,14 @@ footer.footer {
color: #ffffff;
}
.example-pages-3 .action.previous > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-pages-3 .action.previous:before {
font-family: 'icons-blank-theme';
@@ -4870,14 +4864,14 @@ footer.footer {
right: 10px;
}
.window.popup.popup-example .popup-actions .action.close > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.window.popup.popup-example .popup-actions .action.close:before {
font-family: 'icons-blank-theme';
@@ -4964,14 +4958,14 @@ fieldset[disabled] .window.popup.popup-example .popup-actions .action.close {
right: 10px;
}
.window.popup.popup-example-1 .popup-actions .action.close > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.window.popup.popup-example-1 .popup-actions .action.close:before {
font-family: 'icons-blank-theme';
@@ -5075,14 +5069,14 @@ fieldset[disabled] .window.popup.popup-example-1 .popup-actions .action.close {
right: 10px;
}
.window.popup.popup-example-2 .popup-actions .action.close > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.window.popup.popup-example-2 .popup-actions .action.close:before {
font-family: 'icons-blank-theme';
@@ -5173,14 +5167,14 @@ fieldset[disabled] .window.popup.popup-example-2 .popup-actions .action.close {
right: 10px;
}
.window.popup.popup-example-3 .popup-actions .action.close > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.window.popup.popup-example-3 .popup-actions .action.close:before {
font-family: 'icons-blank-theme';
@@ -5273,14 +5267,14 @@ fieldset[disabled] .window.popup.popup-example-3 .popup-actions .action.close {
right: 10px;
}
.window.popup.popup-example-4 .popup-actions .action.close > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.window.popup.popup-example-4 .popup-actions .action.close:before {
font-family: 'icons-blank-theme';
@@ -5367,14 +5361,14 @@ fieldset[disabled] .window.popup.popup-example-4 .popup-actions .action.close {
right: 10px;
}
.window.popup.popup-example-5 .popup-actions .action.close > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.window.popup.popup-example-5 .popup-actions .action.close:before {
font-family: 'icons-blank-theme';
@@ -5489,14 +5483,14 @@ fieldset[disabled] .window.popup.popup-example-5 .popup-actions .action.close {
right: 10px;
}
.window.popup.popup-example-6 .popup-actions .action.close > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.window.popup.popup-example-6 .popup-actions .action.close:before {
font-family: 'icons-blank-theme';
@@ -5702,14 +5696,14 @@ fieldset[disabled] .window.popup.popup-example-8 .popup-actions .action.close {
right: 10px;
}
.window.popup.popup-example-9 .popup-actions .action.close > span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.window.popup.popup-example-9 .popup-actions .action.close:before {
font-family: 'icons-blank-theme';
@@ -5787,14 +5781,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
display: block;
}
.example-ratings-1 input[type="radio"] {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-ratings-1 input[type="radio"]:focus + label:before,
.example-ratings-1 input[type="radio"]:checked + label:before {
@@ -5806,14 +5800,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
cursor: pointer;
}
.example-ratings-1 label span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-ratings-1 label:before {
color: #ff5601;
@@ -5886,14 +5880,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
display: block;
}
.example-ratings-2 input[type="radio"] {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-ratings-2 input[type="radio"]:focus + label:before,
.example-ratings-2 input[type="radio"]:checked + label:before {
@@ -5905,14 +5899,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
cursor: pointer;
}
.example-ratings-2 label span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-ratings-2 label:before {
color: #ff5601;
@@ -6003,14 +5997,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
display: block;
}
.example-ratings-3 input[type="radio"] {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-ratings-3 input[type="radio"]:focus + label:before,
.example-ratings-3 input[type="radio"]:checked + label:before {
@@ -6022,14 +6016,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
cursor: pointer;
}
.example-ratings-3 label span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-ratings-3 label:before {
color: #0a6767;
@@ -6102,14 +6096,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
display: block;
}
.example-ratings-4 input[type="radio"] {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-ratings-4 input[type="radio"]:focus + label:before,
.example-ratings-4 input[type="radio"]:checked + label:before {
@@ -6121,14 +6115,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
cursor: pointer;
}
.example-ratings-4 label span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-ratings-4 label:before {
color: #ff5601;
@@ -6201,14 +6195,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
display: block;
}
.exapmle-ratings-5 .control.rating.vote input[type="radio"] {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.exapmle-ratings-5 .control.rating.vote input[type="radio"]:focus + label:before,
.exapmle-ratings-5 .control.rating.vote input[type="radio"]:checked + label:before {
@@ -6220,14 +6214,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
cursor: pointer;
}
.exapmle-ratings-5 .control.rating.vote label span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.exapmle-ratings-5 .control.rating.vote label:before {
color: #ff5601;
@@ -6329,14 +6323,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
-webkit-font-smoothing: antialiased;
}
.example-rating-summary-1 .rating-result > span span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-rating-summary-2 {
white-space: nowrap;
@@ -6388,14 +6382,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
-webkit-font-smoothing: antialiased;
}
.example-rating-summary-2 .rating-result > span span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-rating-summary-3 {
white-space: nowrap;
@@ -6447,14 +6441,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
-webkit-font-smoothing: antialiased;
}
.example-rating-summary-3 .rating-result > span span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-rating-summary-4 {
white-space: nowrap;
@@ -6506,28 +6500,28 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
-webkit-font-smoothing: antialiased;
}
.example-rating-summary-4 .rating-result > span span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-rating-summary-5 {
white-space: nowrap;
overflow: hidden;
}
.example-rating-summary-5 .label {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-rating-summary-5 .rating-result {
width: 100px;
@@ -6575,14 +6569,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
-webkit-font-smoothing: antialiased;
}
.example-rating-summary-5 .rating-result > span span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-rating-summary-6 .rating-summary {
white-space: nowrap;
@@ -6634,14 +6628,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
-webkit-font-smoothing: antialiased;
}
.example-rating-summary-6 .rating-summary .rating-result > span span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-rating-summary-7 {
white-space: nowrap;
@@ -6693,24 +6687,24 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
-webkit-font-smoothing: antialiased;
}
.example-rating-summary-7 .rating-result > span span {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
-}
-.example-rating-summary-7 .label {
+ padding: 0;
position: absolute;
width: 1px;
+}
+.example-rating-summary-7 .label {
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-responsive-block {
padding: 10px;
@@ -6756,8 +6750,7 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
display: block;
}
.example-sections-1 > .item.title {
- margin: 0;
- margin-right: 5px;
+ margin: 0 5px 0 0;
}
.example-sections-1 > .item.title > .switch {
font-size: 1.4rem;
@@ -6769,10 +6762,7 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
border: 1px solid #d1d1d1;
border-bottom: none;
height: 20px;
- padding-top: 5px;
- padding-right: 20px;
- padding-bottom: 5px;
- padding-left: 20px;
+ padding: 5px 20px 5px 20px;
}
.example-sections-1 > .item.title > .switch:visited {
color: #7d7d7d;
@@ -6849,8 +6839,7 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
display: block;
}
.example-sections-2 > .item.title {
- margin: 0;
- margin-right: 5px;
+ margin: 0 5px 0 0;
}
.example-sections-2 > .item.title > .switch {
font-size: 1.4rem;
@@ -6862,10 +6851,7 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
border: 1px solid #d1d1d1;
border-bottom: none;
height: 20px;
- padding-top: 5px;
- padding-right: 20px;
- padding-bottom: 5px;
- padding-left: 20px;
+ padding: 5px 20px 5px 20px;
}
.example-sections-2 > .item.title > .switch:visited {
color: #7d7d7d;
@@ -6932,8 +6918,7 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
display: block;
}
.example-sections-3 > .item.title {
- margin: 0;
- margin-bottom: 5px;
+ margin: 0 0 5px;
}
.example-sections-3 > .item.title > .switch {
background: #f0f0f0;
@@ -6942,10 +6927,7 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
border-bottom: 1px solid #d1d1d1;
border-left: 1px solid #d1d1d1;
height: 40px;
- padding-top: 5px;
- padding-right: 20px;
- padding-bottom: 5px;
- padding-left: 20px;
+ padding: 5px 20px 5px 20px;
font-size: 1.8rem;
font-weight: 600;
line-height: 40px;
@@ -7023,8 +7005,7 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
display: block;
}
.example-sections-4 > .item.title {
- margin: 0;
- margin-right: 5px;
+ margin: 0 5px 0 0;
}
.example-sections-4 > .item.title > .switch {
font-size: 1.4rem;
@@ -7036,10 +7017,7 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
border: 1px solid #d1d1d1;
border-bottom: none;
height: 20px;
- padding-top: 5px;
- padding-right: 20px;
- padding-bottom: 5px;
- padding-left: 20px;
+ padding: 5px 20px 5px 20px;
}
.example-sections-4 > .item.title > .switch:visited {
color: #7d7d7d;
@@ -7107,8 +7085,7 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
display: block;
}
.example-sections-4 > .item.title {
- margin: 0;
- margin-bottom: 5px;
+ margin: 0 0 5px;
}
.example-sections-4 > .item.title > .switch {
background: #f0f0f0;
@@ -7117,10 +7094,7 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
border-bottom: 1px solid #d1d1d1;
border-left: 1px solid #d1d1d1;
height: 40px;
- padding-top: 5px;
- padding-right: 20px;
- padding-bottom: 5px;
- padding-left: 20px;
+ padding: 5px 20px 5px 20px;
font-size: 1.8rem;
font-weight: 600;
line-height: 40px;
@@ -7287,14 +7261,14 @@ fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close {
padding: 8px 10px;
}
.example-table-3 > caption {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-table-4 {
border-collapse: collapse;
@@ -8042,8 +8016,7 @@ p {
}
abbr[title] {
cursor: help;
- border-bottom: 1px dotted;
- border-bottom-color: #d1d1d1;
+ border-bottom: 1px dotted #d1d1d1;
}
b,
strong {
@@ -8065,9 +8038,7 @@ hr {
margin-top: 20px;
margin-bottom: 20px;
border: 0;
- border-top-width: 1px;
- border-top-style: solid;
- border-top-color: #d1d1d1;
+ border-top: 1px solid #d1d1d1;
}
sub,
sup {
@@ -8217,14 +8188,11 @@ kbd {
}
pre {
background: #f0f0f0;
- border-width: 1px;
- border-style: solid;
- border-color: #d1d1d1;
+ border: 1px solid #d1d1d1;
color: #111111;
display: block;
font-size: 1.2rem;
- margin: 0;
- margin-bottom: 10px;
+ margin: 0 0 10px;
line-height: 1.42857143;
padding: 10px;
word-break: break-all;
@@ -8239,6 +8207,7 @@ pre code {
border-radius: 0;
}
blockquote {
+ border-left: 0 solid #d1d1d1;
margin: 0 0 20px 40px;
padding: 0;
font-size: 1.4rem;
@@ -8247,9 +8216,6 @@ blockquote {
font-weight: 400;
font-style: italic;
line-height: 1.42857143;
- border-left-width: 0;
- border-left-style: solid;
- border-left-color: #d1d1d1;
}
blockquote p:last-child,
blockquote ul:last-child,
@@ -8287,9 +8253,6 @@ q:after {
cite {
font-style: normal;
}
-.example {
- font-size: 2.5rem;
-}
.example-line-height {
line-height: 3rem;
}
@@ -8312,11 +8275,11 @@ cite {
width: 120px;
}
.example-text-hide {
+ background-color: transparent;
+ border: 0;
font: 0/0 a;
color: transparent;
text-shadow: none;
- background-color: transparent;
- border: 0;
}
.example-hyphens {
word-wrap: break-word;
@@ -8333,7 +8296,6 @@ cite {
hyphens: none;
}
.example-typography {
- font-size: 3rem;
color: #ffcc00;
font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;
font-weight: 500;
@@ -8420,8 +8382,7 @@ p {
}
abbr[title] {
cursor: help;
- border-bottom: 1px dotted;
- border-bottom-color: #d1d1d1;
+ border-bottom: 1px dotted #d1d1d1;
}
b,
strong {
@@ -8443,9 +8404,7 @@ hr {
margin-top: 20px;
margin-bottom: 20px;
border: 0;
- border-top-width: 1px;
- border-top-style: solid;
- border-top-color: #d1d1d1;
+ border-top: 1px solid #d1d1d1;
}
sub,
sup {
@@ -8595,14 +8554,11 @@ kbd {
}
pre {
background: #f0f0f0;
- border-width: 1px;
- border-style: solid;
- border-color: #d1d1d1;
+ border: 1px solid #d1d1d1;
color: #111111;
display: block;
font-size: 1.2rem;
- margin: 0;
- margin-bottom: 10px;
+ margin: 0 0 10px;
line-height: 1.42857143;
padding: 10px;
word-break: break-all;
@@ -8617,6 +8573,7 @@ pre code {
border-radius: 0;
}
blockquote {
+ border-left: 0 solid #d1d1d1;
margin: 0 0 20px 40px;
padding: 0;
font-size: 1.4rem;
@@ -8625,9 +8582,6 @@ blockquote {
font-weight: 400;
font-style: italic;
line-height: 1.42857143;
- border-left-width: 0;
- border-left-style: solid;
- border-left-color: #d1d1d1;
}
blockquote p:last-child,
blockquote ul:last-child,
@@ -8686,38 +8640,38 @@ cite {
float: right;
}
.example-visibility-hidden {
- visibility: hidden;
height: 0;
+ visibility: hidden;
}
.example-visually-hidden-1 {
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-visually-hidden-2 {
background: #fdf0d5;
padding: 5px;
- position: absolute;
- width: 1px;
+ border: 0;
+ clip: rect(0, 0, 0, 0);
height: 1px;
margin: -1px;
- padding: 0;
overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
+ padding: 0;
+ position: absolute;
+ width: 1px;
}
.example-visually-hidden-2 {
- position: static;
- width: auto;
+ clip: auto;
height: auto;
margin: 0;
overflow: visible;
- clip: auto;
+ position: static;
+ width: auto;
}
.example-css-container {
padding: 20px;
@@ -8762,7 +8716,19 @@ cite {
background-image: linear-gradient(to right, #ccffff 0%, #ccccff 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ccffff', endColorstr='#ccccff', GradientType=1);
}
+.example-background-gradient-3-wrapper {
+ background: #ffc;
+ padding: 10px;
+}
+.example-background-gradient-3 {
+ background-color: rgba(255, 255, 255, 0);
+ background-repeat: repeat-x;
+ background-image: -webkit-linear-gradient(left, color-stop(rgba(255, 255, 255, 0) 0%), color-stop(#ccccff 100%));
+ background-image: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, #ccccff 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='rgba(255, 255, 255, 0)', endColorstr='#ccccff', GradientType=1);
+}
body {
padding: 15px;
background-image: none;
}
+/*# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["/lib/web/css/source/lib/utilities.less","/lib/web/css/docs/source/actions-toolbar.less","/lib/web/css/source/lib/actions-toolbar.less","/lib/web/css/docs/source/breadcrumbs.less","/lib/web/css/source/lib/breadcrumbs.less","/lib/web/css/source/lib/typography.less","/lib/web/css/source/lib/icons.less","/lib/web/css/source/lib/variables.less","/lib/web/css/docs/source/icons.less","/lib/web/css/docs/source/buttons.less","/lib/web/css/source/lib/buttons.less","/lib/web/css/docs/source/dropdowns.less","/lib/web/css/source/lib/dropdowns.less","/lib/web/css/docs/source/forms.less","/lib/web/css/source/lib/forms.less","/lib/web/css/docs/source/loaders.less","/lib/web/css/source/lib/loaders.less","/lib/web/css/docs/source/messages.less","/lib/web/css/source/lib/messages.less","/lib/web/css/docs/source/layout.less","/lib/web/css/source/lib/layout.less","/lib/web/css/source/lib/grids.less","/lib/web/css/docs/source/pages.less","/lib/web/css/source/lib/pages.less","/lib/web/css/docs/source/popups.less","/lib/web/css/source/lib/popups.less","/lib/web/css/docs/source/rating.less","/lib/web/css/source/lib/rating.less","/lib/web/css/docs/source/responsive.less","/lib/web/css/docs/source/sections.less","/lib/web/css/source/lib/sections.less","/lib/web/css/docs/source/tables.less","/lib/web/css/source/lib/tables.less","/lib/web/css/docs/source/tooltips.less","/lib/web/css/source/lib/tooltips.less","/lib/web/css/docs/source/typography.less","/lib/web/css/docs/source/utilities.less","/lib/web/css/docs/source/docs.less"],"names":[],"mappings":"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"} */
\ No newline at end of file
diff --git a/lib/web/css/docs/source/utilities.less b/lib/web/css/docs/source/utilities.less
index 4858dd017a1ec9e9784bd61d6750d8c525a37807..b62844de354928024e67527eb3aa2a8ef653c398 100644
--- a/lib/web/css/docs/source/utilities.less
+++ b/lib/web/css/docs/source/utilities.less
@@ -284,19 +284,44 @@
);
}
+.example-background-gradient-3-wrapper {
+ background: #ffc;
+ padding: 10px;
+}
+
+.example-background-gradient-3 {
+ .background-gradient(
+ @_background-gradient: true,
+ @_background-gradient-direction: horizontal,
+ @_background-gradient-start-color: rgba(255,255,255,0),
+ @_background-gradient-end-color: #ccf,
+ @_background-gradient-color-position: false
+ );
+}
+
//
// ```
-// <div class="example-background-gradient-1">
-// Hey! I`m gradient with vertical direction!
-//</div>
+// <div class="example-background-gradient-1">
+// I`m gradient with vertical direction
+// </div>
// ```
//
//
// ```
-// <div class="example-background-gradient-2">
-// Hey! I`m gradient with horizontal direction!
-//</div>
+// <div class="example-background-gradient-2">
+// I`m gradient with horizontal direction
+// </div>
+// ```
+//
+
+//
+// ```
+// <div class="example-background-gradient-3-wrapper">
+// <div class="example-background-gradient-3">
+// I`m gradient with horizontal direction from transparent to a color
+// </div>
+// </div>
// ```
//
@@ -306,7 +331,7 @@
// <table>
// <tr>
// <th class="vars_head">Mixin variable</th>
-// <th class="vars_head">Default value </th>
+// <th class="vars_head">Default value</th>
// <th class="vars_head">Allowed values</th>
// <th class="vars_head">Comment</th>
// </tr>
@@ -334,5 +359,11 @@
// <td class="vars_value">'' | false | value</td>
// <td>Gradient end color (any css color) </td>
// </tr>
+// <tr>
+// <th>@_background-gradient-color-position</th>
+// <td class="vars_value">false</td>
+// <td class="vars_value">'' | false | true</td>
+// <td>Sets the background-color fallback property. When set to 'false', the background-color property will be set to @_background-gradient-end-color. When set to 'true', the background-color property will be set to @_background-gradient-start-color</td>
+// </tr>
// </table>
// </pre>
diff --git a/lib/web/css/docs/utilities.html b/lib/web/css/docs/utilities.html
index af1371c43cc4f4abba1ed8ca2db094aeb56ec2ee..be79e18f66f81ca9b4cb0f407055c73610ef2fdf 100644
--- a/lib/web/css/docs/utilities.html
+++ b/lib/web/css/docs/utilities.html
@@ -5,7 +5,7 @@
*/
-->
<!DOCTYPE html><html><head><title>utilities | Magento UI Library
-</title><meta charset="utf-8"><style>*{-moz-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;border:0}body{padding:60px 0 40px;background-color:hsl(207,10%,90%);color:hsl(207,5%,30%)}.container{max-width:1300px;margin:0 auto;padding:0 20px}.section{position:relative;margin-bottom:20px}.docs{position:relative;z-index:2;width:68%;min-height:200px;background-color:hsl(207,0%,100%);background-clip:padding-box;border:1px solid hsla(207,5%,5%,.1);border-radius:5px;box-shadow:0 0 3px hsla(207,5%,5%,.1)}.code{position:absolute;top:5px;bottom:5px;right:0;z-index:1;width:33%;padding:10px 10px 10px 20px;border-radius:0 5px 5px 0;border:1px solid hsla(207,20%,10%,.1);background-color:hsla(207,20%,95%,.9);background-clip:padding-box;opacity:.5;-webkit-transition:opacity .4s;-moz-transition:opacity .4s;-o-transition:opacity .4s;transition:opacity .4s}.code:hover{opacity:1}.preview{background:hsl(207,0%,100%);border-top:1px solid hsl(207,30%,95%);position:relative;z-index:1}.preview-code+.preview{margin-top:0;border-top:0}.preview iframe{display:block;width:100%;height:100%;overflow:hidden}.preview-code{position:relative;z-index:2;display:block;width:100%;color:hsl(207,9%,37%);max-height:200px;padding:10px 20px;overflow-y:auto;background:hsl(207,30%,95%);border:1px solid hsl(207,30%,85%);border-left:0;border-right;box-shadow:inset 0 1px 2px hsla(207,30%,10%,.1);line-height:1.1!important;resize:none}.preview-code:focus{outline:0;background:hsl(207,30%,97%);box-shadow:inset 0 1px 2px hsla(207,30%,10%,.1),0 0 5px hsla(207,75%,75%,.9)}.preview-code:last-child{border-bottom:0;border-radius:0 0 5px 5px}.resizeable{padding:15px;overflow:auto;background:hsl(207,0%,100%);box-shadow:0 0 2px hsla(207,10%,20%,.2);resize:both}.preview-code,pre{white-space:pre-wrap;word-wrap:break-word;overflow-y:auto}.code pre{height:100%;margin-top:0}.bar{position:fixed;left:0;right:0;z-index:1010;min-height:40px;line-height:40px;background-image:-webkit-linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92));background-image:-moz-linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92));background-image:-o-linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92));background-image:linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92))}.bar.top{top:0;box-shadow:0 1px 2px hsla(207,5%,0%,.2)}.bar.bottom{bottom:0;box-shadow:0 -1px 2px hsla(207,5%,0%,.2)}.bar ul{margin:0!important}.bar li{display:block;list-style:none}.bar .icon path{fill:hsla(27,10%,75%,.75)}.docs .icon path{fill:hsla(207,10%,75%,.5)}.docs .permalink:hover .icon path{fill:hsl(207,10%,75%)}.bar button{color:hsla(27,10%,75%,.75)}.bar button:hover .icon path,.bar button.is-active .icon path{fill:hsl(27,10%,85%)}.bar button:hover,.bar button.is-active{color:hsl(27,10%,85%)}.bar .icon{vertical-align:middle;display:inline-block}.bar,.bar a,.bar a:visited{color:hsl(27,10%,85%);text-shadow:1px 1px 0 hsla(27,5%,0%,.5)}.bar a:hover,.bar a.is-active{color:hsl(27,10%,95%);text-shadow:1px 1px 0 hsla(27,5%,0%,1);text-decoration:none}.brand{float:left;margin-right:20px;font-weight:700;font-size:16px;text-decoration:none}.brand,a.brand,a.brand:visited{color:hsl(27,5%,5%);text-shadow:1px 1px 0 hsla(27,5%,100%,.2)}.brand:hover,a.brand:hover{color:hsl(27,5%,0%);text-shadow:1px 1px 0 hsla(27,5%,100%,.3);text-decoration:none}.menu{font-size:12px}.menu>li{float:left;position:relative}.menu a{display:block;margin-right:15px}.dropdown-toggle{position:relative;padding-right:15px}.dropdown-toggle:after{display:block;position:absolute;right:0;top:18px;content:'';border:4px solid;border-left-color:transparent;border-right-color:transparent;border-bottom-color:transparent}.nav-results,.dropdown{position:absolute;z-index:1020;top:32px;left:-16px;width:175px;max-height:500px;padding:10px 0;overflow-y:auto;word-wrap:break-word;font-size:11px;line-height:20px;background-color:hsla(207,10%,25%,.97);border:1px solid hsla(207,5%,70%,.3);border-radius:3px;box-shadow:0 0 3px hsla(207,5%,0%,.2)}.toc-list{width:200px}.nav-results{right:0;width:200px;left:auto;padding:5px 0}.nav-results-filename{display:block;font-size:10px;opacity:.75}.nav-results a{display:block;line-height:15px;padding:5px 10px}.nav-results li:not([hidden])~li a{border-top:1px solid hsla(27,10%,90%,.1)}.dropdown a{padding:0 15px}.dropdown li:hover{background-color:hsl(207,10%,22%)}.nav{float:right;position:relative}.nav input[type="search"]{padding:2px 4px;color:#fff;width:150px;border:1px solid hsla(207,5%,0%,.3);background:hsla(207,12%,40%,.9);box-shadow:inset 1px 1px 3px hsla(207,5%,0%,.05),1px 1px 0 hsla(207,5%,100%,.05);border-radius:10px;-webkit-appearance:textfield}.nav input[type="search"]:focus{outline:0;background:hsla(207,7%,45%,.9)}.settings{text-align:center}.bar button{display:inline-block;vertical-align:middle;padding:0 5px;margin:0 3px;background:transparent}.bar button:first-child{margin-left:0}.settings .auto{line-height:32px;font-size:11px;font-weight:700;letter-spacing:-1px;text-shadow:none;text-transform:uppercase}body{font-family:sans-serif;font-size:14px;line-height:1.618}.docs pre,p,ol,ul,dl,figure,blockquote,table{margin-left:20px;margin-right:20px}.preview,.docs pre,p,ol,ul,dl,figure,blockquote,table{margin-top:10px}ul ul,ol ol,ul ol,ol ul,blockquote p:last-child{margin-top:0}ul,ol{padding-left:1.5em}p:last-child,ol:last-child,ul:last-child,dl:last-child{margin-bottom:20px}hr,h1,h2,h3,h4,h5,h6{margin:1em 20px .5em}h1:first-of-type{margin-top:20px}h1,h2,h3,h4,h5,h6{line-height:1.2;color:hsl(207,10%,50%)}h1 a,h1 a:hover,h1 a:visited{color:inherit;text-decoration:inherit}h1{font-size:3.052em;font-weight:400;color:hsl(207,10%,45%)}h2{font-size:1.953em}h3{font-size:1.536em}h1,h2,h3{letter-spacing:-.025em}h4{font-size:1.25em}h5{font-size:1em;text-transform:uppercase}h6{font-size:1em}.permalink{position:absolute;top:15px;right:15px}a{color:hsl(207,90%,50%);text-decoration:none}a:hover{color:hsl(207,95%,40%);text-decoration:underline}a:visited{color:hsl(207,100%,35%)}.preview-code,pre,code,var{font-style:normal;font-family:"Ubuntu Mono","Andale Mono","DejaVu Sans Mono","Monaco","Bitstream Vera Sans Mono","Consolas","Lucida Console",monospace;font-size:12px}.docs pre,code,var{padding:.1em 3px;background:hsla(207,5%,0%,.025);border:1px solid hsla(207,5%,0%,.05);border-radius:3px}.code pre{line-height:1.1!important}pre code{padding:0;background:transparent;border:0}.cf:before,.cf:after{content:'';display:table}.cf:after{clear:both}[unselectable="on"]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}[hidden]{display:none!important}small{font-size:85%;opacity:.9}.docs .vars_list{width:100%}.docs .vars_list th,.docs .vars_list td{width:33%}.docs pre th{text-align:left}.docs pre table{border-collapse:collapse;margin:0}.docs th,.docs td{border:0;padding:9px 10px 9px 0;vertical-align:top}.docs tr th:last-child,.docs tr td:last-child{padding-right:0}.docs pre th{font-weight:400}.docs pre th.vars_head{border-bottom:1px solid #e5e5e5;color:#707070;white-space:nowrap}.docs pre th.vars_section{border-bottom:1px solid #e5e5e5;color:#333;font-size:18px;padding-top:30px}.vars_value{color:#338bb8}.docs li p{margin:0 0 20px}.dropdown a{text-transform:capitalize}#default-button #default-button-big+.preview+.preview-code{display:block}#actions-toolbar-alignment .preview-code,#reverse-primary-and-secondary-blocks .preview-code,#actions-toolbar-indents-customizations .preview-code,#actionstoolbarclearfloats-mixin .preview-code,#responsive-actions-toolbar .preview-code,#button-with-gradient-background .preview-code,#primary-button .preview-code,#button-as-an-icon .preview-code,#button-with-an-icon-on-the-left-or-right-side-of-the-text .preview-code,#button-with-fixed-width .preview-code,#button-as-a-link .preview-code,#link-as-a-button .preview-code,#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol .preview-code,#breadcrumbs-with-solid-background .preview-code,#pagination-without-label-with-solid-background .preview-code,#pagination-with-label-and-text-previousnext-links .preview-code,#pagination-with-label-and-gradient-background-on-links .preview-code,#fixed-height-popup .preview-code,#fixed-content-height-popup .preview-code,#margins-for-header-content-and-footer-block-in-popup .preview-code,#popup-titles-with-styled-as-theme-headings .preview-code,#popup-action-toolbar .preview-code,#popup-close-button-without-an-icon .preview-code,#modify-icon-of-popup-close-button .preview-code,#modify-overlay-styles .preview-code,#rating-summary-multiple-ratings .preview-code,#rating-summary-hide-label .preview-code,#rating-summary-icons-symbol .preview-code,#rating-summary-icons-color .preview-code,#rating-summary-set-number-of-icons .preview-code,#rating-summary .preview-code,#rating-with-vote-icon-symbol .preview-code,#rating-with-vote-setup-icons-colors .preview-code,#rating-with-vote-setup-number-of-icons .preview-code,#tabs-with-content-top-border .preview-code,#accordion-mixin-variables .preview-code,#tabs-base .preview-code,#accordion-base .preview-code,#warning-message .preview-code,#error-message .preview-code,#success-message .preview-code,#notice-message .preview-code,#message-with-inner-icon .preview-code,#message-with-lateral-icon .preview-code,#custom-message-style .preview-code,#modify-dropdown-list-styles .preview-code,#dropdown-with-icon-customization .preview-code,#split-button-button-styling .preview-code,#split-button-icon-customization .preview-code,#split-button-dropdown-list-customization .preview-code,#table-cells-resize .preview-code,#table-caption .preview-code,#table-typography .preview-code,#table-background-customization .preview-code,#table-borders-customization .preview-code,#table-without-borders .preview-code,#table-with-horizontal-borders .preview-code,#table-with-vertical-borders .preview-code,#striped-table .preview-code,#responsive-table-technics-1 .preview-code,#responsive-table-technics-2 .preview-code,#fontsize-mixin .preview-code,#word-breaking-mixin .preview-code,#word-breaking-mixin .preview-code,#text-overflow-mixin .preview-code,#text-hide .preview-code,#hyphens .preview-code,#font-style-and-color .preview-code,#reset-list-styles .preview-code,#inlineblock-list-item-styling .preview-code,#link-styling-mixin .preview-code,#heading-styling-mixin .preview-code,#icon-with-image-or-sprite .preview-code,#change-the-size-of-font-icon .preview-code,#sprite-and-font-icons-for-blank-theme .preview-code,#icon-position-for-an-icon-with-image-or-sprite .preview-code{display:none}article[id$="-variables"] .docs,#resets .docs,#ratings .docs,#tabs-and-accordions .docs,#messages .docs,#dropdown-and-split-buttons-mixins .docs,#font-face-mixin .docs,#layout .docs,#forms-mixins .docs,#including-magento-ui-library-to-your-theme .docs,#global-forms-elements-customization .docs,#mobile-off-canvas-navigation .docs,#desktop-navigation .docs,#layout-width .docs{width:100%}article[id$="-variables"] .code{display:none}article[id$="-variables"] .docs pre{background:#fff;border:0;margin-top:0}</style><script type="text/preview">(function(){"use strict";var a=function(a){return Array.prototype.slice.call(a)},b=document.getElementsByTagName("body")[0],c=["link","visited","hover","active","focus","target","enabled","disabled","checked"],d=new RegExp(":(("+c.join(")|(")+"))","gi"),e=a(document.styleSheets).map(function(b){return a(b.cssRules).filter(function(a){return a.selectorText&&a.selectorText.match(d)}).map(function(a){return a.cssText.replace(d,".\\3A $1")}).join("")}).join("");if(e.length){var f=document.createElement("style");f.innerText=e;var g=document.getElementsByTagName("style")[0];g.parentNode.insertBefore(f,g)}var h=function(){var a=window.getComputedStyle(b,null);return function(){if(b.childElementCount===0)return b.offsetHeight;var c=b.getElementsByTagName("*"),d=[];for(var e=0,f=c.length;e<f;e++)d.push(c[e].offsetTop+c[e].offsetHeight+parseInt(window.getComputedStyle(c[e],null).getPropertyValue("margin-bottom")));var g=Math.max.apply(Math,d);return g+=parseInt(a.getPropertyValue("padding-bottom"),10),Math.max(g,b.offsetHeight)}}(),i={getHeight:function(){window.parent.postMessage({height:h()},"*")}};window.addEventListener("message",function(a){if(a.data==null)return;typeof a.data=="string"&&i[a.data]()},!1)})()</script><style type="text/preview">body{margin:0;padding:0}article,aside,details,figcaption,figure,main,footer,header,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}nav ul,nav ol{list-style:none none}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body{font-size:1.4rem;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:normal;line-height:1.42857143}p{margin-top:0rem;margin-bottom:1rem}abbr[title]{cursor:help;border-bottom:1px dotted #d1d1d1}b,strong{font-weight:700}em,i{font-style:italic}mark{background:#f0f0f0;color:#000}small,.small{font-size:12px}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #d1d1d1}sub,sup{font-size:71.42857143%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dfn{font-style:italic}h1{font-size:4rem;font-weight:300;line-height:1.1;margin-top:0rem;margin-bottom:2rem}h2{font-size:2.6rem;font-weight:300;line-height:1.1;margin-top:2.5rem;margin-bottom:2rem}h3{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}h4{font-size:1.4rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h5{font-size:1.2rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h6{font-size:1rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small{font-size:71.42857143%;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:normal;line-height:1}a,.alink{color:#1979c3;text-decoration:none}a:visited,.alink:visited{color:#800080;text-decoration:none}a:hover,.alink:hover{color:#006bb4;text-decoration:underline}a:active,.alink:active{color:#ff5501;text-decoration:underline}ul,ol{margin-top:0rem;margin-bottom:2.5rem}ul>li,ol>li{margin-top:0rem;margin-bottom:1rem}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}dl{margin-top:0;margin-bottom:20px}dt{font-weight:700;margin-top:0;margin-bottom:5px}dd{margin-top:0;margin-bottom:10px;margin-left:0}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,'Courier New',monospace}code{background:#f0f0f0;color:#111;font-size:1.2rem;padding:2px 4px;white-space:nowrap}kbd{background:#f0f0f0;color:#111;padding:2px 4px;font-size:1.2rem}pre{background:#f0f0f0;border:1px solid #d1d1d1;color:#111;display:block;font-size:1.2rem;margin:0 0 10px;line-height:1.42857143;padding:10px;word-break:break-all;word-wrap:break-word}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}blockquote{margin:0 0 20px 40px;padding:0;font-size:1.4rem;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:italic;line-height:1.42857143;border-left:0 solid #d1d1d1}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{color:#333;display:block;font-size:1rem;line-height:1.42857143}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote cite{font-style:normal}blockquote:before,blockquote:after{content:""}q{quotes:none}q:before,q:after{content:'';content:none}cite{font-style:normal}table{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}table th{text-align:left}table>tbody>tr>th,table>tfoot>tr>th,table>tbody>tr>td,table>tfoot>tr>td{vertical-align:top}table>thead>tr>th,table>thead>tr>td{vertical-align:bottom}table>thead>tr>th,table>tbody>tr>th,table>tfoot>tr>th,table>thead>tr>td,table>tbody>tr>td,table>tfoot>tr>td{padding:8px 10px}button{background-image:none;background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:0;vertical-align:middle}button:focus,button:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}button:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}button.disabled,button[disabled],fieldset[disabled] button{cursor:default;pointer-events:none;opacity:.5}button::-moz-focus-inner{border:0;padding:0}input[type="text"],input[type="password"],input[type="url"],input[type="tel"],input[type="search"],input[type="number"],input[type="datetime"],input[type="email"]{box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:0 9px;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline}input[type="text"]:disabled,input[type="password"]:disabled,input[type="url"]:disabled,input[type="tel"]:disabled,input[type="search"]:disabled,input[type="number"]:disabled,input[type="datetime"]:disabled,input[type="email"]:disabled{opacity:.5}input[type="text"]::-moz-placeholder,input[type="password"]::-moz-placeholder,input[type="url"]::-moz-placeholder,input[type="tel"]::-moz-placeholder,input[type="search"]::-moz-placeholder,input[type="number"]::-moz-placeholder,input[type="datetime"]::-moz-placeholder,input[type="email"]::-moz-placeholder{color:#c2c2c2}input[type="text"]::-webkit-input-placeholder,input[type="password"]::-webkit-input-placeholder,input[type="url"]::-webkit-input-placeholder,input[type="tel"]::-webkit-input-placeholder,input[type="search"]::-webkit-input-placeholder,input[type="number"]::-webkit-input-placeholder,input[type="datetime"]::-webkit-input-placeholder,input[type="email"]::-webkit-input-placeholder{color:#c2c2c2}input[type="text"]:-ms-input-placeholder,input[type="password"]:-ms-input-placeholder,input[type="url"]:-ms-input-placeholder,input[type="tel"]:-ms-input-placeholder,input[type="search"]:-ms-input-placeholder,input[type="number"]:-ms-input-placeholder,input[type="datetime"]:-ms-input-placeholder,input[type="email"]:-ms-input-placeholder{color:#c2c2c2}input[type="number"]{-moz-appearance:textfield}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}input[type="search"]{-webkit-appearance:none}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-results-button,input[type="search"]::-webkit-search-results-decoration{-webkit-appearance:none}select{box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:5px 10px 4px;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline}select:disabled{opacity:.5}select[multiple="multiple"]{height:auto;background-image:none}textarea{box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:auto;width:100%;padding:10px;margin:0;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;resize:vertical}textarea:disabled{opacity:.5}textarea::-moz-placeholder{color:#c2c2c2}textarea::-webkit-input-placeholder{color:#c2c2c2}textarea:-ms-input-placeholder{color:#c2c2c2}input[type="checkbox"]{margin:2px 5px 0 0}input[type="checkbox"]:disabled{opacity:.5}input[type="radio"]{margin:2px 5px 0 0}input[type="radio"]:disabled{opacity:.5}input.mage-error,select.mage-error,textarea.mage-error{border-color:#ed8380}div.mage-error[generated]{font-size:1.2rem;color:#e02b27}input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}input::-moz-focus-inner{border:0;padding:0}form{-webkit-tap-highlight-color:rgba(0,0,0,0)}address{font-style:normal}:focus{outline:0;box-shadow:none}.focusin :focus,input:not([disabled]):focus,textarea:not([disabled]):focus,select:not([disabled]):focus{box-shadow:0 0 3px 1px #68a8e0}@font-face{font-family:'icons-blank-theme';src:url('/pub/static/frontend/Magento/blank/en_US/fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot');src:url('/pub/static/frontend/Magento/blank/en_US/fonts/Blank-Theme-Icons/Blank-Theme-Icons.eot?#iefix') format('embedded-opentype'),url('/pub/static/frontend/Magento/blank/en_US/fonts/Blank-Theme-Icons/Blank-Theme-Icons.woff') format('woff'),url('/pub/static/frontend/Magento/blank/en_US/fonts/Blank-Theme-Icons/Blank-Theme-Icons.ttf') format('truetype'),url('/pub/static/frontend/Magento/blank/en_US/fonts/Blank-Theme-Icons/Blank-Theme-Icons.svg#icons-blank-theme') format('svg');font-weight:400;font-style:normal}.mage-dropdown-dialog.ui-dialog .ui-dialog-content{overflow:visible}.mage-dropdown-dialog.ui-dialog .ui-dialog-buttonpane{padding:0}@media only screen and (max-width: 767px){.example-responsive-block{ background:#ffc}.example-responsive-block:before{content:'Mobile styles ';font-weight:700}}@media all and (min-width: 768px),print{._rwd_width{ min-width:0!important;max-width:auto!important}._rwd_width_float{width:100%!important;float:none!important}.example-responsive-block{background:#ccf}.example-responsive-block:before{content:'Desktop styles ';font-weight:700}}.actions-toolbar:before,.actions-toolbar:after{content:"";display:table}.actions-toolbar:after{clear:both}.actions-toolbar .primary{float:left}.actions-toolbar .secondary{float:right}.actions-toolbar .primary,.actions-toolbar .secondary{display:inline-block}.actions-toolbar .primary a.action,.actions-toolbar .secondary a.action{display:inline-block}.actions-toolbar .primary .action{margin:0 5px 0 0}.actions-toolbar .secondary a.action{margin-top:6px}.example-actions-toolbar-1:before,.example-actions-toolbar-1:after{content:"";display:table}.example-actions-toolbar-1:after{clear:both}.example-actions-toolbar-1 .primary{float:left}.example-actions-toolbar-1 .secondary{float:right}.example-actions-toolbar-1 .primary,.example-actions-toolbar-1 .secondary{display:inline-block}.example-actions-toolbar-1 .primary a.action,.example-actions-toolbar-1 .secondary a.action{display:inline-block}.example-actions-toolbar-1 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-1 .secondary a.action{margin-top:6px}.example-actions-toolbar-1:before,.example-actions-toolbar-1:after{content:"";display:table}.example-actions-toolbar-1:after{clear:both}.example-actions-toolbar-1 .primary{float:left}.example-actions-toolbar-1 .secondary{float:right}.example-actions-toolbar-1 .primary,.example-actions-toolbar-1 .secondary{display:inline-block}.example-actions-toolbar-1 .primary a.action,.example-actions-toolbar-1 .secondary a.action{display:inline-block}.example-actions-toolbar-1 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-1 .secondary a.action{margin-top:6px}.example-actions-toolbar-2:before,.example-actions-toolbar-2:after{content:"";display:table}.example-actions-toolbar-2:after{clear:both}.example-actions-toolbar-2 .primary{float:left}.example-actions-toolbar-2 .secondary{float:right}.example-actions-toolbar-2 .primary,.example-actions-toolbar-2 .secondary{display:inline-block}.example-actions-toolbar-2 .primary a.action,.example-actions-toolbar-2 .secondary a.action{display:inline-block}.example-actions-toolbar-2 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-2 .secondary a.action{margin-top:6px}.example-actions-toolbar-3{text-align:left}.example-actions-toolbar-3:before,.example-actions-toolbar-3:after{content:"";display:table}.example-actions-toolbar-3:after{clear:both}.example-actions-toolbar-3 .primary{float:left}.example-actions-toolbar-3 .primary,.example-actions-toolbar-3 .secondary{display:inline-block}.example-actions-toolbar-3 .primary a.action,.example-actions-toolbar-3 .secondary a.action{display:inline-block}.example-actions-toolbar-3 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-3 .secondary a.action{margin-top:6px}.example-actions-toolbar-4{text-align:right}.example-actions-toolbar-4:before,.example-actions-toolbar-4:after{content:"";display:table}.example-actions-toolbar-4:after{clear:both}.example-actions-toolbar-4 .secondary{float:right}.example-actions-toolbar-4 .primary,.example-actions-toolbar-4 .secondary{display:inline-block}.example-actions-toolbar-4 .primary a.action,.example-actions-toolbar-4 .secondary a.action{display:inline-block}.example-actions-toolbar-4 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-4 .secondary a.action{margin-top:6px}.example-actions-toolbar-5{text-align:center}.example-actions-toolbar-5:before,.example-actions-toolbar-5:after{content:"";display:table}.example-actions-toolbar-5:after{clear:both}.example-actions-toolbar-5 .primary,.example-actions-toolbar-5 .secondary{vertical-align:top}.example-actions-toolbar-5 .primary,.example-actions-toolbar-5 .secondary{display:inline-block}.example-actions-toolbar-5 .primary a.action,.example-actions-toolbar-5 .secondary a.action{display:inline-block}.example-actions-toolbar-5 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-5 .secondary a.action{margin-top:6px}.example-actions-toolbar-6:before,.example-actions-toolbar-6:after{content:"";display:table}.example-actions-toolbar-6:after{clear:both}.example-actions-toolbar-6 .primary{float:right}.example-actions-toolbar-6 .secondary{float:left}.example-actions-toolbar-6 .primary,.example-actions-toolbar-6 .secondary{display:inline-block}.example-actions-toolbar-6 .primary a.action,.example-actions-toolbar-6 .secondary a.action{display:inline-block}.example-actions-toolbar-6 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-6 .secondary a.action{margin-top:6px}.example-actions-toolbar-7{text-align:left}.example-actions-toolbar-7:before,.example-actions-toolbar-7:after{content:"";display:table}.example-actions-toolbar-7:after{clear:both}.example-actions-toolbar-7 .secondary{float:left}.example-actions-toolbar-7 .primary,.example-actions-toolbar-7 .secondary{display:inline-block}.example-actions-toolbar-7 .primary a.action,.example-actions-toolbar-7 .secondary a.action{display:inline-block}.example-actions-toolbar-7 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-7 .secondary a.action{margin-top:6px}.example-actions-toolbar-8{text-align:right}.example-actions-toolbar-8:before,.example-actions-toolbar-8:after{content:"";display:table}.example-actions-toolbar-8:after{clear:both}.example-actions-toolbar-8 .primary{float:right}.example-actions-toolbar-8 .primary,.example-actions-toolbar-8 .secondary{display:inline-block}.example-actions-toolbar-8 .primary a.action,.example-actions-toolbar-8 .secondary a.action{display:inline-block}.example-actions-toolbar-8 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-8 .secondary a.action{margin-top:6px}.example-actions-toolbar-9{margin:10px;padding:10px}.example-actions-toolbar-9:before,.example-actions-toolbar-9:after{content:"";display:table}.example-actions-toolbar-9:after{clear:both}.example-actions-toolbar-9 .primary{float:left}.example-actions-toolbar-9 .secondary{float:right}.example-actions-toolbar-9 .primary,.example-actions-toolbar-9 .secondary{display:inline-block}.example-actions-toolbar-9 .primary a.action,.example-actions-toolbar-9 .secondary a.action{display:inline-block}.example-actions-toolbar-9 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-9 .secondary a.action{margin-top:6px}.example-actions-toolbar-10{text-align:left}.example-actions-toolbar-10:before,.example-actions-toolbar-10:after{content:"";display:table}.example-actions-toolbar-10:after{clear:both}.example-actions-toolbar-10 .primary{float:left}.example-actions-toolbar-10 .primary,.example-actions-toolbar-10 .secondary{display:inline-block}.example-actions-toolbar-10 .primary a.action,.example-actions-toolbar-10 .secondary a.action{display:inline-block}.example-actions-toolbar-10 .primary .action{margin:0 50px 0 0}.example-actions-toolbar-10 .secondary a.action{margin-top:6px}.example-actions-toolbar-11{text-align:left}.example-actions-toolbar-11:before,.example-actions-toolbar-11:after{content:"";display:table}.example-actions-toolbar-11:after{clear:both}.example-actions-toolbar-11 .primary{float:left}.example-actions-toolbar-11 .primary,.example-actions-toolbar-11 .secondary{display:inline-block}.example-actions-toolbar-11 .primary a.action,.example-actions-toolbar-11 .secondary a.action{display:inline-block}.example-actions-toolbar-11 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-11 .secondary .action{margin:0 50px 0 0}.example-actions-toolbar-11 .secondary a.action{margin-top:6px}.example-actions-toolbar-12:before,.example-actions-toolbar-12:after{content:"";display:table}.example-actions-toolbar-12:after{clear:both}.example-actions-toolbar-12 .primary{float:left}.example-actions-toolbar-12 .secondary{float:right}.example-actions-toolbar-12 .primary,.example-actions-toolbar-12 .secondary{display:inline-block}.example-actions-toolbar-12 .primary a.action,.example-actions-toolbar-12 .secondary a.action{display:inline-block}.example-actions-toolbar-12 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-12 .secondary a.action{margin-top:6px}.example-actions-toolbar-12:before,.example-actions-toolbar-12:after{content:"";display:table}.example-actions-toolbar-12:after{clear:both}.example-actions-toolbar-12 .primary{float:left}.example-actions-toolbar-12 .secondary{float:right}.example-actions-toolbar-12 .primary,.example-actions-toolbar-12 .secondary{display:inline-block}.example-actions-toolbar-12 .primary a.action,.example-actions-toolbar-12 .secondary a.action{display:inline-block}.example-actions-toolbar-12 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-12 .secondary a.action{margin-top:6px}@media only screen and (max-width: 768px){.example-actions-toolbar-12 .primary,.example-actions-toolbar-12 .secondary{ display:block;float:none}}.example-breadcrumbs-1{margin:0 0 20px}.example-breadcrumbs-1 .items{font-size:1.2rem;color:#a3a3a3;margin:0;padding:0;list-style:none none}.example-breadcrumbs-1 .items>li{display:inline-block;vertical-align:top}.example-breadcrumbs-1 .item{margin:0}.example-breadcrumbs-1 a{color:#333;text-decoration:none}.example-breadcrumbs-1 a:visited{color:#333;text-decoration:none}.example-breadcrumbs-1 a:hover{color:#333;text-decoration:underline}.example-breadcrumbs-1 a:active{color:#333;text-decoration:none}.example-breadcrumbs-1 strong{font-weight:400}.example-breadcrumbs-1 .item:not(:last-child){display:inline-block;text-decoration:none}.example-breadcrumbs-1 .item:not(:last-child):after{font-family:'icons-blank-theme';content:'\e608';font-size:24px;line-height:18px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-breadcrumbs-2{margin:0 0 20px}.example-breadcrumbs-2 .items{font-size:1.2rem;color:#1979c3;margin:0;padding:0;list-style:none none}.example-breadcrumbs-2 .items>li{display:inline-block;vertical-align:top}.example-breadcrumbs-2 .item{margin:0}.example-breadcrumbs-2 a{background-color:#ccc;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #f4f4f4 0, #ccc 100%);background-image:linear-gradient(to bottom, #f4f4f4 0, #ccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#cccccc', GradientType=0);border:1px solid #ccc;display:inline-block;padding:3px 5px;color:#333;text-decoration:none}.example-breadcrumbs-2 a:visited{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#333;text-decoration:none}.example-breadcrumbs-2 a:hover{background-color:#f4f4f4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #ccc 0, #f4f4f4 100%);background-image:linear-gradient(to bottom, #ccc 0, #f4f4f4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#f4f4f4', GradientType=0);color:#333;text-decoration:none}.example-breadcrumbs-2 a:active{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#333;text-decoration:none}.example-breadcrumbs-2 strong{background-color:#ff5501;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #f7b32e 0, #ff5501 100%);background-image:linear-gradient(to bottom, #f7b32e 0, #ff5501 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7b32e', endColorstr='#ff5501', GradientType=0);border:1px solid #d04b0a;display:inline-block;padding:3px 5px;font-weight:400}.example-breadcrumbs-2 .item:not(:last-child){display:inline-block;text-decoration:none}.example-breadcrumbs-2 .item:not(:last-child):after{font-family:'icons-blank-theme';content:'\e608';font-size:24px;line-height:18px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-breadcrumbs-3{margin:0 0 20px}.example-breadcrumbs-3 .items{font-size:1.2rem;color:#333;margin:0;padding:0;list-style:none none}.example-breadcrumbs-3 .items>li{display:inline-block;vertical-align:top}.example-breadcrumbs-3 .item{margin:0}.example-breadcrumbs-3 a{background:#f4f4f4;display:inline-block;padding:3px 5px;color:#333;text-decoration:none}.example-breadcrumbs-3 a:visited{color:#333;text-decoration:none}.example-breadcrumbs-3 a:hover{background:#ccc;color:#333;text-decoration:none}.example-breadcrumbs-3 a:active{color:#333;text-decoration:none}.example-breadcrumbs-3 strong{background:#e7e7e7;display:inline-block;padding:3px 5px;font-weight:400}.example-breadcrumbs-3 .item:not(:last-child){display:inline-block;text-decoration:none}.example-breadcrumbs-3 .item:not(:last-child):after{font-family:'icons-blank-theme';content:'\e608';font-size:24px;line-height:18px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-breadcrumbs-3 .item a{position:relative;margin:0 11px 0 0}.example-breadcrumbs-3 .item a:after{width:0;height:0;border:12px solid transparent;border-left-color:#f4f4f4;content:"";position:absolute;display:block;top:0;right:-23px}.example-breadcrumbs-3 .item a:hover:after{border-color:transparent transparent transparent #ccc}button{background-image:none;background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle;border-radius:3px}button:focus,button:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}button:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}button.disabled,button[disabled],fieldset[disabled] button{cursor:default;pointer-events:none;opacity:.5}button:active,button:focus{box-shadow:inset 0 2px 1px rgba(0,0,0,.12)}.example-button-1.example-button-2{line-height:2.2rem;padding:14px 17px;font-size:1.8rem}.example-button-1.example-button-3{line-height:1.2rem;padding:5px 8px;font-size:1.1rem;border-radius:0;color:#000}.example-button-1.example-button-3:hover,.example-button-1.example-button-3.active{color:#000}.example-button-10{background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400}.example-button-10>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-button-10:before{font-family:'icons-blank-theme';content:'\e611';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-button-10:hover:before{color:inherit}.example-button-10:active:before{color:inherit}.example-button-10:focus,.example-button-10:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-10:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-10.disabled,.example-button-10[disabled],fieldset[disabled] .example-button-10{cursor:default;pointer-events:none;opacity:.5}.example-button-10:focus,.example-button-10:active{background:0;border:0}.example-button-10:hover{background:0;border:0}.example-button-10.disabled,.example-button-10[disabled],fieldset[disabled] .example-button-10{cursor:not-allowed;pointer-events:none;opacity:.5}.example-button-11{background-image:none;background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;text-decoration:none}.example-button-11:before{font-family:'icons-blank-theme';content:'\e611';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-button-11:hover:before{color:inherit}.example-button-11:active:before{color:inherit}.example-button-11:focus,.example-button-11:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-11:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-11.disabled,.example-button-11[disabled],fieldset[disabled] .example-button-11{cursor:default;pointer-events:none;opacity:.5}.example-button-12{background-image:none;background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;text-decoration:none}.example-button-12:after{font-family:'icons-blank-theme';content:'\e611';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-button-12:hover:after{color:inherit}.example-button-12:active:after{color:inherit}.example-button-12:focus,.example-button-12:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-12:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-12.disabled,.example-button-12[disabled],fieldset[disabled] .example-button-12{cursor:default;pointer-events:none;opacity:.5}.example-button-13{background-image:none;background:#f2f2f2;padding:7px 15px;width:100px;color:#333;border:1px solid #cdcdcd;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle}.example-button-13:focus,.example-button-13:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-13:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-13.disabled,.example-button-13[disabled],fieldset[disabled] .example-button-13{cursor:default;pointer-events:none;opacity:.5}.example-button-4{background-image:none;background:#1979c3;padding:7px 15px;color:#fff;border:1px solid #1979c3;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;box-sizing:border-box;margin:3px;vertical-align:middle}.example-button-4:focus,.example-button-4:active{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-4:hover{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-4.disabled,.example-button-4[disabled],fieldset[disabled] .example-button-4{cursor:default;pointer-events:none;opacity:.5}.example-button-4:active{box-shadow:inset 0 3px 1px rgba(0,0,0,.29)}.example-button-4.example-button-5{line-height:2.2rem;padding:7px 35px;font-size:1.8rem}.example-button-4.example-button-6{line-height:1.2rem;padding:5px 8px;font-size:1.1rem;color:#fff}.example-button-4.example-button-6:hover,.example-button-4.example-button-6.active{color:#fff}.example-button-7{background-image:none;background:#f2f2f2;background-color:#006bb4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #1979c3 0, #006bb4 100%);background-image:linear-gradient(to bottom, #1979c3 0, #006bb4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1979c3', endColorstr='#006bb4', GradientType=0);padding:7px 15px;color:#fff;border:1px solid #1979c3;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle;border-radius:3px}.example-button-7:focus,.example-button-7:active{background:#e2e2e2;background-color:#006bb4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #006bb4 0, #006bb4 100%);background-image:linear-gradient(to bottom, #006bb4 0, #006bb4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#006bb4', endColorstr='#006bb4', GradientType=0);border:1px solid #006bb4;color:#fff}.example-button-7:hover{background:#e2e2e2;background-color:#1979c3;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #006bb4 0, #1979c3 100%);background-image:linear-gradient(to bottom, #006bb4 0, #1979c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#006bb4', endColorstr='#1979c3', GradientType=0);border:1px solid #006bb4;color:#fff}.example-button-7.disabled,.example-button-7[disabled],fieldset[disabled] .example-button-7{cursor:default;pointer-events:none;opacity:.5}.example-button-7:active{box-shadow:inset 0 3px 1px rgba(0,0,0,.29)}.example-button-8{background:0;border:0;display:inline;line-height:1.42857143;margin:0;padding:0;color:#1979c3;text-decoration:none;font-weight:400}.example-button-8:visited{color:#800080;text-decoration:none}.example-button-8:hover{color:#006bb4;text-decoration:underline}.example-button-8:active{color:#ff5501;text-decoration:underline}.example-button-8:hover{color:#006bb4}.example-button-8:hover,.example-button-8:active,.example-button-8:focus{background:0;border:0}.example-button-8.disabled,.example-button-8[disabled],fieldset[disabled] .example-button-8{color:#1979c3;text-decoration:underline;cursor:default;pointer-events:none;opacity:.5}.example-button-8:active{box-shadow:none}.example-button-9{text-decoration:none;background-image:none;background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:0;vertical-align:middle;margin:3px;border-radius:3px;font-weight:700}.example-button-9:hover,.example-button-9:active,.example-button-9:focus{text-decoration:none}.example-button-9:focus,.example-button-9:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-9:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-9.disabled,.example-button-9[disabled],fieldset[disabled] .example-button-9{cursor:default;pointer-events:none;opacity:.5}.example-button-9:active{box-shadow:inset 0 3px 1px rgba(0,0,0,.29)}.example-button-14{background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400}.example-button-14:focus,.example-button-14:active{background:0;border:0}.example-button-14:hover{background:0;border:0}.example-button-14.disabled,.example-button-14[disabled],fieldset[disabled] .example-button-14{cursor:not-allowed;pointer-events:none;opacity:.5}.example-button-15{background-image:none;background:#1979c3;padding:7px 15px;color:#fff;border:1px solid #1979c3;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;box-sizing:border-box;vertical-align:middle;background:#f2f2f2;color:#333;border:1px solid #cdcdcd}.example-button-15:focus,.example-button-15:active{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-15:hover{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-15.disabled,.example-button-15[disabled],fieldset[disabled] .example-button-15{cursor:default;pointer-events:none;opacity:.5}.example-button-15:focus,.example-button-15:active{background:#e2e2e2;color:#333;border:1px solid #cdcdcd}.example-button-15:hover{background:#e2e2e2;color:#555;border:1px solid #cdcdcd}.example-button-17{line-height:2.2rem;padding:14px 17px;font-size:1.8rem;font-size:1.4rem;line-height:1.6rem;padding:7px 15px}.example-button-18{font-size:1rem;line-height:1.2rem;padding:4px 10px}.example-dropdown-1{display:inline-block;position:relative}.example-dropdown-1:before,.example-dropdown-1:after{content:"";display:table}.example-dropdown-1:after{clear:both}.example-dropdown-1 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-1 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-1 .action.toggle:hover:after{color:inherit}.example-dropdown-1 .action.toggle:active:after{color:inherit}.example-dropdown-1 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-1 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-1 .action.toggle.active:hover:after{color:inherit}.example-dropdown-1 .action.toggle.active:active:after{color:inherit}.example-dropdown-1 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15);margin-top:4px}.example-dropdown-1 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-1 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-1 ul.dropdown:before,.example-dropdown-1 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-1 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-1 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-1 ul.dropdown:before{top:-12px;left:10px}.example-dropdown-1 ul.dropdown:after{top:-14px;left:9px}.example-dropdown-1.active{overflow:visible}.example-dropdown-1.active ul.dropdown{display:block}.example-dropdown-2{display:inline-block;position:relative}.example-dropdown-2:before,.example-dropdown-2:after{content:"";display:table}.example-dropdown-2:after{clear:both}.example-dropdown-2 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-2 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-2 .action.toggle:hover:after{color:inherit}.example-dropdown-2 .action.toggle:active:after{color:inherit}.example-dropdown-2 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-2 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-2 .action.toggle.active:hover:after{color:inherit}.example-dropdown-2 .action.toggle.active:active:after{color:inherit}.example-dropdown-2 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15);margin-top:4px}.example-dropdown-2 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-2 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-2 ul.dropdown:before,.example-dropdown-2 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-2 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-2 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-2 ul.dropdown:before{top:-12px;left:10px}.example-dropdown-2 ul.dropdown:after{top:-14px;left:9px}.example-dropdown-2.active{overflow:visible}.example-dropdown-2.active ul.dropdown{display:block}.example-dropdown-3{display:inline-block;position:relative}.example-dropdown-3:before,.example-dropdown-3:after{content:"";display:table}.example-dropdown-3:after{clear:both}.example-dropdown-3 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-3 .action.toggle:before{font-family:'icons-blank-theme';content:'\e61c';font-size:22px;line-height:1;color:red;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-3 .action.toggle:hover:before{color:red}.example-dropdown-3 .action.toggle:active:before{color:inherit}.example-dropdown-3 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-3 .action.toggle.active:before{font-family:'icons-blank-theme';content:'\e60f';font-size:22px;line-height:1;color:red;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-3 .action.toggle.active:hover:before{color:red}.example-dropdown-3 .action.toggle.active:active:before{color:inherit}.example-dropdown-3 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15);margin-top:4px}.example-dropdown-3 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-3 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-3 ul.dropdown:before,.example-dropdown-3 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-3 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-3 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-3 ul.dropdown:before{top:-12px;left:10px}.example-dropdown-3 ul.dropdown:after{top:-14px;left:9px}.example-dropdown-3.active{overflow:visible}.example-dropdown-3.active ul.dropdown{display:block}.example-dropdown-5{display:inline-block;position:relative}.example-dropdown-5:before,.example-dropdown-5:after{content:"";display:table}.example-dropdown-5:after{clear:both}.example-dropdown-5 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-5 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:1;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-5 .action.toggle:hover:after{color:inherit}.example-dropdown-5 .action.toggle:active:after{color:inherit}.example-dropdown-5 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-5 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:1;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-5 .action.toggle.active:hover:after{color:inherit}.example-dropdown-5 .action.toggle.active:active:after{color:inherit}.example-dropdown-5 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#eef1f3;border:2px solid #ced1d4;position:absolute;z-index:100;top:100%;min-width:100%;display:none}.example-dropdown-5 ul.dropdown li{margin:0;padding:10px;border-top:2px solid #e8eaed}.example-dropdown-5 ul.dropdown li:first-child{border:0}.example-dropdown-5 ul.dropdown li:hover{background:#d8e3e3;cursor:pointer}.example-dropdown-5.active{overflow:visible}.example-dropdown-5.active ul.dropdown{display:block}.example-dropdown-6{display:inline-block;position:relative}.example-dropdown-6:before,.example-dropdown-6:after{content:"";display:table}.example-dropdown-6:after{clear:both}.example-dropdown-6 .action.split{float:left;margin:0}.example-dropdown-6 .action.toggle{float:right;margin:0}.example-dropdown-6 button.action.split{border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-6 button+.action.toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-6 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-6 .action.toggle>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-6 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-6 .action.toggle:hover:after{color:inherit}.example-dropdown-6 .action.toggle:active:after{color:inherit}.example-dropdown-6 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-6 .action.toggle.active>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-6 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-6 .action.toggle.active:hover:after{color:inherit}.example-dropdown-6 .action.toggle.active:active:after{color:inherit}.example-dropdown-6 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15);margin-top:4px}.example-dropdown-6 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-6 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-6 ul.dropdown:before,.example-dropdown-6 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-6 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-6 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-6 ul.dropdown:before{top:-12px;right:10px}.example-dropdown-6 ul.dropdown:after{top:-14px;right:9px}.example-dropdown-6.active{overflow:visible}.example-dropdown-6.active ul.dropdown{display:block}.split.example-dropdown-7{display:inline-block;position:relative}.split.example-dropdown-7:before,.split.example-dropdown-7:after{content:"";display:table}.split.example-dropdown-7:after{clear:both}.split.example-dropdown-7 .action.split{float:left;margin:0}.split.example-dropdown-7 .action.toggle{float:right;margin:0}.split.example-dropdown-7 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.split.example-dropdown-7 .action.toggle>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.split.example-dropdown-7 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.split.example-dropdown-7 .action.toggle:hover:after{color:inherit}.split.example-dropdown-7 .action.toggle:active:after{color:inherit}.split.example-dropdown-7 .action.toggle.active{display:inline-block;text-decoration:none}.split.example-dropdown-7 .action.toggle.active>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.split.example-dropdown-7 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.split.example-dropdown-7 .action.toggle.active:hover:after{color:inherit}.split.example-dropdown-7 .action.toggle.active:active:after{color:inherit}.split.example-dropdown-7 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15);margin-top:4px}.split.example-dropdown-7 ul.dropdown li{margin:0;padding:3px 5px}.split.example-dropdown-7 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.split.example-dropdown-7 ul.dropdown:before,.split.example-dropdown-7 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.split.example-dropdown-7 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.split.example-dropdown-7 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.split.example-dropdown-7 ul.dropdown:before{top:-12px;right:10px}.split.example-dropdown-7 ul.dropdown:after{top:-14px;right:9px}.split.example-dropdown-7.active{overflow:visible}.split.example-dropdown-7.active ul.dropdown{display:block}.example-dropdown-8{display:inline-block;position:relative}.example-dropdown-8:before,.example-dropdown-8:after{content:"";display:table}.example-dropdown-8:after{clear:both}.example-dropdown-8 .action.split{float:left;margin:0}.example-dropdown-8 .action.toggle{float:right;margin:0}.example-dropdown-8 button.action.split{border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-8 button+.action.toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-8 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-8 .action.toggle>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-8 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-8 .action.toggle:hover:after{color:inherit}.example-dropdown-8 .action.toggle:active:after{color:inherit}.example-dropdown-8 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-8 .action.toggle.active>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-8 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-8 .action.toggle.active:hover:after{color:inherit}.example-dropdown-8 .action.toggle.active:active:after{color:inherit}.example-dropdown-8 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15);margin-top:4px}.example-dropdown-8 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-8 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-8 ul.dropdown:before,.example-dropdown-8 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-8 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-8 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-8 ul.dropdown:before{top:-12px;right:10px}.example-dropdown-8 ul.dropdown:after{top:-14px;right:9px}.example-dropdown-8.active{overflow:visible}.example-dropdown-8.active ul.dropdown{display:block}.example-dropdown-9{display:inline-block;position:relative}.example-dropdown-9 .action.split,.example-dropdown-9 .action.toggle{line-height:2.2rem;padding:14px 17px;font-size:1.8rem}.example-dropdown-9:before,.example-dropdown-9:after{content:"";display:table}.example-dropdown-9:after{clear:both}.example-dropdown-9 .action.split{float:left;margin:0}.example-dropdown-9 .action.toggle{float:right;margin:0}.example-dropdown-9 button.action.split{border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-9 button+.action.toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-9 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-9 .action.toggle>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-9 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-9 .action.toggle:hover:after{color:inherit}.example-dropdown-9 .action.toggle:active:after{color:inherit}.example-dropdown-9 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-9 .action.toggle.active>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-9 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-9 .action.toggle.active:hover:after{color:inherit}.example-dropdown-9 .action.toggle.active:active:after{color:inherit}.example-dropdown-9 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15);margin-top:4px}.example-dropdown-9 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-9 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-9 ul.dropdown:before,.example-dropdown-9 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-9 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-9 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-9 ul.dropdown:before{top:-12px;right:10px}.example-dropdown-9 ul.dropdown:after{top:-14px;right:9px}.example-dropdown-9.active{overflow:visible}.example-dropdown-9.active ul.dropdown{display:block}.example-dropdown-10{display:inline-block;position:relative}.example-dropdown-10 .action.split,.example-dropdown-10 .action.toggle{line-height:1.2rem;padding:5px 8px;font-size:1.1rem}.example-dropdown-10:before,.example-dropdown-10:after{content:"";display:table}.example-dropdown-10:after{clear:both}.example-dropdown-10 .action.split{float:left;margin:0}.example-dropdown-10 .action.toggle{float:right;margin:0}.example-dropdown-10 button.action.split{border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-10 button+.action.toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-10 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-10 .action.toggle>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-10 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-10 .action.toggle:hover:after{color:inherit}.example-dropdown-10 .action.toggle:active:after{color:inherit}.example-dropdown-10 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-10 .action.toggle.active>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-10 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-10 .action.toggle.active:hover:after{color:inherit}.example-dropdown-10 .action.toggle.active:active:after{color:inherit}.example-dropdown-10 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15);margin-top:4px}.example-dropdown-10 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-10 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-10 ul.dropdown:before,.example-dropdown-10 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-10 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-10 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-10 ul.dropdown:before{top:-12px;right:10px}.example-dropdown-10 ul.dropdown:after{top:-14px;right:9px}.example-dropdown-10.active{overflow:visible}.example-dropdown-10.active ul.dropdown{display:block}.example-dropdown-11{display:inline-block;position:relative}.example-dropdown-11:before,.example-dropdown-11:after{content:"";display:table}.example-dropdown-11:after{clear:both}.example-dropdown-11 .action.split{float:right;margin:0}.example-dropdown-11 .action.toggle{float:left;margin:0}.example-dropdown-11 button.action.split{border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-11 button+.action.toggle{border-right:0;border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-11 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-11 .action.toggle>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-11 .action.toggle:before{font-family:'icons-blank-theme';content:'\e61c';font-size:22px;line-height:22px;color:red;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-11 .action.toggle:hover:before{color:red}.example-dropdown-11 .action.toggle:active:before{color:inherit}.example-dropdown-11 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-11 .action.toggle.active>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-11 .action.toggle.active:before{font-family:'icons-blank-theme';content:'\e60f';font-size:22px;line-height:22px;color:red;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-11 .action.toggle.active:hover:before{color:red}.example-dropdown-11 .action.toggle.active:active:before{color:inherit}.example-dropdown-11 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15);margin-top:4px}.example-dropdown-11 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-11 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-11 ul.dropdown:before,.example-dropdown-11 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-11 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-11 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-11 ul.dropdown:before{top:-12px;right:10px}.example-dropdown-11 ul.dropdown:after{top:-14px;right:9px}.example-dropdown-11.active{overflow:visible}.example-dropdown-11.active ul.dropdown{display:block}.example-dropdown-12{display:inline-block;position:relative}.example-dropdown-12:before,.example-dropdown-12:after{content:"";display:table}.example-dropdown-12:after{clear:both}.example-dropdown-12 .action.split{float:left;margin:0}.example-dropdown-12 .action.toggle{float:right;margin:0}.example-dropdown-12 button.action.split{border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-12 button+.action.toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-12 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-12 .action.toggle>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-12 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-12 .action.toggle:hover:after{color:inherit}.example-dropdown-12 .action.toggle:active:after{color:inherit}.example-dropdown-12 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-12 .action.toggle.active>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-dropdown-12 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-12 .action.toggle.active:hover:after{color:inherit}.example-dropdown-12 .action.toggle.active:active:after{color:inherit}.example-dropdown-12 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#eef1f3;border:2px solid #ced1d4;position:absolute;z-index:100;top:100%;min-width:100%;display:none}.example-dropdown-12 ul.dropdown li{margin:0;padding:10px;border-top:2px solid #e8eaed}.example-dropdown-12 ul.dropdown li:first-child{border:0}.example-dropdown-12 ul.dropdown li:hover{background:#d8e3e3;cursor:pointer}.example-dropdown-12.active{overflow:visible}.example-dropdown-12.active ul.dropdown{display:block}.example-form-1 .example-form-1-fieldset{padding:0;margin:0 0 40px;border:0;letter-spacing:-.31em}.example-form-1 .example-form-1-fieldset>*{letter-spacing:normal}.example-form-1 .example-form-1-fieldset>.legend{margin:0 0 25px;padding:0;font-size:2rem;line-height:1.2;box-sizing:border-box;float:left}.example-form-1 .example-form-1-fieldset>.legend+br{display:block;visibility:hidden;height:0;overflow:hidden;clear:both}.example-form-1 .example-form-1-fieldset:after{content:attr(data-hasrequired);display:block;font-size:1.2rem;color:#e02b27;margin:10px 0 0;letter-spacing:normal;word-spacing:normal}.example-form-1 .example-form-1-fieldset>.field{margin:0 0 20px}.example-form-1 .example-form-1-fieldset>.field>.label{display:inline-block;margin:0 0 5px}.example-form-1 .example-form-1-fieldset>.field:last-child{margin-bottom:0}.example-form-1 .example-form-1-fieldset>.field>.label{font-weight:700}.example-form-1 .example-form-1-fieldset>.field>.label+br{display:none}.example-form-1 .example-form-1-fieldset>.field .choice input{vertical-align:top}.example-form-1 .example-form-1-fieldset>.field .fields.group:before,.example-form-1 .example-form-1-fieldset>.field .fields.group:after{content:"";display:table}.example-form-1 .example-form-1-fieldset>.field .fields.group:after{clear:both}.example-form-1 .example-form-1-fieldset>.field .fields.group .field{box-sizing:border-box;float:left}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-2 .field{width:50%!important}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-3 .field{width:33.3%!important}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-4 .field{width:25%!important}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-5 .field{width:20%!important}.example-form-1 .example-form-1-fieldset>.field .addon{display:inline-flex;flex-wrap:nowrap;padding:0;width:100%}.example-form-1 .example-form-1-fieldset>.field .addon textarea,.example-form-1 .example-form-1-fieldset>.field .addon select,.example-form-1 .example-form-1-fieldset>.field .addon input{-webkit-order:2;-ms-flex-order:2;order:2;box-shadow:none;display:inline-block;margin:0;width:auto;flex-basis:100%}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore,.example-form-1 .example-form-1-fieldset>.field .addon .addafter{-webkit-order:3;-ms-flex-order:3;order:3;display:inline-block;box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:0 9px;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;width:auto;white-space:nowrap;vertical-align:middle}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore:disabled,.example-form-1 .example-form-1-fieldset>.field .addon .addafter:disabled{opacity:.5}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore::-moz-placeholder,.example-form-1 .example-form-1-fieldset>.field .addon .addafter::-moz-placeholder{color:#c2c2c2}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore::-webkit-input-placeholder,.example-form-1 .example-form-1-fieldset>.field .addon .addafter::-webkit-input-placeholder{color:#c2c2c2}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore:-ms-input-placeholder,.example-form-1 .example-form-1-fieldset>.field .addon .addafter:-ms-input-placeholder{color:#c2c2c2}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore{float:left;-webkit-order:1;-ms-flex-order:1;order:1}.example-form-1 .example-form-1-fieldset>.field .additional{margin-top:10px}.example-form-1 .example-form-1-fieldset>.field.required>.label:after{content:'*';font-size:1.2rem;color:#e02b27;margin:0 0 0 5px}.example-form-1 .example-form-1-fieldset>.field .note{font-size:1.2rem;margin:3px 0 0;padding:0;display:inline-block;text-decoration:none}.example-form-1 .example-form-1-fieldset>.field .note:before{font-family:'icons-blank-theme';content:'\e618';font-size:24px;line-height:12px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-form-2 .example-form-2-fieldset{padding:0;margin:0 0 40px;border:0;letter-spacing:-.31em}.example-form-2 .example-form-2-fieldset>*{letter-spacing:normal}.example-form-2 .example-form-2-fieldset>.legend{margin:0 0 25px;padding:0;font-size:2rem;line-height:1.2;box-sizing:border-box;float:left}.example-form-2 .example-form-2-fieldset>.legend+br{display:block;visibility:hidden;height:0;overflow:hidden;clear:both}.example-form-2 .example-form-2-fieldset>.field{margin:0 0 20px;box-sizing:border-box;display:inline-block;padding:0 12px 0 0;width:50%;vertical-align:top}.example-form-2 .example-form-2-fieldset>.field>.label{display:inline-block;margin:0 0 5px}.example-form-2 .example-form-2-fieldset>.field:last-child{margin-bottom:0}.example-form-2 .example-form-2-fieldset>.field+.fieldset{clear:both}.example-form-2 .example-form-2-fieldset>.field>.label{font-weight:700}.example-form-2 .example-form-2-fieldset>.field>.label+br{display:none}.example-form-2 .example-form-2-fieldset>.field .choice input{vertical-align:top}.example-form-2 .example-form-2-fieldset>.field .fields.group:before,.example-form-2 .example-form-2-fieldset>.field .fields.group:after{content:"";display:table}.example-form-2 .example-form-2-fieldset>.field .fields.group:after{clear:both}.example-form-2 .example-form-2-fieldset>.field .fields.group .field{box-sizing:border-box;float:left}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-2 .field{width:50%!important}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-3 .field{width:33.3%!important}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-4 .field{width:25%!important}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-5 .field{width:20%!important}.example-form-2 .example-form-2-fieldset>.field .addon{display:inline-flex;flex-wrap:nowrap;padding:0;width:100%}.example-form-2 .example-form-2-fieldset>.field .addon textarea,.example-form-2 .example-form-2-fieldset>.field .addon select,.example-form-2 .example-form-2-fieldset>.field .addon input{-webkit-order:2;-ms-flex-order:2;order:2;box-shadow:none;display:inline-block;margin:0;width:auto;flex-basis:100%}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore,.example-form-2 .example-form-2-fieldset>.field .addon .addafter{-webkit-order:3;-ms-flex-order:3;order:3;display:inline-block;box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:0 9px;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;width:auto;white-space:nowrap;vertical-align:middle}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore:disabled,.example-form-2 .example-form-2-fieldset>.field .addon .addafter:disabled{opacity:.5}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore::-moz-placeholder,.example-form-2 .example-form-2-fieldset>.field .addon .addafter::-moz-placeholder{color:#c2c2c2}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore::-webkit-input-placeholder,.example-form-2 .example-form-2-fieldset>.field .addon .addafter::-webkit-input-placeholder{color:#c2c2c2}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore:-ms-input-placeholder,.example-form-2 .example-form-2-fieldset>.field .addon .addafter:-ms-input-placeholder{color:#c2c2c2}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore{float:left;-webkit-order:1;-ms-flex-order:1;order:1}.example-form-2 .example-form-2-fieldset>.field .additional{margin-top:10px}.example-form-2 .example-form-2-fieldset>.field.required>.label:after{content:'*';font-size:1.2rem;color:#e02b27;margin:0 0 0 5px}.example-form-2 .example-form-2-fieldset>.field .note{font-size:1.2rem;margin:3px 0 0;padding:0;display:inline-block;text-decoration:none}.example-form-2 .example-form-2-fieldset>.field .note:before{font-family:'icons-blank-theme';content:'\e618';font-size:24px;line-height:12px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}input[type="text"],input[type="password"],input[type="url"],input[type="tel"],input[type="search"],input[type="number"],input[type="datetime"],input[type="email"]{box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:0 9px;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;margin-bottom:20px}input[type="text"]:disabled,input[type="password"]:disabled,input[type="url"]:disabled,input[type="tel"]:disabled,input[type="search"]:disabled,input[type="number"]:disabled,input[type="datetime"]:disabled,input[type="email"]:disabled{opacity:.5}input[type="text"]::-moz-placeholder,input[type="password"]::-moz-placeholder,input[type="url"]::-moz-placeholder,input[type="tel"]::-moz-placeholder,input[type="search"]::-moz-placeholder,input[type="number"]::-moz-placeholder,input[type="datetime"]::-moz-placeholder,input[type="email"]::-moz-placeholder{color:#c2c2c2}input[type="text"]::-webkit-input-placeholder,input[type="password"]::-webkit-input-placeholder,input[type="url"]::-webkit-input-placeholder,input[type="tel"]::-webkit-input-placeholder,input[type="search"]::-webkit-input-placeholder,input[type="number"]::-webkit-input-placeholder,input[type="datetime"]::-webkit-input-placeholder,input[type="email"]::-webkit-input-placeholder{color:#c2c2c2}input[type="text"]:-ms-input-placeholder,input[type="password"]:-ms-input-placeholder,input[type="url"]:-ms-input-placeholder,input[type="tel"]:-ms-input-placeholder,input[type="search"]:-ms-input-placeholder,input[type="number"]:-ms-input-placeholder,input[type="datetime"]:-ms-input-placeholder,input[type="email"]:-ms-input-placeholder{color:#c2c2c2}select{box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:5px 10px 4px;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;margin-bottom:20px}select:disabled{opacity:.5}select[multiple="multiple"]{height:auto;margin-bottom:20px}textarea{box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:auto;width:100%;padding:10px;margin:0;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;resize:vertical}textarea:disabled{opacity:.5}textarea::-moz-placeholder{color:#c2c2c2}textarea::-webkit-input-placeholder{color:#c2c2c2}textarea:-ms-input-placeholder{color:#c2c2c2}input[type="checkbox"]{margin:2px 5px 0 0}input[type="checkbox"]:disabled{opacity:.5}input[type="radio"]{margin:2px 5px 0 0}input[type="radio"]:disabled{opacity:.5}input.text-example-1,select.select-example-1,textarea.textarea-example-1{border-color:#fc0;background:#fdf0d5;color:#b30000}input.text-example-1:focus,select.select-example-1:focus,textarea.textarea-example-1:focus{border-color:#cff;color:#060}input.text-example-1:disabled,select.select-example-1:disabled,textarea.textarea-example-1:disabled{color:#fcc}input.text-example-1::-moz-placeholder,textarea.textarea-example-1::-moz-placeholder{color:#ccc}input.text-example-1::-webkit-input-placeholder,textarea.textarea-example-1::-webkit-input-placeholder{color:#ccc}input.text-example-1:-ms-input-placeholder,textarea.textarea-example-1:-ms-input-placeholder{color:#ccc}.number-example{-moz-appearance:textfield}.number-example::-webkit-inner-spin-button,.number-example::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.search-example{-webkit-appearance:none}.search-example::-webkit-search-cancel-button,.search-example::-webkit-search-decoration,.search-example::-webkit-search-results-button,.search-example::-webkit-search-results-decoration{-webkit-appearance:none}input,textarea,select{font-size:1.2rem;color:#e02b27}.example-icon-1{display:inline-block}.example-icon-1:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-2{display:inline-block}.example-icon-2:after{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat -26px 0}.example-icon-3{display:inline-block}.example-icon-3>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-icon-3:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat -156px -52px}.example-icon-4{display:inline-block;text-decoration:none}.example-icon-4:before{font-family:'icons-blank-theme';content:'\e606';font-size:24px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-5{display:inline-block;text-decoration:none}.example-icon-5:after{font-family:'icons-blank-theme';content:'\e605';font-size:24px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-6{display:inline-block;text-decoration:none}.example-icon-6>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-icon-6:before{font-family:'icons-blank-theme';content:'\e61b';font-size:24px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-7{display:inline-block}.example-icon-7:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-8{display:inline-block}.example-icon-8:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-8:before{background-position:-182px 0}.example-icon-9{display:inline-block}.example-icon-9:after{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-9:after{background-position:-52px -26px}.example-icon-10{display:inline-block}.example-icon-10:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-10:before{background-position:-104px 0}.example-icon-11{display:inline-block}.example-icon-11:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-11:before{width:30px;height:30px}.example-icon-11:after{width:30px;height:30px}.example-icon-11:before{background-color:#f1f1f1}.example-icon-12{display:inline-block;text-decoration:none}.example-icon-12:before{font-family:'icons-blank-theme';content:'\e612';font-size:28px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-13{display:inline-block;text-decoration:none}.example-icon-13:before{font-family:'icons-blank-theme';content:'\e612';font-size:inherit;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-13:before{font-size:26px;line-height:inherit}.example-icon-14{display:inline-block;text-decoration:none}.example-icon-14:before{font-family:'icons-blank-theme';content:'\e61d';font-size:26px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-14>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.icons-image-list{list-style:none;padding:0}.icons-image-list li{float:left;width:33%}.icons-image-list li>span{display:inline-block}.icons-image-list li>span:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.icons-image-list li .icon-search:before{background-position:0 0}.icons-image-list li .icon-cart:before{background-position:-26px 0}.icons-image-list li .icon-arrow-down:before{background-position:-52px 0}.icons-image-list li .icon-arrow-up:before{background-position:-78px 0}.icons-image-list li .icon-grid:before{background-position:-104px 0}.icons-image-list li .icon-list:before{background-position:-130px 0}.icons-image-list li .icon-remove:before{background-position:-156px 0}.icons-image-list li .icon-star:before{background-position:-182px 0}.icons-image-list li .icon-pointer-down:before{background-position:-208px 0}.icons-image-list li .icon-pointer-up:before{background-position:-234px 0}.icons-image-list li .icon-pointer-left:before{background-position:-260px 0}.icons-image-list li .icon-pointer-right:before{background-position:-286px 0}.icons-image-list li .icon-compare-empty:before{background-position:0 -26px}.icons-image-list li .icon-compare-full:before{background-position:-26px -26px}.icons-image-list li .icon-wishlist-empty:before{background-position:-52px -26px}.icons-image-list li .icon-wishlist-full:before{background-position:-78px -26px}.icons-image-list li .icon-update:before{background-position:-104px -26px}.icons-image-list li .icon-collapse:before{background-position:-130px -26px}.icons-image-list li .icon-expand:before{background-position:-156px -26px}.icons-image-list li .icon-menu:before{background-position:-182px -26px}.icons-image-list li .icon-prev:before{background-position:-208px -26px}.icons-image-list li .icon-next:before{background-position:-234px -26px}.icons-image-list li .icon-settings:before{background-position:-260px -26px}.icons-image-list li .icon-info:before{background-position:-286px -26px}.icons-image-list li .icon-checkmark:before{background-position:0 -52px}.icons-image-list li .icon-calendar:before{background-position:-26px -52px}.icons-image-list li .icon-comment:before{background-position:-52px -52px}.icons-image-list li .icon-comment-reflected:before{background-position:-78px -52px}.icons-image-list li .icon-envelope:before{background-position:-104px -52px}.icons-image-list li .icon-warning:before{background-position:-130px -52px}.icons-image-list li .icon-trash:before{background-position:-156px -52px}.icons-image-list li .icon-flag:before{background-position:-182px -52px}.icons-image-list li .icon-location:before{background-position:-208px -52px}.icons-image-list li .icon-up:before{background-position:-234px -52px}.icons-image-list li .icon-down:before{background-position:-260px -52px}.icons-font-list{list-style:none;padding:0}.icons-font-list li{float:left;width:25%;margin-bottom:35px;text-align:center}.icons-font-list li>span{display:inline-block;text-decoration:none}.icons-font-list li>span:before{font-family:'icons-blank-theme';font-size:34px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.icons-font-list li>span:before{content:attr(data-icon);margin:0 auto;display:block}.loader{position:fixed;left:0;top:0;right:0;bottom:0;background-color:rgba(255,255,255,.5);z-index:9999}.loader:before{box-sizing:border-box;background:transparent url('/pub/static/frontend/Magento/blank/en_US/images/loader-2.gif') no-repeat 50% 50%;border-radius:5px;content:'';position:absolute;top:0;right:0;left:0;bottom:0;margin:auto;width:160px;height:160px}.loading{position:relative}.loading:before{content:'';position:absolute;left:0;top:0;right:0;bottom:0;background:rgba(255,255,255,.5) url('/pub/static/frontend/Magento/blank/en_US/images/loader-2.gif') no-repeat 50% 50%}.example-message-info{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fdf0d5;color:#6f4400}.example-message-info a{color:#1979c3}.example-message-info a:hover{color:#006bb4}.example-message-info a:active{color:#006bb4}.example-message-warning{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fdf0d5;color:#6f4400}.example-message-warning a{color:#1979c3}.example-message-warning a:hover{color:#006bb4}.example-message-warning a:active{color:#006bb4}.example-message-error{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fae5e5;color:#e02b27}.example-message-error a{color:#1979c3}.example-message-error a:hover{color:#006bb4}.example-message-error a:active{color:#006bb4}.example-message-success{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#e5efe5;color:#006400}.example-message-success a{color:#1979c3}.example-message-success a:hover{color:#006bb4}.example-message-success a:active{color:#006bb4}.example-message-notice{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fdf0d5;color:#6f4400}.example-message-notice a{color:#1979c3}.example-message-notice a:hover{color:#006bb4}.example-message-notice a:active{color:#006bb4}.example-message-1{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fdf0d5;color:#6f4400;position:relative;padding-left:40px}.example-message-1 a{color:#1979c3}.example-message-1 a:hover{color:#006bb4}.example-message-1 a:active{color:#006bb4}.example-message-1>:first-child:before{font-family:'icons-blank-theme';content:'\e602';font-size:28px;line-height:28px;color:#c07600;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;margin:-14px 0 0;position:absolute;top:18px;left:0;text-align:center;width:40px}.example-message-2{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fae5e5;color:#e02b27;position:relative;padding-right:40px}.example-message-2 a{color:#1979c3}.example-message-2 a:hover{color:#006bb4}.example-message-2 a:active{color:#006bb4}.example-message-2:before{content:'';position:absolute;width:30px;text-align:center;top:0;height:100%;display:block;padding:0;background:#b30000}.example-message-2>:first-child:before{content:'';position:absolute;overflow:hidden;top:50%;margin-top:-5px}.example-message-2>:first-child:after{font-family:'icons-blank-theme';content:'\e602';font-size:28px;line-height:28px;color:#fff;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;margin:-14px 0 0;position:absolute;top:18px;left:0;text-align:center;width:30px}.example-message-2:before{right:0}.example-message-2>:first-child:before{width:0;height:0;border:5px solid transparent;border-right-color:#b30000;right:30px}.example-message-2>:first-child:after{right:0}.example-message-3{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#e5efe5;color:#006400;position:relative;padding-left:40px}.example-message-3 a{color:#1979c3}.example-message-3 a:hover{color:#006bb4}.example-message-3 a:active{color:#006bb4}.example-message-3:before{content:'';position:absolute;width:30px;text-align:center;top:0;height:100%;display:block;padding:0;background:#006400}.example-message-3>:first-child:before{content:'';position:absolute;overflow:hidden;top:50%;margin-top:-5px}.example-message-3>:first-child:after{font-family:'icons-blank-theme';content:'\e610';font-size:28px;line-height:28px;color:#fff;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;margin:-14px 0 0;position:absolute;top:18px;left:0;text-align:center;width:30px}.example-message-3:before{left:0}.example-message-3>:first-child:before{width:0;height:0;border:5px solid transparent;border-left-color:#006400;left:30px}.example-message-3>:first-child:after{left:0}.example-message-4{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fc0;border-color:#ffa500;color:#000;position:relative;padding-left:40px;border-width:4px;border-radius:10px}.example-message-4 a{color:#00f}.example-message-4 a:hover{color:#009}.example-message-4 a:active{color:#006}.example-message-4:before{content:'';position:absolute;width:30px;text-align:center;top:0;height:100%;display:block;padding:0;background:#green}.example-message-4>:first-child:before{content:'';position:absolute;overflow:hidden;top:50%;margin-top:-5px}.example-message-4>:first-child:after{font-family:'icons-blank-theme';content:'\e606';font-size:28px;line-height:28px;color:#000;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;margin:-14px 0 0;position:absolute;top:15px;left:0;text-align:center;width:30px}.example-message-4:before{left:0}.example-message-4>:first-child:before{width:0;height:0;border:5px solid transparent;border-left-color:#green;left:30px}.example-message-4>:first-child:after{left:0}header.header{background-color:rgba(255,0,0,.2)}.column.main{background-color:rgba(255,255,0,.2)}.column.left{background-color:rgba(0,255,255,.2)}.column.right{background-color:rgba(0,0,255,.2)}footer.footer{background-color:rgba(0,0,0,.2)}.columns{box-sizing:border-box;display:-webkit-flex;display:-ms-flexbox;display:flex;flex-wrap:wrap}.columns:after{content:" ";display:block;height:0;clear:both;overflow:hidden;visibility:hidden}.columns>.column{padding-bottom:40px}@media (min-width: 600px){.page-layout-1column .column.main{ width:100%;-webkit-order:2;-ms-flex-order:2;order:2}.page-layout-3columns .column.main{width:66.66666667%;display:inline-block;-webkit-order:2;-ms-flex-order:2;order:2}.page-layout-2columns-left .column.main{width:83.33333333%;float:right;-webkit-order:2;-ms-flex-order:2;order:2}.page-layout-2columns-right .column.main{width:83.33333333%;float:left;-webkit-order:1;-ms-flex-order:1;order:1}.page-layout-3columns .column.left{width:16.66666667%;float:left;-webkit-order:1;-ms-flex-order:1;order:1}.page-layout-2columns-left .column.left{width:16.66666667%;float:left;-webkit-order:1;-ms-flex-order:1;order:1}.page-layout-2columns-right .column.left{width:16.66666667%;float:left;-webkit-order:1;-ms-flex-order:1;order:1}.page-layout-3columns .column.right{width:16.66666667%;float:right;-webkit-order:3;-ms-flex-order:3;order:3}.page-layout-2columns-left .column.right{width:16.66666667%;float:right;-webkit-order:2;-ms-flex-order:2;order:2}.page-layout-2columns-right .column.right{width:16.66666667%;float:right;-webkit-order:2;-ms-flex-order:2;order:2}}.layout-example-3 .column.main{width:60%;display:inline-block;-webkit-order:2;-ms-flex-order:2;order:2}.layout-example-3 .column.left{width:20%;float:left;-webkit-order:1;-ms-flex-order:1;order:1}.layout-example-3 .column.right{width:20%;float:right;-webkit-order:3;-ms-flex-order:3;order:3}.layout-example-3-1 .column.main{width:60%;float:left;-webkit-order:1;-ms-flex-order:1;order:1}.layout-example-3-1 .column.left{width:20%;display:inline-block;-webkit-order:2;-ms-flex-order:2;order:2}.layout-example-3-1 .column.right{width:20%;float:right;-webkit-order:3;-ms-flex-order:3;order:3}.pages>.label{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.pages .items{font-size:0;line-height:0;letter-spacing:-1px;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.pages .item{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;margin:0 2px 0 0;display:inline-block}.pages .item .label{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.pages a.page{padding:0 4px;color:#1979c3;display:inline-block;text-decoration:none}.pages a.page:visited{color:#800080}.pages a.page:hover{color:#006bb4;text-decoration:none}.pages a.page:active{color:#ff5501}.pages strong.page{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;padding:0 4px;color:#333;display:inline-block;font-weight:700}.pages .action{border:1px solid #d1d1d1;padding:0;color:#7d7d7d;display:inline-block;text-decoration:none}.pages .action:visited{color:#7d7d7d}.pages .action:hover{color:#7d7d7d;text-decoration:none}.pages .action:active{color:#7d7d7d}.pages .action.next{display:inline-block;text-decoration:none}.pages .action.next:visited:before{color:#7d7d7d}.pages .action.next:active:before{color:#7d7d7d}.pages .action.next>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.pages .action.next:before{font-family:'icons-blank-theme';content:'\e608';font-size:46px;line-height:inherit;color:#7d7d7d;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.pages .action.next:hover:before{color:#7d7d7d}.pages .action.next:active:before{color:#7d7d7d}.pages .action.previous{display:inline-block;text-decoration:none}.pages .action.previous:visited:before{color:#7d7d7d}.pages .action.previous:active:before{color:#7d7d7d}.pages .action.previous>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.pages .action.previous:before{font-family:'icons-blank-theme';content:'\e617';font-size:46px;line-height:inherit;color:#7d7d7d;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.pages .action.previous:hover:before{color:#7d7d7d}.pages .action.previous:active:before{color:#7d7d7d}.example-pages-1>.label{display:inline-block;font-weight:700;font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal}.example-pages-1>.label:after{content:':'}.example-pages-1 .items{font-size:0;line-height:0;letter-spacing:-1px;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.example-pages-1 .item{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;margin:0 3px;display:inline-block}.example-pages-1 .item .label{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-pages-1 a.page{background-color:#ccc;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #f4f4f4 0, #ccc 100%);background-image:linear-gradient(to bottom, #f4f4f4 0, #ccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#cccccc', GradientType=0);border:1px solid #b3b3b3;padding:0 4px;color:#333;display:inline-block;text-decoration:none}.example-pages-1 a.page:visited{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#800080}.example-pages-1 a.page:hover{background-color:#f4f4f4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #ccc 0, #f4f4f4 100%);background-image:linear-gradient(to bottom, #ccc 0, #f4f4f4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#f4f4f4', GradientType=0);border:1px solid #999;color:#333;text-decoration:none}.example-pages-1 a.page:active{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#ff5501}.example-pages-1 strong.page{background:#1979c3;border:1px solid #135d96;font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;padding:0 4px;color:#f7b32e;display:inline-block;font-weight:700}.example-pages-1 .action{border:1px solid #d1d1d1;padding:0;color:#7d7d7d;display:inline-block;text-decoration:none}.example-pages-1 .action:visited{color:#7d7d7d}.example-pages-1 .action:hover{color:#ff5501;text-decoration:none}.example-pages-1 .action:active{color:#7d7d7d}.example-pages-1 .action.next{display:inline-block;text-decoration:none}.example-pages-1 .action.next:visited:before{color:#7d7d7d}.example-pages-1 .action.next:active:before{color:#7d7d7d}.example-pages-1 .action.next>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-pages-1 .action.next:before{font-family:'icons-blank-theme';content:'\e608';font-size:30px;line-height:inherit;color:#7d7d7d;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.example-pages-1 .action.next:hover:before{color:#ff5501}.example-pages-1 .action.next:active:before{color:#7d7d7d}.example-pages-1 .action.previous{display:inline-block;text-decoration:none}.example-pages-1 .action.previous:visited:before{color:#7d7d7d}.example-pages-1 .action.previous:active:before{color:#7d7d7d}.example-pages-1 .action.previous>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-pages-1 .action.previous:before{font-family:'icons-blank-theme';content:'\e617';font-size:30px;line-height:inherit;color:#7d7d7d;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.example-pages-1 .action.previous:hover:before{color:#ff5501}.example-pages-1 .action.previous:active:before{color:#7d7d7d}.example-pages-2>.label{display:inline-block;font-weight:700;font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal}.example-pages-2>.label:after{content:':'}.example-pages-2 .items{font-size:0;line-height:0;letter-spacing:-1px;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.example-pages-2 .item{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;margin:0 2px 0 0;display:inline-block}.example-pages-2 .item .label{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-pages-2 a.page{padding:0 4px;color:#1979c3;display:inline-block;text-decoration:none}.example-pages-2 a.page:visited{color:#800080}.example-pages-2 a.page:hover{color:#006bb4;text-decoration:none}.example-pages-2 a.page:active{color:#ff5501}.example-pages-2 strong.page{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;padding:0 4px;color:#333;display:inline-block;font-weight:700}.example-pages-2 .action{border:1px solid #d1d1d1;padding:0;color:#7d7d7d;display:inline-block;text-decoration:none}.example-pages-2 .action:visited{color:#7d7d7d}.example-pages-2 .action:hover{color:#7d7d7d;text-decoration:none}.example-pages-2 .action:active{color:#7d7d7d}.example-pages-3>.label{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-pages-3 .items{font-size:0;line-height:0;letter-spacing:-1px;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.example-pages-3 .item{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;margin:0 2px 0 0;display:inline-block}.example-pages-3 .item .label{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-pages-3 a.page{background:#1979c3;padding:0 4px;color:#fff;display:inline-block;text-decoration:none}.example-pages-3 a.page:visited{background:#800080;color:#fff}.example-pages-3 a.page:hover{background:#006bb4;color:#fff;text-decoration:none}.example-pages-3 a.page:active{background:#ff5501;color:#fff}.example-pages-3 strong.page{background:#800080;font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;padding:0 4px;color:#fff;display:inline-block;font-weight:700}.example-pages-3 .action{background:#1979c3;border:1px solid #d1d1d1;padding:0;color:#fff;display:inline-block;text-decoration:none}.example-pages-3 .action:visited{background:#800080;color:#7d7d7d}.example-pages-3 .action:hover{background:#006bb4;color:#fff;text-decoration:none}.example-pages-3 .action:active{background:#ff5501;color:#fff}.example-pages-3 .action.next{display:inline-block;text-decoration:none}.example-pages-3 .action.next:visited:before{color:#7d7d7d}.example-pages-3 .action.next:active:before{color:#fff}.example-pages-3 .action.next>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-pages-3 .action.next:before{font-family:'icons-blank-theme';content:'\e608';font-size:46px;line-height:inherit;color:#fff;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.example-pages-3 .action.next:hover:before{color:#fff}.example-pages-3 .action.next:active:before{color:#fff}.example-pages-3 .action.previous{display:inline-block;text-decoration:none}.example-pages-3 .action.previous:visited:before{color:#7d7d7d}.example-pages-3 .action.previous:active:before{color:#fff}.example-pages-3 .action.previous>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-pages-3 .action.previous:before{font-family:'icons-blank-theme';content:'\e617';font-size:46px;line-height:inherit;color:#fff;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.example-pages-3 .action.previous:hover:before{color:#fff}.example-pages-3 .action.previous:active:before{color:#fff}.window.popup.popup-example{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example .popup-actions .action.close>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.window.popup.popup-example .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example .popup-actions .action.close:focus,.window.popup.popup-example .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example .popup-actions .action.close.disabled,.window.popup.popup-example .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example.active{opacity:1}.window.popup.popup-example-1{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-1 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-1 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-1 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-1 .popup-actions .action.close>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.window.popup.popup-example-1 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-1 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-1 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-1 .popup-actions .action.close:focus,.window.popup.popup-example-1 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-1 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-1 .popup-actions .action.close.disabled,.window.popup.popup-example-1 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-1 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-1.active{opacity:1}.window.overlay{transition:opacity .15s linear;position:fixed;top:0;right:0;bottom:0;left:0;background:#000;z-index:1000;opacity:0}.window.overlay.active{opacity:.5;filter:alpha(opacity=50)}.window.popup.popup-example-2{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;overflow-y:auto;max-height:200px;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-2 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-2 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-2 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-2 .popup-actions .action.close>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.window.popup.popup-example-2 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-2 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-2 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-2 .popup-actions .action.close:focus,.window.popup.popup-example-2 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-2 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-2 .popup-actions .action.close.disabled,.window.popup.popup-example-2 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-2 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-2.active{opacity:1}.window.popup.popup-example-3{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-3 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-3 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-3 .popup-content{overflow-y:auto;max-height:200px}.window.popup.popup-example-3 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-3 .popup-actions .action.close>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.window.popup.popup-example-3 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-3 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-3 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-3 .popup-actions .action.close:focus,.window.popup.popup-example-3 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-3 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-3 .popup-actions .action.close.disabled,.window.popup.popup-example-3 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-3 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-3.active{opacity:1}.window.popup.popup-example-4{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-4 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-4 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-4 .popup-content{margin:0 0 20px}.window.popup.popup-example-4 .popup-footer{margin:0 20px}.window.popup.popup-example-4 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-4 .popup-actions .action.close>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.window.popup.popup-example-4 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-4 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-4 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-4 .popup-actions .action.close:focus,.window.popup.popup-example-4 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-4 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-4 .popup-actions .action.close.disabled,.window.popup.popup-example-4 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-4 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-4.active{opacity:1}.window.popup.popup-example-5{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-5 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-5 .popup-header .title{font-size:4rem;font-weight:300;line-height:1.1;margin-top:0rem;margin-bottom:2rem}.window.popup.popup-example-5 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-5 .popup-actions .action.close>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.window.popup.popup-example-5 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-5 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-5 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-5 .popup-actions .action.close:focus,.window.popup.popup-example-5 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-5 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-5 .popup-actions .action.close.disabled,.window.popup.popup-example-5 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-5 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-5.active{opacity:1}.window.popup.popup-example-6{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-6 .popup-footer .actions.toolbar{text-align:left}.window.popup.popup-example-6 .popup-footer .actions.toolbar:before,.window.popup.popup-example-6 .popup-footer .actions.toolbar:after{content:"";display:table}.window.popup.popup-example-6 .popup-footer .actions.toolbar:after{clear:both}.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary{float:left}.window.popup.popup-example-6 .popup-footer .actions.toolbar .primary,.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary{display:inline-block}.window.popup.popup-example-6 .popup-footer .actions.toolbar .primary a.action,.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary a.action{display:inline-block}.window.popup.popup-example-6 .popup-footer .actions.toolbar .primary .action{margin:0 5px 0 0}.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary a.action{margin-top:6px}.window.popup.popup-example-6 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-6 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-6 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-6 .popup-actions .action.close>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.window.popup.popup-example-6 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-6 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-6 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-6 .popup-actions .action.close:focus,.window.popup.popup-example-6 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-6 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-6 .popup-actions .action.close.disabled,.window.popup.popup-example-6 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-6 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-6.active{opacity:1}.window.popup.popup-example-7{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-7 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-7 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-7 .popup-actions .action.close{position:absolute;top:10px;right:10px}.window.popup.popup-example-7.active{opacity:1}.window.popup.popup-example-8{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-8 .popup-header{margin:0 0 25px;padding-right:30px}.window.popup.popup-example-8 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-8 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-8 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e613';font-size:30px;line-height:22px;color:red;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:0}.window.popup.popup-example-8 .popup-actions .action.close:hover:before{color:#090}.window.popup.popup-example-8 .popup-actions .action.close:active:before{color:#00f}.window.popup.popup-example-8 .popup-actions .action.close:focus,.window.popup.popup-example-8 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-8 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-8 .popup-actions .action.close.disabled,.window.popup.popup-example-8 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-8 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-8.active{opacity:1}.window.popup.popup-example-9{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-9 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-9 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-9 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-9 .popup-actions .action.close>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.window.popup.popup-example-9 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-9 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-9 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-9 .popup-actions .action.close:focus,.window.popup.popup-example-9 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-9 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-9 .popup-actions .action.close.disabled,.window.popup.popup-example-9 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-9.active{opacity:1}.window.overlay.example-overlay-1.active{transition:opacity .15s linear;position:fixed;top:0;right:0;bottom:0;left:0;background:#0f5293;z-index:1000;opacity:0}.window.overlay.example-overlay-1.active.active{opacity:.8;filter:alpha(opacity=80)}.example-ratings-1{overflow:hidden}.example-ratings-1:before{letter-spacing:-10px;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#c7c7c7;vertical-align:top;content:'\e605' '\e605' '\e605' '\e605' '\e605';position:absolute;z-index:1;display:block}.example-ratings-1 input[type="radio"]{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-ratings-1 input[type="radio"]:focus+label:before,.example-ratings-1 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-1 label{position:absolute;display:block;cursor:pointer}.example-ratings-1 label span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-ratings-1 label:before{letter-spacing:-10px;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#ff5601;vertical-align:top;opacity:0}.example-ratings-1 label:hover:before{opacity:1}.example-ratings-1 label:hover~label:before{opacity:0}.example-ratings-1 .rating-5{z-index:2}.example-ratings-1 .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-1 .rating-4{z-index:3}.example-ratings-1 .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.example-ratings-1 .rating-3{z-index:4}.example-ratings-1 .rating-3:before{content:'\e605' '\e605' '\e605'}.example-ratings-1 .rating-2{z-index:5}.example-ratings-1 .rating-2:before{content:'\e605' '\e605'}.example-ratings-1 .rating-1{z-index:6}.example-ratings-1 .rating-1:before{content:'\e605'}.example-ratings-2{overflow:hidden}.example-ratings-2:before{letter-spacing:-10px;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#c7c7c7;vertical-align:top;content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605';position:absolute;z-index:1;display:block}.example-ratings-2 input[type="radio"]{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-ratings-2 input[type="radio"]:focus+label:before,.example-ratings-2 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-2 label{position:absolute;display:block;cursor:pointer}.example-ratings-2 label span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-ratings-2 label:before{letter-spacing:-10px;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#ff5601;vertical-align:top;opacity:0}.example-ratings-2 label:hover:before{opacity:1}.example-ratings-2 label:hover~label:before{opacity:0}.example-ratings-2 .rating-8{z-index:2}.example-ratings-2 .rating-8:before{content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-7{z-index:3}.example-ratings-2 .rating-7:before{content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-6{z-index:4}.example-ratings-2 .rating-6:before{content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-5{z-index:5}.example-ratings-2 .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-4{z-index:6}.example-ratings-2 .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-3{z-index:7}.example-ratings-2 .rating-3:before{content:'\e605' '\e605' '\e605'}.example-ratings-2 .rating-2{z-index:8}.example-ratings-2 .rating-2:before{content:'\e605' '\e605'}.example-ratings-2 .rating-1{z-index:9}.example-ratings-2 .rating-1:before{content:'\e605'}.example-ratings-3{overflow:hidden}.example-ratings-3:before{letter-spacing:-10px;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#aff5e3;vertical-align:top;content:'\e605' '\e605' '\e605' '\e605' '\e605';position:absolute;z-index:1;display:block}.example-ratings-3 input[type="radio"]{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-ratings-3 input[type="radio"]:focus+label:before,.example-ratings-3 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-3 label{position:absolute;display:block;cursor:pointer}.example-ratings-3 label span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-ratings-3 label:before{letter-spacing:-10px;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#0a6767;vertical-align:top;opacity:0}.example-ratings-3 label:hover:before{opacity:1}.example-ratings-3 label:hover~label:before{opacity:0}.example-ratings-3 .rating-5{z-index:2}.example-ratings-3 .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-3 .rating-4{z-index:3}.example-ratings-3 .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.example-ratings-3 .rating-3{z-index:4}.example-ratings-3 .rating-3:before{content:'\e605' '\e605' '\e605'}.example-ratings-3 .rating-2{z-index:5}.example-ratings-3 .rating-2:before{content:'\e605' '\e605'}.example-ratings-3 .rating-1{z-index:6}.example-ratings-3 .rating-1:before{content:'\e605'}.example-ratings-4{overflow:hidden}.example-ratings-4:before{letter-spacing:-10px;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#c7c7c7;vertical-align:top;content:'\e600' '\e600' '\e600' '\e600' '\e600';position:absolute;z-index:1;display:block}.example-ratings-4 input[type="radio"]{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-ratings-4 input[type="radio"]:focus+label:before,.example-ratings-4 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-4 label{position:absolute;display:block;cursor:pointer}.example-ratings-4 label span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-ratings-4 label:before{letter-spacing:-10px;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#ff5601;vertical-align:top;opacity:0}.example-ratings-4 label:hover:before{opacity:1}.example-ratings-4 label:hover~label:before{opacity:0}.example-ratings-4 .rating-5{z-index:2}.example-ratings-4 .rating-5:before{content:'\e600' '\e600' '\e600' '\e600' '\e600'}.example-ratings-4 .rating-4{z-index:3}.example-ratings-4 .rating-4:before{content:'\e600' '\e600' '\e600' '\e600'}.example-ratings-4 .rating-3{z-index:4}.example-ratings-4 .rating-3:before{content:'\e600' '\e600' '\e600'}.example-ratings-4 .rating-2{z-index:5}.example-ratings-4 .rating-2:before{content:'\e600' '\e600'}.example-ratings-4 .rating-1{z-index:6}.example-ratings-4 .rating-1:before{content:'\e600'}.exapmle-ratings-5 .control.rating.vote{overflow:hidden}.exapmle-ratings-5 .control.rating.vote:before{letter-spacing:-10px;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#c7c7c7;vertical-align:top;content:'\e605' '\e605' '\e605' '\e605' '\e605';position:absolute;z-index:1;display:block}.exapmle-ratings-5 .control.rating.vote input[type="radio"]{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.exapmle-ratings-5 .control.rating.vote input[type="radio"]:focus+label:before,.exapmle-ratings-5 .control.rating.vote input[type="radio"]:checked+label:before{opacity:1}.exapmle-ratings-5 .control.rating.vote label{position:absolute;display:block;cursor:pointer}.exapmle-ratings-5 .control.rating.vote label span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.exapmle-ratings-5 .control.rating.vote label:before{letter-spacing:-10px;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#ff5601;vertical-align:top;opacity:0}.exapmle-ratings-5 .control.rating.vote label:hover:before{opacity:1}.exapmle-ratings-5 .control.rating.vote label:hover~label:before{opacity:0}.exapmle-ratings-5 .control.rating.vote .rating-5{z-index:2}.exapmle-ratings-5 .control.rating.vote .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-4{z-index:3}.exapmle-ratings-5 .control.rating.vote .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-3{z-index:4}.exapmle-ratings-5 .control.rating.vote .rating-3:before{content:'\e605' '\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-2{z-index:5}.exapmle-ratings-5 .control.rating.vote .rating-2:before{content:'\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-1{z-index:6}.exapmle-ratings-5 .control.rating.vote .rating-1:before{content:'\e605'}.example-rating-summary-1{white-space:nowrap;overflow:hidden}.example-rating-summary-1 .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-1 .rating-result:before{position:absolute;z-index:1;top:0;left:0;width:100%;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#c7c7c7}.example-rating-summary-1 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-1 .rating-result>span:before{position:relative;z-index:2;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#ff5601}.example-rating-summary-1 .rating-result>span span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-rating-summary-2{white-space:nowrap;overflow:hidden}.example-rating-summary-2 .rating-result{width:154px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-2 .rating-result:before{position:absolute;z-index:1;top:0;left:0;width:100%;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#c7c7c7}.example-rating-summary-2 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-2 .rating-result>span:before{position:relative;z-index:2;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#ff5601}.example-rating-summary-2 .rating-result>span span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-rating-summary-3{white-space:nowrap;overflow:hidden}.example-rating-summary-3 .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-3 .rating-result:before{position:absolute;z-index:1;top:0;left:0;width:100%;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#aff5e3}.example-rating-summary-3 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-3 .rating-result>span:before{position:relative;z-index:2;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#0a6767}.example-rating-summary-3 .rating-result>span span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-rating-summary-4{white-space:nowrap;overflow:hidden}.example-rating-summary-4 .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-4 .rating-result:before{position:absolute;z-index:1;top:0;left:0;width:100%;display:block;font-family:'icons-blank-theme';content:'\e600' '\e600' '\e600' '\e600' '\e600';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#c7c7c7}.example-rating-summary-4 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-4 .rating-result>span:before{position:relative;z-index:2;display:block;font-family:'icons-blank-theme';content:'\e600' '\e600' '\e600' '\e600' '\e600';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#ff5601}.example-rating-summary-4 .rating-result>span span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-rating-summary-5{white-space:nowrap;overflow:hidden}.example-rating-summary-5 .label{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-rating-summary-5 .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-5 .rating-result:before{position:absolute;z-index:1;top:0;left:0;width:100%;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#c7c7c7}.example-rating-summary-5 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-5 .rating-result>span:before{position:relative;z-index:2;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#ff5601}.example-rating-summary-5 .rating-result>span span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-rating-summary-6 .rating-summary{white-space:nowrap;overflow:hidden}.example-rating-summary-6 .rating-summary .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-6 .rating-summary .rating-result:before{position:absolute;z-index:1;top:0;left:0;width:100%;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#c7c7c7}.example-rating-summary-6 .rating-summary .rating-result>span{display:block;overflow:hidden}.example-rating-summary-6 .rating-summary .rating-result>span:before{position:relative;z-index:2;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#ff5601}.example-rating-summary-6 .rating-summary .rating-result>span span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-rating-summary-7{white-space:nowrap;overflow:hidden}.example-rating-summary-7 .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-7 .rating-result:before{position:absolute;z-index:1;top:0;left:0;width:100%;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#c7c7c7}.example-rating-summary-7 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-7 .rating-result>span:before{position:relative;z-index:2;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;line-height:28px;height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;color:#ff5601}.example-rating-summary-7 .rating-result>span span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-rating-summary-7 .label{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-responsive-block{padding:10px}.example-sections-1{position:relative;z-index:1}.example-sections-1:before,.example-sections-1:after{content:"";display:table}.example-sections-1:after{clear:both}.example-sections-1>.item.title{float:left;width:auto}.example-sections-1>.item.title>.switch{display:block;height:20px;position:relative;z-index:2}.example-sections-1>.item.content{box-sizing:border-box;float:right;margin-top:20px;margin-left:-100%;width:100%}.example-sections-1>.item.content:before,.example-sections-1>.item.content:after{content:"";display:table}.example-sections-1>.item.content:after{clear:both}.example-sections-1>.item.content.active{display:block}.example-sections-1>.item.title{margin:0 5px 0 0}.example-sections-1>.item.title>.switch{font-size:1.4rem;font-weight:600;line-height:20px;color:#7d7d7d;text-decoration:none;height:20px;padding:5px 20px 5px 20px;border:1px solid #d1d1d1;background:#f0f0f0;border-bottom:0}.example-sections-1>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-1>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-1>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-1>.item.title:not(.disabled)>.switch:focus,.example-sections-1>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-1>.item.title:not(.disabled)>.switch:active,.example-sections-1>.item.title.active>.switch,.example-sections-1>.item.title.active>.switch:focus,.example-sections-1>.item.title.active>.switch:hover{background:#fff;color:#333}.example-sections-1>.item.title.active>.switch,.example-sections-1>.item.title.active>.switch:hover{padding-bottom:6px}.example-sections-1>.item.content{background:#fff;margin-top:31px;padding:20px 20px 20px 20px;border:1px solid #d1d1d1}.example-sections-2{position:relative;z-index:1}.example-sections-2:before,.example-sections-2:after{content:"";display:table}.example-sections-2:after{clear:both}.example-sections-2>.item.title{float:left;width:auto}.example-sections-2>.item.title>.switch{display:block;height:20px;position:relative;z-index:2}.example-sections-2>.item.content{box-sizing:border-box;float:right;margin-top:20px;margin-left:-100%;width:100%}.example-sections-2>.item.content:before,.example-sections-2>.item.content:after{content:"";display:table}.example-sections-2>.item.content:after{clear:both}.example-sections-2>.item.content.active{display:block}.example-sections-2>.item.title{margin:0 5px 0 0}.example-sections-2>.item.title>.switch{font-size:1.4rem;font-weight:600;line-height:20px;color:#7d7d7d;text-decoration:none;height:20px;padding:5px 20px 5px 20px;border:1px solid #d1d1d1;background:#f0f0f0;border-bottom:0}.example-sections-2>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-2>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-2>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-2>.item.title:not(.disabled)>.switch:focus,.example-sections-2>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-2>.item.title:not(.disabled)>.switch:active,.example-sections-2>.item.title.active>.switch,.example-sections-2>.item.title.active>.switch:focus,.example-sections-2>.item.title.active>.switch:hover{background:#fff;color:#333}.example-sections-2>.item.title.active>.switch,.example-sections-2>.item.title.active>.switch:hover{padding-bottom:6px}.example-sections-2>.item.content{background:#fff;margin-top:31px;padding:20px 20px 20px 20px;border:0;border-top:1px solid #d1d1d1}.example-sections-3{margin:0;padding:0}.example-sections-3>.item.title{box-sizing:border-box;float:none;width:100%}.example-sections-3>.item.title>.switch{display:block}.example-sections-3>.item.content{box-sizing:border-box;float:none;margin:0;display:block}.example-sections-3>.item.content:before,.example-sections-3>.item.content:after{content:"";display:table}.example-sections-3>.item.content:after{clear:both}.example-sections-3>.item.content.active{display:block}.example-sections-3>.item.title{margin:0 0 5px}.example-sections-3>.item.title>.switch{background:#f0f0f0;border-top:1px solid #d1d1d1;border-right:1px solid #d1d1d1;border-bottom:1px solid #d1d1d1;border-left:1px solid #d1d1d1;height:40px;padding:5px 20px 5px 20px;font-size:1.8rem;font-weight:600;line-height:40px;color:#7d7d7d;text-decoration:none}.example-sections-3>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-3>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-3>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-3>.item.title:not(.disabled)>.switch:focus,.example-sections-3>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-3>.item.title:not(.disabled)>.switch:active,.example-sections-3>.item.title.active>.switch,.example-sections-3>.item.title.active>.switch:focus,.example-sections-3>.item.title.active>.switch:hover{background:#fff;padding-bottom:5px}.example-sections-3>.item.content{background:#fff;border:1px solid #d1d1d1;margin:0 0 5px;padding:20px 20px 20px 20px}@media only screen and (max-width: 99999px){.example-sections-4{ position:relative;z-index:1}.example-sections-4:before,.example-sections-4:after{content:"";display:table}.example-sections-4:after{clear:both}.example-sections-4>.item.title{float:left;width:auto}.example-sections-4>.item.title>.switch{display:block;height:20px;position:relative;z-index:2}.example-sections-4>.item.content{box-sizing:border-box;float:right;margin-top:20px;margin-left:-100%;width:100%}.example-sections-4>.item.content:before,.example-sections-4>.item.content:after{content:"";display:table}.example-sections-4>.item.content:after{clear:both}.example-sections-4>.item.content.active{display:block}.example-sections-4>.item.title{margin:0 5px 0 0}.example-sections-4>.item.title>.switch{font-size:1.4rem;font-weight:600;line-height:20px;color:#7d7d7d;text-decoration:none;height:20px;padding:5px 20px 5px 20px;border:1px solid #d1d1d1;background:#f0f0f0;border-bottom:0}.example-sections-4>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-4>.item.title:not(.disabled)>.switch:focus,.example-sections-4>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-4>.item.title:not(.disabled)>.switch:active,.example-sections-4>.item.title.active>.switch,.example-sections-4>.item.title.active>.switch:focus,.example-sections-4>.item.title.active>.switch:hover{background:#fff;color:#333}.example-sections-4>.item.title.active>.switch,.example-sections-4>.item.title.active>.switch:hover{padding-bottom:6px}.example-sections-4>.item.content{background:#fff;margin-top:31px;padding:20px 20px 20px 20px;border:1px solid #d1d1d1}}@media only screen and (max-width: 768px){.example-sections-4{ margin:0;padding:0}.example-sections-4>.item.title{box-sizing:border-box;float:none;width:100%}.example-sections-4>.item.title>.switch{display:block}.example-sections-4>.item.content{box-sizing:border-box;float:none;margin:0;display:block}.example-sections-4>.item.content:before,.example-sections-4>.item.content:after{content:"";display:table}.example-sections-4>.item.content:after{clear:both}.example-sections-4>.item.content.active{display:block}.example-sections-4>.item.title{margin:0 0 5px}.example-sections-4>.item.title>.switch{background:#f0f0f0;border-top:1px solid #d1d1d1;border-right:1px solid #d1d1d1;border-bottom:1px solid #d1d1d1;border-left:1px solid #d1d1d1;height:40px;padding:5px 20px 5px 20px;font-size:1.8rem;font-weight:600;line-height:40px;color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-4>.item.title:not(.disabled)>.switch:focus,.example-sections-4>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-4>.item.title:not(.disabled)>.switch:active,.example-sections-4>.item.title.active>.switch,.example-sections-4>.item.title.active>.switch:focus,.example-sections-4>.item.title.active>.switch:hover{background:#fff;padding-bottom:5px}.example-sections-4>.item.content{background:#fff;border:1px solid #d1d1d1;margin:0 0 5px;padding:20px 20px 20px 20px}}.example-sections-5{position:relative;z-index:1}.example-sections-5:before,.example-sections-5:after{content:"";display:table}.example-sections-5:after{clear:both}.example-sections-5>.item.title{float:left;width:auto}.example-sections-5>.item.title>.switch{display:block;height:20px;position:relative;z-index:2}.example-sections-5>.item.content{box-sizing:border-box;float:right;margin-top:20px;margin-left:-100%;width:100%}.example-sections-5>.item.content:before,.example-sections-5>.item.content:after{content:"";display:table}.example-sections-5>.item.content:after{clear:both}.example-sections-5>.item.content.active{display:block}.example-sections-6{margin:0;padding:0}.example-sections-6>.item.title{box-sizing:border-box;float:none;width:100%}.example-sections-6>.item.title>.switch{display:block}.example-sections-6>.item.content{box-sizing:border-box;float:none;margin:0;display:block}.example-sections-6>.item.content:before,.example-sections-6>.item.content:after{content:"";display:table}.example-sections-6>.item.content:after{clear:both}.example-sections-6>.item.content.active{display:block}.example-table-1{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-1 th{text-align:left}.example-table-1>tbody>tr>th,.example-table-1>tfoot>tr>th,.example-table-1>tbody>tr>td,.example-table-1>tfoot>tr>td{vertical-align:top}.example-table-1>thead>tr>th,.example-table-1>thead>tr>td{vertical-align:bottom}.example-table-1>thead>tr>th,.example-table-1>tbody>tr>th,.example-table-1>tfoot>tr>th,.example-table-1>thead>tr>td,.example-table-1>tbody>tr>td,.example-table-1>tfoot>tr>td{padding:8px 10px}.example-table-2>thead>tr>th,.example-table-2>tbody>tr>th,.example-table-2>tfoot>tr>th{color:#111;font-weight:700}.example-table-3{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-3 th{text-align:left}.example-table-3>tbody>tr>th,.example-table-3>tfoot>tr>th,.example-table-3>tbody>tr>td,.example-table-3>tfoot>tr>td{vertical-align:top}.example-table-3>thead>tr>th,.example-table-3>thead>tr>td{vertical-align:bottom}.example-table-3>thead>tr>th,.example-table-3>tbody>tr>th,.example-table-3>tfoot>tr>th,.example-table-3>thead>tr>td,.example-table-3>tbody>tr>td,.example-table-3>tfoot>tr>td{padding:8px 10px}.example-table-3>caption{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-table-4{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-4 th{text-align:left}.example-table-4>tbody>tr>th,.example-table-4>tfoot>tr>th,.example-table-4>tbody>tr>td,.example-table-4>tfoot>tr>td{vertical-align:top}.example-table-4>thead>tr>th,.example-table-4>thead>tr>td{vertical-align:bottom}.example-table-4>thead>tr>th,.example-table-4>tbody>tr>th,.example-table-4>tfoot>tr>th,.example-table-4>thead>tr>td,.example-table-4>tbody>tr>td,.example-table-4>tfoot>tr>td{padding:8px 10px}.example-table-4>thead>tr>td,.example-table-4>tbody>tr>td,.example-table-4>tfoot>tr>td{padding:15px 25px 5px 0}.example-table-4>thead>tr>th,.example-table-4>tbody>tr>th,.example-table-4>tfoot>tr>th{padding:15px 25px 10px 0}.example-table-5{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;background:#fff}.example-table-5 th{text-align:left}.example-table-5>tbody>tr>th,.example-table-5>tfoot>tr>th,.example-table-5>tbody>tr>td,.example-table-5>tfoot>tr>td{vertical-align:top}.example-table-5>thead>tr>th,.example-table-5>thead>tr>td{vertical-align:bottom}.example-table-5>thead>tr>th,.example-table-5>tbody>tr>th,.example-table-5>tfoot>tr>th,.example-table-5>thead>tr>td,.example-table-5>tbody>tr>td,.example-table-5>tfoot>tr>td{padding:8px 10px}.example-table-5>thead{background:#ccf}.example-table-5>tfoot{background:#cff}.example-table-5>tbody>tr>td{background:#fcc}.example-table-5>tbody>tr>th{background:#ffc}.example-table-6{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;border:1px solid #d1d1d1}.example-table-6 th{text-align:left}.example-table-6>tbody>tr>th,.example-table-6>tfoot>tr>th,.example-table-6>tbody>tr>td,.example-table-6>tfoot>tr>td{vertical-align:top}.example-table-6>thead>tr>th,.example-table-6>thead>tr>td{vertical-align:bottom}.example-table-6>thead>tr>th,.example-table-6>tbody>tr>th,.example-table-6>tfoot>tr>th,.example-table-6>thead>tr>td,.example-table-6>tbody>tr>td,.example-table-6>tfoot>tr>td{padding:8px 10px}.example-table-6>thead>tr>th,.example-table-6>tbody>tr>th,.example-table-6>tfoot>tr>th,.example-table-6>thead>tr>td,.example-table-6>tbody>tr>td,.example-table-6>tfoot>tr>td{border:1px solid #d1d1d1}.example-table-7{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-7 th{text-align:left}.example-table-7>tbody>tr>th,.example-table-7>tfoot>tr>th,.example-table-7>tbody>tr>td,.example-table-7>tfoot>tr>td{vertical-align:top}.example-table-7>thead>tr>th,.example-table-7>thead>tr>td{vertical-align:bottom}.example-table-7>thead>tr>th,.example-table-7>tbody>tr>th,.example-table-7>tfoot>tr>th,.example-table-7>thead>tr>td,.example-table-7>tbody>tr>td,.example-table-7>tfoot>tr>td{padding:8px 10px}.example-table-7>thead>tr>th,.example-table-7>tbody>tr>th,.example-table-7>tfoot>tr>th,.example-table-7>thead>tr>td,.example-table-7>tbody>tr>td,.example-table-7>tfoot>tr>td{border-top:1px solid #d1d1d1}.example-table-7>caption+thead>tr:first-child>th,.example-table-7>colgroup+thead>tr:first-child>th,.example-table-7>thead:first-child>tr:first-child>th,.example-table-7>caption+thead>tr:first-child>td,.example-table-7>colgroup+thead>tr:first-child>td,.example-table-7>thead:first-child>tr:first-child>td{border-top:0}.example-table-7>tbody+tbody{border-top:1px solid #d1d1d1}.example-table-8{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-8 th{text-align:left}.example-table-8>tbody>tr>th,.example-table-8>tfoot>tr>th,.example-table-8>tbody>tr>td,.example-table-8>tfoot>tr>td{vertical-align:top}.example-table-8>thead>tr>th,.example-table-8>thead>tr>td{vertical-align:bottom}.example-table-8>thead>tr>th,.example-table-8>tbody>tr>th,.example-table-8>tfoot>tr>th,.example-table-8>thead>tr>td,.example-table-8>tbody>tr>td,.example-table-8>tfoot>tr>td{padding:8px 10px}.example-table-8>thead>tr>th,.example-table-8>tbody>tr>th,.example-table-8>tfoot>tr>th,.example-table-8>thead>tr>td,.example-table-8>tbody>tr>td,.example-table-8>tfoot>tr>td{border-left:1px solid #d1d1d1}.example-table-8>thead>tr>th:first-child,.example-table-8>tbody>tr>th:first-child,.example-table-8>tfoot>tr>th:first-child,.example-table-8>thead>tr>td:first-child,.example-table-8>tbody>tr>td:first-child,.example-table-8>tfoot>tr>td:first-child{border-left:0}.example-table-9{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;border:0}.example-table-9 th{text-align:left}.example-table-9>tbody>tr>th,.example-table-9>tfoot>tr>th,.example-table-9>tbody>tr>td,.example-table-9>tfoot>tr>td{vertical-align:top}.example-table-9>thead>tr>th,.example-table-9>thead>tr>td{vertical-align:bottom}.example-table-9>thead>tr>th,.example-table-9>tbody>tr>th,.example-table-9>tfoot>tr>th,.example-table-9>thead>tr>td,.example-table-9>tbody>tr>td,.example-table-9>tfoot>tr>td{padding:8px 10px}.example-table-9>thead>tr>th,.example-table-9>tbody>tr>th,.example-table-9>tfoot>tr>th,.example-table-9>thead>tr>td,.example-table-9>tbody>tr>td,.example-table-9>tfoot>tr>td{border:0}.example-table-9>thead>tr>th,.example-table-9>thead>tr>td{border-bottom:1px solid #d1d1d1}.example-table-10{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;border:0}.example-table-10 th{text-align:left}.example-table-10>tbody>tr>th,.example-table-10>tfoot>tr>th,.example-table-10>tbody>tr>td,.example-table-10>tfoot>tr>td{vertical-align:top}.example-table-10>thead>tr>th,.example-table-10>thead>tr>td{vertical-align:bottom}.example-table-10>thead>tr>th,.example-table-10>tbody>tr>th,.example-table-10>tfoot>tr>th,.example-table-10>thead>tr>td,.example-table-10>tbody>tr>td,.example-table-10>tfoot>tr>td{padding:8px 10px}.example-table-10>thead>tr>th,.example-table-10>tbody>tr>th,.example-table-10>tfoot>tr>th,.example-table-10>thead>tr>td,.example-table-10>tbody>tr>td,.example-table-10>tfoot>tr>td{border:0}.example-table-11{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-11 th{text-align:left}.example-table-11>tbody>tr>th,.example-table-11>tfoot>tr>th,.example-table-11>tbody>tr>td,.example-table-11>tfoot>tr>td{vertical-align:top}.example-table-11>thead>tr>th,.example-table-11>thead>tr>td{vertical-align:bottom}.example-table-11>thead>tr>th,.example-table-11>tbody>tr>th,.example-table-11>tfoot>tr>th,.example-table-11>thead>tr>td,.example-table-11>tbody>tr>td,.example-table-11>tfoot>tr>td{padding:8px 10px}.example-table-11>tbody>tr:nth-child(even)>td,.example-table-11>tbody>tr:nth-child(even)>th{background:#ffc;color:#000}.example-table-12{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-12 th{text-align:left}.example-table-12>tbody>tr>th,.example-table-12>tfoot>tr>th,.example-table-12>tbody>tr>td,.example-table-12>tfoot>tr>td{vertical-align:top}.example-table-12>thead>tr>th,.example-table-12>thead>tr>td{vertical-align:bottom}.example-table-12>thead>tr>th,.example-table-12>tbody>tr>th,.example-table-12>tfoot>tr>th,.example-table-12>thead>tr>td,.example-table-12>tbody>tr>td,.example-table-12>tfoot>tr>td{padding:8px 10px}.example-table-12>tbody>tr:nth-child(even):hover>td,.example-table-12>tbody>tr:nth-child(even):hover>th{background:#f0f0f0}.example-table-12>tbody>tr:nth-child(odd):hover>td,.example-table-12>tbody>tr:nth-child(odd):hover>th{background:#f0f0f0}.example-table-13{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;border:1px solid #d1d1d1}.example-table-13 th{text-align:left}.example-table-13>tbody>tr>th,.example-table-13>tfoot>tr>th,.example-table-13>tbody>tr>td,.example-table-13>tfoot>tr>td{vertical-align:top}.example-table-13>thead>tr>th,.example-table-13>thead>tr>td{vertical-align:bottom}.example-table-13>thead>tr>th,.example-table-13>tbody>tr>th,.example-table-13>tfoot>tr>th,.example-table-13>thead>tr>td,.example-table-13>tbody>tr>td,.example-table-13>tfoot>tr>td{padding:8px 10px}.example-table-13>thead>tr>th,.example-table-13>tbody>tr>th,.example-table-13>tfoot>tr>th,.example-table-13>thead>tr>td,.example-table-13>tbody>tr>td,.example-table-13>tfoot>tr>td{border:1px solid #d1d1d1}.example-table-13>tbody>tr:nth-child(odd)>td,.example-table-13>tbody>tr:nth-child(odd)>th{background:#fff}.example-table-13>tbody>tr:nth-child(even):hover>td,.example-table-13>tbody>tr:nth-child(even):hover>th{background:#f0f0f0}.example-table-13>tbody>tr:nth-child(odd):hover>td,.example-table-13>tbody>tr:nth-child(odd):hover>th{background:#f0f0f0}@media only screen and (max-width: 768px){.example-table-14{ width:100%;overflow-y:hidden;overflow-x:auto;-ms-overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}}.example-table-15{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;border:1px solid #d1d1d1}.example-table-15 th{text-align:left}.example-table-15>tbody>tr>th,.example-table-15>tfoot>tr>th,.example-table-15>tbody>tr>td,.example-table-15>tfoot>tr>td{vertical-align:top}.example-table-15>thead>tr>th,.example-table-15>thead>tr>td{vertical-align:bottom}.example-table-15>thead>tr>th,.example-table-15>tbody>tr>th,.example-table-15>tfoot>tr>th,.example-table-15>thead>tr>td,.example-table-15>tbody>tr>td,.example-table-15>tfoot>tr>td{padding:8px 10px}.example-table-15>thead>tr>th,.example-table-15>tbody>tr>th,.example-table-15>tfoot>tr>th,.example-table-15>thead>tr>td,.example-table-15>tbody>tr>td,.example-table-15>tfoot>tr>td{border:1px solid #d1d1d1}.example-table-15>tbody>tr:nth-child(odd)>td,.example-table-15>tbody>tr:nth-child(odd)>th{background:#fff}.example-table-15>tbody>tr:nth-child(even):hover>td,.example-table-15>tbody>tr:nth-child(even):hover>th{background:#f0f0f0}.example-table-15>tbody>tr:nth-child(odd):hover>td,.example-table-15>tbody>tr:nth-child(odd):hover>th{background:#f0f0f0}@media only screen and (max-width: 768px){.example-table-15{ border:0;display:block;background:#cff}.example-table-15>tbody>tr:nth-child(odd)>td,.example-table-15>tbody>tr:nth-child(odd)>th{background:#cff}.example-table-15>tbody>tr:nth-child(even):hover>td,.example-table-15>tbody>tr:nth-child(even):hover>th{background:#cff}.example-table-15>tbody>tr:nth-child(odd):hover>td,.example-table-15>tbody>tr:nth-child(odd):hover>th{background:#cff}.example-table-15>thead>tr>th{display:none}.example-table-15>tbody{display:block}.example-table-15>tbody>tr{display:block}.example-table-15>tbody>tr td,.example-table-15>tbody>tr th{border-bottom:0;display:block;padding:5px 0}.example-table-15>tbody>tr td:before,.example-table-15>tbody>tr th:before{content:attr(data-th) ":";display:inline-block;padding-right:10px;color:#111;font-weight:700}.example-table-15>tbody>tr td{background:#cff}.example-table-15>tbody>tr>th{background-color:#ffc!important}}.example-tooltip-bottom{position:relative}.example-tooltip-bottom .tooltip-content{z-index:100;background:#fff;min-width:210px;max-width:360px;padding:12px 16px;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;top:100%;left:0;margin-top:5px}.example-tooltip-bottom .tooltip-content:after,.example-tooltip-bottom .tooltip-content:before{border:solid transparent;content:'';height:0;width:0;position:absolute}.example-tooltip-bottom .tooltip-content:after{border-color:transparent;border-width:5px}.example-tooltip-bottom .tooltip-content:before{border-color:transparent;border-width:6px}.example-tooltip-bottom .tooltip-content:after,.example-tooltip-bottom .tooltip-content:before{bottom:100%}.example-tooltip-bottom .tooltip-content:after{border-bottom-color:#fff;margin-left:-5px;left:15px}.example-tooltip-bottom .tooltip-content:before{border-bottom-color:#bbb;margin-left:-6px;left:15px}.example-tooltip-bottom .tooltip-toggle{cursor:help}.example-tooltip-bottom .tooltip-toggle:hover+.tooltip-content,.example-tooltip-bottom .tooltip-toggle:focus+.tooltip-content,.example-tooltip-bottom:hover .tooltip-content{display:block}.example-tooltip-left{position:relative}.example-tooltip-left .tooltip-content{z-index:100;background:#fff;min-width:210px;max-width:360px;padding:12px 16px;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;right:100%;top:0;margin-right:5px}.example-tooltip-left .tooltip-content:after,.example-tooltip-left .tooltip-content:before{border:solid transparent;content:'';height:0;width:0;position:absolute}.example-tooltip-left .tooltip-content:after{border-color:transparent;border-width:5px}.example-tooltip-left .tooltip-content:before{border-color:transparent;border-width:6px}.example-tooltip-left .tooltip-content:after,.example-tooltip-left .tooltip-content:before{left:100%}.example-tooltip-left .tooltip-content:after{border-left-color:#fff;margin-top:-5px;top:15px}.example-tooltip-left .tooltip-content:before{border-left-color:#bbb;margin-top:-6px;top:15px}.example-tooltip-left .tooltip-toggle{cursor:help}.example-tooltip-left .tooltip-toggle:hover+.tooltip-content,.example-tooltip-left .tooltip-toggle:focus+.tooltip-content,.example-tooltip-left:hover .tooltip-content{display:block}.example-tooltip-right{position:relative}.example-tooltip-right .tooltip-content{z-index:100;background:#fff;min-width:210px;max-width:360px;padding:12px 16px;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;left:100%;top:0;margin-left:5px}.example-tooltip-right .tooltip-content:after,.example-tooltip-right .tooltip-content:before{border:solid transparent;content:'';height:0;width:0;position:absolute}.example-tooltip-right .tooltip-content:after{border-color:transparent;border-width:5px}.example-tooltip-right .tooltip-content:before{border-color:transparent;border-width:6px}.example-tooltip-right .tooltip-content:after,.example-tooltip-right .tooltip-content:before{right:100%}.example-tooltip-right .tooltip-content:after{border-right-color:#fff;margin-top:-5px;top:15px}.example-tooltip-right .tooltip-content:before{border-right-color:#bbb;margin-top:-6px;top:15px}.example-tooltip-right .tooltip-toggle{cursor:help}.example-tooltip-right .tooltip-toggle:hover+.tooltip-content,.example-tooltip-right .tooltip-toggle:focus+.tooltip-content,.example-tooltip-right:hover .tooltip-content{display:block}.example-tooltip-top{position:relative}.example-tooltip-top .tooltip-content{z-index:100;background:#fff;min-width:210px;max-width:360px;padding:12px 16px;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;bottom:100%;left:0;margin-bottom:5px}.example-tooltip-top .tooltip-content:after,.example-tooltip-top .tooltip-content:before{border:solid transparent;content:'';height:0;width:0;position:absolute}.example-tooltip-top .tooltip-content:after{border-color:transparent;border-width:5px}.example-tooltip-top .tooltip-content:before{border-color:transparent;border-width:6px}.example-tooltip-top .tooltip-content:after,.example-tooltip-top .tooltip-content:before{top:100%}.example-tooltip-top .tooltip-content:after{border-top-color:#fff;margin-left:-5px;left:15px}.example-tooltip-top .tooltip-content:before{border-top-color:#bbb;margin-left:-6px;left:15px}.example-tooltip-top .tooltip-toggle{cursor:help}.example-tooltip-top .tooltip-toggle:hover+.tooltip-content,.example-tooltip-top .tooltip-toggle:focus+.tooltip-content,.example-tooltip-top:hover .tooltip-content{display:block}html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body{font-size:1.4rem;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:normal;line-height:1.42857143}p{margin-top:0rem;margin-bottom:1rem}abbr[title]{cursor:help;border-bottom:1px dotted #d1d1d1}b,strong{font-weight:700}em,i{font-style:italic}mark{background:#f0f0f0;color:#000}small,.small{font-size:12px}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #d1d1d1}sub,sup{font-size:71.42857143%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dfn{font-style:italic}h1{font-size:4rem;font-weight:300;line-height:1.1;margin-top:0rem;margin-bottom:2rem}h2{font-size:2.6rem;font-weight:300;line-height:1.1;margin-top:2.5rem;margin-bottom:2rem}h3{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}h4{font-size:1.4rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h5{font-size:1.2rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h6{font-size:1rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small{font-size:71.42857143%;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:normal;line-height:1}a,.alink{color:#1979c3;text-decoration:none}a:visited,.alink:visited{color:#800080;text-decoration:none}a:hover,.alink:hover{color:#006bb4;text-decoration:underline}a:active,.alink:active{color:#ff5501;text-decoration:underline}ul,ol{margin-top:0rem;margin-bottom:2.5rem}ul>li,ol>li{margin-top:0rem;margin-bottom:1rem}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}dl{margin-top:0;margin-bottom:20px}dt{font-weight:700;margin-top:0;margin-bottom:5px}dd{margin-top:0;margin-bottom:10px;margin-left:0}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,'Courier New',monospace}code{background:#f0f0f0;color:#111;font-size:1.2rem;padding:2px 4px;white-space:nowrap}kbd{background:#f0f0f0;color:#111;padding:2px 4px;font-size:1.2rem}pre{background:#f0f0f0;border:1px solid #d1d1d1;color:#111;display:block;font-size:1.2rem;margin:0 0 10px;line-height:1.42857143;padding:10px;word-break:break-all;word-wrap:break-word}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}blockquote{margin:0 0 20px 40px;padding:0;font-size:1.4rem;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:italic;line-height:1.42857143;border-left:0 solid #d1d1d1}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{color:#333;display:block;font-size:1rem;line-height:1.42857143}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote cite{font-style:normal}blockquote:before,blockquote:after{content:""}q{quotes:none}q:before,q:after{content:'';content:none}cite{font-style:normal}.example{font-size:2.5rem}.example-line-height{line-height:3rem}.example-word-wrap{word-break:break-all;word-break:break-word;word-wrap:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto;background:#ccc;width:120px}.example-text-overflow{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;background:#ccc;width:120px}.example-text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.example-hyphens{word-wrap:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto}.example-hyphens-none{word-wrap:break-word;-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none}.example-typography{font-size:3rem;color:#fc0;font-family:Menlo,Monaco,Consolas,'Courier New',monospace;font-weight:500;font-style:italic;line-height:1.2}.example-list-reset-styles{margin:0;padding:0;list-style:none none}.example-list-inline{margin:0;padding:0;list-style:none none}.example-list-inline>li{display:inline-block;vertical-align:top}.example-link-default{color:#1979c3;text-decoration:none}.example-link-default:visited{color:#800080;text-decoration:none}.example-link-default:hover{color:#006bb4;text-decoration:underline}.example-link-default:active{color:#ff5501;text-decoration:underline}.example-link{color:#008000;text-decoration:none}.example-link:visited{color:#800080;text-decoration:none}.example-link:hover{color:#ffa500;text-decoration:none}.example-link:active{color:#ff5501;text-decoration:underline}.example-heading{font-size:4rem;font-weight:300;line-height:1.1;margin-top:0rem;margin-bottom:2rem}.example-heading-2{font-size:2.6rem;font-weight:300;line-height:1.1;margin-top:2.5rem;margin-bottom:2rem}html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body{font-size:1.4rem;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:normal;line-height:1.42857143}p{margin-top:0rem;margin-bottom:1rem}abbr[title]{cursor:help;border-bottom:1px dotted #d1d1d1}b,strong{font-weight:700}em,i{font-style:italic}mark{background:#f0f0f0;color:#000}small,.small{font-size:12px}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #d1d1d1}sub,sup{font-size:71.42857143%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dfn{font-style:italic}h1{font-size:4rem;font-weight:300;line-height:1.1;margin-top:0rem;margin-bottom:2rem}h2{font-size:2.6rem;font-weight:300;line-height:1.1;margin-top:2.5rem;margin-bottom:2rem}h3{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}h4{font-size:1.4rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h5{font-size:1.2rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h6{font-size:1rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small{font-size:71.42857143%;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:normal;line-height:1}a,.alink{color:#1979c3;text-decoration:none}a:visited,.alink:visited{color:#800080;text-decoration:none}a:hover,.alink:hover{color:#006bb4;text-decoration:underline}a:active,.alink:active{color:#ff5501;text-decoration:underline}ul,ol{margin-top:0rem;margin-bottom:2.5rem}ul>li,ol>li{margin-top:0rem;margin-bottom:1rem}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}dl{margin-top:0;margin-bottom:20px}dt{font-weight:700;margin-top:0;margin-bottom:5px}dd{margin-top:0;margin-bottom:10px;margin-left:0}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,'Courier New',monospace}code{background:#f0f0f0;color:#111;font-size:1.2rem;padding:2px 4px;white-space:nowrap}kbd{background:#f0f0f0;color:#111;padding:2px 4px;font-size:1.2rem}pre{background:#f0f0f0;border:1px solid #d1d1d1;color:#111;display:block;font-size:1.2rem;margin:0 0 10px;line-height:1.42857143;padding:10px;word-break:break-all;word-wrap:break-word}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}blockquote{margin:0 0 20px 40px;padding:0;font-size:1.4rem;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:italic;line-height:1.42857143;border-left:0 solid #d1d1d1}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{color:#333;display:block;font-size:1rem;line-height:1.42857143}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote cite{font-style:normal}blockquote:before,blockquote:after{content:""}q{quotes:none}q:before,q:after{content:'';content:none}cite{font-style:normal}.example-clearfix-container-1{border:1px solid red}.example-clearfix-container-2{border:1px solid #0f0}.example-clearfix-container-2:before,.example-clearfix-container-2:after{content:"";display:table}.example-clearfix-container-2:after{clear:both}.example-clearfix-item.left{float:left}.example-clearfix-item.right{float:right}.example-visibility-hidden{visibility:hidden;height:0}.example-visually-hidden-1{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-visually-hidden-2{background:#fdf0d5;padding:5px;position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}.example-visually-hidden-2{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.example-css-container{padding:20px;background:#e8e8e8}.example-rotate{background:red;position:absolute;height:20px;width:40px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.example-placeholder::-webkit-input-placeholder{color:#808080;font-weight:700}.example-placeholder:-moz-placeholder{color:#808080;font-weight:700}.example-placeholder::-moz-placeholder{color:#808080;font-weight:700}.example-placeholder:-ms-input-placeholder{color:#808080;font-weight:700}.example-background-gradient-1{background-color:#ccf;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #cff 0, #ccf 100%);background-image:linear-gradient(to bottom, #cff 0, #ccf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ccffff', endColorstr='#ccccff', GradientType=0)}.example-background-gradient-2{background-color:#ccf;background-repeat:repeat-x;background-image:-webkit-linear-gradient(left,color-stop( #cff 0),color-stop( #ccf 100%));background-image:linear-gradient(to right, #cff 0, #ccf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ccffff', endColorstr='#ccccff', GradientType=1)}body{padding:15px;background-image:none}</style></head><body><nav class="bar top cf"><div class="container"><a href="index.html" class="brand">Magento UI Library</a><ul class="menu"><li><a href="#" data-toggle="dropdown-1" unselectable="on" class="dropdown-toggle">files</a><ul id="dropdown-1" hidden class="dropdown"><li><a href="actions-toolbar.html">actions-toolbar</a></li><li><a href="breadcrumbs.html">breadcrumbs</a></li><li><a href="buttons.html">buttons</a></li><li><a href="docs.html">docs</a></li><li><a href="dropdowns.html">dropdowns</a></li><li><a href="forms.html">forms</a></li><li><a href="icons.html">icons</a></li><li><a href="layout.html">layout</a></li><li><a href="lib.html">lib</a></li><li><a href="loaders.html">loaders</a></li><li><a href="messages.html">messages</a></li><li><a href="pages.html">pages</a></li><li><a href="popups.html">popups</a></li><li><a href="rating.html">rating</a></li><li><a href="resets.html">resets</a></li><li><a href="responsive.html">responsive</a></li><li><a href="sections.html">sections</a></li><li><a href="tables.html">tables</a></li><li><a href="tooltips.html">tooltips</a></li><li><a href="typography.html">typography</a></li><li><a href="utilities.html">utilities</a></li><li><a href="variables.html">variables</a></li></ul></li></ul><div class="nav"><button title="Table of Contents" data-toggle="nav-toc"><svg viewBox="0 0 512 512" height="22" width="22" class="icon"><path d="M108.9,403.1V462H50v-58.9H108.9z M108.9,285.4H50v58.9h58.9V285.4zM108.9,50H50v58.9h58.9V50z M108.9,167.7H50v58.9h58.9V167.7z M167.7,344.3H462v-58.9H167.7V344.3zM167.7,50v58.9H462V50H167.7z M167.7,462H462v-58.9H167.7V462z M167.7,226.6H462v-58.9H167.7V226.6z"></path></svg></button><input type="search" placeholder="Search" class="search"></div></div></nav><section class="container"><article id="utilities" class="section"><div class="docs"><a href="#utilities" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="utilities">Utilities</h1>
+</title><meta charset="utf-8"><style>*{-moz-box-sizing:border-box;box-sizing:border-box;margin:0;padding:0;border:0}body{padding:60px 0 40px;background-color:hsl(207,10%,90%);color:hsl(207,5%,30%)}.container{max-width:1300px;margin:0 auto;padding:0 20px}.section{position:relative;margin-bottom:20px}.docs{position:relative;z-index:2;width:68%;min-height:200px;background-color:hsl(207,0%,100%);background-clip:padding-box;border:1px solid hsla(207,5%,5%,.1);border-radius:5px;box-shadow:0 0 3px hsla(207,5%,5%,.1)}.code{position:absolute;top:5px;bottom:5px;right:0;z-index:1;width:33%;padding:10px 10px 10px 20px;border-radius:0 5px 5px 0;border:1px solid hsla(207,20%,10%,.1);background-color:hsla(207,20%,95%,.9);background-clip:padding-box;opacity:.5;-webkit-transition:opacity .4s;-moz-transition:opacity .4s;-o-transition:opacity .4s;transition:opacity .4s}.code:hover{opacity:1}.preview{background:hsl(207,0%,100%);border-top:1px solid hsl(207,30%,95%);position:relative;z-index:1}.preview-code+.preview{margin-top:0;border-top:0}.preview iframe{display:block;width:100%;height:100%;overflow:hidden}.preview-code{position:relative;z-index:2;display:block;width:100%;color:hsl(207,9%,37%);max-height:200px;padding:10px 20px;overflow-y:auto;background:hsl(207,30%,95%);border:1px solid hsl(207,30%,85%);border-left:0;border-right;box-shadow:inset 0 1px 2px hsla(207,30%,10%,.1);line-height:1.1!important;resize:none}.preview-code:focus{outline:0;background:hsl(207,30%,97%);box-shadow:inset 0 1px 2px hsla(207,30%,10%,.1),0 0 5px hsla(207,75%,75%,.9)}.preview-code:last-child{border-bottom:0;border-radius:0 0 5px 5px}.resizeable{padding:15px;overflow:auto;background:hsl(207,0%,100%);box-shadow:0 0 2px hsla(207,10%,20%,.2);resize:both}.preview-code,pre{white-space:pre-wrap;word-wrap:break-word;overflow-y:auto}.code pre{height:100%;margin-top:0}.bar{position:fixed;left:0;right:0;z-index:1010;min-height:40px;line-height:40px;background-image:-webkit-linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92));background-image:-moz-linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92));background-image:-o-linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92));background-image:linear-gradient(hsla(207,10%,35%,.97),hsla(207,5%,25%,.92))}.bar.top{top:0;box-shadow:0 1px 2px hsla(207,5%,0%,.2)}.bar.bottom{bottom:0;box-shadow:0 -1px 2px hsla(207,5%,0%,.2)}.bar ul{margin:0!important}.bar li{display:block;list-style:none}.bar .icon path{fill:hsla(27,10%,75%,.75)}.docs .icon path{fill:hsla(207,10%,75%,.5)}.docs .permalink:hover .icon path{fill:hsl(207,10%,75%)}.bar button{color:hsla(27,10%,75%,.75)}.bar button:hover .icon path,.bar button.is-active .icon path{fill:hsl(27,10%,85%)}.bar button:hover,.bar button.is-active{color:hsl(27,10%,85%)}.bar .icon{vertical-align:middle;display:inline-block}.bar,.bar a,.bar a:visited{color:hsl(27,10%,85%);text-shadow:1px 1px 0 hsla(27,5%,0%,.5)}.bar a:hover,.bar a.is-active{color:hsl(27,10%,95%);text-shadow:1px 1px 0 hsla(27,5%,0%,1);text-decoration:none}.brand{float:left;margin-right:20px;font-weight:700;font-size:16px;text-decoration:none}.brand,a.brand,a.brand:visited{color:hsl(27,5%,5%);text-shadow:1px 1px 0 hsla(27,5%,100%,.2)}.brand:hover,a.brand:hover{color:hsl(27,5%,0%);text-shadow:1px 1px 0 hsla(27,5%,100%,.3);text-decoration:none}.menu{font-size:12px}.menu>li{float:left;position:relative}.menu a{display:block;margin-right:15px}.dropdown-toggle{position:relative;padding-right:15px}.dropdown-toggle:after{display:block;position:absolute;right:0;top:18px;content:'';border:4px solid;border-left-color:transparent;border-right-color:transparent;border-bottom-color:transparent}.nav-results,.dropdown{position:absolute;z-index:1020;top:32px;left:-16px;width:175px;max-height:500px;padding:10px 0;overflow-y:auto;word-wrap:break-word;font-size:11px;line-height:20px;background-color:hsla(207,10%,25%,.97);border:1px solid hsla(207,5%,70%,.3);border-radius:3px;box-shadow:0 0 3px hsla(207,5%,0%,.2)}.toc-list{width:200px}.nav-results{right:0;width:200px;left:auto;padding:5px 0}.nav-results-filename{display:block;font-size:10px;opacity:.75}.nav-results a{display:block;line-height:15px;padding:5px 10px}.nav-results li:not([hidden])~li a{border-top:1px solid hsla(27,10%,90%,.1)}.dropdown a{padding:0 15px}.dropdown li:hover{background-color:hsl(207,10%,22%)}.nav{float:right;position:relative}.nav input[type="search"]{padding:2px 4px;color:#fff;width:150px;border:1px solid hsla(207,5%,0%,.3);background:hsla(207,12%,40%,.9);box-shadow:inset 1px 1px 3px hsla(207,5%,0%,.05),1px 1px 0 hsla(207,5%,100%,.05);border-radius:10px;-webkit-appearance:textfield}.nav input[type="search"]:focus{outline:0;background:hsla(207,7%,45%,.9)}.settings{text-align:center}.bar button{display:inline-block;vertical-align:middle;padding:0 5px;margin:0 3px;background:transparent}.bar button:first-child{margin-left:0}.settings .auto{line-height:32px;font-size:11px;font-weight:700;letter-spacing:-1px;text-shadow:none;text-transform:uppercase}body{font-family:sans-serif;font-size:14px;line-height:1.618}.docs pre,p,ol,ul,dl,figure,blockquote,table{margin-left:20px;margin-right:20px}.preview,.docs pre,p,ol,ul,dl,figure,blockquote,table{margin-top:10px}ul ul,ol ol,ul ol,ol ul,blockquote p:last-child{margin-top:0}ul,ol{padding-left:1.5em}p:last-child,ol:last-child,ul:last-child,dl:last-child{margin-bottom:20px}hr,h1,h2,h3,h4,h5,h6{margin:1em 20px .5em}h1:first-of-type{margin-top:20px}h1,h2,h3,h4,h5,h6{line-height:1.2;color:hsl(207,10%,50%)}h1 a,h1 a:hover,h1 a:visited{color:inherit;text-decoration:inherit}h1{font-size:3.052em;font-weight:400;color:hsl(207,10%,45%)}h2{font-size:1.953em}h3{font-size:1.536em}h1,h2,h3{letter-spacing:-.025em}h4{font-size:1.25em}h5{font-size:1em;text-transform:uppercase}h6{font-size:1em}.permalink{position:absolute;top:15px;right:15px}a{color:hsl(207,90%,50%);text-decoration:none}a:hover{color:hsl(207,95%,40%);text-decoration:underline}a:visited{color:hsl(207,100%,35%)}.preview-code,pre,code,var{font-style:normal;font-family:"Ubuntu Mono","Andale Mono","DejaVu Sans Mono","Monaco","Bitstream Vera Sans Mono","Consolas","Lucida Console",monospace;font-size:12px}.docs pre,code,var{padding:.1em 3px;background:hsla(207,5%,0%,.025);border:1px solid hsla(207,5%,0%,.05);border-radius:3px}.code pre{line-height:1.1!important}pre code{padding:0;background:transparent;border:0}.cf:before,.cf:after{content:'';display:table}.cf:after{clear:both}[unselectable="on"]{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}[hidden]{display:none!important}small{font-size:85%;opacity:.9}.docs .vars_list{width:100%}.docs .vars_list th,.docs .vars_list td{width:33%}.docs pre th{text-align:left}.docs pre table{border-collapse:collapse;margin:0}.docs th,.docs td{border:0;padding:9px 10px 9px 0;vertical-align:top}.docs tr th:last-child,.docs tr td:last-child{padding-right:0}.docs pre th{font-weight:400}.docs pre th.vars_head{border-bottom:1px solid #e5e5e5;color:#707070;white-space:nowrap}.docs pre th.vars_section{border-bottom:1px solid #e5e5e5;color:#333;font-size:18px;padding-top:30px}.vars_value{color:#338bb8}.docs li p{margin:0 0 20px}.dropdown a{text-transform:capitalize}#default-button #default-button-big+.preview+.preview-code{display:block}#actions-toolbar-alignment .preview-code,#reverse-primary-and-secondary-blocks .preview-code,#actions-toolbar-indents-customizations .preview-code,#actionstoolbarclearfloats-mixin .preview-code,#responsive-actions-toolbar .preview-code,#button-with-gradient-background .preview-code,#primary-button .preview-code,#button-as-an-icon .preview-code,#button-with-an-icon-on-the-left-or-right-side-of-the-text .preview-code,#button-with-fixed-width .preview-code,#button-as-a-link .preview-code,#link-as-a-button .preview-code,#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol .preview-code,#breadcrumbs-with-solid-background .preview-code,#pagination-without-label-with-solid-background .preview-code,#pagination-with-label-and-text-previousnext-links .preview-code,#pagination-with-label-and-gradient-background-on-links .preview-code,#fixed-height-popup .preview-code,#fixed-content-height-popup .preview-code,#margins-for-header-content-and-footer-block-in-popup .preview-code,#popup-titles-with-styled-as-theme-headings .preview-code,#popup-action-toolbar .preview-code,#popup-close-button-without-an-icon .preview-code,#modify-icon-of-popup-close-button .preview-code,#modify-overlay-styles .preview-code,#rating-summary-multiple-ratings .preview-code,#rating-summary-hide-label .preview-code,#rating-summary-icons-symbol .preview-code,#rating-summary-icons-color .preview-code,#rating-summary-set-number-of-icons .preview-code,#rating-summary .preview-code,#rating-with-vote-icon-symbol .preview-code,#rating-with-vote-setup-icons-colors .preview-code,#rating-with-vote-setup-number-of-icons .preview-code,#tabs-with-content-top-border .preview-code,#accordion-mixin-variables .preview-code,#tabs-base .preview-code,#accordion-base .preview-code,#warning-message .preview-code,#error-message .preview-code,#success-message .preview-code,#notice-message .preview-code,#message-with-inner-icon .preview-code,#message-with-lateral-icon .preview-code,#custom-message-style .preview-code,#modify-dropdown-list-styles .preview-code,#dropdown-with-icon-customization .preview-code,#split-button-button-styling .preview-code,#split-button-icon-customization .preview-code,#split-button-dropdown-list-customization .preview-code,#table-cells-resize .preview-code,#table-caption .preview-code,#table-typography .preview-code,#table-background-customization .preview-code,#table-borders-customization .preview-code,#table-without-borders .preview-code,#table-with-horizontal-borders .preview-code,#table-with-vertical-borders .preview-code,#striped-table .preview-code,#responsive-table-technics-1 .preview-code,#responsive-table-technics-2 .preview-code,#fontsize-mixin .preview-code,#word-breaking-mixin .preview-code,#word-breaking-mixin .preview-code,#text-overflow-mixin .preview-code,#text-hide .preview-code,#hyphens .preview-code,#font-style-and-color .preview-code,#reset-list-styles .preview-code,#inlineblock-list-item-styling .preview-code,#link-styling-mixin .preview-code,#heading-styling-mixin .preview-code,#icon-with-image-or-sprite .preview-code,#change-the-size-of-font-icon .preview-code,#sprite-and-font-icons-for-blank-theme .preview-code,#icon-position-for-an-icon-with-image-or-sprite .preview-code{display:none}article[id$="-variables"] .docs,#resets .docs,#ratings .docs,#tabs-and-accordions .docs,#messages .docs,#dropdown-and-split-buttons-mixins .docs,#font-face-mixin .docs,#layout .docs,#forms-mixins .docs,#including-magento-ui-library-to-your-theme .docs,#global-forms-elements-customization .docs,#mobile-off-canvas-navigation .docs,#desktop-navigation .docs,#utilities .docs,#layout-width .docs,#responsive-breakpoints .docs,#responsive-mixins-usage .docs{width:100%}article[id$="-variables"] .code{display:none}article[id$="-variables"] .docs pre{background:#fff;border:0;margin-top:0}</style><script type="text/preview">(function(){"use strict";var a=function(a){return Array.prototype.slice.call(a)},b=document.getElementsByTagName("body")[0],c=["link","visited","hover","active","focus","target","enabled","disabled","checked"],d=new RegExp(":(("+c.join(")|(")+"))","gi"),e=a(document.styleSheets).map(function(b){return a(b.cssRules).filter(function(a){return a.selectorText&&a.selectorText.match(d)}).map(function(a){return a.cssText.replace(d,".\\3A $1")}).join("")}).join("");if(e.length){var f=document.createElement("style");f.innerText=e;var g=document.getElementsByTagName("style")[0];g.parentNode.insertBefore(f,g)}var h=function(){var a=window.getComputedStyle(b,null);return function(){if(b.childElementCount===0)return b.offsetHeight;var c=b.getElementsByTagName("*"),d=[];for(var e=0,f=c.length;e<f;e++)d.push(c[e].offsetTop+c[e].offsetHeight+parseInt(window.getComputedStyle(c[e],null).getPropertyValue("margin-bottom")));var g=Math.max.apply(Math,d);return g+=parseInt(a.getPropertyValue("padding-bottom"),10),Math.max(g,b.offsetHeight)}}(),i={getHeight:function(){window.parent.postMessage({height:h()},"*")}};window.addEventListener("message",function(a){if(a.data==null)return;typeof a.data=="string"&&i[a.data]()},!1)})()</script><style type="text/preview">.actions-toolbar:before,.actions-toolbar:after{content:"";display:table}.actions-toolbar:after{clear:both}.actions-toolbar .primary{float:left}.actions-toolbar .secondary{float:right}.actions-toolbar .primary,.actions-toolbar .secondary{display:inline-block}.actions-toolbar .primary a.action,.actions-toolbar .secondary a.action{display:inline-block}.actions-toolbar .primary .action{margin:0 5px 0 0}.actions-toolbar .secondary a.action{margin-top:6px}.example-actions-toolbar-1:before,.example-actions-toolbar-1:after{content:"";display:table}.example-actions-toolbar-1:after{clear:both}.example-actions-toolbar-1 .primary{float:left}.example-actions-toolbar-1 .secondary{float:right}.example-actions-toolbar-1 .primary,.example-actions-toolbar-1 .secondary{display:inline-block}.example-actions-toolbar-1 .primary a.action,.example-actions-toolbar-1 .secondary a.action{display:inline-block}.example-actions-toolbar-1 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-1 .secondary a.action{margin-top:6px}.example-actions-toolbar-1:before,.example-actions-toolbar-1:after{content:"";display:table}.example-actions-toolbar-1:after{clear:both}.example-actions-toolbar-1 .primary{float:left}.example-actions-toolbar-1 .secondary{float:right}.example-actions-toolbar-1 .primary,.example-actions-toolbar-1 .secondary{display:inline-block}.example-actions-toolbar-1 .primary a.action,.example-actions-toolbar-1 .secondary a.action{display:inline-block}.example-actions-toolbar-1 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-1 .secondary a.action{margin-top:6px}.example-actions-toolbar-2:before,.example-actions-toolbar-2:after{content:"";display:table}.example-actions-toolbar-2:after{clear:both}.example-actions-toolbar-2 .primary{float:left}.example-actions-toolbar-2 .secondary{float:right}.example-actions-toolbar-2 .primary,.example-actions-toolbar-2 .secondary{display:inline-block}.example-actions-toolbar-2 .primary a.action,.example-actions-toolbar-2 .secondary a.action{display:inline-block}.example-actions-toolbar-2 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-2 .secondary a.action{margin-top:6px}.example-actions-toolbar-3{text-align:left}.example-actions-toolbar-3:before,.example-actions-toolbar-3:after{content:"";display:table}.example-actions-toolbar-3:after{clear:both}.example-actions-toolbar-3 .primary{float:left}.example-actions-toolbar-3 .primary,.example-actions-toolbar-3 .secondary{display:inline-block}.example-actions-toolbar-3 .primary a.action,.example-actions-toolbar-3 .secondary a.action{display:inline-block}.example-actions-toolbar-3 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-3 .secondary a.action{margin-top:6px}.example-actions-toolbar-4{text-align:right}.example-actions-toolbar-4:before,.example-actions-toolbar-4:after{content:"";display:table}.example-actions-toolbar-4:after{clear:both}.example-actions-toolbar-4 .secondary{float:right}.example-actions-toolbar-4 .primary,.example-actions-toolbar-4 .secondary{display:inline-block}.example-actions-toolbar-4 .primary a.action,.example-actions-toolbar-4 .secondary a.action{display:inline-block}.example-actions-toolbar-4 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-4 .secondary a.action{margin-top:6px}.example-actions-toolbar-5{text-align:center}.example-actions-toolbar-5:before,.example-actions-toolbar-5:after{content:"";display:table}.example-actions-toolbar-5:after{clear:both}.example-actions-toolbar-5 .primary,.example-actions-toolbar-5 .secondary{vertical-align:top}.example-actions-toolbar-5 .primary,.example-actions-toolbar-5 .secondary{display:inline-block}.example-actions-toolbar-5 .primary a.action,.example-actions-toolbar-5 .secondary a.action{display:inline-block}.example-actions-toolbar-5 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-5 .secondary a.action{margin-top:6px}.example-actions-toolbar-6:before,.example-actions-toolbar-6:after{content:"";display:table}.example-actions-toolbar-6:after{clear:both}.example-actions-toolbar-6 .primary{float:right}.example-actions-toolbar-6 .secondary{float:left}.example-actions-toolbar-6 .primary,.example-actions-toolbar-6 .secondary{display:inline-block}.example-actions-toolbar-6 .primary a.action,.example-actions-toolbar-6 .secondary a.action{display:inline-block}.example-actions-toolbar-6 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-6 .secondary a.action{margin-top:6px}.example-actions-toolbar-7{text-align:left}.example-actions-toolbar-7:before,.example-actions-toolbar-7:after{content:"";display:table}.example-actions-toolbar-7:after{clear:both}.example-actions-toolbar-7 .secondary{float:left}.example-actions-toolbar-7 .primary,.example-actions-toolbar-7 .secondary{display:inline-block}.example-actions-toolbar-7 .primary a.action,.example-actions-toolbar-7 .secondary a.action{display:inline-block}.example-actions-toolbar-7 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-7 .secondary a.action{margin-top:6px}.example-actions-toolbar-8{text-align:right}.example-actions-toolbar-8:before,.example-actions-toolbar-8:after{content:"";display:table}.example-actions-toolbar-8:after{clear:both}.example-actions-toolbar-8 .primary{float:right}.example-actions-toolbar-8 .primary,.example-actions-toolbar-8 .secondary{display:inline-block}.example-actions-toolbar-8 .primary a.action,.example-actions-toolbar-8 .secondary a.action{display:inline-block}.example-actions-toolbar-8 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-8 .secondary a.action{margin-top:6px}.example-actions-toolbar-9{margin:10px;padding:10px}.example-actions-toolbar-9:before,.example-actions-toolbar-9:after{content:"";display:table}.example-actions-toolbar-9:after{clear:both}.example-actions-toolbar-9 .primary{float:left}.example-actions-toolbar-9 .secondary{float:right}.example-actions-toolbar-9 .primary,.example-actions-toolbar-9 .secondary{display:inline-block}.example-actions-toolbar-9 .primary a.action,.example-actions-toolbar-9 .secondary a.action{display:inline-block}.example-actions-toolbar-9 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-9 .secondary a.action{margin-top:6px}.example-actions-toolbar-10{text-align:left}.example-actions-toolbar-10:before,.example-actions-toolbar-10:after{content:"";display:table}.example-actions-toolbar-10:after{clear:both}.example-actions-toolbar-10 .primary{float:left}.example-actions-toolbar-10 .primary,.example-actions-toolbar-10 .secondary{display:inline-block}.example-actions-toolbar-10 .primary a.action,.example-actions-toolbar-10 .secondary a.action{display:inline-block}.example-actions-toolbar-10 .primary .action{margin:0 50px 0 0}.example-actions-toolbar-10 .secondary a.action{margin-top:6px}.example-actions-toolbar-11{text-align:left}.example-actions-toolbar-11:before,.example-actions-toolbar-11:after{content:"";display:table}.example-actions-toolbar-11:after{clear:both}.example-actions-toolbar-11 .primary{float:left}.example-actions-toolbar-11 .primary,.example-actions-toolbar-11 .secondary{display:inline-block}.example-actions-toolbar-11 .primary a.action,.example-actions-toolbar-11 .secondary a.action{display:inline-block}.example-actions-toolbar-11 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-11 .secondary .action{margin:0 50px 0 0}.example-actions-toolbar-11 .secondary a.action{margin-top:6px}.example-actions-toolbar-12:before,.example-actions-toolbar-12:after{content:"";display:table}.example-actions-toolbar-12:after{clear:both}.example-actions-toolbar-12 .primary{float:left}.example-actions-toolbar-12 .secondary{float:right}.example-actions-toolbar-12 .primary,.example-actions-toolbar-12 .secondary{display:inline-block}.example-actions-toolbar-12 .primary a.action,.example-actions-toolbar-12 .secondary a.action{display:inline-block}.example-actions-toolbar-12 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-12 .secondary a.action{margin-top:6px}.example-actions-toolbar-12:before,.example-actions-toolbar-12:after{content:"";display:table}.example-actions-toolbar-12:after{clear:both}.example-actions-toolbar-12 .primary{float:left}.example-actions-toolbar-12 .secondary{float:right}.example-actions-toolbar-12 .primary,.example-actions-toolbar-12 .secondary{display:inline-block}.example-actions-toolbar-12 .primary a.action,.example-actions-toolbar-12 .secondary a.action{display:inline-block}.example-actions-toolbar-12 .primary .action{margin:0 5px 0 0}.example-actions-toolbar-12 .secondary a.action{margin-top:6px}@media only screen and (max-width: 768px){.example-actions-toolbar-12 .primary,.example-actions-toolbar-12 .secondary{ display:block;float:none}}.example-breadcrumbs-1{margin:0 0 20px}.example-breadcrumbs-1 .items{font-size:1.2rem;color:#a3a3a3;margin:0;padding:0;list-style:none none}.example-breadcrumbs-1 .items>li{display:inline-block;vertical-align:top}.example-breadcrumbs-1 .item{margin:0}.example-breadcrumbs-1 a{color:#333;text-decoration:none}.example-breadcrumbs-1 a:visited{color:#333;text-decoration:none}.example-breadcrumbs-1 a:hover{color:#333;text-decoration:underline}.example-breadcrumbs-1 a:active{color:#333;text-decoration:none}.example-breadcrumbs-1 strong{font-weight:400}.example-breadcrumbs-1 .item:not(:last-child){display:inline-block;text-decoration:none}.example-breadcrumbs-1 .item:not(:last-child):after{font-family:'icons-blank-theme';content:'\e608';font-size:24px;line-height:18px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-breadcrumbs-2{margin:0 0 20px}.example-breadcrumbs-2 .items{font-size:1.2rem;color:#1979c3;margin:0;padding:0;list-style:none none}.example-breadcrumbs-2 .items>li{display:inline-block;vertical-align:top}.example-breadcrumbs-2 .item{margin:0}.example-breadcrumbs-2 a{background-color:#ccc;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #f4f4f4 0, #ccc 100%);background-image:linear-gradient(to bottom, #f4f4f4 0, #ccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#cccccc', GradientType=0);border:1px solid #ccc;display:inline-block;padding:3px 5px;color:#333;text-decoration:none}.example-breadcrumbs-2 a:visited{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#333;text-decoration:none}.example-breadcrumbs-2 a:hover{background-color:#f4f4f4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #ccc 0, #f4f4f4 100%);background-image:linear-gradient(to bottom, #ccc 0, #f4f4f4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#f4f4f4', GradientType=0);color:#333;text-decoration:none}.example-breadcrumbs-2 a:active{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#333;text-decoration:none}.example-breadcrumbs-2 strong{background-color:#ff5501;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #f7b32e 0, #ff5501 100%);background-image:linear-gradient(to bottom, #f7b32e 0, #ff5501 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7b32e', endColorstr='#ff5501', GradientType=0);border:1px solid #d04b0a;display:inline-block;padding:3px 5px;font-weight:400}.example-breadcrumbs-2 .item:not(:last-child){display:inline-block;text-decoration:none}.example-breadcrumbs-2 .item:not(:last-child):after{font-family:'icons-blank-theme';content:'\e608';font-size:24px;line-height:18px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-breadcrumbs-3{margin:0 0 20px}.example-breadcrumbs-3 .items{font-size:1.2rem;color:#333;margin:0;padding:0;list-style:none none}.example-breadcrumbs-3 .items>li{display:inline-block;vertical-align:top}.example-breadcrumbs-3 .item{margin:0}.example-breadcrumbs-3 a{background:#f4f4f4;display:inline-block;padding:3px 5px;color:#333;text-decoration:none}.example-breadcrumbs-3 a:visited{color:#333;text-decoration:none}.example-breadcrumbs-3 a:hover{background:#ccc;color:#333;text-decoration:none}.example-breadcrumbs-3 a:active{color:#333;text-decoration:none}.example-breadcrumbs-3 strong{background:#e7e7e7;display:inline-block;padding:3px 5px;font-weight:400}.example-breadcrumbs-3 .item:not(:last-child){display:inline-block;text-decoration:none}.example-breadcrumbs-3 .item:not(:last-child):after{font-family:'icons-blank-theme';content:'\e608';font-size:24px;line-height:18px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-breadcrumbs-3 .item a{position:relative;margin:0 11px 0 0}.example-breadcrumbs-3 .item a:after{border:12px solid transparent;height:0;width:0;border-left-color:#f4f4f4;content:"";position:absolute;display:block;top:0;right:-23px}.example-breadcrumbs-3 .item a:hover:after{border-color:transparent transparent transparent #ccc}button{background-image:none;background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle;border-radius:3px}button:focus,button:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}button:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}button.disabled,button[disabled],fieldset[disabled] button{cursor:default;pointer-events:none;opacity:.5}button:active,button:focus{box-shadow:inset 0 2px 1px rgba(0,0,0,.12)}.example-button-1.example-button-2{line-height:2.2rem;padding:14px 17px;font-size:1.8rem}.example-button-1.example-button-3{line-height:1.2rem;padding:5px 8px;font-size:1.1rem;border-radius:0;color:#000}.example-button-1.example-button-3:hover,.example-button-1.example-button-3.active{color:#000}.example-button-10{background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400}.example-button-10>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-button-10:before{font-family:'icons-blank-theme';content:'\e611';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-button-10:hover:before{color:inherit}.example-button-10:active:before{color:inherit}.example-button-10:focus,.example-button-10:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-10:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-10.disabled,.example-button-10[disabled],fieldset[disabled] .example-button-10{cursor:default;pointer-events:none;opacity:.5}.example-button-10:focus,.example-button-10:active{background:0;border:0}.example-button-10:hover{background:0;border:0}.example-button-10.disabled,.example-button-10[disabled],fieldset[disabled] .example-button-10{cursor:not-allowed;pointer-events:none;opacity:.5}.example-button-11{background-image:none;background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;text-decoration:none}.example-button-11:before{font-family:'icons-blank-theme';content:'\e611';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-button-11:hover:before{color:inherit}.example-button-11:active:before{color:inherit}.example-button-11:focus,.example-button-11:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-11:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-11.disabled,.example-button-11[disabled],fieldset[disabled] .example-button-11{cursor:default;pointer-events:none;opacity:.5}.example-button-12{background-image:none;background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle;display:inline-block;text-decoration:none}.example-button-12:after{font-family:'icons-blank-theme';content:'\e611';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-button-12:hover:after{color:inherit}.example-button-12:active:after{color:inherit}.example-button-12:focus,.example-button-12:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-12:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-12.disabled,.example-button-12[disabled],fieldset[disabled] .example-button-12{cursor:default;pointer-events:none;opacity:.5}.example-button-13{background-image:none;background:#f2f2f2;padding:7px 15px;width:100px;color:#333;border:1px solid #cdcdcd;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle}.example-button-13:focus,.example-button-13:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-13:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-13.disabled,.example-button-13[disabled],fieldset[disabled] .example-button-13{cursor:default;pointer-events:none;opacity:.5}.example-button-4{background-image:none;background:#1979c3;padding:7px 15px;color:#fff;border:1px solid #1979c3;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;box-sizing:border-box;margin:3px;vertical-align:middle}.example-button-4:focus,.example-button-4:active{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-4:hover{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-4.disabled,.example-button-4[disabled],fieldset[disabled] .example-button-4{cursor:default;pointer-events:none;opacity:.5}.example-button-4:active{box-shadow:inset 0 3px 1px rgba(0,0,0,.29)}.example-button-4.example-button-5{line-height:2.2rem;padding:7px 35px;font-size:1.8rem}.example-button-4.example-button-6{line-height:1.2rem;padding:5px 8px;font-size:1.1rem;color:#fff}.example-button-4.example-button-6:hover,.example-button-4.example-button-6.active{color:#fff}.example-button-7{background-image:none;background:#f2f2f2;background-color:#006bb4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #1979c3 0, #006bb4 100%);background-image:linear-gradient(to bottom, #1979c3 0, #006bb4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1979c3', endColorstr='#006bb4', GradientType=0);padding:7px 15px;color:#fff;border:1px solid #1979c3;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:3px;vertical-align:middle;border-radius:3px}.example-button-7:focus,.example-button-7:active{background:#e2e2e2;background-color:#006bb4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #006bb4 0, #006bb4 100%);background-image:linear-gradient(to bottom, #006bb4 0, #006bb4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#006bb4', endColorstr='#006bb4', GradientType=0);border:1px solid #006bb4;color:#fff}.example-button-7:hover{background:#e2e2e2;background-color:#1979c3;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #006bb4 0, #1979c3 100%);background-image:linear-gradient(to bottom, #006bb4 0, #1979c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#006bb4', endColorstr='#1979c3', GradientType=0);border:1px solid #006bb4;color:#fff}.example-button-7.disabled,.example-button-7[disabled],fieldset[disabled] .example-button-7{cursor:default;pointer-events:none;opacity:.5}.example-button-7:active{box-shadow:inset 0 3px 1px rgba(0,0,0,.29)}.example-button-8{background:0;border:0;display:inline;line-height:1.42857143;margin:0;padding:0;color:#1979c3;text-decoration:none;font-weight:400}.example-button-8:visited{color:#800080;text-decoration:none}.example-button-8:hover{color:#006bb4;text-decoration:underline}.example-button-8:active{color:#ff5501;text-decoration:underline}.example-button-8:hover{color:#006bb4}.example-button-8:hover,.example-button-8:active,.example-button-8:focus{background:0;border:0}.example-button-8.disabled,.example-button-8[disabled],fieldset[disabled] .example-button-8{color:#1979c3;text-decoration:underline;cursor:default;pointer-events:none;opacity:.5}.example-button-8:active{box-shadow:none}.example-button-9{text-decoration:none;background-image:none;background:#f2f2f2;padding:7px 15px;color:#333;border:1px solid #cdcdcd;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;line-height:1.6rem;box-sizing:border-box;margin:0;vertical-align:middle;margin:3px;border-radius:3px;font-weight:700}.example-button-9:hover,.example-button-9:active,.example-button-9:focus{text-decoration:none}.example-button-9:focus,.example-button-9:active{background:#e2e2e2;border:1px solid #cdcdcd;color:#333}.example-button-9:hover{background:#e2e2e2;border:1px solid #cdcdcd;color:#555}.example-button-9.disabled,.example-button-9[disabled],fieldset[disabled] .example-button-9{cursor:default;pointer-events:none;opacity:.5}.example-button-9:active{box-shadow:inset 0 3px 1px rgba(0,0,0,.29)}.example-button-14{background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400}.example-button-14:focus,.example-button-14:active{background:0;border:0}.example-button-14:hover{background:0;border:0}.example-button-14.disabled,.example-button-14[disabled],fieldset[disabled] .example-button-14{cursor:not-allowed;pointer-events:none;opacity:.5}.example-button-15{background-image:none;background:#1979c3;padding:7px 15px;color:#fff;border:1px solid #1979c3;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;box-sizing:border-box;vertical-align:middle;background:#f2f2f2;color:#333;border:1px solid #cdcdcd}.example-button-15:focus,.example-button-15:active{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-15:hover{background:#006bb4;border:1px solid #006bb4;color:#fff}.example-button-15.disabled,.example-button-15[disabled],fieldset[disabled] .example-button-15{cursor:default;pointer-events:none;opacity:.5}.example-button-15:focus,.example-button-15:active{background:#e2e2e2;color:#333;border:1px solid #cdcdcd}.example-button-15:hover{background:#e2e2e2;color:#555;border:1px solid #cdcdcd}.example-button-17{line-height:2.2rem;padding:14px 17px;font-size:1.8rem;font-size:1.4rem;line-height:1.6rem;padding:7px 15px}.example-button-18{font-size:1rem;line-height:1.2rem;padding:4px 10px}.example-dropdown-1{display:inline-block;position:relative}.example-dropdown-1:before,.example-dropdown-1:after{content:"";display:table}.example-dropdown-1:after{clear:both}.example-dropdown-1 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-1 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-1 .action.toggle:hover:after{color:inherit}.example-dropdown-1 .action.toggle:active:after{color:inherit}.example-dropdown-1 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-1 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-1 .action.toggle.active:hover:after{color:inherit}.example-dropdown-1 .action.toggle.active:active:after{color:inherit}.example-dropdown-1 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-1 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-1 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-1 ul.dropdown:before,.example-dropdown-1 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-1 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-1 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-1 ul.dropdown:before{top:-12px;left:10px}.example-dropdown-1 ul.dropdown:after{top:-14px;left:9px}.example-dropdown-1.active{overflow:visible}.example-dropdown-1.active ul.dropdown{display:block}.example-dropdown-2{display:inline-block;position:relative}.example-dropdown-2:before,.example-dropdown-2:after{content:"";display:table}.example-dropdown-2:after{clear:both}.example-dropdown-2 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-2 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-2 .action.toggle:hover:after{color:inherit}.example-dropdown-2 .action.toggle:active:after{color:inherit}.example-dropdown-2 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-2 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-2 .action.toggle.active:hover:after{color:inherit}.example-dropdown-2 .action.toggle.active:active:after{color:inherit}.example-dropdown-2 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-2 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-2 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-2 ul.dropdown:before,.example-dropdown-2 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-2 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-2 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-2 ul.dropdown:before{top:-12px;left:10px}.example-dropdown-2 ul.dropdown:after{top:-14px;left:9px}.example-dropdown-2.active{overflow:visible}.example-dropdown-2.active ul.dropdown{display:block}.example-dropdown-3{display:inline-block;position:relative}.example-dropdown-3:before,.example-dropdown-3:after{content:"";display:table}.example-dropdown-3:after{clear:both}.example-dropdown-3 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-3 .action.toggle:before{font-family:'icons-blank-theme';content:'\e61c';font-size:22px;line-height:1;color:red;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-3 .action.toggle:hover:before{color:red}.example-dropdown-3 .action.toggle:active:before{color:inherit}.example-dropdown-3 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-3 .action.toggle.active:before{font-family:'icons-blank-theme';content:'\e60f';font-size:22px;line-height:1;color:red;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-3 .action.toggle.active:hover:before{color:red}.example-dropdown-3 .action.toggle.active:active:before{color:inherit}.example-dropdown-3 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-3 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-3 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-3 ul.dropdown:before,.example-dropdown-3 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-3 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-3 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-3 ul.dropdown:before{top:-12px;left:10px}.example-dropdown-3 ul.dropdown:after{top:-14px;left:9px}.example-dropdown-3.active{overflow:visible}.example-dropdown-3.active ul.dropdown{display:block}.example-dropdown-5{display:inline-block;position:relative}.example-dropdown-5:before,.example-dropdown-5:after{content:"";display:table}.example-dropdown-5:after{clear:both}.example-dropdown-5 .action.toggle{cursor:pointer;display:inline-block;text-decoration:none}.example-dropdown-5 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:1;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-5 .action.toggle:hover:after{color:inherit}.example-dropdown-5 .action.toggle:active:after{color:inherit}.example-dropdown-5 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-5 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:1;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-5 .action.toggle.active:hover:after{color:inherit}.example-dropdown-5 .action.toggle.active:active:after{color:inherit}.example-dropdown-5 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#eef1f3;border:2px solid #ced1d4;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none}.example-dropdown-5 ul.dropdown li{margin:0;padding:10px;border-top:2px solid #e8eaed}.example-dropdown-5 ul.dropdown li:first-child{border:0}.example-dropdown-5 ul.dropdown li:hover{background:#d8e3e3;cursor:pointer}.example-dropdown-5.active{overflow:visible}.example-dropdown-5.active ul.dropdown{display:block}.example-dropdown-6{display:inline-block;position:relative}.example-dropdown-6:before,.example-dropdown-6:after{content:"";display:table}.example-dropdown-6:after{clear:both}.example-dropdown-6 .action.split{float:left;margin:0}.example-dropdown-6 .action.toggle{float:right;margin:0}.example-dropdown-6 button.action.split{border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-6 button+.action.toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-6 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-6 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-6 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-6 .action.toggle:hover:after{color:inherit}.example-dropdown-6 .action.toggle:active:after{color:inherit}.example-dropdown-6 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-6 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-6 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-6 .action.toggle.active:hover:after{color:inherit}.example-dropdown-6 .action.toggle.active:active:after{color:inherit}.example-dropdown-6 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-6 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-6 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-6 ul.dropdown:before,.example-dropdown-6 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-6 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-6 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-6 ul.dropdown:before{top:-12px;right:10px}.example-dropdown-6 ul.dropdown:after{top:-14px;right:9px}.example-dropdown-6.active{overflow:visible}.example-dropdown-6.active ul.dropdown{display:block}.split.example-dropdown-7{display:inline-block;position:relative}.split.example-dropdown-7:before,.split.example-dropdown-7:after{content:"";display:table}.split.example-dropdown-7:after{clear:both}.split.example-dropdown-7 .action.split{float:left;margin:0}.split.example-dropdown-7 .action.toggle{float:right;margin:0}.split.example-dropdown-7 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.split.example-dropdown-7 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.split.example-dropdown-7 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.split.example-dropdown-7 .action.toggle:hover:after{color:inherit}.split.example-dropdown-7 .action.toggle:active:after{color:inherit}.split.example-dropdown-7 .action.toggle.active{display:inline-block;text-decoration:none}.split.example-dropdown-7 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.split.example-dropdown-7 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.split.example-dropdown-7 .action.toggle.active:hover:after{color:inherit}.split.example-dropdown-7 .action.toggle.active:active:after{color:inherit}.split.example-dropdown-7 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.split.example-dropdown-7 ul.dropdown li{margin:0;padding:3px 5px}.split.example-dropdown-7 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.split.example-dropdown-7 ul.dropdown:before,.split.example-dropdown-7 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.split.example-dropdown-7 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.split.example-dropdown-7 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.split.example-dropdown-7 ul.dropdown:before{top:-12px;right:10px}.split.example-dropdown-7 ul.dropdown:after{top:-14px;right:9px}.split.example-dropdown-7.active{overflow:visible}.split.example-dropdown-7.active ul.dropdown{display:block}.example-dropdown-8{display:inline-block;position:relative}.example-dropdown-8:before,.example-dropdown-8:after{content:"";display:table}.example-dropdown-8:after{clear:both}.example-dropdown-8 .action.split{float:left;margin:0}.example-dropdown-8 .action.toggle{float:right;margin:0}.example-dropdown-8 button.action.split{border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-8 button+.action.toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-8 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-8 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-8 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-8 .action.toggle:hover:after{color:inherit}.example-dropdown-8 .action.toggle:active:after{color:inherit}.example-dropdown-8 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-8 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-8 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-8 .action.toggle.active:hover:after{color:inherit}.example-dropdown-8 .action.toggle.active:active:after{color:inherit}.example-dropdown-8 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-8 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-8 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-8 ul.dropdown:before,.example-dropdown-8 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-8 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-8 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-8 ul.dropdown:before{top:-12px;right:10px}.example-dropdown-8 ul.dropdown:after{top:-14px;right:9px}.example-dropdown-8.active{overflow:visible}.example-dropdown-8.active ul.dropdown{display:block}.example-dropdown-9{display:inline-block;position:relative}.example-dropdown-9 .action.split,.example-dropdown-9 .action.toggle{line-height:2.2rem;padding:14px 17px;font-size:1.8rem}.example-dropdown-9:before,.example-dropdown-9:after{content:"";display:table}.example-dropdown-9:after{clear:both}.example-dropdown-9 .action.split{float:left;margin:0}.example-dropdown-9 .action.toggle{float:right;margin:0}.example-dropdown-9 button.action.split{border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-9 button+.action.toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-9 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-9 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-9 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-9 .action.toggle:hover:after{color:inherit}.example-dropdown-9 .action.toggle:active:after{color:inherit}.example-dropdown-9 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-9 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-9 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-9 .action.toggle.active:hover:after{color:inherit}.example-dropdown-9 .action.toggle.active:active:after{color:inherit}.example-dropdown-9 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-9 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-9 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-9 ul.dropdown:before,.example-dropdown-9 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-9 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-9 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-9 ul.dropdown:before{top:-12px;right:10px}.example-dropdown-9 ul.dropdown:after{top:-14px;right:9px}.example-dropdown-9.active{overflow:visible}.example-dropdown-9.active ul.dropdown{display:block}.example-dropdown-10{display:inline-block;position:relative}.example-dropdown-10 .action.split,.example-dropdown-10 .action.toggle{line-height:1.2rem;padding:5px 8px;font-size:1.1rem}.example-dropdown-10:before,.example-dropdown-10:after{content:"";display:table}.example-dropdown-10:after{clear:both}.example-dropdown-10 .action.split{float:left;margin:0}.example-dropdown-10 .action.toggle{float:right;margin:0}.example-dropdown-10 button.action.split{border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-10 button+.action.toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-10 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-10 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-10 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-10 .action.toggle:hover:after{color:inherit}.example-dropdown-10 .action.toggle:active:after{color:inherit}.example-dropdown-10 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-10 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-10 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-10 .action.toggle.active:hover:after{color:inherit}.example-dropdown-10 .action.toggle.active:active:after{color:inherit}.example-dropdown-10 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-10 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-10 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-10 ul.dropdown:before,.example-dropdown-10 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-10 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-10 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-10 ul.dropdown:before{top:-12px;right:10px}.example-dropdown-10 ul.dropdown:after{top:-14px;right:9px}.example-dropdown-10.active{overflow:visible}.example-dropdown-10.active ul.dropdown{display:block}.example-dropdown-11{display:inline-block;position:relative}.example-dropdown-11:before,.example-dropdown-11:after{content:"";display:table}.example-dropdown-11:after{clear:both}.example-dropdown-11 .action.split{float:right;margin:0}.example-dropdown-11 .action.toggle{float:left;margin:0}.example-dropdown-11 button.action.split{border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-11 button+.action.toggle{border-right:0;border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-11 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-11 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-11 .action.toggle:before{font-family:'icons-blank-theme';content:'\e61c';font-size:22px;line-height:22px;color:red;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-11 .action.toggle:hover:before{color:red}.example-dropdown-11 .action.toggle:active:before{color:inherit}.example-dropdown-11 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-11 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-11 .action.toggle.active:before{font-family:'icons-blank-theme';content:'\e60f';font-size:22px;line-height:22px;color:red;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-11 .action.toggle.active:hover:before{color:red}.example-dropdown-11 .action.toggle.active:active:before{color:inherit}.example-dropdown-11 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#fff;border:1px solid #bbb;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none;box-shadow:0 3px 3px rgba(0,0,0,.15)}.example-dropdown-11 ul.dropdown li{margin:0;padding:3px 5px}.example-dropdown-11 ul.dropdown li:hover{background:#e8e8e8;cursor:pointer}.example-dropdown-11 ul.dropdown:before,.example-dropdown-11 ul.dropdown:after{content:"";position:absolute;display:block;width:0;height:0;border-bottom-style:solid}.example-dropdown-11 ul.dropdown:before{z-index:99;border:solid 6px;border-color:transparent transparent #fff transparent}.example-dropdown-11 ul.dropdown:after{z-index:98;border:solid 7px;border-color:transparent transparent #bbb transparent}.example-dropdown-11 ul.dropdown:before{top:-12px;right:10px}.example-dropdown-11 ul.dropdown:after{top:-14px;right:9px}.example-dropdown-11.active{overflow:visible}.example-dropdown-11.active ul.dropdown{display:block}.example-dropdown-12{display:inline-block;position:relative}.example-dropdown-12:before,.example-dropdown-12:after{content:"";display:table}.example-dropdown-12:after{clear:both}.example-dropdown-12 .action.split{float:left;margin:0}.example-dropdown-12 .action.toggle{float:right;margin:0}.example-dropdown-12 button.action.split{border-top-right-radius:0;border-bottom-right-radius:0}.example-dropdown-12 button+.action.toggle{border-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.example-dropdown-12 .action.toggle{padding:4px 5px;display:inline-block;text-decoration:none}.example-dropdown-12 .action.toggle>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-12 .action.toggle:after{font-family:'icons-blank-theme';content:'\e607';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-12 .action.toggle:hover:after{color:inherit}.example-dropdown-12 .action.toggle:active:after{color:inherit}.example-dropdown-12 .action.toggle.active{display:inline-block;text-decoration:none}.example-dropdown-12 .action.toggle.active>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-dropdown-12 .action.toggle.active:after{font-family:'icons-blank-theme';content:'\e618';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.example-dropdown-12 .action.toggle.active:hover:after{color:inherit}.example-dropdown-12 .action.toggle.active:active:after{color:inherit}.example-dropdown-12 ul.dropdown{margin:0;padding:0;list-style:none none;box-sizing:border-box;background:#eef1f3;border:2px solid #ced1d4;position:absolute;z-index:100;top:100%;min-width:100%;margin-top:4px;display:none}.example-dropdown-12 ul.dropdown li{margin:0;padding:10px;border-top:2px solid #e8eaed}.example-dropdown-12 ul.dropdown li:first-child{border:0}.example-dropdown-12 ul.dropdown li:hover{background:#d8e3e3;cursor:pointer}.example-dropdown-12.active{overflow:visible}.example-dropdown-12.active ul.dropdown{display:block}.example-form-1 .example-form-1-fieldset{padding:0;margin:0 0 40px;border:0;letter-spacing:-.31em}.example-form-1 .example-form-1-fieldset>*{letter-spacing:normal}.example-form-1 .example-form-1-fieldset>.legend{margin:0 0 25px;padding:0;font-size:2rem;line-height:1.2;box-sizing:border-box;float:left}.example-form-1 .example-form-1-fieldset>.legend+br{display:block;visibility:hidden;height:0;overflow:hidden;clear:both}.example-form-1 .example-form-1-fieldset:after{content:attr(data-hasrequired);display:block;font-size:1.2rem;color:#e02b27;margin:10px 0 0;letter-spacing:normal;word-spacing:normal}.example-form-1 .example-form-1-fieldset>.field{margin:0 0 20px}.example-form-1 .example-form-1-fieldset>.field>.label{display:inline-block;margin:0 0 5px}.example-form-1 .example-form-1-fieldset>.field:last-child{margin-bottom:0}.example-form-1 .example-form-1-fieldset>.field>.label{font-weight:700}.example-form-1 .example-form-1-fieldset>.field>.label+br{display:none}.example-form-1 .example-form-1-fieldset>.field .choice input{vertical-align:top}.example-form-1 .example-form-1-fieldset>.field .fields.group:before,.example-form-1 .example-form-1-fieldset>.field .fields.group:after{content:"";display:table}.example-form-1 .example-form-1-fieldset>.field .fields.group:after{clear:both}.example-form-1 .example-form-1-fieldset>.field .fields.group .field{box-sizing:border-box;float:left}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-2 .field{width:50%!important}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-3 .field{width:33.3%!important}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-4 .field{width:25%!important}.example-form-1 .example-form-1-fieldset>.field .fields.group.group-5 .field{width:20%!important}.example-form-1 .example-form-1-fieldset>.field .addon{display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-flex-wrap:nowrap;flex-wrap:nowrap;padding:0;width:100%}.example-form-1 .example-form-1-fieldset>.field .addon textarea,.example-form-1 .example-form-1-fieldset>.field .addon select,.example-form-1 .example-form-1-fieldset>.field .addon input{-ms-flex-order:2;-webkit-order:2;order:2;-webkit-flex-basis:100%;flex-basis:100%;box-shadow:none;display:inline-block;margin:0;width:auto}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore,.example-form-1 .example-form-1-fieldset>.field .addon .addafter{-ms-flex-order:3;-webkit-order:3;order:3;display:inline-block;box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:0 9px;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;width:auto;white-space:nowrap;vertical-align:middle}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore:disabled,.example-form-1 .example-form-1-fieldset>.field .addon .addafter:disabled{opacity:.5}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore::-moz-placeholder,.example-form-1 .example-form-1-fieldset>.field .addon .addafter::-moz-placeholder{color:#c2c2c2}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore::-webkit-input-placeholder,.example-form-1 .example-form-1-fieldset>.field .addon .addafter::-webkit-input-placeholder{color:#c2c2c2}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore:-ms-input-placeholder,.example-form-1 .example-form-1-fieldset>.field .addon .addafter:-ms-input-placeholder{color:#c2c2c2}.example-form-1 .example-form-1-fieldset>.field .addon .addbefore{float:left;-ms-flex-order:1;-webkit-order:1;order:1}.example-form-1 .example-form-1-fieldset>.field .additional{margin-top:10px}.example-form-1 .example-form-1-fieldset>.field.required>.label:after{content:'*';font-size:1.2rem;color:#e02b27;margin:0 0 0 5px}.example-form-1 .example-form-1-fieldset>.field .note{font-size:1.2rem;margin:3px 0 0;padding:0;display:inline-block;text-decoration:none}.example-form-1 .example-form-1-fieldset>.field .note:before{font-family:'icons-blank-theme';content:'\e618';font-size:24px;line-height:12px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-form-2 .example-form-2-fieldset{padding:0;margin:0 0 40px;border:0;letter-spacing:-.31em}.example-form-2 .example-form-2-fieldset>*{letter-spacing:normal}.example-form-2 .example-form-2-fieldset>.legend{margin:0 0 25px;padding:0;font-size:2rem;line-height:1.2;box-sizing:border-box;float:left}.example-form-2 .example-form-2-fieldset>.legend+br{display:block;visibility:hidden;height:0;overflow:hidden;clear:both}.example-form-2 .example-form-2-fieldset>.field{margin:0 0 20px;box-sizing:border-box;display:inline-block;padding:0 12px 0 0;width:50%;vertical-align:top}.example-form-2 .example-form-2-fieldset>.field>.label{display:inline-block;margin:0 0 5px}.example-form-2 .example-form-2-fieldset>.field:last-child{margin-bottom:0}.example-form-2 .example-form-2-fieldset>.field+.fieldset{clear:both}.example-form-2 .example-form-2-fieldset>.field>.label{font-weight:700}.example-form-2 .example-form-2-fieldset>.field>.label+br{display:none}.example-form-2 .example-form-2-fieldset>.field .choice input{vertical-align:top}.example-form-2 .example-form-2-fieldset>.field .fields.group:before,.example-form-2 .example-form-2-fieldset>.field .fields.group:after{content:"";display:table}.example-form-2 .example-form-2-fieldset>.field .fields.group:after{clear:both}.example-form-2 .example-form-2-fieldset>.field .fields.group .field{box-sizing:border-box;float:left}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-2 .field{width:50%!important}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-3 .field{width:33.3%!important}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-4 .field{width:25%!important}.example-form-2 .example-form-2-fieldset>.field .fields.group.group-5 .field{width:20%!important}.example-form-2 .example-form-2-fieldset>.field .addon{display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-flex-wrap:nowrap;flex-wrap:nowrap;padding:0;width:100%}.example-form-2 .example-form-2-fieldset>.field .addon textarea,.example-form-2 .example-form-2-fieldset>.field .addon select,.example-form-2 .example-form-2-fieldset>.field .addon input{-ms-flex-order:2;-webkit-order:2;order:2;-webkit-flex-basis:100%;flex-basis:100%;box-shadow:none;display:inline-block;margin:0;width:auto}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore,.example-form-2 .example-form-2-fieldset>.field .addon .addafter{-ms-flex-order:3;-webkit-order:3;order:3;display:inline-block;box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:0 9px;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;width:auto;white-space:nowrap;vertical-align:middle}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore:disabled,.example-form-2 .example-form-2-fieldset>.field .addon .addafter:disabled{opacity:.5}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore::-moz-placeholder,.example-form-2 .example-form-2-fieldset>.field .addon .addafter::-moz-placeholder{color:#c2c2c2}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore::-webkit-input-placeholder,.example-form-2 .example-form-2-fieldset>.field .addon .addafter::-webkit-input-placeholder{color:#c2c2c2}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore:-ms-input-placeholder,.example-form-2 .example-form-2-fieldset>.field .addon .addafter:-ms-input-placeholder{color:#c2c2c2}.example-form-2 .example-form-2-fieldset>.field .addon .addbefore{float:left;-ms-flex-order:1;-webkit-order:1;order:1}.example-form-2 .example-form-2-fieldset>.field .additional{margin-top:10px}.example-form-2 .example-form-2-fieldset>.field.required>.label:after{content:'*';font-size:1.2rem;color:#e02b27;margin:0 0 0 5px}.example-form-2 .example-form-2-fieldset>.field .note{font-size:1.2rem;margin:3px 0 0;padding:0;display:inline-block;text-decoration:none}.example-form-2 .example-form-2-fieldset>.field .note:before{font-family:'icons-blank-theme';content:'\e618';font-size:24px;line-height:12px;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}input[type="text"],input[type="password"],input[type="url"],input[type="tel"],input[type="search"],input[type="number"],input[type="datetime"],input[type="email"]{box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:0 9px;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;margin-bottom:20px}input[type="text"]:disabled,input[type="password"]:disabled,input[type="url"]:disabled,input[type="tel"]:disabled,input[type="search"]:disabled,input[type="number"]:disabled,input[type="datetime"]:disabled,input[type="email"]:disabled{opacity:.5}input[type="text"]::-moz-placeholder,input[type="password"]::-moz-placeholder,input[type="url"]::-moz-placeholder,input[type="tel"]::-moz-placeholder,input[type="search"]::-moz-placeholder,input[type="number"]::-moz-placeholder,input[type="datetime"]::-moz-placeholder,input[type="email"]::-moz-placeholder{color:#c2c2c2}input[type="text"]::-webkit-input-placeholder,input[type="password"]::-webkit-input-placeholder,input[type="url"]::-webkit-input-placeholder,input[type="tel"]::-webkit-input-placeholder,input[type="search"]::-webkit-input-placeholder,input[type="number"]::-webkit-input-placeholder,input[type="datetime"]::-webkit-input-placeholder,input[type="email"]::-webkit-input-placeholder{color:#c2c2c2}input[type="text"]:-ms-input-placeholder,input[type="password"]:-ms-input-placeholder,input[type="url"]:-ms-input-placeholder,input[type="tel"]:-ms-input-placeholder,input[type="search"]:-ms-input-placeholder,input[type="number"]:-ms-input-placeholder,input[type="datetime"]:-ms-input-placeholder,input[type="email"]:-ms-input-placeholder{color:#c2c2c2}select{box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:32px;width:100%;padding:5px 10px 4px;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;margin-bottom:20px}select:disabled{opacity:.5}select[multiple="multiple"]{height:auto;margin-bottom:20px}textarea{box-sizing:border-box;background:#fff;border:1px solid #c2c2c2;border-radius:1px;height:auto;width:100%;padding:10px;margin:0;font-size:14px;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;line-height:1.428571429;background-clip:padding-box;vertical-align:baseline;resize:vertical}textarea:disabled{opacity:.5}textarea::-moz-placeholder{color:#c2c2c2}textarea::-webkit-input-placeholder{color:#c2c2c2}textarea:-ms-input-placeholder{color:#c2c2c2}input[type="checkbox"]{margin:2px 5px 0 0}input[type="checkbox"]:disabled{opacity:.5}input[type="radio"]{margin:2px 5px 0 0}input[type="radio"]:disabled{opacity:.5}input.text-example-1,select.select-example-1,textarea.textarea-example-1{background:#fdf0d5;border-color:#fc0;color:#b30000}input.text-example-1:focus,select.select-example-1:focus,textarea.textarea-example-1:focus{border-color:#cff;color:#060}input.text-example-1:disabled,select.select-example-1:disabled,textarea.textarea-example-1:disabled{color:#fcc}input.text-example-1::-moz-placeholder,textarea.textarea-example-1::-moz-placeholder{color:#ccc}input.text-example-1::-webkit-input-placeholder,textarea.textarea-example-1::-webkit-input-placeholder{color:#ccc}input.text-example-1:-ms-input-placeholder,textarea.textarea-example-1:-ms-input-placeholder{color:#ccc}.number-example{-moz-appearance:textfield}.number-example::-webkit-inner-spin-button,.number-example::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.search-example{-webkit-appearance:none}.search-example::-webkit-search-cancel-button,.search-example::-webkit-search-decoration,.search-example::-webkit-search-results-button,.search-example::-webkit-search-results-decoration{-webkit-appearance:none}input,textarea,select{font-size:1.2rem;color:#e02b27}.example-icon-1{display:inline-block}.example-icon-1:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-2{display:inline-block}.example-icon-2:after{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat -26px 0}.example-icon-3{display:inline-block}.example-icon-3>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-icon-3:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat -156px -52px}.example-icon-4{display:inline-block;text-decoration:none}.example-icon-4:before{font-family:'icons-blank-theme';content:'\e606';font-size:24px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-5{display:inline-block;text-decoration:none}.example-icon-5:after{font-family:'icons-blank-theme';content:'\e605';font-size:24px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-6{display:inline-block;text-decoration:none}.example-icon-6>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-icon-6:before{font-family:'icons-blank-theme';content:'\e61b';font-size:24px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-7{display:inline-block}.example-icon-7:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-8{display:inline-block}.example-icon-8:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-8:before{background-position:-182px 0}.example-icon-9{display:inline-block}.example-icon-9:after{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-9:after{background-position:-52px -26px}.example-icon-10{display:inline-block}.example-icon-10:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-10:before{background-position:-104px 0}.example-icon-11{display:inline-block}.example-icon-11:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.example-icon-11:before{width:30px;height:30px}.example-icon-11:after{width:30px;height:30px}.example-icon-11:before{background-color:#f1f1f1}.example-icon-12{display:inline-block;text-decoration:none}.example-icon-12:before{font-family:'icons-blank-theme';content:'\e612';font-size:28px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-13{display:inline-block;text-decoration:none}.example-icon-13:before{font-family:'icons-blank-theme';content:'\e612';font-size:inherit;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-13:before{font-size:26px;line-height:inherit}.example-icon-14{display:inline-block;text-decoration:none}.example-icon-14:before{font-family:'icons-blank-theme';content:'\e61d';font-size:26px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.example-icon-14>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.icons-image-list{list-style:none;padding:0}.icons-image-list li{float:left;width:33%}.icons-image-list li>span{display:inline-block}.icons-image-list li>span:before{content:'';display:inline-block;width:26px;height:26px;line-height:26px;vertical-align:middle;background:url('/pub/static/frontend/Magento/blank/en_US/images/blank-theme-icons.png') no-repeat 0 0}.icons-image-list li .icon-search:before{background-position:0 0}.icons-image-list li .icon-cart:before{background-position:-26px 0}.icons-image-list li .icon-arrow-down:before{background-position:-52px 0}.icons-image-list li .icon-arrow-up:before{background-position:-78px 0}.icons-image-list li .icon-grid:before{background-position:-104px 0}.icons-image-list li .icon-list:before{background-position:-130px 0}.icons-image-list li .icon-remove:before{background-position:-156px 0}.icons-image-list li .icon-star:before{background-position:-182px 0}.icons-image-list li .icon-pointer-down:before{background-position:-208px 0}.icons-image-list li .icon-pointer-up:before{background-position:-234px 0}.icons-image-list li .icon-pointer-left:before{background-position:-260px 0}.icons-image-list li .icon-pointer-right:before{background-position:-286px 0}.icons-image-list li .icon-compare-empty:before{background-position:0 -26px}.icons-image-list li .icon-compare-full:before{background-position:-26px -26px}.icons-image-list li .icon-wishlist-empty:before{background-position:-52px -26px}.icons-image-list li .icon-wishlist-full:before{background-position:-78px -26px}.icons-image-list li .icon-update:before{background-position:-104px -26px}.icons-image-list li .icon-collapse:before{background-position:-130px -26px}.icons-image-list li .icon-expand:before{background-position:-156px -26px}.icons-image-list li .icon-menu:before{background-position:-182px -26px}.icons-image-list li .icon-prev:before{background-position:-208px -26px}.icons-image-list li .icon-next:before{background-position:-234px -26px}.icons-image-list li .icon-settings:before{background-position:-260px -26px}.icons-image-list li .icon-info:before{background-position:-286px -26px}.icons-image-list li .icon-checkmark:before{background-position:0 -52px}.icons-image-list li .icon-calendar:before{background-position:-26px -52px}.icons-image-list li .icon-comment:before{background-position:-52px -52px}.icons-image-list li .icon-comment-reflected:before{background-position:-78px -52px}.icons-image-list li .icon-envelope:before{background-position:-104px -52px}.icons-image-list li .icon-warning:before{background-position:-130px -52px}.icons-image-list li .icon-trash:before{background-position:-156px -52px}.icons-image-list li .icon-flag:before{background-position:-182px -52px}.icons-image-list li .icon-location:before{background-position:-208px -52px}.icons-image-list li .icon-up:before{background-position:-234px -52px}.icons-image-list li .icon-down:before{background-position:-260px -52px}.icons-font-list{list-style:none;padding:0}.icons-font-list li{float:left;width:25%;margin-bottom:35px;text-align:center}.icons-font-list li>span{display:inline-block;text-decoration:none}.icons-font-list li>span:before{font-family:'icons-blank-theme';font-size:34px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.icons-font-list li>span:before{content:attr(data-icon);margin:0 auto;display:block}.loader{position:fixed;top:0;right:0;bottom:0;left:0;background-color:rgba(255,255,255,.5);z-index:9999}.loader:before{border-radius:5px;background:transparent url('/pub/static/frontend/Magento/blank/en_US/images/loader-2.gif') no-repeat 50% 50%;box-sizing:border-box;content:'';position:absolute;top:0;right:0;left:0;bottom:0;margin:auto;width:160px;height:160px}.loading{position:relative}.loading:before{content:'';position:absolute;left:0;top:0;right:0;bottom:0;background:rgba(255,255,255,.5) url('/pub/static/frontend/Magento/blank/en_US/images/loader-2.gif') no-repeat 50% 50%}.example-message-info{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fdf0d5;color:#6f4400}.example-message-info a{color:#1979c3}.example-message-info a:hover{color:#006bb4}.example-message-info a:active{color:#006bb4}.example-message-warning{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fdf0d5;color:#6f4400}.example-message-warning a{color:#1979c3}.example-message-warning a:hover{color:#006bb4}.example-message-warning a:active{color:#006bb4}.example-message-error{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fae5e5;color:#e02b27}.example-message-error a{color:#1979c3}.example-message-error a:hover{color:#006bb4}.example-message-error a:active{color:#006bb4}.example-message-success{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#e5efe5;color:#006400}.example-message-success a{color:#1979c3}.example-message-success a:hover{color:#006bb4}.example-message-success a:active{color:#006bb4}.example-message-notice{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fdf0d5;color:#6f4400}.example-message-notice a{color:#1979c3}.example-message-notice a:hover{color:#006bb4}.example-message-notice a:active{color:#006bb4}.example-message-1{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fdf0d5;color:#6f4400;position:relative;padding-left:40px}.example-message-1 a{color:#1979c3}.example-message-1 a:hover{color:#006bb4}.example-message-1 a:active{color:#006bb4}.example-message-1>:first-child:before{font-family:'icons-blank-theme';content:'\e602';font-size:28px;line-height:28px;color:#c07600;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;margin:-14px 0 0;position:absolute;top:18px;left:0;text-align:center;width:40px}.example-message-2{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fae5e5;color:#e02b27;position:relative;padding-right:40px}.example-message-2 a{color:#1979c3}.example-message-2 a:hover{color:#006bb4}.example-message-2 a:active{color:#006bb4}.example-message-2:before{content:'';position:absolute;width:30px;text-align:center;top:0;height:100%;display:block;padding:0;background:#b30000}.example-message-2>:first-child:before{content:'';position:absolute;overflow:hidden;top:50%;margin-top:-5px}.example-message-2>:first-child:after{font-family:'icons-blank-theme';content:'\e602';font-size:28px;line-height:28px;color:#fff;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;margin:-14px 0 0;position:absolute;top:18px;left:0;text-align:center;width:30px}.example-message-2:before{right:0}.example-message-2>:first-child:before{border:5px solid transparent;height:0;width:0;border-right-color:#b30000;right:30px}.example-message-2>:first-child:after{right:0}.example-message-3{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#e5efe5;color:#006400;position:relative;padding-left:40px}.example-message-3 a{color:#1979c3}.example-message-3 a:hover{color:#006bb4}.example-message-3 a:active{color:#006bb4}.example-message-3:before{content:'';position:absolute;width:30px;text-align:center;top:0;height:100%;display:block;padding:0;background:#006400}.example-message-3>:first-child:before{content:'';position:absolute;overflow:hidden;top:50%;margin-top:-5px}.example-message-3>:first-child:after{font-family:'icons-blank-theme';content:'\e610';font-size:28px;line-height:28px;color:#fff;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;margin:-14px 0 0;position:absolute;top:18px;left:0;text-align:center;width:30px}.example-message-3:before{left:0}.example-message-3>:first-child:before{border:5px solid transparent;height:0;width:0;border-left-color:#006400;left:30px}.example-message-3>:first-child:after{left:0}.example-message-4{display:block;margin:0 0 10px;padding:10px 20px;font-size:1.3rem;line-height:1.2em;background:#fc0;border-color:#ffa500;color:#000;position:relative;padding-left:40px;border-width:4px;border-radius:10px}.example-message-4 a{color:#00f}.example-message-4 a:hover{color:#009}.example-message-4 a:active{color:#006}.example-message-4:before{content:'';position:absolute;width:30px;text-align:center;top:0;height:100%;display:block;padding:0;background:#green}.example-message-4>:first-child:before{content:'';position:absolute;overflow:hidden;top:50%;margin-top:-5px}.example-message-4>:first-child:after{font-family:'icons-blank-theme';content:'\e606';font-size:28px;line-height:28px;color:#000;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;margin:-14px 0 0;position:absolute;top:15px;left:0;text-align:center;width:30px}.example-message-4:before{left:0}.example-message-4>:first-child:before{border:5px solid transparent;height:0;width:0;border-left-color:#green;left:30px}.example-message-4>:first-child:after{left:0}header.header{background-color:rgba(255,0,0,.2)}.column.main{background-color:rgba(255,255,0,.2)}.column.left{background-color:rgba(0,255,255,.2)}.column.right{background-color:rgba(0,0,255,.2)}footer.footer{background-color:rgba(0,0,0,.2)}.columns{box-sizing:border-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.columns:after{content:" ";display:block;height:0;clear:both;overflow:hidden;visibility:hidden}.columns>.column{padding-bottom:40px}@media (min-width: 600px){.page-layout-1column .column.main{ width:100%;-ms-flex-order:2;-webkit-order:2;order:2}.page-layout-3columns .column.main{width:66.66666667%;display:inline-block;-ms-flex-order:2;-webkit-order:2;order:2}.page-layout-2columns-left .column.main{width:83.33333333%;float:right;-ms-flex-order:2;-webkit-order:2;order:2}.page-layout-2columns-right .column.main{width:83.33333333%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.page-layout-3columns .column.left{width:16.66666667%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.page-layout-2columns-left .column.left{width:16.66666667%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.page-layout-2columns-right .column.left{width:16.66666667%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.page-layout-3columns .column.right{width:16.66666667%;float:right;-ms-flex-order:3;-webkit-order:3;order:3}.page-layout-2columns-left .column.right{width:16.66666667%;float:right;-ms-flex-order:2;-webkit-order:2;order:2}.page-layout-2columns-right .column.right{width:16.66666667%;float:right;-ms-flex-order:2;-webkit-order:2;order:2}}.layout-example-3 .column.main{width:60%;display:inline-block;-ms-flex-order:2;-webkit-order:2;order:2}.layout-example-3 .column.left{width:20%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.layout-example-3 .column.right{width:20%;float:right;-ms-flex-order:3;-webkit-order:3;order:3}.layout-example-3-1 .column.main{width:60%;float:left;-ms-flex-order:1;-webkit-order:1;order:1}.layout-example-3-1 .column.left{width:20%;display:inline-block;-ms-flex-order:2;-webkit-order:2;order:2}.layout-example-3-1 .column.right{width:20%;float:right;-ms-flex-order:3;-webkit-order:3;order:3}.pages>.label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pages .items{font-size:0;line-height:0;letter-spacing:-1px;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.pages .item{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;margin:0 2px 0 0;display:inline-block}.pages .item .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pages a.page{color:#1979c3;display:inline-block;padding:0 4px;text-decoration:none}.pages a.page:visited{color:#800080}.pages a.page:hover{color:#006bb4;text-decoration:none}.pages a.page:active{color:#ff5501}.pages strong.page{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;color:#333;display:inline-block;font-weight:700;padding:0 4px}.pages .action{border:1px solid #d1d1d1;color:#7d7d7d;display:inline-block;padding:0;text-decoration:none}.pages .action:visited{color:#7d7d7d}.pages .action:hover{color:#7d7d7d;text-decoration:none}.pages .action:active{color:#7d7d7d}.pages .action.next{display:inline-block;text-decoration:none}.pages .action.next:visited:before{color:#7d7d7d}.pages .action.next:active:before{color:#7d7d7d}.pages .action.next>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pages .action.next:before{font-family:'icons-blank-theme';content:'\e608';font-size:46px;line-height:inherit;color:#7d7d7d;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.pages .action.next:hover:before{color:#7d7d7d}.pages .action.next:active:before{color:#7d7d7d}.pages .action.previous{display:inline-block;text-decoration:none}.pages .action.previous:visited:before{color:#7d7d7d}.pages .action.previous:active:before{color:#7d7d7d}.pages .action.previous>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.pages .action.previous:before{font-family:'icons-blank-theme';content:'\e617';font-size:46px;line-height:inherit;color:#7d7d7d;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.pages .action.previous:hover:before{color:#7d7d7d}.pages .action.previous:active:before{color:#7d7d7d}.example-pages-1>.label{display:inline-block;font-weight:700;font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal}.example-pages-1>.label:after{content:':'}.example-pages-1 .items{font-size:0;line-height:0;letter-spacing:-1px;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.example-pages-1 .item{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;margin:0 3px;display:inline-block}.example-pages-1 .item .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-1 a.page{background-color:#ccc;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #f4f4f4 0, #ccc 100%);background-image:linear-gradient(to bottom, #f4f4f4 0, #ccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4f4f4', endColorstr='#cccccc', GradientType=0);border:1px solid #b3b3b3;color:#333;display:inline-block;padding:0 4px;text-decoration:none}.example-pages-1 a.page:visited{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#800080}.example-pages-1 a.page:hover{background-color:#f4f4f4;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #ccc 0, #f4f4f4 100%);background-image:linear-gradient(to bottom, #ccc 0, #f4f4f4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#f4f4f4', GradientType=0);border:1px solid #999;color:#333;text-decoration:none}.example-pages-1 a.page:active{background-color:false;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top,false 0,false 100%);background-image:linear-gradient(to bottom,false 0,false 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='false', endColorstr='false', GradientType=0);color:#ff5501}.example-pages-1 strong.page{background:#1979c3;border:1px solid #135d96;font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;color:#f7b32e;display:inline-block;font-weight:700;padding:0 4px}.example-pages-1 .action{border:1px solid #d1d1d1;color:#7d7d7d;display:inline-block;padding:0;text-decoration:none}.example-pages-1 .action:visited{color:#7d7d7d}.example-pages-1 .action:hover{color:#ff5501;text-decoration:none}.example-pages-1 .action:active{color:#7d7d7d}.example-pages-1 .action.next{display:inline-block;text-decoration:none}.example-pages-1 .action.next:visited:before{color:#7d7d7d}.example-pages-1 .action.next:active:before{color:#7d7d7d}.example-pages-1 .action.next>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-1 .action.next:before{font-family:'icons-blank-theme';content:'\e608';font-size:30px;line-height:inherit;color:#7d7d7d;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.example-pages-1 .action.next:hover:before{color:#ff5501}.example-pages-1 .action.next:active:before{color:#7d7d7d}.example-pages-1 .action.previous{display:inline-block;text-decoration:none}.example-pages-1 .action.previous:visited:before{color:#7d7d7d}.example-pages-1 .action.previous:active:before{color:#7d7d7d}.example-pages-1 .action.previous>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-1 .action.previous:before{font-family:'icons-blank-theme';content:'\e617';font-size:30px;line-height:inherit;color:#7d7d7d;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.example-pages-1 .action.previous:hover:before{color:#ff5501}.example-pages-1 .action.previous:active:before{color:#7d7d7d}.example-pages-2>.label{display:inline-block;font-weight:700;font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal}.example-pages-2>.label:after{content:':'}.example-pages-2 .items{font-size:0;line-height:0;letter-spacing:-1px;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.example-pages-2 .item{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;margin:0 2px 0 0;display:inline-block}.example-pages-2 .item .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-2 a.page{color:#1979c3;display:inline-block;padding:0 4px;text-decoration:none}.example-pages-2 a.page:visited{color:#800080}.example-pages-2 a.page:hover{color:#006bb4;text-decoration:none}.example-pages-2 a.page:active{color:#ff5501}.example-pages-2 strong.page{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;color:#333;display:inline-block;font-weight:700;padding:0 4px}.example-pages-2 .action{border:1px solid #d1d1d1;color:#7d7d7d;display:inline-block;padding:0;text-decoration:none}.example-pages-2 .action:visited{color:#7d7d7d}.example-pages-2 .action:hover{color:#7d7d7d;text-decoration:none}.example-pages-2 .action:active{color:#7d7d7d}.example-pages-3>.label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-3 .items{font-size:0;line-height:0;letter-spacing:-1px;white-space:nowrap;margin:0;padding:0;list-style:none none;display:inline-block;font-weight:700}.example-pages-3 .item{font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;margin:0 2px 0 0;display:inline-block}.example-pages-3 .item .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-3 a.page{background:#1979c3;color:#fff;display:inline-block;padding:0 4px;text-decoration:none}.example-pages-3 a.page:visited{background:#800080;color:#fff}.example-pages-3 a.page:hover{background:#006bb4;color:#fff;text-decoration:none}.example-pages-3 a.page:active{background:#ff5501;color:#fff}.example-pages-3 strong.page{background:#800080;font-size:1.2rem;font-size:12px;line-height:32px;letter-spacing:normal;color:#fff;display:inline-block;font-weight:700;padding:0 4px}.example-pages-3 .action{background:#1979c3;border:1px solid #d1d1d1;color:#fff;display:inline-block;padding:0;text-decoration:none}.example-pages-3 .action:visited{background:#800080;color:#7d7d7d}.example-pages-3 .action:hover{background:#006bb4;color:#fff;text-decoration:none}.example-pages-3 .action:active{background:#ff5501;color:#fff}.example-pages-3 .action.next{display:inline-block;text-decoration:none}.example-pages-3 .action.next:visited:before{color:#7d7d7d}.example-pages-3 .action.next:active:before{color:#fff}.example-pages-3 .action.next>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-3 .action.next:before{font-family:'icons-blank-theme';content:'\e608';font-size:46px;line-height:inherit;color:#fff;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.example-pages-3 .action.next:hover:before{color:#fff}.example-pages-3 .action.next:active:before{color:#fff}.example-pages-3 .action.previous{display:inline-block;text-decoration:none}.example-pages-3 .action.previous:visited:before{color:#7d7d7d}.example-pages-3 .action.previous:active:before{color:#fff}.example-pages-3 .action.previous>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-pages-3 .action.previous:before{font-family:'icons-blank-theme';content:'\e617';font-size:46px;line-height:inherit;color:#fff;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0 0 0 -6px}.example-pages-3 .action.previous:hover:before{color:#fff}.example-pages-3 .action.previous:active:before{color:#fff}.window.popup.popup-example{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example .popup-actions .action.close:focus,.window.popup.popup-example .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example .popup-actions .action.close.disabled,.window.popup.popup-example .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example.active{opacity:1}.window.popup.popup-example-1{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-1 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-1 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-1 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-1 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-1 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-1 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-1 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-1 .popup-actions .action.close:focus,.window.popup.popup-example-1 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-1 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-1 .popup-actions .action.close.disabled,.window.popup.popup-example-1 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-1 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-1.active{opacity:1}.window.overlay{transition:opacity .15s linear;position:fixed;top:0;right:0;bottom:0;left:0;background:#000;z-index:1000;opacity:0}.window.overlay.active{opacity:.5;filter:alpha(opacity=50)}.window.popup.popup-example-2{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;overflow-y:auto;max-height:200px;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-2 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-2 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-2 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-2 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-2 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-2 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-2 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-2 .popup-actions .action.close:focus,.window.popup.popup-example-2 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-2 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-2 .popup-actions .action.close.disabled,.window.popup.popup-example-2 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-2 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-2.active{opacity:1}.window.popup.popup-example-3{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-3 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-3 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-3 .popup-content{overflow-y:auto;max-height:200px}.window.popup.popup-example-3 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-3 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-3 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-3 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-3 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-3 .popup-actions .action.close:focus,.window.popup.popup-example-3 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-3 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-3 .popup-actions .action.close.disabled,.window.popup.popup-example-3 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-3 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-3.active{opacity:1}.window.popup.popup-example-4{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-4 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-4 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-4 .popup-content{margin:0 0 20px}.window.popup.popup-example-4 .popup-footer{margin:0 20px}.window.popup.popup-example-4 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-4 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-4 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-4 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-4 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-4 .popup-actions .action.close:focus,.window.popup.popup-example-4 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-4 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-4 .popup-actions .action.close.disabled,.window.popup.popup-example-4 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-4 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-4.active{opacity:1}.window.popup.popup-example-5{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-5 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-5 .popup-header .title{font-size:4rem;font-weight:300;line-height:1.1;margin-top:0rem;margin-bottom:2rem}.window.popup.popup-example-5 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-5 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-5 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-5 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-5 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-5 .popup-actions .action.close:focus,.window.popup.popup-example-5 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-5 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-5 .popup-actions .action.close.disabled,.window.popup.popup-example-5 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-5 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-5.active{opacity:1}.window.popup.popup-example-6{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-6 .popup-footer .actions.toolbar{text-align:left}.window.popup.popup-example-6 .popup-footer .actions.toolbar:before,.window.popup.popup-example-6 .popup-footer .actions.toolbar:after{content:"";display:table}.window.popup.popup-example-6 .popup-footer .actions.toolbar:after{clear:both}.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary{float:left}.window.popup.popup-example-6 .popup-footer .actions.toolbar .primary,.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary{display:inline-block}.window.popup.popup-example-6 .popup-footer .actions.toolbar .primary a.action,.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary a.action{display:inline-block}.window.popup.popup-example-6 .popup-footer .actions.toolbar .primary .action{margin:0 5px 0 0}.window.popup.popup-example-6 .popup-footer .actions.toolbar .secondary a.action{margin-top:6px}.window.popup.popup-example-6 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-6 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-6 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-6 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-6 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-6 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-6 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-6 .popup-actions .action.close:focus,.window.popup.popup-example-6 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-6 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-6 .popup-actions .action.close.disabled,.window.popup.popup-example-6 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-6 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-6.active{opacity:1}.window.popup.popup-example-7{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-7 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-7 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-7 .popup-actions .action.close{position:absolute;top:10px;right:10px}.window.popup.popup-example-7.active{opacity:1}.window.popup.popup-example-8{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-8 .popup-header{margin:0 0 25px;padding-right:30px}.window.popup.popup-example-8 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-8 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-8 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e613';font-size:30px;line-height:22px;color:red;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:0}.window.popup.popup-example-8 .popup-actions .action.close:hover:before{color:#090}.window.popup.popup-example-8 .popup-actions .action.close:active:before{color:#00f}.window.popup.popup-example-8 .popup-actions .action.close:focus,.window.popup.popup-example-8 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-8 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-8 .popup-actions .action.close.disabled,.window.popup.popup-example-8 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-8 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-8.active{opacity:1}.window.popup.popup-example-9{background:#fff;border:1px solid #aeaeae;padding:22px;width:auto;box-shadow:0 3px 3px rgba(0,0,0,.15);top:0;right:0;bottom:0;left:0;display:none;opacity:0;position:fixed;z-index:1001;transition:opacity .3s linear}.window.popup.popup-example-9 .popup-header{margin:0 0 25px;padding-right:22px}.window.popup.popup-example-9 .popup-header .title{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}.window.popup.popup-example-9 .popup-actions .action.close{position:absolute;display:inline-block;background-image:none;background:0;border:0;margin:0;padding:0;-moz-box-sizing:content-box;box-shadow:none;text-shadow:none;text-decoration:none;line-height:inherit;font-weight:400;top:10px;right:10px}.window.popup.popup-example-9 .popup-actions .action.close>span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.window.popup.popup-example-9 .popup-actions .action.close:before{font-family:'icons-blank-theme';content:'\e616';font-size:22px;line-height:22px;color:inherit;overflow:hidden;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:top;text-align:center;margin:0}.window.popup.popup-example-9 .popup-actions .action.close:hover:before{color:inherit}.window.popup.popup-example-9 .popup-actions .action.close:active:before{color:inherit}.window.popup.popup-example-9 .popup-actions .action.close:focus,.window.popup.popup-example-9 .popup-actions .action.close:active{background:0;border:0}.window.popup.popup-example-9 .popup-actions .action.close:hover{background:0;border:0}.window.popup.popup-example-9 .popup-actions .action.close.disabled,.window.popup.popup-example-9 .popup-actions .action.close[disabled],fieldset[disabled] .window.popup.popup-example-9 .popup-actions .action.close{cursor:not-allowed;pointer-events:none;opacity:.5}.window.popup.popup-example-9.active{opacity:1}.window.overlay.example-overlay-1.active{transition:opacity .15s linear;position:fixed;top:0;right:0;bottom:0;left:0;background:#0f5293;z-index:1000;opacity:0}.window.overlay.example-overlay-1.active.active{opacity:.8;filter:alpha(opacity=80)}.example-ratings-1{overflow:hidden}.example-ratings-1:before{color:#c7c7c7;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;letter-spacing:-10px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;vertical-align:top;content:'\e605' '\e605' '\e605' '\e605' '\e605';position:absolute;z-index:1;display:block}.example-ratings-1 input[type="radio"]{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-1 input[type="radio"]:focus+label:before,.example-ratings-1 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-1 label{position:absolute;display:block;cursor:pointer}.example-ratings-1 label span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-1 label:before{color:#ff5601;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;letter-spacing:-10px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;vertical-align:top;opacity:0}.example-ratings-1 label:hover:before{opacity:1}.example-ratings-1 label:hover~label:before{opacity:0}.example-ratings-1 .rating-5{z-index:2}.example-ratings-1 .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-1 .rating-4{z-index:3}.example-ratings-1 .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.example-ratings-1 .rating-3{z-index:4}.example-ratings-1 .rating-3:before{content:'\e605' '\e605' '\e605'}.example-ratings-1 .rating-2{z-index:5}.example-ratings-1 .rating-2:before{content:'\e605' '\e605'}.example-ratings-1 .rating-1{z-index:6}.example-ratings-1 .rating-1:before{content:'\e605'}.example-ratings-2{overflow:hidden}.example-ratings-2:before{color:#c7c7c7;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;letter-spacing:-10px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;vertical-align:top;content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605';position:absolute;z-index:1;display:block}.example-ratings-2 input[type="radio"]{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-2 input[type="radio"]:focus+label:before,.example-ratings-2 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-2 label{position:absolute;display:block;cursor:pointer}.example-ratings-2 label span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-2 label:before{color:#ff5601;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;letter-spacing:-10px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;vertical-align:top;opacity:0}.example-ratings-2 label:hover:before{opacity:1}.example-ratings-2 label:hover~label:before{opacity:0}.example-ratings-2 .rating-8{z-index:2}.example-ratings-2 .rating-8:before{content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-7{z-index:3}.example-ratings-2 .rating-7:before{content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-6{z-index:4}.example-ratings-2 .rating-6:before{content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-5{z-index:5}.example-ratings-2 .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-4{z-index:6}.example-ratings-2 .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.example-ratings-2 .rating-3{z-index:7}.example-ratings-2 .rating-3:before{content:'\e605' '\e605' '\e605'}.example-ratings-2 .rating-2{z-index:8}.example-ratings-2 .rating-2:before{content:'\e605' '\e605'}.example-ratings-2 .rating-1{z-index:9}.example-ratings-2 .rating-1:before{content:'\e605'}.example-ratings-3{overflow:hidden}.example-ratings-3:before{color:#aff5e3;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;letter-spacing:-10px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;vertical-align:top;content:'\e605' '\e605' '\e605' '\e605' '\e605';position:absolute;z-index:1;display:block}.example-ratings-3 input[type="radio"]{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-3 input[type="radio"]:focus+label:before,.example-ratings-3 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-3 label{position:absolute;display:block;cursor:pointer}.example-ratings-3 label span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-3 label:before{color:#0a6767;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;letter-spacing:-10px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;vertical-align:top;opacity:0}.example-ratings-3 label:hover:before{opacity:1}.example-ratings-3 label:hover~label:before{opacity:0}.example-ratings-3 .rating-5{z-index:2}.example-ratings-3 .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.example-ratings-3 .rating-4{z-index:3}.example-ratings-3 .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.example-ratings-3 .rating-3{z-index:4}.example-ratings-3 .rating-3:before{content:'\e605' '\e605' '\e605'}.example-ratings-3 .rating-2{z-index:5}.example-ratings-3 .rating-2:before{content:'\e605' '\e605'}.example-ratings-3 .rating-1{z-index:6}.example-ratings-3 .rating-1:before{content:'\e605'}.example-ratings-4{overflow:hidden}.example-ratings-4:before{color:#c7c7c7;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;letter-spacing:-10px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;vertical-align:top;content:'\e600' '\e600' '\e600' '\e600' '\e600';position:absolute;z-index:1;display:block}.example-ratings-4 input[type="radio"]{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-4 input[type="radio"]:focus+label:before,.example-ratings-4 input[type="radio"]:checked+label:before{opacity:1}.example-ratings-4 label{position:absolute;display:block;cursor:pointer}.example-ratings-4 label span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-ratings-4 label:before{color:#ff5601;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;letter-spacing:-10px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;vertical-align:top;opacity:0}.example-ratings-4 label:hover:before{opacity:1}.example-ratings-4 label:hover~label:before{opacity:0}.example-ratings-4 .rating-5{z-index:2}.example-ratings-4 .rating-5:before{content:'\e600' '\e600' '\e600' '\e600' '\e600'}.example-ratings-4 .rating-4{z-index:3}.example-ratings-4 .rating-4:before{content:'\e600' '\e600' '\e600' '\e600'}.example-ratings-4 .rating-3{z-index:4}.example-ratings-4 .rating-3:before{content:'\e600' '\e600' '\e600'}.example-ratings-4 .rating-2{z-index:5}.example-ratings-4 .rating-2:before{content:'\e600' '\e600'}.example-ratings-4 .rating-1{z-index:6}.example-ratings-4 .rating-1:before{content:'\e600'}.exapmle-ratings-5 .control.rating.vote{overflow:hidden}.exapmle-ratings-5 .control.rating.vote:before{color:#c7c7c7;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;letter-spacing:-10px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;vertical-align:top;content:'\e605' '\e605' '\e605' '\e605' '\e605';position:absolute;z-index:1;display:block}.exapmle-ratings-5 .control.rating.vote input[type="radio"]{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.exapmle-ratings-5 .control.rating.vote input[type="radio"]:focus+label:before,.exapmle-ratings-5 .control.rating.vote input[type="radio"]:checked+label:before{opacity:1}.exapmle-ratings-5 .control.rating.vote label{position:absolute;display:block;cursor:pointer}.exapmle-ratings-5 .control.rating.vote label span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.exapmle-ratings-5 .control.rating.vote label:before{color:#ff5601;font-family:'icons-blank-theme';font-style:normal;font-size:28px;line-height:28px;letter-spacing:-10px;height:28px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased;vertical-align:top;opacity:0}.exapmle-ratings-5 .control.rating.vote label:hover:before{opacity:1}.exapmle-ratings-5 .control.rating.vote label:hover~label:before{opacity:0}.exapmle-ratings-5 .control.rating.vote .rating-5{z-index:2}.exapmle-ratings-5 .control.rating.vote .rating-5:before{content:'\e605' '\e605' '\e605' '\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-4{z-index:3}.exapmle-ratings-5 .control.rating.vote .rating-4:before{content:'\e605' '\e605' '\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-3{z-index:4}.exapmle-ratings-5 .control.rating.vote .rating-3:before{content:'\e605' '\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-2{z-index:5}.exapmle-ratings-5 .control.rating.vote .rating-2:before{content:'\e605' '\e605'}.exapmle-ratings-5 .control.rating.vote .rating-1{z-index:6}.exapmle-ratings-5 .control.rating.vote .rating-1:before{content:'\e605'}.example-rating-summary-1{white-space:nowrap;overflow:hidden}.example-rating-summary-1 .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-1 .rating-result:before{position:absolute;top:0;left:0;width:100%;z-index:1;color:#c7c7c7;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-1 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-1 .rating-result>span:before{position:relative;z-index:2;color:#ff5601;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-1 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-2{white-space:nowrap;overflow:hidden}.example-rating-summary-2 .rating-result{width:154px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-2 .rating-result:before{position:absolute;top:0;left:0;width:100%;z-index:1;color:#c7c7c7;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-2 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-2 .rating-result>span:before{position:relative;z-index:2;color:#ff5601;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-2 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-3{white-space:nowrap;overflow:hidden}.example-rating-summary-3 .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-3 .rating-result:before{position:absolute;top:0;left:0;width:100%;z-index:1;color:#aff5e3;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-3 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-3 .rating-result>span:before{position:relative;z-index:2;color:#0a6767;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-3 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-4{white-space:nowrap;overflow:hidden}.example-rating-summary-4 .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-4 .rating-result:before{position:absolute;top:0;left:0;width:100%;z-index:1;color:#c7c7c7;display:block;font-family:'icons-blank-theme';content:'\e600' '\e600' '\e600' '\e600' '\e600';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-4 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-4 .rating-result>span:before{position:relative;z-index:2;color:#ff5601;display:block;font-family:'icons-blank-theme';content:'\e600' '\e600' '\e600' '\e600' '\e600';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-4 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-5{white-space:nowrap;overflow:hidden}.example-rating-summary-5 .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-5 .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-5 .rating-result:before{position:absolute;top:0;left:0;width:100%;z-index:1;color:#c7c7c7;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-5 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-5 .rating-result>span:before{position:relative;z-index:2;color:#ff5601;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-5 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-6 .rating-summary{white-space:nowrap;overflow:hidden}.example-rating-summary-6 .rating-summary .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-6 .rating-summary .rating-result:before{position:absolute;top:0;left:0;width:100%;z-index:1;color:#c7c7c7;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-6 .rating-summary .rating-result>span{display:block;overflow:hidden}.example-rating-summary-6 .rating-summary .rating-result>span:before{position:relative;z-index:2;color:#ff5601;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-6 .rating-summary .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-7{white-space:nowrap;overflow:hidden}.example-rating-summary-7 .rating-result{width:100px;display:inline-block;vertical-align:middle;position:relative}.example-rating-summary-7 .rating-result:before{position:absolute;top:0;left:0;width:100%;z-index:1;color:#c7c7c7;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-7 .rating-result>span{display:block;overflow:hidden}.example-rating-summary-7 .rating-result>span:before{position:relative;z-index:2;color:#ff5601;display:block;font-family:'icons-blank-theme';content:'\e605' '\e605' '\e605' '\e605' '\e605';font-style:normal;font-size:28px;height:28px;line-height:28px;letter-spacing:-10px;speak:none;font-weight:400;-webkit-font-smoothing:antialiased}.example-rating-summary-7 .rating-result>span span{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-rating-summary-7 .label{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-responsive-block{padding:10px}.example-sections-1{position:relative;z-index:1}.example-sections-1:before,.example-sections-1:after{content:"";display:table}.example-sections-1:after{clear:both}.example-sections-1>.item.title{float:left;width:auto}.example-sections-1>.item.title>.switch{display:block;height:20px;position:relative;z-index:2}.example-sections-1>.item.content{box-sizing:border-box;float:right;margin-top:20px;margin-left:-100%;width:100%}.example-sections-1>.item.content:before,.example-sections-1>.item.content:after{content:"";display:table}.example-sections-1>.item.content:after{clear:both}.example-sections-1>.item.content.active{display:block}.example-sections-1>.item.title{margin:0 5px 0 0}.example-sections-1>.item.title>.switch{font-size:1.4rem;font-weight:600;line-height:20px;color:#7d7d7d;text-decoration:none;background:#f0f0f0;border:1px solid #d1d1d1;border-bottom:0;height:20px;padding:5px 20px 5px 20px}.example-sections-1>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-1>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-1>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-1>.item.title:not(.disabled)>.switch:focus,.example-sections-1>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-1>.item.title:not(.disabled)>.switch:active,.example-sections-1>.item.title.active>.switch,.example-sections-1>.item.title.active>.switch:focus,.example-sections-1>.item.title.active>.switch:hover{background:#fff;color:#333}.example-sections-1>.item.title.active>.switch,.example-sections-1>.item.title.active>.switch:focus,.example-sections-1>.item.title.active>.switch:hover{padding-bottom:6px}.example-sections-1>.item.content{background:#fff;margin-top:31px;padding:20px 20px 20px 20px;border:1px solid #d1d1d1}.example-sections-2{position:relative;z-index:1}.example-sections-2:before,.example-sections-2:after{content:"";display:table}.example-sections-2:after{clear:both}.example-sections-2>.item.title{float:left;width:auto}.example-sections-2>.item.title>.switch{display:block;height:20px;position:relative;z-index:2}.example-sections-2>.item.content{box-sizing:border-box;float:right;margin-top:20px;margin-left:-100%;width:100%}.example-sections-2>.item.content:before,.example-sections-2>.item.content:after{content:"";display:table}.example-sections-2>.item.content:after{clear:both}.example-sections-2>.item.content.active{display:block}.example-sections-2>.item.title{margin:0 5px 0 0}.example-sections-2>.item.title>.switch{font-size:1.4rem;font-weight:600;line-height:20px;color:#7d7d7d;text-decoration:none;background:#f0f0f0;border:1px solid #d1d1d1;border-bottom:0;height:20px;padding:5px 20px 5px 20px}.example-sections-2>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-2>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-2>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-2>.item.title:not(.disabled)>.switch:focus,.example-sections-2>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-2>.item.title:not(.disabled)>.switch:active,.example-sections-2>.item.title.active>.switch,.example-sections-2>.item.title.active>.switch:focus,.example-sections-2>.item.title.active>.switch:hover{background:#fff;color:#333}.example-sections-2>.item.title.active>.switch,.example-sections-2>.item.title.active>.switch:focus,.example-sections-2>.item.title.active>.switch:hover{padding-bottom:6px}.example-sections-2>.item.content{background:#fff;margin-top:31px;padding:20px 20px 20px 20px;border:0;border-top:1px solid #d1d1d1}.example-sections-3{margin:0;padding:0}.example-sections-3>.item.title{box-sizing:border-box;float:none;width:100%}.example-sections-3>.item.title>.switch{display:block}.example-sections-3>.item.content{box-sizing:border-box;float:none;margin:0;display:block}.example-sections-3>.item.content:before,.example-sections-3>.item.content:after{content:"";display:table}.example-sections-3>.item.content:after{clear:both}.example-sections-3>.item.content.active{display:block}.example-sections-3>.item.title{margin:0 0 5px}.example-sections-3>.item.title>.switch{background:#f0f0f0;border-top:1px solid #d1d1d1;border-right:1px solid #d1d1d1;border-bottom:1px solid #d1d1d1;border-left:1px solid #d1d1d1;height:40px;padding:5px 20px 5px 20px;font-size:1.8rem;font-weight:600;line-height:40px;color:#7d7d7d;text-decoration:none}.example-sections-3>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-3>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-3>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-3>.item.title:not(.disabled)>.switch:focus,.example-sections-3>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-3>.item.title:not(.disabled)>.switch:active,.example-sections-3>.item.title.active>.switch,.example-sections-3>.item.title.active>.switch:focus,.example-sections-3>.item.title.active>.switch:hover{background:#fff;padding-bottom:5px}.example-sections-3>.item.content{background:#fff;border:1px solid #d1d1d1;margin:0 0 5px;padding:20px 20px 20px 20px}@media only screen and (max-width: 99999px){.example-sections-4{ position:relative;z-index:1}.example-sections-4:before,.example-sections-4:after{content:"";display:table}.example-sections-4:after{clear:both}.example-sections-4>.item.title{float:left;width:auto}.example-sections-4>.item.title>.switch{display:block;height:20px;position:relative;z-index:2}.example-sections-4>.item.content{box-sizing:border-box;float:right;margin-top:20px;margin-left:-100%;width:100%}.example-sections-4>.item.content:before,.example-sections-4>.item.content:after{content:"";display:table}.example-sections-4>.item.content:after{clear:both}.example-sections-4>.item.content.active{display:block}.example-sections-4>.item.title{margin:0 5px 0 0}.example-sections-4>.item.title>.switch{font-size:1.4rem;font-weight:600;line-height:20px;color:#7d7d7d;text-decoration:none;background:#f0f0f0;border:1px solid #d1d1d1;border-bottom:0;height:20px;padding:5px 20px 5px 20px}.example-sections-4>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-4>.item.title:not(.disabled)>.switch:focus,.example-sections-4>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-4>.item.title:not(.disabled)>.switch:active,.example-sections-4>.item.title.active>.switch,.example-sections-4>.item.title.active>.switch:focus,.example-sections-4>.item.title.active>.switch:hover{background:#fff;color:#333}.example-sections-4>.item.title.active>.switch,.example-sections-4>.item.title.active>.switch:focus,.example-sections-4>.item.title.active>.switch:hover{padding-bottom:6px}.example-sections-4>.item.content{background:#fff;margin-top:31px;padding:20px 20px 20px 20px;border:1px solid #d1d1d1}}@media only screen and (max-width: 768px){.example-sections-4{ margin:0;padding:0}.example-sections-4>.item.title{box-sizing:border-box;float:none;width:100%}.example-sections-4>.item.title>.switch{display:block}.example-sections-4>.item.content{box-sizing:border-box;float:none;margin:0;display:block}.example-sections-4>.item.content:before,.example-sections-4>.item.content:after{content:"";display:table}.example-sections-4>.item.content:after{clear:both}.example-sections-4>.item.content.active{display:block}.example-sections-4>.item.title{margin:0 0 5px}.example-sections-4>.item.title>.switch{background:#f0f0f0;border-top:1px solid #d1d1d1;border-right:1px solid #d1d1d1;border-bottom:1px solid #d1d1d1;border-left:1px solid #d1d1d1;height:40px;padding:5px 20px 5px 20px;font-size:1.8rem;font-weight:600;line-height:40px;color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:visited{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:hover{color:#7d7d7d;text-decoration:none}.example-sections-4>.item.title>.switch:active{color:#333;text-decoration:none}.example-sections-4>.item.title:not(.disabled)>.switch:focus,.example-sections-4>.item.title:not(.disabled)>.switch:hover{background:#fcfcfc}.example-sections-4>.item.title:not(.disabled)>.switch:active,.example-sections-4>.item.title.active>.switch,.example-sections-4>.item.title.active>.switch:focus,.example-sections-4>.item.title.active>.switch:hover{background:#fff;padding-bottom:5px}.example-sections-4>.item.content{background:#fff;border:1px solid #d1d1d1;margin:0 0 5px;padding:20px 20px 20px 20px}}.example-sections-5{position:relative;z-index:1}.example-sections-5:before,.example-sections-5:after{content:"";display:table}.example-sections-5:after{clear:both}.example-sections-5>.item.title{float:left;width:auto}.example-sections-5>.item.title>.switch{display:block;height:20px;position:relative;z-index:2}.example-sections-5>.item.content{box-sizing:border-box;float:right;margin-top:20px;margin-left:-100%;width:100%}.example-sections-5>.item.content:before,.example-sections-5>.item.content:after{content:"";display:table}.example-sections-5>.item.content:after{clear:both}.example-sections-5>.item.content.active{display:block}.example-sections-6{margin:0;padding:0}.example-sections-6>.item.title{box-sizing:border-box;float:none;width:100%}.example-sections-6>.item.title>.switch{display:block}.example-sections-6>.item.content{box-sizing:border-box;float:none;margin:0;display:block}.example-sections-6>.item.content:before,.example-sections-6>.item.content:after{content:"";display:table}.example-sections-6>.item.content:after{clear:both}.example-sections-6>.item.content.active{display:block}.example-table-1{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-1 th{text-align:left}.example-table-1>tbody>tr>th,.example-table-1>tfoot>tr>th,.example-table-1>tbody>tr>td,.example-table-1>tfoot>tr>td{vertical-align:top}.example-table-1>thead>tr>th,.example-table-1>thead>tr>td{vertical-align:bottom}.example-table-1>thead>tr>th,.example-table-1>tbody>tr>th,.example-table-1>tfoot>tr>th,.example-table-1>thead>tr>td,.example-table-1>tbody>tr>td,.example-table-1>tfoot>tr>td{padding:8px 10px}.example-table-2>thead>tr>th,.example-table-2>tbody>tr>th,.example-table-2>tfoot>tr>th{color:#111;font-weight:700}.example-table-3{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-3 th{text-align:left}.example-table-3>tbody>tr>th,.example-table-3>tfoot>tr>th,.example-table-3>tbody>tr>td,.example-table-3>tfoot>tr>td{vertical-align:top}.example-table-3>thead>tr>th,.example-table-3>thead>tr>td{vertical-align:bottom}.example-table-3>thead>tr>th,.example-table-3>tbody>tr>th,.example-table-3>tfoot>tr>th,.example-table-3>thead>tr>td,.example-table-3>tbody>tr>td,.example-table-3>tfoot>tr>td{padding:8px 10px}.example-table-3>caption{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-table-4{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-4 th{text-align:left}.example-table-4>tbody>tr>th,.example-table-4>tfoot>tr>th,.example-table-4>tbody>tr>td,.example-table-4>tfoot>tr>td{vertical-align:top}.example-table-4>thead>tr>th,.example-table-4>thead>tr>td{vertical-align:bottom}.example-table-4>thead>tr>th,.example-table-4>tbody>tr>th,.example-table-4>tfoot>tr>th,.example-table-4>thead>tr>td,.example-table-4>tbody>tr>td,.example-table-4>tfoot>tr>td{padding:8px 10px}.example-table-4>thead>tr>td,.example-table-4>tbody>tr>td,.example-table-4>tfoot>tr>td{padding:15px 25px 5px 0}.example-table-4>thead>tr>th,.example-table-4>tbody>tr>th,.example-table-4>tfoot>tr>th{padding:15px 25px 10px 0}.example-table-5{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;background:#fff}.example-table-5 th{text-align:left}.example-table-5>tbody>tr>th,.example-table-5>tfoot>tr>th,.example-table-5>tbody>tr>td,.example-table-5>tfoot>tr>td{vertical-align:top}.example-table-5>thead>tr>th,.example-table-5>thead>tr>td{vertical-align:bottom}.example-table-5>thead>tr>th,.example-table-5>tbody>tr>th,.example-table-5>tfoot>tr>th,.example-table-5>thead>tr>td,.example-table-5>tbody>tr>td,.example-table-5>tfoot>tr>td{padding:8px 10px}.example-table-5>thead{background:#ccf}.example-table-5>tfoot{background:#cff}.example-table-5>tbody>tr>td{background:#fcc}.example-table-5>tbody>tr>th{background:#ffc}.example-table-6{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;border:1px solid #d1d1d1}.example-table-6 th{text-align:left}.example-table-6>tbody>tr>th,.example-table-6>tfoot>tr>th,.example-table-6>tbody>tr>td,.example-table-6>tfoot>tr>td{vertical-align:top}.example-table-6>thead>tr>th,.example-table-6>thead>tr>td{vertical-align:bottom}.example-table-6>thead>tr>th,.example-table-6>tbody>tr>th,.example-table-6>tfoot>tr>th,.example-table-6>thead>tr>td,.example-table-6>tbody>tr>td,.example-table-6>tfoot>tr>td{padding:8px 10px}.example-table-6>thead>tr>th,.example-table-6>tbody>tr>th,.example-table-6>tfoot>tr>th,.example-table-6>thead>tr>td,.example-table-6>tbody>tr>td,.example-table-6>tfoot>tr>td{border:1px solid #d1d1d1}.example-table-7{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-7 th{text-align:left}.example-table-7>tbody>tr>th,.example-table-7>tfoot>tr>th,.example-table-7>tbody>tr>td,.example-table-7>tfoot>tr>td{vertical-align:top}.example-table-7>thead>tr>th,.example-table-7>thead>tr>td{vertical-align:bottom}.example-table-7>thead>tr>th,.example-table-7>tbody>tr>th,.example-table-7>tfoot>tr>th,.example-table-7>thead>tr>td,.example-table-7>tbody>tr>td,.example-table-7>tfoot>tr>td{padding:8px 10px}.example-table-7>thead>tr>th,.example-table-7>tbody>tr>th,.example-table-7>tfoot>tr>th,.example-table-7>thead>tr>td,.example-table-7>tbody>tr>td,.example-table-7>tfoot>tr>td{border-top:1px solid #d1d1d1}.example-table-7>caption+thead>tr:first-child>th,.example-table-7>colgroup+thead>tr:first-child>th,.example-table-7>thead:first-child>tr:first-child>th,.example-table-7>caption+thead>tr:first-child>td,.example-table-7>colgroup+thead>tr:first-child>td,.example-table-7>thead:first-child>tr:first-child>td{border-top:0}.example-table-7>tbody+tbody{border-top:1px solid #d1d1d1}.example-table-8{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-8 th{text-align:left}.example-table-8>tbody>tr>th,.example-table-8>tfoot>tr>th,.example-table-8>tbody>tr>td,.example-table-8>tfoot>tr>td{vertical-align:top}.example-table-8>thead>tr>th,.example-table-8>thead>tr>td{vertical-align:bottom}.example-table-8>thead>tr>th,.example-table-8>tbody>tr>th,.example-table-8>tfoot>tr>th,.example-table-8>thead>tr>td,.example-table-8>tbody>tr>td,.example-table-8>tfoot>tr>td{padding:8px 10px}.example-table-8>thead>tr>th,.example-table-8>tbody>tr>th,.example-table-8>tfoot>tr>th,.example-table-8>thead>tr>td,.example-table-8>tbody>tr>td,.example-table-8>tfoot>tr>td{border-left:1px solid #d1d1d1}.example-table-8>thead>tr>th:first-child,.example-table-8>tbody>tr>th:first-child,.example-table-8>tfoot>tr>th:first-child,.example-table-8>thead>tr>td:first-child,.example-table-8>tbody>tr>td:first-child,.example-table-8>tfoot>tr>td:first-child{border-left:0}.example-table-9{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;border:0}.example-table-9 th{text-align:left}.example-table-9>tbody>tr>th,.example-table-9>tfoot>tr>th,.example-table-9>tbody>tr>td,.example-table-9>tfoot>tr>td{vertical-align:top}.example-table-9>thead>tr>th,.example-table-9>thead>tr>td{vertical-align:bottom}.example-table-9>thead>tr>th,.example-table-9>tbody>tr>th,.example-table-9>tfoot>tr>th,.example-table-9>thead>tr>td,.example-table-9>tbody>tr>td,.example-table-9>tfoot>tr>td{padding:8px 10px}.example-table-9>thead>tr>th,.example-table-9>tbody>tr>th,.example-table-9>tfoot>tr>th,.example-table-9>thead>tr>td,.example-table-9>tbody>tr>td,.example-table-9>tfoot>tr>td{border:0}.example-table-9>thead>tr>th,.example-table-9>thead>tr>td{border-bottom:1px solid #d1d1d1}.example-table-10{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;border:0}.example-table-10 th{text-align:left}.example-table-10>tbody>tr>th,.example-table-10>tfoot>tr>th,.example-table-10>tbody>tr>td,.example-table-10>tfoot>tr>td{vertical-align:top}.example-table-10>thead>tr>th,.example-table-10>thead>tr>td{vertical-align:bottom}.example-table-10>thead>tr>th,.example-table-10>tbody>tr>th,.example-table-10>tfoot>tr>th,.example-table-10>thead>tr>td,.example-table-10>tbody>tr>td,.example-table-10>tfoot>tr>td{padding:8px 10px}.example-table-10>thead>tr>th,.example-table-10>tbody>tr>th,.example-table-10>tfoot>tr>th,.example-table-10>thead>tr>td,.example-table-10>tbody>tr>td,.example-table-10>tfoot>tr>td{border:0}.example-table-11{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-11 th{text-align:left}.example-table-11>tbody>tr>th,.example-table-11>tfoot>tr>th,.example-table-11>tbody>tr>td,.example-table-11>tfoot>tr>td{vertical-align:top}.example-table-11>thead>tr>th,.example-table-11>thead>tr>td{vertical-align:bottom}.example-table-11>thead>tr>th,.example-table-11>tbody>tr>th,.example-table-11>tfoot>tr>th,.example-table-11>thead>tr>td,.example-table-11>tbody>tr>td,.example-table-11>tfoot>tr>td{padding:8px 10px}.example-table-11>tbody>tr:nth-child(even)>td,.example-table-11>tbody>tr:nth-child(even)>th{background:#ffc;color:#000}.example-table-12{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%}.example-table-12 th{text-align:left}.example-table-12>tbody>tr>th,.example-table-12>tfoot>tr>th,.example-table-12>tbody>tr>td,.example-table-12>tfoot>tr>td{vertical-align:top}.example-table-12>thead>tr>th,.example-table-12>thead>tr>td{vertical-align:bottom}.example-table-12>thead>tr>th,.example-table-12>tbody>tr>th,.example-table-12>tfoot>tr>th,.example-table-12>thead>tr>td,.example-table-12>tbody>tr>td,.example-table-12>tfoot>tr>td{padding:8px 10px}.example-table-12>tbody>tr:nth-child(even):hover>td,.example-table-12>tbody>tr:nth-child(even):hover>th{background:#f0f0f0}.example-table-12>tbody>tr:nth-child(odd):hover>td,.example-table-12>tbody>tr:nth-child(odd):hover>th{background:#f0f0f0}.example-table-13{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;border:1px solid #d1d1d1}.example-table-13 th{text-align:left}.example-table-13>tbody>tr>th,.example-table-13>tfoot>tr>th,.example-table-13>tbody>tr>td,.example-table-13>tfoot>tr>td{vertical-align:top}.example-table-13>thead>tr>th,.example-table-13>thead>tr>td{vertical-align:bottom}.example-table-13>thead>tr>th,.example-table-13>tbody>tr>th,.example-table-13>tfoot>tr>th,.example-table-13>thead>tr>td,.example-table-13>tbody>tr>td,.example-table-13>tfoot>tr>td{padding:8px 10px}.example-table-13>thead>tr>th,.example-table-13>tbody>tr>th,.example-table-13>tfoot>tr>th,.example-table-13>thead>tr>td,.example-table-13>tbody>tr>td,.example-table-13>tfoot>tr>td{border:1px solid #d1d1d1}.example-table-13>tbody>tr:nth-child(odd)>td,.example-table-13>tbody>tr:nth-child(odd)>th{background:#fff}.example-table-13>tbody>tr:nth-child(even):hover>td,.example-table-13>tbody>tr:nth-child(even):hover>th{background:#f0f0f0}.example-table-13>tbody>tr:nth-child(odd):hover>td,.example-table-13>tbody>tr:nth-child(odd):hover>th{background:#f0f0f0}@media only screen and (max-width: 768px){.example-table-14{ width:100%;overflow-y:hidden;overflow-x:auto;-ms-overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}}.example-table-15{border-collapse:collapse;border-spacing:0;max-width:100%;width:100%;border:1px solid #d1d1d1}.example-table-15 th{text-align:left}.example-table-15>tbody>tr>th,.example-table-15>tfoot>tr>th,.example-table-15>tbody>tr>td,.example-table-15>tfoot>tr>td{vertical-align:top}.example-table-15>thead>tr>th,.example-table-15>thead>tr>td{vertical-align:bottom}.example-table-15>thead>tr>th,.example-table-15>tbody>tr>th,.example-table-15>tfoot>tr>th,.example-table-15>thead>tr>td,.example-table-15>tbody>tr>td,.example-table-15>tfoot>tr>td{padding:8px 10px}.example-table-15>thead>tr>th,.example-table-15>tbody>tr>th,.example-table-15>tfoot>tr>th,.example-table-15>thead>tr>td,.example-table-15>tbody>tr>td,.example-table-15>tfoot>tr>td{border:1px solid #d1d1d1}.example-table-15>tbody>tr:nth-child(odd)>td,.example-table-15>tbody>tr:nth-child(odd)>th{background:#fff}.example-table-15>tbody>tr:nth-child(even):hover>td,.example-table-15>tbody>tr:nth-child(even):hover>th{background:#f0f0f0}.example-table-15>tbody>tr:nth-child(odd):hover>td,.example-table-15>tbody>tr:nth-child(odd):hover>th{background:#f0f0f0}@media only screen and (max-width: 768px){.example-table-15{ border:0;display:block;background:#cff}.example-table-15>tbody>tr:nth-child(odd)>td,.example-table-15>tbody>tr:nth-child(odd)>th{background:#cff}.example-table-15>tbody>tr:nth-child(even):hover>td,.example-table-15>tbody>tr:nth-child(even):hover>th{background:#cff}.example-table-15>tbody>tr:nth-child(odd):hover>td,.example-table-15>tbody>tr:nth-child(odd):hover>th{background:#cff}.example-table-15>thead>tr>th{display:none}.example-table-15>tbody{display:block}.example-table-15>tbody>tr{display:block}.example-table-15>tbody>tr td,.example-table-15>tbody>tr th{border-bottom:0;display:block;padding:5px 0}.example-table-15>tbody>tr td:before,.example-table-15>tbody>tr th:before{content:attr(data-th) ":";display:inline-block;padding-right:10px;color:#111;font-weight:700}.example-table-15>tbody>tr td{background:#cff}.example-table-15>tbody>tr>th{background-color:#ffc!important}}.example-tooltip-bottom{position:relative}.example-tooltip-bottom .tooltip-content{z-index:100;background:#fff;min-width:210px;max-width:360px;padding:12px 16px;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;top:100%;left:0;margin-top:5px}.example-tooltip-bottom .tooltip-content:after,.example-tooltip-bottom .tooltip-content:before{border:solid transparent;content:'';height:0;width:0;position:absolute}.example-tooltip-bottom .tooltip-content:after{border-color:transparent;border-width:5px}.example-tooltip-bottom .tooltip-content:before{border-color:transparent;border-width:6px}.example-tooltip-bottom .tooltip-content:after,.example-tooltip-bottom .tooltip-content:before{bottom:100%}.example-tooltip-bottom .tooltip-content:after{border-bottom-color:#fff;margin-left:-5px;left:15px}.example-tooltip-bottom .tooltip-content:before{border-bottom-color:#bbb;margin-left:-6px;left:15px}.example-tooltip-bottom .tooltip-toggle{cursor:help}.example-tooltip-bottom .tooltip-toggle:hover+.tooltip-content,.example-tooltip-bottom .tooltip-toggle:focus+.tooltip-content,.example-tooltip-bottom:hover .tooltip-content{display:block}.example-tooltip-left{position:relative}.example-tooltip-left .tooltip-content{z-index:100;background:#fff;min-width:210px;max-width:360px;padding:12px 16px;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;right:100%;top:0;margin-right:5px}.example-tooltip-left .tooltip-content:after,.example-tooltip-left .tooltip-content:before{border:solid transparent;content:'';height:0;width:0;position:absolute}.example-tooltip-left .tooltip-content:after{border-color:transparent;border-width:5px}.example-tooltip-left .tooltip-content:before{border-color:transparent;border-width:6px}.example-tooltip-left .tooltip-content:after,.example-tooltip-left .tooltip-content:before{left:100%}.example-tooltip-left .tooltip-content:after{border-left-color:#fff;margin-top:-5px;top:15px}.example-tooltip-left .tooltip-content:before{border-left-color:#bbb;margin-top:-6px;top:15px}.example-tooltip-left .tooltip-toggle{cursor:help}.example-tooltip-left .tooltip-toggle:hover+.tooltip-content,.example-tooltip-left .tooltip-toggle:focus+.tooltip-content,.example-tooltip-left:hover .tooltip-content{display:block}.example-tooltip-right{position:relative}.example-tooltip-right .tooltip-content{z-index:100;background:#fff;min-width:210px;max-width:360px;padding:12px 16px;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;left:100%;top:0;margin-left:5px}.example-tooltip-right .tooltip-content:after,.example-tooltip-right .tooltip-content:before{border:solid transparent;content:'';height:0;width:0;position:absolute}.example-tooltip-right .tooltip-content:after{border-color:transparent;border-width:5px}.example-tooltip-right .tooltip-content:before{border-color:transparent;border-width:6px}.example-tooltip-right .tooltip-content:after,.example-tooltip-right .tooltip-content:before{right:100%}.example-tooltip-right .tooltip-content:after{border-right-color:#fff;margin-top:-5px;top:15px}.example-tooltip-right .tooltip-content:before{border-right-color:#bbb;margin-top:-6px;top:15px}.example-tooltip-right .tooltip-toggle{cursor:help}.example-tooltip-right .tooltip-toggle:hover+.tooltip-content,.example-tooltip-right .tooltip-toggle:focus+.tooltip-content,.example-tooltip-right:hover .tooltip-content{display:block}.example-tooltip-top{position:relative}.example-tooltip-top .tooltip-content{z-index:100;background:#fff;min-width:210px;max-width:360px;padding:12px 16px;display:none;position:absolute;text-align:left;color:#333;line-height:1.4;border:1px solid #bbb;bottom:100%;left:0;margin-bottom:5px}.example-tooltip-top .tooltip-content:after,.example-tooltip-top .tooltip-content:before{border:solid transparent;content:'';height:0;width:0;position:absolute}.example-tooltip-top .tooltip-content:after{border-color:transparent;border-width:5px}.example-tooltip-top .tooltip-content:before{border-color:transparent;border-width:6px}.example-tooltip-top .tooltip-content:after,.example-tooltip-top .tooltip-content:before{top:100%}.example-tooltip-top .tooltip-content:after{border-top-color:#fff;margin-left:-5px;left:15px}.example-tooltip-top .tooltip-content:before{border-top-color:#bbb;margin-left:-6px;left:15px}.example-tooltip-top .tooltip-toggle{cursor:help}.example-tooltip-top .tooltip-toggle:hover+.tooltip-content,.example-tooltip-top .tooltip-toggle:focus+.tooltip-content,.example-tooltip-top:hover .tooltip-content{display:block}html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body{font-size:1.4rem;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:normal;line-height:1.42857143}p{margin-top:0rem;margin-bottom:1rem}abbr[title]{cursor:help;border-bottom:1px dotted #d1d1d1}b,strong{font-weight:700}em,i{font-style:italic}mark{background:#f0f0f0;color:#000}small,.small{font-size:12px}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #d1d1d1}sub,sup{font-size:71.42857143%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dfn{font-style:italic}h1{font-size:4rem;font-weight:300;line-height:1.1;margin-top:0rem;margin-bottom:2rem}h2{font-size:2.6rem;font-weight:300;line-height:1.1;margin-top:2.5rem;margin-bottom:2rem}h3{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}h4{font-size:1.4rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h5{font-size:1.2rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h6{font-size:1rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small{font-size:71.42857143%;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:normal;line-height:1}a,.alink{color:#1979c3;text-decoration:none}a:visited,.alink:visited{color:#800080;text-decoration:none}a:hover,.alink:hover{color:#006bb4;text-decoration:underline}a:active,.alink:active{color:#ff5501;text-decoration:underline}ul,ol{margin-top:0rem;margin-bottom:2.5rem}ul>li,ol>li{margin-top:0rem;margin-bottom:1rem}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}dl{margin-top:0;margin-bottom:20px}dt{font-weight:700;margin-top:0;margin-bottom:5px}dd{margin-top:0;margin-bottom:10px;margin-left:0}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,'Courier New',monospace}code{background:#f0f0f0;color:#111;font-size:1.2rem;padding:2px 4px;white-space:nowrap}kbd{background:#f0f0f0;color:#111;font-size:1.2rem;padding:2px 4px}pre{background:#f0f0f0;border:1px solid #d1d1d1;color:#111;display:block;font-size:1.2rem;margin:0 0 10px;line-height:1.42857143;padding:10px;word-break:break-all;word-wrap:break-word}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}blockquote{border-left:0 solid #d1d1d1;margin:0 0 20px 40px;padding:0;font-size:1.4rem;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:italic;line-height:1.42857143}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{color:#333;display:block;font-size:1rem;line-height:1.42857143}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote cite{font-style:normal}blockquote:before,blockquote:after{content:""}q{quotes:none}q:before,q:after{content:'';content:none}cite{font-style:normal}.example-line-height{line-height:3rem}.example-word-wrap{word-break:break-all;word-break:break-word;word-wrap:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto;background:#ccc;width:120px}.example-text-overflow{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;background:#ccc;width:120px}.example-text-hide{background-color:transparent;border:0;font:0/0 a;color:transparent;text-shadow:none}.example-hyphens{word-wrap:break-word;-webkit-hyphens:auto;-moz-hyphens:auto;-ms-hyphens:auto;hyphens:auto}.example-hyphens-none{word-wrap:break-word;-webkit-hyphens:none;-moz-hyphens:none;-ms-hyphens:none;hyphens:none}.example-typography{color:#fc0;font-family:Menlo,Monaco,Consolas,'Courier New',monospace;font-weight:500;font-style:italic;line-height:1.2}.example-list-reset-styles{margin:0;padding:0;list-style:none none}.example-list-inline{margin:0;padding:0;list-style:none none}.example-list-inline>li{display:inline-block;vertical-align:top}.example-link-default{color:#1979c3;text-decoration:none}.example-link-default:visited{color:#800080;text-decoration:none}.example-link-default:hover{color:#006bb4;text-decoration:underline}.example-link-default:active{color:#ff5501;text-decoration:underline}.example-link{color:#008000;text-decoration:none}.example-link:visited{color:#800080;text-decoration:none}.example-link:hover{color:#ffa500;text-decoration:none}.example-link:active{color:#ff5501;text-decoration:underline}.example-heading{font-size:4rem;font-weight:300;line-height:1.1;margin-top:0rem;margin-bottom:2rem}.example-heading-2{font-size:2.6rem;font-weight:300;line-height:1.1;margin-top:2.5rem;margin-bottom:2rem}html{font-size:62.5%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;font-size-adjust:100%}body{font-size:1.4rem;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:normal;line-height:1.42857143}p{margin-top:0rem;margin-bottom:1rem}abbr[title]{cursor:help;border-bottom:1px dotted #d1d1d1}b,strong{font-weight:700}em,i{font-style:italic}mark{background:#f0f0f0;color:#000}small,.small{font-size:12px}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #d1d1d1}sub,sup{font-size:71.42857143%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dfn{font-style:italic}h1{font-size:4rem;font-weight:300;line-height:1.1;margin-top:0rem;margin-bottom:2rem}h2{font-size:2.6rem;font-weight:300;line-height:1.1;margin-top:2.5rem;margin-bottom:2rem}h3{font-size:1.8rem;font-weight:300;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem}h4{font-size:1.4rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h5{font-size:1.2rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h6{font-size:1rem;font-weight:700;line-height:1.1;margin-top:2rem;margin-bottom:2rem}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small{font-size:71.42857143%;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:normal;line-height:1}a,.alink{color:#1979c3;text-decoration:none}a:visited,.alink:visited{color:#800080;text-decoration:none}a:hover,.alink:hover{color:#006bb4;text-decoration:underline}a:active,.alink:active{color:#ff5501;text-decoration:underline}ul,ol{margin-top:0rem;margin-bottom:2.5rem}ul>li,ol>li{margin-top:0rem;margin-bottom:1rem}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}dl{margin-top:0;margin-bottom:20px}dt{font-weight:700;margin-top:0;margin-bottom:5px}dd{margin-top:0;margin-bottom:10px;margin-left:0}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,'Courier New',monospace}code{background:#f0f0f0;color:#111;font-size:1.2rem;padding:2px 4px;white-space:nowrap}kbd{background:#f0f0f0;color:#111;font-size:1.2rem;padding:2px 4px}pre{background:#f0f0f0;border:1px solid #d1d1d1;color:#111;display:block;font-size:1.2rem;margin:0 0 10px;line-height:1.42857143;padding:10px;word-break:break-all;word-wrap:break-word}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}blockquote{border-left:0 solid #d1d1d1;margin:0 0 20px 40px;padding:0;font-size:1.4rem;color:#333;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-weight:400;font-style:italic;line-height:1.42857143}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{color:#333;display:block;font-size:1rem;line-height:1.42857143}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote cite{font-style:normal}blockquote:before,blockquote:after{content:""}q{quotes:none}q:before,q:after{content:'';content:none}cite{font-style:normal}.example-clearfix-container-1{border:1px solid red}.example-clearfix-container-2{border:1px solid #0f0}.example-clearfix-container-2:before,.example-clearfix-container-2:after{content:"";display:table}.example-clearfix-container-2:after{clear:both}.example-clearfix-item.left{float:left}.example-clearfix-item.right{float:right}.example-visibility-hidden{height:0;visibility:hidden}.example-visually-hidden-1{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-visually-hidden-2{background:#fdf0d5;padding:5px;border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.example-visually-hidden-2{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.example-css-container{padding:20px;background:#e8e8e8}.example-rotate{background:red;position:absolute;height:20px;width:40px;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);transform:rotate(45deg)}.example-placeholder::-webkit-input-placeholder{color:#808080;font-weight:700}.example-placeholder:-moz-placeholder{color:#808080;font-weight:700}.example-placeholder::-moz-placeholder{color:#808080;font-weight:700}.example-placeholder:-ms-input-placeholder{color:#808080;font-weight:700}.example-background-gradient-1{background-color:#ccf;background-repeat:repeat-x;background-image:-webkit-linear-gradient(top, #cff 0, #ccf 100%);background-image:linear-gradient(to bottom, #cff 0, #ccf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ccffff', endColorstr='#ccccff', GradientType=0)}.example-background-gradient-2{background-color:#ccf;background-repeat:repeat-x;background-image:-webkit-linear-gradient(left,color-stop( #cff 0),color-stop( #ccf 100%));background-image:linear-gradient(to right, #cff 0, #ccf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ccffff', endColorstr='#ccccff', GradientType=1)}.example-background-gradient-3-wrapper{background:#ffc;padding:10px}.example-background-gradient-3{background-color:rgba(255,255,255,0);background-repeat:repeat-x;background-image:-webkit-linear-gradient(left,color-stop(rgba(255,255,255,0) 0),color-stop( #ccf 100%));background-image:linear-gradient(to right,rgba(255,255,255,0) 0, #ccf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='rgba(255, 255, 255, 0)',endColorstr='#ccccff',GradientType=1)}body{padding:15px;background-image:none}</style></head><body><nav class="bar top cf"><div class="container"><a href="index.html" class="brand">Magento UI Library</a><ul class="menu"><li><a href="#" data-toggle="dropdown-1" unselectable="on" class="dropdown-toggle">files</a><ul id="dropdown-1" hidden class="dropdown"><li><a href="actions-toolbar.html">actions-toolbar</a></li><li><a href="breadcrumbs.html">breadcrumbs</a></li><li><a href="buttons.html">buttons</a></li><li><a href="docs.html">docs</a></li><li><a href="dropdowns.html">dropdowns</a></li><li><a href="forms.html">forms</a></li><li><a href="icons.html">icons</a></li><li><a href="layout.html">layout</a></li><li><a href="lib.html">lib</a></li><li><a href="loaders.html">loaders</a></li><li><a href="messages.html">messages</a></li><li><a href="pages.html">pages</a></li><li><a href="popups.html">popups</a></li><li><a href="rating.html">rating</a></li><li><a href="resets.html">resets</a></li><li><a href="responsive.html">responsive</a></li><li><a href="sections.html">sections</a></li><li><a href="tables.html">tables</a></li><li><a href="tooltips.html">tooltips</a></li><li><a href="typography.html">typography</a></li><li><a href="utilities.html">utilities</a></li><li><a href="variables.html">variables</a></li></ul></li></ul><div class="nav"><button title="Table of Contents" data-toggle="nav-toc"><svg viewBox="0 0 512 512" height="22" width="22" class="icon"><path d="M108.9,403.1V462H50v-58.9H108.9z M108.9,285.4H50v58.9h58.9V285.4zM108.9,50H50v58.9h58.9V50z M108.9,167.7H50v58.9h58.9V167.7z M167.7,344.3H462v-58.9H167.7V344.3zM167.7,50v58.9H462V50H167.7z M167.7,462H462v-58.9H167.7V462z M167.7,226.6H462v-58.9H167.7V226.6z"></path></svg></button><input type="search" placeholder="Search" class="search"></div></div></nav><section class="container"><article id="utilities" class="section"><div class="docs"><a href="#utilities" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="utilities">Utilities</h1>
<p> <code>utilities.less</code> is a reuseable collection of basic Less mixins.</p>
</div></article><article id="clearfix" class="section"><div class="docs"><a href="#clearfix" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="clearfix">.clearfix()</h1>
<p> The <code>.clearfix()</code> mixin is a modern solution for healing container`s height which have floated elements. Also its applying prevents top-margins from collapsing.</p>
@@ -44,6 +44,7 @@
}
+
</code></pre></div></article><article id="visibilityhidden" class="section"><div class="docs"><a href="#visibilityhidden" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="visibilityhidden">.visibility-hidden()</h1>
<p> The <code>.visibility-hidden()()</code> mixin changes element`s visibility to hidden and height to 0.</p>
<p> This is a block with applied <code>.visibility-hidden()</code> mixin.</p>
@@ -58,6 +59,7 @@
}
+
</code></pre></div></article><article id="visuallyhidden" class="section"><div class="docs"><a href="#visuallyhidden" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="visuallyhidden">.visually-hidden()</h1>
<p> The <code>.visually-hidden()</code> mixin safely hides the element for accessibility reasons.</p>
<p> This is a block with applied <code>.visually-hidden()</code> mixin.</p>
@@ -72,6 +74,7 @@
}
+
</code></pre></div></article><article id="visuallyhiddenreset" class="section"><div class="docs"><a href="#visuallyhiddenreset" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="visuallyhiddenreset">.visually-hidden-reset()</h1>
<p> The <code>.visually-hidden-reset()</code> mixin resets hidden visibility and makes element again visible.</p>
<p> This is a block with applied <code>.visually-hidden-reset()</code> mixin after <code>.visually-hidden()</code> applying.</p>
@@ -92,6 +95,7 @@
}
+
</code></pre></div></article><article id="css" class="section"><div class="docs"><a href="#css" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="css">.css()</h1>
<p> The <code>.css()</code> mixin is used to set any css property if there is a value passed to it by a variable. Also <code>.css()</code> can add -ms-, -webkit- and -moz- prefixes if needed.</p>
<p> If the variable is set to <code>false</code>, the <code>.css()</code> mixin will add nothing to the code.</p>
@@ -111,6 +115,7 @@
.css(background, false);
}
+
</code></pre></div></article><article id="css-variables" class="section"><div class="docs"><a href="#css-variables" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="css-variables">.css() variables</h1>
<pre>
<table>
@@ -140,7 +145,8 @@
</tr>
</table>
</pre>
-</div><div class="code"><pre><code></code></pre></div></article><article id="rotate" class="section"><div class="docs"><a href="#rotate" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="rotate">.rotate()</h1>
+</div><div class="code"><pre><code>
+</code></pre></div></article><article id="rotate" class="section"><div class="docs"><a href="#rotate" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="rotate">.rotate()</h1>
<p> The <code>.rotate()</code> mixin is a wrapper for css3 transform property with rotate value.</p>
<textarea class="preview-code" spellcheck="false"> <div class="example-rotate"></div></textarea>
</div><div class="code"><pre><code>
@@ -154,6 +160,7 @@
);
}
+
</code></pre></div></article><article id="rotate-variables" class="section"><div class="docs"><a href="#rotate-variables" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="rotate-variables">.rotate() variables</h1>
<pre>
<table>
@@ -171,7 +178,8 @@
</tr>
</table>
</pre>
-</div><div class="code"><pre><code></code></pre></div></article><article id="inputplaceholder" class="section"><div class="docs"><a href="#inputplaceholder" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="inputplaceholder">.input-placeholder()</h1>
+</div><div class="code"><pre><code>
+</code></pre></div></article><article id="inputplaceholder" class="section"><div class="docs"><a href="#inputplaceholder" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="inputplaceholder">.input-placeholder()</h1>
<p> The <code>.input-placeholder()</code> mixin is used to change placeholder font-color and font-weight.</p>
<textarea class="preview-code" spellcheck="false"> <input placeholder="Default text" class="example-placeholder" type="text" /></textarea>
</div><div class="code"><pre><code>
@@ -179,6 +187,7 @@
.input-placeholder(#808080, bold);
}
+
</code></pre></div></article><article id="inputplaceholder-variables" class="section"><div class="docs"><a href="#inputplaceholder-variables" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="inputplaceholder-variables">.input-placeholder() variables</h1>
<pre>
<table>
@@ -202,13 +211,18 @@
</tr>
</table>
</pre>
-</div><div class="code"><pre><code></code></pre></div></article><article id="backgroundgradient" class="section"><div class="docs"><a href="#backgroundgradient" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="backgroundgradient">.background-gradient()</h1>
+</div><div class="code"><pre><code>
+</code></pre></div></article><article id="backgroundgradient" class="section"><div class="docs"><a href="#backgroundgradient" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="backgroundgradient">.background-gradient()</h1>
<p> The <code>.background-gradient()</code> mixin is used for applying custom css3 gradient.</p>
-<textarea class="preview-code" spellcheck="false"> <div class="example-background-gradient-1">
- Hey! I`m gradient with vertical direction!
-</div></textarea><textarea class="preview-code" spellcheck="false"> <div class="example-background-gradient-2">
- Hey! I`m gradient with horizontal direction!
-</div></textarea>
+<textarea class="preview-code" spellcheck="false"> <div class="example-background-gradient-1">
+ I`m gradient with vertical direction
+ </div></textarea><textarea class="preview-code" spellcheck="false"> <div class="example-background-gradient-2">
+ I`m gradient with horizontal direction
+ </div></textarea><textarea class="preview-code" spellcheck="false"> <div class="example-background-gradient-3-wrapper">
+ <div class="example-background-gradient-3">
+ I`m gradient with horizontal direction from transparent to a color
+ </div>
+ </div></textarea>
</div><div class="code"><pre><code>
.example-background-gradient-1 {
.background-gradient(
@@ -228,13 +242,30 @@
);
}
+.example-background-gradient-3-wrapper {
+ background: #ffc;
+ padding: 10px;
+}
+
+.example-background-gradient-3 {
+ .background-gradient(
+ @_background-gradient: true,
+ @_background-gradient-direction: horizontal,
+ @_background-gradient-start-color: rgba(255,255,255,0),
+ @_background-gradient-end-color: #ccf,
+ @_background-gradient-color-position: false
+ );
+}
+
+
+
</code></pre></div></article><article id="backgroundgradient-variables" class="section"><div class="docs"><a href="#backgroundgradient-variables" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="backgroundgradient-variables">.background-gradient() variables</h1>
<pre>
<table>
<tr>
<th class="vars_head">Mixin variable</th>
- <th class="vars_head">Default value </th>
+ <th class="vars_head">Default value</th>
<th class="vars_head">Allowed values</th>
<th class="vars_head">Comment</th>
</tr>
@@ -262,6 +293,12 @@
<td class="vars_value">'' | false | value</td>
<td>Gradient end color (any css color) </td>
</tr>
+ <tr>
+ <th>@_background-gradient-color-position</th>
+ <td class="vars_value">false</td>
+ <td class="vars_value">'' | false | true</td>
+ <td>Sets the background-color fallback property. When set to 'false', the background-color property will be set to @_background-gradient-end-color. When set to 'true', the background-color property will be set to @_background-gradient-start-color</td>
+ </tr>
</table>
</pre>
-</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"",filename:"actions-toolbar",url:"actions-toolbar.html#"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"",filename:"breadcrumbs",url:"breadcrumbs.html#"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"",filename:"docs",url:"docs.html#"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"",filename:"dropdowns",url:"dropdowns.html#"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables// <pre>",filename:"forms",url:"forms.html#form-validation-variables-pre"},{title:"icons",filename:"icons",url:"icons.html"},{title:"",filename:"icons",url:"icons.html#"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"",filename:"lib",url:"lib.html#"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"",filename:"messages",url:"messages.html#"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"",filename:"pages",url:"pages.html#"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"",filename:"rating",url:"rating.html#"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"",filename:"responsive",url:"responsive.html#"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"",filename:"sections",url:"sections.html#"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"",filename:"tables",url:"tables.html#"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"",filename:"tooltips",url:"tooltips.html#"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".clearfix()",filename:"utilities",url:"utilities.html#clearfix"},{title:".visibility-hidden()",filename:"utilities",url:"utilities.html#visibilityhidden"},{title:".visually-hidden()",filename:"utilities",url:"utilities.html#visuallyhidden"},{title:".visually-hidden-reset()",filename:"utilities",url:"utilities.html#visuallyhiddenreset"},{title:".css()",filename:"utilities",url:"utilities.html#css"},{title:".css() variables",filename:"utilities",url:"utilities.html#css-variables"},{title:".rotate()",filename:"utilities",url:"utilities.html#rotate"},{title:".rotate() variables",filename:"utilities",url:"utilities.html#rotate-variables"},{title:".input-placeholder()",filename:"utilities",url:"utilities.html#inputplaceholder"},{title:".input-placeholder() variables",filename:"utilities",url:"utilities.html#inputplaceholder-variables"},{title:".background-gradient()",filename:"utilities",url:"utilities.html#backgroundgradient"},{title:".background-gradient() variables",filename:"utilities",url:"utilities.html#backgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
+</div></article></section><div class="bar bottom"><div hidden class="settings container"><!-- Icons from http://iconmonstr.com--><button title="Desktop (1280)" data-width='1280'><svg viewBox="0 0 412 386" height="24" width="26" class="icon"><path d="m147.6,343.9c-4.5,15.9-26.2,37.6-42.1,42.1h201c-15.3,-4-38.1,-26.8-42.1,-42.1H147.6zM387,0.5H25c-13.8,0-25,11.2-25,25V294c0,13.8 11.2,25 25,25h362c13.8,0 25,-11.2 25,-25V25.5C412,11.7 400.8,0.5 387,0.5zM369.9,238.2H42.1L42.1,42.6 369.9,42.6V238.2z"></path></svg></button><button title="Laptop (1024)" data-width='1024'><svg viewBox="0 0 384 312" height="23" width="28" class="icon"><path d="m349.2,20.5c0,-11-9,-20-20,-20H53.6c-11,0-20,9-20,20v194H349.2v-194zm-27,167H60.6V27.5H322.2v160zm28,42H32.6L2.6,282.1c-3.5,6.2-3.5,13.8 0.1,19.9 3.6,6.2 10.2,9.9 17.3,9.9H363.1c7.1,0 13.7,-3.8 17.3,-10 3.6,-6.2 3.6,-13.8 0,-20l-30.2,-52.5zm-196.9,54 8,-23.5h60.5l8,23.5h-76.5z"></path></svg></button><button title="Tablet (768)" data-width='768'><svg viewBox="0 0 317 412" height="24" width="18" class="icon"><path d="M 316.5,380 V 32 c 0,-17.7 -14.3,-32 -32,-32 H 32 C 14.3,0 0,14.3 0,32 v 348 c 0,17.7 14.3,32 32,32 h 252.5 c 17.7,0 32,-14.3 32,-32 z M 40,367 V 45 H 276.5 V 367 H 40 z m 109.8,22.7 c 0,-4.7 3.8,-8.5 8.5,-8.5 4.7,0 8.5,3.8 8.5,8.5 0,4.7 -3.8,8.5 -8.5,8.5 -4.7,0 -8.5,-3.8 -8.5,-8.5 z"></path></svg></button><button title="Smart phone (320)" data-width='320'><svg viewBox="0 0 224 412" height="24" width="13" class="icon"><path d="M 190.7,0 H 33 C 14.8,0 0,14.8 0,33 v 346 c 0,18.2 14.8,33 33,33 h 157.7 c 18.2,0 33,-14.8 33,-33 V 33 c 0,-18.2 -14.8,-33 -33,-33 z M 94.3,30.2 h 37 c 2.2,0 4,1.8 4,4 0,2.2 -1.8,4 -4,4 h -37 c -2.2,0 -4,-1.8 -4,-4 0,-2.2 1.8,-4 4,-4 z m 18.5,362.8 c -8.8,0 -16,-7.2 -16,-16 0,-8.8 7.2,-16 16,-16 8.8,0 16,7.2 16,16 0,8.8 -7.2,16 -16,16 z M 198.6,343.8 H 25.1 V 68.2 h 173.5 v 275.5 z"></path></svg></button><button title="Feature phone (240)" data-width='240'><svg viewBox="0 0 201 412" height="24" width="12" class="icon"><path d="M 165.5,0.2 V 45 H 25 c -13.8,0 -25,11.2 -25,25 V 387 c 0,13.8 11.2,25 25,25 h 150.5 c 13.8,0 25,-11.2 25,-25 V 0.2 h -35 z M 65.2,366.5 H 34.2 v -24.5 h 31 v 24.5 z m 0,-44.3 H 34.2 v -24.5 h 31 v 24.5 z m 50.5,44.3 H 84.7 v -24.5 h 31 v 24.5 z m 0,-44.3 H 84.7 v -24.5 h 31 v 24.5 z m 50.5,44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-44.3 h -31 v -24.5 h 31 v 24.5 z m 0,-59.3 h -132 V 95.4 h 132 V 262.9 z"></path></svg></button><button title="Auto (100%)" data-width="auto" class="auto is-active">Auto</button></div></div><script>(function(){var a=[{title:"actions-toolbar",filename:"actions-toolbar",url:"actions-toolbar.html"},{title:"",filename:"actions-toolbar",url:"actions-toolbar.html#"},{title:"Actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar"},{title:"Actions toolbar mixin variables",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-mixin-variables"},{title:"Actions toolbar alignment",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-alignment"},{title:"Reverse primary and secondary blocks",filename:"actions-toolbar",url:"actions-toolbar.html#reverse-primary-and-secondary-blocks"},{title:"Actions toolbar indents customizations",filename:"actions-toolbar",url:"actions-toolbar.html#actions-toolbar-indents-customizations"},{title:"Responsive actions toolbar",filename:"actions-toolbar",url:"actions-toolbar.html#responsive-actions-toolbar"},{title:"breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html"},{title:"",filename:"breadcrumbs",url:"breadcrumbs.html#"},{title:"Breadcrumbs",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs"},{title:"Breadcrumbs variables",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-variables"},{title:"Button-styled breadcrumbs with gradient background, border, and no separating symbol",filename:"breadcrumbs",url:"breadcrumbs.html#buttonstyled-breadcrumbs-with-gradient-background-border-and-no-separating-symbol"},{title:"Breadcrumbs with solid background",filename:"breadcrumbs",url:"breadcrumbs.html#breadcrumbs-with-solid-background"},{title:"buttons",filename:"buttons",url:"buttons.html"},{title:"",filename:"buttons",url:"buttons.html#"},{title:"Default button",filename:"buttons",url:"buttons.html#default-button"},{title:"Button variables",filename:"buttons",url:"buttons.html#button-variables"},{title:"Button as an icon",filename:"buttons",url:"buttons.html#button-as-an-icon"},{title:"Button with an icon on the left or right side of the text",filename:"buttons",url:"buttons.html#button-with-an-icon-on-the-left-or-right-side-of-the-text"},{title:"Button with fixed width",filename:"buttons",url:"buttons.html#button-with-fixed-width"},{title:"Primary button",filename:"buttons",url:"buttons.html#primary-button"},{title:"Primary button variables",filename:"buttons",url:"buttons.html#primary-button-variables"},{title:"Button with gradient background",filename:"buttons",url:"buttons.html#button-with-gradient-background"},{title:"Button as a link",filename:"buttons",url:"buttons.html#button-as-a-link"},{title:"Link as a button",filename:"buttons",url:"buttons.html#link-as-a-button"},{title:"Button reset",filename:"buttons",url:"buttons.html#button-reset"},{title:"Button revert secondary color",filename:"buttons",url:"buttons.html#button-revert-secondary-color"},{title:"Button revert secondary color variables",filename:"buttons",url:"buttons.html#button-revert-secondary-color-variables"},{title:"Button revert secondary size",filename:"buttons",url:"buttons.html#button-revert-secondary-size"},{title:"Button revert secondary size variables",filename:"buttons",url:"buttons.html#button-revert-secondary-size-variables"},{title:"docs",filename:"docs",url:"docs.html"},{title:"",filename:"docs",url:"docs.html#"},{title:"Documentation",filename:"docs",url:"docs.html#documentation"},{title:"dropdowns",filename:"dropdowns",url:"dropdowns.html"},{title:"",filename:"dropdowns",url:"dropdowns.html#"},{title:"Drop-down and split buttons mixins",filename:"dropdowns",url:"dropdowns.html#dropdown-and-split-buttons-mixins"},{title:"Drop-down",filename:"dropdowns",url:"dropdowns.html#dropdown"},{title:"Drop-down variables",filename:"dropdowns",url:"dropdowns.html#dropdown-variables"},{title:"Drop-down with icon customization",filename:"dropdowns",url:"dropdowns.html#dropdown-with-icon-customization"},{title:"Modify dropdown list styles",filename:"dropdowns",url:"dropdowns.html#modify-dropdown-list-styles"},{title:"Split button",filename:"dropdowns",url:"dropdowns.html#split-button"},{title:"Split button variables",filename:"dropdowns",url:"dropdowns.html#split-button-variables"},{title:"Split button - button styling",filename:"dropdowns",url:"dropdowns.html#split-button-button-styling"},{title:"Split button icon customization",filename:"dropdowns",url:"dropdowns.html#split-button-icon-customization"},{title:"Split button drop-down list customization",filename:"dropdowns",url:"dropdowns.html#split-button-dropdown-list-customization"},{title:"forms",filename:"forms",url:"forms.html"},{title:"",filename:"forms",url:"forms.html#"},{title:"Forms mixins",filename:"forms",url:"forms.html#forms-mixins"},{title:"Global forms elements customization",filename:"forms",url:"forms.html#global-forms-elements-customization"},{title:"Fieldsets & fields customization",filename:"forms",url:"forms.html#fieldsets-fields-customization"},{title:"Fieldset and legend customization variables",filename:"forms",url:"forms.html#fieldset-and-legend-customization-variables"},{title:"Fields customization variables",filename:"forms",url:"forms.html#fields-customization-variables"},{title:"Required fields message customization variables",filename:"forms",url:"forms.html#required-fields-message-customization-variables"},{title:"Form element inputs customization",filename:"forms",url:"forms.html#form-element-inputs-customization"},{title:"Form element inputs customization variables",filename:"forms",url:"forms.html#form-element-inputs-customization-variables"},{title:"Form element choice",filename:"forms",url:"forms.html#form-element-choice"},{title:"Form element choice variables",filename:"forms",url:"forms.html#form-element-choice-variables"},{title:"Custom color",filename:"forms",url:"forms.html#custom-color"},{title:"Input number - input-text view",filename:"forms",url:"forms.html#input-number-inputtext-view"},{title:"Input search - input-text view",filename:"forms",url:"forms.html#input-search-inputtext-view"},{title:"Form validation",filename:"forms",url:"forms.html#form-validation"},{title:"Form validation variables// <pre>",filename:"forms",url:"forms.html#form-validation-variables-pre"},{title:"icons",filename:"icons",url:"icons.html"},{title:"",filename:"icons",url:"icons.html#"},{title:"Icons",filename:"icons",url:"icons.html#icons"},{title:"Icon with image or sprite",filename:"icons",url:"icons.html#icon-with-image-or-sprite"},{title:"Icon with image or sprite variables",filename:"icons",url:"icons.html#icon-with-image-or-sprite-variables"},{title:"Icon position for an icon with image or sprite",filename:"icons",url:"icons.html#icon-position-for-an-icon-with-image-or-sprite"},{title:"Position for icon with image or sprite mixin variables",filename:"icons",url:"icons.html#position-for-icon-with-image-or-sprite-mixin-variables"},{title:"Icon sprite position (with grid)",filename:"icons",url:"icons.html#icon-sprite-position-with-grid"},{title:"Icon sprite position variables",filename:"icons",url:"icons.html#icon-sprite-position-variables"},{title:"Image/sprite icon size",filename:"icons",url:"icons.html#imagesprite-icon-size"},{title:"Image/sprite icon size variables",filename:"icons",url:"icons.html#imagesprite-icon-size-variables"},{title:"Font icon",filename:"icons",url:"icons.html#font-icon"},{title:"Font icon variables",filename:"icons",url:"icons.html#font-icon-variables"},{title:"Change the size of font icon",filename:"icons",url:"icons.html#change-the-size-of-font-icon"},{title:"Change the size of font icon variables",filename:"icons",url:"icons.html#change-the-size-of-font-icon-variables"},{title:"Hide icon text",filename:"icons",url:"icons.html#hide-icon-text"},{title:"Sprite and font icons for Blank theme",filename:"icons",url:"icons.html#sprite-and-font-icons-for-blank-theme"},{title:"layout",filename:"layout",url:"layout.html"},{title:"",filename:"layout",url:"layout.html#"},{title:"Layout",filename:"layout",url:"layout.html#layout"},{title:"Layout global variables",filename:"layout",url:"layout.html#layout-global-variables"},{title:"Page layouts",filename:"layout",url:"layout.html#page-layouts"},{title:"Layout column",filename:"layout",url:"layout.html#layout-column"},{title:"Layout column variables",filename:"layout",url:"layout.html#layout-column-variables"},{title:"Layout width",filename:"layout",url:"layout.html#layout-width"},{title:"Layout width variables",filename:"layout",url:"layout.html#layout-width-variables"},{title:"lib",filename:"lib",url:"lib.html"},{title:"",filename:"lib",url:"lib.html#"},{title:"Including Magento UI library to your theme",filename:"lib",url:"lib.html#including-magento-ui-library-to-your-theme"},{title:"loaders",filename:"loaders",url:"loaders.html"},{title:"",filename:"loaders",url:"loaders.html#"},{title:"Loaders",filename:"loaders",url:"loaders.html#loaders"},{title:"Default loader variables",filename:"loaders",url:"loaders.html#default-loader-variables"},{title:"Loading",filename:"loaders",url:"loaders.html#loading"},{title:"Loading default variables",filename:"loaders",url:"loaders.html#loading-default-variables"},{title:"messages",filename:"messages",url:"messages.html"},{title:"",filename:"messages",url:"messages.html#"},{title:"Messages",filename:"messages",url:"messages.html#messages"},{title:"Information message",filename:"messages",url:"messages.html#information-message"},{title:"Warning message",filename:"messages",url:"messages.html#warning-message"},{title:"Error message",filename:"messages",url:"messages.html#error-message"},{title:"Success message",filename:"messages",url:"messages.html#success-message"},{title:"Notice message",filename:"messages",url:"messages.html#notice-message"},{title:"Message with inner icon",filename:"messages",url:"messages.html#message-with-inner-icon"},{title:"Message with lateral icon",filename:"messages",url:"messages.html#message-with-lateral-icon"},{title:"Custom message style",filename:"messages",url:"messages.html#custom-message-style"},{title:"Messages global variables",filename:"messages",url:"messages.html#messages-global-variables"},{title:"pages",filename:"pages",url:"pages.html"},{title:"",filename:"pages",url:"pages.html#"},{title:"Pagination HTML markup",filename:"pages",url:"pages.html#pagination-html-markup"},{title:"Pagination variables",filename:"pages",url:"pages.html#pagination-variables"},{title:"Pagination with label and gradient background on links",filename:"pages",url:"pages.html#pagination-with-label-and-gradient-background-on-links"},{title:'Pagination with "previous"..."next" text links and label',filename:"pages",url:"pages.html#pagination-with-previousnext-text-links-and-label"},{title:"Pagination without label, with solid background",filename:"pages",url:"pages.html#pagination-without-label-with-solid-background"},{title:"popups",filename:"popups",url:"popups.html"},{title:"",filename:"popups",url:"popups.html#"},{title:"Popups",filename:"popups",url:"popups.html#popups"},{title:"Popup variables",filename:"popups",url:"popups.html#popup-variables"},{title:"Window overlay mixin variables",filename:"popups",url:"popups.html#window-overlay-mixin-variables"},{title:"Fixed height popup",filename:"popups",url:"popups.html#fixed-height-popup"},{title:"Fixed content height popup",filename:"popups",url:"popups.html#fixed-content-height-popup"},{title:"Margins for header, content and footer block in popup",filename:"popups",url:"popups.html#margins-for-header-content-and-footer-block-in-popup"},{title:"Popup titles styled as theme headings",filename:"popups",url:"popups.html#popup-titles-styled-as-theme-headings"},{title:"Popup action toolbar",filename:"popups",url:"popups.html#popup-action-toolbar"},{title:"Popup Close button without an icon",filename:"popups",url:"popups.html#popup-close-button-without-an-icon"},{title:"Modify the icon of popup Close button",filename:"popups",url:"popups.html#modify-the-icon-of-popup-close-button"},{title:"Modify overlay styles",filename:"popups",url:"popups.html#modify-overlay-styles"},{title:"rating",filename:"rating",url:"rating.html"},{title:"",filename:"rating",url:"rating.html#"},{title:"Ratings",filename:"rating",url:"rating.html#ratings"},{title:"Global rating variables",filename:"rating",url:"rating.html#global-rating-variables"},{title:"Rating with vote",filename:"rating",url:"rating.html#rating-with-vote"},{title:"Rating with vote icons number customization",filename:"rating",url:"rating.html#rating-with-vote-icons-number-customization"},{title:"Rating with vote icons colors customization",filename:"rating",url:"rating.html#rating-with-vote-icons-colors-customization"},{title:"Rating with vote icons symbol customization",filename:"rating",url:"rating.html#rating-with-vote-icons-symbol-customization"},{title:"Accessible rating with vote",filename:"rating",url:"rating.html#accessible-rating-with-vote"},{title:"Rating summary",filename:"rating",url:"rating.html#rating-summary"},{title:"Rating summary icons number customization",filename:"rating",url:"rating.html#rating-summary-icons-number-customization"},{title:"Rating summary icons color customization",filename:"rating",url:"rating.html#rating-summary-icons-color-customization"},{title:"Rating summary icons symbol customization",filename:"rating",url:"rating.html#rating-summary-icons-symbol-customization"},{title:"Rating summary hide label",filename:"rating",url:"rating.html#rating-summary-hide-label"},{title:"Rating summary multiple ratings",filename:"rating",url:"rating.html#rating-summary-multiple-ratings"},{title:"Rating hide label mixin",filename:"rating",url:"rating.html#rating-hide-label-mixin"},{title:"resets",filename:"resets",url:"resets.html"},{title:"",filename:"resets",url:"resets.html#"},{title:"Resets",filename:"resets",url:"resets.html#resets"},{title:"responsive",filename:"responsive",url:"responsive.html"},{title:"",filename:"responsive",url:"responsive.html#"},{title:"Responsive",filename:"responsive",url:"responsive.html#responsive"},{title:"Responsive mixins usage",filename:"responsive",url:"responsive.html#responsive-mixins-usage"},{title:"Media query style groups separation variables",filename:"responsive",url:"responsive.html#media-query-style-groups-separation-variables"},{title:"Responsive breakpoints",filename:"responsive",url:"responsive.html#responsive-breakpoints"},{title:"sections",filename:"sections",url:"sections.html"},{title:"",filename:"sections",url:"sections.html#"},{title:"Tabs and accordions",filename:"sections",url:"sections.html#tabs-and-accordions"},{title:"Tabs",filename:"sections",url:"sections.html#tabs"},{title:"Tabs mixin variables",filename:"sections",url:"sections.html#tabs-mixin-variables"},{title:"Tabs with content top border",filename:"sections",url:"sections.html#tabs-with-content-top-border"},{title:"Accordion",filename:"sections",url:"sections.html#accordion"},{title:"Accordion mixin variables",filename:"sections",url:"sections.html#accordion-mixin-variables"},{title:"Responsive tabs",filename:"sections",url:"sections.html#responsive-tabs"},{title:"Tabs Base",filename:"sections",url:"sections.html#tabs-base"},{title:"Accordion Base",filename:"sections",url:"sections.html#accordion-base"},{title:"tables",filename:"tables",url:"tables.html"},{title:"",filename:"tables",url:"tables.html#"},{title:"Tables",filename:"tables",url:"tables.html#tables"},{title:"Table mixin variables",filename:"tables",url:"tables.html#table-mixin-variables"},{title:"Table typography",filename:"tables",url:"tables.html#table-typography"},{title:"Table typography mixin variables",filename:"tables",url:"tables.html#table-typography-mixin-variables"},{title:"Table caption",filename:"tables",url:"tables.html#table-caption"},{title:"Table caption mixin variables",filename:"tables",url:"tables.html#table-caption-mixin-variables"},{title:"Table cells resize",filename:"tables",url:"tables.html#table-cells-resize"},{title:"Table cells resize variables",filename:"tables",url:"tables.html#table-cells-resize-variables"},{title:"Table background customization",filename:"tables",url:"tables.html#table-background-customization"},{title:"Table background mixin variables",filename:"tables",url:"tables.html#table-background-mixin-variables"},{title:"Table borders customization",filename:"tables",url:"tables.html#table-borders-customization"},{title:"Table borders mixin variables",filename:"tables",url:"tables.html#table-borders-mixin-variables"},{title:"Table with horizontal borders",filename:"tables",url:"tables.html#table-with-horizontal-borders"},{title:"Table with vertical borders",filename:"tables",url:"tables.html#table-with-vertical-borders"},{title:"Table with light borders",filename:"tables",url:"tables.html#table-with-light-borders"},{title:"Table without borders",filename:"tables",url:"tables.html#table-without-borders"},{title:"Striped table",filename:"tables",url:"tables.html#striped-table"},{title:"Striped table mixin variables",filename:"tables",url:"tables.html#striped-table-mixin-variables"},{title:"Table with rows hover",filename:"tables",url:"tables.html#table-with-rows-hover"},{title:"Table with rows hover mixin variables",filename:"tables",url:"tables.html#table-with-rows-hover-mixin-variables"},{title:"Responsive table technics #1",filename:"tables",url:"tables.html#responsive-table-technics-1"},{title:"Responsive table technics #2",filename:"tables",url:"tables.html#responsive-table-technics-2"},{title:"Responsive table technics #2 mixin variables",filename:"tables",url:"tables.html#responsive-table-technics-2-mixin-variables"},{title:"tooltips",filename:"tooltips",url:"tooltips.html"},{title:"",filename:"tooltips",url:"tooltips.html#"},{title:"Tooltips",filename:"tooltips",url:"tooltips.html#tooltips"},{title:"Tooltips variables",filename:"tooltips",url:"tooltips.html#tooltips-variables"},{title:"typography",filename:"typography",url:"typography.html"},{title:"",filename:"typography",url:"typography.html#"},{title:"Typogrphy",filename:"typography",url:"typography.html#typogrphy"},{title:"Typography variables",filename:"typography",url:"typography.html#typography-variables"},{title:"Font-size mixin",filename:"typography",url:"typography.html#fontsize-mixin"},{title:"Line-height mixin",filename:"typography",url:"typography.html#lineheight-mixin"},{title:"Word breaking mixin",filename:"typography",url:"typography.html#word-breaking-mixin"},{title:"Font face mixin",filename:"typography",url:"typography.html#font-face-mixin"},{title:"Text overflow mixin",filename:"typography",url:"typography.html#text-overflow-mixin"},{title:"Text hide",filename:"typography",url:"typography.html#text-hide"},{title:"Hyphens",filename:"typography",url:"typography.html#hyphens"},{title:"Font style and color",filename:"typography",url:"typography.html#font-style-and-color"},{title:"Font style mixin variables",filename:"typography",url:"typography.html#font-style-mixin-variables"},{title:"Reset list styles",filename:"typography",url:"typography.html#reset-list-styles"},{title:"Reset list styles variables",filename:"typography",url:"typography.html#reset-list-styles-variables"},{title:"Inline-block list item styling",filename:"typography",url:"typography.html#inlineblock-list-item-styling"},{title:"Link styling mixin",filename:"typography",url:"typography.html#link-styling-mixin"},{title:"Link styling mixin variables",filename:"typography",url:"typography.html#link-styling-mixin-variables"},{title:"Heading styling mixin",filename:"typography",url:"typography.html#heading-styling-mixin"},{title:"Base typography mixins",filename:"typography",url:"typography.html#base-typography-mixins"},{title:"Headings typography mixin",filename:"typography",url:"typography.html#headings-typography-mixin"},{title:"Typography links mixin",filename:"typography",url:"typography.html#typography-links-mixin"},{title:"Typography lists mixin",filename:"typography",url:"typography.html#typography-lists-mixin"},{title:"Typography code elements mixin",filename:"typography",url:"typography.html#typography-code-elements-mixin"},{title:"Typography blockquote",filename:"typography",url:"typography.html#typography-blockquote"},{title:"utilities",filename:"utilities",url:"utilities.html"},{title:"Utilities",filename:"utilities",url:"utilities.html#utilities"},{title:".clearfix()",filename:"utilities",url:"utilities.html#clearfix"},{title:".visibility-hidden()",filename:"utilities",url:"utilities.html#visibilityhidden"},{title:".visually-hidden()",filename:"utilities",url:"utilities.html#visuallyhidden"},{title:".visually-hidden-reset()",filename:"utilities",url:"utilities.html#visuallyhiddenreset"},{title:".css()",filename:"utilities",url:"utilities.html#css"},{title:".css() variables",filename:"utilities",url:"utilities.html#css-variables"},{title:".rotate()",filename:"utilities",url:"utilities.html#rotate"},{title:".rotate() variables",filename:"utilities",url:"utilities.html#rotate-variables"},{title:".input-placeholder()",filename:"utilities",url:"utilities.html#inputplaceholder"},{title:".input-placeholder() variables",filename:"utilities",url:"utilities.html#inputplaceholder-variables"},{title:".background-gradient()",filename:"utilities",url:"utilities.html#backgroundgradient"},{title:".background-gradient() variables",filename:"utilities",url:"utilities.html#backgroundgradient-variables"},{title:"variables",filename:"variables",url:"variables.html"},{title:"",filename:"variables",url:"variables.html#"},{title:"List of Global Variables",filename:"variables",url:"variables.html#list-of-global-variables"},{title:"Table with rows hover mixin variables",filename:"variables",url:"variables.html#table-with-rows-hover-mixin-variables"}];(function(){"use strict";var b=function(a,b){return Array.prototype.indexOf.call(a,b)!==-1},c=function(a,b){return Array.prototype.filter.call(a,b)},d=function(a,b){return Array.prototype.forEach.call(a,b)},e=document.getElementsByTagName("body")[0];e.addEventListener("click",function(a){var b=a.target;b.tagName.toLowerCase()==="svg"&&(b=b.parentNode);var c=!1;b.dataset.toggle!=null&&(a.preventDefault(),b.classList.contains("is-active")||(c=!0)),d(e.querySelectorAll("[data-toggle]"),function(a){a.classList.remove("is-active"),document.getElementById(a.dataset.toggle).hidden=!0}),c&&(b.classList.add("is-active"),document.getElementById(b.dataset.toggle).hidden=!1)}),function(){var f=e.getElementsByClassName("nav")[0];if(!f)return;var g=document.createElement("ul");g.className="nav-results",g.id="nav-search",g.hidden=!0,d(a,function(a){var b,c,d;b=document.createElement("li"),b._title=a.title.toLowerCase(),b.hidden=!0,b.appendChild(c=document.createElement("a")),c.href=a.url,c.innerHTML=a.title,c.appendChild(d=document.createElement("span")),d.innerHTML=a.filename,d.className="nav-results-filename",g.appendChild(b)}),f.appendChild(g);var h=g.children,i=function(a){d(h,function(a){a.hidden=!0});var b=this.value.toLowerCase(),e=[];b!==""&&(e=c(h,function(a){return a._title.indexOf(b)!==-1})),e.length>0?(d(e,function(a){a.hidden=!1}),g.hidden=!1):g.hidden=!0},j=f.querySelector('input[type="search"]');j.addEventListener("keyup",i),j.addEventListener("focus",i),e.addEventListener("click",function(a){if(a.target.classList&&a.target.classList.contains("search"))return;g.hidden=!0}),g.addEventListener("click",function(a){j.value=""});var k=document.createElement("ul");k.id="nav-toc",k.hidden=!0,k.className="nav-results toc-list",c(e.getElementsByTagName("*"),function(a){return b(["h1","h2","h3"],a.tagName.toLowerCase())}).map(function(a){var b=document.createElement("li"),c=document.createElement("a"),d=a.tagName.toLowerCase()[1];c.classList.add("level-"+d),b.appendChild(c),c.href="#"+a.id,c.innerHTML=a.innerHTML,k.appendChild(b)}),f.appendChild(k)}()})(),function(){"use strict";if(location.hash==="#__preview__"||location.protocol==="data:")return;var a=function(a,b){return Array.prototype.forEach.call(a,b)},b=function(a,b){var e=Array.prototype.slice.call(arguments,2);return d(a,function(a){return(c(b)?b||a:a[b]).apply(a,e)})},c=function(a){return Object.prototype.toString.call(a)==="[object Function]"},d=function(a,b){return Array.prototype.map.call(a,b)},e=function(a,b){return d(a,function(a){return a[b]})},f=function(a){var b={},c=a.split(";");for(var d=0;c.length>d;d++){var e=c[d].trim().split("=");b[e[0]]=e[1]}return b},g=function(a,c){return b(e(a,"classList"),"remove",c)},h=function(a,b){a.contentDocument.defaultView.postMessage(b,"*")},i=document.getElementsByTagName("head")[0],j=document.getElementsByTagName("body")[0],k=e(i.querySelectorAll('style[type="text/preview"]'),"innerHTML").join(""),l=e(i.querySelectorAll('script[type="text/preview"]'),"innerHTML").join(""),m=location.href.split("#")[0]+"#__preview__",n=document.createElement("iframe");n.src="data:text/html,",j.appendChild(n),n.addEventListener("load",function(){var b={sameOriginDataUri:!0};try{this.contentDocument,this.contentDocument||(b.sameOriginDataUri=!1)}catch(c){b.sameOriginDataUri=!1}this.parentNode.removeChild(this),a(j.getElementsByTagName("textarea"),function(a,c){o(a,b,c),q(),p(a)})});var o=function(a,b,c){var d,e,f;d=document.createElement("div"),d.appendChild(e=document.createElement("div")),d.className="preview",e.appendChild(f=document.createElement("iframe")),e.className="resizeable",f.setAttribute("scrolling","no"),f.name="iframe"+c++,f.addEventListener("load",function(){var c,d,e,f,g,i,j;j=this.contentDocument;if(!b.sameOriginDataUri&&this.src!==m)return;this.src===m&&(c=j.createElement("html"),c.appendChild(j.createElement("head")),c.appendChild(d=j.createElement("body")),d.innerHTML=a.textContent,j.replaceChild(c,j.documentElement)),g=j.createElement("head"),g.appendChild(f=j.createElement("style")),g.appendChild(e=j.createElement("script")),e.textContent=l,f.textContent=k,i=j.getElementsByTagName("head")[0],i.parentNode.replaceChild(g,i),h(this,"getHeight")});var g;b.sameOriginDataUri?g="data:text/html;charset=utf-8,"+encodeURIComponent("<!doctype html><html><head></head></body>"+a.textContent):g=m,f.setAttribute("src",g);var i=function(){f.contentDocument.body.innerHTML=this.value,h(f,"getHeight")};a.addEventListener("keypress",i),a.addEventListener("keyup",i),a.parentNode.insertBefore(d,a)},p=function(a){var b=document.createElement("div");b.className="preview-code",b.style.position="absolute",b.style.left="-9999px",j.appendChild(b);var c=parseInt(window.getComputedStyle(a).getPropertyValue("max-height"),10),d=function(a){b.textContent=this.value+"\n";var d=b.offsetHeight+2;d>=c?this.style.overflow="auto":this.style.overflow="hidden",this.style.height=b.offsetHeight+2+"px"};a.addEventListener("keypress",d),a.addEventListener("keyup",d),d.call(a)},q=function(){var b=j.getElementsByClassName("settings")[0],c=j.getElementsByClassName("resizeable"),d=30,e=function(b){document.cookie="preview-width="+b,a(c,function(a){b==="auto"&&(b=a.parentNode.offsetWidth),a.style.width=b+"px",h(a.getElementsByTagName("iframe")[0],"getHeight")})},i=f(document.cookie)["preview-width"];if(i){e(i),g(b.getElementsByClassName("is-active"),"is-active");var k=b.querySelector('button[data-width="'+i+'"]');k&&k.classList.add("is-active")}window.addEventListener("message",function(a){if(a.data==null||!a.source)return;var b=a.data,c=document.getElementsByName(a.source.name)[0];b.height!=null&&c&&(c.parentNode.style.height=b.height+d+"px")},!1),b&&c.length>0&&(b.hidden=!1,b.addEventListener("click",function(a){var c=a.target.tagName.toLowerCase(),d;if(c==="button")d=a.target;else{if(c!=="svg")return;d=a.target.parentNode}a.preventDefault(),g(b.getElementsByClassName("is-active"),"is-active"),d.classList.add("is-active");var f=d.dataset.width;e(f)}))}}()})()</script></body></html><!-- Generated with StyleDocco (http://jacobrask.github.com/styledocco). -->
diff --git a/lib/web/css/source/lib/utilities.less b/lib/web/css/source/lib/utilities.less
index bb222930367a4a37b1bfcc9d32d130de9c5e1233..06bc543940c506d015d907e2ad7f1d5494e82366 100644
--- a/lib/web/css/source/lib/utilities.less
+++ b/lib/web/css/source/lib/utilities.less
@@ -70,15 +70,30 @@
// Color stops are not available in IE9 and below.
// Filters are enabled
.horizontal(
- @_start-color;
- @_end-color;
- @_start-percent: 0%;
- @_end-percent: 100%
- ) when not (@disable-filters) {
+ @_start-color,
+ @_end-color,
+ @_start-percent: 0%,
+ @_end-percent: 100%,
+ @_background-color-position: true
+ ) when not (@disable-filters) and (@_background-color-position = true) {
background-color: @_end-color;
background-repeat: repeat-x;
background-image: -webkit-linear-gradient(left, color-stop(@_start-color @_start-percent), color-stop(@_end-color @_end-percent)); // Safari 5.1-6, Chrome 10+
- background-image: linear-gradient(to right, @_start-color @_start-percent, @_end-color @_end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+ background-image: linear-gradient(to right, @_start-color @_start-percent, @_end-color @_end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)", @_start-color, @_end-color)); // IE9 and down
+ }
+
+ .horizontal(
+ @_start-color,
+ @_end-color,
+ @_start-percent: 0%,
+ @_end-percent: 100%,
+ @_background-color-position: true
+ ) when not (@disable-filters) and (@_background-color-position = false) {
+ background-color: @_start-color;
+ background-repeat: repeat-x;
+ background-image: -webkit-linear-gradient(left, color-stop(@_start-color @_start-percent), color-stop(@_end-color @_end-percent)); // Safari 5.1-6, Chrome 10+
+ background-image: linear-gradient(to right, @_start-color @_start-percent, @_end-color @_end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)", @_start-color, @_end-color)); // IE9 and down
}
@@ -87,15 +102,29 @@
// Color stops are not available in IE9 and below.
// Filters are disabled
.horizontal(
- @_start-color;
- @_end-color;
- @_start-percent: 0%;
- @_end-percent: 100%
- ) when (@disable-filters) {
+ @_start-color,
+ @_end-color,
+ @_start-percent: 0%,
+ @_end-percent: 100%,
+ @_background-color-position: true
+ ) when (@disable-filters) and (@_background-color-position = true) {
background-color: @_end-color;
background-repeat: repeat-x;
background-image: -webkit-linear-gradient(left, color-stop(@_start-color @_start-percent), color-stop(@_end-color @_end-percent)); // Safari 5.1-6, Chrome 10+
- background-image: linear-gradient(to right, @_start-color @_start-percent, @_end-color @_end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+ background-image: linear-gradient(to right, @_start-color @_start-percent, @_end-color @_end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+ }
+
+ .horizontal(
+ @_start-color,
+ @_end-color,
+ @_start-percent: 0%,
+ @_end-percent: 100%,
+ @_background-color-position: true
+ ) when (@disable-filters) and (@_background-color-position = false) {
+ background-color: @_start-color;
+ background-repeat: repeat-x;
+ background-image: -webkit-linear-gradient(left, color-stop(@_start-color @_start-percent), color-stop(@_end-color @_end-percent)); // Safari 5.1-6, Chrome 10+
+ background-image: linear-gradient(to right, @_start-color @_start-percent, @_end-color @_end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
}
// Vertical gradient, from top to bottom
@@ -103,11 +132,12 @@
// Color stops are not available in IE9 and below.
// Filters are enabled
.vertical(
- @_start-color;
- @_end-color;
- @_start-percent: 0%;
- @_end-percent: 100%
- ) when not (@disable-filters) {
+ @_start-color,
+ @_end-color,
+ @_start-percent: 0%,
+ @_end-percent: 100%,
+ @_background-color-position: true
+ ) when not (@disable-filters) and (@_background-color-position = true) {
background-color: @_end-color;
background-repeat: repeat-x;
background-image: -webkit-linear-gradient(top, @_start-color @_start-percent, @_end-color @_end-percent); // Safari 5.1-6, Chrome 10+
@@ -115,21 +145,49 @@
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)", @_start-color, @_end-color)); // IE9 and down
}
+ .vertical(
+ @_start-color,
+ @_end-color,
+ @_start-percent: 0%,
+ @_end-percent: 100%,
+ @_background-color-position: true
+ ) when not (@disable-filters) and (@_background-color-position = false) {
+ background-color: @_start-color;
+ background-repeat: repeat-x;
+ background-image: -webkit-linear-gradient(top, @_start-color @_start-percent, @_end-color @_end-percent); // Safari 5.1-6, Chrome 10+
+ background-image: linear-gradient(to bottom, @_start-color @_start-percent, @_end-color @_end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)", @_start-color, @_end-color)); // IE9 and down
+ }
+
// Vertical gradient, from top to bottom
// Creates two color stops, start and end, by specifying a color and position for each color stop.
// Color stops are not available in IE9 and below.
// Filters are disabled
.vertical(
- @_start-color;
- @_end-color;
- @_start-percent: 0%;
- @_end-percent: 100%
- ) when (@disable-filters) {
+ @_start-color,
+ @_end-color,
+ @_start-percent: 0%,
+ @_end-percent: 100%,
+ @_background-color-position: true
+ ) when (@disable-filters) and (@_background-color-position = true) {
background-color: @_end-color;
background-repeat: repeat-x;
background-image: -webkit-linear-gradient(top, @_start-color @_start-percent, @_end-color @_end-percent); // Safari 5.1-6, Chrome 10+
background-image: linear-gradient(to bottom, @_start-color @_start-percent, @_end-color @_end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
}
+
+ .vertical(
+ @_start-color,
+ @_end-color,
+ @_start-percent: 0%,
+ @_end-percent: 100%,
+ @_background-color-position: true
+ ) when (@disable-filters) and (@_background-color-position = false) {
+ background-color: @_start-color;
+ background-repeat: repeat-x;
+ background-image: -webkit-linear-gradient(top, @_start-color @_start-percent, @_end-color @_end-percent); // Safari 5.1-6, Chrome 10+
+ background-image: linear-gradient(to bottom, @_start-color @_start-percent, @_end-color @_end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+ }
}
//
@@ -141,9 +199,14 @@
@_background-gradient-start-color,
@_background-gradient-end-color,
@_background-gradient-direction,
- @_background-gradient
+ @_background-gradient,
+ @_background-gradient-color-position: true
) when (@_background-gradient-direction = horizontal) and (@_background-gradient = true) {
- #gradient > .horizontal(@_background-gradient-start-color, @_background-gradient-end-color);
+ #gradient > .horizontal(
+ @_start-color: @_background-gradient-start-color,
+ @_end-color: @_background-gradient-end-color,
+ @_background-color-position: @_background-gradient-color-position
+ );
}
// Pager gradient - vertical
@@ -151,9 +214,14 @@
@_background-gradient-start-color,
@_background-gradient-end-color,
@_background-gradient-direction,
- @_background-gradient
+ @_background-gradient,
+ @_background-gradient-color-position: true
) when (@_background-gradient-direction = vertical) and (@_background-gradient = true) {
- #gradient > .vertical(@_background-gradient-start-color, @_background-gradient-end-color);
+ #gradient > .vertical(
+ @_start-color: @_background-gradient-start-color,
+ @_end-color: @_background-gradient-end-color,
+ @_background-color-position: @_background-gradient-color-position
+ );
}
//
diff --git a/lib/web/css/source/lib/variables.less b/lib/web/css/source/lib/variables.less
index e1533cf2b545bbf91d025fbf6be08338e1fdb31f..3cd5303d83a348d5c7da865b201757bd8fc51e6b 100644
--- a/lib/web/css/source/lib/variables.less
+++ b/lib/web/css/source/lib/variables.less
@@ -42,6 +42,7 @@
@color-gray79: #c9c9c9;
@color-gray80: #ccc;
@color-gray82: #d1d1d1;
+@color-gray89: #e3e3e3;
@color-gray90: #e5e5e5;
@color-gray91: #e8e8e8;
@color-gray92: #ebebeb;
diff --git a/lib/web/mage/translate-inline.js b/lib/web/mage/translate-inline.js
index f9c41e4b21a0629fc3deb7e307b0139b7d677e2a..71d12032f7cd60f108ef4a438888870ab5f4d5b6 100644
--- a/lib/web/mage/translate-inline.js
+++ b/lib/web/mage/translate-inline.js
@@ -127,5 +127,33 @@
}
});
+ $.widget('ui.button', $.ui.button, {
+ _create: function () {
+ this._super();
+ /**
+ * Decode HTML entities to prevent incorrect rendering of dialog button label
+ */
+ this.options.label = this.options.label
+ ? jQuery('<div/>').html(this.options.label).text()
+ : this.options.label;
+ /**
+ * Reset button to make decoded label visible
+ */
+ this._resetButton();
+ }
+ });
+
+ $.widget('ui.dialog', $.ui.dialog, {
+ /**
+ * Prevent rendering of dialog title as escaped HTML
+ */
+ _title: function (title) {
+ this._super(title);
+ if (this.options.title) {
+ title.html(this.options.title);
+ }
+ }
+ });
+
return $.mage.translateInline;
}));
diff --git a/nginx.conf.sample b/nginx.conf.sample
index 782aac48782c701385c3d821d80caac1391391fb..6577f250d636d2ddc1a14b20202591249b4ef56a 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -17,6 +17,7 @@
# include /vagrant/magento2/nginx.conf.sample;
# }
+
root $MAGE_ROOT;
@@ -46,17 +47,56 @@ location / {
rewrite / /index.php ;
}
-
location /static/ {
+
if ($MAGE_MODE = "production") {
expires max;
}
+
+ location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+ add_header Cache-Control "public";
+ expires +1y;
+
+ if (!-f $request_filename) {
+ rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
+ }
+ }
+
+ location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
+ add_header Cache-Control "no-store";
+ expires off;
+
+ if (!-f $request_filename) {
+ rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
+ }
+
+ }
+
if (!-f $request_filename) {
rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
}
}
location /media/ {
+
+ location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+ add_header Cache-Control "public";
+ expires +1y;
+
+ if (!-f $request_filename) {
+ rewrite / /get.php;
+ }
+ }
+
+ location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
+ add_header Cache-Control "no-store";
+ expires off;
+
+ if (!-f $request_filename) {
+ rewrite / /get.php;
+ }
+ }
+
if (!-f $request_filename) {
rewrite / /get.php;
}
@@ -99,4 +139,4 @@ location / {
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params;
}
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 5cfd2d3dc77c0fda924f09064831c9f3125638b5..1fe7921b68ec9f39ea1015d1a0ee7b362cdc6d1a 100644
--- a/package.json
+++ b/package.json
@@ -1,25 +1,34 @@
{
"name": "Magento2",
+ "author": "Magento, an eBay Inc. company",
"description": "Magento2 node modules dependencies for local development",
+ "version": "0.42.0-beta1",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/magento/magento2.git"
+ },
+ "homepage": "http://magento.com/",
"devDependencies": {
"connect": "^3.3.3",
"grunt": "^0.4.5",
+ "grunt-autoprefixer": "^2.0.0",
"grunt-contrib-clean": "^0.6.0",
+ "grunt-contrib-concat": "^0.5.0",
+ "grunt-contrib-cssmin": "^0.10.0",
"grunt-contrib-imagemin": "^0.9.2",
"grunt-contrib-jasmine": "^0.8.1",
"grunt-contrib-less": "^0.12.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-exec": "^0.4.6",
"grunt-styledocco": "^0.1.4",
- "imagemin-svgo": "^4.0.1",
"grunt-template-jasmine-requirejs": "^0.2.0",
+ "imagemin-svgo": "^4.0.1",
"load-grunt-tasks": "^1.0.0",
- "time-grunt": "^1.0.0",
- "underscore": "^1.7.0",
- "node-minify": "^1.0.1",
"morgan": "^1.5.0",
+ "node-minify": "^1.0.1",
"serve-static": "^1.7.1",
- "time-grunt": "^1.0.0"
+ "time-grunt": "^1.0.0",
+ "underscore": "^1.7.0"
},
"engines": {
"node": ">=0.10.0"
diff --git a/pub/.htaccess b/pub/.htaccess
old mode 100644
new mode 100755
diff --git a/pub/cron.php b/pub/cron.php
old mode 100644
new mode 100755
diff --git a/pub/errors/.htaccess b/pub/errors/.htaccess
old mode 100644
new mode 100755
diff --git a/pub/errors/404.php b/pub/errors/404.php
old mode 100644
new mode 100755
diff --git a/pub/errors/503.php b/pub/errors/503.php
old mode 100644
new mode 100755
diff --git a/pub/errors/default/404.phtml b/pub/errors/default/404.phtml
old mode 100644
new mode 100755
diff --git a/pub/errors/default/503.phtml b/pub/errors/default/503.phtml
old mode 100644
new mode 100755
diff --git a/pub/errors/default/css/styles.css b/pub/errors/default/css/styles.css
old mode 100644
new mode 100755
diff --git a/pub/errors/default/images/favicon.ico b/pub/errors/default/images/favicon.ico
old mode 100644
new mode 100755
diff --git a/pub/errors/default/images/i_msg-error.gif b/pub/errors/default/images/i_msg-error.gif
old mode 100644
new mode 100755
diff --git a/pub/errors/default/images/i_msg-note.gif b/pub/errors/default/images/i_msg-note.gif
old mode 100644
new mode 100755
diff --git a/pub/errors/default/images/i_msg-success.gif b/pub/errors/default/images/i_msg-success.gif
old mode 100644
new mode 100755
diff --git a/pub/errors/default/images/logo.gif b/pub/errors/default/images/logo.gif
old mode 100644
new mode 100755
diff --git a/pub/errors/default/nocache.phtml b/pub/errors/default/nocache.phtml
old mode 100644
new mode 100755
diff --git a/pub/errors/default/page.phtml b/pub/errors/default/page.phtml
old mode 100644
new mode 100755
diff --git a/pub/errors/default/report.phtml b/pub/errors/default/report.phtml
old mode 100644
new mode 100755
diff --git a/pub/errors/design.xml b/pub/errors/design.xml
old mode 100644
new mode 100755
diff --git a/pub/errors/local.xml.sample b/pub/errors/local.xml.sample
old mode 100644
new mode 100755
diff --git a/pub/errors/noCache.php b/pub/errors/noCache.php
old mode 100644
new mode 100755
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
old mode 100644
new mode 100755
diff --git a/pub/errors/processorFactory.php b/pub/errors/processorFactory.php
old mode 100644
new mode 100755
diff --git a/pub/errors/report.php b/pub/errors/report.php
old mode 100644
new mode 100755
diff --git a/pub/get.php b/pub/get.php
old mode 100644
new mode 100755
diff --git a/pub/index.php b/pub/index.php
old mode 100644
new mode 100755
diff --git a/pub/media/.htaccess b/pub/media/.htaccess
old mode 100644
new mode 100755
index 5c5cc71bac44aab715d9cf216bfca0449741201f..f2751570906a53719d522d910be118f77ffcedaf
--- a/pub/media/.htaccess
+++ b/pub/media/.htaccess
@@ -23,3 +23,100 @@ Options -ExecCGI
RewriteRule .* ../get.php [L]
</IfModule>
+
+############################################
+## setting MIME types
+
+# JavaScript
+AddType application/javascript js jsonp
+AddType application/json json
+
+# CSS
+AddType text/css css
+
+# Images and icons
+AddType image/x-icon ico
+AddType image/gif gif
+AddType image/png png
+AddType image/jpeg jpg
+AddType image/jpeg jpeg
+
+# SVG
+AddType image/svg+xml svg
+
+# Fonts
+AddType application/vnd.ms-fontobject eot
+AddType application/x-font-ttf ttf
+AddType application/x-font-otf otf
+AddType application/x-font-woff woff
+AddType application/font-woff2 woff2
+
+# Flash
+AddType application/x-shockwave-flash swf
+
+# Archives and exports
+AddType application/zip gzip
+AddType application/x-gzip gz gzip
+AddType application/x-bzip2 bz2
+AddType text/csv csv
+AddType application/xml xml
+
+<IfModule mod_headers.c>
+
+ <FilesMatch .*\.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$>
+ Header append Cache-Control public
+ </FilesMatch>
+
+ <FilesMatch .*\.(zip|gz|gzip|bz2|csv|xml)$>
+ Header append Cache-Control no-store
+ </FilesMatch>
+
+</IfModule>
+
+<IfModule mod_expires.c>
+
+############################################
+## Add default Expires header
+## http://developer.yahoo.com/performance/rules.html#expires
+
+ ExpiresActive On
+
+ # Data
+ <FilesMatch \.(zip|gz|gzip|bz2|csv|xml)$>
+ ExpiresDefault "access plus 0 seconds"
+ </FilesMatch>
+ ExpiresByType text/xml "access plus 0 seconds"
+ ExpiresByType text/csv "access plus 0 seconds"
+ ExpiresByType application/json "access plus 0 seconds"
+ ExpiresByType application/zip "access plus 0 seconds"
+ ExpiresByType application/x-gzip "access plus 0 seconds"
+ ExpiresByType application/x-bzip2 "access plus 0 seconds"
+
+ # CSS, JavaScript
+ <FilesMatch \.(css|js)$>
+ ExpiresDefault "access plus 1 year"
+ </FilesMatch>
+ ExpiresByType text/css "access plus 1 year"
+ ExpiresByType application/javascript "access plus 1 year"
+
+ # Favicon, images, flash
+ <FilesMatch \.(ico|gif|png|jpg|jpeg|swf|svg)$>
+ ExpiresDefault "access plus 1 year"
+ </FilesMatch>
+ ExpiresByType image/gif "access plus 1 year"
+ ExpiresByType image/png "access plus 1 year"
+ ExpiresByType image/jpg "access plus 1 year"
+ ExpiresByType image/jpeg "access plus 1 year"
+ ExpiresByType image/svg+xml "access plus 1 year"
+
+ # Fonts
+ <FilesMatch \.(eot|ttf|otf|svg|woff|woff2)$>
+ ExpiresDefault "access plus 1 year"
+ </FilesMatch>
+ ExpiresByType application/vnd.ms-fontobject "access plus 1 year"
+ ExpiresByType application/x-font-ttf "access plus 1 year"
+ ExpiresByType application/x-font-otf "access plus 1 year"
+ ExpiresByType application/x-font-woff "access plus 1 year"
+ ExpiresByType application/font-woff2 "access plus 1 year"
+
+</IfModule>
diff --git a/pub/media/customer/.htaccess b/pub/media/customer/.htaccess
old mode 100644
new mode 100755
diff --git a/pub/media/downloadable/.htaccess b/pub/media/downloadable/.htaccess
old mode 100644
new mode 100755
diff --git a/pub/media/theme_customization/.htaccess b/pub/media/theme_customization/.htaccess
old mode 100644
new mode 100755
diff --git a/pub/opt/magento/var/resource_config.json b/pub/opt/magento/var/resource_config.json
old mode 100644
new mode 100755
diff --git a/pub/static.php b/pub/static.php
old mode 100644
new mode 100755
diff --git a/pub/static/.htaccess b/pub/static/.htaccess
old mode 100644
new mode 100755
index 777c0a1dca22f843eb4aa4dfb53c2e4f7054058d..8d1f4ff8630b1e68d3011c6b2a3c80d4bedb4644
--- a/pub/static/.htaccess
+++ b/pub/static/.htaccess
@@ -12,3 +12,100 @@ php_flag engine 0
RewriteRule .* ../static.php?resource=$0 [L]
</IfModule>
+
+############################################
+## setting MIME types
+
+# JavaScript
+AddType application/javascript js jsonp
+AddType application/json json
+
+# CSS
+AddType text/css css
+
+# Images and icons
+AddType image/x-icon ico
+AddType image/gif gif
+AddType image/png png
+AddType image/jpeg jpg
+AddType image/jpeg jpeg
+
+# SVG
+AddType image/svg+xml svg
+
+# Fonts
+AddType application/vnd.ms-fontobject eot
+AddType application/x-font-ttf ttf
+AddType application/x-font-otf otf
+AddType application/x-font-woff woff
+AddType application/font-woff2 woff2
+
+# Flash
+AddType application/x-shockwave-flash swf
+
+# Archives and exports
+AddType application/zip gzip
+AddType application/x-gzip gz gzip
+AddType application/x-bzip2 bz2
+AddType text/csv csv
+AddType application/xml xml
+
+<IfModule mod_headers.c>
+
+ <FilesMatch .*\.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$>
+ Header append Cache-Control public
+ </FilesMatch>
+
+ <FilesMatch .*\.(zip|gz|gzip|bz2|csv|xml)$>
+ Header append Cache-Control no-store
+ </FilesMatch>
+
+</IfModule>
+
+<IfModule mod_expires.c>
+
+############################################
+## Add default Expires header
+## http://developer.yahoo.com/performance/rules.html#expires
+
+ ExpiresActive On
+
+ # Data
+ <FilesMatch \.(zip|gz|gzip|bz2|csv|xml)$>
+ ExpiresDefault "access plus 0 seconds"
+ </FilesMatch>
+ ExpiresByType text/xml "access plus 0 seconds"
+ ExpiresByType text/csv "access plus 0 seconds"
+ ExpiresByType application/json "access plus 0 seconds"
+ ExpiresByType application/zip "access plus 0 seconds"
+ ExpiresByType application/x-gzip "access plus 0 seconds"
+ ExpiresByType application/x-bzip2 "access plus 0 seconds"
+
+ # CSS, JavaScript
+ <FilesMatch \.(css|js)$>
+ ExpiresDefault "access plus 1 year"
+ </FilesMatch>
+ ExpiresByType text/css "access plus 1 year"
+ ExpiresByType application/javascript "access plus 1 year"
+
+ # Favicon, images, flash
+ <FilesMatch \.(ico|gif|png|jpg|jpeg|swf|svg)$>
+ ExpiresDefault "access plus 1 year"
+ </FilesMatch>
+ ExpiresByType image/gif "access plus 1 year"
+ ExpiresByType image/png "access plus 1 year"
+ ExpiresByType image/jpg "access plus 1 year"
+ ExpiresByType image/jpeg "access plus 1 year"
+ ExpiresByType image/svg+xml "access plus 1 year"
+
+ # Fonts
+ <FilesMatch \.(eot|ttf|otf|svg|woff|woff2)$>
+ ExpiresDefault "access plus 1 year"
+ </FilesMatch>
+ ExpiresByType application/vnd.ms-fontobject "access plus 1 year"
+ ExpiresByType application/x-font-ttf "access plus 1 year"
+ ExpiresByType application/x-font-otf "access plus 1 year"
+ ExpiresByType application/x-font-woff "access plus 1 year"
+ ExpiresByType application/font-woff2 "access plus 1 year"
+
+</IfModule>
diff --git a/setup/config/states.config.php b/setup/config/states.config.php
index 51522a10873738bc542c7dfa6073886add5f9385..81bb91de50432d2f2e668dcd6d64b82dffdb0008 100644
--- a/setup/config/states.config.php
+++ b/setup/config/states.config.php
@@ -36,7 +36,7 @@ return [
'id' => 'root.readiness-check',
'url' => 'readiness-check',
'templateUrl' => "{$base}/readiness-check",
- 'title' => 'Readiness Check',
+ 'title' => "Readiness \n Check",
'header' => 'Step 1: Readiness Check',
'nav-bar' => true,
'order' => 1,
@@ -55,7 +55,7 @@ return [
'id' => 'root.add-database',
'url' => 'add-database',
'templateUrl' => "{$base}/add-database",
- 'title' => 'Add a Database',
+ 'title' => "Add \n a Database",
'header' => 'Step 2: Add a Database',
'controller' => 'addDatabaseController',
'nav-bar' => true,
@@ -66,7 +66,7 @@ return [
'id' => 'root.web-configuration',
'url' => 'web-configuration',
'templateUrl' => "{$base}/web-configuration",
- 'title' => 'Web Configuration',
+ 'title' => "Web \n Configuration",
'header' => 'Step 3: Web Configuration',
'controller' => 'webConfigurationController',
'nav-bar' => true,
@@ -77,7 +77,7 @@ return [
'id' => 'root.customize-your-store',
'url' => 'customize-your-store',
'templateUrl' => "{$base}/customize-your-store",
- 'title' => 'Customize Your Store',
+ 'title' => "Customize \n Your Store",
'header' => 'Step 4: Customize Your Store',
'controller' => 'customizeYourStoreController',
'nav-bar' => true,
@@ -87,7 +87,7 @@ return [
'id' => 'root.create-admin-account',
'url' => 'create-admin-account',
'templateUrl' => "{$base}/create-admin-account",
- 'title' => 'Create Admin Account',
+ 'title' => "Create \n Admin Account",
'header' => 'Step 5: Create Admin Account',
'controller' => 'createAdminAccountController',
'nav-bar' => true,
diff --git a/setup/module/Magento/Setup/styles/components/_navigation-bar.less b/setup/module/Magento/Setup/styles/components/_navigation-bar.less
new file mode 100644
index 0000000000000000000000000000000000000000..0805c9cc19a985761962c94edb3db5485d7ef65a
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/components/_navigation-bar.less
@@ -0,0 +1,318 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@nav__background-color: @color-white-fog;
+@nav__border-color: @color-gray89;
+@nav__indent-right: 1.5rem;
+
+@nav-bar__color: @color-brownie;
+@nav-bar__font-size: 1.2rem;
+@nav-bar__min-height: 5.8rem;
+
+@nav-bar-bullet-wrap__background-color: @color-gray84;
+@nav-bar-bullet-wrap__border-bottom-color: @color-gray85;
+@nav-bar-bullet-wrap__border-top-color: @color-gray75;
+
+@nav-bar-dot__size: 2.2rem;
+@nav-bar-items__indent-bottom: 1.7rem;
+@nav-bar-item__color: @color-gray65;
+
+@nav-bar-point__border-width: .4rem;
+@nav-bar-point__size: .7rem;
+
+@nav-bar-step__width: 10.3rem;
+
+//
+// Styles
+// _____________________________________________
+
+//
+// Navigation
+// ---------------------------------------------
+
+.nav {
+ background-color: @nav__background-color;
+ border-bottom: 1px solid @nav__border-color;
+ border-top: 1px solid @nav__border-color;
+ .extend__clearer();
+ display: none;
+ padding: @nav-bar-dot__size @nav__indent-right 0 0;
+}
+
+// Buttons panel
+.nav .btn-group,
+.nav-bar-outer-actions {
+ float: right;
+ margin-bottom: @nav-bar-items__indent-bottom;
+ .btn-wrap {
+ float: right;
+ margin-left: .5rem;
+ margin-right: .5rem;
+ }
+}
+
+.nav-bar-outer-actions {
+ margin-top: -(@main__indent-top + @nav-bar__min-height + @nav-bar-items__indent-bottom + .1rem);
+ padding-right: @nav__indent-right;
+}
+
+.btn-wrap-try-again {
+ width: 9.5rem;
+}
+
+.btn-wrap-prev,
+.btn-wrap-next {
+ width: 8.5rem;
+}
+
+//
+// Progress bar
+// ---------------------------------------------
+
+.nav-bar {
+ counter-reset: i;
+ float: left;
+ margin: 0 1rem @nav-bar-items__indent-bottom 0;
+ padding: 0;
+ position: relative;
+ white-space: nowrap;
+
+ // Progress line tunnel
+ &:before {
+ .background-gradient( @_background-gradient: true, @_background-gradient-direction: vertical, @_background-gradient-start-color: @color-gray82, @_background-gradient-end-color: @color-gray83 );
+ border-bottom: 1px solid @nav-bar-bullet-wrap__border-bottom-color;
+ border-top: 1px solid @nav-bar-bullet-wrap__border-top-color;
+ content: '';
+ height: .8rem;
+ left: @nav-bar-step__width / 2;
+ position: absolute;
+ right: @nav-bar-step__width / 2;
+ top: @nav-bar-point__size;
+ }
+
+ // Step link wrap
+ > li {
+ display: inline-block;
+ font-size: 0;
+ position: relative;
+ vertical-align: top;
+ width: @nav-bar-step__width;
+
+ // Discard progress line for first item
+ &:first-child {
+ &:after {
+ display: none;
+ }
+ }
+
+ // Progress line
+ &:after {
+ background-color: @nav-bar__color;
+ content: '';
+ height: .5rem;
+ left: ~'calc(-50% + .25rem)';
+ position: absolute;
+ right: ~'calc(50% + .7rem)';
+ top: .9rem;
+ }
+
+ // Disabled state
+ &.disabled {
+ &:before {
+ bottom: 0;
+ content: '';
+ left: 0;
+ position: absolute;
+ right: 0;
+ top: 0;
+ z-index: 1;
+ }
+ }
+
+ // Active step link wrap
+ &.active {
+ // Not visited
+ ~ li {
+ // Not visited progress line (discard)
+ &:after {
+ display: none;
+ }
+
+ a {
+ // Not visited step link bullet
+ &:after {
+ background-color: transparent;
+ border-color: transparent;
+ color: @nav-bar-item__color;
+ }
+ }
+ }
+
+ // Active link
+ a {
+ color: darken(@nav-bar__color, 30%);
+ &:hover {
+ cursor: default;
+ }
+
+ // Active step link bullet
+ &:after {
+ background-color: @color-white;
+ content: '';
+ }
+ }
+ }
+ }
+
+ // Visited step link
+ a {
+ color: @nav-bar__color;
+ display: block;
+ font-size: @nav-bar__font-size;
+ font-weight: @font-weight-semibold;
+ line-height: 1.2;
+ overflow: hidden;
+ padding: 3rem .5em 0;
+ position: relative;
+ text-align: center;
+ text-overflow: ellipsis;
+ &:hover {
+ text-decoration: none;
+ }
+
+ // Visited step link bullet
+ &:after {
+ background-color: @nav-bar__color;
+ border: .4rem solid @nav-bar__color;
+ border-radius: 100%;
+ color: @color-white;
+ content: counter(i);
+ counter-increment: i;
+ height: @nav-bar-point__size;
+ left: 50%;
+ line-height: .6;
+ margin-left: -@nav-bar-point__size - .1;
+ position: absolute;
+ right: auto;
+ text-align: center;
+ top: @nav-bar-dot__size / 2 - (@nav-bar-point__size / 2) - @nav-bar-point__border-width + .05;
+ width: @nav-bar-point__size;
+ }
+
+ // Visited step link bullet wrap
+ &:before {
+ background-color: @nav-bar-bullet-wrap__background-color;
+ border: 1px solid transparent;
+ border-bottom-color: @nav-bar-bullet-wrap__border-bottom-color;
+ border-radius: 100%;
+ border-top-color: @nav-bar-bullet-wrap__border-top-color;
+ content: '';
+ height: @nav-bar-dot__size - .1;
+ left: 50%;
+ line-height: 1;
+ margin-left: -(@nav-bar-dot__size / 2) - .1;
+ position: absolute;
+ top: 0;
+ width: @nav-bar-dot__size - .1;
+ }
+ }
+}
+
+//
+// Desktop
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-l) {
+ .nav {
+ padding-bottom: @btn-base__height + @nav-bar-items__indent-bottom;
+ padding-left: 1.5rem;
+ text-align: center;
+ }
+ .nav-bar {
+ display: inline-block;
+ float: none;
+ margin-right: 0;
+ vertical-align: top;
+ }
+ .nav .btn-group,
+ .nav-bar-outer-actions {
+ display: inline-block;
+ float: none;
+ margin-top: -(@main__indent-top + @btn-base__height + @nav-bar-items__indent-bottom + .1rem);
+ text-align: center;
+ vertical-align: top;
+ width: 100%;
+ }
+ .nav-bar-outer-actions {
+ padding-right: 0;
+ .outer-actions-inner-wrap {
+ display: inline-block;
+ }
+ }
+}
+
+//
+// Mobile
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-m) {
+ .nav {
+ padding-bottom: 0;
+ padding-left: 0;
+ padding-right: 0;
+ }
+ .nav-bar-outer-actions {
+ margin-top: 0;
+ }
+ .nav-bar {
+ .extend__clearer();
+ display: block;
+ margin-bottom: 0;
+ margin-left: auto;
+ margin-right: auto;
+ width: @nav-bar-step__width * 3;
+ &:before {
+ display: none;
+ }
+ > li {
+ float: left;
+ min-height: 9rem;
+ &:after {
+ display: none;
+ }
+ &:nth-child(4n) {
+ clear: both;
+ }
+ }
+ a {
+ line-height: 1.4;
+ }
+ }
+}
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-xs) {
+ .nav-bar {
+ width: @nav-bar-step__width * .75 * 3;
+ > li {
+ width: @nav-bar-step__width * .75;
+ }
+ }
+ .nav .btn-group,
+ .nav-bar-outer-actions {
+ .btn-wrap-try-again {
+ clear: both;
+ display: block;
+ float: none;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 1rem;
+ padding-top: 1rem;
+ }
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/components/_progress-bars.less b/setup/module/Magento/Setup/styles/components/_progress-bars.less
new file mode 100644
index 0000000000000000000000000000000000000000..8736ff9e5a308e37d4cef13e4c150f4a371dc16a
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/components/_progress-bars.less
@@ -0,0 +1,79 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@progress__border-color: @color-gray80;
+@progress__color: @color-gray98;
+
+@progress-bar__background-color: @color-success;
+@progress-bar__color: @color-white;
+@progress-bar__height: 3rem;
+
+//
+// Progress bars
+// _____________________________________________
+
+//
+// Bar animations
+// ---------------------------------------------
+
+// WebKit
+
+@-webkit-keyframes progress-bar-stripes {
+ from {
+ background-position: 4rem 0;
+ }
+ to {
+ background-position: 0 0;
+ }
+}
+
+// Spec and IE10+
+
+@keyframes progress-bar-stripes {
+ from {
+ background-position: 4rem 0;
+ }
+ to {
+ background-position: 0 0;
+ }
+}
+
+//
+// Bar
+// ---------------------------------------------
+
+// Outer container
+
+.progress {
+ background-color: @progress__color;
+ border: 1px solid @progress__border-color;
+ height: @progress-bar__height;
+ margin-bottom: @progress-bar__height;
+ overflow: hidden;
+}
+
+// Bar of progress
+
+.progress-bar {
+ background-color: @progress-bar__background-color;
+ color: @progress-bar__color;
+ float: left;
+ font-size: @small__font-size;
+ height: 100%;
+ line-height: @progress-bar__height;
+ text-align: center;
+ transition: width .6s ease;
+ width: 0;
+}
+
+// Call animation for the active one
+
+.progress-bar.active {
+ .animation(progress-bar-stripes 2s linear infinite);
+}
diff --git a/setup/module/Magento/Setup/styles/components/_spinner.less b/setup/module/Magento/Setup/styles/components/_spinner.less
new file mode 100644
index 0000000000000000000000000000000000000000..288147f7ea3f97dd18eb121459d6edaa9f97eb47
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/components/_spinner.less
@@ -0,0 +1,68 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@spinner__base-size: 4rem;
+
+// Size of spinner
+@spinner__border-radius: 6px;
+@spinner__spin-count: 8;
+@spinner__first-color: @color-brownie;
+@spinner__second-color: @color-white;
+@spinner__keyframe-name: fade;
+@spinner__animation-step: .09s;
+@spinner__animation-duration: @spinner__animation-step * @spinner__spin-count;
+@spinner__animation-transform: scale(.4);
+@spinner__animation-iteration-count: infinite;
+@spinner__animation-direction: linear;
+@spinner__rotate: 0;
+
+// Degree for one elem
+@spinner__rotate-step: 45;
+
+// One step in degree
+@spinner__delay: .9;
+
+//
+// Spinner
+// _____________________________________________
+
+// Base spinner
+
+.spinner {
+ ._spinner-keyframes();
+ ._spinner-loop (
+ @spinner__spin-count,
+ @spinner__rotate,
+ @spinner__delay
+ );
+ display: inline-block;
+ font-size: @spinner__base-size;
+ height: @spinner__size;
+ margin-right: 1.5rem;
+ position: relative;
+ width: @spinner__size;
+
+ > span {
+ ._spinner_transform();
+ background-color: @spinner__second-color;
+ border-radius: @spinner__border-radius;
+ clip: rect(0 1em/3.5 .1em 0);
+ height: .1em;
+ margin-top: 1em / 2;
+ position: absolute;
+ width: 1em;
+ }
+
+ .ie9 & {
+ background: url('@{path-to-pub}images/ajax-loader.gif') no-repeat center;
+ > span {
+ display: none;
+ }
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/components/_tooltips.less b/setup/module/Magento/Setup/styles/components/_tooltips.less
new file mode 100644
index 0000000000000000000000000000000000000000..3925911031a61c2ef203c8da6a71643931348423
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/components/_tooltips.less
@@ -0,0 +1,7 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+@import 'tooltips/_tooltips';
+@import 'tooltips/_password-strength';
diff --git a/setup/module/Magento/Setup/styles/components/tooltips/_password-strength.less b/setup/module/Magento/Setup/styles/components/tooltips/_password-strength.less
new file mode 100644
index 0000000000000000000000000000000000000000..9f77e70ef6ea06ec64658afff53083d2d6e35f39
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/components/tooltips/_password-strength.less
@@ -0,0 +1,43 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.password-strength {
+ display: block;
+ margin: 0 -.3rem 1em;
+ white-space: nowrap;
+ &.password-strength-to-short {
+ .password-strength-item {
+ &:first-child {
+ background-color: @color-failed;
+ }
+ }
+ }
+ &.password-strength-weak {
+ .password-strength-item:first-child,
+ .password-strength-item:first-child + .password-strength-item {
+ background-color: @color-warning;
+ }
+ }
+ &.password-strength-good {
+ .password-strength-item:first-child,
+ .password-strength-item:first-child + .password-strength-item,
+ .password-strength-item:first-child + .password-strength-item + .password-strength-item {
+ background-color: @color-success;
+ }
+ }
+ &.password-strength-strong {
+ .password-strength-item {
+ background-color: @color-success;
+ }
+ }
+ .password-strength-item {
+ background-color: @color-gray80;
+ display: inline-block;
+ font-size: 0;
+ height: 1.4rem;
+ margin-right: .3rem;
+ width: ~'calc(25% - .6rem)';
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/components/tooltips/_tooltips.less b/setup/module/Magento/Setup/styles/components/tooltips/_tooltips.less
new file mode 100644
index 0000000000000000000000000000000000000000..4959f1ac878f3a35e09e9a42c85310dee30d82b0
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/components/tooltips/_tooltips.less
@@ -0,0 +1,184 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@tooltip__background-color: @color-white;
+@tooltip__border-color: @color-gray68;
+@tooltip__border-radius: 0;
+@tooltip__color: @color-dark-brownie;
+@tooltip__max-width: 20rem;
+@tooltip__opacity: .9;
+@tooltip__shadow-color: @color-gray80;
+@tooltip__z-index: 10;
+
+@tooltip-arrow__border-color: darken(@tooltip__border-color, 10%);
+@tooltip-arrow__color: @tooltip__background-color;
+@tooltip-arrow__size: 8px;
+
+//
+// Tooltips
+// _____________________________________________
+
+// Base class
+.tooltip {
+ display: block;
+ font-family: @base__font-family;
+ font-size: @small__font-size;
+ font-weight: @font-weight-regular;
+ line-height: 1.4;
+ opacity: 0;
+ position: absolute;
+ visibility: visible;
+ z-index: @tooltip__z-index;
+ &.in {
+ opacity: @tooltip__opacity;
+ }
+ &.top {
+ margin-top: -(@tooltip-arrow__size / 2);
+ padding: @tooltip-arrow__size 0;
+ }
+ &.right {
+ margin-left: @tooltip-arrow__size / 2;
+ padding: 0 @tooltip-arrow__size;
+ }
+ &.bottom {
+ margin-top: @tooltip-arrow__size / 2;
+ padding: @tooltip-arrow__size 0;
+ }
+ &.left {
+ margin-left: -(@tooltip-arrow__size / 2);
+ padding: 0 @tooltip-arrow__size;
+ }
+}
+
+// Wrapper for the tooltip content
+.tooltip-inner {
+ background-color: @tooltip__background-color;
+ border: 1px solid @tooltip__border-color;
+ border-radius: @tooltip__border-radius;
+ box-shadow: 1px 1px 1px @tooltip__shadow-color;
+ color: @tooltip__color;
+ max-width: @tooltip__max-width;
+ padding: .5em 1em;
+ text-decoration: none;
+}
+
+// Arrows
+.tooltip-arrow,
+.tooltip-arrow:after {
+ border: solid transparent;
+ height: 0;
+ position: absolute;
+ width: 0;
+}
+
+.tooltip-arrow {
+ &:after {
+ content: '';
+ position: absolute;
+ }
+}
+
+// ToDo UI: Only right tooltip arrow is styled, if we will neeed more need to add another ones
+
+.tooltip {
+ &.top {
+ .tooltip-arrow,
+ .tooltip-arrow:after {
+ border-top-color: @tooltip-arrow__border-color;
+ border-width: @tooltip-arrow__size @tooltip-arrow__size 0;
+ bottom: 0;
+ left: 50%;
+ margin-left: -@tooltip-arrow__size;
+ }
+ }
+ &.top-left {
+ .tooltip-arrow,
+ .tooltip-arrow:after {
+ border-top-color: @tooltip-arrow__border-color;
+ border-width: @tooltip-arrow__size @tooltip-arrow__size 0;
+ bottom: 0;
+ margin-bottom: -@tooltip-arrow__size;
+ right: @tooltip-arrow__size;
+ }
+ }
+ &.top-right {
+ .tooltip-arrow,
+ .tooltip-arrow:after {
+ border-top-color: @tooltip-arrow__border-color;
+ border-width: @tooltip-arrow__size @tooltip-arrow__size 0;
+ bottom: 0;
+ left: @tooltip-arrow__size;
+ margin-bottom: -@tooltip-arrow__size;
+ }
+ }
+ &.right {
+ .tooltip-arrow,
+ .tooltip-arrow:after {
+ border-right-color: @tooltip-arrow__border-color;
+ border-width: @tooltip-arrow__size @tooltip-arrow__size @tooltip-arrow__size 0;
+ left: 1px;
+ margin-top: -@tooltip-arrow__size;
+ top: 50%;
+ }
+ .tooltip-arrow {
+ &:after {
+ border-right-color: @tooltip__background-color;
+ border-width: (@tooltip-arrow__size - 2) (@tooltip-arrow__size - 1) (@tooltip-arrow__size - 2) 0;
+ margin-left: 0;
+ margin-top: -(@tooltip-arrow__size - 2);
+ }
+ }
+ }
+ &.left {
+ .tooltip-arrow,
+ .tooltip-arrow:after {
+ border-left-color: @tooltip-arrow__border-color;
+ border-width: @tooltip-arrow__size 0 @tooltip-arrow__size @tooltip-arrow__size;
+ margin-top: -@tooltip-arrow__size;
+ right: 0;
+ top: 50%;
+ }
+ }
+ &.bottom {
+ .tooltip-arrow,
+ .tooltip-arrow:after {
+ border-bottom-color: @tooltip-arrow__border-color;
+ border-width: 0 @tooltip-arrow__size @tooltip-arrow__size;
+ left: 50%;
+ margin-left: -@tooltip-arrow__size;
+ top: 0;
+ }
+ }
+ &.bottom-left {
+ .tooltip-arrow,
+ .tooltip-arrow:after {
+ border-bottom-color: @tooltip-arrow__border-color;
+ border-width: 0 @tooltip-arrow__size @tooltip-arrow__size;
+ margin-top: -@tooltip-arrow__size;
+ right: @tooltip-arrow__size;
+ top: 0;
+ }
+ }
+ &.bottom-right {
+ .tooltip-arrow,
+ .tooltip-arrow:after {
+ border-bottom-color: @tooltip-arrow__border-color;
+ border-width: 0 @tooltip-arrow__size @tooltip-arrow__size;
+ left: @tooltip-arrow__size;
+ margin-top: -@tooltip-arrow__size;
+ top: 0;
+ }
+ }
+}
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-m) {
+ .tooltip {
+ display: none !important;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_alerts.less b/setup/module/Magento/Setup/styles/lib/_alerts.less
new file mode 100644
index 0000000000000000000000000000000000000000..28d3b2b28920621ca0db28c9a18f2dd22f87c317
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_alerts.less
@@ -0,0 +1,74 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+// Colors
+
+@alert-info__background-color: @color-gray98;
+@alert-info__border-color: @color-gray80;
+
+@alert-warning__background-color: @color-lazy-sun;
+@alert-warning__border-color: @alert-warning__background-color;
+
+@alert-icon__size: 3.8rem;
+
+//
+// Common
+// _____________________________________________
+
+.alert {
+ margin-bottom: 3.5rem;
+ padding: 2.5rem;
+ .vendor-box-align(center);
+ .vendor-prefix-display(flex);
+ .spinner {
+ min-width: @spinner__size;
+ }
+ .ie9 & {
+ .extend__clearer();
+ .spinner {
+ float: left;
+ }
+ }
+}
+
+.alert-info {
+ background-color: @alert-info__background-color;
+ border: 1px solid @alert-info__border-color;
+}
+
+.alert-warning {
+ background-color: @alert-warning__background-color;
+ border: 1px solid @alert-warning__border-color;
+}
+
+.alert-icon {
+ margin-right: 1.5rem;
+ .ie9 & {
+ float: left;
+ }
+}
+
+[class*='icon-'] {
+ &.alert-icon {
+ font-size: @alert-icon__size;
+ min-width: @alert-icon__size;
+ }
+}
+
+.alert-text {
+ margin-bottom: 0;
+ ~ .alert-text {
+ margin-top: @paragraph__indent-bottom;
+ }
+ .ie9 & {
+ display: block;
+ margin-left: @alert-icon__size + 1.5rem;
+ margin-top: 1rem;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_buttons.less b/setup/module/Magento/Setup/styles/lib/_buttons.less
new file mode 100644
index 0000000000000000000000000000000000000000..9559e344891607fbee6eb44239037bc202da1f1e
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_buttons.less
@@ -0,0 +1,402 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+// Colors
+
+@btn-base__background-color: @color-gray89;
+@btn-base__color: @color-brownie;
+@btn-base__active__background-color: darken(@btn-base__background-color, 5%);
+@btn-base__disabled__background-color: lighten(@btn-base__background-color, 5%);
+@btn-base__hover__background-color: darken(@btn-base__background-color, 3%);
+
+@btn-prime__color: @color-white;
+@btn-prime__background-color: @color-prime;
+@btn-prime__color-gradient-start: @color-phoenix-down;
+@btn-prime__color-gradient-end: @color-phoenix-rise;
+@btn-prime__border-color: @color-gray79;
+@btn-prime__disabled__background-color: lighten(@btn-prime__background-color, 10%);
+
+@btn-secondary__color: @color-white;
+@btn-secondary__background-color: @color-brownie;
+@btn-secondary__hover__background-color: lighten(@btn-secondary__background-color, 5%);
+@btn-secondary__disabled__background-color: lighten(@btn-secondary__background-color, 0%);
+@btn-secondary__active__background-color: lighten(@btn-secondary__background-color, 2%);
+
+@triangle-base__size: @btn-base__height / 2;
+
+//
+// Common
+// _____________________________________________
+
+.btn-wrap {
+ margin: 0 auto;
+ .btn {
+ width: 100%;
+ }
+}
+
+.btn {
+ background: @btn-base__background-color none;
+ border: none;
+ color: @btn-base__color;
+ display: inline-block;
+ font-size: @btn-base__font-size;
+ font-weight: @font-weight-semibold;
+ padding: @btn-base__padding-top .5em;
+ text-align: center;
+ &:hover {
+ background-color: @btn-base__hover__background-color;
+ color: @color-brownie;
+ text-decoration: none;
+ }
+ &:active {
+ background-color: @btn-base__active__background-color;
+ }
+ // Disabled state
+ &[disabled],
+ &.disabled {
+ cursor: default;
+ opacity: @disabled__opacity;
+ pointer-events: none;
+ .ie9 & {
+ background-color: @btn-base__disabled__background-color;
+ opacity: 1;
+ text-shadow: none;
+ }
+ }
+}
+
+.btn-large {
+ padding: .75em 1.25em;
+}
+
+//
+// Buttons
+// ---------------------------------------------
+
+.btn-link {
+ background-color: transparent;
+ border: none;
+ color: @link__color;
+ font-family: @btn-base__font-size;
+ font-size: 1.5rem; // ToDo UI: Check font-size and standardize
+ &:hover {
+ background-color: transparent;
+ color: @link__hover__color;
+ }
+}
+
+.btn-prime {
+ background-color: @btn-prime__background-color;
+ color: @btn-prime__color;
+ text-shadow: 1px 1px 0 rgba(0, 0, 0, .25);
+ &:hover {
+ .background-gradient(
+ @_background-gradient: true,
+ @_background-gradient-direction: horizontal,
+ @_background-gradient-start-color: @btn-prime__color-gradient-start,
+ @_background-gradient-end-color: @btn-prime__color-gradient-end
+ );
+ color: @btn-prime__color;
+ }
+ &:active {
+ .background-gradient(
+ @_background-gradient: true,
+ @_background-gradient-direction: horizontal,
+ @_background-gradient-start-color: @btn-prime__color-gradient-end,
+ @_background-gradient-end-color: @btn-prime__color-gradient-start
+ );
+ }
+ // Disabled state for IE9
+ &[disabled],
+ &.disabled {
+ .ie9 & {
+ background-color: @btn-prime__disabled__background-color;
+ }
+ &:hover,
+ &:active {
+ .ie9 & {
+ background-color: @btn-prime__disabled__background-color;
+ filter: none;
+ }
+ }
+ }
+}
+
+.btn-secondary {
+ background-color: @btn-secondary__background-color;
+ color: @btn-secondary__color;
+ &:hover {
+ background-color: @btn-secondary__hover__background-color;
+ color: @btn-secondary__color;
+ }
+ &:active {
+ background-color: @btn-secondary__active__background-color;
+ }
+ // Disabled state for IE9
+ &[disabled],
+ &.disabled {
+ .ie9 & {
+ background-color: @btn-secondary__disabled__background-color;
+ }
+ &:hover,
+ &:active {
+ .ie9 & {
+ background-color: @btn-secondary__disabled__background-color;
+ filter: none;
+ }
+ }
+ }
+}
+
+//
+// Triangle modification
+// ---------------------------------------------
+
+[class*='btn-wrap-triangle'] {
+ overflow: hidden;
+ position: relative;
+ .btn {
+ &:after {
+ border-style: solid;
+ content: '';
+ height: 0;
+ position: absolute;
+ top: 0;
+ width: 0;
+ }
+ }
+}
+
+// Right
+.btn-wrap-triangle-right {
+ display: inline-block;
+ padding-right: @triangle-base__size - .1;
+ position: relative;
+ .btn {
+ text-indent: @triangle-base__size / 2;
+ &:after {
+ border-color: transparent transparent transparent @btn-base__background-color;
+ border-width: @triangle-base__size 0 @triangle-base__size @triangle-base__size;
+ left: 100%;
+ margin-left: -@triangle-base__size + .1;
+ }
+ &:hover {
+ &:after {
+ border-left-color: @btn-base__hover__background-color;
+ }
+ }
+ &:active {
+ &:after {
+ border-left-color: @btn-base__active__background-color;
+ }
+ }
+ &:not([disabled]),
+ &:not(.disabled) {
+ &:active {
+ left: 1px;
+ }
+ }
+ // Disabled state for IE9
+ &[disabled],
+ &.disabled {
+ &:after {
+ .ie9 & {
+ border-color: transparent transparent transparent @btn-base__disabled__background-color;
+ }
+ }
+ &:hover,
+ &:active {
+ &:after {
+ .ie9 & {
+ border-left-color: @btn-base__disabled__background-color;
+ }
+ }
+ }
+ }
+ }
+
+ .btn-prime {
+ &:after {
+ border-color: transparent transparent transparent @btn-prime__background-color;
+ }
+ &:hover {
+ &:after {
+ border-left-color: @btn-prime__color-gradient-end;
+ }
+ }
+ &:active {
+ &:after {
+ border-left-color: @btn-prime__color-gradient-start;
+ }
+ }
+ &:not([disabled]),
+ &:not(.disabled) {
+ &:active {
+ left: 1px;
+ }
+ }
+ // Disabled state for IE9
+ &[disabled],
+ &.disabled {
+ &:after {
+ .ie9 & {
+ border-color: transparent transparent transparent @btn-prime__disabled__background-color;
+ }
+ }
+ &:hover,
+ &:active {
+ &:after {
+ .ie9 & {
+ border-left-color: @btn-prime__disabled__background-color;
+ }
+ }
+ }
+ }
+ }
+}
+
+// Left
+
+.btn-wrap-triangle-left {
+ display: inline-block;
+ padding-left: @triangle-base__size - .1;
+ .btn {
+ text-indent: -@triangle-base__size / 2;
+ &:after {
+ border-color: transparent @btn-base__background-color transparent transparent;
+ border-width: @triangle-base__size @triangle-base__size @triangle-base__size 0;
+ margin-right: -@triangle-base__size + .1;
+ right: 100%;
+ }
+ &:hover {
+ &:after {
+ border-right-color: @btn-base__hover__background-color;
+ }
+ }
+ &:active {
+ &:after {
+ border-right-color: @btn-base__active__background-color;
+ }
+ }
+ &:not([disabled]),
+ &:not(.disabled) {
+ &:active {
+ right: 1px;
+ }
+ }
+ // Disabled state for IE9
+ &[disabled],
+ &.disabled {
+ &:after {
+ .ie9 & {
+ border-color: transparent @btn-base__disabled__background-color transparent transparent;
+ }
+ }
+ &:hover,
+ &:active {
+ &:after {
+ .ie9 & {
+ border-right-color: @btn-base__disabled__background-color;
+ }
+ }
+ }
+ }
+ }
+ .btn-prime {
+ &:after {
+ border-color: transparent @btn-prime__background-color transparent transparent;
+ }
+ &:hover {
+ &:after {
+ border-right-color: @btn-prime__color-gradient-start;
+ }
+ }
+ &:active {
+ &:after {
+ border-right-color: @btn-prime__color-gradient-end;
+ }
+ }
+ &:not([disabled]),
+ &:not(.disabled) {
+ &:active {
+ right: 1px;
+ }
+ }
+ // Disabled state for IE9
+ &[disabled],
+ &.disabled {
+ &:after {
+ .ie9 & {
+ border-color: transparent @btn-prime__disabled__background-color transparent transparent;
+ }
+ }
+ &:hover,
+ &:active {
+ &:after {
+ .ie9 & {
+ border-right-color: @btn-prime__disabled__background-color;
+ }
+ }
+ }
+ }
+ }
+}
+
+//
+// Expand button
+// ---------------------------------------------
+
+@color-btn-expand: @base__color;
+@color-btn-expand-hover: lighten(@base__color, 5%);
+@width-triangle-btn-expand: .57em;
+@height-triangle-btn-expand: .36em;
+
+.btn-expand {
+ background-color: transparent;
+ border: none;
+ color: @color-btn-expand;
+ font-family: @base__font-family;
+ font-size: @base__font-size;
+ font-weight: @font-weight-bold;
+ padding: 0;
+ position: relative;
+ &.expanded {
+ &:after {
+ border-color: transparent transparent @color-btn-expand transparent;
+ border-width: 0 @width-triangle-btn-expand / 2 @height-triangle-btn-expand @width-triangle-btn-expand / 2;
+ }
+ &:hover {
+ &:after {
+ border-color: transparent transparent @color-btn-expand-hover transparent;
+ }
+ }
+ }
+ &:hover {
+ background-color: transparent;
+ border: none;
+ color: @color-btn-expand-hover;
+ &:after {
+ border-color: @color-btn-expand-hover transparent transparent transparent;
+ }
+ }
+ &:after {
+ border-color: @color-btn-expand transparent transparent transparent;
+ border-style: solid;
+ border-width: @height-triangle-btn-expand @width-triangle-btn-expand / 2 0 @width-triangle-btn-expand / 2;
+ content: '';
+ height: 0;
+ left: 100%;
+ margin-left: .5em;
+ margin-top: -(@height-triangle-btn-expand / 2);
+ position: absolute;
+ top: 50%;
+ width: 0;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_classes.less b/setup/module/Magento/Setup/styles/lib/_classes.less
new file mode 100644
index 0000000000000000000000000000000000000000..9f2258fd4e8dbc09c52cca47c57869848d728a98
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_classes.less
@@ -0,0 +1,32 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+// Allow angular.js to be loaded in body, hiding cloaked elements until templates compile. The !important is important given that there may be other selectors that are more specific or come later and might alter display.
+
+.ng-cloak {
+ display: none !important;
+}
+
+//
+
+.hide {
+ && {
+ display: none;
+ }
+}
+
+.show {
+ && {
+ display: block;
+ }
+}
+
+.text-center {
+ text-align: center;
+}
+
+.text-right {
+ text-align: right;
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_collector.less b/setup/module/Magento/Setup/styles/lib/_collector.less
new file mode 100644
index 0000000000000000000000000000000000000000..8352fc50f5e98e6f2e97d53ac81b10d6d6ff34c4
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_collector.less
@@ -0,0 +1,68 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+// ToDo UI: When Installer will be merged in mainline: Expand functionality of responsive.less in lib and merge it with this collector
+
+//
+// Media variables, that can be used for splitting styles into several files
+// _____________________________________________
+
+// Sets whether to output common styles (true|false)
+@media-common: true;
+// Sets target device for styles output ('all' | 'desktop' | 'mobile')
+@media-target: 'all';
+
+//
+// Media width mixin used to group styles output based on media queries
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-s) {
+}
+
+//
+// Style groups for 'mobile' devices
+// _____________________________________________
+
+& when (@media-target = 'desktop'), (@media-target = 'all') {
+
+ @media all and (max-width: (@screen-l - 1)) {
+ .media-width('max', @screen-l);
+ }
+
+ @media all and (min-width: @screen-m) {
+ .media-width('min', @screen-m);
+ }
+
+ @media all and (min-width: @screen-l) {
+ .media-width('min', @screen-l);
+ }
+
+ @media all and (min-width: @screen-xl) {
+ .media-width('min', @screen-xl);
+ }
+}
+
+//
+// Style groups for 'desktop' devices
+// _____________________________________________
+
+& when (@media-target = 'mobile'), (@media-target = 'all') {
+
+ @media all and (min-width: @screen-s) {
+ .media-width('min', @screen-s);
+ }
+
+ @media all and (max-width: (@screen-m - 1)) {
+ .media-width('max', @screen-m);
+ }
+
+ @media all and (max-width: (@screen-s - 1)) {
+ .media-width('max', @screen-s);
+ }
+
+ @media all and (max-width: (@screen-xs - 1)) {
+ .media-width('max', @screen-xs);
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_extends.less b/setup/module/Magento/Setup/styles/lib/_extends.less
new file mode 100644
index 0000000000000000000000000000000000000000..29b9ac3a7ea3188ca9dcfbe386dca7bcd2bc25d4
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_extends.less
@@ -0,0 +1,14 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+// Clearfix
+
+.abs-clearer {
+ .clearer();
+}
+
+.extend__clearer() {
+ &:extend(.abs-clearer all);
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_forms.less b/setup/module/Magento/Setup/styles/lib/_forms.less
new file mode 100644
index 0000000000000000000000000000000000000000..c33cbb85b8564fa0e3c2b328e3211c1d8ef87280
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_forms.less
@@ -0,0 +1,10 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+@import 'forms/_forms';
+@import 'forms/_legends';
+@import 'forms/_checkbox-radio';
+@import 'forms/_selects';
+@import 'forms/_validation';
diff --git a/setup/module/Magento/Setup/styles/lib/_grid.less b/setup/module/Magento/Setup/styles/lib/_grid.less
new file mode 100644
index 0000000000000000000000000000000000000000..b4c386e9579433ba0805549c0b0d31f29e7116ec
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_grid.less
@@ -0,0 +1,65 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+//
+// Grid
+// ---------------------------------------------
+
+// Number of columns in the grid.
+
+@grid-columns: 12;
+@grid-gutter-width: 0;
+
+//
+// Grid system
+// _____________________________________________
+
+//
+// Row
+// ---------------------------------------------
+
+// Rows contain and clear the floats of your columns.
+
+.row {
+ .make-row();
+}
+
+//
+// Columns
+// ---------------------------------------------
+
+// Common styles for small and large grid columns
+
+.make-grid-columns();
+
+// Extra small grid
+// Columns, offsets, pushes, and pulls for extra small devices like smartphones.
+
+.make-grid(xs);
+
+// Small grid
+// Columns, offsets, pushes, and pulls for the small device range, from phones to tablets.
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
+ .make-grid(m);
+}
+
+// Medium grid
+// Columns, offsets, pushes, and pulls for the desktop device range.
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-l) {
+ .make-grid(l);
+}
+
+// Large grid
+// Columns, offsets, pushes, and pulls for the large desktop device range.
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-xl) {
+ .make-grid(xl);
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_icons.less b/setup/module/Magento/Setup/styles/lib/_icons.less
new file mode 100644
index 0000000000000000000000000000000000000000..46bc6d0476e0ec5593e7ecab1e2050ef3b03a34a
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_icons.less
@@ -0,0 +1,94 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.font-face(
+ @family-name: 'Icons',
+ @font-path: '@{path-to-pub}fonts/icons/icons',
+ @font-weight: normal,
+ @font-style: normal
+);
+
+[class*='icon-'] {
+ display: inline-block;
+ line-height: 1;
+ &:after {
+ font-family: @icons__font-family;
+ }
+}
+
+.icon-success-thick {
+ &:after {
+ content: @icon-success-thick__content;
+ }
+}
+
+.icon-success {
+ &:after {
+ content: '\e601';
+ }
+}
+
+.icon-collapse {
+ &:after {
+ content: @icon-collapse__content;
+ }
+}
+
+.icon-failed-thick {
+ &:after {
+ content: @icon-failed-thick__content;
+ }
+}
+
+.icon-failed {
+ &:after {
+ content: '\e604';
+ }
+}
+
+.icon-expand {
+ &:after {
+ content: @icon-expand__content;
+ }
+}
+
+.icon-warning {
+ &:after {
+ content: '\e606';
+ }
+}
+
+.icon-success-round,
+.icon-failed-round {
+ border-radius: 100%;
+ color: @color-white;
+ font-size: @icons-round__size;
+ height: 1em;
+ position: relative;
+ text-align: center;
+ width: 1em;
+ &:after {
+ bottom: 0;
+ font-size: .8em;
+ left: 0;
+ position: absolute;
+ right: 0;
+ top: .15em;
+ }
+}
+
+.icon-success-round {
+ background-color: @color-success;
+ &:after {
+ content: @icon-success-thick__content;
+ }
+}
+
+.icon-failed-round {
+ background-color: @color-failed;
+ &:after {
+ content: @icon-failed-thick__content;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_lists.less b/setup/module/Magento/Setup/styles/lib/_lists.less
new file mode 100644
index 0000000000000000000000000000000000000000..777289123e82786f2c76eeae4c639fb30874f75b
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_lists.less
@@ -0,0 +1,102 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@list-item-icon__indent-left: 3.5rem;
+
+//
+
+ul,
+ol,
+dl {
+ margin-top: 0;
+}
+
+.list {
+ margin-bottom: 1em;
+ padding-left: 0;
+ > li {
+ display: block;
+ margin-bottom: .75em;
+ position: relative;
+ > .icon-success,
+ > .icon-failed {
+ font-size: 1.6em;
+ left: -.1em;
+ position: absolute;
+ top: 0;
+ }
+ > .icon-success {
+ color: @color-success;
+
+ }
+ > .icon-failed {
+ color: @color-failed;
+ }
+ }
+}
+
+.list-item-icon {
+ padding-left: @list-item-icon__indent-left;
+}
+
+.list-item-success,
+.list-item-failed {
+ padding-left: @list-item-icon__indent-left;
+ &:before {
+ font-family: @icons__font-family;
+ font-size: 1.6em;
+ left: -.1em;
+ position: absolute;
+ top: -.2em;
+ }
+}
+
+.list-item-success {
+ &:before {
+ color: @color-success;
+ content: @icon-success__content;
+ }
+}
+
+.list-item-failed {
+ &:before {
+ color: @color-failed;
+ content: @icon-failed__content;
+ }
+}
+
+// Definition list
+
+.list-definition {
+ margin: 0 0 3rem;
+ padding: 0;
+ > dt {
+ clear: left;
+ float: left;
+ }
+ > dd {
+ margin-bottom: 1em;
+ margin-left: 20rem;
+ }
+}
+
+//
+// Mobile
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-m) {
+ .list-definition {
+ > dt {
+ float: none;
+ }
+ > dd {
+ margin-left: 0;
+ }
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_pseudo-tables.less b/setup/module/Magento/Setup/styles/lib/_pseudo-tables.less
new file mode 100644
index 0000000000000000000000000000000000000000..d97e7d893d955778ceaf59d6bd7d9ac04e62917d
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_pseudo-tables.less
@@ -0,0 +1,12 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.pseudo-table {
+ display: table;
+}
+
+.pseudo-td {
+ display: table-cell;
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_reset.less b/setup/module/Magento/Setup/styles/lib/_reset.less
new file mode 100644
index 0000000000000000000000000000000000000000..26477850c74f86832bdd8ea84b6e0a08e47f435b
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_reset.less
@@ -0,0 +1,36 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.normalize();
+
+* {
+ box-sizing: border-box;
+ &:focus {
+ box-shadow: none;
+ outline: 0;
+ }
+}
+
+.keyfocus * {
+ &:focus {
+ box-shadow: @focus__box-shadow;
+ }
+}
+
+img,
+video,
+embed,
+object {
+ max-width: 100%;
+}
+
+
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
+ html {
+ margin-left: ~'calc(100vw - 100%)';
+ margin-right: 0;
+ overflow: auto;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_structures.less b/setup/module/Magento/Setup/styles/lib/_structures.less
new file mode 100644
index 0000000000000000000000000000000000000000..5a63e7806784d3771b82f2015251acfa10ea8e56
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_structures.less
@@ -0,0 +1,11 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.container {
+ display: block;
+ margin: 0 auto 4rem;
+ max-width: @container__width;
+ padding: 0 @container__indent;
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_typography.less b/setup/module/Magento/Setup/styles/lib/_typography.less
new file mode 100644
index 0000000000000000000000000000000000000000..2cde11bde1dd4f3f809621c094eb14ae26bd446a
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_typography.less
@@ -0,0 +1,73 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.font-face(
+ @family-name: 'Open Sans',
+ @font-path: '@{path-to-pub}fonts/opensans/light/opensans-300',
+ @font-weight: @font-weight-light,
+ @font-style: normal
+);
+
+.font-face(
+ @family-name: 'Open Sans',
+ @font-path: '@{path-to-pub}fonts/opensans/regular/opensans-400',
+ @font-weight: @font-weight-regular,
+ @font-style: normal
+);
+
+.font-face(
+ @family-name: 'Open Sans',
+ @font-path: '@{path-to-pub}fonts/opensans/semibold/opensans-600',
+ @font-weight: @font-weight-semibold,
+ @font-style: normal
+);
+
+.font-face(
+ @family-name: 'Open Sans',
+ @font-path: '@{path-to-pub}fonts/opensans/bold/opensans-700',
+ @font-weight: @font-weight-bold,
+ @font-style: normal
+);
+
+html {
+ font-size: 62.5%;
+}
+
+body {
+ color: @base__color;
+ font-family: @base__font-family;
+ font-size: @base__font-size;
+ font-weight: @font-weight-regular;
+ line-height: @base__line-height;
+}
+
+// Headings
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-weight: @font-weight-regular;
+ margin-top: 0;
+}
+
+// Text
+
+p {
+ margin: 0 0 1em;
+}
+
+// Links
+
+a {
+ color: @link__color;
+ text-decoration: none;
+ &:hover {
+ color: @link__hover__color;
+ text-decoration: underline;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_utilities.less b/setup/module/Magento/Setup/styles/lib/_utilities.less
new file mode 100644
index 0000000000000000000000000000000000000000..8831915b2d3b86a98228314ebc1d0f84f3b2bcda
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_utilities.less
@@ -0,0 +1,30 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+@import 'utilities/_vendor-prefixes';
+@import 'utilities/_grid-framework';
+@import 'utilities/_grid';
+@import 'utilities/_animations';
+@import 'utilities/_spinner';
+
+// Clip & hide element
+
+.clip() {
+ clip: rect(0, 0, 0, 0);
+ position: absolute;
+}
+
+//
+// Effects
+// ---------------------------------------------
+
+.effect-hover-opacity (
+ @opacity: .85,
+ @transition: opacity .2s linear) {
+ transition: @transition;
+ &:hover {
+ opacity: @opacity;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/_variables.less b/setup/module/Magento/Setup/styles/lib/_variables.less
new file mode 100644
index 0000000000000000000000000000000000000000..dcb2097db8f5277ce6292d0d944e6999fcd32084
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/_variables.less
@@ -0,0 +1,130 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+// Paths
+
+@path-to-pub: '../../../../pub/';
+
+//
+// Colors
+// ---------------------------------------------
+
+@color-brownie: #514943;
+@color-light-brownie: #676056;
+@color-gray65: #a6a6a6;
+@color-gray68: #adadad;
+@color-gray75: #bfbfbf;
+@color-gray80: #ccc;
+@color-gray82: #d1d1d1;
+@color-gray83: #d4d4d4;
+@color-gray84: #d6d6d6;
+@color-gray85: #d9d9d9;
+@color-gray89: #e3e3e3;
+@color-gray98: #fafafa;
+@color-white-fog: #f8f8f8;
+@color-lazy-sun: #fff8d6;
+@color-dodger-blue: #008bdb;
+@color-green-apple: #79a22e;
+@color-dark-brownie: #41362f;
+@color-phoenix-down: #e04f00;
+@color-phoenix: #eb5202;
+@color-phoenix-almost-rise: #ef672f;
+@color-phoenix-rise: #f65405;
+@color-tomato-brick: #e22626;
+@color-strawberry-milkshake: #ee7d7d;
+
+// Nesting colors
+@color-prime: @color-phoenix;
+@color-tertiary: @color-brownie;
+@color-success: @color-green-apple;
+@color-warning: @color-phoenix-almost-rise;
+@color-failed: @color-tomato-brick;
+
+//
+// Break points
+// ---------------------------------------------
+
+@screen-l: 1048px;
+
+//
+// Icons
+// ---------------------------------------------
+
+@icons__font-family: 'Icons';
+@icons-round__size: 2.5rem;
+@icon-success__content: '\e601';
+@icon-failed__content: '\e604';
+@icon-collapse__content: '\e602';
+@icon-expand__content: '\e605';
+@icon-success-thick__content: '\e600';
+@icon-failed-thick__content: '\e603';
+
+//
+// Typography
+// ---------------------------------------------
+
+// Focus
+@focus__color: @color-dodger-blue;
+@focus__box-shadow: 0 0 0 1px @focus__color;
+
+// Disabled
+@disabled__opacity: .5;
+
+//
+
+@font-family-console: 'Courier New', Courier, monospace;
+@font-weight-light: 300;
+@font-weight-regular: 400;
+@font-weight-semibold: 600;
+@font-weight-bold: 700;
+
+@base__color: @color-gray19;
+@base__font-family: 'Open Sans', @font-family-sans-serif;
+@base__font-size: 1.4rem;
+@base__line-height: 1.4;
+
+@small__font-size: @base__font-size * .85;
+
+@link__color: @color-dodger-blue;
+@link__hover__color: lighten(@link__color, 10%);
+
+@paragraph__indent-bottom: 1em;
+
+//
+// Structure
+// ---------------------------------------------
+
+@container__width: 100rem;
+@container__indent: 2rem;
+
+@main__indent-top: 3rem;
+
+//
+// Buttons
+// ---------------------------------------------
+
+// Sizes
+
+@btn-base__font-size: 1.6rem;
+@btn-base__padding-top: .45em;
+@btn-base__padding-bottom: @btn-base__padding-top;
+@btn-base__height: @btn-base__font-size * @base__line-height + @btn-base__font-size * @btn-base__padding-top + @btn-base__font-size * @btn-base__padding-bottom;
+
+//
+// Forms
+// ---------------------------------------------
+
+@form-el__border-radius: 2px;
+@form-el__indent-top: .6rem;
+@form-el__padding-bottom: .5em;
+@form-el__padding-side: .55em;
+@form-el__padding-top: .35em;
+
+//
+// Components
+// ---------------------------------------------
+
+// Spinner
+@spinner__size: 1em;
diff --git a/setup/module/Magento/Setup/styles/lib/forms/_checkbox-radio.less b/setup/module/Magento/Setup/styles/lib/forms/_checkbox-radio.less
new file mode 100644
index 0000000000000000000000000000000000000000..163d1af77084034b79c1ab94758db672144d6e6e
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/forms/_checkbox-radio.less
@@ -0,0 +1,134 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@checkbox__border-color: @color-gray68;
+@radio-bullet__color: @color-brownie;
+@color-required: @color-prime;
+
+//
+// Common
+// _____________________________________________
+
+.form-el-checkbox,
+.form-el-radio {
+ .clip();
+
+ // Disabled state
+
+ &[disabled],
+ &.disabled {
+ + .form-label, + .form-label:before {
+ cursor: default;
+ opacity: @disabled__opacity;
+ pointer-events: none;
+ }
+ }
+
+ // Hover state
+
+ &:not([disabled]),
+ &:not(.disabled) {
+ + .form-label {
+ &:hover {
+ &:before {
+ border-color: @radio-bullet__color;
+ }
+ }
+ }
+ }
+
+ + .form-label {
+ font-weight: @font-weight-regular;
+ padding-left: 2em;
+ padding-right: 0;
+ position: relative;
+ text-align: left;
+ transition: border-color .1s linear;
+ &:before {
+ border: 1px solid;
+ content: '';
+ left: 0;
+ position: absolute;
+ top: .1rem;
+ transition: border-color .1s linear;
+ }
+ }
+}
+
+//
+// Checkboxes
+// _____________________________________________
+
+// Unchecked checkbox state
+
+.form-el-checkbox {
+ + .form-label {
+ &:before {
+ border-color: @checkbox__border-color;
+ border-radius: @form-el__border-radius;
+ height: 1.4rem;
+ line-height: 1;
+ width: 1.4rem;
+ }
+ }
+}
+
+// Checked checkbox state
+
+.form-el-checkbox {
+ &:checked {
+ + .form-label {
+ &::before {
+ content: @icon-success-thick__content;
+ font-family: @icons__font-family;
+ }
+ }
+ }
+}
+
+//
+// Radio
+// _____________________________________________
+
+// Unchecked radio state
+
+.form-el-radio {
+ + .form-label {
+ &:before {
+ background-color: @color-white;
+ border: 1px solid @color-gray68;
+ border-radius: 100%;
+ height: 1.6rem; // 16px
+ width: 1.6rem; // 16px
+ }
+ &:after {
+ background: transparent;
+ border: .5rem solid transparent;
+ border-radius: 100%;
+ content: '';
+ height: 0;
+ left: .4rem;
+ position: absolute;
+ top: .1rem + .4rem;
+ transition: background .3s linear;
+ width: 0;
+ }
+ }
+
+ // Checked radio state
+
+ &:checked {
+ + .form-label {
+ cursor: default;
+ &:after {
+ border-color: @radio-bullet__color;
+ }
+ }
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/forms/_forms.less b/setup/module/Magento/Setup/styles/lib/forms/_forms.less
new file mode 100644
index 0000000000000000000000000000000000000000..502eea1ca425ef297461fb0b58f21da1a83ab8db
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/forms/_forms.less
@@ -0,0 +1,154 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@form-el__border-color: @color-gray68;
+@form-el__color: @base__color;
+@form-el__focus__border-color: @focus__color;
+@form-el__hover__border-color: darken(@form-el__border-color, 10%);
+
+//
+// Structure
+// _____________________________________________
+
+[class*='col-'] {
+ .form-el-input,
+ .form-el-select {
+ width: 100%;
+ }
+}
+
+// Fieldset
+.form-fieldset {
+ border: none;
+ margin: 0 0 1em;
+ padding: 0;
+}
+
+//
+// Forms block structure
+// ---------------------------------------------
+
+.form-row {
+ .extend__clearer();
+ margin-bottom: 2.2rem;
+
+ .form-row {
+ margin-bottom: .4rem;
+ }
+
+ // Labels
+ .form-label {
+ display: block;
+ font-weight: @font-weight-semibold;
+ padding: @form-el__indent-top 2.1em 0 0;
+ text-align: right;
+
+ &.required {
+ position: relative;
+ &:after {
+ color: @color-required;
+ content: '*';
+ font-size: 1.15em;
+ position: absolute;
+ right: .7em;
+ top: .5em;
+ }
+ }
+ }
+
+ .form-el-checkbox,
+ .form-el-radio {
+ + .form-label {
+ &:before {
+ top: .1rem + @form-el__indent-top;
+ }
+ &:after {
+ top: .1rem + @form-el__indent-top + .4rem;
+ }
+ }
+ }
+}
+
+//
+// Elements
+// _____________________________________________
+
+input:not([disabled]),
+textarea:not([disabled]) {
+ &:focus {
+ box-shadow: none;
+ }
+}
+
+//
+// Inputs
+// ---------------------------------------------
+
+.form-el-input {
+ border: 1px solid @form-el__border-color;
+ border-radius: @form-el__border-radius;
+ color: @form-el__color;
+ padding: @form-el__padding-top @form-el__padding-side @form-el__padding-bottom;
+ &:hover {
+ border-color: @form-el__hover__border-color;
+ }
+ &:focus {
+ border-color: @form-el__focus__border-color;
+ }
+}
+
+//
+// Labels
+// ---------------------------------------------
+
+.form-label {
+ margin-bottom: .5em;
+}
+
+[class*='form-label'][for] {
+ cursor: pointer;
+}
+
+//
+// Insider
+// ---------------------------------------------
+
+.form-el-insider-wrap {
+ display: table;
+ width: 100%;
+}
+
+.form-el-insider-input {
+ display: table-cell;
+ width: 100%;
+}
+
+.form-el-insider {
+ border-radius: @form-el__border-radius;
+ display: table-cell;
+ vertical-align: top;
+ padding: @form-el__padding-top + .08em @form-el__padding-side @form-el__padding-bottom 0;
+}
+
+//
+// Mobile
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-m) {
+ .form-row {
+ .form-label {
+ text-align: left;
+ &.required {
+ &:after {
+ position: static;
+ }
+ }
+ }
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/forms/_legends.less b/setup/module/Magento/Setup/styles/lib/forms/_legends.less
new file mode 100644
index 0000000000000000000000000000000000000000..7826b9089bf13f9abd8b3fbf22877fcc21c0976b
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/forms/_legends.less
@@ -0,0 +1,55 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@color-border-legend: @color-gray80;
+
+//
+
+.form-legend,
+.form-legend-light,
+.form-legend-expand {
+ display: block;
+ margin: 0;
+}
+
+.form-legend,
+.form-legend-expand {
+ margin-bottom: 2.5em;
+ padding-top: 1.5em;
+ font-weight: @font-weight-semibold;
+ font-size: 1.25em;
+}
+
+.form-legend {
+ width: 100%;
+ border-top: 1px solid @color-border-legend;
+}
+
+.form-legend-light {
+ margin-bottom: 1.5em;
+ font-size: 1em;
+}
+
+.form-legend-expand {
+ .effect-hover-opacity();
+ cursor: pointer;
+ &.expanded {
+ &:after {
+ content: @icon-collapse__content;
+ }
+ }
+ &:after {
+ margin-left: .5em;
+ font-weight: @font-weight-regular;
+ font-size: 1.15em;
+ font-family: @icons__font-family;
+ content: @icon-expand__content;
+ vertical-align: sub;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/forms/_selects.less b/setup/module/Magento/Setup/styles/lib/forms/_selects.less
new file mode 100644
index 0000000000000000000000000000000000000000..9db10e324941ace136458d4f4596b75431219abd
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/forms/_selects.less
@@ -0,0 +1,95 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@select-check__background-color: @color-gray89;
+@select-check__height: 5px;
+@select-check__size: 2.36em;
+@select-check__width: 8px;
+
+//
+// Customized select with label wrap
+// ---------------------------------------------
+
+.form-select-label {
+ border: 1px solid @form-el__border-color;
+ border-radius: @form-el__border-radius;
+ color: @form-el__color;
+ cursor: pointer;
+ display: block;
+ overflow: hidden;
+ position: relative;
+ &:hover,
+ &:hover:after {
+ border-color: @form-el__hover__border-color;
+ }
+ &:focus,
+ &:focus:after,
+ &:active,
+ &:active:after {
+ border-color: @form-el__focus__border-color;
+ }
+ &:after {
+ background: @select-check__background-color;
+ border-left: 1px solid @form-el__border-color;
+ bottom: 0;
+ content: '';
+ position: absolute;
+ right: 0;
+ top: 0;
+ width: @select-check__size;
+ z-index: -2;
+ .ie9 & {
+ display: none;
+ }
+ }
+ &:before {
+ border-color: @form-el__color transparent transparent transparent;
+ border-style: solid;
+ border-width: @select-check__height @select-check__width / 2 0 @select-check__width / 2;
+ content: '';
+ height: 0;
+ margin-right: -(@select-check__width / 2);
+ margin-top: -(@select-check__height / 2);
+ position: absolute;
+ right: @select-check__size / 2;
+ top: 50%;
+ width: 0;
+ z-index: -1;
+ .ie9 & {
+ display: none;
+ }
+ }
+ .form-el-select {
+ background: transparent;
+ border: none;
+ border-radius: 0;
+ content: '';
+ display: block;
+ margin: 0;
+ padding: @form-el__padding-top ~'calc(@{select-check__size} + 10%)' @form-el__padding-bottom @form-el__padding-side;
+ width: 110%;
+ .ie9 & {
+ padding-right: @form-el__padding-side;
+ width: 100%;
+ }
+ }
+}
+
+//
+// Light customized select
+// ---------------------------------------------
+
+.form-el-select {
+ background: @color-white;
+ border: 1px solid @form-el__border-color;
+ border-radius: @form-el__border-radius;
+ color: @form-el__color;
+ display: block;
+ padding: @form-el__padding-top @form-el__padding-side;
+}
diff --git a/setup/module/Magento/Setup/styles/lib/forms/_validation.less b/setup/module/Magento/Setup/styles/lib/forms/_validation.less
new file mode 100644
index 0000000000000000000000000000000000000000..9babbfb4e94c0616ba5df3205350622c82c82354
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/forms/_validation.less
@@ -0,0 +1,51 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@color-border-failed: @color-failed;
+@color-border-sucess: @color-success;
+@color-border-validation-message-failed: @color-strawberry-milkshake;
+@color-bg-validation-message-failed: @color-lazy-sun;
+@font-size-gap: @base__font-size - @small__font-size;
+
+//
+// Elements
+// _____________________________________________
+
+[class*='form-el-'] {
+ &.invalid {
+ border-color: @color-border-failed;
+ + .error-container {
+ display: block;
+ }
+ }
+}
+
+.error-container {
+ background-color: @color-bg-validation-message-failed;
+ border: 1px solid @color-border-validation-message-failed;
+ border-radius: @form-el__border-radius;
+ color: @color-brownie;
+ display: none;
+ font-size: @small__font-size;
+ margin-top: .2rem;
+ padding: @form-el__padding-top * (1 + @font-size-gap) @form-el__padding-side * (1 + @font-size-gap) @form-el__padding-bottom * (1 + @font-size-gap);
+}
+
+// Check results
+
+.check-result-message {
+ margin-left: .5em;
+ min-height: @btn-base__height;
+ .vendor-box-align(center);
+ .vendor-prefix-display(flex);
+}
+
+.check-result-text {
+ margin-left: .5em;
+}
diff --git a/setup/module/Magento/Setup/styles/lib/utilities/_animations.less b/setup/module/Magento/Setup/styles/lib/utilities/_animations.less
new file mode 100644
index 0000000000000000000000000000000000000000..cf4e3b9873d92ef69b9281b358b5c881b9324b6a
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/utilities/_animations.less
@@ -0,0 +1,56 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+// Animations
+
+.animation(@animation) {
+ -webkit-animation: @animation;
+ -o-animation: @animation;
+ animation: @animation;
+}
+
+.animation-name(@name) {
+ -webkit-animation-name: @name;
+ animation-name: @name;
+}
+
+.animation-duration(@duration) {
+ -webkit-animation-duration: @duration;
+ animation-duration: @duration;
+}
+
+.animation-timing-function(@timing-function) {
+ -webkit-animation-timing-function: @timing-function;
+ animation-timing-function: @timing-function;
+}
+
+.animation-delay(@delay) {
+ -webkit-animation-delay: @delay;
+ animation-delay: @delay;
+}
+
+.animation-iteration-count(@iteration-count) {
+ -webkit-animation-iteration-count: @iteration-count;
+ animation-iteration-count: @iteration-count;
+}
+
+.animation-direction(@direction) {
+ -webkit-animation-direction: @direction;
+ animation-direction: @direction;
+}
+
+.animation-fill-mode(@fill-mode) {
+ -webkit-animation-fill-mode: @fill-mode;
+ animation-fill-mode: @fill-mode;
+}
+
+// Backface visibility
+// Prevent browsers from flickering when using CSS 3D transforms. Default value is `visible`, but can be changed to `hidden`
+
+.backface-visibility(@visibility) {
+ -webkit-backface-visibility: @visibility;
+ -moz-backface-visibility: @visibility;
+ backface-visibility: @visibility;
+}
diff --git a/setup/module/Magento/Setup/styles/lib/utilities/_grid-framework.less b/setup/module/Magento/Setup/styles/lib/utilities/_grid-framework.less
new file mode 100644
index 0000000000000000000000000000000000000000..6b60151aae665c549aeaf360ddaa5657a26c9446
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/utilities/_grid-framework.less
@@ -0,0 +1,117 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Framework grid generation
+// _____________________________________________
+
+.make-grid-columns() {
+
+ // Common styles for all sizes of grid columns, widths 1-12
+
+ .col(@index) {
+ // Initial
+ @item: ~'.col-xs-@{index}, .col-m-@{index}, .col-l-@{index}, .col-xl-@{index}';
+ .col((@index + 1), @item);
+ }
+
+ .col(@index, @list) when (@index =< @grid-columns) {
+ // General; '=<' isn't a typo
+ @item: ~'.col-xs-@{index}, .col-m-@{index}, .col-l-@{index}, .col-xl-@{index}';
+ .col((@index + 1), ~'@{list}, @{item}');
+ }
+
+ .col(@index, @list) when (@index > @grid-columns) {
+ // Terminal
+ @{list} {
+ // Prevent columns from collapsing when empty
+ min-height: 1px;
+ // Inner gutter via padding
+ padding-left: (@grid-gutter-width / 2);
+ padding-right: (@grid-gutter-width / 2);
+ position: relative;
+ }
+ }
+
+ .col(1); // Kickstart it
+}
+
+.float-grid-columns(@class) {
+
+ .col(@index) {
+ // Initial
+ @item: ~'.col-@{class}-@{index}';
+ .col((@index + 1), @item);
+ }
+
+ .col(@index, @list) when (@index =< @grid-columns) {
+ // General
+ @item: ~'.col-@{class}-@{index}';
+ .col((@index + 1), ~'@{list}, @{item}');
+ }
+
+ .col(@index, @list) when (@index > @grid-columns) {
+ // Terminal
+ @{list} {
+ float: left;
+ }
+ }
+
+ .col(1); // Kickstart it
+}
+
+.calc-grid-column(@index, @class, @type) when (@type = width) and (@index > 0) {
+ .col-@{class}-@{index} {
+ width: percentage((@index / @grid-columns));
+ }
+}
+
+.calc-grid-column(@index, @class, @type) when (@type = push) and (@index > 0) {
+ .col-@{class}-push-@{index} {
+ left: percentage((@index / @grid-columns));
+ }
+}
+
+.calc-grid-column(@index, @class, @type) when (@type = push) and (@index = 0) {
+ .col-@{class}-push-0 {
+ left: auto;
+ }
+}
+
+.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index > 0) {
+ .col-@{class}-pull-@{index} {
+ right: percentage((@index / @grid-columns));
+ }
+}
+
+.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index = 0) {
+ .col-@{class}-pull-0 {
+ right: auto;
+ }
+}
+
+.calc-grid-column(@index, @class, @type) when (@type = offset) {
+ .col-@{class}-offset-@{index} {
+ margin-left: percentage((@index / @grid-columns));
+ }
+}
+
+// Basic looping in LESS
+
+.loop-grid-columns(@index, @class, @type) when (@index >= 0) {
+ .calc-grid-column(@index, @class, @type);
+ // Next iteration
+ .loop-grid-columns((@index - 1), @class, @type);
+}
+
+// Create grid for specific class
+
+.make-grid(@class) {
+ .float-grid-columns(@class);
+ .loop-grid-columns(@grid-columns, @class, width);
+ .loop-grid-columns(@grid-columns, @class, pull);
+ .loop-grid-columns(@grid-columns, @class, push);
+ .loop-grid-columns(@grid-columns, @class, offset);
+}
diff --git a/setup/module/Magento/Setup/styles/lib/utilities/_grid.less b/setup/module/Magento/Setup/styles/lib/utilities/_grid.less
new file mode 100644
index 0000000000000000000000000000000000000000..74aad598e2c97f8ed1689914121fe22a7837a74a
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/utilities/_grid.less
@@ -0,0 +1,157 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Grid system
+// _____________________________________________
+
+//
+// Generate semantic grid columns with these utilities.
+// ---------------------------------------------
+
+// Centered container element
+
+.container-fixed(@gutter: @grid-gutter-width) {
+ margin-left: auto;
+ margin-right: auto;
+ padding-left: (@gutter / 2);
+ padding-right: (@gutter / 2);
+ .extend__clearer();
+}
+
+// Creates a wrapper for a series of columns
+
+.make-row(@gutter: @grid-gutter-width) {
+ margin-left: (@gutter / -2);
+ margin-right: (@gutter / -2);
+ .extend__clearer();
+}
+
+//
+// Generate the extra small columns
+// ---------------------------------------------
+
+.make-xs-column(@columns; @gutter: @grid-gutter-width) {
+ float: left;
+ min-height: 1px;
+ padding-left: (@gutter / 2);
+ padding-right: (@gutter / 2);
+ position: relative;
+ width: percentage((@columns / @grid-columns));
+}
+
+.make-xs-column-offset(@columns) {
+ margin-left: percentage((@columns / @grid-columns));
+}
+
+.make-xs-column-push(@columns) {
+ left: percentage((@columns / @grid-columns));
+}
+
+.make-xs-column-pull(@columns) {
+ right: percentage((@columns / @grid-columns));
+}
+
+//
+// Generate the small columns
+// ---------------------------------------------
+
+.make-m-column(@columns; @gutter: @grid-gutter-width) {
+ min-height: 1px;
+ padding-left: (@gutter / 2);
+ padding-right: (@gutter / 2);
+ position: relative;
+
+ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
+ float: left;
+ width: percentage((@columns / @grid-columns));
+ }
+}
+
+.make-m-column-offset(@columns) {
+ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
+ margin-left: percentage((@columns / @grid-columns));
+ }
+}
+
+.make-m-column-push(@columns) {
+ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
+ left: percentage((@columns / @grid-columns));
+ }
+}
+
+.make-m-column-pull(@columns) {
+ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-m) {
+ right: percentage((@columns / @grid-columns));
+ }
+}
+
+//
+// Generate the medium columns
+// ---------------------------------------------
+
+.make-l-column(@columns; @gutter: @grid-gutter-width) {
+ min-height: 1px;
+ padding-left: (@gutter / 2);
+ padding-right: (@gutter / 2);
+ position: relative;
+
+ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-l) {
+ float: left;
+ width: percentage((@columns / @grid-columns));
+ }
+}
+
+.make-l-column-offset(@columns) {
+ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen-l) {
+ margin-left: percentage((@columns / @grid-columns));
+ }
+}
+
+.make-l-column-push(@columns) {
+ @media (min-width: @screen-l) {
+ left: percentage((@columns / @grid-columns));
+ }
+}
+
+.make-l-column-pull(@columns) {
+ @media (min-width: @screen-l) {
+ right: percentage((@columns / @grid-columns));
+ }
+}
+
+//
+// Generate the large columns
+// ---------------------------------------------
+
+.make-xl-column(@columns; @gutter: @grid-gutter-width) {
+ min-height: 1px;
+ padding-left: (@gutter / 2);
+ padding-right: (@gutter / 2);
+ position: relative;
+
+ @media (min-width: @screen-xl) {
+ float: left;
+ width: percentage((@columns / @grid-columns));
+ }
+}
+
+.make-xl-column-offset(@columns) {
+ @media (min-width: @screen-xl) {
+ margin-left: percentage((@columns / @grid-columns));
+ }
+}
+
+.make-xl-column-push(@columns) {
+ @media (min-width: @screen-xl) {
+ left: percentage((@columns / @grid-columns));
+ }
+}
+
+.make-xl-column-pull(@columns) {
+ @media (min-width: @screen-xl) {
+ right: percentage((@columns / @grid-columns));
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/lib/utilities/_spinner.less b/setup/module/Magento/Setup/styles/lib/utilities/_spinner.less
new file mode 100644
index 0000000000000000000000000000000000000000..56fd54f6f51329e1e1d10ae020a8db49745e4364
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/utilities/_spinner.less
@@ -0,0 +1,86 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+._spinner-keyframes() {
+ @-moz-keyframes @spinner__keyframe-name {
+ 0% {
+ background-color: @spinner__first-color;
+ }
+ 100% {
+ background-color: @spinner__second-color;
+ }
+ }
+ @-webkit-keyframes @spinner__keyframe-name {
+ 0% {
+ background-color: @spinner__first-color;
+ }
+ 100% {
+ background-color: @spinner__second-color;
+ }
+ }
+ @-ms-keyframes @spinner__keyframe-name {
+ 0% {
+ background-color: @spinner__first-color;
+ }
+ 100% {
+ background-color: @spinner__second-color;
+ }
+ }
+ @keyframes @spinner__keyframe-name {
+ 0% {
+ background-color: @spinner__first-color;
+ }
+ 100% {
+ background-color: @spinner__second-color;
+ }
+ }
+}
+
+._spinner-loop(
+ @_spinner-spin-count: @spinner__spin-count,
+ @_spinner-rotate: @spinner__rotate,
+ @_spinner-delay: @spinner__delay
+) when (@_spinner-spin-count > 0) {
+ ._spinner-loop(
+ (@_spinner-spin-count - 1),
+ (@_spinner-rotate - @spinner__rotate-step),
+ (@_spinner-delay - @spinner__animation-step)
+ );
+ > span {
+ &:nth-child(@{_spinner-spin-count}) {
+ -webkit-animation-delay: @_spinner-delay;
+ -moz-animation-delay: @_spinner-delay;
+ -ms-animation-delay: @_spinner-delay;
+ animation-delay: @_spinner-delay;
+ -webkit-transform: ~'rotate(@{_spinner-rotate}deg)';
+ -moz-transform: ~'rotate(@{_spinner-rotate}deg)';
+ -ms-transform: ~'rotate(@{_spinner-rotate}deg)';
+ transform: ~'rotate(@{_spinner-rotate}deg)';
+ }
+ }
+}
+
+._spinner_transform() {
+ -webkit-animation-direction: @spinner__animation-direction;
+ -moz-animation-direction: @spinner__animation-direction;
+ -ms-animation-direction: @spinner__animation-direction;
+ animation-direction: @spinner__animation-direction;
+ -webkit-animation-duration: @spinner__animation-duration;
+ -moz-animation-duration: @spinner__animation-duration;
+ -ms-animation-duration: @spinner__animation-duration;
+ animation-duration: @spinner__animation-duration;
+ -webkit-animation-iteration-count: @spinner__animation-iteration-count;
+ -moz-animation-iteration-count: @spinner__animation-iteration-count;
+ -ms-animation-iteration-count: @spinner__animation-iteration-count;
+ animation-iteration-count: @spinner__animation-iteration-count;
+ -webkit-animation-name: @spinner__keyframe-name;
+ -moz-animation-name: @spinner__keyframe-name;
+ -ms-animation-name: @spinner__keyframe-name;
+ animation-name: @spinner__keyframe-name;
+ -webkit-transform: @spinner__animation-transform;
+ -moz-transform: @spinner__animation-transform;
+ -ms-transform: @spinner__animation-transform;
+ transform: @spinner__animation-transform;
+}
diff --git a/setup/module/Magento/Setup/styles/lib/utilities/_vendor-prefixes.less b/setup/module/Magento/Setup/styles/lib/utilities/_vendor-prefixes.less
new file mode 100644
index 0000000000000000000000000000000000000000..58e5eb8843f601b1fac34580e1ccdace82c4a67a
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/lib/utilities/_vendor-prefixes.less
@@ -0,0 +1,12 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.vendor-prefix-appearance (
+ @value: none
+) {
+ -webkit-appearance: @value;
+ -moz-appearance: @value;
+ appearance: @value;
+}
diff --git a/setup/module/Magento/Setup/styles/pages/_common.less b/setup/module/Magento/Setup/styles/pages/_common.less
new file mode 100644
index 0000000000000000000000000000000000000000..a93e1414b424ad5653aaae42ea19e2a30148748f
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/pages/_common.less
@@ -0,0 +1,60 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+// Sizes
+
+@logo-icon__width: 3.5rem;
+@logo-icon__height: 4.1rem;
+
+//
+
+.main {
+ padding-bottom: 2rem;
+ padding-top: @main__indent-top;
+}
+
+//
+// Header
+// _____________________________________________
+
+.header {
+ .extend__clearer();
+ display: none;
+ .logo {
+ float: left;
+ height: @logo-icon__height;
+ width: @logo-icon__width;
+ }
+}
+
+.header-title {
+ font-size: 2.8rem;
+ letter-spacing: .02em;
+ margin: 2.5rem 0 3.5rem @logo-icon__width + 1.5rem;
+}
+
+//
+// Titles
+// _____________________________________________
+
+.page-title {
+ font-size: 2rem;
+ margin-bottom: 1.3em;
+}
+
+//
+// Accent block
+// _____________________________________________
+
+.accent-box {
+ margin-bottom: 2rem;
+ .btn-prime {
+ margin-top: 1.5rem;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/pages/_customize-your-store.less b/setup/module/Magento/Setup/styles/pages/_customize-your-store.less
new file mode 100644
index 0000000000000000000000000000000000000000..cdc0fa09dae604f7859820ba0c77d2d24d03dbf1
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/pages/_customize-your-store.less
@@ -0,0 +1,44 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.uncheckedClass {
+ padding: 5px 5px 5px 5px;
+ width:480px;
+ font-weight: normal;
+}
+
+.checkedClass {
+ padding: 5px 5px 5px 5px;
+ background-color:#d9edf7;
+ width:480px;
+ font-weight: normal;
+}
+
+.disabledClass {
+ padding: 5px 5px 5px 5px;
+ color: #707070;
+ width:480px;
+ font-weight: normal;
+}
+
+.multiSelect{
+ padding : 10px;
+ border-radius: 4px;
+ border: 1px solid #ccc;
+ overflow-y: scroll;
+ width:500px;
+ height:300px;
+}
+
+::-webkit-scrollbar {
+ -webkit-appearance: none;
+ width: 8px;
+}
+
+::-webkit-scrollbar-thumb {
+ border-radius: 4px;
+ background-color: rgba(0,0,0,.5);
+ -webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
+}
\ No newline at end of file
diff --git a/setup/module/Magento/Setup/styles/pages/_install.less b/setup/module/Magento/Setup/styles/pages/_install.less
new file mode 100644
index 0000000000000000000000000000000000000000..2919bd3c062b13542720cc5b61180933527a812e
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/pages/_install.less
@@ -0,0 +1,45 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+@console__border-color: @color-gray80;
+
+//
+
+.content-install {
+ margin-bottom: 2rem;
+}
+
+.console {
+ border: 1px solid @console__border-color;
+ border-radius: 5px;
+ font-family: @font-family-console;
+ font-weight: @font-weight-light;
+ margin: 1rem 0 2rem;
+ max-height: 20rem;
+ overflow-y: auto;
+ padding: 1.5rem 2rem 2rem;
+}
+
+// Success
+
+.content-success {
+ .btn-prime {
+ margin-top: 1.5rem;
+ }
+}
+
+.jumbo-title {
+ font-size: 3.6rem;
+ .jumbo-icon {
+ font-size: 3.8rem;
+ margin-right: .25em;
+ position: relative;
+ top: .15em;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/pages/_landing.less b/setup/module/Magento/Setup/styles/pages/_landing.less
new file mode 100644
index 0000000000000000000000000000000000000000..d11f78f5fbee26f39772e56ee20275f59eb1f542
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/pages/_landing.less
@@ -0,0 +1,28 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.page-landing {
+ margin: 7.6% auto 0;
+ max-width: 44rem;
+ text-align: center;
+ .logo {
+ height: 5.6rem;
+ margin-bottom: 2rem;
+ width: 19.2rem;
+ }
+ .text-version {
+ margin-bottom: 3rem;
+ }
+ .text-welcome {
+ margin-bottom: 6.5rem;
+ }
+ .text-terms {
+ margin-bottom: 2.5rem;
+ text-align: center;
+ }
+ .btn-submit {
+ margin-bottom: @indent-base;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/pages/_license.less b/setup/module/Magento/Setup/styles/pages/_license.less
new file mode 100644
index 0000000000000000000000000000000000000000..9621c9d4a99069f9c59d9f14c8bb07bfff6ac1b1
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/pages/_license.less
@@ -0,0 +1,13 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.page-license {
+ .license-text {
+ margin-bottom: 2rem;
+ }
+ .page-license-footer {
+ text-align: right;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/pages/_readiness-check.less b/setup/module/Magento/Setup/styles/pages/_readiness-check.less
new file mode 100644
index 0000000000000000000000000000000000000000..0d303bc553ee5005fccdd0955c655880b88d3ea5
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/pages/_readiness-check.less
@@ -0,0 +1,64 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+//
+// Variables
+// _____________________________________________
+
+// Sizes
+
+@readiness-check-side__width: 22rem;
+@readiness-check-content__indent: 7.5rem;
+
+//
+// Common
+// ---------------------------------------------
+
+.rediness-check-item {
+ margin-bottom: 4rem;
+}
+
+.readiness-check-title {
+ font-size: @base__font-size;
+ font-weight: @font-weight-bold;
+ margin-bottom: .1rem;
+ margin-left: @readiness-check-content__indent;
+}
+
+.readiness-check-content {
+ margin-left: @readiness-check-content__indent;
+ margin-right: @readiness-check-side__width;
+ .readiness-check-title {
+ margin-left: 0;
+ }
+ .list {
+ margin-top: -.3rem;
+ }
+}
+
+.rediness-check-side {
+ float: right;
+ padding-left: 2.4rem;
+ width: @readiness-check-side__width;
+ .side-title {
+ margin-bottom: 0;
+ }
+}
+
+.readiness-check-icon {
+ float: left;
+ margin-left: 2rem;
+ margin-top: .7rem;
+}
+
+//
+// Mobile
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-m) {
+ .readiness-check-content {
+ margin-right: 2rem;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/pages/_web-configuration.less b/setup/module/Magento/Setup/styles/pages/_web-configuration.less
new file mode 100644
index 0000000000000000000000000000000000000000..f416f5971e894a6ca034935c20ca0f70fe87f115
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/pages/_web-configuration.less
@@ -0,0 +1,32 @@
+// /**
+// * Copyright © 2015 Magento. All rights reserved.
+// * See COPYING.txt for license details.
+// */
+
+.page-web-configuration {
+ .form-el-insider-wrap {
+ width: auto;
+ }
+ .form-el-insider {
+ width: 15.4rem;
+ }
+ .form-el-insider-input {
+ .form-el-input {
+ width: 16.5rem;
+ }
+ }
+}
+
+//
+// Mobile
+// _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen-m) {
+ .form-el-insider-wrap,
+ .form-el-insider,
+ .page-web-configuration .form-el-insider-input,
+ .page-web-configuration .form-el-insider-input .form-el-input {
+ display: block;
+ width: 100%;
+ }
+}
diff --git a/setup/module/Magento/Setup/styles/setup.less b/setup/module/Magento/Setup/styles/setup.less
new file mode 100644
index 0000000000000000000000000000000000000000..c063bfda1c508fa926db4eaf15d5098becf67035
--- /dev/null
+++ b/setup/module/Magento/Setup/styles/setup.less
@@ -0,0 +1,58 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+//
+// Global lib
+// _____________________________________________
+
+@baseDir: '../';
+
+@import '/lib/web/css/source/lib/lib';
+
+//
+// Local lib
+// _____________________________________________
+
+@import 'lib/_variables';
+@import 'lib/_utilities';
+@import 'lib/_reset';
+@import 'lib/_extends';
+@import 'lib/_classes';
+@import 'lib/_typography';
+@import 'lib/_icons';
+@import 'lib/_lists';
+@import 'lib/_buttons';
+@import 'lib/_forms';
+@import 'lib/_pseudo-tables';
+@import 'lib/_alerts';
+@import 'lib/_structures';
+@import 'lib/_grid';
+
+//
+// Components
+// _____________________________________________
+
+@import 'components/_navigation-bar';
+@import 'components/_tooltips';
+@import 'components/_progress-bars';
+@import 'components/_spinner';
+
+//
+// Pages
+// _____________________________________________
+
+@import 'pages/_common';
+@import 'pages/_landing';
+@import 'pages/_license';
+@import 'pages/_readiness-check';
+@import 'pages/_web-configuration';
+@import 'pages/_customize-your-store';
+@import 'pages/_install';
+
+//
+// Media queries collector
+// _____________________________________________
+
+@import 'lib/_collector';
diff --git a/setup/pub/bootstrap/css/bootstrap-theme.css b/setup/pub/bootstrap/css/bootstrap-theme.css
deleted file mode 100644
index a4069929bceb661eacbd4b1eb21306cfa5a1c8f9..0000000000000000000000000000000000000000
--- a/setup/pub/bootstrap/css/bootstrap-theme.css
+++ /dev/null
@@ -1,347 +0,0 @@
-/*!
- * Bootstrap v3.1.1 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-info,
-.btn-warning,
-.btn-danger {
- text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
-}
-.btn-default:active,
-.btn-primary:active,
-.btn-success:active,
-.btn-info:active,
-.btn-warning:active,
-.btn-danger:active,
-.btn-default.active,
-.btn-primary.active,
-.btn-success.active,
-.btn-info.active,
-.btn-warning.active,
-.btn-danger.active {
- -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
- box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn:active,
-.btn.active {
- background-image: none;
-}
-.btn-default {
- text-shadow: 0 1px 0 #fff;
- background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
- background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- background-repeat: repeat-x;
- border-color: #dbdbdb;
- border-color: #ccc;
-}
-.btn-default:hover,
-.btn-default:focus {
- background-color: #e0e0e0;
- background-position: 0 -15px;
-}
-.btn-default:active,
-.btn-default.active {
- background-color: #e0e0e0;
- border-color: #dbdbdb;
-}
-.btn-primary {
- background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
- background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- background-repeat: repeat-x;
- border-color: #2b669a;
-}
-.btn-primary:hover,
-.btn-primary:focus {
- background-color: #2d6ca2;
- background-position: 0 -15px;
-}
-.btn-primary:active,
-.btn-primary.active {
- background-color: #2d6ca2;
- border-color: #2b669a;
-}
-.btn-success {
- background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
- background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- background-repeat: repeat-x;
- border-color: #3e8f3e;
-}
-.btn-success:hover,
-.btn-success:focus {
- background-color: #419641;
- background-position: 0 -15px;
-}
-.btn-success:active,
-.btn-success.active {
- background-color: #419641;
- border-color: #3e8f3e;
-}
-.btn-info {
- background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
- background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- background-repeat: repeat-x;
- border-color: #28a4c9;
-}
-.btn-info:hover,
-.btn-info:focus {
- background-color: #2aabd2;
- background-position: 0 -15px;
-}
-.btn-info:active,
-.btn-info.active {
- background-color: #2aabd2;
- border-color: #28a4c9;
-}
-.btn-warning {
- background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
- background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- background-repeat: repeat-x;
- border-color: #e38d13;
-}
-.btn-warning:hover,
-.btn-warning:focus {
- background-color: #eb9316;
- background-position: 0 -15px;
-}
-.btn-warning:active,
-.btn-warning.active {
- background-color: #eb9316;
- border-color: #e38d13;
-}
-.btn-danger {
- background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
- background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- background-repeat: repeat-x;
- border-color: #b92c28;
-}
-.btn-danger:hover,
-.btn-danger:focus {
- background-color: #c12e2a;
- background-position: 0 -15px;
-}
-.btn-danger:active,
-.btn-danger.active {
- background-color: #c12e2a;
- border-color: #b92c28;
-}
-.thumbnail,
-.img-thumbnail {
- -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
- box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
- background-color: #e8e8e8;
- background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
- background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
- background-repeat: repeat-x;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
- background-color: #357ebd;
- background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
- background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
- background-repeat: repeat-x;
-}
-.navbar-default {
- background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
- background-image: linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- background-repeat: repeat-x;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
-}
-.navbar-default .navbar-nav > .active > a {
- background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
- background-image: linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
- background-repeat: repeat-x;
- -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
- box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
-}
-.navbar-brand,
-.navbar-nav > li > a {
- text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
-}
-.navbar-inverse {
- background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
- background-image: linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- background-repeat: repeat-x;
-}
-.navbar-inverse .navbar-nav > .active > a {
- background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
- background-image: linear-gradient(to bottom, #222 0%, #282828 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
- background-repeat: repeat-x;
- -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
- box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
-}
-.navbar-inverse .navbar-brand,
-.navbar-inverse .navbar-nav > li > a {
- text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
-}
-.navbar-static-top,
-.navbar-fixed-top,
-.navbar-fixed-bottom {
- border-radius: 0;
-}
-.alert {
- text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
-}
-.alert-success {
- background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
- background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
- background-repeat: repeat-x;
- border-color: #b2dba1;
-}
-.alert-info {
- background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
- background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
- background-repeat: repeat-x;
- border-color: #9acfea;
-}
-.alert-warning {
- background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
- background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
- background-repeat: repeat-x;
- border-color: #f5e79e;
-}
-.alert-danger {
- background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
- background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
- background-repeat: repeat-x;
- border-color: #dca7a7;
-}
-.progress {
- background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
- background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
- background-repeat: repeat-x;
-}
-.progress-bar {
- background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
- background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
- background-repeat: repeat-x;
-}
-.progress-bar-success {
- background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
- background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
- background-repeat: repeat-x;
-}
-.progress-bar-info {
- background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
- background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
- background-repeat: repeat-x;
-}
-.progress-bar-warning {
- background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
- background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
- background-repeat: repeat-x;
-}
-.progress-bar-danger {
- background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
- background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
- background-repeat: repeat-x;
-}
-.list-group {
- border-radius: 4px;
- -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
- box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-}
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
- text-shadow: 0 -1px 0 #3071a9;
- background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
- background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
- background-repeat: repeat-x;
- border-color: #3278b3;
-}
-.panel {
- -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
- box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-}
-.panel-default > .panel-heading {
- background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
- background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
- background-repeat: repeat-x;
-}
-.panel-primary > .panel-heading {
- background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
- background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
- background-repeat: repeat-x;
-}
-.panel-success > .panel-heading {
- background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
- background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
- background-repeat: repeat-x;
-}
-.panel-info > .panel-heading {
- background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
- background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
- background-repeat: repeat-x;
-}
-.panel-warning > .panel-heading {
- background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
- background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
- background-repeat: repeat-x;
-}
-.panel-danger > .panel-heading {
- background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
- background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
- background-repeat: repeat-x;
-}
-.well {
- background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
- background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
- background-repeat: repeat-x;
- border-color: #dcdcdc;
- -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
- box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
-}
-/*# sourceMappingURL=bootstrap-theme.css.map */
diff --git a/setup/pub/bootstrap/css/bootstrap-theme.css.map b/setup/pub/bootstrap/css/bootstrap-theme.css.map
deleted file mode 100644
index b36fc9a4970e41d7a3bfdb67780e93ab18a68faf..0000000000000000000000000000000000000000
--- a/setup/pub/bootstrap/css/bootstrap-theme.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["less/theme.less","less/mixins.less"],"names":[],"mappings":"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","sourcesContent":["\n//\n// Load core variables and mixins\n// --------------------------------------------------\n\n@import \"variables.less\";\n@import \"mixins.less\";\n\n\n\n//\n// Buttons\n// --------------------------------------------------\n\n// Common styles\n.btn-default,\n.btn-primary,\n.btn-success,\n.btn-info,\n.btn-warning,\n.btn-danger {\n text-shadow: 0 -1px 0 rgba(0,0,0,.2);\n @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);\n .box-shadow(@shadow);\n\n // Reset the shadow\n &:active,\n &.active {\n .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n }\n}\n\n// Mixin for generating new styles\n.btn-styles(@btn-color: #555) {\n #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%));\n .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners\n background-repeat: repeat-x;\n border-color: darken(@btn-color, 14%);\n\n &:hover,\n &:focus {\n background-color: darken(@btn-color, 12%);\n background-position: 0 -15px;\n }\n\n &:active,\n &.active {\n background-color: darken(@btn-color, 12%);\n border-color: darken(@btn-color, 14%);\n }\n}\n\n// Common styles\n.btn {\n // Remove the gradient for the pressed/active state\n &:active,\n &.active {\n background-image: none;\n }\n}\n\n// Apply the mixin to the buttons\n.btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }\n.btn-primary { .btn-styles(@btn-primary-bg); }\n.btn-success { .btn-styles(@btn-success-bg); }\n.btn-info { .btn-styles(@btn-info-bg); }\n.btn-warning { .btn-styles(@btn-warning-bg); }\n.btn-danger { .btn-styles(@btn-danger-bg); }\n\n\n\n//\n// Images\n// --------------------------------------------------\n\n.thumbnail,\n.img-thumbnail {\n .box-shadow(0 1px 2px rgba(0,0,0,.075));\n}\n\n\n\n//\n// Dropdowns\n// --------------------------------------------------\n\n.dropdown-menu > li > a:hover,\n.dropdown-menu > li > a:focus {\n #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));\n background-color: darken(@dropdown-link-hover-bg, 5%);\n}\n.dropdown-menu > .active > a,\n.dropdown-menu > .active > a:hover,\n.dropdown-menu > .active > a:focus {\n #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));\n background-color: darken(@dropdown-link-active-bg, 5%);\n}\n\n\n\n//\n// Navbar\n// --------------------------------------------------\n\n// Default navbar\n.navbar-default {\n #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg);\n .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered\n border-radius: @navbar-border-radius;\n @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);\n .box-shadow(@shadow);\n\n .navbar-nav > .active > a {\n #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));\n .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));\n }\n}\n.navbar-brand,\n.navbar-nav > li > a {\n text-shadow: 0 1px 0 rgba(255,255,255,.25);\n}\n\n// Inverted navbar\n.navbar-inverse {\n #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg);\n .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered\n\n .navbar-nav > .active > a {\n #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));\n .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));\n }\n\n .navbar-brand,\n .navbar-nav > li > a {\n text-shadow: 0 -1px 0 rgba(0,0,0,.25);\n }\n}\n\n// Undo rounded corners in static and fixed navbars\n.navbar-static-top,\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n border-radius: 0;\n}\n\n\n\n//\n// Alerts\n// --------------------------------------------------\n\n// Common styles\n.alert {\n text-shadow: 0 1px 0 rgba(255,255,255,.2);\n @shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05);\n .box-shadow(@shadow);\n}\n\n// Mixin for generating new styles\n.alert-styles(@color) {\n #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 7.5%));\n border-color: darken(@color, 15%);\n}\n\n// Apply the mixin to the alerts\n.alert-success { .alert-styles(@alert-success-bg); }\n.alert-info { .alert-styles(@alert-info-bg); }\n.alert-warning { .alert-styles(@alert-warning-bg); }\n.alert-danger { .alert-styles(@alert-danger-bg); }\n\n\n\n//\n// Progress bars\n// --------------------------------------------------\n\n// Give the progress background some depth\n.progress {\n #gradient > .vertical(@start-color: darken(@progress-bg, 4%); @end-color: @progress-bg)\n}\n\n// Mixin for generating new styles\n.progress-bar-styles(@color) {\n #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 10%));\n}\n\n// Apply the mixin to the progress bars\n.progress-bar { .progress-bar-styles(@progress-bar-bg); }\n.progress-bar-success { .progress-bar-styles(@progress-bar-success-bg); }\n.progress-bar-info { .progress-bar-styles(@progress-bar-info-bg); }\n.progress-bar-warning { .progress-bar-styles(@progress-bar-warning-bg); }\n.progress-bar-danger { .progress-bar-styles(@progress-bar-danger-bg); }\n\n\n\n//\n// List groups\n// --------------------------------------------------\n\n.list-group {\n border-radius: @border-radius-base;\n .box-shadow(0 1px 2px rgba(0,0,0,.075));\n}\n.list-group-item.active,\n.list-group-item.active:hover,\n.list-group-item.active:focus {\n text-shadow: 0 -1px 0 darken(@list-group-active-bg, 10%);\n #gradient > .vertical(@start-color: @list-group-active-bg; @end-color: darken(@list-group-active-bg, 7.5%));\n border-color: darken(@list-group-active-border, 7.5%);\n}\n\n\n\n//\n// Panels\n// --------------------------------------------------\n\n// Common styles\n.panel {\n .box-shadow(0 1px 2px rgba(0,0,0,.05));\n}\n\n// Mixin for generating new styles\n.panel-heading-styles(@color) {\n #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 5%));\n}\n\n// Apply the mixin to the panel headings only\n.panel-default > .panel-heading { .panel-heading-styles(@panel-default-heading-bg); }\n.panel-primary > .panel-heading { .panel-heading-styles(@panel-primary-heading-bg); }\n.panel-success > .panel-heading { .panel-heading-styles(@panel-success-heading-bg); }\n.panel-info > .panel-heading { .panel-heading-styles(@panel-info-heading-bg); }\n.panel-warning > .panel-heading { .panel-heading-styles(@panel-warning-heading-bg); }\n.panel-danger > .panel-heading { .panel-heading-styles(@panel-danger-heading-bg); }\n\n\n\n//\n// Wells\n// --------------------------------------------------\n\n.well {\n #gradient > .vertical(@start-color: darken(@well-bg, 5%); @end-color: @well-bg);\n border-color: darken(@well-bg, 10%);\n @shadow: inset 0 1px 3px rgba(0,0,0,.05), 0 1px 0 rgba(255,255,255,.1);\n .box-shadow(@shadow);\n}\n","//\n// Mixins\n// --------------------------------------------------\n\n\n// Utilities\n// -------------------------\n\n// Clearfix\n// Source: http://nicolasgallagher.com/micro-clearfix-hack/\n//\n// For modern browsers\n// 1. The space content is one way to avoid an Opera bug when the\n// contenteditable attribute is included anywhere else in the document.\n// Otherwise it causes space to appear at the top and bottom of elements\n// that are clearfixed.\n// 2. The use of `table` rather than `block` is only necessary if using\n// `:before` to contain the top-margins of child elements.\n.clearfix() {\n &:before,\n &:after {\n content: \" \"; // 1\n display: table; // 2\n }\n &:after {\n clear: both;\n }\n}\n\n// WebKit-style focus\n.tab-focus() {\n // Default\n outline: thin dotted;\n // WebKit\n outline: 5px auto -webkit-focus-ring-color;\n outline-offset: -2px;\n}\n\n// Center-align a block level element\n.center-block() {\n display: block;\n margin-left: auto;\n margin-right: auto;\n}\n\n// Sizing shortcuts\n.size(@width; @height) {\n width: @width;\n height: @height;\n}\n.square(@size) {\n .size(@size; @size);\n}\n\n// Placeholder text\n.placeholder(@color: @input-color-placeholder) {\n &::-moz-placeholder { color: @color; // Firefox\n opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526\n &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+\n &::-webkit-input-placeholder { color: @color; } // Safari and Chrome\n}\n\n// Text overflow\n// Requires inline-block or block for proper styling\n.text-overflow() {\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n}\n\n// CSS image replacement\n//\n// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for\n// mixins being reused as classes with the same name, this doesn't hold up. As\n// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. Note\n// that we cannot chain the mixins together in Less, so they are repeated.\n//\n// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757\n\n// Deprecated as of v3.0.1 (will be removed in v4)\n.hide-text() {\n font: ~\"0/0\" a;\n color: transparent;\n text-shadow: none;\n background-color: transparent;\n border: 0;\n}\n// New mixin to use as of v3.0.1\n.text-hide() {\n .hide-text();\n}\n\n\n\n// CSS3 PROPERTIES\n// --------------------------------------------------\n\n// Single side border-radius\n.border-top-radius(@radius) {\n border-top-right-radius: @radius;\n border-top-left-radius: @radius;\n}\n.border-right-radius(@radius) {\n border-bottom-right-radius: @radius;\n border-top-right-radius: @radius;\n}\n.border-bottom-radius(@radius) {\n border-bottom-right-radius: @radius;\n border-bottom-left-radius: @radius;\n}\n.border-left-radius(@radius) {\n border-bottom-left-radius: @radius;\n border-top-left-radius: @radius;\n}\n\n// Drop shadows\n//\n// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's\n// supported browsers that have box shadow capabilities now support the\n// standard `box-shadow` property.\n.box-shadow(@shadow) {\n -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1\n box-shadow: @shadow;\n}\n\n// Transitions\n.transition(@transition) {\n -webkit-transition: @transition;\n transition: @transition;\n}\n.transition-property(@transition-property) {\n -webkit-transition-property: @transition-property;\n transition-property: @transition-property;\n}\n.transition-delay(@transition-delay) {\n -webkit-transition-delay: @transition-delay;\n transition-delay: @transition-delay;\n}\n.transition-duration(@transition-duration) {\n -webkit-transition-duration: @transition-duration;\n transition-duration: @transition-duration;\n}\n.transition-transform(@transition) {\n -webkit-transition: -webkit-transform @transition;\n -moz-transition: -moz-transform @transition;\n -o-transition: -o-transform @transition;\n transition: transform @transition;\n}\n\n// Transformations\n.rotate(@degrees) {\n -webkit-transform: rotate(@degrees);\n -ms-transform: rotate(@degrees); // IE9 only\n transform: rotate(@degrees);\n}\n.scale(@ratio; @ratio-y...) {\n -webkit-transform: scale(@ratio, @ratio-y);\n -ms-transform: scale(@ratio, @ratio-y); // IE9 only\n transform: scale(@ratio, @ratio-y);\n}\n.translate(@x; @y) {\n -webkit-transform: translate(@x, @y);\n -ms-transform: translate(@x, @y); // IE9 only\n transform: translate(@x, @y);\n}\n.skew(@x; @y) {\n -webkit-transform: skew(@x, @y);\n -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+\n transform: skew(@x, @y);\n}\n.translate3d(@x; @y; @z) {\n -webkit-transform: translate3d(@x, @y, @z);\n transform: translate3d(@x, @y, @z);\n}\n\n.rotateX(@degrees) {\n -webkit-transform: rotateX(@degrees);\n -ms-transform: rotateX(@degrees); // IE9 only\n transform: rotateX(@degrees);\n}\n.rotateY(@degrees) {\n -webkit-transform: rotateY(@degrees);\n -ms-transform: rotateY(@degrees); // IE9 only\n transform: rotateY(@degrees);\n}\n.perspective(@perspective) {\n -webkit-perspective: @perspective;\n -moz-perspective: @perspective;\n perspective: @perspective;\n}\n.perspective-origin(@perspective) {\n -webkit-perspective-origin: @perspective;\n -moz-perspective-origin: @perspective;\n perspective-origin: @perspective;\n}\n.transform-origin(@origin) {\n -webkit-transform-origin: @origin;\n -moz-transform-origin: @origin;\n -ms-transform-origin: @origin; // IE9 only\n transform-origin: @origin;\n}\n\n// Animations\n.animation(@animation) {\n -webkit-animation: @animation;\n animation: @animation;\n}\n.animation-name(@name) {\n -webkit-animation-name: @name;\n animation-name: @name;\n}\n.animation-duration(@duration) {\n -webkit-animation-duration: @duration;\n animation-duration: @duration;\n}\n.animation-timing-function(@timing-function) {\n -webkit-animation-timing-function: @timing-function;\n animation-timing-function: @timing-function;\n}\n.animation-delay(@delay) {\n -webkit-animation-delay: @delay;\n animation-delay: @delay;\n}\n.animation-iteration-count(@iteration-count) {\n -webkit-animation-iteration-count: @iteration-count;\n animation-iteration-count: @iteration-count;\n}\n.animation-direction(@direction) {\n -webkit-animation-direction: @direction;\n animation-direction: @direction;\n}\n\n// Backface visibility\n// Prevent browsers from flickering when using CSS 3D transforms.\n// Default value is `visible`, but can be changed to `hidden`\n.backface-visibility(@visibility){\n -webkit-backface-visibility: @visibility;\n -moz-backface-visibility: @visibility;\n backface-visibility: @visibility;\n}\n\n// Box sizing\n.box-sizing(@boxmodel) {\n -webkit-box-sizing: @boxmodel;\n -moz-box-sizing: @boxmodel;\n box-sizing: @boxmodel;\n}\n\n// User select\n// For selecting text on the page\n.user-select(@select) {\n -webkit-user-select: @select;\n -moz-user-select: @select;\n -ms-user-select: @select; // IE10+\n user-select: @select;\n}\n\n// Resize anything\n.resizable(@direction) {\n resize: @direction; // Options: horizontal, vertical, both\n overflow: auto; // Safari fix\n}\n\n// CSS3 Content Columns\n.content-columns(@column-count; @column-gap: @grid-gutter-width) {\n -webkit-column-count: @column-count;\n -moz-column-count: @column-count;\n column-count: @column-count;\n -webkit-column-gap: @column-gap;\n -moz-column-gap: @column-gap;\n column-gap: @column-gap;\n}\n\n// Optional hyphenation\n.hyphens(@mode: auto) {\n word-wrap: break-word;\n -webkit-hyphens: @mode;\n -moz-hyphens: @mode;\n -ms-hyphens: @mode; // IE10+\n -o-hyphens: @mode;\n hyphens: @mode;\n}\n\n// Opacity\n.opacity(@opacity) {\n opacity: @opacity;\n // IE8 filter\n @opacity-ie: (@opacity * 100);\n filter: ~\"alpha(opacity=@{opacity-ie})\";\n}\n\n\n\n// GRADIENTS\n// --------------------------------------------------\n\n#gradient {\n\n // Horizontal gradient, from left to right\n //\n // Creates two color stops, start and end, by specifying a color and position for each color stop.\n // Color stops are not available in IE9 and below.\n .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1-6, Chrome 10+\n background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n background-repeat: repeat-x;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down\n }\n\n // Vertical gradient, from top to bottom\n //\n // Creates two color stops, start and end, by specifying a color and position for each color stop.\n // Color stops are not available in IE9 and below.\n .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+\n background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n background-repeat: repeat-x;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down\n }\n\n .directional(@start-color: #555; @end-color: #333; @deg: 45deg) {\n background-repeat: repeat-x;\n background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+\n background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n }\n .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);\n background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color);\n background-repeat: no-repeat;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n }\n .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n background-repeat: no-repeat;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n }\n .radial(@inner-color: #555; @outer-color: #333) {\n background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);\n background-image: radial-gradient(circle, @inner-color, @outer-color);\n background-repeat: no-repeat;\n }\n .striped(@color: rgba(255,255,255,.15); @angle: 45deg) {\n background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n }\n}\n\n// Reset filters for IE\n//\n// When you need to remove a gradient background, do not forget to use this to reset\n// the IE filter for IE9 and below.\n.reset-filter() {\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(enabled = false)\"));\n}\n\n\n\n// Retina images\n//\n// Short retina mixin for setting background-image and -size\n\n.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {\n background-image: url(\"@{file-1x}\");\n\n @media\n only screen and (-webkit-min-device-pixel-ratio: 2),\n only screen and ( min--moz-device-pixel-ratio: 2),\n only screen and ( -o-min-device-pixel-ratio: 2/1),\n only screen and ( min-device-pixel-ratio: 2),\n only screen and ( min-resolution: 192dpi),\n only screen and ( min-resolution: 2dppx) {\n background-image: url(\"@{file-2x}\");\n background-size: @width-1x @height-1x;\n }\n}\n\n\n// Responsive image\n//\n// Keep images from scaling beyond the width of their parents.\n\n.img-responsive(@display: block) {\n display: @display;\n max-width: 100%; // Part 1: Set a maximum relative to the parent\n height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching\n}\n\n\n// COMPONENT MIXINS\n// --------------------------------------------------\n\n// Horizontal dividers\n// -------------------------\n// Dividers (basically an hr) within dropdowns and nav lists\n.nav-divider(@color: #e5e5e5) {\n height: 1px;\n margin: ((@line-height-computed / 2) - 1) 0;\n overflow: hidden;\n background-color: @color;\n}\n\n// Panels\n// -------------------------\n.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {\n border-color: @border;\n\n & > .panel-heading {\n color: @heading-text-color;\n background-color: @heading-bg-color;\n border-color: @heading-border;\n\n + .panel-collapse .panel-body {\n border-top-color: @border;\n }\n }\n & > .panel-footer {\n + .panel-collapse .panel-body {\n border-bottom-color: @border;\n }\n }\n}\n\n// Alerts\n// -------------------------\n.alert-variant(@background; @border; @text-color) {\n background-color: @background;\n border-color: @border;\n color: @text-color;\n\n hr {\n border-top-color: darken(@border, 5%);\n }\n .alert-link {\n color: darken(@text-color, 10%);\n }\n}\n\n// Tables\n// -------------------------\n.table-row-variant(@state; @background) {\n // Exact selectors below required to override `.table-striped` and prevent\n // inheritance to nested tables.\n .table > thead > tr,\n .table > tbody > tr,\n .table > tfoot > tr {\n > td.@{state},\n > th.@{state},\n &.@{state} > td,\n &.@{state} > th {\n background-color: @background;\n }\n }\n\n // Hover states for `.table-hover`\n // Note: this is not available for cells or rows within `thead` or `tfoot`.\n .table-hover > tbody > tr {\n > td.@{state}:hover,\n > th.@{state}:hover,\n &.@{state}:hover > td,\n &.@{state}:hover > th {\n background-color: darken(@background, 5%);\n }\n }\n}\n\n// List Groups\n// -------------------------\n.list-group-item-variant(@state; @background; @color) {\n .list-group-item-@{state} {\n color: @color;\n background-color: @background;\n\n a& {\n color: @color;\n\n .list-group-item-heading { color: inherit; }\n\n &:hover,\n &:focus {\n color: @color;\n background-color: darken(@background, 5%);\n }\n &.active,\n &.active:hover,\n &.active:focus {\n color: #fff;\n background-color: @color;\n border-color: @color;\n }\n }\n }\n}\n\n// Button variants\n// -------------------------\n// Easily pump out default styles, as well as :hover, :focus, :active,\n// and disabled options for all buttons\n.button-variant(@color; @background; @border) {\n color: @color;\n background-color: @background;\n border-color: @border;\n\n &:hover,\n &:focus,\n &:active,\n &.active,\n .open .dropdown-toggle& {\n color: @color;\n background-color: darken(@background, 8%);\n border-color: darken(@border, 12%);\n }\n &:active,\n &.active,\n .open .dropdown-toggle& {\n background-image: none;\n }\n &.disabled,\n &[disabled],\n fieldset[disabled] & {\n &,\n &:hover,\n &:focus,\n &:active,\n &.active {\n background-color: @background;\n border-color: @border;\n }\n }\n\n .badge {\n color: @background;\n background-color: @color;\n }\n}\n\n// Button sizes\n// -------------------------\n.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n padding: @padding-vertical @padding-horizontal;\n font-size: @font-size;\n line-height: @line-height;\n border-radius: @border-radius;\n}\n\n// Pagination\n// -------------------------\n.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {\n > li {\n > a,\n > span {\n padding: @padding-vertical @padding-horizontal;\n font-size: @font-size;\n }\n &:first-child {\n > a,\n > span {\n .border-left-radius(@border-radius);\n }\n }\n &:last-child {\n > a,\n > span {\n .border-right-radius(@border-radius);\n }\n }\n }\n}\n\n// Labels\n// -------------------------\n.label-variant(@color) {\n background-color: @color;\n &[href] {\n &:hover,\n &:focus {\n background-color: darken(@color, 10%);\n }\n }\n}\n\n// Contextual backgrounds\n// -------------------------\n.bg-variant(@color) {\n background-color: @color;\n a&:hover {\n background-color: darken(@color, 10%);\n }\n}\n\n// Typography\n// -------------------------\n.text-emphasis-variant(@color) {\n color: @color;\n a&:hover {\n color: darken(@color, 10%);\n }\n}\n\n// Navbar vertical align\n// -------------------------\n// Vertically center elements in the navbar.\n// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin.\n.navbar-vertical-align(@element-height) {\n margin-top: ((@navbar-height - @element-height) / 2);\n margin-bottom: ((@navbar-height - @element-height) / 2);\n}\n\n// Progress bars\n// -------------------------\n.progress-bar-variant(@color) {\n background-color: @color;\n .progress-striped & {\n #gradient > .striped();\n }\n}\n\n// Responsive utilities\n// -------------------------\n// More easily include all the states for responsive-utilities.less.\n.responsive-visibility() {\n display: block !important;\n table& { display: table; }\n tr& { display: table-row !important; }\n th&,\n td& { display: table-cell !important; }\n}\n\n.responsive-invisibility() {\n display: none !important;\n}\n\n\n// Grid System\n// -----------\n\n// Centered container element\n.container-fixed() {\n margin-right: auto;\n margin-left: auto;\n padding-left: (@grid-gutter-width / 2);\n padding-right: (@grid-gutter-width / 2);\n &:extend(.clearfix all);\n}\n\n// Creates a wrapper for a series of columns\n.make-row(@gutter: @grid-gutter-width) {\n margin-left: (@gutter / -2);\n margin-right: (@gutter / -2);\n &:extend(.clearfix all);\n}\n\n// Generate the extra small columns\n.make-xs-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n float: left;\n width: percentage((@columns / @grid-columns));\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n}\n.make-xs-column-offset(@columns) {\n @media (min-width: @screen-xs-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-xs-column-push(@columns) {\n @media (min-width: @screen-xs-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-xs-column-pull(@columns) {\n @media (min-width: @screen-xs-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Generate the small columns\n.make-sm-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n\n @media (min-width: @screen-sm-min) {\n float: left;\n width: percentage((@columns / @grid-columns));\n }\n}\n.make-sm-column-offset(@columns) {\n @media (min-width: @screen-sm-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-sm-column-push(@columns) {\n @media (min-width: @screen-sm-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-sm-column-pull(@columns) {\n @media (min-width: @screen-sm-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Generate the medium columns\n.make-md-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n\n @media (min-width: @screen-md-min) {\n float: left;\n width: percentage((@columns / @grid-columns));\n }\n}\n.make-md-column-offset(@columns) {\n @media (min-width: @screen-md-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-md-column-push(@columns) {\n @media (min-width: @screen-md-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-md-column-pull(@columns) {\n @media (min-width: @screen-md-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Generate the large columns\n.make-lg-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n\n @media (min-width: @screen-lg-min) {\n float: left;\n width: percentage((@columns / @grid-columns));\n }\n}\n.make-lg-column-offset(@columns) {\n @media (min-width: @screen-lg-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-lg-column-push(@columns) {\n @media (min-width: @screen-lg-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-lg-column-pull(@columns) {\n @media (min-width: @screen-lg-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Framework grid generation\n//\n// Used only by Bootstrap to generate the correct number of grid classes given\n// any value of `@grid-columns`.\n\n.make-grid-columns() {\n // Common styles for all sizes of grid columns, widths 1-12\n .col(@index) when (@index = 1) { // initial\n @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n .col((@index + 1), @item);\n }\n .col(@index, @list) when (@index =< @grid-columns) { // general; \"=<\" isn't a typo\n @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n .col((@index + 1), ~\"@{list}, @{item}\");\n }\n .col(@index, @list) when (@index > @grid-columns) { // terminal\n @{list} {\n position: relative;\n // Prevent columns from collapsing when empty\n min-height: 1px;\n // Inner gutter via padding\n padding-left: (@grid-gutter-width / 2);\n padding-right: (@grid-gutter-width / 2);\n }\n }\n .col(1); // kickstart it\n}\n\n.float-grid-columns(@class) {\n .col(@index) when (@index = 1) { // initial\n @item: ~\".col-@{class}-@{index}\";\n .col((@index + 1), @item);\n }\n .col(@index, @list) when (@index =< @grid-columns) { // general\n @item: ~\".col-@{class}-@{index}\";\n .col((@index + 1), ~\"@{list}, @{item}\");\n }\n .col(@index, @list) when (@index > @grid-columns) { // terminal\n @{list} {\n float: left;\n }\n }\n .col(1); // kickstart it\n}\n\n.calc-grid-column(@index, @class, @type) when (@type = width) and (@index > 0) {\n .col-@{class}-@{index} {\n width: percentage((@index / @grid-columns));\n }\n}\n.calc-grid-column(@index, @class, @type) when (@type = push) {\n .col-@{class}-push-@{index} {\n left: percentage((@index / @grid-columns));\n }\n}\n.calc-grid-column(@index, @class, @type) when (@type = pull) {\n .col-@{class}-pull-@{index} {\n right: percentage((@index / @grid-columns));\n }\n}\n.calc-grid-column(@index, @class, @type) when (@type = offset) {\n .col-@{class}-offset-@{index} {\n margin-left: percentage((@index / @grid-columns));\n }\n}\n\n// Basic looping in LESS\n.loop-grid-columns(@index, @class, @type) when (@index >= 0) {\n .calc-grid-column(@index, @class, @type);\n // next iteration\n .loop-grid-columns((@index - 1), @class, @type);\n}\n\n// Create grid for specific class\n.make-grid(@class) {\n .float-grid-columns(@class);\n .loop-grid-columns(@grid-columns, @class, width);\n .loop-grid-columns(@grid-columns, @class, pull);\n .loop-grid-columns(@grid-columns, @class, push);\n .loop-grid-columns(@grid-columns, @class, offset);\n}\n\n// Form validation states\n//\n// Used in forms.less to generate the form validation CSS for warnings, errors,\n// and successes.\n\n.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) {\n // Color the label and help text\n .help-block,\n .control-label,\n .radio,\n .checkbox,\n .radio-inline,\n .checkbox-inline {\n color: @text-color;\n }\n // Set the border and box shadow on specific inputs to match\n .form-control {\n border-color: @border-color;\n .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work\n &:focus {\n border-color: darken(@border-color, 10%);\n @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);\n .box-shadow(@shadow);\n }\n }\n // Set validation states also for addons\n .input-group-addon {\n color: @text-color;\n border-color: @border-color;\n background-color: @background-color;\n }\n // Optional feedback icon\n .form-control-feedback {\n color: @text-color;\n }\n}\n\n// Form control focus state\n//\n// Generate a customized focus state and for any input with the specified color,\n// which defaults to the `@input-focus-border` variable.\n//\n// We highly encourage you to not customize the default value, but instead use\n// this to tweak colors on an as-needed basis. This aesthetic change is based on\n// WebKit's default styles, but applicable to a wider range of browsers. Its\n// usability and accessibility should be taken into account with any change.\n//\n// Example usage: change the default blue border and shadow to white for better\n// contrast against a dark gray background.\n\n.form-control-focus(@color: @input-border-focus) {\n @color-rgba: rgba(red(@color), green(@color), blue(@color), .6);\n &:focus {\n border-color: @color;\n outline: 0;\n .box-shadow(~\"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}\");\n }\n}\n\n// Form control sizing\n//\n// Relative text size, padding, and border-radii changes for form controls. For\n// horizontal sizing, wrap controls in the predefined grid classes. `<select>`\n// element gets special love because it's special, and that's a fact!\n\n.input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n height: @input-height;\n padding: @padding-vertical @padding-horizontal;\n font-size: @font-size;\n line-height: @line-height;\n border-radius: @border-radius;\n\n select& {\n height: @input-height;\n line-height: @input-height;\n }\n\n textarea&,\n select[multiple]& {\n height: auto;\n }\n}\n"]}
\ No newline at end of file
diff --git a/setup/pub/bootstrap/css/bootstrap-theme.min.css b/setup/pub/bootstrap/css/bootstrap-theme.min.css
deleted file mode 100644
index ba4bd28ae51616917024b5d4a8d2d20b969a9e31..0000000000000000000000000000000000000000
--- a/setup/pub/bootstrap/css/bootstrap-theme.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v3.1.1 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn:active,.btn.active{background-image:none}.btn-default{background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;text-shadow:0 1px 0 #fff;border-color:#ccc}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-primary{background-image:-webkit-linear-gradient(top,#428bca 0,#2d6ca2 100%);background-image:linear-gradient(to bottom,#428bca 0,#2d6ca2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#2b669a}.btn-primary:hover,.btn-primary:focus{background-color:#2d6ca2;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#2d6ca2;border-color:#2b669a}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-color:#e8e8e8}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);background-color:#357ebd}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f3f3f3 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f3f3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#222 0,#282828 100%);background-image:linear-gradient(to bottom,#222 0,#282828 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0)}.progress-bar{background-image:-webkit-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:linear-gradient(to bottom,#428bca 0,#3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0)}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0)}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0)}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0)}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:linear-gradient(to bottom,#428bca 0,#3278b3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);border-color:#3278b3}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0)}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0)}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0)}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0)}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0)}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0)}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)}
\ No newline at end of file
diff --git a/setup/pub/bootstrap/css/bootstrap.css b/setup/pub/bootstrap/css/bootstrap.css
deleted file mode 100644
index 7f36651961ed5bc42a712042c6db5493b4ce99e9..0000000000000000000000000000000000000000
--- a/setup/pub/bootstrap/css/bootstrap.css
+++ /dev/null
@@ -1,5785 +0,0 @@
-/*!
- * Bootstrap v3.1.1 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
-html {
- font-family: sans-serif;
- -webkit-text-size-adjust: 100%;
- -ms-text-size-adjust: 100%;
-}
-body {
- margin: 0;
-}
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
- display: block;
-}
-audio,
-canvas,
-progress,
-video {
- display: inline-block;
- vertical-align: baseline;
-}
-audio:not([controls]) {
- display: none;
- height: 0;
-}
-[hidden],
-template {
- display: none;
-}
-a {
- background: transparent;
-}
-a:active,
-a:hover {
- outline: 0;
-}
-abbr[title] {
- border-bottom: 1px dotted;
-}
-b,
-strong {
- font-weight: bold;
-}
-dfn {
- font-style: italic;
-}
-h1 {
- margin: .67em 0;
- font-size: 2em;
-}
-mark {
- color: #000;
- background: #ff0;
-}
-small {
- font-size: 80%;
-}
-sub,
-sup {
- position: relative;
- font-size: 75%;
- line-height: 0;
- vertical-align: baseline;
-}
-sup {
- top: -.5em;
-}
-sub {
- bottom: -.25em;
-}
-img {
- border: 0;
-}
-svg:not(:root) {
- overflow: hidden;
-}
-figure {
- margin: 1em 40px;
-}
-hr {
- height: 0;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
-}
-pre {
- overflow: auto;
-}
-code,
-kbd,
-pre,
-samp {
- font-family: monospace, monospace;
- font-size: 1em;
-}
-button,
-input,
-optgroup,
-select,
-textarea {
- margin: 0;
- font: inherit;
- color: inherit;
-}
-button {
- overflow: visible;
-}
-button,
-select {
- text-transform: none;
-}
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
- -webkit-appearance: button;
- cursor: pointer;
-}
-button[disabled],
-html input[disabled] {
- cursor: default;
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner {
- padding: 0;
- border: 0;
-}
-input {
- line-height: normal;
-}
-input[type="checkbox"],
-input[type="radio"] {
- box-sizing: border-box;
- padding: 0;
-}
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
- height: auto;
-}
-input[type="search"] {
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
- -webkit-appearance: textfield;
-}
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
- -webkit-appearance: none;
-}
-fieldset {
- padding: .35em .625em .75em;
- margin: 0 2px;
- border: 1px solid #c0c0c0;
-}
-legend {
- padding: 0;
- border: 0;
-}
-textarea {
- overflow: auto;
-}
-optgroup {
- font-weight: bold;
-}
-table {
- border-spacing: 0;
- border-collapse: collapse;
-}
-td,
-th {
- padding: 0;
-}
-@media print {
- * {
- color: #000 !important;
- text-shadow: none !important;
- background: transparent !important;
- box-shadow: none !important;
- }
- a,
- a:visited {
- text-decoration: underline;
- }
- a[href]:after {
- content: " (" attr(href) ")";
- }
- abbr[title]:after {
- content: " (" attr(title) ")";
- }
- a[href^="javascript:"]:after,
- a[href^="#"]:after {
- content: "";
- }
- pre,
- blockquote {
- border: 1px solid #999;
-
- page-break-inside: avoid;
- }
- thead {
- display: table-header-group;
- }
- tr,
- img {
- page-break-inside: avoid;
- }
- img {
- max-width: 100% !important;
- }
- p,
- h2,
- h3 {
- orphans: 3;
- widows: 3;
- }
- h2,
- h3 {
- page-break-after: avoid;
- }
- select {
- background: #fff !important;
- }
- .navbar {
- display: none;
- }
- .table td,
- .table th {
- background-color: #fff !important;
- }
- .btn > .caret,
- .dropup > .btn > .caret {
- border-top-color: #000 !important;
- }
- .label {
- border: 1px solid #000;
- }
- .table {
- border-collapse: collapse !important;
- }
- .table-bordered th,
- .table-bordered td {
- border: 1px solid #ddd !important;
- }
-}
-* {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-*:before,
-*:after {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-html {
- font-size: 62.5%;
-
- -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-body {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 14px;
- line-height: 1.42857143;
- color: #333;
- background-color: #fff;
-}
-input,
-button,
-select,
-textarea {
- font-family: inherit;
- font-size: inherit;
- line-height: inherit;
-}
-a {
- color: #428bca;
- text-decoration: none;
-}
-a:hover,
-a:focus {
- color: #2a6496;
- text-decoration: underline;
-}
-a:focus {
- outline: thin dotted;
- outline: 5px auto -webkit-focus-ring-color;
- outline-offset: -2px;
-}
-figure {
- margin: 0;
-}
-img {
- vertical-align: middle;
-}
-.img-responsive,
-.thumbnail > img,
-.thumbnail a > img,
-.carousel-inner > .item > img,
-.carousel-inner > .item > a > img {
- display: block;
- max-width: 100%;
- height: auto;
-}
-.img-rounded {
- border-radius: 6px;
-}
-.img-thumbnail {
- display: inline-block;
- max-width: 100%;
- height: auto;
- padding: 4px;
- line-height: 1.42857143;
- background-color: #fff;
- border: 1px solid #ddd;
- border-radius: 4px;
- -webkit-transition: all .2s ease-in-out;
- transition: all .2s ease-in-out;
-}
-.img-circle {
- border-radius: 50%;
-}
-hr {
- margin-top: 20px;
- margin-bottom: 20px;
- border: 0;
- border-top: 1px solid #eee;
-}
-.sr-only {
- position: absolute;
- width: 1px;
- height: 1px;
- padding: 0;
- margin: -1px;
- overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6 {
- font-family: inherit;
- font-weight: 500;
- line-height: 1.1;
- color: inherit;
-}
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small,
-.h1 small,
-.h2 small,
-.h3 small,
-.h4 small,
-.h5 small,
-.h6 small,
-h1 .small,
-h2 .small,
-h3 .small,
-h4 .small,
-h5 .small,
-h6 .small,
-.h1 .small,
-.h2 .small,
-.h3 .small,
-.h4 .small,
-.h5 .small,
-.h6 .small {
- font-weight: normal;
- line-height: 1;
- color: #999;
-}
-h1,
-.h1,
-h2,
-.h2,
-h3,
-.h3 {
- margin-top: 20px;
- margin-bottom: 10px;
-}
-h1 small,
-.h1 small,
-h2 small,
-.h2 small,
-h3 small,
-.h3 small,
-h1 .small,
-.h1 .small,
-h2 .small,
-.h2 .small,
-h3 .small,
-.h3 .small {
- font-size: 65%;
-}
-h4,
-.h4,
-h5,
-.h5,
-h6,
-.h6 {
- margin-top: 10px;
- margin-bottom: 10px;
-}
-h4 small,
-.h4 small,
-h5 small,
-.h5 small,
-h6 small,
-.h6 small,
-h4 .small,
-.h4 .small,
-h5 .small,
-.h5 .small,
-h6 .small,
-.h6 .small {
- font-size: 75%;
-}
-h1,
-.h1 {
- font-size: 36px;
-}
-h2,
-.h2 {
- font-size: 30px;
-}
-h3,
-.h3 {
- font-size: 24px;
-}
-h4,
-.h4 {
- font-size: 18px;
-}
-h5,
-.h5 {
- font-size: 14px;
-}
-h6,
-.h6 {
- font-size: 12px;
-}
-p {
- margin: 0 0 10px;
-}
-.lead {
- margin-bottom: 20px;
- font-size: 16px;
- font-weight: 200;
- line-height: 1.4;
-}
-@media (min-width: 768px) {
- .lead {
- font-size: 21px;
- }
-}
-small,
-.small {
- font-size: 85%;
-}
-cite {
- font-style: normal;
-}
-.text-left {
- text-align: left;
-}
-.text-right {
- text-align: right;
-}
-.text-center {
- text-align: center;
-}
-.text-justify {
- text-align: justify;
-}
-.text-muted {
- color: #999;
-}
-.text-primary {
- color: #428bca;
-}
-a.text-primary:hover {
- color: #3071a9;
-}
-.text-success {
- color: #3c763d;
-}
-a.text-success:hover {
- color: #2b542c;
-}
-.text-info {
- color: #31708f;
-}
-a.text-info:hover {
- color: #245269;
-}
-.text-warning {
- color: #8a6d3b;
-}
-a.text-warning:hover {
- color: #66512c;
-}
-.text-danger {
- color: #a94442;
-}
-a.text-danger:hover {
- color: #843534;
-}
-.bg-primary {
- color: #fff;
- background-color: #428bca;
-}
-a.bg-primary:hover {
- background-color: #3071a9;
-}
-.bg-success {
- background-color: #dff0d8;
-}
-a.bg-success:hover {
- background-color: #c1e2b3;
-}
-.bg-info {
- background-color: #d9edf7;
-}
-a.bg-info:hover {
- background-color: #afd9ee;
-}
-.bg-warning {
- background-color: #fcf8e3;
-}
-a.bg-warning:hover {
- background-color: #f7ecb5;
-}
-.bg-danger {
- background-color: #f2dede;
-}
-a.bg-danger:hover {
- background-color: #e4b9b9;
-}
-.page-header {
- padding-bottom: 9px;
- margin: 40px 0 20px;
- border-bottom: 1px solid #eee;
-}
-ul,
-ol {
- margin-top: 0;
- margin-bottom: 10px;
-}
-ul ul,
-ol ul,
-ul ol,
-ol ol {
- margin-bottom: 0;
-}
-.list-unstyled {
- padding-left: 0;
- list-style: none;
-}
-.list-inline {
- padding-left: 0;
- margin-left: -5px;
- list-style: none;
-}
-.list-inline > li {
- display: inline-block;
- padding-right: 5px;
- padding-left: 5px;
-}
-dl {
- margin-top: 0;
- margin-bottom: 20px;
-}
-dt,
-dd {
- line-height: 1.42857143;
-}
-dt {
- font-weight: bold;
-}
-dd {
- margin-left: 0;
-}
-@media (min-width: 768px) {
- .dl-horizontal dt {
- float: left;
- width: 160px;
- overflow: hidden;
- clear: left;
- text-align: right;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
- .dl-horizontal dd {
- margin-left: 180px;
- }
-}
-abbr[title],
-abbr[data-original-title] {
- cursor: help;
- border-bottom: 1px dotted #999;
-}
-.initialism {
- font-size: 90%;
- text-transform: uppercase;
-}
-blockquote {
- padding: 10px 20px;
- margin: 0 0 20px;
- font-size: 17.5px;
- border-left: 5px solid #eee;
-}
-blockquote p:last-child,
-blockquote ul:last-child,
-blockquote ol:last-child {
- margin-bottom: 0;
-}
-blockquote footer,
-blockquote small,
-blockquote .small {
- display: block;
- font-size: 80%;
- line-height: 1.42857143;
- color: #999;
-}
-blockquote footer:before,
-blockquote small:before,
-blockquote .small:before {
- content: '\2014 \00A0';
-}
-.blockquote-reverse,
-blockquote.pull-right {
- padding-right: 15px;
- padding-left: 0;
- text-align: right;
- border-right: 5px solid #eee;
- border-left: 0;
-}
-.blockquote-reverse footer:before,
-blockquote.pull-right footer:before,
-.blockquote-reverse small:before,
-blockquote.pull-right small:before,
-.blockquote-reverse .small:before,
-blockquote.pull-right .small:before {
- content: '';
-}
-.blockquote-reverse footer:after,
-blockquote.pull-right footer:after,
-.blockquote-reverse small:after,
-blockquote.pull-right small:after,
-.blockquote-reverse .small:after,
-blockquote.pull-right .small:after {
- content: '\00A0 \2014';
-}
-blockquote:before,
-blockquote:after {
- content: "";
-}
-address {
- margin-bottom: 20px;
- font-style: normal;
- line-height: 1.42857143;
-}
-code,
-kbd,
-pre,
-samp {
- font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-}
-code {
- padding: 2px 4px;
- font-size: 90%;
- color: #c7254e;
- white-space: nowrap;
- background-color: #f9f2f4;
- border-radius: 4px;
-}
-kbd {
- padding: 2px 4px;
- font-size: 90%;
- color: #fff;
- background-color: #333;
- border-radius: 3px;
- box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
-}
-pre {
- display: block;
- padding: 9.5px;
- margin: 0 0 10px;
- font-size: 13px;
- line-height: 1.42857143;
- color: #333;
- word-break: break-all;
- word-wrap: break-word;
- background-color: #f5f5f5;
- border: 1px solid #ccc;
- border-radius: 4px;
-}
-pre code {
- padding: 0;
- font-size: inherit;
- color: inherit;
- white-space: pre-wrap;
- background-color: transparent;
- border-radius: 0;
-}
-.pre-scrollable {
- max-height: 340px;
- overflow-y: scroll;
-}
-.container {
- padding-right: 15px;
- padding-left: 15px;
- margin-right: auto;
- margin-left: auto;
-}
-@media (min-width: 768px) {
- .container {
- width: 750px;
- }
-}
-@media (min-width: 992px) {
- .container {
- width: 970px;
- }
-}
-@media (min-width: 1200px) {
- .container {
- width: 1170px;
- }
-}
-.container-fluid {
- padding-right: 15px;
- padding-left: 15px;
- margin-right: auto;
- margin-left: auto;
-}
-.row {
- margin-right: -15px;
- margin-left: -15px;
-}
-.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
- position: relative;
- min-height: 1px;
- padding-right: 15px;
- padding-left: 15px;
-}
-.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
- float: left;
-}
-.col-xs-12 {
- width: 100%;
-}
-.col-xs-11 {
- width: 91.66666667%;
-}
-.col-xs-10 {
- width: 83.33333333%;
-}
-.col-xs-9 {
- width: 75%;
-}
-.col-xs-8 {
- width: 66.66666667%;
-}
-.col-xs-7 {
- width: 58.33333333%;
-}
-.col-xs-6 {
- width: 50%;
-}
-.col-xs-5 {
- width: 41.66666667%;
-}
-.col-xs-4 {
- width: 33.33333333%;
-}
-.col-xs-3 {
- width: 25%;
-}
-.col-xs-2 {
- width: 16.66666667%;
-}
-.col-xs-1 {
- width: 8.33333333%;
-}
-.col-xs-pull-12 {
- right: 100%;
-}
-.col-xs-pull-11 {
- right: 91.66666667%;
-}
-.col-xs-pull-10 {
- right: 83.33333333%;
-}
-.col-xs-pull-9 {
- right: 75%;
-}
-.col-xs-pull-8 {
- right: 66.66666667%;
-}
-.col-xs-pull-7 {
- right: 58.33333333%;
-}
-.col-xs-pull-6 {
- right: 50%;
-}
-.col-xs-pull-5 {
- right: 41.66666667%;
-}
-.col-xs-pull-4 {
- right: 33.33333333%;
-}
-.col-xs-pull-3 {
- right: 25%;
-}
-.col-xs-pull-2 {
- right: 16.66666667%;
-}
-.col-xs-pull-1 {
- right: 8.33333333%;
-}
-.col-xs-pull-0 {
- right: 0;
-}
-.col-xs-push-12 {
- left: 100%;
-}
-.col-xs-push-11 {
- left: 91.66666667%;
-}
-.col-xs-push-10 {
- left: 83.33333333%;
-}
-.col-xs-push-9 {
- left: 75%;
-}
-.col-xs-push-8 {
- left: 66.66666667%;
-}
-.col-xs-push-7 {
- left: 58.33333333%;
-}
-.col-xs-push-6 {
- left: 50%;
-}
-.col-xs-push-5 {
- left: 41.66666667%;
-}
-.col-xs-push-4 {
- left: 33.33333333%;
-}
-.col-xs-push-3 {
- left: 25%;
-}
-.col-xs-push-2 {
- left: 16.66666667%;
-}
-.col-xs-push-1 {
- left: 8.33333333%;
-}
-.col-xs-push-0 {
- left: 0;
-}
-.col-xs-offset-12 {
- margin-left: 100%;
-}
-.col-xs-offset-11 {
- margin-left: 91.66666667%;
-}
-.col-xs-offset-10 {
- margin-left: 83.33333333%;
-}
-.col-xs-offset-9 {
- margin-left: 75%;
-}
-.col-xs-offset-8 {
- margin-left: 66.66666667%;
-}
-.col-xs-offset-7 {
- margin-left: 58.33333333%;
-}
-.col-xs-offset-6 {
- margin-left: 50%;
-}
-.col-xs-offset-5 {
- margin-left: 41.66666667%;
-}
-.col-xs-offset-4 {
- margin-left: 33.33333333%;
-}
-.col-xs-offset-3 {
- margin-left: 25%;
-}
-.col-xs-offset-2 {
- margin-left: 16.66666667%;
-}
-.col-xs-offset-1 {
- margin-left: 8.33333333%;
-}
-.col-xs-offset-0 {
- margin-left: 0;
-}
-@media (min-width: 768px) {
- .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
- float: left;
- }
- .col-sm-12 {
- width: 100%;
- }
- .col-sm-11 {
- width: 91.66666667%;
- }
- .col-sm-10 {
- width: 83.33333333%;
- }
- .col-sm-9 {
- width: 75%;
- }
- .col-sm-8 {
- width: 66.66666667%;
- }
- .col-sm-7 {
- width: 58.33333333%;
- }
- .col-sm-6 {
- width: 50%;
- }
- .col-sm-5 {
- width: 41.66666667%;
- }
- .col-sm-4 {
- width: 33.33333333%;
- }
- .col-sm-3 {
- width: 25%;
- }
- .col-sm-2 {
- width: 16.66666667%;
- }
- .col-sm-1 {
- width: 8.33333333%;
- }
- .col-sm-pull-12 {
- right: 100%;
- }
- .col-sm-pull-11 {
- right: 91.66666667%;
- }
- .col-sm-pull-10 {
- right: 83.33333333%;
- }
- .col-sm-pull-9 {
- right: 75%;
- }
- .col-sm-pull-8 {
- right: 66.66666667%;
- }
- .col-sm-pull-7 {
- right: 58.33333333%;
- }
- .col-sm-pull-6 {
- right: 50%;
- }
- .col-sm-pull-5 {
- right: 41.66666667%;
- }
- .col-sm-pull-4 {
- right: 33.33333333%;
- }
- .col-sm-pull-3 {
- right: 25%;
- }
- .col-sm-pull-2 {
- right: 16.66666667%;
- }
- .col-sm-pull-1 {
- right: 8.33333333%;
- }
- .col-sm-pull-0 {
- right: 0;
- }
- .col-sm-push-12 {
- left: 100%;
- }
- .col-sm-push-11 {
- left: 91.66666667%;
- }
- .col-sm-push-10 {
- left: 83.33333333%;
- }
- .col-sm-push-9 {
- left: 75%;
- }
- .col-sm-push-8 {
- left: 66.66666667%;
- }
- .col-sm-push-7 {
- left: 58.33333333%;
- }
- .col-sm-push-6 {
- left: 50%;
- }
- .col-sm-push-5 {
- left: 41.66666667%;
- }
- .col-sm-push-4 {
- left: 33.33333333%;
- }
- .col-sm-push-3 {
- left: 25%;
- }
- .col-sm-push-2 {
- left: 16.66666667%;
- }
- .col-sm-push-1 {
- left: 8.33333333%;
- }
- .col-sm-push-0 {
- left: 0;
- }
- .col-sm-offset-12 {
- margin-left: 100%;
- }
- .col-sm-offset-11 {
- margin-left: 91.66666667%;
- }
- .col-sm-offset-10 {
- margin-left: 83.33333333%;
- }
- .col-sm-offset-9 {
- margin-left: 75%;
- }
- .col-sm-offset-8 {
- margin-left: 66.66666667%;
- }
- .col-sm-offset-7 {
- margin-left: 58.33333333%;
- }
- .col-sm-offset-6 {
- margin-left: 50%;
- }
- .col-sm-offset-5 {
- margin-left: 41.66666667%;
- }
- .col-sm-offset-4 {
- margin-left: 33.33333333%;
- }
- .col-sm-offset-3 {
- margin-left: 25%;
- }
- .col-sm-offset-2 {
- margin-left: 16.66666667%;
- }
- .col-sm-offset-1 {
- margin-left: 8.33333333%;
- }
- .col-sm-offset-0 {
- margin-left: 0;
- }
-}
-@media (min-width: 992px) {
- .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
- float: left;
- }
- .col-md-12 {
- width: 100%;
- }
- .col-md-11 {
- width: 91.66666667%;
- }
- .col-md-10 {
- width: 83.33333333%;
- }
- .col-md-9 {
- width: 75%;
- }
- .col-md-8 {
- width: 66.66666667%;
- }
- .col-md-7 {
- width: 58.33333333%;
- }
- .col-md-6 {
- width: 50%;
- }
- .col-md-5 {
- width: 41.66666667%;
- }
- .col-md-4 {
- width: 33.33333333%;
- }
- .col-md-3 {
- width: 25%;
- }
- .col-md-2 {
- width: 16.66666667%;
- }
- .col-md-1 {
- width: 8.33333333%;
- }
- .col-md-pull-12 {
- right: 100%;
- }
- .col-md-pull-11 {
- right: 91.66666667%;
- }
- .col-md-pull-10 {
- right: 83.33333333%;
- }
- .col-md-pull-9 {
- right: 75%;
- }
- .col-md-pull-8 {
- right: 66.66666667%;
- }
- .col-md-pull-7 {
- right: 58.33333333%;
- }
- .col-md-pull-6 {
- right: 50%;
- }
- .col-md-pull-5 {
- right: 41.66666667%;
- }
- .col-md-pull-4 {
- right: 33.33333333%;
- }
- .col-md-pull-3 {
- right: 25%;
- }
- .col-md-pull-2 {
- right: 16.66666667%;
- }
- .col-md-pull-1 {
- right: 8.33333333%;
- }
- .col-md-pull-0 {
- right: 0;
- }
- .col-md-push-12 {
- left: 100%;
- }
- .col-md-push-11 {
- left: 91.66666667%;
- }
- .col-md-push-10 {
- left: 83.33333333%;
- }
- .col-md-push-9 {
- left: 75%;
- }
- .col-md-push-8 {
- left: 66.66666667%;
- }
- .col-md-push-7 {
- left: 58.33333333%;
- }
- .col-md-push-6 {
- left: 50%;
- }
- .col-md-push-5 {
- left: 41.66666667%;
- }
- .col-md-push-4 {
- left: 33.33333333%;
- }
- .col-md-push-3 {
- left: 25%;
- }
- .col-md-push-2 {
- left: 16.66666667%;
- }
- .col-md-push-1 {
- left: 8.33333333%;
- }
- .col-md-push-0 {
- left: 0;
- }
- .col-md-offset-12 {
- margin-left: 100%;
- }
- .col-md-offset-11 {
- margin-left: 91.66666667%;
- }
- .col-md-offset-10 {
- margin-left: 83.33333333%;
- }
- .col-md-offset-9 {
- margin-left: 75%;
- }
- .col-md-offset-8 {
- margin-left: 66.66666667%;
- }
- .col-md-offset-7 {
- margin-left: 58.33333333%;
- }
- .col-md-offset-6 {
- margin-left: 50%;
- }
- .col-md-offset-5 {
- margin-left: 41.66666667%;
- }
- .col-md-offset-4 {
- margin-left: 33.33333333%;
- }
- .col-md-offset-3 {
- margin-left: 25%;
- }
- .col-md-offset-2 {
- margin-left: 16.66666667%;
- }
- .col-md-offset-1 {
- margin-left: 8.33333333%;
- }
- .col-md-offset-0 {
- margin-left: 0;
- }
-}
-@media (min-width: 1200px) {
- .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
- float: left;
- }
- .col-lg-12 {
- width: 100%;
- }
- .col-lg-11 {
- width: 91.66666667%;
- }
- .col-lg-10 {
- width: 83.33333333%;
- }
- .col-lg-9 {
- width: 75%;
- }
- .col-lg-8 {
- width: 66.66666667%;
- }
- .col-lg-7 {
- width: 58.33333333%;
- }
- .col-lg-6 {
- width: 50%;
- }
- .col-lg-5 {
- width: 41.66666667%;
- }
- .col-lg-4 {
- width: 33.33333333%;
- }
- .col-lg-3 {
- width: 25%;
- }
- .col-lg-2 {
- width: 16.66666667%;
- }
- .col-lg-1 {
- width: 8.33333333%;
- }
- .col-lg-pull-12 {
- right: 100%;
- }
- .col-lg-pull-11 {
- right: 91.66666667%;
- }
- .col-lg-pull-10 {
- right: 83.33333333%;
- }
- .col-lg-pull-9 {
- right: 75%;
- }
- .col-lg-pull-8 {
- right: 66.66666667%;
- }
- .col-lg-pull-7 {
- right: 58.33333333%;
- }
- .col-lg-pull-6 {
- right: 50%;
- }
- .col-lg-pull-5 {
- right: 41.66666667%;
- }
- .col-lg-pull-4 {
- right: 33.33333333%;
- }
- .col-lg-pull-3 {
- right: 25%;
- }
- .col-lg-pull-2 {
- right: 16.66666667%;
- }
- .col-lg-pull-1 {
- right: 8.33333333%;
- }
- .col-lg-pull-0 {
- right: 0;
- }
- .col-lg-push-12 {
- left: 100%;
- }
- .col-lg-push-11 {
- left: 91.66666667%;
- }
- .col-lg-push-10 {
- left: 83.33333333%;
- }
- .col-lg-push-9 {
- left: 75%;
- }
- .col-lg-push-8 {
- left: 66.66666667%;
- }
- .col-lg-push-7 {
- left: 58.33333333%;
- }
- .col-lg-push-6 {
- left: 50%;
- }
- .col-lg-push-5 {
- left: 41.66666667%;
- }
- .col-lg-push-4 {
- left: 33.33333333%;
- }
- .col-lg-push-3 {
- left: 25%;
- }
- .col-lg-push-2 {
- left: 16.66666667%;
- }
- .col-lg-push-1 {
- left: 8.33333333%;
- }
- .col-lg-push-0 {
- left: 0;
- }
- .col-lg-offset-12 {
- margin-left: 100%;
- }
- .col-lg-offset-11 {
- margin-left: 91.66666667%;
- }
- .col-lg-offset-10 {
- margin-left: 83.33333333%;
- }
- .col-lg-offset-9 {
- margin-left: 75%;
- }
- .col-lg-offset-8 {
- margin-left: 66.66666667%;
- }
- .col-lg-offset-7 {
- margin-left: 58.33333333%;
- }
- .col-lg-offset-6 {
- margin-left: 50%;
- }
- .col-lg-offset-5 {
- margin-left: 41.66666667%;
- }
- .col-lg-offset-4 {
- margin-left: 33.33333333%;
- }
- .col-lg-offset-3 {
- margin-left: 25%;
- }
- .col-lg-offset-2 {
- margin-left: 16.66666667%;
- }
- .col-lg-offset-1 {
- margin-left: 8.33333333%;
- }
- .col-lg-offset-0 {
- margin-left: 0;
- }
-}
-table {
- max-width: 100%;
- background-color: transparent;
-}
-th {
- text-align: left;
-}
-.table {
- width: 100%;
- margin-bottom: 20px;
-}
-.table > thead > tr > th,
-.table > tbody > tr > th,
-.table > tfoot > tr > th,
-.table > thead > tr > td,
-.table > tbody > tr > td,
-.table > tfoot > tr > td {
- padding: 8px;
- line-height: 1.42857143;
- vertical-align: top;
- border-top: 1px solid #ddd;
-}
-.table > thead > tr > th {
- vertical-align: bottom;
- border-bottom: 2px solid #ddd;
-}
-.table > caption + thead > tr:first-child > th,
-.table > colgroup + thead > tr:first-child > th,
-.table > thead:first-child > tr:first-child > th,
-.table > caption + thead > tr:first-child > td,
-.table > colgroup + thead > tr:first-child > td,
-.table > thead:first-child > tr:first-child > td {
- border-top: 0;
-}
-.table > tbody + tbody {
- border-top: 2px solid #ddd;
-}
-.table .table {
- background-color: #fff;
-}
-.table-condensed > thead > tr > th,
-.table-condensed > tbody > tr > th,
-.table-condensed > tfoot > tr > th,
-.table-condensed > thead > tr > td,
-.table-condensed > tbody > tr > td,
-.table-condensed > tfoot > tr > td {
- padding: 5px;
-}
-.table-bordered {
- border: 1px solid #ddd;
-}
-.table-bordered > thead > tr > th,
-.table-bordered > tbody > tr > th,
-.table-bordered > tfoot > tr > th,
-.table-bordered > thead > tr > td,
-.table-bordered > tbody > tr > td,
-.table-bordered > tfoot > tr > td {
- border: 1px solid #ddd;
-}
-.table-bordered > thead > tr > th,
-.table-bordered > thead > tr > td {
- border-bottom-width: 2px;
-}
-.table-striped > tbody > tr:nth-child(odd) > td,
-.table-striped > tbody > tr:nth-child(odd) > th {
- background-color: #f9f9f9;
-}
-.table-hover > tbody > tr:hover > td,
-.table-hover > tbody > tr:hover > th {
- background-color: #f5f5f5;
-}
-table col[class*="col-"] {
- position: static;
- display: table-column;
- float: none;
-}
-table td[class*="col-"],
-table th[class*="col-"] {
- position: static;
- display: table-cell;
- float: none;
-}
-.table > thead > tr > td.active,
-.table > tbody > tr > td.active,
-.table > tfoot > tr > td.active,
-.table > thead > tr > th.active,
-.table > tbody > tr > th.active,
-.table > tfoot > tr > th.active,
-.table > thead > tr.active > td,
-.table > tbody > tr.active > td,
-.table > tfoot > tr.active > td,
-.table > thead > tr.active > th,
-.table > tbody > tr.active > th,
-.table > tfoot > tr.active > th {
- background-color: #f5f5f5;
-}
-.table-hover > tbody > tr > td.active:hover,
-.table-hover > tbody > tr > th.active:hover,
-.table-hover > tbody > tr.active:hover > td,
-.table-hover > tbody > tr.active:hover > th {
- background-color: #e8e8e8;
-}
-.table > thead > tr > td.success,
-.table > tbody > tr > td.success,
-.table > tfoot > tr > td.success,
-.table > thead > tr > th.success,
-.table > tbody > tr > th.success,
-.table > tfoot > tr > th.success,
-.table > thead > tr.success > td,
-.table > tbody > tr.success > td,
-.table > tfoot > tr.success > td,
-.table > thead > tr.success > th,
-.table > tbody > tr.success > th,
-.table > tfoot > tr.success > th {
- background-color: #dff0d8;
-}
-.table-hover > tbody > tr > td.success:hover,
-.table-hover > tbody > tr > th.success:hover,
-.table-hover > tbody > tr.success:hover > td,
-.table-hover > tbody > tr.success:hover > th {
- background-color: #d0e9c6;
-}
-.table > thead > tr > td.info,
-.table > tbody > tr > td.info,
-.table > tfoot > tr > td.info,
-.table > thead > tr > th.info,
-.table > tbody > tr > th.info,
-.table > tfoot > tr > th.info,
-.table > thead > tr.info > td,
-.table > tbody > tr.info > td,
-.table > tfoot > tr.info > td,
-.table > thead > tr.info > th,
-.table > tbody > tr.info > th,
-.table > tfoot > tr.info > th {
- background-color: #d9edf7;
-}
-.table-hover > tbody > tr > td.info:hover,
-.table-hover > tbody > tr > th.info:hover,
-.table-hover > tbody > tr.info:hover > td,
-.table-hover > tbody > tr.info:hover > th {
- background-color: #c4e3f3;
-}
-.table > thead > tr > td.warning,
-.table > tbody > tr > td.warning,
-.table > tfoot > tr > td.warning,
-.table > thead > tr > th.warning,
-.table > tbody > tr > th.warning,
-.table > tfoot > tr > th.warning,
-.table > thead > tr.warning > td,
-.table > tbody > tr.warning > td,
-.table > tfoot > tr.warning > td,
-.table > thead > tr.warning > th,
-.table > tbody > tr.warning > th,
-.table > tfoot > tr.warning > th {
- background-color: #fcf8e3;
-}
-.table-hover > tbody > tr > td.warning:hover,
-.table-hover > tbody > tr > th.warning:hover,
-.table-hover > tbody > tr.warning:hover > td,
-.table-hover > tbody > tr.warning:hover > th {
- background-color: #faf2cc;
-}
-.table > thead > tr > td.danger,
-.table > tbody > tr > td.danger,
-.table > tfoot > tr > td.danger,
-.table > thead > tr > th.danger,
-.table > tbody > tr > th.danger,
-.table > tfoot > tr > th.danger,
-.table > thead > tr.danger > td,
-.table > tbody > tr.danger > td,
-.table > tfoot > tr.danger > td,
-.table > thead > tr.danger > th,
-.table > tbody > tr.danger > th,
-.table > tfoot > tr.danger > th {
- background-color: #f2dede;
-}
-.table-hover > tbody > tr > td.danger:hover,
-.table-hover > tbody > tr > th.danger:hover,
-.table-hover > tbody > tr.danger:hover > td,
-.table-hover > tbody > tr.danger:hover > th {
- background-color: #ebcccc;
-}
-@media (max-width: 767px) {
- .table-responsive {
- width: 100%;
- margin-bottom: 15px;
- overflow-x: scroll;
- overflow-y: hidden;
- -webkit-overflow-scrolling: touch;
- -ms-overflow-style: -ms-autohiding-scrollbar;
- border: 1px solid #ddd;
- }
- .table-responsive > .table {
- margin-bottom: 0;
- }
- .table-responsive > .table > thead > tr > th,
- .table-responsive > .table > tbody > tr > th,
- .table-responsive > .table > tfoot > tr > th,
- .table-responsive > .table > thead > tr > td,
- .table-responsive > .table > tbody > tr > td,
- .table-responsive > .table > tfoot > tr > td {
- white-space: nowrap;
- }
- .table-responsive > .table-bordered {
- border: 0;
- }
- .table-responsive > .table-bordered > thead > tr > th:first-child,
- .table-responsive > .table-bordered > tbody > tr > th:first-child,
- .table-responsive > .table-bordered > tfoot > tr > th:first-child,
- .table-responsive > .table-bordered > thead > tr > td:first-child,
- .table-responsive > .table-bordered > tbody > tr > td:first-child,
- .table-responsive > .table-bordered > tfoot > tr > td:first-child {
- border-left: 0;
- }
- .table-responsive > .table-bordered > thead > tr > th:last-child,
- .table-responsive > .table-bordered > tbody > tr > th:last-child,
- .table-responsive > .table-bordered > tfoot > tr > th:last-child,
- .table-responsive > .table-bordered > thead > tr > td:last-child,
- .table-responsive > .table-bordered > tbody > tr > td:last-child,
- .table-responsive > .table-bordered > tfoot > tr > td:last-child {
- border-right: 0;
- }
- .table-responsive > .table-bordered > tbody > tr:last-child > th,
- .table-responsive > .table-bordered > tfoot > tr:last-child > th,
- .table-responsive > .table-bordered > tbody > tr:last-child > td,
- .table-responsive > .table-bordered > tfoot > tr:last-child > td {
- border-bottom: 0;
- }
-}
-fieldset {
- min-width: 0;
- padding: 0;
- margin: 0;
- border: 0;
-}
-legend {
- display: block;
- width: 100%;
- padding: 0;
- margin-bottom: 20px;
- font-size: 21px;
- line-height: inherit;
- color: #333;
- border: 0;
- border-bottom: 1px solid #e5e5e5;
-}
-label {
- display: inline-block;
- margin-bottom: 5px;
- font-weight: bold;
-}
-input[type="search"] {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-input[type="radio"],
-input[type="checkbox"] {
- margin: 4px 0 0;
- margin-top: 1px \9;
- /* IE8-9 */
- line-height: normal;
-}
-input[type="file"] {
- display: block;
-}
-input[type="range"] {
- display: block;
- width: 100%;
-}
-select[multiple],
-select[size] {
- height: auto;
-}
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
- outline: thin dotted;
- outline: 5px auto -webkit-focus-ring-color;
- outline-offset: -2px;
-}
-output {
- display: block;
- padding-top: 7px;
- font-size: 14px;
- line-height: 1.42857143;
- color: #555;
-}
-.form-control {
- display: block;
- width: 100%;
- height: 34px;
- padding: 6px 12px;
- font-size: 14px;
- line-height: 1.42857143;
- color: #555;
- background-color: #fff;
- background-image: none;
- border: 1px solid #ccc;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
- -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
- transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-}
-.form-control:focus {
- border-color: #66afe9;
- outline: 0;
- -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
- box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
-}
-.form-control::-moz-placeholder {
- color: #999;
- opacity: 1;
-}
-.form-control:-ms-input-placeholder {
- color: #999;
-}
-.form-control::-webkit-input-placeholder {
- color: #999;
-}
-.form-control[disabled],
-.form-control[readonly],
-fieldset[disabled] .form-control {
- cursor: not-allowed;
- background-color: #eee;
- opacity: 1;
-}
-textarea.form-control {
- height: auto;
-}
-input[type="search"] {
- -webkit-appearance: none;
-}
-input[type="date"] {
- line-height: 34px;
-}
-.form-group {
- margin-bottom: 15px;
-}
-.radio,
-.checkbox {
- display: block;
- min-height: 20px;
- padding-left: 20px;
- margin-top: 10px;
- margin-bottom: 10px;
-}
-.radio label,
-.checkbox label {
- display: inline;
- font-weight: normal;
- cursor: pointer;
-}
-.radio input[type="radio"],
-.radio-inline input[type="radio"],
-.checkbox input[type="checkbox"],
-.checkbox-inline input[type="checkbox"] {
- float: left;
- margin-left: -20px;
-}
-.radio + .radio,
-.checkbox + .checkbox {
- margin-top: -5px;
-}
-.radio-inline,
-.checkbox-inline {
- display: inline-block;
- padding-left: 20px;
- margin-bottom: 0;
- font-weight: normal;
- vertical-align: middle;
- cursor: pointer;
-}
-.radio-inline + .radio-inline,
-.checkbox-inline + .checkbox-inline {
- margin-top: 0;
- margin-left: 10px;
-}
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-.radio[disabled],
-.radio-inline[disabled],
-.checkbox[disabled],
-.checkbox-inline[disabled],
-fieldset[disabled] input[type="radio"],
-fieldset[disabled] input[type="checkbox"],
-fieldset[disabled] .radio,
-fieldset[disabled] .radio-inline,
-fieldset[disabled] .checkbox,
-fieldset[disabled] .checkbox-inline {
- cursor: not-allowed;
-}
-.input-sm {
- height: 30px;
- padding: 5px 10px;
- font-size: 12px;
- line-height: 1.5;
- border-radius: 3px;
-}
-select.input-sm {
- height: 30px;
- line-height: 30px;
-}
-textarea.input-sm,
-select[multiple].input-sm {
- height: auto;
-}
-.input-lg {
- height: 46px;
- padding: 10px 16px;
- font-size: 18px;
- line-height: 1.33;
- border-radius: 6px;
-}
-select.input-lg {
- height: 46px;
- line-height: 46px;
-}
-textarea.input-lg,
-select[multiple].input-lg {
- height: auto;
-}
-.has-feedback {
- position: relative;
-}
-.has-feedback .form-control {
- padding-right: 42.5px;
-}
-.has-feedback .form-control-feedback {
- position: absolute;
- top: 25px;
- right: 0;
- display: block;
- width: 34px;
- height: 34px;
- line-height: 34px;
- text-align: center;
-}
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline {
- color: #3c763d;
-}
-.has-success .form-control {
- border-color: #3c763d;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-}
-.has-success .form-control:focus {
- border-color: #2b542c;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
-}
-.has-success .input-group-addon {
- color: #3c763d;
- background-color: #dff0d8;
- border-color: #3c763d;
-}
-.has-success .form-control-feedback {
- color: #3c763d;
-}
-.has-warning .help-block,
-.has-warning .control-label,
-.has-warning .radio,
-.has-warning .checkbox,
-.has-warning .radio-inline,
-.has-warning .checkbox-inline {
- color: #8a6d3b;
-}
-.has-warning .form-control {
- border-color: #8a6d3b;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-}
-.has-warning .form-control:focus {
- border-color: #66512c;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
-}
-.has-warning .input-group-addon {
- color: #8a6d3b;
- background-color: #fcf8e3;
- border-color: #8a6d3b;
-}
-.has-warning .form-control-feedback {
- color: #8a6d3b;
-}
-.has-error .help-block,
-.has-error .control-label,
-.has-error .radio,
-.has-error .checkbox,
-.has-error .radio-inline,
-.has-error .checkbox-inline {
- color: #a94442;
-}
-.has-error .form-control {
- border-color: #a94442;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-}
-.has-error .form-control:focus {
- border-color: #843534;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
-}
-.has-error .input-group-addon {
- color: #a94442;
- background-color: #f2dede;
- border-color: #a94442;
-}
-.has-error .form-control-feedback {
- color: #a94442;
-}
-.form-control-static {
- margin-bottom: 0;
-}
-.help-block {
- display: block;
- margin-top: 5px;
- margin-bottom: 10px;
- color: #737373;
-}
-@media (min-width: 768px) {
- .form-inline .form-group {
- display: inline-block;
- margin-bottom: 0;
- vertical-align: middle;
- }
- .form-inline .form-control {
- display: inline-block;
- width: auto;
- vertical-align: middle;
- }
- .form-inline .input-group > .form-control {
- width: 100%;
- }
- .form-inline .control-label {
- margin-bottom: 0;
- vertical-align: middle;
- }
- .form-inline .radio,
- .form-inline .checkbox {
- display: inline-block;
- padding-left: 0;
- margin-top: 0;
- margin-bottom: 0;
- vertical-align: middle;
- }
- .form-inline .radio input[type="radio"],
- .form-inline .checkbox input[type="checkbox"] {
- float: none;
- margin-left: 0;
- }
- .form-inline .has-feedback .form-control-feedback {
- top: 0;
- }
-}
-.form-horizontal .control-label,
-.form-horizontal .radio,
-.form-horizontal .checkbox,
-.form-horizontal .radio-inline,
-.form-horizontal .checkbox-inline {
- padding-top: 7px;
- margin-top: 0;
- margin-bottom: 0;
-}
-.form-horizontal .radio,
-.form-horizontal .checkbox {
- min-height: 27px;
-}
-.form-horizontal .form-group {
- margin-right: -15px;
- margin-left: -15px;
-}
-.form-horizontal .form-control-static {
- padding-top: 7px;
-}
-@media (min-width: 768px) {
- .form-horizontal .control-label {
- text-align: right;
- }
-}
-.form-horizontal .has-feedback .form-control-feedback {
- top: 0;
- right: 15px;
-}
-.btn {
- display: inline-block;
- padding: 6px 12px;
- margin-bottom: 0;
- font-size: 14px;
- font-weight: normal;
- line-height: 1.42857143;
- text-align: center;
- white-space: nowrap;
- vertical-align: middle;
- cursor: pointer;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- background-image: none;
- border: 1px solid transparent;
- border-radius: 4px;
-}
-.btn:focus,
-.btn:active:focus,
-.btn.active:focus {
- outline: thin dotted;
- outline: 5px auto -webkit-focus-ring-color;
- outline-offset: -2px;
-}
-.btn:hover,
-.btn:focus {
- color: #333;
- text-decoration: none;
-}
-.btn:active,
-.btn.active {
- background-image: none;
- outline: 0;
- -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
- box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn.disabled,
-.btn[disabled],
-fieldset[disabled] .btn {
- pointer-events: none;
- cursor: not-allowed;
- filter: alpha(opacity=65);
- -webkit-box-shadow: none;
- box-shadow: none;
- opacity: .65;
-}
-.btn-default {
- color: #333;
- background-color: #fff;
- border-color: #ccc;
-}
-.btn-default:hover,
-.btn-default:focus,
-.btn-default:active,
-.btn-default.active,
-.open .dropdown-toggle.btn-default {
- color: #333;
- background-color: #ebebeb;
- border-color: #adadad;
-}
-.btn-default:active,
-.btn-default.active,
-.open .dropdown-toggle.btn-default {
- background-image: none;
-}
-.btn-default.disabled,
-.btn-default[disabled],
-fieldset[disabled] .btn-default,
-.btn-default.disabled:hover,
-.btn-default[disabled]:hover,
-fieldset[disabled] .btn-default:hover,
-.btn-default.disabled:focus,
-.btn-default[disabled]:focus,
-fieldset[disabled] .btn-default:focus,
-.btn-default.disabled:active,
-.btn-default[disabled]:active,
-fieldset[disabled] .btn-default:active,
-.btn-default.disabled.active,
-.btn-default[disabled].active,
-fieldset[disabled] .btn-default.active {
- background-color: #fff;
- border-color: #ccc;
-}
-.btn-default .badge {
- color: #fff;
- background-color: #333;
-}
-.btn-primary {
- color: #fff;
- background-color: #428bca;
- border-color: #357ebd;
-}
-.btn-primary:hover,
-.btn-primary:focus,
-.btn-primary:active,
-.btn-primary.active,
-.open .dropdown-toggle.btn-primary {
- color: #fff;
- background-color: #3276b1;
- border-color: #285e8e;
-}
-.btn-primary:active,
-.btn-primary.active,
-.open .dropdown-toggle.btn-primary {
- background-image: none;
-}
-.btn-primary.disabled,
-.btn-primary[disabled],
-fieldset[disabled] .btn-primary,
-.btn-primary.disabled:hover,
-.btn-primary[disabled]:hover,
-fieldset[disabled] .btn-primary:hover,
-.btn-primary.disabled:focus,
-.btn-primary[disabled]:focus,
-fieldset[disabled] .btn-primary:focus,
-.btn-primary.disabled:active,
-.btn-primary[disabled]:active,
-fieldset[disabled] .btn-primary:active,
-.btn-primary.disabled.active,
-.btn-primary[disabled].active,
-fieldset[disabled] .btn-primary.active {
- background-color: #428bca;
- border-color: #357ebd;
-}
-.btn-primary .badge {
- color: #428bca;
- background-color: #fff;
-}
-.btn-success {
- color: #fff;
- background-color: #5cb85c;
- border-color: #4cae4c;
-}
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
- color: #fff;
- background-color: #47a447;
- border-color: #398439;
-}
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
- background-image: none;
-}
-.btn-success.disabled,
-.btn-success[disabled],
-fieldset[disabled] .btn-success,
-.btn-success.disabled:hover,
-.btn-success[disabled]:hover,
-fieldset[disabled] .btn-success:hover,
-.btn-success.disabled:focus,
-.btn-success[disabled]:focus,
-fieldset[disabled] .btn-success:focus,
-.btn-success.disabled:active,
-.btn-success[disabled]:active,
-fieldset[disabled] .btn-success:active,
-.btn-success.disabled.active,
-.btn-success[disabled].active,
-fieldset[disabled] .btn-success.active {
- background-color: #5cb85c;
- border-color: #4cae4c;
-}
-.btn-success .badge {
- color: #5cb85c;
- background-color: #fff;
-}
-.btn-info {
- color: #fff;
- background-color: #5bc0de;
- border-color: #46b8da;
-}
-.btn-info:hover,
-.btn-info:focus,
-.btn-info:active,
-.btn-info.active,
-.open .dropdown-toggle.btn-info {
- color: #fff;
- background-color: #39b3d7;
- border-color: #269abc;
-}
-.btn-info:active,
-.btn-info.active,
-.open .dropdown-toggle.btn-info {
- background-image: none;
-}
-.btn-info.disabled,
-.btn-info[disabled],
-fieldset[disabled] .btn-info,
-.btn-info.disabled:hover,
-.btn-info[disabled]:hover,
-fieldset[disabled] .btn-info:hover,
-.btn-info.disabled:focus,
-.btn-info[disabled]:focus,
-fieldset[disabled] .btn-info:focus,
-.btn-info.disabled:active,
-.btn-info[disabled]:active,
-fieldset[disabled] .btn-info:active,
-.btn-info.disabled.active,
-.btn-info[disabled].active,
-fieldset[disabled] .btn-info.active {
- background-color: #5bc0de;
- border-color: #46b8da;
-}
-.btn-info .badge {
- color: #5bc0de;
- background-color: #fff;
-}
-.btn-warning {
- color: #fff;
- background-color: #f0ad4e;
- border-color: #eea236;
-}
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
- color: #fff;
- background-color: #ed9c28;
- border-color: #d58512;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
- background-image: none;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
- background-color: #f0ad4e;
- border-color: #eea236;
-}
-.btn-warning .badge {
- color: #f0ad4e;
- background-color: #fff;
-}
-.btn-danger {
- color: #fff;
- background-color: #d9534f;
- border-color: #d43f3a;
-}
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
- color: #fff;
- background-color: #d2322d;
- border-color: #ac2925;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
- background-image: none;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
- background-color: #d9534f;
- border-color: #d43f3a;
-}
-.btn-danger .badge {
- color: #d9534f;
- background-color: #fff;
-}
-.btn-link {
- font-weight: normal;
- color: #428bca;
- cursor: pointer;
- border-radius: 0;
-}
-.btn-link,
-.btn-link:active,
-.btn-link[disabled],
-fieldset[disabled] .btn-link {
- background-color: transparent;
- -webkit-box-shadow: none;
- box-shadow: none;
-}
-.btn-link,
-.btn-link:hover,
-.btn-link:focus,
-.btn-link:active {
- border-color: transparent;
-}
-.btn-link:hover,
-.btn-link:focus {
- color: #2a6496;
- text-decoration: underline;
- background-color: transparent;
-}
-.btn-link[disabled]:hover,
-fieldset[disabled] .btn-link:hover,
-.btn-link[disabled]:focus,
-fieldset[disabled] .btn-link:focus {
- color: #999;
- text-decoration: none;
-}
-.btn-lg,
-.btn-group-lg > .btn {
- padding: 10px 16px;
- font-size: 18px;
- line-height: 1.33;
- border-radius: 6px;
-}
-.btn-sm,
-.btn-group-sm > .btn {
- padding: 5px 10px;
- font-size: 12px;
- line-height: 1.5;
- border-radius: 3px;
-}
-.btn-xs,
-.btn-group-xs > .btn {
- padding: 1px 5px;
- font-size: 12px;
- line-height: 1.5;
- border-radius: 3px;
-}
-.btn-block {
- display: block;
- width: 100%;
- padding-right: 0;
- padding-left: 0;
-}
-.btn-block + .btn-block {
- margin-top: 5px;
-}
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
- width: 100%;
-}
-.fade {
- opacity: 0;
- -webkit-transition: opacity .15s linear;
- transition: opacity .15s linear;
-}
-.fade.in {
- opacity: 1;
-}
-.collapse {
- display: none;
-}
-.collapse.in {
- display: block;
-}
-.collapsing {
- position: relative;
- height: 0;
- overflow: hidden;
- -webkit-transition: height .35s ease;
- transition: height .35s ease;
-}
-@font-face {
- font-family: 'Glyphicons Halflings';
-
- src: url('../fonts/glyphicons-halflings-regular.eot');
- src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
-}
-.glyphicon {
- position: relative;
- top: 1px;
- display: inline-block;
- font-family: 'Glyphicons Halflings';
- font-style: normal;
- font-weight: normal;
- line-height: 1;
-
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-.glyphicon-asterisk:before {
- content: "\2a";
-}
-.glyphicon-plus:before {
- content: "\2b";
-}
-.glyphicon-euro:before {
- content: "\20ac";
-}
-.glyphicon-minus:before {
- content: "\2212";
-}
-.glyphicon-cloud:before {
- content: "\2601";
-}
-.glyphicon-envelope:before {
- content: "\2709";
-}
-.glyphicon-pencil:before {
- content: "\270f";
-}
-.glyphicon-glass:before {
- content: "\e001";
-}
-.glyphicon-music:before {
- content: "\e002";
-}
-.glyphicon-search:before {
- content: "\e003";
-}
-.glyphicon-heart:before {
- content: "\e005";
-}
-.glyphicon-star:before {
- content: "\e006";
-}
-.glyphicon-star-empty:before {
- content: "\e007";
-}
-.glyphicon-user:before {
- content: "\e008";
-}
-.glyphicon-film:before {
- content: "\e009";
-}
-.glyphicon-th-large:before {
- content: "\e010";
-}
-.glyphicon-th:before {
- content: "\e011";
-}
-.glyphicon-th-list:before {
- content: "\e012";
-}
-.glyphicon-ok:before {
- content: "\e013";
-}
-.glyphicon-remove:before {
- content: "\e014";
-}
-.glyphicon-zoom-in:before {
- content: "\e015";
-}
-.glyphicon-zoom-out:before {
- content: "\e016";
-}
-.glyphicon-off:before {
- content: "\e017";
-}
-.glyphicon-signal:before {
- content: "\e018";
-}
-.glyphicon-cog:before {
- content: "\e019";
-}
-.glyphicon-trash:before {
- content: "\e020";
-}
-.glyphicon-home:before {
- content: "\e021";
-}
-.glyphicon-file:before {
- content: "\e022";
-}
-.glyphicon-time:before {
- content: "\e023";
-}
-.glyphicon-road:before {
- content: "\e024";
-}
-.glyphicon-download-alt:before {
- content: "\e025";
-}
-.glyphicon-download:before {
- content: "\e026";
-}
-.glyphicon-upload:before {
- content: "\e027";
-}
-.glyphicon-inbox:before {
- content: "\e028";
-}
-.glyphicon-play-circle:before {
- content: "\e029";
-}
-.glyphicon-repeat:before {
- content: "\e030";
-}
-.glyphicon-refresh:before {
- content: "\e031";
-}
-.glyphicon-list-alt:before {
- content: "\e032";
-}
-.glyphicon-lock:before {
- content: "\e033";
-}
-.glyphicon-flag:before {
- content: "\e034";
-}
-.glyphicon-headphones:before {
- content: "\e035";
-}
-.glyphicon-volume-off:before {
- content: "\e036";
-}
-.glyphicon-volume-down:before {
- content: "\e037";
-}
-.glyphicon-volume-up:before {
- content: "\e038";
-}
-.glyphicon-qrcode:before {
- content: "\e039";
-}
-.glyphicon-barcode:before {
- content: "\e040";
-}
-.glyphicon-tag:before {
- content: "\e041";
-}
-.glyphicon-tags:before {
- content: "\e042";
-}
-.glyphicon-book:before {
- content: "\e043";
-}
-.glyphicon-bookmark:before {
- content: "\e044";
-}
-.glyphicon-print:before {
- content: "\e045";
-}
-.glyphicon-camera:before {
- content: "\e046";
-}
-.glyphicon-font:before {
- content: "\e047";
-}
-.glyphicon-bold:before {
- content: "\e048";
-}
-.glyphicon-italic:before {
- content: "\e049";
-}
-.glyphicon-text-height:before {
- content: "\e050";
-}
-.glyphicon-text-width:before {
- content: "\e051";
-}
-.glyphicon-align-left:before {
- content: "\e052";
-}
-.glyphicon-align-center:before {
- content: "\e053";
-}
-.glyphicon-align-right:before {
- content: "\e054";
-}
-.glyphicon-align-justify:before {
- content: "\e055";
-}
-.glyphicon-list:before {
- content: "\e056";
-}
-.glyphicon-indent-left:before {
- content: "\e057";
-}
-.glyphicon-indent-right:before {
- content: "\e058";
-}
-.glyphicon-facetime-video:before {
- content: "\e059";
-}
-.glyphicon-picture:before {
- content: "\e060";
-}
-.glyphicon-map-marker:before {
- content: "\e062";
-}
-.glyphicon-adjust:before {
- content: "\e063";
-}
-.glyphicon-tint:before {
- content: "\e064";
-}
-.glyphicon-edit:before {
- content: "\e065";
-}
-.glyphicon-share:before {
- content: "\e066";
-}
-.glyphicon-check:before {
- content: "\e067";
-}
-.glyphicon-move:before {
- content: "\e068";
-}
-.glyphicon-step-backward:before {
- content: "\e069";
-}
-.glyphicon-fast-backward:before {
- content: "\e070";
-}
-.glyphicon-backward:before {
- content: "\e071";
-}
-.glyphicon-play:before {
- content: "\e072";
-}
-.glyphicon-pause:before {
- content: "\e073";
-}
-.glyphicon-stop:before {
- content: "\e074";
-}
-.glyphicon-forward:before {
- content: "\e075";
-}
-.glyphicon-fast-forward:before {
- content: "\e076";
-}
-.glyphicon-step-forward:before {
- content: "\e077";
-}
-.glyphicon-eject:before {
- content: "\e078";
-}
-.glyphicon-chevron-left:before {
- content: "\e079";
-}
-.glyphicon-chevron-right:before {
- content: "\e080";
-}
-.glyphicon-plus-sign:before {
- content: "\e081";
-}
-.glyphicon-minus-sign:before {
- content: "\e082";
-}
-.glyphicon-remove-sign:before {
- content: "\e083";
-}
-.glyphicon-ok-sign:before {
- content: "\e084";
-}
-.glyphicon-question-sign:before {
- content: "\e085";
-}
-.glyphicon-info-sign:before {
- content: "\e086";
-}
-.glyphicon-screenshot:before {
- content: "\e087";
-}
-.glyphicon-remove-circle:before {
- content: "\e088";
-}
-.glyphicon-ok-circle:before {
- content: "\e089";
-}
-.glyphicon-ban-circle:before {
- content: "\e090";
-}
-.glyphicon-arrow-left:before {
- content: "\e091";
-}
-.glyphicon-arrow-right:before {
- content: "\e092";
-}
-.glyphicon-arrow-up:before {
- content: "\e093";
-}
-.glyphicon-arrow-down:before {
- content: "\e094";
-}
-.glyphicon-share-alt:before {
- content: "\e095";
-}
-.glyphicon-resize-full:before {
- content: "\e096";
-}
-.glyphicon-resize-small:before {
- content: "\e097";
-}
-.glyphicon-exclamation-sign:before {
- content: "\e101";
-}
-.glyphicon-gift:before {
- content: "\e102";
-}
-.glyphicon-leaf:before {
- content: "\e103";
-}
-.glyphicon-fire:before {
- content: "\e104";
-}
-.glyphicon-eye-open:before {
- content: "\e105";
-}
-.glyphicon-eye-close:before {
- content: "\e106";
-}
-.glyphicon-warning-sign:before {
- content: "\e107";
-}
-.glyphicon-plane:before {
- content: "\e108";
-}
-.glyphicon-calendar:before {
- content: "\e109";
-}
-.glyphicon-random:before {
- content: "\e110";
-}
-.glyphicon-comment:before {
- content: "\e111";
-}
-.glyphicon-magnet:before {
- content: "\e112";
-}
-.glyphicon-chevron-up:before {
- content: "\e113";
-}
-.glyphicon-chevron-down:before {
- content: "\e114";
-}
-.glyphicon-retweet:before {
- content: "\e115";
-}
-.glyphicon-shopping-cart:before {
- content: "\e116";
-}
-.glyphicon-folder-close:before {
- content: "\e117";
-}
-.glyphicon-folder-open:before {
- content: "\e118";
-}
-.glyphicon-resize-vertical:before {
- content: "\e119";
-}
-.glyphicon-resize-horizontal:before {
- content: "\e120";
-}
-.glyphicon-hdd:before {
- content: "\e121";
-}
-.glyphicon-bullhorn:before {
- content: "\e122";
-}
-.glyphicon-bell:before {
- content: "\e123";
-}
-.glyphicon-certificate:before {
- content: "\e124";
-}
-.glyphicon-thumbs-up:before {
- content: "\e125";
-}
-.glyphicon-thumbs-down:before {
- content: "\e126";
-}
-.glyphicon-hand-right:before {
- content: "\e127";
-}
-.glyphicon-hand-left:before {
- content: "\e128";
-}
-.glyphicon-hand-up:before {
- content: "\e129";
-}
-.glyphicon-hand-down:before {
- content: "\e130";
-}
-.glyphicon-circle-arrow-right:before {
- content: "\e131";
-}
-.glyphicon-circle-arrow-left:before {
- content: "\e132";
-}
-.glyphicon-circle-arrow-up:before {
- content: "\e133";
-}
-.glyphicon-circle-arrow-down:before {
- content: "\e134";
-}
-.glyphicon-globe:before {
- content: "\e135";
-}
-.glyphicon-wrench:before {
- content: "\e136";
-}
-.glyphicon-tasks:before {
- content: "\e137";
-}
-.glyphicon-filter:before {
- content: "\e138";
-}
-.glyphicon-briefcase:before {
- content: "\e139";
-}
-.glyphicon-fullscreen:before {
- content: "\e140";
-}
-.glyphicon-dashboard:before {
- content: "\e141";
-}
-.glyphicon-paperclip:before {
- content: "\e142";
-}
-.glyphicon-heart-empty:before {
- content: "\e143";
-}
-.glyphicon-link:before {
- content: "\e144";
-}
-.glyphicon-phone:before {
- content: "\e145";
-}
-.glyphicon-pushpin:before {
- content: "\e146";
-}
-.glyphicon-usd:before {
- content: "\e148";
-}
-.glyphicon-gbp:before {
- content: "\e149";
-}
-.glyphicon-sort:before {
- content: "\e150";
-}
-.glyphicon-sort-by-alphabet:before {
- content: "\e151";
-}
-.glyphicon-sort-by-alphabet-alt:before {
- content: "\e152";
-}
-.glyphicon-sort-by-order:before {
- content: "\e153";
-}
-.glyphicon-sort-by-order-alt:before {
- content: "\e154";
-}
-.glyphicon-sort-by-attributes:before {
- content: "\e155";
-}
-.glyphicon-sort-by-attributes-alt:before {
- content: "\e156";
-}
-.glyphicon-unchecked:before {
- content: "\e157";
-}
-.glyphicon-expand:before {
- content: "\e158";
-}
-.glyphicon-collapse-down:before {
- content: "\e159";
-}
-.glyphicon-collapse-up:before {
- content: "\e160";
-}
-.glyphicon-log-in:before {
- content: "\e161";
-}
-.glyphicon-flash:before {
- content: "\e162";
-}
-.glyphicon-log-out:before {
- content: "\e163";
-}
-.glyphicon-new-window:before {
- content: "\e164";
-}
-.glyphicon-record:before {
- content: "\e165";
-}
-.glyphicon-save:before {
- content: "\e166";
-}
-.glyphicon-open:before {
- content: "\e167";
-}
-.glyphicon-saved:before {
- content: "\e168";
-}
-.glyphicon-import:before {
- content: "\e169";
-}
-.glyphicon-export:before {
- content: "\e170";
-}
-.glyphicon-send:before {
- content: "\e171";
-}
-.glyphicon-floppy-disk:before {
- content: "\e172";
-}
-.glyphicon-floppy-saved:before {
- content: "\e173";
-}
-.glyphicon-floppy-remove:before {
- content: "\e174";
-}
-.glyphicon-floppy-save:before {
- content: "\e175";
-}
-.glyphicon-floppy-open:before {
- content: "\e176";
-}
-.glyphicon-credit-card:before {
- content: "\e177";
-}
-.glyphicon-transfer:before {
- content: "\e178";
-}
-.glyphicon-cutlery:before {
- content: "\e179";
-}
-.glyphicon-header:before {
- content: "\e180";
-}
-.glyphicon-compressed:before {
- content: "\e181";
-}
-.glyphicon-earphone:before {
- content: "\e182";
-}
-.glyphicon-phone-alt:before {
- content: "\e183";
-}
-.glyphicon-tower:before {
- content: "\e184";
-}
-.glyphicon-stats:before {
- content: "\e185";
-}
-.glyphicon-sd-video:before {
- content: "\e186";
-}
-.glyphicon-hd-video:before {
- content: "\e187";
-}
-.glyphicon-subtitles:before {
- content: "\e188";
-}
-.glyphicon-sound-stereo:before {
- content: "\e189";
-}
-.glyphicon-sound-dolby:before {
- content: "\e190";
-}
-.glyphicon-sound-5-1:before {
- content: "\e191";
-}
-.glyphicon-sound-6-1:before {
- content: "\e192";
-}
-.glyphicon-sound-7-1:before {
- content: "\e193";
-}
-.glyphicon-copyright-mark:before {
- content: "\e194";
-}
-.glyphicon-registration-mark:before {
- content: "\e195";
-}
-.glyphicon-cloud-download:before {
- content: "\e197";
-}
-.glyphicon-cloud-upload:before {
- content: "\e198";
-}
-.glyphicon-tree-conifer:before {
- content: "\e199";
-}
-.glyphicon-tree-deciduous:before {
- content: "\e200";
-}
-.caret {
- display: inline-block;
- width: 0;
- height: 0;
- margin-left: 2px;
- vertical-align: middle;
- border-top: 4px solid;
- border-right: 4px solid transparent;
- border-left: 4px solid transparent;
-}
-.dropdown {
- position: relative;
-}
-.dropdown-toggle:focus {
- outline: 0;
-}
-.dropdown-menu {
- position: absolute;
- top: 100%;
- left: 0;
- z-index: 1000;
- display: none;
- float: left;
- min-width: 160px;
- padding: 5px 0;
- margin: 2px 0 0;
- font-size: 14px;
- list-style: none;
- background-color: #fff;
- background-clip: padding-box;
- border: 1px solid #ccc;
- border: 1px solid rgba(0, 0, 0, .15);
- border-radius: 4px;
- -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
- box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-}
-.dropdown-menu.pull-right {
- right: 0;
- left: auto;
-}
-.dropdown-menu .divider {
- height: 1px;
- margin: 9px 0;
- overflow: hidden;
- background-color: #e5e5e5;
-}
-.dropdown-menu > li > a {
- display: block;
- padding: 3px 20px;
- clear: both;
- font-weight: normal;
- line-height: 1.42857143;
- color: #333;
- white-space: nowrap;
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
- color: #262626;
- text-decoration: none;
- background-color: #f5f5f5;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
- color: #fff;
- text-decoration: none;
- background-color: #428bca;
- outline: 0;
-}
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
- color: #999;
-}
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
- text-decoration: none;
- cursor: not-allowed;
- background-color: transparent;
- background-image: none;
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-}
-.open > .dropdown-menu {
- display: block;
-}
-.open > a {
- outline: 0;
-}
-.dropdown-menu-right {
- right: 0;
- left: auto;
-}
-.dropdown-menu-left {
- right: auto;
- left: 0;
-}
-.dropdown-header {
- display: block;
- padding: 3px 20px;
- font-size: 12px;
- line-height: 1.42857143;
- color: #999;
-}
-.dropdown-backdrop {
- position: fixed;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- z-index: 990;
-}
-.pull-right > .dropdown-menu {
- right: 0;
- left: auto;
-}
-.dropup .caret,
-.navbar-fixed-bottom .dropdown .caret {
- content: "";
- border-top: 0;
- border-bottom: 4px solid;
-}
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
- top: auto;
- bottom: 100%;
- margin-bottom: 1px;
-}
-@media (min-width: 768px) {
- .navbar-right .dropdown-menu {
- right: 0;
- left: auto;
- }
- .navbar-right .dropdown-menu-left {
- right: auto;
- left: 0;
- }
-}
-.btn-group,
-.btn-group-vertical {
- position: relative;
- display: inline-block;
- vertical-align: middle;
-}
-.btn-group > .btn,
-.btn-group-vertical > .btn {
- position: relative;
- float: left;
-}
-.btn-group > .btn:hover,
-.btn-group-vertical > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group-vertical > .btn:focus,
-.btn-group > .btn:active,
-.btn-group-vertical > .btn:active,
-.btn-group > .btn.active,
-.btn-group-vertical > .btn.active {
- z-index: 2;
-}
-.btn-group > .btn:focus,
-.btn-group-vertical > .btn:focus {
- outline: none;
-}
-.btn-group .btn + .btn,
-.btn-group .btn + .btn-group,
-.btn-group .btn-group + .btn,
-.btn-group .btn-group + .btn-group {
- margin-left: -1px;
-}
-.btn-toolbar {
- margin-left: -5px;
-}
-.btn-toolbar .btn-group,
-.btn-toolbar .input-group {
- float: left;
-}
-.btn-toolbar > .btn,
-.btn-toolbar > .btn-group,
-.btn-toolbar > .input-group {
- margin-left: 5px;
-}
-.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
- border-radius: 0;
-}
-.btn-group > .btn:first-child {
- margin-left: 0;
-}
-.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-.btn-group > .btn:last-child:not(:first-child),
-.btn-group > .dropdown-toggle:not(:first-child) {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-.btn-group > .btn-group {
- float: left;
-}
-.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
- border-radius: 0;
-}
-.btn-group > .btn-group:first-child > .btn:last-child,
-.btn-group > .btn-group:first-child > .dropdown-toggle {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-.btn-group > .btn-group:last-child > .btn:first-child {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
- outline: 0;
-}
-.btn-group > .btn + .dropdown-toggle {
- padding-right: 8px;
- padding-left: 8px;
-}
-.btn-group > .btn-lg + .dropdown-toggle {
- padding-right: 12px;
- padding-left: 12px;
-}
-.btn-group.open .dropdown-toggle {
- -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
- box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-}
-.btn-group.open .dropdown-toggle.btn-link {
- -webkit-box-shadow: none;
- box-shadow: none;
-}
-.btn .caret {
- margin-left: 0;
-}
-.btn-lg .caret {
- border-width: 5px 5px 0;
- border-bottom-width: 0;
-}
-.dropup .btn-lg .caret {
- border-width: 0 5px 5px;
-}
-.btn-group-vertical > .btn,
-.btn-group-vertical > .btn-group,
-.btn-group-vertical > .btn-group > .btn {
- display: block;
- float: none;
- width: 100%;
- max-width: 100%;
-}
-.btn-group-vertical > .btn-group > .btn {
- float: none;
-}
-.btn-group-vertical > .btn + .btn,
-.btn-group-vertical > .btn + .btn-group,
-.btn-group-vertical > .btn-group + .btn,
-.btn-group-vertical > .btn-group + .btn-group {
- margin-top: -1px;
- margin-left: 0;
-}
-.btn-group-vertical > .btn:not(:first-child):not(:last-child) {
- border-radius: 0;
-}
-.btn-group-vertical > .btn:first-child:not(:last-child) {
- border-top-right-radius: 4px;
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 0;
-}
-.btn-group-vertical > .btn:last-child:not(:first-child) {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- border-bottom-left-radius: 4px;
-}
-.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
- border-radius: 0;
-}
-.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 0;
-}
-.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
- border-top-left-radius: 0;
- border-top-right-radius: 0;
-}
-.btn-group-justified {
- display: table;
- width: 100%;
- table-layout: fixed;
- border-collapse: separate;
-}
-.btn-group-justified > .btn,
-.btn-group-justified > .btn-group {
- display: table-cell;
- float: none;
- width: 1%;
-}
-.btn-group-justified > .btn-group .btn {
- width: 100%;
-}
-[data-toggle="buttons"] > .btn > input[type="radio"],
-[data-toggle="buttons"] > .btn > input[type="checkbox"] {
- display: none;
-}
-.input-group {
- position: relative;
- display: table;
- border-collapse: separate;
-}
-.input-group[class*="col-"] {
- float: none;
- padding-right: 0;
- padding-left: 0;
-}
-.input-group .form-control {
- position: relative;
- z-index: 2;
- float: left;
- width: 100%;
- margin-bottom: 0;
-}
-.input-group-lg > .form-control,
-.input-group-lg > .input-group-addon,
-.input-group-lg > .input-group-btn > .btn {
- height: 46px;
- padding: 10px 16px;
- font-size: 18px;
- line-height: 1.33;
- border-radius: 6px;
-}
-select.input-group-lg > .form-control,
-select.input-group-lg > .input-group-addon,
-select.input-group-lg > .input-group-btn > .btn {
- height: 46px;
- line-height: 46px;
-}
-textarea.input-group-lg > .form-control,
-textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn,
-select[multiple].input-group-lg > .form-control,
-select[multiple].input-group-lg > .input-group-addon,
-select[multiple].input-group-lg > .input-group-btn > .btn {
- height: auto;
-}
-.input-group-sm > .form-control,
-.input-group-sm > .input-group-addon,
-.input-group-sm > .input-group-btn > .btn {
- height: 30px;
- padding: 5px 10px;
- font-size: 12px;
- line-height: 1.5;
- border-radius: 3px;
-}
-select.input-group-sm > .form-control,
-select.input-group-sm > .input-group-addon,
-select.input-group-sm > .input-group-btn > .btn {
- height: 30px;
- line-height: 30px;
-}
-textarea.input-group-sm > .form-control,
-textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn,
-select[multiple].input-group-sm > .form-control,
-select[multiple].input-group-sm > .input-group-addon,
-select[multiple].input-group-sm > .input-group-btn > .btn {
- height: auto;
-}
-.input-group-addon,
-.input-group-btn,
-.input-group .form-control {
- display: table-cell;
-}
-.input-group-addon:not(:first-child):not(:last-child),
-.input-group-btn:not(:first-child):not(:last-child),
-.input-group .form-control:not(:first-child):not(:last-child) {
- border-radius: 0;
-}
-.input-group-addon,
-.input-group-btn {
- width: 1%;
- white-space: nowrap;
- vertical-align: middle;
-}
-.input-group-addon {
- padding: 6px 12px;
- font-size: 14px;
- font-weight: normal;
- line-height: 1;
- color: #555;
- text-align: center;
- background-color: #eee;
- border: 1px solid #ccc;
- border-radius: 4px;
-}
-.input-group-addon.input-sm {
- padding: 5px 10px;
- font-size: 12px;
- border-radius: 3px;
-}
-.input-group-addon.input-lg {
- padding: 10px 16px;
- font-size: 18px;
- border-radius: 6px;
-}
-.input-group-addon input[type="radio"],
-.input-group-addon input[type="checkbox"] {
- margin-top: 0;
-}
-.input-group .form-control:first-child,
-.input-group-addon:first-child,
-.input-group-btn:first-child > .btn,
-.input-group-btn:first-child > .btn-group > .btn,
-.input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
-.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
- border-top-right-radius: 0;
- border-bottom-right-radius: 0;
-}
-.input-group-addon:first-child {
- border-right: 0;
-}
-.input-group .form-control:last-child,
-.input-group-addon:last-child,
-.input-group-btn:last-child > .btn,
-.input-group-btn:last-child > .btn-group > .btn,
-.input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child),
-.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
- border-top-left-radius: 0;
- border-bottom-left-radius: 0;
-}
-.input-group-addon:last-child {
- border-left: 0;
-}
-.input-group-btn {
- position: relative;
- font-size: 0;
- white-space: nowrap;
-}
-.input-group-btn > .btn {
- position: relative;
-}
-.input-group-btn > .btn + .btn {
- margin-left: -1px;
-}
-.input-group-btn > .btn:hover,
-.input-group-btn > .btn:focus,
-.input-group-btn > .btn:active {
- z-index: 2;
-}
-.input-group-btn:first-child > .btn,
-.input-group-btn:first-child > .btn-group {
- margin-right: -1px;
-}
-.input-group-btn:last-child > .btn,
-.input-group-btn:last-child > .btn-group {
- margin-left: -1px;
-}
-.nav {
- padding-left: 0;
- margin-bottom: 0;
- list-style: none;
-}
-.nav > li {
- position: relative;
- display: block;
-}
-.nav > li > a {
- position: relative;
- display: block;
- padding: 10px 15px;
-}
-.nav > li > a:hover,
-.nav > li > a:focus {
- text-decoration: none;
- background-color: #eee;
-}
-.nav > li.disabled > a {
- color: #999;
-}
-.nav > li.disabled > a:hover,
-.nav > li.disabled > a:focus {
- color: #999;
- text-decoration: none;
- cursor: not-allowed;
- background-color: transparent;
-}
-.nav .open > a,
-.nav .open > a:hover,
-.nav .open > a:focus {
- background-color: #eee;
- border-color: #428bca;
-}
-.nav .nav-divider {
- height: 1px;
- margin: 9px 0;
- overflow: hidden;
- background-color: #e5e5e5;
-}
-.nav > li > a > img {
- max-width: none;
-}
-.nav-tabs {
- border-bottom: 1px solid #ddd;
-}
-.nav-tabs > li {
- float: left;
- margin-bottom: -1px;
-}
-.nav-tabs > li > a {
- margin-right: 2px;
- line-height: 1.42857143;
- border: 1px solid transparent;
- border-radius: 4px 4px 0 0;
-}
-.nav-tabs > li > a:hover {
- border-color: #eee #eee #ddd;
-}
-.nav-tabs > li.active > a,
-.nav-tabs > li.active > a:hover,
-.nav-tabs > li.active > a:focus {
- color: #555;
- cursor: default;
- background-color: #fff;
- border: 1px solid #ddd;
- border-bottom-color: transparent;
-}
-.nav-tabs.nav-justified {
- width: 100%;
- border-bottom: 0;
-}
-.nav-tabs.nav-justified > li {
- float: none;
-}
-.nav-tabs.nav-justified > li > a {
- margin-bottom: 5px;
- text-align: center;
-}
-.nav-tabs.nav-justified > .dropdown .dropdown-menu {
- top: auto;
- left: auto;
-}
-@media (min-width: 768px) {
- .nav-tabs.nav-justified > li {
- display: table-cell;
- width: 1%;
- }
- .nav-tabs.nav-justified > li > a {
- margin-bottom: 0;
- }
-}
-.nav-tabs.nav-justified > li > a {
- margin-right: 0;
- border-radius: 4px;
-}
-.nav-tabs.nav-justified > .active > a,
-.nav-tabs.nav-justified > .active > a:hover,
-.nav-tabs.nav-justified > .active > a:focus {
- border: 1px solid #ddd;
-}
-@media (min-width: 768px) {
- .nav-tabs.nav-justified > li > a {
- border-bottom: 1px solid #ddd;
- border-radius: 4px 4px 0 0;
- }
- .nav-tabs.nav-justified > .active > a,
- .nav-tabs.nav-justified > .active > a:hover,
- .nav-tabs.nav-justified > .active > a:focus {
- border-bottom-color: #fff;
- }
-}
-.nav-pills > li {
- float: left;
-}
-.nav-pills > li > a {
- border-radius: 4px;
-}
-.nav-pills > li + li {
- margin-left: 2px;
-}
-.nav-pills > li.active > a,
-.nav-pills > li.active > a:hover,
-.nav-pills > li.active > a:focus {
- color: #fff;
- background-color: #428bca;
-}
-.nav-stacked > li {
- float: none;
-}
-.nav-stacked > li + li {
- margin-top: 2px;
- margin-left: 0;
-}
-.nav-justified {
- width: 100%;
-}
-.nav-justified > li {
- float: none;
-}
-.nav-justified > li > a {
- margin-bottom: 5px;
- text-align: center;
-}
-.nav-justified > .dropdown .dropdown-menu {
- top: auto;
- left: auto;
-}
-@media (min-width: 768px) {
- .nav-justified > li {
- display: table-cell;
- width: 1%;
- }
- .nav-justified > li > a {
- margin-bottom: 0;
- }
-}
-.nav-tabs-justified {
- border-bottom: 0;
-}
-.nav-tabs-justified > li > a {
- margin-right: 0;
- border-radius: 4px;
-}
-.nav-tabs-justified > .active > a,
-.nav-tabs-justified > .active > a:hover,
-.nav-tabs-justified > .active > a:focus {
- border: 1px solid #ddd;
-}
-@media (min-width: 768px) {
- .nav-tabs-justified > li > a {
- border-bottom: 1px solid #ddd;
- border-radius: 4px 4px 0 0;
- }
- .nav-tabs-justified > .active > a,
- .nav-tabs-justified > .active > a:hover,
- .nav-tabs-justified > .active > a:focus {
- border-bottom-color: #fff;
- }
-}
-.tab-content > .tab-pane {
- display: none;
-}
-.tab-content > .active {
- display: block;
-}
-.nav-tabs .dropdown-menu {
- margin-top: -1px;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
-}
-.navbar {
- position: relative;
- min-height: 50px;
- margin-bottom: 20px;
- border: 1px solid transparent;
-}
-@media (min-width: 768px) {
- .navbar {
- border-radius: 4px;
- }
-}
-@media (min-width: 768px) {
- .navbar-header {
- float: left;
- }
-}
-.navbar-collapse {
- max-height: 340px;
- padding-right: 15px;
- padding-left: 15px;
- overflow-x: visible;
- -webkit-overflow-scrolling: touch;
- border-top: 1px solid transparent;
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
-}
-.navbar-collapse.in {
- overflow-y: auto;
-}
-@media (min-width: 768px) {
- .navbar-collapse {
- width: auto;
- border-top: 0;
- box-shadow: none;
- }
- .navbar-collapse.collapse {
- display: block !important;
- height: auto !important;
- padding-bottom: 0;
- overflow: visible !important;
- }
- .navbar-collapse.in {
- overflow-y: visible;
- }
- .navbar-fixed-top .navbar-collapse,
- .navbar-static-top .navbar-collapse,
- .navbar-fixed-bottom .navbar-collapse {
- padding-right: 0;
- padding-left: 0;
- }
-}
-.container > .navbar-header,
-.container-fluid > .navbar-header,
-.container > .navbar-collapse,
-.container-fluid > .navbar-collapse {
- margin-right: -15px;
- margin-left: -15px;
-}
-@media (min-width: 768px) {
- .container > .navbar-header,
- .container-fluid > .navbar-header,
- .container > .navbar-collapse,
- .container-fluid > .navbar-collapse {
- margin-right: 0;
- margin-left: 0;
- }
-}
-.navbar-static-top {
- z-index: 1000;
- border-width: 0 0 1px;
-}
-@media (min-width: 768px) {
- .navbar-static-top {
- border-radius: 0;
- }
-}
-.navbar-fixed-top,
-.navbar-fixed-bottom {
- position: fixed;
- right: 0;
- left: 0;
- z-index: 1030;
-}
-@media (min-width: 768px) {
- .navbar-fixed-top,
- .navbar-fixed-bottom {
- border-radius: 0;
- }
-}
-.navbar-fixed-top {
- top: 0;
- border-width: 0 0 1px;
-}
-.navbar-fixed-bottom {
- bottom: 0;
- margin-bottom: 0;
- border-width: 1px 0 0;
-}
-.navbar-brand {
- float: left;
- height: 50px;
- padding: 15px 15px;
- font-size: 18px;
- line-height: 20px;
-}
-.navbar-brand:hover,
-.navbar-brand:focus {
- text-decoration: none;
-}
-@media (min-width: 768px) {
- .navbar > .container .navbar-brand,
- .navbar > .container-fluid .navbar-brand {
- margin-left: -15px;
- }
-}
-.navbar-toggle {
- position: relative;
- float: right;
- padding: 9px 10px;
- margin-top: 8px;
- margin-right: 15px;
- margin-bottom: 8px;
- background-color: transparent;
- background-image: none;
- border: 1px solid transparent;
- border-radius: 4px;
-}
-.navbar-toggle:focus {
- outline: none;
-}
-.navbar-toggle .icon-bar {
- display: block;
- width: 22px;
- height: 2px;
- border-radius: 1px;
-}
-.navbar-toggle .icon-bar + .icon-bar {
- margin-top: 4px;
-}
-@media (min-width: 768px) {
- .navbar-toggle {
- display: none;
- }
-}
-.navbar-nav {
- margin: 7.5px -15px;
-}
-.navbar-nav > li > a {
- padding-top: 10px;
- padding-bottom: 10px;
- line-height: 20px;
-}
-@media (max-width: 767px) {
- .navbar-nav .open .dropdown-menu {
- position: static;
- float: none;
- width: auto;
- margin-top: 0;
- background-color: transparent;
- border: 0;
- box-shadow: none;
- }
- .navbar-nav .open .dropdown-menu > li > a,
- .navbar-nav .open .dropdown-menu .dropdown-header {
- padding: 5px 15px 5px 25px;
- }
- .navbar-nav .open .dropdown-menu > li > a {
- line-height: 20px;
- }
- .navbar-nav .open .dropdown-menu > li > a:hover,
- .navbar-nav .open .dropdown-menu > li > a:focus {
- background-image: none;
- }
-}
-@media (min-width: 768px) {
- .navbar-nav {
- float: left;
- margin: 0;
- }
- .navbar-nav > li {
- float: left;
- }
- .navbar-nav > li > a {
- padding-top: 15px;
- padding-bottom: 15px;
- }
- .navbar-nav.navbar-right:last-child {
- margin-right: -15px;
- }
-}
-@media (min-width: 768px) {
- .navbar-left {
- float: left !important;
- }
- .navbar-right {
- float: right !important;
- }
-}
-.navbar-form {
- padding: 10px 15px;
- margin-top: 8px;
- margin-right: -15px;
- margin-bottom: 8px;
- margin-left: -15px;
- border-top: 1px solid transparent;
- border-bottom: 1px solid transparent;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
-}
-@media (min-width: 768px) {
- .navbar-form .form-group {
- display: inline-block;
- margin-bottom: 0;
- vertical-align: middle;
- }
- .navbar-form .form-control {
- display: inline-block;
- width: auto;
- vertical-align: middle;
- }
- .navbar-form .input-group > .form-control {
- width: 100%;
- }
- .navbar-form .control-label {
- margin-bottom: 0;
- vertical-align: middle;
- }
- .navbar-form .radio,
- .navbar-form .checkbox {
- display: inline-block;
- padding-left: 0;
- margin-top: 0;
- margin-bottom: 0;
- vertical-align: middle;
- }
- .navbar-form .radio input[type="radio"],
- .navbar-form .checkbox input[type="checkbox"] {
- float: none;
- margin-left: 0;
- }
- .navbar-form .has-feedback .form-control-feedback {
- top: 0;
- }
-}
-@media (max-width: 767px) {
- .navbar-form .form-group {
- margin-bottom: 5px;
- }
-}
-@media (min-width: 768px) {
- .navbar-form {
- width: auto;
- padding-top: 0;
- padding-bottom: 0;
- margin-right: 0;
- margin-left: 0;
- border: 0;
- -webkit-box-shadow: none;
- box-shadow: none;
- }
- .navbar-form.navbar-right:last-child {
- margin-right: -15px;
- }
-}
-.navbar-nav > li > .dropdown-menu {
- margin-top: 0;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
-}
-.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
- border-bottom-right-radius: 0;
- border-bottom-left-radius: 0;
-}
-.navbar-btn {
- margin-top: 8px;
- margin-bottom: 8px;
-}
-.navbar-btn.btn-sm {
- margin-top: 10px;
- margin-bottom: 10px;
-}
-.navbar-btn.btn-xs {
- margin-top: 14px;
- margin-bottom: 14px;
-}
-.navbar-text {
- margin-top: 15px;
- margin-bottom: 15px;
-}
-@media (min-width: 768px) {
- .navbar-text {
- float: left;
- margin-right: 15px;
- margin-left: 15px;
- }
- .navbar-text.navbar-right:last-child {
- margin-right: 0;
- }
-}
-.navbar-default {
- background-color: #f8f8f8;
- border-color: #e7e7e7;
-}
-.navbar-default .navbar-brand {
- color: #777;
-}
-.navbar-default .navbar-brand:hover,
-.navbar-default .navbar-brand:focus {
- color: #5e5e5e;
- background-color: transparent;
-}
-.navbar-default .navbar-text {
- color: #777;
-}
-.navbar-default .navbar-nav > li > a {
- color: #777;
-}
-.navbar-default .navbar-nav > li > a:hover,
-.navbar-default .navbar-nav > li > a:focus {
- color: #333;
- background-color: transparent;
-}
-.navbar-default .navbar-nav > .active > a,
-.navbar-default .navbar-nav > .active > a:hover,
-.navbar-default .navbar-nav > .active > a:focus {
- color: #555;
- background-color: #e7e7e7;
-}
-.navbar-default .navbar-nav > .disabled > a,
-.navbar-default .navbar-nav > .disabled > a:hover,
-.navbar-default .navbar-nav > .disabled > a:focus {
- color: #ccc;
- background-color: transparent;
-}
-.navbar-default .navbar-toggle {
- border-color: #ddd;
-}
-.navbar-default .navbar-toggle:hover,
-.navbar-default .navbar-toggle:focus {
- background-color: #ddd;
-}
-.navbar-default .navbar-toggle .icon-bar {
- background-color: #888;
-}
-.navbar-default .navbar-collapse,
-.navbar-default .navbar-form {
- border-color: #e7e7e7;
-}
-.navbar-default .navbar-nav > .open > a,
-.navbar-default .navbar-nav > .open > a:hover,
-.navbar-default .navbar-nav > .open > a:focus {
- color: #555;
- background-color: #e7e7e7;
-}
-@media (max-width: 767px) {
- .navbar-default .navbar-nav .open .dropdown-menu > li > a {
- color: #777;
- }
- .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
- .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
- color: #333;
- background-color: transparent;
- }
- .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
- .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
- .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
- color: #555;
- background-color: #e7e7e7;
- }
- .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
- .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
- .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
- color: #ccc;
- background-color: transparent;
- }
-}
-.navbar-default .navbar-link {
- color: #777;
-}
-.navbar-default .navbar-link:hover {
- color: #333;
-}
-.navbar-inverse {
- background-color: #222;
- border-color: #080808;
-}
-.navbar-inverse .navbar-brand {
- color: #999;
-}
-.navbar-inverse .navbar-brand:hover,
-.navbar-inverse .navbar-brand:focus {
- color: #fff;
- background-color: transparent;
-}
-.navbar-inverse .navbar-text {
- color: #999;
-}
-.navbar-inverse .navbar-nav > li > a {
- color: #999;
-}
-.navbar-inverse .navbar-nav > li > a:hover,
-.navbar-inverse .navbar-nav > li > a:focus {
- color: #fff;
- background-color: transparent;
-}
-.navbar-inverse .navbar-nav > .active > a,
-.navbar-inverse .navbar-nav > .active > a:hover,
-.navbar-inverse .navbar-nav > .active > a:focus {
- color: #fff;
- background-color: #080808;
-}
-.navbar-inverse .navbar-nav > .disabled > a,
-.navbar-inverse .navbar-nav > .disabled > a:hover,
-.navbar-inverse .navbar-nav > .disabled > a:focus {
- color: #444;
- background-color: transparent;
-}
-.navbar-inverse .navbar-toggle {
- border-color: #333;
-}
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
- background-color: #333;
-}
-.navbar-inverse .navbar-toggle .icon-bar {
- background-color: #fff;
-}
-.navbar-inverse .navbar-collapse,
-.navbar-inverse .navbar-form {
- border-color: #101010;
-}
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
- color: #fff;
- background-color: #080808;
-}
-@media (max-width: 767px) {
- .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
- border-color: #080808;
- }
- .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
- background-color: #080808;
- }
- .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
- color: #999;
- }
- .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
- .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
- color: #fff;
- background-color: transparent;
- }
- .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
- .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
- .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
- color: #fff;
- background-color: #080808;
- }
- .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
- .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
- .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
- color: #444;
- background-color: transparent;
- }
-}
-.navbar-inverse .navbar-link {
- color: #999;
-}
-.navbar-inverse .navbar-link:hover {
- color: #fff;
-}
-.breadcrumb {
- padding: 8px 15px;
- margin-bottom: 20px;
- list-style: none;
- background-color: #f5f5f5;
- border-radius: 4px;
-}
-.breadcrumb > li {
- display: inline-block;
-}
-.breadcrumb > li + li:before {
- padding: 0 5px;
- color: #ccc;
- content: "/\00a0";
-}
-.breadcrumb > .active {
- color: #999;
-}
-.pagination {
- display: inline-block;
- padding-left: 0;
- margin: 20px 0;
- border-radius: 4px;
-}
-.pagination > li {
- display: inline;
-}
-.pagination > li > a,
-.pagination > li > span {
- position: relative;
- float: left;
- padding: 6px 12px;
- margin-left: -1px;
- line-height: 1.42857143;
- color: #428bca;
- text-decoration: none;
- background-color: #fff;
- border: 1px solid #ddd;
-}
-.pagination > li:first-child > a,
-.pagination > li:first-child > span {
- margin-left: 0;
- border-top-left-radius: 4px;
- border-bottom-left-radius: 4px;
-}
-.pagination > li:last-child > a,
-.pagination > li:last-child > span {
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
-}
-.pagination > li > a:hover,
-.pagination > li > span:hover,
-.pagination > li > a:focus,
-.pagination > li > span:focus {
- color: #2a6496;
- background-color: #eee;
- border-color: #ddd;
-}
-.pagination > .active > a,
-.pagination > .active > span,
-.pagination > .active > a:hover,
-.pagination > .active > span:hover,
-.pagination > .active > a:focus,
-.pagination > .active > span:focus {
- z-index: 2;
- color: #fff;
- cursor: default;
- background-color: #428bca;
- border-color: #428bca;
-}
-.pagination > .disabled > span,
-.pagination > .disabled > span:hover,
-.pagination > .disabled > span:focus,
-.pagination > .disabled > a,
-.pagination > .disabled > a:hover,
-.pagination > .disabled > a:focus {
- color: #999;
- cursor: not-allowed;
- background-color: #fff;
- border-color: #ddd;
-}
-.pagination-lg > li > a,
-.pagination-lg > li > span {
- padding: 10px 16px;
- font-size: 18px;
-}
-.pagination-lg > li:first-child > a,
-.pagination-lg > li:first-child > span {
- border-top-left-radius: 6px;
- border-bottom-left-radius: 6px;
-}
-.pagination-lg > li:last-child > a,
-.pagination-lg > li:last-child > span {
- border-top-right-radius: 6px;
- border-bottom-right-radius: 6px;
-}
-.pagination-sm > li > a,
-.pagination-sm > li > span {
- padding: 5px 10px;
- font-size: 12px;
-}
-.pagination-sm > li:first-child > a,
-.pagination-sm > li:first-child > span {
- border-top-left-radius: 3px;
- border-bottom-left-radius: 3px;
-}
-.pagination-sm > li:last-child > a,
-.pagination-sm > li:last-child > span {
- border-top-right-radius: 3px;
- border-bottom-right-radius: 3px;
-}
-.pager {
- padding-left: 0;
- margin: 20px 0;
- text-align: center;
- list-style: none;
-}
-.pager li {
- display: inline;
-}
-.pager li > a,
-.pager li > span {
- display: inline-block;
- padding: 5px 14px;
- background-color: #fff;
- border: 1px solid #ddd;
- border-radius: 15px;
-}
-.pager li > a:hover,
-.pager li > a:focus {
- text-decoration: none;
- background-color: #eee;
-}
-.pager .next > a,
-.pager .next > span {
- float: right;
-}
-.pager .previous > a,
-.pager .previous > span {
- float: left;
-}
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
- color: #999;
- cursor: not-allowed;
- background-color: #fff;
-}
-.label {
- display: inline;
- padding: .2em .6em .3em;
- font-size: 75%;
- font-weight: bold;
- line-height: 1;
- color: #fff;
- text-align: center;
- white-space: nowrap;
- vertical-align: baseline;
- border-radius: .25em;
-}
-.label[href]:hover,
-.label[href]:focus {
- color: #fff;
- text-decoration: none;
- cursor: pointer;
-}
-.label:empty {
- display: none;
-}
-.btn .label {
- position: relative;
- top: -1px;
-}
-.label-default {
- background-color: #999;
-}
-.label-default[href]:hover,
-.label-default[href]:focus {
- background-color: #808080;
-}
-.label-primary {
- background-color: #428bca;
-}
-.label-primary[href]:hover,
-.label-primary[href]:focus {
- background-color: #3071a9;
-}
-.label-success {
- background-color: #5cb85c;
-}
-.label-success[href]:hover,
-.label-success[href]:focus {
- background-color: #449d44;
-}
-.label-info {
- background-color: #5bc0de;
-}
-.label-info[href]:hover,
-.label-info[href]:focus {
- background-color: #31b0d5;
-}
-.label-warning {
- background-color: #f0ad4e;
-}
-.label-warning[href]:hover,
-.label-warning[href]:focus {
- background-color: #ec971f;
-}
-.label-danger {
- background-color: #d9534f;
-}
-.label-danger[href]:hover,
-.label-danger[href]:focus {
- background-color: #c9302c;
-}
-.badge {
- display: inline-block;
- min-width: 10px;
- padding: 3px 7px;
- font-size: 12px;
- font-weight: bold;
- line-height: 1;
- color: #fff;
- text-align: center;
- white-space: nowrap;
- vertical-align: baseline;
- background-color: #999;
- border-radius: 10px;
-}
-.badge:empty {
- display: none;
-}
-.btn .badge {
- position: relative;
- top: -1px;
-}
-.btn-xs .badge {
- top: 0;
- padding: 1px 5px;
-}
-a.badge:hover,
-a.badge:focus {
- color: #fff;
- text-decoration: none;
- cursor: pointer;
-}
-a.list-group-item.active > .badge,
-.nav-pills > .active > a > .badge {
- color: #428bca;
- background-color: #fff;
-}
-.nav-pills > li > a > .badge {
- margin-left: 3px;
-}
-.jumbotron {
- padding: 30px;
- margin-bottom: 30px;
- color: inherit;
- background-color: #eee;
-}
-.jumbotron h1,
-.jumbotron .h1 {
- color: inherit;
-}
-.jumbotron p {
- margin-bottom: 15px;
- font-size: 21px;
- font-weight: 200;
-}
-.container .jumbotron {
- border-radius: 6px;
-}
-.jumbotron .container {
- max-width: 100%;
-}
-@media screen and (min-width: 768px) {
- .jumbotron {
- padding-top: 48px;
- padding-bottom: 48px;
- }
- .container .jumbotron {
- padding-right: 60px;
- padding-left: 60px;
- }
- .jumbotron h1,
- .jumbotron .h1 {
- font-size: 63px;
- }
-}
-.thumbnail {
- display: block;
- padding: 4px;
- margin-bottom: 20px;
- line-height: 1.42857143;
- background-color: #fff;
- border: 1px solid #ddd;
- border-radius: 4px;
- -webkit-transition: all .2s ease-in-out;
- transition: all .2s ease-in-out;
-}
-.thumbnail > img,
-.thumbnail a > img {
- margin-right: auto;
- margin-left: auto;
-}
-a.thumbnail:hover,
-a.thumbnail:focus,
-a.thumbnail.active {
- border-color: #428bca;
-}
-.thumbnail .caption {
- padding: 9px;
- color: #333;
-}
-.alert {
- padding: 15px;
- margin-bottom: 20px;
- border: 1px solid transparent;
- border-radius: 4px;
-}
-.alert h4 {
- margin-top: 0;
- color: inherit;
-}
-.alert .alert-link {
- font-weight: bold;
-}
-.alert > p,
-.alert > ul {
- margin-bottom: 0;
-}
-.alert > p + p {
- margin-top: 5px;
-}
-.alert-dismissable {
- padding-right: 35px;
-}
-.alert-dismissable .close {
- position: relative;
- top: -2px;
- right: -21px;
- color: inherit;
-}
-.alert-success {
- color: #3c763d;
- background-color: #dff0d8;
- border-color: #d6e9c6;
-}
-.alert-success hr {
- border-top-color: #c9e2b3;
-}
-.alert-success .alert-link {
- color: #2b542c;
-}
-.alert-info {
- color: #31708f;
- background-color: #d9edf7;
- border-color: #bce8f1;
-}
-.alert-info hr {
- border-top-color: #a6e1ec;
-}
-.alert-info .alert-link {
- color: #245269;
-}
-.alert-warning {
- color: #8a6d3b;
- background-color: #fcf8e3;
- border-color: #faebcc;
-}
-.alert-warning hr {
- border-top-color: #f7e1b5;
-}
-.alert-warning .alert-link {
- color: #66512c;
-}
-.alert-danger {
- color: #a94442;
- background-color: #f2dede;
- border-color: #ebccd1;
-}
-.alert-danger hr {
- border-top-color: #e4b9c0;
-}
-.alert-danger .alert-link {
- color: #843534;
-}
-@-webkit-keyframes progress-bar-stripes {
- from {
- background-position: 40px 0;
- }
- to {
- background-position: 0 0;
- }
-}
-@keyframes progress-bar-stripes {
- from {
- background-position: 40px 0;
- }
- to {
- background-position: 0 0;
- }
-}
-.progress {
- height: 20px;
- margin-bottom: 20px;
- overflow: hidden;
- background-color: #f5f5f5;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
-}
-.progress-bar {
- float: left;
- width: 0;
- height: 100%;
- font-size: 12px;
- line-height: 20px;
- color: #fff;
- text-align: center;
- background-color: #428bca;
- -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
- box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
- -webkit-transition: width .6s ease;
- transition: width .6s ease;
-}
-.progress-striped .progress-bar {
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
- background-size: 40px 40px;
-}
-.progress.active .progress-bar {
- -webkit-animation: progress-bar-stripes 2s linear infinite;
- animation: progress-bar-stripes 2s linear infinite;
-}
-.progress-bar-success {
- background-color: #5cb85c;
-}
-.progress-striped .progress-bar-success {
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.progress-bar-info {
- background-color: #5bc0de;
-}
-.progress-striped .progress-bar-info {
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.progress-bar-warning {
- background-color: #f0ad4e;
-}
-.progress-striped .progress-bar-warning {
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.progress-bar-danger {
- background-color: #d9534f;
-}
-.progress-striped .progress-bar-danger {
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-}
-.media,
-.media-body {
- overflow: hidden;
- zoom: 1;
-}
-.media,
-.media .media {
- margin-top: 15px;
-}
-.media:first-child {
- margin-top: 0;
-}
-.media-object {
- display: block;
-}
-.media-heading {
- margin: 0 0 5px;
-}
-.media > .pull-left {
- margin-right: 10px;
-}
-.media > .pull-right {
- margin-left: 10px;
-}
-.media-list {
- padding-left: 0;
- list-style: none;
-}
-.list-group {
- padding-left: 0;
- margin-bottom: 20px;
-}
-.list-group-item {
- position: relative;
- display: block;
- padding: 10px 15px;
- margin-bottom: -1px;
- background-color: #fff;
- border: 1px solid #ddd;
-}
-.list-group-item:first-child {
- border-top-left-radius: 4px;
- border-top-right-radius: 4px;
-}
-.list-group-item:last-child {
- margin-bottom: 0;
- border-bottom-right-radius: 4px;
- border-bottom-left-radius: 4px;
-}
-.list-group-item > .badge {
- float: right;
-}
-.list-group-item > .badge + .badge {
- margin-right: 5px;
-}
-a.list-group-item {
- color: #555;
-}
-a.list-group-item .list-group-item-heading {
- color: #333;
-}
-a.list-group-item:hover,
-a.list-group-item:focus {
- text-decoration: none;
- background-color: #f5f5f5;
-}
-a.list-group-item.active,
-a.list-group-item.active:hover,
-a.list-group-item.active:focus {
- z-index: 2;
- color: #fff;
- background-color: #428bca;
- border-color: #428bca;
-}
-a.list-group-item.active .list-group-item-heading,
-a.list-group-item.active:hover .list-group-item-heading,
-a.list-group-item.active:focus .list-group-item-heading {
- color: inherit;
-}
-a.list-group-item.active .list-group-item-text,
-a.list-group-item.active:hover .list-group-item-text,
-a.list-group-item.active:focus .list-group-item-text {
- color: #e1edf7;
-}
-.list-group-item-success {
- color: #3c763d;
- background-color: #dff0d8;
-}
-a.list-group-item-success {
- color: #3c763d;
-}
-a.list-group-item-success .list-group-item-heading {
- color: inherit;
-}
-a.list-group-item-success:hover,
-a.list-group-item-success:focus {
- color: #3c763d;
- background-color: #d0e9c6;
-}
-a.list-group-item-success.active,
-a.list-group-item-success.active:hover,
-a.list-group-item-success.active:focus {
- color: #fff;
- background-color: #3c763d;
- border-color: #3c763d;
-}
-.list-group-item-info {
- color: #31708f;
- background-color: #d9edf7;
-}
-a.list-group-item-info {
- color: #31708f;
-}
-a.list-group-item-info .list-group-item-heading {
- color: inherit;
-}
-a.list-group-item-info:hover,
-a.list-group-item-info:focus {
- color: #31708f;
- background-color: #c4e3f3;
-}
-a.list-group-item-info.active,
-a.list-group-item-info.active:hover,
-a.list-group-item-info.active:focus {
- color: #fff;
- background-color: #31708f;
- border-color: #31708f;
-}
-.list-group-item-warning {
- color: #8a6d3b;
- background-color: #fcf8e3;
-}
-a.list-group-item-warning {
- color: #8a6d3b;
-}
-a.list-group-item-warning .list-group-item-heading {
- color: inherit;
-}
-a.list-group-item-warning:hover,
-a.list-group-item-warning:focus {
- color: #8a6d3b;
- background-color: #faf2cc;
-}
-a.list-group-item-warning.active,
-a.list-group-item-warning.active:hover,
-a.list-group-item-warning.active:focus {
- color: #fff;
- background-color: #8a6d3b;
- border-color: #8a6d3b;
-}
-.list-group-item-danger {
- color: #a94442;
- background-color: #f2dede;
-}
-a.list-group-item-danger {
- color: #a94442;
-}
-a.list-group-item-danger .list-group-item-heading {
- color: inherit;
-}
-a.list-group-item-danger:hover,
-a.list-group-item-danger:focus {
- color: #a94442;
- background-color: #ebcccc;
-}
-a.list-group-item-danger.active,
-a.list-group-item-danger.active:hover,
-a.list-group-item-danger.active:focus {
- color: #fff;
- background-color: #a94442;
- border-color: #a94442;
-}
-.list-group-item-heading {
- margin-top: 0;
- margin-bottom: 5px;
-}
-.list-group-item-text {
- margin-bottom: 0;
- line-height: 1.3;
-}
-.panel {
- margin-bottom: 20px;
- background-color: #fff;
- border: 1px solid transparent;
- border-radius: 4px;
- -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
- box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
-}
-.panel-body {
- padding: 15px;
-}
-.panel-heading {
- padding: 10px 15px;
- border-bottom: 1px solid transparent;
- border-top-left-radius: 3px;
- border-top-right-radius: 3px;
-}
-.panel-heading > .dropdown .dropdown-toggle {
- color: inherit;
-}
-.panel-title {
- margin-top: 0;
- margin-bottom: 0;
- font-size: 16px;
- color: inherit;
-}
-.panel-title > a {
- color: inherit;
-}
-.panel-footer {
- padding: 10px 15px;
- background-color: #f5f5f5;
- border-top: 1px solid #ddd;
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
-}
-.panel > .list-group {
- margin-bottom: 0;
-}
-.panel > .list-group .list-group-item {
- border-width: 1px 0;
- border-radius: 0;
-}
-.panel > .list-group:first-child .list-group-item:first-child {
- border-top: 0;
- border-top-left-radius: 3px;
- border-top-right-radius: 3px;
-}
-.panel > .list-group:last-child .list-group-item:last-child {
- border-bottom: 0;
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
-}
-.panel-heading + .list-group .list-group-item:first-child {
- border-top-width: 0;
-}
-.panel > .table,
-.panel > .table-responsive > .table {
- margin-bottom: 0;
-}
-.panel > .table:first-child,
-.panel > .table-responsive:first-child > .table:first-child {
- border-top-left-radius: 3px;
- border-top-right-radius: 3px;
-}
-.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
-.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
- border-top-left-radius: 3px;
-}
-.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
-.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
-.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
-.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
-.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
- border-top-right-radius: 3px;
-}
-.panel > .table:last-child,
-.panel > .table-responsive:last-child > .table:last-child {
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
-}
-.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
-.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
- border-bottom-left-radius: 3px;
-}
-.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
-.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
-.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
-.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
- border-bottom-right-radius: 3px;
-}
-.panel > .panel-body + .table,
-.panel > .panel-body + .table-responsive {
- border-top: 1px solid #ddd;
-}
-.panel > .table > tbody:first-child > tr:first-child th,
-.panel > .table > tbody:first-child > tr:first-child td {
- border-top: 0;
-}
-.panel > .table-bordered,
-.panel > .table-responsive > .table-bordered {
- border: 0;
-}
-.panel > .table-bordered > thead > tr > th:first-child,
-.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
-.panel > .table-bordered > tbody > tr > th:first-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,
-.panel > .table-bordered > tfoot > tr > th:first-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,
-.panel > .table-bordered > thead > tr > td:first-child,
-.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,
-.panel > .table-bordered > tbody > tr > td:first-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
-.panel > .table-bordered > tfoot > tr > td:first-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
- border-left: 0;
-}
-.panel > .table-bordered > thead > tr > th:last-child,
-.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
-.panel > .table-bordered > tbody > tr > th:last-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,
-.panel > .table-bordered > tfoot > tr > th:last-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,
-.panel > .table-bordered > thead > tr > td:last-child,
-.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,
-.panel > .table-bordered > tbody > tr > td:last-child,
-.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
-.panel > .table-bordered > tfoot > tr > td:last-child,
-.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
- border-right: 0;
-}
-.panel > .table-bordered > thead > tr:first-child > td,
-.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
-.panel > .table-bordered > tbody > tr:first-child > td,
-.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
-.panel > .table-bordered > thead > tr:first-child > th,
-.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
-.panel > .table-bordered > tbody > tr:first-child > th,
-.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {
- border-bottom: 0;
-}
-.panel > .table-bordered > tbody > tr:last-child > td,
-.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
-.panel > .table-bordered > tfoot > tr:last-child > td,
-.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,
-.panel > .table-bordered > tbody > tr:last-child > th,
-.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
-.panel > .table-bordered > tfoot > tr:last-child > th,
-.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {
- border-bottom: 0;
-}
-.panel > .table-responsive {
- margin-bottom: 0;
- border: 0;
-}
-.panel-group {
- margin-bottom: 20px;
-}
-.panel-group .panel {
- margin-bottom: 0;
- overflow: hidden;
- border-radius: 4px;
-}
-.panel-group .panel + .panel {
- margin-top: 5px;
-}
-.panel-group .panel-heading {
- border-bottom: 0;
-}
-.panel-group .panel-heading + .panel-collapse .panel-body {
- border-top: 1px solid #ddd;
-}
-.panel-group .panel-footer {
- border-top: 0;
-}
-.panel-group .panel-footer + .panel-collapse .panel-body {
- border-bottom: 1px solid #ddd;
-}
-.panel-default {
- border-color: #ddd;
-}
-.panel-default > .panel-heading {
- color: #333;
- background-color: #f5f5f5;
- border-color: #ddd;
-}
-.panel-default > .panel-heading + .panel-collapse .panel-body {
- border-top-color: #ddd;
-}
-.panel-default > .panel-footer + .panel-collapse .panel-body {
- border-bottom-color: #ddd;
-}
-.panel-primary {
- border-color: #428bca;
-}
-.panel-primary > .panel-heading {
- color: #fff;
- background-color: #428bca;
- border-color: #428bca;
-}
-.panel-primary > .panel-heading + .panel-collapse .panel-body {
- border-top-color: #428bca;
-}
-.panel-primary > .panel-footer + .panel-collapse .panel-body {
- border-bottom-color: #428bca;
-}
-.panel-success {
- border-color: #d6e9c6;
-}
-.panel-success > .panel-heading {
- color: #3c763d;
- background-color: #dff0d8;
- border-color: #d6e9c6;
-}
-.panel-success > .panel-heading + .panel-collapse .panel-body {
- border-top-color: #d6e9c6;
-}
-.panel-success > .panel-footer + .panel-collapse .panel-body {
- border-bottom-color: #d6e9c6;
-}
-.panel-info {
- border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
- color: #31708f;
- background-color: #d9edf7;
- border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse .panel-body {
- border-top-color: #bce8f1;
-}
-.panel-info > .panel-footer + .panel-collapse .panel-body {
- border-bottom-color: #bce8f1;
-}
-.panel-warning {
- border-color: #faebcc;
-}
-.panel-warning > .panel-heading {
- color: #8a6d3b;
- background-color: #fcf8e3;
- border-color: #faebcc;
-}
-.panel-warning > .panel-heading + .panel-collapse .panel-body {
- border-top-color: #faebcc;
-}
-.panel-warning > .panel-footer + .panel-collapse .panel-body {
- border-bottom-color: #faebcc;
-}
-.panel-danger {
- border-color: #ebccd1;
-}
-.panel-danger > .panel-heading {
- color: #a94442;
- background-color: #f2dede;
- border-color: #ebccd1;
-}
-.panel-danger > .panel-heading + .panel-collapse .panel-body {
- border-top-color: #ebccd1;
-}
-.panel-danger > .panel-footer + .panel-collapse .panel-body {
- border-bottom-color: #ebccd1;
-}
-.well {
- min-height: 20px;
- padding: 19px;
- margin-bottom: 20px;
- background-color: #f5f5f5;
- border: 1px solid #e3e3e3;
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
-}
-.well blockquote {
- border-color: #ddd;
- border-color: rgba(0, 0, 0, .15);
-}
-.well-lg {
- padding: 24px;
- border-radius: 6px;
-}
-.well-sm {
- padding: 9px;
- border-radius: 3px;
-}
-.close {
- float: right;
- font-size: 21px;
- font-weight: bold;
- line-height: 1;
- color: #000;
- text-shadow: 0 1px 0 #fff;
- filter: alpha(opacity=20);
- opacity: .2;
-}
-.close:hover,
-.close:focus {
- color: #000;
- text-decoration: none;
- cursor: pointer;
- filter: alpha(opacity=50);
- opacity: .5;
-}
-button.close {
- -webkit-appearance: none;
- padding: 0;
- cursor: pointer;
- background: transparent;
- border: 0;
-}
-.modal-open {
- overflow: hidden;
-}
-.modal {
- position: fixed;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- z-index: 1050;
- display: none;
- overflow: auto;
- overflow-y: scroll;
- -webkit-overflow-scrolling: touch;
- outline: 0;
-}
-.modal.fade .modal-dialog {
- -webkit-transition: -webkit-transform .3s ease-out;
- -moz-transition: -moz-transform .3s ease-out;
- -o-transition: -o-transform .3s ease-out;
- transition: transform .3s ease-out;
- -webkit-transform: translate(0, -25%);
- -ms-transform: translate(0, -25%);
- transform: translate(0, -25%);
-}
-.modal.in .modal-dialog {
- -webkit-transform: translate(0, 0);
- -ms-transform: translate(0, 0);
- transform: translate(0, 0);
-}
-.modal-dialog {
- position: relative;
- width: auto;
- margin: 10px;
-}
-.modal-content {
- position: relative;
- background-color: #fff;
- background-clip: padding-box;
- border: 1px solid #999;
- border: 1px solid rgba(0, 0, 0, .2);
- border-radius: 6px;
- outline: none;
- -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
- box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
-}
-.modal-backdrop {
- position: fixed;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- z-index: 1040;
- background-color: #000;
-}
-.modal-backdrop.fade {
- filter: alpha(opacity=0);
- opacity: 0;
-}
-.modal-backdrop.in {
- filter: alpha(opacity=50);
- opacity: .5;
-}
-.modal-header {
- min-height: 16.42857143px;
- padding: 15px;
- border-bottom: 1px solid #e5e5e5;
-}
-.modal-header .close {
- margin-top: -2px;
-}
-.modal-title {
- margin: 0;
- line-height: 1.42857143;
-}
-.modal-body {
- position: relative;
- padding: 20px;
-}
-.modal-footer {
- padding: 19px 20px 20px;
- margin-top: 15px;
- text-align: right;
- border-top: 1px solid #e5e5e5;
-}
-.modal-footer .btn + .btn {
- margin-bottom: 0;
- margin-left: 5px;
-}
-.modal-footer .btn-group .btn + .btn {
- margin-left: -1px;
-}
-.modal-footer .btn-block + .btn-block {
- margin-left: 0;
-}
-@media (min-width: 768px) {
- .modal-dialog {
- width: 600px;
- margin: 30px auto;
- }
- .modal-content {
- -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
- box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
- }
- .modal-sm {
- width: 300px;
- }
-}
-@media (min-width: 992px) {
- .modal-lg {
- width: 900px;
- }
-}
-.tooltip {
- position: absolute;
- z-index: 1030;
- display: block;
- font-size: 12px;
- line-height: 1.4;
- visibility: visible;
- filter: alpha(opacity=0);
- opacity: 0;
-}
-.tooltip.in {
- filter: alpha(opacity=90);
- opacity: .9;
-}
-.tooltip.top {
- padding: 5px 0;
- margin-top: -3px;
-}
-.tooltip.right {
- padding: 0 5px;
- margin-left: 3px;
-}
-.tooltip.bottom {
- padding: 5px 0;
- margin-top: 3px;
-}
-.tooltip.left {
- padding: 0 5px;
- margin-left: -3px;
-}
-.tooltip-inner {
- max-width: 200px;
- padding: 3px 8px;
- color: #fff;
- text-align: center;
- text-decoration: none;
- background-color: #000;
- border-radius: 4px;
-}
-.tooltip-arrow {
- position: absolute;
- width: 0;
- height: 0;
- border-color: transparent;
- border-style: solid;
-}
-.tooltip.top .tooltip-arrow {
- bottom: 0;
- left: 50%;
- margin-left: -5px;
- border-width: 5px 5px 0;
- border-top-color: #000;
-}
-.tooltip.top-left .tooltip-arrow {
- bottom: 0;
- left: 5px;
- border-width: 5px 5px 0;
- border-top-color: #000;
-}
-.tooltip.top-right .tooltip-arrow {
- right: 5px;
- bottom: 0;
- border-width: 5px 5px 0;
- border-top-color: #000;
-}
-.tooltip.right .tooltip-arrow {
- top: 50%;
- left: 0;
- margin-top: -5px;
- border-width: 5px 5px 5px 0;
- border-right-color: #000;
-}
-.tooltip.left .tooltip-arrow {
- top: 50%;
- right: 0;
- margin-top: -5px;
- border-width: 5px 0 5px 5px;
- border-left-color: #000;
-}
-.tooltip.bottom .tooltip-arrow {
- top: 0;
- left: 50%;
- margin-left: -5px;
- border-width: 0 5px 5px;
- border-bottom-color: #000;
-}
-.tooltip.bottom-left .tooltip-arrow {
- top: 0;
- left: 5px;
- border-width: 0 5px 5px;
- border-bottom-color: #000;
-}
-.tooltip.bottom-right .tooltip-arrow {
- top: 0;
- right: 5px;
- border-width: 0 5px 5px;
- border-bottom-color: #000;
-}
-.popover {
- position: absolute;
- top: 0;
- left: 0;
- z-index: 1010;
- display: none;
- max-width: 276px;
- padding: 1px;
- text-align: left;
- white-space: normal;
- background-color: #fff;
- background-clip: padding-box;
- border: 1px solid #ccc;
- border: 1px solid rgba(0, 0, 0, .2);
- border-radius: 6px;
- -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
- box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
-}
-.popover.top {
- margin-top: -10px;
-}
-.popover.right {
- margin-left: 10px;
-}
-.popover.bottom {
- margin-top: 10px;
-}
-.popover.left {
- margin-left: -10px;
-}
-.popover-title {
- padding: 8px 14px;
- margin: 0;
- font-size: 14px;
- font-weight: normal;
- line-height: 18px;
- background-color: #f7f7f7;
- border-bottom: 1px solid #ebebeb;
- border-radius: 5px 5px 0 0;
-}
-.popover-content {
- padding: 9px 14px;
-}
-.popover > .arrow,
-.popover > .arrow:after {
- position: absolute;
- display: block;
- width: 0;
- height: 0;
- border-color: transparent;
- border-style: solid;
-}
-.popover > .arrow {
- border-width: 11px;
-}
-.popover > .arrow:after {
- content: "";
- border-width: 10px;
-}
-.popover.top > .arrow {
- bottom: -11px;
- left: 50%;
- margin-left: -11px;
- border-top-color: #999;
- border-top-color: rgba(0, 0, 0, .25);
- border-bottom-width: 0;
-}
-.popover.top > .arrow:after {
- bottom: 1px;
- margin-left: -10px;
- content: " ";
- border-top-color: #fff;
- border-bottom-width: 0;
-}
-.popover.right > .arrow {
- top: 50%;
- left: -11px;
- margin-top: -11px;
- border-right-color: #999;
- border-right-color: rgba(0, 0, 0, .25);
- border-left-width: 0;
-}
-.popover.right > .arrow:after {
- bottom: -10px;
- left: 1px;
- content: " ";
- border-right-color: #fff;
- border-left-width: 0;
-}
-.popover.bottom > .arrow {
- top: -11px;
- left: 50%;
- margin-left: -11px;
- border-top-width: 0;
- border-bottom-color: #999;
- border-bottom-color: rgba(0, 0, 0, .25);
-}
-.popover.bottom > .arrow:after {
- top: 1px;
- margin-left: -10px;
- content: " ";
- border-top-width: 0;
- border-bottom-color: #fff;
-}
-.popover.left > .arrow {
- top: 50%;
- right: -11px;
- margin-top: -11px;
- border-right-width: 0;
- border-left-color: #999;
- border-left-color: rgba(0, 0, 0, .25);
-}
-.popover.left > .arrow:after {
- right: 1px;
- bottom: -10px;
- content: " ";
- border-right-width: 0;
- border-left-color: #fff;
-}
-.carousel {
- position: relative;
-}
-.carousel-inner {
- position: relative;
- width: 100%;
- overflow: hidden;
-}
-.carousel-inner > .item {
- position: relative;
- display: none;
- -webkit-transition: .6s ease-in-out left;
- transition: .6s ease-in-out left;
-}
-.carousel-inner > .item > img,
-.carousel-inner > .item > a > img {
- line-height: 1;
-}
-.carousel-inner > .active,
-.carousel-inner > .next,
-.carousel-inner > .prev {
- display: block;
-}
-.carousel-inner > .active {
- left: 0;
-}
-.carousel-inner > .next,
-.carousel-inner > .prev {
- position: absolute;
- top: 0;
- width: 100%;
-}
-.carousel-inner > .next {
- left: 100%;
-}
-.carousel-inner > .prev {
- left: -100%;
-}
-.carousel-inner > .next.left,
-.carousel-inner > .prev.right {
- left: 0;
-}
-.carousel-inner > .active.left {
- left: -100%;
-}
-.carousel-inner > .active.right {
- left: 100%;
-}
-.carousel-control {
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- width: 15%;
- font-size: 20px;
- color: #fff;
- text-align: center;
- text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
- filter: alpha(opacity=50);
- opacity: .5;
-}
-.carousel-control.left {
- background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .5) 0%), color-stop(rgba(0, 0, 0, .0001) 100%));
- background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
- background-repeat: repeat-x;
-}
-.carousel-control.right {
- right: 0;
- left: auto;
- background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .0001) 0%), color-stop(rgba(0, 0, 0, .5) 100%));
- background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
- background-repeat: repeat-x;
-}
-.carousel-control:hover,
-.carousel-control:focus {
- color: #fff;
- text-decoration: none;
- filter: alpha(opacity=90);
- outline: none;
- opacity: .9;
-}
-.carousel-control .icon-prev,
-.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-left,
-.carousel-control .glyphicon-chevron-right {
- position: absolute;
- top: 50%;
- z-index: 5;
- display: inline-block;
-}
-.carousel-control .icon-prev,
-.carousel-control .glyphicon-chevron-left {
- left: 50%;
-}
-.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-right {
- right: 50%;
-}
-.carousel-control .icon-prev,
-.carousel-control .icon-next {
- width: 20px;
- height: 20px;
- margin-top: -10px;
- margin-left: -10px;
- font-family: serif;
-}
-.carousel-control .icon-prev:before {
- content: '\2039';
-}
-.carousel-control .icon-next:before {
- content: '\203a';
-}
-.carousel-indicators {
- position: absolute;
- bottom: 10px;
- left: 50%;
- z-index: 15;
- width: 60%;
- padding-left: 0;
- margin-left: -30%;
- text-align: center;
- list-style: none;
-}
-.carousel-indicators li {
- display: inline-block;
- width: 10px;
- height: 10px;
- margin: 1px;
- text-indent: -999px;
- cursor: pointer;
- background-color: #000 \9;
- background-color: rgba(0, 0, 0, 0);
- border: 1px solid #fff;
- border-radius: 10px;
-}
-.carousel-indicators .active {
- width: 12px;
- height: 12px;
- margin: 0;
- background-color: #fff;
-}
-.carousel-caption {
- position: absolute;
- right: 15%;
- bottom: 20px;
- left: 15%;
- z-index: 10;
- padding-top: 20px;
- padding-bottom: 20px;
- color: #fff;
- text-align: center;
- text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
-}
-.carousel-caption .btn {
- text-shadow: none;
-}
-@media screen and (min-width: 768px) {
- .carousel-control .glyphicon-chevron-left,
- .carousel-control .glyphicon-chevron-right,
- .carousel-control .icon-prev,
- .carousel-control .icon-next {
- width: 30px;
- height: 30px;
- margin-top: -15px;
- margin-left: -15px;
- font-size: 30px;
- }
- .carousel-caption {
- right: 20%;
- left: 20%;
- padding-bottom: 30px;
- }
- .carousel-indicators {
- bottom: 20px;
- }
-}
-.clearfix:before,
-.clearfix:after,
-.container:before,
-.container:after,
-.container-fluid:before,
-.container-fluid:after,
-.row:before,
-.row:after,
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after,
-.btn-toolbar:before,
-.btn-toolbar:after,
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after,
-.nav:before,
-.nav:after,
-.navbar:before,
-.navbar:after,
-.navbar-header:before,
-.navbar-header:after,
-.navbar-collapse:before,
-.navbar-collapse:after,
-.pager:before,
-.pager:after,
-.panel-body:before,
-.panel-body:after,
-.modal-footer:before,
-.modal-footer:after {
- display: table;
- content: " ";
-}
-.clearfix:after,
-.container:after,
-.container-fluid:after,
-.row:after,
-.form-horizontal .form-group:after,
-.btn-toolbar:after,
-.btn-group-vertical > .btn-group:after,
-.nav:after,
-.navbar:after,
-.navbar-header:after,
-.navbar-collapse:after,
-.pager:after,
-.panel-body:after,
-.modal-footer:after {
- clear: both;
-}
-.center-block {
- display: block;
- margin-right: auto;
- margin-left: auto;
-}
-.pull-right {
- float: right !important;
-}
-.pull-left {
- float: left !important;
-}
-.hide {
- display: none !important;
-}
-.show {
- display: block !important;
-}
-.invisible {
- visibility: hidden;
-}
-.text-hide {
- font: 0/0 a;
- color: transparent;
- text-shadow: none;
- background-color: transparent;
- border: 0;
-}
-.hidden {
- display: none !important;
- visibility: hidden !important;
-}
-.affix {
- position: fixed;
-}
-@-ms-viewport {
- width: device-width;
-}
-.visible-xs,
-.visible-sm,
-.visible-md,
-.visible-lg {
- display: none !important;
-}
-@media (max-width: 767px) {
- .visible-xs {
- display: block !important;
- }
- table.visible-xs {
- display: table;
- }
- tr.visible-xs {
- display: table-row !important;
- }
- th.visible-xs,
- td.visible-xs {
- display: table-cell !important;
- }
-}
-@media (min-width: 768px) and (max-width: 991px) {
- .visible-sm {
- display: block !important;
- }
- table.visible-sm {
- display: table;
- }
- tr.visible-sm {
- display: table-row !important;
- }
- th.visible-sm,
- td.visible-sm {
- display: table-cell !important;
- }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
- .visible-md {
- display: block !important;
- }
- table.visible-md {
- display: table;
- }
- tr.visible-md {
- display: table-row !important;
- }
- th.visible-md,
- td.visible-md {
- display: table-cell !important;
- }
-}
-@media (min-width: 1200px) {
- .visible-lg {
- display: block !important;
- }
- table.visible-lg {
- display: table;
- }
- tr.visible-lg {
- display: table-row !important;
- }
- th.visible-lg,
- td.visible-lg {
- display: table-cell !important;
- }
-}
-@media (max-width: 767px) {
- .hidden-xs {
- display: none !important;
- }
-}
-@media (min-width: 768px) and (max-width: 991px) {
- .hidden-sm {
- display: none !important;
- }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
- .hidden-md {
- display: none !important;
- }
-}
-@media (min-width: 1200px) {
- .hidden-lg {
- display: none !important;
- }
-}
-.visible-print {
- display: none !important;
-}
-@media print {
- .visible-print {
- display: block !important;
- }
- table.visible-print {
- display: table;
- }
- tr.visible-print {
- display: table-row !important;
- }
- th.visible-print,
- td.visible-print {
- display: table-cell !important;
- }
-}
-@media print {
- .hidden-print {
- display: none !important;
- }
-}
-/*# sourceMappingURL=bootstrap.css.map */
diff --git a/setup/pub/bootstrap/css/bootstrap.css.map b/setup/pub/bootstrap/css/bootstrap.css.map
deleted file mode 100644
index 6bc5a2dc75413860670f9e657d62b64cf15fd195..0000000000000000000000000000000000000000
--- a/setup/pub/bootstrap/css/bootstrap.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["less/normalize.less","less/print.less","less/scaffolding.less","less/mixins.less","less/variables.less","less/thumbnails.less","less/carousel.less","less/type.less","less/code.less","less/grid.less","less/tables.less","less/forms.less","less/buttons.less","less/button-groups.less","less/component-animations.less","less/glyphicons.less","less/dropdowns.less","less/input-groups.less","less/navs.less","less/navbar.less","less/utilities.less","less/breadcrumbs.less","less/pagination.less","less/pager.less","less/labels.less","less/badges.less","less/jumbotron.less","less/alerts.less","less/progress-bars.less","less/media.less","less/list-group.less","less/panels.less","less/wells.less","less/close.less","less/modals.less","less/tooltip.less","less/popovers.less","less/responsive-utilities.less"],"names":[],"mappings":"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","sourcesContent":["/*! normalize.css v3.0.0 | MIT License | git.io/normalize */\n\n//\n// 1. Set default font family to sans-serif.\n// 2. Prevent iOS text size adjust after orientation change, without disabling\n// user zoom.\n//\n\nhtml {\n font-family: sans-serif; // 1\n -ms-text-size-adjust: 100%; // 2\n -webkit-text-size-adjust: 100%; // 2\n}\n\n//\n// Remove default margin.\n//\n\nbody {\n margin: 0;\n}\n\n// HTML5 display definitions\n// ==========================================================================\n\n//\n// Correct `block` display not defined in IE 8/9.\n//\n\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nnav,\nsection,\nsummary {\n display: block;\n}\n\n//\n// 1. Correct `inline-block` display not defined in IE 8/9.\n// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.\n//\n\naudio,\ncanvas,\nprogress,\nvideo {\n display: inline-block; // 1\n vertical-align: baseline; // 2\n}\n\n//\n// Prevent modern browsers from displaying `audio` without controls.\n// Remove excess height in iOS 5 devices.\n//\n\naudio:not([controls]) {\n display: none;\n height: 0;\n}\n\n//\n// Address `[hidden]` styling not present in IE 8/9.\n// Hide the `template` element in IE, Safari, and Firefox < 22.\n//\n\n[hidden],\ntemplate {\n display: none;\n}\n\n// Links\n// ==========================================================================\n\n//\n// Remove the gray background color from active links in IE 10.\n//\n\na {\n background: transparent;\n}\n\n//\n// Improve readability when focused and also mouse hovered in all browsers.\n//\n\na:active,\na:hover {\n outline: 0;\n}\n\n// Text-level semantics\n// ==========================================================================\n\n//\n// Address styling not present in IE 8/9, Safari 5, and Chrome.\n//\n\nabbr[title] {\n border-bottom: 1px dotted;\n}\n\n//\n// Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.\n//\n\nb,\nstrong {\n font-weight: bold;\n}\n\n//\n// Address styling not present in Safari 5 and Chrome.\n//\n\ndfn {\n font-style: italic;\n}\n\n//\n// Address variable `h1` font-size and margin within `section` and `article`\n// contexts in Firefox 4+, Safari 5, and Chrome.\n//\n\nh1 {\n font-size: 2em;\n margin: 0.67em 0;\n}\n\n//\n// Address styling not present in IE 8/9.\n//\n\nmark {\n background: #ff0;\n color: #000;\n}\n\n//\n// Address inconsistent and variable font size in all browsers.\n//\n\nsmall {\n font-size: 80%;\n}\n\n//\n// Prevent `sub` and `sup` affecting `line-height` in all browsers.\n//\n\nsub,\nsup {\n font-size: 75%;\n line-height: 0;\n position: relative;\n vertical-align: baseline;\n}\n\nsup {\n top: -0.5em;\n}\n\nsub {\n bottom: -0.25em;\n}\n\n// Embedded content\n// ==========================================================================\n\n//\n// Remove border when inside `a` element in IE 8/9.\n//\n\nimg {\n border: 0;\n}\n\n//\n// Correct overflow displayed oddly in IE 9.\n//\n\nsvg:not(:root) {\n overflow: hidden;\n}\n\n// Grouping content\n// ==========================================================================\n\n//\n// Address margin not present in IE 8/9 and Safari 5.\n//\n\nfigure {\n margin: 1em 40px;\n}\n\n//\n// Address differences between Firefox and other browsers.\n//\n\nhr {\n -moz-box-sizing: content-box;\n box-sizing: content-box;\n height: 0;\n}\n\n//\n// Contain overflow in all browsers.\n//\n\npre {\n overflow: auto;\n}\n\n//\n// Address odd `em`-unit font size rendering in all browsers.\n//\n\ncode,\nkbd,\npre,\nsamp {\n font-family: monospace, monospace;\n font-size: 1em;\n}\n\n// Forms\n// ==========================================================================\n\n//\n// Known limitation: by default, Chrome and Safari on OS X allow very limited\n// styling of `select`, unless a `border` property is set.\n//\n\n//\n// 1. Correct color not being inherited.\n// Known issue: affects color of disabled elements.\n// 2. Correct font properties not being inherited.\n// 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.\n//\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n color: inherit; // 1\n font: inherit; // 2\n margin: 0; // 3\n}\n\n//\n// Address `overflow` set to `hidden` in IE 8/9/10.\n//\n\nbutton {\n overflow: visible;\n}\n\n//\n// Address inconsistent `text-transform` inheritance for `button` and `select`.\n// All other form control elements do not inherit `text-transform` values.\n// Correct `button` style inheritance in Firefox, IE 8+, and Opera\n// Correct `select` style inheritance in Firefox.\n//\n\nbutton,\nselect {\n text-transform: none;\n}\n\n//\n// 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`\n// and `video` controls.\n// 2. Correct inability to style clickable `input` types in iOS.\n// 3. Improve usability and consistency of cursor style between image-type\n// `input` and others.\n//\n\nbutton,\nhtml input[type=\"button\"], // 1\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n -webkit-appearance: button; // 2\n cursor: pointer; // 3\n}\n\n//\n// Re-set default cursor for disabled elements.\n//\n\nbutton[disabled],\nhtml input[disabled] {\n cursor: default;\n}\n\n//\n// Remove inner padding and border in Firefox 4+.\n//\n\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n border: 0;\n padding: 0;\n}\n\n//\n// Address Firefox 4+ setting `line-height` on `input` using `!important` in\n// the UA stylesheet.\n//\n\ninput {\n line-height: normal;\n}\n\n//\n// It's recommended that you don't attempt to style these elements.\n// Firefox's implementation doesn't respect box-sizing, padding, or width.\n//\n// 1. Address box sizing set to `content-box` in IE 8/9/10.\n// 2. Remove excess padding in IE 8/9/10.\n//\n\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n box-sizing: border-box; // 1\n padding: 0; // 2\n}\n\n//\n// Fix the cursor style for Chrome's increment/decrement buttons. For certain\n// `font-size` values of the `input`, it causes the cursor style of the\n// decrement button to change from `default` to `text`.\n//\n\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n height: auto;\n}\n\n//\n// 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.\n// 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome\n// (include `-moz` to future-proof).\n//\n\ninput[type=\"search\"] {\n -webkit-appearance: textfield; // 1\n -moz-box-sizing: content-box;\n -webkit-box-sizing: content-box; // 2\n box-sizing: content-box;\n}\n\n//\n// Remove inner padding and search cancel button in Safari and Chrome on OS X.\n// Safari (but not Chrome) clips the cancel button when the search input has\n// padding (and `textfield` appearance).\n//\n\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n -webkit-appearance: none;\n}\n\n//\n// Define consistent border, margin, and padding.\n//\n\nfieldset {\n border: 1px solid #c0c0c0;\n margin: 0 2px;\n padding: 0.35em 0.625em 0.75em;\n}\n\n//\n// 1. Correct `color` not being inherited in IE 8/9.\n// 2. Remove padding so people aren't caught out if they zero out fieldsets.\n//\n\nlegend {\n border: 0; // 1\n padding: 0; // 2\n}\n\n//\n// Remove default vertical scrollbar in IE 8/9.\n//\n\ntextarea {\n overflow: auto;\n}\n\n//\n// Don't inherit the `font-weight` (applied by a rule above).\n// NOTE: the default cannot safely be changed in Chrome and Safari on OS X.\n//\n\noptgroup {\n font-weight: bold;\n}\n\n// Tables\n// ==========================================================================\n\n//\n// Remove most spacing between table cells.\n//\n\ntable {\n border-collapse: collapse;\n border-spacing: 0;\n}\n\ntd,\nth {\n padding: 0;\n}","//\n// Basic print styles\n// --------------------------------------------------\n// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css\n\n@media print {\n\n * {\n text-shadow: none !important;\n color: #000 !important; // Black prints faster: h5bp.com/s\n background: transparent !important;\n box-shadow: none !important;\n }\n\n a,\n a:visited {\n text-decoration: underline;\n }\n\n a[href]:after {\n content: \" (\" attr(href) \")\";\n }\n\n abbr[title]:after {\n content: \" (\" attr(title) \")\";\n }\n\n // Don't show links for images, or javascript/internal links\n a[href^=\"javascript:\"]:after,\n a[href^=\"#\"]:after {\n content: \"\";\n }\n\n pre,\n blockquote {\n border: 1px solid #999;\n page-break-inside: avoid;\n }\n\n thead {\n display: table-header-group; // h5bp.com/t\n }\n\n tr,\n img {\n page-break-inside: avoid;\n }\n\n img {\n max-width: 100% !important;\n }\n\n p,\n h2,\n h3 {\n orphans: 3;\n widows: 3;\n }\n\n h2,\n h3 {\n page-break-after: avoid;\n }\n\n // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245\n // Once fixed, we can just straight up remove this.\n select {\n background: #fff !important;\n }\n\n // Bootstrap components\n .navbar {\n display: none;\n }\n .table {\n td,\n th {\n background-color: #fff !important;\n }\n }\n .btn,\n .dropup > .btn {\n > .caret {\n border-top-color: #000 !important;\n }\n }\n .label {\n border: 1px solid #000;\n }\n\n .table {\n border-collapse: collapse !important;\n }\n .table-bordered {\n th,\n td {\n border: 1px solid #ddd !important;\n }\n }\n\n}\n","//\n// Scaffolding\n// --------------------------------------------------\n\n\n// Reset the box-sizing\n//\n// Heads up! This reset may cause conflicts with some third-party widgets.\n// For recommendations on resolving such conflicts, see\n// http://getbootstrap.com/getting-started/#third-box-sizing\n* {\n .box-sizing(border-box);\n}\n*:before,\n*:after {\n .box-sizing(border-box);\n}\n\n\n// Body reset\n\nhtml {\n font-size: 62.5%;\n -webkit-tap-highlight-color: rgba(0,0,0,0);\n}\n\nbody {\n font-family: @font-family-base;\n font-size: @font-size-base;\n line-height: @line-height-base;\n color: @text-color;\n background-color: @body-bg;\n}\n\n// Reset fonts for relevant elements\ninput,\nbutton,\nselect,\ntextarea {\n font-family: inherit;\n font-size: inherit;\n line-height: inherit;\n}\n\n\n// Links\n\na {\n color: @link-color;\n text-decoration: none;\n\n &:hover,\n &:focus {\n color: @link-hover-color;\n text-decoration: underline;\n }\n\n &:focus {\n .tab-focus();\n }\n}\n\n\n// Figures\n//\n// We reset this here because previously Normalize had no `figure` margins. This\n// ensures we don't break anyone's use of the element.\n\nfigure {\n margin: 0;\n}\n\n\n// Images\n\nimg {\n vertical-align: middle;\n}\n\n// Responsive images (ensure images don't scale beyond their parents)\n.img-responsive {\n .img-responsive();\n}\n\n// Rounded corners\n.img-rounded {\n border-radius: @border-radius-large;\n}\n\n// Image thumbnails\n//\n// Heads up! This is mixin-ed into thumbnails.less for `.thumbnail`.\n.img-thumbnail {\n padding: @thumbnail-padding;\n line-height: @line-height-base;\n background-color: @thumbnail-bg;\n border: 1px solid @thumbnail-border;\n border-radius: @thumbnail-border-radius;\n .transition(all .2s ease-in-out);\n\n // Keep them at most 100% wide\n .img-responsive(inline-block);\n}\n\n// Perfect circle\n.img-circle {\n border-radius: 50%; // set radius in percents\n}\n\n\n// Horizontal rules\n\nhr {\n margin-top: @line-height-computed;\n margin-bottom: @line-height-computed;\n border: 0;\n border-top: 1px solid @hr-border;\n}\n\n\n// Only display content to screen readers\n//\n// See: http://a11yproject.com/posts/how-to-hide-content/\n\n.sr-only {\n position: absolute;\n width: 1px;\n height: 1px;\n margin: -1px;\n padding: 0;\n overflow: hidden;\n clip: rect(0,0,0,0);\n border: 0;\n}\n","//\n// Mixins\n// --------------------------------------------------\n\n\n// Utilities\n// -------------------------\n\n// Clearfix\n// Source: http://nicolasgallagher.com/micro-clearfix-hack/\n//\n// For modern browsers\n// 1. The space content is one way to avoid an Opera bug when the\n// contenteditable attribute is included anywhere else in the document.\n// Otherwise it causes space to appear at the top and bottom of elements\n// that are clearfixed.\n// 2. The use of `table` rather than `block` is only necessary if using\n// `:before` to contain the top-margins of child elements.\n.clearfix() {\n &:before,\n &:after {\n content: \" \"; // 1\n display: table; // 2\n }\n &:after {\n clear: both;\n }\n}\n\n// WebKit-style focus\n.tab-focus() {\n // Default\n outline: thin dotted;\n // WebKit\n outline: 5px auto -webkit-focus-ring-color;\n outline-offset: -2px;\n}\n\n// Center-align a block level element\n.center-block() {\n display: block;\n margin-left: auto;\n margin-right: auto;\n}\n\n// Sizing shortcuts\n.size(@width; @height) {\n width: @width;\n height: @height;\n}\n.square(@size) {\n .size(@size; @size);\n}\n\n// Placeholder text\n.placeholder(@color: @input-color-placeholder) {\n &::-moz-placeholder { color: @color; // Firefox\n opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526\n &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+\n &::-webkit-input-placeholder { color: @color; } // Safari and Chrome\n}\n\n// Text overflow\n// Requires inline-block or block for proper styling\n.text-overflow() {\n overflow: hidden;\n text-overflow: ellipsis;\n white-space: nowrap;\n}\n\n// CSS image replacement\n//\n// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for\n// mixins being reused as classes with the same name, this doesn't hold up. As\n// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. Note\n// that we cannot chain the mixins together in Less, so they are repeated.\n//\n// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757\n\n// Deprecated as of v3.0.1 (will be removed in v4)\n.hide-text() {\n font: ~\"0/0\" a;\n color: transparent;\n text-shadow: none;\n background-color: transparent;\n border: 0;\n}\n// New mixin to use as of v3.0.1\n.text-hide() {\n .hide-text();\n}\n\n\n\n// CSS3 PROPERTIES\n// --------------------------------------------------\n\n// Single side border-radius\n.border-top-radius(@radius) {\n border-top-right-radius: @radius;\n border-top-left-radius: @radius;\n}\n.border-right-radius(@radius) {\n border-bottom-right-radius: @radius;\n border-top-right-radius: @radius;\n}\n.border-bottom-radius(@radius) {\n border-bottom-right-radius: @radius;\n border-bottom-left-radius: @radius;\n}\n.border-left-radius(@radius) {\n border-bottom-left-radius: @radius;\n border-top-left-radius: @radius;\n}\n\n// Drop shadows\n//\n// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's\n// supported browsers that have box shadow capabilities now support the\n// standard `box-shadow` property.\n.box-shadow(@shadow) {\n -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1\n box-shadow: @shadow;\n}\n\n// Transitions\n.transition(@transition) {\n -webkit-transition: @transition;\n transition: @transition;\n}\n.transition-property(@transition-property) {\n -webkit-transition-property: @transition-property;\n transition-property: @transition-property;\n}\n.transition-delay(@transition-delay) {\n -webkit-transition-delay: @transition-delay;\n transition-delay: @transition-delay;\n}\n.transition-duration(@transition-duration) {\n -webkit-transition-duration: @transition-duration;\n transition-duration: @transition-duration;\n}\n.transition-transform(@transition) {\n -webkit-transition: -webkit-transform @transition;\n -moz-transition: -moz-transform @transition;\n -o-transition: -o-transform @transition;\n transition: transform @transition;\n}\n\n// Transformations\n.rotate(@degrees) {\n -webkit-transform: rotate(@degrees);\n -ms-transform: rotate(@degrees); // IE9 only\n transform: rotate(@degrees);\n}\n.scale(@ratio; @ratio-y...) {\n -webkit-transform: scale(@ratio, @ratio-y);\n -ms-transform: scale(@ratio, @ratio-y); // IE9 only\n transform: scale(@ratio, @ratio-y);\n}\n.translate(@x; @y) {\n -webkit-transform: translate(@x, @y);\n -ms-transform: translate(@x, @y); // IE9 only\n transform: translate(@x, @y);\n}\n.skew(@x; @y) {\n -webkit-transform: skew(@x, @y);\n -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+\n transform: skew(@x, @y);\n}\n.translate3d(@x; @y; @z) {\n -webkit-transform: translate3d(@x, @y, @z);\n transform: translate3d(@x, @y, @z);\n}\n\n.rotateX(@degrees) {\n -webkit-transform: rotateX(@degrees);\n -ms-transform: rotateX(@degrees); // IE9 only\n transform: rotateX(@degrees);\n}\n.rotateY(@degrees) {\n -webkit-transform: rotateY(@degrees);\n -ms-transform: rotateY(@degrees); // IE9 only\n transform: rotateY(@degrees);\n}\n.perspective(@perspective) {\n -webkit-perspective: @perspective;\n -moz-perspective: @perspective;\n perspective: @perspective;\n}\n.perspective-origin(@perspective) {\n -webkit-perspective-origin: @perspective;\n -moz-perspective-origin: @perspective;\n perspective-origin: @perspective;\n}\n.transform-origin(@origin) {\n -webkit-transform-origin: @origin;\n -moz-transform-origin: @origin;\n -ms-transform-origin: @origin; // IE9 only\n transform-origin: @origin;\n}\n\n// Animations\n.animation(@animation) {\n -webkit-animation: @animation;\n animation: @animation;\n}\n.animation-name(@name) {\n -webkit-animation-name: @name;\n animation-name: @name;\n}\n.animation-duration(@duration) {\n -webkit-animation-duration: @duration;\n animation-duration: @duration;\n}\n.animation-timing-function(@timing-function) {\n -webkit-animation-timing-function: @timing-function;\n animation-timing-function: @timing-function;\n}\n.animation-delay(@delay) {\n -webkit-animation-delay: @delay;\n animation-delay: @delay;\n}\n.animation-iteration-count(@iteration-count) {\n -webkit-animation-iteration-count: @iteration-count;\n animation-iteration-count: @iteration-count;\n}\n.animation-direction(@direction) {\n -webkit-animation-direction: @direction;\n animation-direction: @direction;\n}\n\n// Backface visibility\n// Prevent browsers from flickering when using CSS 3D transforms.\n// Default value is `visible`, but can be changed to `hidden`\n.backface-visibility(@visibility){\n -webkit-backface-visibility: @visibility;\n -moz-backface-visibility: @visibility;\n backface-visibility: @visibility;\n}\n\n// Box sizing\n.box-sizing(@boxmodel) {\n -webkit-box-sizing: @boxmodel;\n -moz-box-sizing: @boxmodel;\n box-sizing: @boxmodel;\n}\n\n// User select\n// For selecting text on the page\n.user-select(@select) {\n -webkit-user-select: @select;\n -moz-user-select: @select;\n -ms-user-select: @select; // IE10+\n user-select: @select;\n}\n\n// Resize anything\n.resizable(@direction) {\n resize: @direction; // Options: horizontal, vertical, both\n overflow: auto; // Safari fix\n}\n\n// CSS3 Content Columns\n.content-columns(@column-count; @column-gap: @grid-gutter-width) {\n -webkit-column-count: @column-count;\n -moz-column-count: @column-count;\n column-count: @column-count;\n -webkit-column-gap: @column-gap;\n -moz-column-gap: @column-gap;\n column-gap: @column-gap;\n}\n\n// Optional hyphenation\n.hyphens(@mode: auto) {\n word-wrap: break-word;\n -webkit-hyphens: @mode;\n -moz-hyphens: @mode;\n -ms-hyphens: @mode; // IE10+\n -o-hyphens: @mode;\n hyphens: @mode;\n}\n\n// Opacity\n.opacity(@opacity) {\n opacity: @opacity;\n // IE8 filter\n @opacity-ie: (@opacity * 100);\n filter: ~\"alpha(opacity=@{opacity-ie})\";\n}\n\n\n\n// GRADIENTS\n// --------------------------------------------------\n\n#gradient {\n\n // Horizontal gradient, from left to right\n //\n // Creates two color stops, start and end, by specifying a color and position for each color stop.\n // Color stops are not available in IE9 and below.\n .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1-6, Chrome 10+\n background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n background-repeat: repeat-x;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down\n }\n\n // Vertical gradient, from top to bottom\n //\n // Creates two color stops, start and end, by specifying a color and position for each color stop.\n // Color stops are not available in IE9 and below.\n .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+\n background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n background-repeat: repeat-x;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down\n }\n\n .directional(@start-color: #555; @end-color: #333; @deg: 45deg) {\n background-repeat: repeat-x;\n background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+\n background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n }\n .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);\n background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color);\n background-repeat: no-repeat;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n }\n .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n background-repeat: no-repeat;\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n }\n .radial(@inner-color: #555; @outer-color: #333) {\n background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);\n background-image: radial-gradient(circle, @inner-color, @outer-color);\n background-repeat: no-repeat;\n }\n .striped(@color: rgba(255,255,255,.15); @angle: 45deg) {\n background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n }\n}\n\n// Reset filters for IE\n//\n// When you need to remove a gradient background, do not forget to use this to reset\n// the IE filter for IE9 and below.\n.reset-filter() {\n filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(enabled = false)\"));\n}\n\n\n\n// Retina images\n//\n// Short retina mixin for setting background-image and -size\n\n.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {\n background-image: url(\"@{file-1x}\");\n\n @media\n only screen and (-webkit-min-device-pixel-ratio: 2),\n only screen and ( min--moz-device-pixel-ratio: 2),\n only screen and ( -o-min-device-pixel-ratio: 2/1),\n only screen and ( min-device-pixel-ratio: 2),\n only screen and ( min-resolution: 192dpi),\n only screen and ( min-resolution: 2dppx) {\n background-image: url(\"@{file-2x}\");\n background-size: @width-1x @height-1x;\n }\n}\n\n\n// Responsive image\n//\n// Keep images from scaling beyond the width of their parents.\n\n.img-responsive(@display: block) {\n display: @display;\n max-width: 100%; // Part 1: Set a maximum relative to the parent\n height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching\n}\n\n\n// COMPONENT MIXINS\n// --------------------------------------------------\n\n// Horizontal dividers\n// -------------------------\n// Dividers (basically an hr) within dropdowns and nav lists\n.nav-divider(@color: #e5e5e5) {\n height: 1px;\n margin: ((@line-height-computed / 2) - 1) 0;\n overflow: hidden;\n background-color: @color;\n}\n\n// Panels\n// -------------------------\n.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {\n border-color: @border;\n\n & > .panel-heading {\n color: @heading-text-color;\n background-color: @heading-bg-color;\n border-color: @heading-border;\n\n + .panel-collapse .panel-body {\n border-top-color: @border;\n }\n }\n & > .panel-footer {\n + .panel-collapse .panel-body {\n border-bottom-color: @border;\n }\n }\n}\n\n// Alerts\n// -------------------------\n.alert-variant(@background; @border; @text-color) {\n background-color: @background;\n border-color: @border;\n color: @text-color;\n\n hr {\n border-top-color: darken(@border, 5%);\n }\n .alert-link {\n color: darken(@text-color, 10%);\n }\n}\n\n// Tables\n// -------------------------\n.table-row-variant(@state; @background) {\n // Exact selectors below required to override `.table-striped` and prevent\n // inheritance to nested tables.\n .table > thead > tr,\n .table > tbody > tr,\n .table > tfoot > tr {\n > td.@{state},\n > th.@{state},\n &.@{state} > td,\n &.@{state} > th {\n background-color: @background;\n }\n }\n\n // Hover states for `.table-hover`\n // Note: this is not available for cells or rows within `thead` or `tfoot`.\n .table-hover > tbody > tr {\n > td.@{state}:hover,\n > th.@{state}:hover,\n &.@{state}:hover > td,\n &.@{state}:hover > th {\n background-color: darken(@background, 5%);\n }\n }\n}\n\n// List Groups\n// -------------------------\n.list-group-item-variant(@state; @background; @color) {\n .list-group-item-@{state} {\n color: @color;\n background-color: @background;\n\n a& {\n color: @color;\n\n .list-group-item-heading { color: inherit; }\n\n &:hover,\n &:focus {\n color: @color;\n background-color: darken(@background, 5%);\n }\n &.active,\n &.active:hover,\n &.active:focus {\n color: #fff;\n background-color: @color;\n border-color: @color;\n }\n }\n }\n}\n\n// Button variants\n// -------------------------\n// Easily pump out default styles, as well as :hover, :focus, :active,\n// and disabled options for all buttons\n.button-variant(@color; @background; @border) {\n color: @color;\n background-color: @background;\n border-color: @border;\n\n &:hover,\n &:focus,\n &:active,\n &.active,\n .open .dropdown-toggle& {\n color: @color;\n background-color: darken(@background, 8%);\n border-color: darken(@border, 12%);\n }\n &:active,\n &.active,\n .open .dropdown-toggle& {\n background-image: none;\n }\n &.disabled,\n &[disabled],\n fieldset[disabled] & {\n &,\n &:hover,\n &:focus,\n &:active,\n &.active {\n background-color: @background;\n border-color: @border;\n }\n }\n\n .badge {\n color: @background;\n background-color: @color;\n }\n}\n\n// Button sizes\n// -------------------------\n.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n padding: @padding-vertical @padding-horizontal;\n font-size: @font-size;\n line-height: @line-height;\n border-radius: @border-radius;\n}\n\n// Pagination\n// -------------------------\n.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {\n > li {\n > a,\n > span {\n padding: @padding-vertical @padding-horizontal;\n font-size: @font-size;\n }\n &:first-child {\n > a,\n > span {\n .border-left-radius(@border-radius);\n }\n }\n &:last-child {\n > a,\n > span {\n .border-right-radius(@border-radius);\n }\n }\n }\n}\n\n// Labels\n// -------------------------\n.label-variant(@color) {\n background-color: @color;\n &[href] {\n &:hover,\n &:focus {\n background-color: darken(@color, 10%);\n }\n }\n}\n\n// Contextual backgrounds\n// -------------------------\n.bg-variant(@color) {\n background-color: @color;\n a&:hover {\n background-color: darken(@color, 10%);\n }\n}\n\n// Typography\n// -------------------------\n.text-emphasis-variant(@color) {\n color: @color;\n a&:hover {\n color: darken(@color, 10%);\n }\n}\n\n// Navbar vertical align\n// -------------------------\n// Vertically center elements in the navbar.\n// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin.\n.navbar-vertical-align(@element-height) {\n margin-top: ((@navbar-height - @element-height) / 2);\n margin-bottom: ((@navbar-height - @element-height) / 2);\n}\n\n// Progress bars\n// -------------------------\n.progress-bar-variant(@color) {\n background-color: @color;\n .progress-striped & {\n #gradient > .striped();\n }\n}\n\n// Responsive utilities\n// -------------------------\n// More easily include all the states for responsive-utilities.less.\n.responsive-visibility() {\n display: block !important;\n table& { display: table; }\n tr& { display: table-row !important; }\n th&,\n td& { display: table-cell !important; }\n}\n\n.responsive-invisibility() {\n display: none !important;\n}\n\n\n// Grid System\n// -----------\n\n// Centered container element\n.container-fixed() {\n margin-right: auto;\n margin-left: auto;\n padding-left: (@grid-gutter-width / 2);\n padding-right: (@grid-gutter-width / 2);\n &:extend(.clearfix all);\n}\n\n// Creates a wrapper for a series of columns\n.make-row(@gutter: @grid-gutter-width) {\n margin-left: (@gutter / -2);\n margin-right: (@gutter / -2);\n &:extend(.clearfix all);\n}\n\n// Generate the extra small columns\n.make-xs-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n float: left;\n width: percentage((@columns / @grid-columns));\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n}\n.make-xs-column-offset(@columns) {\n @media (min-width: @screen-xs-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-xs-column-push(@columns) {\n @media (min-width: @screen-xs-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-xs-column-pull(@columns) {\n @media (min-width: @screen-xs-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Generate the small columns\n.make-sm-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n\n @media (min-width: @screen-sm-min) {\n float: left;\n width: percentage((@columns / @grid-columns));\n }\n}\n.make-sm-column-offset(@columns) {\n @media (min-width: @screen-sm-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-sm-column-push(@columns) {\n @media (min-width: @screen-sm-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-sm-column-pull(@columns) {\n @media (min-width: @screen-sm-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Generate the medium columns\n.make-md-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n\n @media (min-width: @screen-md-min) {\n float: left;\n width: percentage((@columns / @grid-columns));\n }\n}\n.make-md-column-offset(@columns) {\n @media (min-width: @screen-md-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-md-column-push(@columns) {\n @media (min-width: @screen-md-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-md-column-pull(@columns) {\n @media (min-width: @screen-md-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Generate the large columns\n.make-lg-column(@columns; @gutter: @grid-gutter-width) {\n position: relative;\n min-height: 1px;\n padding-left: (@gutter / 2);\n padding-right: (@gutter / 2);\n\n @media (min-width: @screen-lg-min) {\n float: left;\n width: percentage((@columns / @grid-columns));\n }\n}\n.make-lg-column-offset(@columns) {\n @media (min-width: @screen-lg-min) {\n margin-left: percentage((@columns / @grid-columns));\n }\n}\n.make-lg-column-push(@columns) {\n @media (min-width: @screen-lg-min) {\n left: percentage((@columns / @grid-columns));\n }\n}\n.make-lg-column-pull(@columns) {\n @media (min-width: @screen-lg-min) {\n right: percentage((@columns / @grid-columns));\n }\n}\n\n\n// Framework grid generation\n//\n// Used only by Bootstrap to generate the correct number of grid classes given\n// any value of `@grid-columns`.\n\n.make-grid-columns() {\n // Common styles for all sizes of grid columns, widths 1-12\n .col(@index) when (@index = 1) { // initial\n @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n .col((@index + 1), @item);\n }\n .col(@index, @list) when (@index =< @grid-columns) { // general; \"=<\" isn't a typo\n @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n .col((@index + 1), ~\"@{list}, @{item}\");\n }\n .col(@index, @list) when (@index > @grid-columns) { // terminal\n @{list} {\n position: relative;\n // Prevent columns from collapsing when empty\n min-height: 1px;\n // Inner gutter via padding\n padding-left: (@grid-gutter-width / 2);\n padding-right: (@grid-gutter-width / 2);\n }\n }\n .col(1); // kickstart it\n}\n\n.float-grid-columns(@class) {\n .col(@index) when (@index = 1) { // initial\n @item: ~\".col-@{class}-@{index}\";\n .col((@index + 1), @item);\n }\n .col(@index, @list) when (@index =< @grid-columns) { // general\n @item: ~\".col-@{class}-@{index}\";\n .col((@index + 1), ~\"@{list}, @{item}\");\n }\n .col(@index, @list) when (@index > @grid-columns) { // terminal\n @{list} {\n float: left;\n }\n }\n .col(1); // kickstart it\n}\n\n.calc-grid-column(@index, @class, @type) when (@type = width) and (@index > 0) {\n .col-@{class}-@{index} {\n width: percentage((@index / @grid-columns));\n }\n}\n.calc-grid-column(@index, @class, @type) when (@type = push) {\n .col-@{class}-push-@{index} {\n left: percentage((@index / @grid-columns));\n }\n}\n.calc-grid-column(@index, @class, @type) when (@type = pull) {\n .col-@{class}-pull-@{index} {\n right: percentage((@index / @grid-columns));\n }\n}\n.calc-grid-column(@index, @class, @type) when (@type = offset) {\n .col-@{class}-offset-@{index} {\n margin-left: percentage((@index / @grid-columns));\n }\n}\n\n// Basic looping in LESS\n.loop-grid-columns(@index, @class, @type) when (@index >= 0) {\n .calc-grid-column(@index, @class, @type);\n // next iteration\n .loop-grid-columns((@index - 1), @class, @type);\n}\n\n// Create grid for specific class\n.make-grid(@class) {\n .float-grid-columns(@class);\n .loop-grid-columns(@grid-columns, @class, width);\n .loop-grid-columns(@grid-columns, @class, pull);\n .loop-grid-columns(@grid-columns, @class, push);\n .loop-grid-columns(@grid-columns, @class, offset);\n}\n\n// Form validation states\n//\n// Used in forms.less to generate the form validation CSS for warnings, errors,\n// and successes.\n\n.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) {\n // Color the label and help text\n .help-block,\n .control-label,\n .radio,\n .checkbox,\n .radio-inline,\n .checkbox-inline {\n color: @text-color;\n }\n // Set the border and box shadow on specific inputs to match\n .form-control {\n border-color: @border-color;\n .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work\n &:focus {\n border-color: darken(@border-color, 10%);\n @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);\n .box-shadow(@shadow);\n }\n }\n // Set validation states also for addons\n .input-group-addon {\n color: @text-color;\n border-color: @border-color;\n background-color: @background-color;\n }\n // Optional feedback icon\n .form-control-feedback {\n color: @text-color;\n }\n}\n\n// Form control focus state\n//\n// Generate a customized focus state and for any input with the specified color,\n// which defaults to the `@input-focus-border` variable.\n//\n// We highly encourage you to not customize the default value, but instead use\n// this to tweak colors on an as-needed basis. This aesthetic change is based on\n// WebKit's default styles, but applicable to a wider range of browsers. Its\n// usability and accessibility should be taken into account with any change.\n//\n// Example usage: change the default blue border and shadow to white for better\n// contrast against a dark gray background.\n\n.form-control-focus(@color: @input-border-focus) {\n @color-rgba: rgba(red(@color), green(@color), blue(@color), .6);\n &:focus {\n border-color: @color;\n outline: 0;\n .box-shadow(~\"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}\");\n }\n}\n\n// Form control sizing\n//\n// Relative text size, padding, and border-radii changes for form controls. For\n// horizontal sizing, wrap controls in the predefined grid classes. `<select>`\n// element gets special love because it's special, and that's a fact!\n\n.input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n height: @input-height;\n padding: @padding-vertical @padding-horizontal;\n font-size: @font-size;\n line-height: @line-height;\n border-radius: @border-radius;\n\n select& {\n height: @input-height;\n line-height: @input-height;\n }\n\n textarea&,\n select[multiple]& {\n height: auto;\n }\n}\n","//\n// Variables\n// --------------------------------------------------\n\n\n//== Colors\n//\n//## Gray and brand colors for use across Bootstrap.\n\n@gray-darker: lighten(#000, 13.5%); // #222\n@gray-dark: lighten(#000, 20%); // #333\n@gray: lighten(#000, 33.5%); // #555\n@gray-light: lighten(#000, 60%); // #999\n@gray-lighter: lighten(#000, 93.5%); // #eee\n\n@brand-primary: #428bca;\n@brand-success: #5cb85c;\n@brand-info: #5bc0de;\n@brand-warning: #f0ad4e;\n@brand-danger: #d9534f;\n\n\n//== Scaffolding\n//\n// ## Settings for some of the most global styles.\n\n//** Background color for `<body>`.\n@body-bg: #fff;\n//** Global text color on `<body>`.\n@text-color: @gray-dark;\n\n//** Global textual link color.\n@link-color: @brand-primary;\n//** Link hover color set via `darken()` function.\n@link-hover-color: darken(@link-color, 15%);\n\n\n//== Typography\n//\n//## Font, line-height, and color for body text, headings, and more.\n\n@font-family-sans-serif: \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n@font-family-serif: Georgia, \"Times New Roman\", Times, serif;\n//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.\n@font-family-monospace: Menlo, Monaco, Consolas, \"Courier New\", monospace;\n@font-family-base: @font-family-sans-serif;\n\n@font-size-base: 14px;\n@font-size-large: ceil((@font-size-base * 1.25)); // ~18px\n@font-size-small: ceil((@font-size-base * 0.85)); // ~12px\n\n@font-size-h1: floor((@font-size-base * 2.6)); // ~36px\n@font-size-h2: floor((@font-size-base * 2.15)); // ~30px\n@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px\n@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px\n@font-size-h5: @font-size-base;\n@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px\n\n//** Unit-less `line-height` for use in components like buttons.\n@line-height-base: 1.428571429; // 20/14\n//** Computed \"line-height\" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.\n@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px\n\n//** By default, this inherits from the `<body>`.\n@headings-font-family: inherit;\n@headings-font-weight: 500;\n@headings-line-height: 1.1;\n@headings-color: inherit;\n\n\n//-- Iconography\n//\n//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.\n\n@icon-font-path: \"../fonts/\";\n@icon-font-name: \"glyphicons-halflings-regular\";\n@icon-font-svg-id: \"glyphicons_halflingsregular\";\n\n//== Components\n//\n//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).\n\n@padding-base-vertical: 6px;\n@padding-base-horizontal: 12px;\n\n@padding-large-vertical: 10px;\n@padding-large-horizontal: 16px;\n\n@padding-small-vertical: 5px;\n@padding-small-horizontal: 10px;\n\n@padding-xs-vertical: 1px;\n@padding-xs-horizontal: 5px;\n\n@line-height-large: 1.33;\n@line-height-small: 1.5;\n\n@border-radius-base: 4px;\n@border-radius-large: 6px;\n@border-radius-small: 3px;\n\n//** Global color for active items (e.g., navs or dropdowns).\n@component-active-color: #fff;\n//** Global background color for active items (e.g., navs or dropdowns).\n@component-active-bg: @brand-primary;\n\n//** Width of the `border` for generating carets that indicator dropdowns.\n@caret-width-base: 4px;\n//** Carets increase slightly in size for larger components.\n@caret-width-large: 5px;\n\n\n//== Tables\n//\n//## Customizes the `.table` component with basic values, each used across all table variations.\n\n//** Padding for `<th>`s and `<td>`s.\n@table-cell-padding: 8px;\n//** Padding for cells in `.table-condensed`.\n@table-condensed-cell-padding: 5px;\n\n//** Default background color used for all tables.\n@table-bg: transparent;\n//** Background color used for `.table-striped`.\n@table-bg-accent: #f9f9f9;\n//** Background color used for `.table-hover`.\n@table-bg-hover: #f5f5f5;\n@table-bg-active: @table-bg-hover;\n\n//** Border color for table and cell borders.\n@table-border-color: #ddd;\n\n\n//== Buttons\n//\n//## For each of Bootstrap's buttons, define text, background and border color.\n\n@btn-font-weight: normal;\n\n@btn-default-color: #333;\n@btn-default-bg: #fff;\n@btn-default-border: #ccc;\n\n@btn-primary-color: #fff;\n@btn-primary-bg: @brand-primary;\n@btn-primary-border: darken(@btn-primary-bg, 5%);\n\n@btn-success-color: #fff;\n@btn-success-bg: @brand-success;\n@btn-success-border: darken(@btn-success-bg, 5%);\n\n@btn-info-color: #fff;\n@btn-info-bg: @brand-info;\n@btn-info-border: darken(@btn-info-bg, 5%);\n\n@btn-warning-color: #fff;\n@btn-warning-bg: @brand-warning;\n@btn-warning-border: darken(@btn-warning-bg, 5%);\n\n@btn-danger-color: #fff;\n@btn-danger-bg: @brand-danger;\n@btn-danger-border: darken(@btn-danger-bg, 5%);\n\n@btn-link-disabled-color: @gray-light;\n\n\n//== Forms\n//\n//##\n\n//** `<input>` background color\n@input-bg: #fff;\n//** `<input disabled>` background color\n@input-bg-disabled: @gray-lighter;\n\n//** Text color for `<input>`s\n@input-color: @gray;\n//** `<input>` border color\n@input-border: #ccc;\n//** `<input>` border radius\n@input-border-radius: @border-radius-base;\n//** Border color for inputs on focus\n@input-border-focus: #66afe9;\n\n//** Placeholder text color\n@input-color-placeholder: @gray-light;\n\n//** Default `.form-control` height\n@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);\n//** Large `.form-control` height\n@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);\n//** Small `.form-control` height\n@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);\n\n@legend-color: @gray-dark;\n@legend-border-color: #e5e5e5;\n\n//** Background color for textual input addons\n@input-group-addon-bg: @gray-lighter;\n//** Border color for textual input addons\n@input-group-addon-border-color: @input-border;\n\n\n//== Dropdowns\n//\n//## Dropdown menu container and contents.\n\n//** Background for the dropdown menu.\n@dropdown-bg: #fff;\n//** Dropdown menu `border-color`.\n@dropdown-border: rgba(0,0,0,.15);\n//** Dropdown menu `border-color` **for IE8**.\n@dropdown-fallback-border: #ccc;\n//** Divider color for between dropdown items.\n@dropdown-divider-bg: #e5e5e5;\n\n//** Dropdown link text color.\n@dropdown-link-color: @gray-dark;\n//** Hover color for dropdown links.\n@dropdown-link-hover-color: darken(@gray-dark, 5%);\n//** Hover background for dropdown links.\n@dropdown-link-hover-bg: #f5f5f5;\n\n//** Active dropdown menu item text color.\n@dropdown-link-active-color: @component-active-color;\n//** Active dropdown menu item background color.\n@dropdown-link-active-bg: @component-active-bg;\n\n//** Disabled dropdown menu item background color.\n@dropdown-link-disabled-color: @gray-light;\n\n//** Text color for headers within dropdown menus.\n@dropdown-header-color: @gray-light;\n\n// Note: Deprecated @dropdown-caret-color as of v3.1.0\n@dropdown-caret-color: #000;\n\n\n//-- Z-index master list\n//\n// Warning: Avoid customizing these values. They're used for a bird's eye view\n// of components dependent on the z-axis and are designed to all work together.\n//\n// Note: These variables are not generated into the Customizer.\n\n@zindex-navbar: 1000;\n@zindex-dropdown: 1000;\n@zindex-popover: 1010;\n@zindex-tooltip: 1030;\n@zindex-navbar-fixed: 1030;\n@zindex-modal-background: 1040;\n@zindex-modal: 1050;\n\n\n//== Media queries breakpoints\n//\n//## Define the breakpoints at which your layout will change, adapting to different screen sizes.\n\n// Extra small screen / phone\n// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1\n@screen-xs: 480px;\n@screen-xs-min: @screen-xs;\n@screen-phone: @screen-xs-min;\n\n// Small screen / tablet\n// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1\n@screen-sm: 768px;\n@screen-sm-min: @screen-sm;\n@screen-tablet: @screen-sm-min;\n\n// Medium screen / desktop\n// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1\n@screen-md: 992px;\n@screen-md-min: @screen-md;\n@screen-desktop: @screen-md-min;\n\n// Large screen / wide desktop\n// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1\n@screen-lg: 1200px;\n@screen-lg-min: @screen-lg;\n@screen-lg-desktop: @screen-lg-min;\n\n// So media queries don't overlap when required, provide a maximum\n@screen-xs-max: (@screen-sm-min - 1);\n@screen-sm-max: (@screen-md-min - 1);\n@screen-md-max: (@screen-lg-min - 1);\n\n\n//== Grid system\n//\n//## Define your custom responsive grid.\n\n//** Number of columns in the grid.\n@grid-columns: 12;\n//** Padding between columns. Gets divided in half for the left and right.\n@grid-gutter-width: 30px;\n// Navbar collapse\n//** Point at which the navbar becomes uncollapsed.\n@grid-float-breakpoint: @screen-sm-min;\n//** Point at which the navbar begins collapsing.\n@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);\n\n\n//== Container sizes\n//\n//## Define the maximum width of `.container` for different screen sizes.\n\n// Small screen / tablet\n@container-tablet: ((720px + @grid-gutter-width));\n//** For `@screen-sm-min` and up.\n@container-sm: @container-tablet;\n\n// Medium screen / desktop\n@container-desktop: ((940px + @grid-gutter-width));\n//** For `@screen-md-min` and up.\n@container-md: @container-desktop;\n\n// Large screen / wide desktop\n@container-large-desktop: ((1140px + @grid-gutter-width));\n//** For `@screen-lg-min` and up.\n@container-lg: @container-large-desktop;\n\n\n//== Navbar\n//\n//##\n\n// Basics of a navbar\n@navbar-height: 50px;\n@navbar-margin-bottom: @line-height-computed;\n@navbar-border-radius: @border-radius-base;\n@navbar-padding-horizontal: floor((@grid-gutter-width / 2));\n@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);\n@navbar-collapse-max-height: 340px;\n\n@navbar-default-color: #777;\n@navbar-default-bg: #f8f8f8;\n@navbar-default-border: darken(@navbar-default-bg, 6.5%);\n\n// Navbar links\n@navbar-default-link-color: #777;\n@navbar-default-link-hover-color: #333;\n@navbar-default-link-hover-bg: transparent;\n@navbar-default-link-active-color: #555;\n@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%);\n@navbar-default-link-disabled-color: #ccc;\n@navbar-default-link-disabled-bg: transparent;\n\n// Navbar brand label\n@navbar-default-brand-color: @navbar-default-link-color;\n@navbar-default-brand-hover-color: darken(@navbar-default-brand-color, 10%);\n@navbar-default-brand-hover-bg: transparent;\n\n// Navbar toggle\n@navbar-default-toggle-hover-bg: #ddd;\n@navbar-default-toggle-icon-bar-bg: #888;\n@navbar-default-toggle-border-color: #ddd;\n\n\n// Inverted navbar\n// Reset inverted navbar basics\n@navbar-inverse-color: @gray-light;\n@navbar-inverse-bg: #222;\n@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);\n\n// Inverted navbar links\n@navbar-inverse-link-color: @gray-light;\n@navbar-inverse-link-hover-color: #fff;\n@navbar-inverse-link-hover-bg: transparent;\n@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;\n@navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 10%);\n@navbar-inverse-link-disabled-color: #444;\n@navbar-inverse-link-disabled-bg: transparent;\n\n// Inverted navbar brand label\n@navbar-inverse-brand-color: @navbar-inverse-link-color;\n@navbar-inverse-brand-hover-color: #fff;\n@navbar-inverse-brand-hover-bg: transparent;\n\n// Inverted navbar toggle\n@navbar-inverse-toggle-hover-bg: #333;\n@navbar-inverse-toggle-icon-bar-bg: #fff;\n@navbar-inverse-toggle-border-color: #333;\n\n\n//== Navs\n//\n//##\n\n//=== Shared nav styles\n@nav-link-padding: 10px 15px;\n@nav-link-hover-bg: @gray-lighter;\n\n@nav-disabled-link-color: @gray-light;\n@nav-disabled-link-hover-color: @gray-light;\n\n@nav-open-link-hover-color: #fff;\n\n//== Tabs\n@nav-tabs-border-color: #ddd;\n\n@nav-tabs-link-hover-border-color: @gray-lighter;\n\n@nav-tabs-active-link-hover-bg: @body-bg;\n@nav-tabs-active-link-hover-color: @gray;\n@nav-tabs-active-link-hover-border-color: #ddd;\n\n@nav-tabs-justified-link-border-color: #ddd;\n@nav-tabs-justified-active-link-border-color: @body-bg;\n\n//== Pills\n@nav-pills-border-radius: @border-radius-base;\n@nav-pills-active-link-hover-bg: @component-active-bg;\n@nav-pills-active-link-hover-color: @component-active-color;\n\n\n//== Pagination\n//\n//##\n\n@pagination-color: @link-color;\n@pagination-bg: #fff;\n@pagination-border: #ddd;\n\n@pagination-hover-color: @link-hover-color;\n@pagination-hover-bg: @gray-lighter;\n@pagination-hover-border: #ddd;\n\n@pagination-active-color: #fff;\n@pagination-active-bg: @brand-primary;\n@pagination-active-border: @brand-primary;\n\n@pagination-disabled-color: @gray-light;\n@pagination-disabled-bg: #fff;\n@pagination-disabled-border: #ddd;\n\n\n//== Pager\n//\n//##\n\n@pager-bg: @pagination-bg;\n@pager-border: @pagination-border;\n@pager-border-radius: 15px;\n\n@pager-hover-bg: @pagination-hover-bg;\n\n@pager-active-bg: @pagination-active-bg;\n@pager-active-color: @pagination-active-color;\n\n@pager-disabled-color: @pagination-disabled-color;\n\n\n//== Jumbotron\n//\n//##\n\n@jumbotron-padding: 30px;\n@jumbotron-color: inherit;\n@jumbotron-bg: @gray-lighter;\n@jumbotron-heading-color: inherit;\n@jumbotron-font-size: ceil((@font-size-base * 1.5));\n\n\n//== Form states and alerts\n//\n//## Define colors for form feedback states and, by default, alerts.\n\n@state-success-text: #3c763d;\n@state-success-bg: #dff0d8;\n@state-success-border: darken(spin(@state-success-bg, -10), 5%);\n\n@state-info-text: #31708f;\n@state-info-bg: #d9edf7;\n@state-info-border: darken(spin(@state-info-bg, -10), 7%);\n\n@state-warning-text: #8a6d3b;\n@state-warning-bg: #fcf8e3;\n@state-warning-border: darken(spin(@state-warning-bg, -10), 5%);\n\n@state-danger-text: #a94442;\n@state-danger-bg: #f2dede;\n@state-danger-border: darken(spin(@state-danger-bg, -10), 5%);\n\n\n//== Tooltips\n//\n//##\n\n//** Tooltip max width\n@tooltip-max-width: 200px;\n//** Tooltip text color\n@tooltip-color: #fff;\n//** Tooltip background color\n@tooltip-bg: #000;\n@tooltip-opacity: .9;\n\n//** Tooltip arrow width\n@tooltip-arrow-width: 5px;\n//** Tooltip arrow color\n@tooltip-arrow-color: @tooltip-bg;\n\n\n//== Popovers\n//\n//##\n\n//** Popover body background color\n@popover-bg: #fff;\n//** Popover maximum width\n@popover-max-width: 276px;\n//** Popover border color\n@popover-border-color: rgba(0,0,0,.2);\n//** Popover fallback border color\n@popover-fallback-border-color: #ccc;\n\n//** Popover title background color\n@popover-title-bg: darken(@popover-bg, 3%);\n\n//** Popover arrow width\n@popover-arrow-width: 10px;\n//** Popover arrow color\n@popover-arrow-color: #fff;\n\n//** Popover outer arrow width\n@popover-arrow-outer-width: (@popover-arrow-width + 1);\n//** Popover outer arrow color\n@popover-arrow-outer-color: fadein(@popover-border-color, 5%);\n//** Popover outer arrow fallback color\n@popover-arrow-outer-fallback-color: darken(@popover-fallback-border-color, 20%);\n\n\n//== Labels\n//\n//##\n\n//** Default label background color\n@label-default-bg: @gray-light;\n//** Primary label background color\n@label-primary-bg: @brand-primary;\n//** Success label background color\n@label-success-bg: @brand-success;\n//** Info label background color\n@label-info-bg: @brand-info;\n//** Warning label background color\n@label-warning-bg: @brand-warning;\n//** Danger label background color\n@label-danger-bg: @brand-danger;\n\n//** Default label text color\n@label-color: #fff;\n//** Default text color of a linked label\n@label-link-hover-color: #fff;\n\n\n//== Modals\n//\n//##\n\n//** Padding applied to the modal body\n@modal-inner-padding: 20px;\n\n//** Padding applied to the modal title\n@modal-title-padding: 15px;\n//** Modal title line-height\n@modal-title-line-height: @line-height-base;\n\n//** Background color of modal content area\n@modal-content-bg: #fff;\n//** Modal content border color\n@modal-content-border-color: rgba(0,0,0,.2);\n//** Modal content border color **for IE8**\n@modal-content-fallback-border-color: #999;\n\n//** Modal backdrop background color\n@modal-backdrop-bg: #000;\n//** Modal backdrop opacity\n@modal-backdrop-opacity: .5;\n//** Modal header border color\n@modal-header-border-color: #e5e5e5;\n//** Modal footer border color\n@modal-footer-border-color: @modal-header-border-color;\n\n@modal-lg: 900px;\n@modal-md: 600px;\n@modal-sm: 300px;\n\n\n//== Alerts\n//\n//## Define alert colors, border radius, and padding.\n\n@alert-padding: 15px;\n@alert-border-radius: @border-radius-base;\n@alert-link-font-weight: bold;\n\n@alert-success-bg: @state-success-bg;\n@alert-success-text: @state-success-text;\n@alert-success-border: @state-success-border;\n\n@alert-info-bg: @state-info-bg;\n@alert-info-text: @state-info-text;\n@alert-info-border: @state-info-border;\n\n@alert-warning-bg: @state-warning-bg;\n@alert-warning-text: @state-warning-text;\n@alert-warning-border: @state-warning-border;\n\n@alert-danger-bg: @state-danger-bg;\n@alert-danger-text: @state-danger-text;\n@alert-danger-border: @state-danger-border;\n\n\n//== Progress bars\n//\n//##\n\n//** Background color of the whole progress component\n@progress-bg: #f5f5f5;\n//** Progress bar text color\n@progress-bar-color: #fff;\n\n//** Default progress bar color\n@progress-bar-bg: @brand-primary;\n//** Success progress bar color\n@progress-bar-success-bg: @brand-success;\n//** Warning progress bar color\n@progress-bar-warning-bg: @brand-warning;\n//** Danger progress bar color\n@progress-bar-danger-bg: @brand-danger;\n//** Info progress bar color\n@progress-bar-info-bg: @brand-info;\n\n\n//== List group\n//\n//##\n\n//** Background color on `.list-group-item`\n@list-group-bg: #fff;\n//** `.list-group-item` border color\n@list-group-border: #ddd;\n//** List group border radius\n@list-group-border-radius: @border-radius-base;\n\n//** Background color of single list elements on hover\n@list-group-hover-bg: #f5f5f5;\n//** Text color of active list elements\n@list-group-active-color: @component-active-color;\n//** Background color of active list elements\n@list-group-active-bg: @component-active-bg;\n//** Border color of active list elements\n@list-group-active-border: @list-group-active-bg;\n@list-group-active-text-color: lighten(@list-group-active-bg, 40%);\n\n@list-group-link-color: #555;\n@list-group-link-heading-color: #333;\n\n\n//== Panels\n//\n//##\n\n@panel-bg: #fff;\n@panel-body-padding: 15px;\n@panel-border-radius: @border-radius-base;\n\n//** Border color for elements within panels\n@panel-inner-border: #ddd;\n@panel-footer-bg: #f5f5f5;\n\n@panel-default-text: @gray-dark;\n@panel-default-border: #ddd;\n@panel-default-heading-bg: #f5f5f5;\n\n@panel-primary-text: #fff;\n@panel-primary-border: @brand-primary;\n@panel-primary-heading-bg: @brand-primary;\n\n@panel-success-text: @state-success-text;\n@panel-success-border: @state-success-border;\n@panel-success-heading-bg: @state-success-bg;\n\n@panel-info-text: @state-info-text;\n@panel-info-border: @state-info-border;\n@panel-info-heading-bg: @state-info-bg;\n\n@panel-warning-text: @state-warning-text;\n@panel-warning-border: @state-warning-border;\n@panel-warning-heading-bg: @state-warning-bg;\n\n@panel-danger-text: @state-danger-text;\n@panel-danger-border: @state-danger-border;\n@panel-danger-heading-bg: @state-danger-bg;\n\n\n//== Thumbnails\n//\n//##\n\n//** Padding around the thumbnail image\n@thumbnail-padding: 4px;\n//** Thumbnail background color\n@thumbnail-bg: @body-bg;\n//** Thumbnail border color\n@thumbnail-border: #ddd;\n//** Thumbnail border radius\n@thumbnail-border-radius: @border-radius-base;\n\n//** Custom text color for thumbnail captions\n@thumbnail-caption-color: @text-color;\n//** Padding around the thumbnail caption\n@thumbnail-caption-padding: 9px;\n\n\n//== Wells\n//\n//##\n\n@well-bg: #f5f5f5;\n@well-border: darken(@well-bg, 7%);\n\n\n//== Badges\n//\n//##\n\n@badge-color: #fff;\n//** Linked badge text color on hover\n@badge-link-hover-color: #fff;\n@badge-bg: @gray-light;\n\n//** Badge text color in active nav link\n@badge-active-color: @link-color;\n//** Badge background color in active nav link\n@badge-active-bg: #fff;\n\n@badge-font-weight: bold;\n@badge-line-height: 1;\n@badge-border-radius: 10px;\n\n\n//== Breadcrumbs\n//\n//##\n\n@breadcrumb-padding-vertical: 8px;\n@breadcrumb-padding-horizontal: 15px;\n//** Breadcrumb background color\n@breadcrumb-bg: #f5f5f5;\n//** Breadcrumb text color\n@breadcrumb-color: #ccc;\n//** Text color of current page in the breadcrumb\n@breadcrumb-active-color: @gray-light;\n//** Textual separator for between breadcrumb elements\n@breadcrumb-separator: \"/\";\n\n\n//== Carousel\n//\n//##\n\n@carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);\n\n@carousel-control-color: #fff;\n@carousel-control-width: 15%;\n@carousel-control-opacity: .5;\n@carousel-control-font-size: 20px;\n\n@carousel-indicator-active-bg: #fff;\n@carousel-indicator-border-color: #fff;\n\n@carousel-caption-color: #fff;\n\n\n//== Close\n//\n//##\n\n@close-font-weight: bold;\n@close-color: #000;\n@close-text-shadow: 0 1px 0 #fff;\n\n\n//== Code\n//\n//##\n\n@code-color: #c7254e;\n@code-bg: #f9f2f4;\n\n@kbd-color: #fff;\n@kbd-bg: #333;\n\n@pre-bg: #f5f5f5;\n@pre-color: @gray-dark;\n@pre-border-color: #ccc;\n@pre-scrollable-max-height: 340px;\n\n\n//== Type\n//\n//##\n\n//** Text muted color\n@text-muted: @gray-light;\n//** Abbreviations and acronyms border color\n@abbr-border-color: @gray-light;\n//** Headings small color\n@headings-small-color: @gray-light;\n//** Blockquote small color\n@blockquote-small-color: @gray-light;\n//** Blockquote font size\n@blockquote-font-size: (@font-size-base * 1.25);\n//** Blockquote border color\n@blockquote-border-color: @gray-lighter;\n//** Page header border color\n@page-header-border-color: @gray-lighter;\n\n\n//== Miscellaneous\n//\n//##\n\n//** Horizontal line color.\n@hr-border: @gray-lighter;\n\n//** Horizontal offset for forms and lists.\n@component-offset-horizontal: 180px;\n","//\n// Thumbnails\n// --------------------------------------------------\n\n\n// Mixin and adjust the regular image class\n.thumbnail {\n display: block;\n padding: @thumbnail-padding;\n margin-bottom: @line-height-computed;\n line-height: @line-height-base;\n background-color: @thumbnail-bg;\n border: 1px solid @thumbnail-border;\n border-radius: @thumbnail-border-radius;\n .transition(all .2s ease-in-out);\n\n > img,\n a > img {\n &:extend(.img-responsive);\n margin-left: auto;\n margin-right: auto;\n }\n\n // Add a hover state for linked versions only\n a&:hover,\n a&:focus,\n a&.active {\n border-color: @link-color;\n }\n\n // Image captions\n .caption {\n padding: @thumbnail-caption-padding;\n color: @thumbnail-caption-color;\n }\n}\n","//\n// Carousel\n// --------------------------------------------------\n\n\n// Wrapper for the slide container and indicators\n.carousel {\n position: relative;\n}\n\n.carousel-inner {\n position: relative;\n overflow: hidden;\n width: 100%;\n\n > .item {\n display: none;\n position: relative;\n .transition(.6s ease-in-out left);\n\n // Account for jankitude on images\n > img,\n > a > img {\n &:extend(.img-responsive);\n line-height: 1;\n }\n }\n\n > .active,\n > .next,\n > .prev { display: block; }\n\n > .active {\n left: 0;\n }\n\n > .next,\n > .prev {\n position: absolute;\n top: 0;\n width: 100%;\n }\n\n > .next {\n left: 100%;\n }\n > .prev {\n left: -100%;\n }\n > .next.left,\n > .prev.right {\n left: 0;\n }\n\n > .active.left {\n left: -100%;\n }\n > .active.right {\n left: 100%;\n }\n\n}\n\n// Left/right controls for nav\n// ---------------------------\n\n.carousel-control {\n position: absolute;\n top: 0;\n left: 0;\n bottom: 0;\n width: @carousel-control-width;\n .opacity(@carousel-control-opacity);\n font-size: @carousel-control-font-size;\n color: @carousel-control-color;\n text-align: center;\n text-shadow: @carousel-text-shadow;\n // We can't have this transition here because WebKit cancels the carousel\n // animation if you trip this while in the middle of another animation.\n\n // Set gradients for backgrounds\n &.left {\n #gradient > .horizontal(@start-color: rgba(0,0,0,.5); @end-color: rgba(0,0,0,.0001));\n }\n &.right {\n left: auto;\n right: 0;\n #gradient > .horizontal(@start-color: rgba(0,0,0,.0001); @end-color: rgba(0,0,0,.5));\n }\n\n // Hover/focus state\n &:hover,\n &:focus {\n outline: none;\n color: @carousel-control-color;\n text-decoration: none;\n .opacity(.9);\n }\n\n // Toggles\n .icon-prev,\n .icon-next,\n .glyphicon-chevron-left,\n .glyphicon-chevron-right {\n position: absolute;\n top: 50%;\n z-index: 5;\n display: inline-block;\n }\n .icon-prev,\n .glyphicon-chevron-left {\n left: 50%;\n }\n .icon-next,\n .glyphicon-chevron-right {\n right: 50%;\n }\n .icon-prev,\n .icon-next {\n width: 20px;\n height: 20px;\n margin-top: -10px;\n margin-left: -10px;\n font-family: serif;\n }\n\n .icon-prev {\n &:before {\n content: '\\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)\n }\n }\n .icon-next {\n &:before {\n content: '\\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)\n }\n }\n}\n\n// Optional indicator pips\n//\n// Add an unordered list with the following class and add a list item for each\n// slide your carousel holds.\n\n.carousel-indicators {\n position: absolute;\n bottom: 10px;\n left: 50%;\n z-index: 15;\n width: 60%;\n margin-left: -30%;\n padding-left: 0;\n list-style: none;\n text-align: center;\n\n li {\n display: inline-block;\n width: 10px;\n height: 10px;\n margin: 1px;\n text-indent: -999px;\n border: 1px solid @carousel-indicator-border-color;\n border-radius: 10px;\n cursor: pointer;\n\n // IE8-9 hack for event handling\n //\n // Internet Explorer 8-9 does not support clicks on elements without a set\n // `background-color`. We cannot use `filter` since that's not viewed as a\n // background color by the browser. Thus, a hack is needed.\n //\n // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we\n // set alpha transparency for the best results possible.\n background-color: #000 \\9; // IE8\n background-color: rgba(0,0,0,0); // IE9\n }\n .active {\n margin: 0;\n width: 12px;\n height: 12px;\n background-color: @carousel-indicator-active-bg;\n }\n}\n\n// Optional captions\n// -----------------------------\n// Hidden by default for smaller viewports\n.carousel-caption {\n position: absolute;\n left: 15%;\n right: 15%;\n bottom: 20px;\n z-index: 10;\n padding-top: 20px;\n padding-bottom: 20px;\n color: @carousel-caption-color;\n text-align: center;\n text-shadow: @carousel-text-shadow;\n & .btn {\n text-shadow: none; // No shadow for button elements in carousel-caption\n }\n}\n\n\n// Scale up controls for tablets and up\n@media screen and (min-width: @screen-sm-min) {\n\n // Scale up the controls a smidge\n .carousel-control {\n .glyphicon-chevron-left,\n .glyphicon-chevron-right,\n .icon-prev,\n .icon-next {\n width: 30px;\n height: 30px;\n margin-top: -15px;\n margin-left: -15px;\n font-size: 30px;\n }\n }\n\n // Show and left align the captions\n .carousel-caption {\n left: 20%;\n right: 20%;\n padding-bottom: 30px;\n }\n\n // Move up the indicators\n .carousel-indicators {\n bottom: 20px;\n }\n}\n","//\n// Typography\n// --------------------------------------------------\n\n\n// Headings\n// -------------------------\n\nh1, h2, h3, h4, h5, h6,\n.h1, .h2, .h3, .h4, .h5, .h6 {\n font-family: @headings-font-family;\n font-weight: @headings-font-weight;\n line-height: @headings-line-height;\n color: @headings-color;\n\n small,\n .small {\n font-weight: normal;\n line-height: 1;\n color: @headings-small-color;\n }\n}\n\nh1, .h1,\nh2, .h2,\nh3, .h3 {\n margin-top: @line-height-computed;\n margin-bottom: (@line-height-computed / 2);\n\n small,\n .small {\n font-size: 65%;\n }\n}\nh4, .h4,\nh5, .h5,\nh6, .h6 {\n margin-top: (@line-height-computed / 2);\n margin-bottom: (@line-height-computed / 2);\n\n small,\n .small {\n font-size: 75%;\n }\n}\n\nh1, .h1 { font-size: @font-size-h1; }\nh2, .h2 { font-size: @font-size-h2; }\nh3, .h3 { font-size: @font-size-h3; }\nh4, .h4 { font-size: @font-size-h4; }\nh5, .h5 { font-size: @font-size-h5; }\nh6, .h6 { font-size: @font-size-h6; }\n\n\n// Body text\n// -------------------------\n\np {\n margin: 0 0 (@line-height-computed / 2);\n}\n\n.lead {\n margin-bottom: @line-height-computed;\n font-size: floor((@font-size-base * 1.15));\n font-weight: 200;\n line-height: 1.4;\n\n @media (min-width: @screen-sm-min) {\n font-size: (@font-size-base * 1.5);\n }\n}\n\n\n// Emphasis & misc\n// -------------------------\n\n// Ex: 14px base font * 85% = about 12px\nsmall,\n.small { font-size: 85%; }\n\n// Undo browser default styling\ncite { font-style: normal; }\n\n// Alignment\n.text-left { text-align: left; }\n.text-right { text-align: right; }\n.text-center { text-align: center; }\n.text-justify { text-align: justify; }\n\n// Contextual colors\n.text-muted {\n color: @text-muted;\n}\n.text-primary {\n .text-emphasis-variant(@brand-primary);\n}\n.text-success {\n .text-emphasis-variant(@state-success-text);\n}\n.text-info {\n .text-emphasis-variant(@state-info-text);\n}\n.text-warning {\n .text-emphasis-variant(@state-warning-text);\n}\n.text-danger {\n .text-emphasis-variant(@state-danger-text);\n}\n\n// Contextual backgrounds\n// For now we'll leave these alongside the text classes until v4 when we can\n// safely shift things around (per SemVer rules).\n.bg-primary {\n // Given the contrast here, this is the only class to have its color inverted\n // automatically.\n color: #fff;\n .bg-variant(@brand-primary);\n}\n.bg-success {\n .bg-variant(@state-success-bg);\n}\n.bg-info {\n .bg-variant(@state-info-bg);\n}\n.bg-warning {\n .bg-variant(@state-warning-bg);\n}\n.bg-danger {\n .bg-variant(@state-danger-bg);\n}\n\n\n// Page header\n// -------------------------\n\n.page-header {\n padding-bottom: ((@line-height-computed / 2) - 1);\n margin: (@line-height-computed * 2) 0 @line-height-computed;\n border-bottom: 1px solid @page-header-border-color;\n}\n\n\n// Lists\n// --------------------------------------------------\n\n// Unordered and Ordered lists\nul,\nol {\n margin-top: 0;\n margin-bottom: (@line-height-computed / 2);\n ul,\n ol {\n margin-bottom: 0;\n }\n}\n\n// List options\n\n// Unstyled keeps list items block level, just removes default browser padding and list-style\n.list-unstyled {\n padding-left: 0;\n list-style: none;\n}\n\n// Inline turns list items into inline-block\n.list-inline {\n .list-unstyled();\n margin-left: -5px;\n\n > li {\n display: inline-block;\n padding-left: 5px;\n padding-right: 5px;\n }\n}\n\n// Description Lists\ndl {\n margin-top: 0; // Remove browser default\n margin-bottom: @line-height-computed;\n}\ndt,\ndd {\n line-height: @line-height-base;\n}\ndt {\n font-weight: bold;\n}\ndd {\n margin-left: 0; // Undo browser default\n}\n\n// Horizontal description lists\n//\n// Defaults to being stacked without any of the below styles applied, until the\n// grid breakpoint is reached (default of ~768px).\n\n@media (min-width: @grid-float-breakpoint) {\n .dl-horizontal {\n dt {\n float: left;\n width: (@component-offset-horizontal - 20);\n clear: left;\n text-align: right;\n .text-overflow();\n }\n dd {\n margin-left: @component-offset-horizontal;\n &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present\n }\n }\n}\n\n// MISC\n// ----\n\n// Abbreviations and acronyms\nabbr[title],\n// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257\nabbr[data-original-title] {\n cursor: help;\n border-bottom: 1px dotted @abbr-border-color;\n}\n.initialism {\n font-size: 90%;\n text-transform: uppercase;\n}\n\n// Blockquotes\nblockquote {\n padding: (@line-height-computed / 2) @line-height-computed;\n margin: 0 0 @line-height-computed;\n font-size: @blockquote-font-size;\n border-left: 5px solid @blockquote-border-color;\n\n p,\n ul,\n ol {\n &:last-child {\n margin-bottom: 0;\n }\n }\n\n // Note: Deprecated small and .small as of v3.1.0\n // Context: https://github.com/twbs/bootstrap/issues/11660\n footer,\n small,\n .small {\n display: block;\n font-size: 80%; // back to default font-size\n line-height: @line-height-base;\n color: @blockquote-small-color;\n\n &:before {\n content: '\\2014 \\00A0'; // em dash, nbsp\n }\n }\n}\n\n// Opposite alignment of blockquote\n//\n// Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0.\n.blockquote-reverse,\nblockquote.pull-right {\n padding-right: 15px;\n padding-left: 0;\n border-right: 5px solid @blockquote-border-color;\n border-left: 0;\n text-align: right;\n\n // Account for citation\n footer,\n small,\n .small {\n &:before { content: ''; }\n &:after {\n content: '\\00A0 \\2014'; // nbsp, em dash\n }\n }\n}\n\n// Quotes\nblockquote:before,\nblockquote:after {\n content: \"\";\n}\n\n// Addresses\naddress {\n margin-bottom: @line-height-computed;\n font-style: normal;\n line-height: @line-height-base;\n}\n","//\n// Code (inline and block)\n// --------------------------------------------------\n\n\n// Inline and block code styles\ncode,\nkbd,\npre,\nsamp {\n font-family: @font-family-monospace;\n}\n\n// Inline code\ncode {\n padding: 2px 4px;\n font-size: 90%;\n color: @code-color;\n background-color: @code-bg;\n white-space: nowrap;\n border-radius: @border-radius-base;\n}\n\n// User input typically entered via keyboard\nkbd {\n padding: 2px 4px;\n font-size: 90%;\n color: @kbd-color;\n background-color: @kbd-bg;\n border-radius: @border-radius-small;\n box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);\n}\n\n// Blocks of code\npre {\n display: block;\n padding: ((@line-height-computed - 1) / 2);\n margin: 0 0 (@line-height-computed / 2);\n font-size: (@font-size-base - 1); // 14px to 13px\n line-height: @line-height-base;\n word-break: break-all;\n word-wrap: break-word;\n color: @pre-color;\n background-color: @pre-bg;\n border: 1px solid @pre-border-color;\n border-radius: @border-radius-base;\n\n // Account for some code outputs that place code tags in pre tags\n code {\n padding: 0;\n font-size: inherit;\n color: inherit;\n white-space: pre-wrap;\n background-color: transparent;\n border-radius: 0;\n }\n}\n\n// Enable scrollable blocks of code\n.pre-scrollable {\n max-height: @pre-scrollable-max-height;\n overflow-y: scroll;\n}\n","//\n// Grid system\n// --------------------------------------------------\n\n\n// Container widths\n//\n// Set the container width, and override it for fixed navbars in media queries.\n\n.container {\n .container-fixed();\n\n @media (min-width: @screen-sm-min) {\n width: @container-sm;\n }\n @media (min-width: @screen-md-min) {\n width: @container-md;\n }\n @media (min-width: @screen-lg-min) {\n width: @container-lg;\n }\n}\n\n\n// Fluid container\n//\n// Utilizes the mixin meant for fixed width containers, but without any defined\n// width for fluid, full width layouts.\n\n.container-fluid {\n .container-fixed();\n}\n\n\n// Row\n//\n// Rows contain and clear the floats of your columns.\n\n.row {\n .make-row();\n}\n\n\n// Columns\n//\n// Common styles for small and large grid columns\n\n.make-grid-columns();\n\n\n// Extra small grid\n//\n// Columns, offsets, pushes, and pulls for extra small devices like\n// smartphones.\n\n.make-grid(xs);\n\n\n// Small grid\n//\n// Columns, offsets, pushes, and pulls for the small device range, from phones\n// to tablets.\n\n@media (min-width: @screen-sm-min) {\n .make-grid(sm);\n}\n\n\n// Medium grid\n//\n// Columns, offsets, pushes, and pulls for the desktop device range.\n\n@media (min-width: @screen-md-min) {\n .make-grid(md);\n}\n\n\n// Large grid\n//\n// Columns, offsets, pushes, and pulls for the large desktop device range.\n\n@media (min-width: @screen-lg-min) {\n .make-grid(lg);\n}\n","//\n// Tables\n// --------------------------------------------------\n\n\ntable {\n max-width: 100%;\n background-color: @table-bg;\n}\nth {\n text-align: left;\n}\n\n\n// Baseline styles\n\n.table {\n width: 100%;\n margin-bottom: @line-height-computed;\n // Cells\n > thead,\n > tbody,\n > tfoot {\n > tr {\n > th,\n > td {\n padding: @table-cell-padding;\n line-height: @line-height-base;\n vertical-align: top;\n border-top: 1px solid @table-border-color;\n }\n }\n }\n // Bottom align for column headings\n > thead > tr > th {\n vertical-align: bottom;\n border-bottom: 2px solid @table-border-color;\n }\n // Remove top border from thead by default\n > caption + thead,\n > colgroup + thead,\n > thead:first-child {\n > tr:first-child {\n > th,\n > td {\n border-top: 0;\n }\n }\n }\n // Account for multiple tbody instances\n > tbody + tbody {\n border-top: 2px solid @table-border-color;\n }\n\n // Nesting\n .table {\n background-color: @body-bg;\n }\n}\n\n\n// Condensed table w/ half padding\n\n.table-condensed {\n > thead,\n > tbody,\n > tfoot {\n > tr {\n > th,\n > td {\n padding: @table-condensed-cell-padding;\n }\n }\n }\n}\n\n\n// Bordered version\n//\n// Add borders all around the table and between all the columns.\n\n.table-bordered {\n border: 1px solid @table-border-color;\n > thead,\n > tbody,\n > tfoot {\n > tr {\n > th,\n > td {\n border: 1px solid @table-border-color;\n }\n }\n }\n > thead > tr {\n > th,\n > td {\n border-bottom-width: 2px;\n }\n }\n}\n\n\n// Zebra-striping\n//\n// Default zebra-stripe styles (alternating gray and transparent backgrounds)\n\n.table-striped {\n > tbody > tr:nth-child(odd) {\n > td,\n > th {\n background-color: @table-bg-accent;\n }\n }\n}\n\n\n// Hover effect\n//\n// Placed here since it has to come after the potential zebra striping\n\n.table-hover {\n > tbody > tr:hover {\n > td,\n > th {\n background-color: @table-bg-hover;\n }\n }\n}\n\n\n// Table cell sizing\n//\n// Reset default table behavior\n\ntable col[class*=\"col-\"] {\n position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)\n float: none;\n display: table-column;\n}\ntable {\n td,\n th {\n &[class*=\"col-\"] {\n position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)\n float: none;\n display: table-cell;\n }\n }\n}\n\n\n// Table backgrounds\n//\n// Exact selectors below required to override `.table-striped` and prevent\n// inheritance to nested tables.\n\n// Generate the contextual variants\n.table-row-variant(active; @table-bg-active);\n.table-row-variant(success; @state-success-bg);\n.table-row-variant(info; @state-info-bg);\n.table-row-variant(warning; @state-warning-bg);\n.table-row-variant(danger; @state-danger-bg);\n\n\n// Responsive tables\n//\n// Wrap your tables in `.table-responsive` and we'll make them mobile friendly\n// by enabling horizontal scrolling. Only applies <768px. Everything above that\n// will display normally.\n\n@media (max-width: @screen-xs-max) {\n .table-responsive {\n width: 100%;\n margin-bottom: (@line-height-computed * 0.75);\n overflow-y: hidden;\n overflow-x: scroll;\n -ms-overflow-style: -ms-autohiding-scrollbar;\n border: 1px solid @table-border-color;\n -webkit-overflow-scrolling: touch;\n\n // Tighten up spacing\n > .table {\n margin-bottom: 0;\n\n // Ensure the content doesn't wrap\n > thead,\n > tbody,\n > tfoot {\n > tr {\n > th,\n > td {\n white-space: nowrap;\n }\n }\n }\n }\n\n // Special overrides for the bordered tables\n > .table-bordered {\n border: 0;\n\n // Nuke the appropriate borders so that the parent can handle them\n > thead,\n > tbody,\n > tfoot {\n > tr {\n > th:first-child,\n > td:first-child {\n border-left: 0;\n }\n > th:last-child,\n > td:last-child {\n border-right: 0;\n }\n }\n }\n\n // Only nuke the last row's bottom-border in `tbody` and `tfoot` since\n // chances are there will be only one `tr` in a `thead` and that would\n // remove the border altogether.\n > tbody,\n > tfoot {\n > tr:last-child {\n > th,\n > td {\n border-bottom: 0;\n }\n }\n }\n\n }\n }\n}\n","//\n// Forms\n// --------------------------------------------------\n\n\n// Normalize non-controls\n//\n// Restyle and baseline non-control form elements.\n\nfieldset {\n padding: 0;\n margin: 0;\n border: 0;\n // Chrome and Firefox set a `min-width: -webkit-min-content;` on fieldsets,\n // so we reset that to ensure it behaves more like a standard block element.\n // See https://github.com/twbs/bootstrap/issues/12359.\n min-width: 0;\n}\n\nlegend {\n display: block;\n width: 100%;\n padding: 0;\n margin-bottom: @line-height-computed;\n font-size: (@font-size-base * 1.5);\n line-height: inherit;\n color: @legend-color;\n border: 0;\n border-bottom: 1px solid @legend-border-color;\n}\n\nlabel {\n display: inline-block;\n margin-bottom: 5px;\n font-weight: bold;\n}\n\n\n// Normalize form controls\n//\n// While most of our form styles require extra classes, some basic normalization\n// is required to ensure optimum display with or without those classes to better\n// address browser inconsistencies.\n\n// Override content-box in Normalize (* isn't specific enough)\ninput[type=\"search\"] {\n .box-sizing(border-box);\n}\n\n// Position radios and checkboxes better\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n margin: 4px 0 0;\n margin-top: 1px \\9; /* IE8-9 */\n line-height: normal;\n}\n\n// Set the height of file controls to match text inputs\ninput[type=\"file\"] {\n display: block;\n}\n\n// Make range inputs behave like textual form controls\ninput[type=\"range\"] {\n display: block;\n width: 100%;\n}\n\n// Make multiple select elements height not fixed\nselect[multiple],\nselect[size] {\n height: auto;\n}\n\n// Focus for file, radio, and checkbox\ninput[type=\"file\"]:focus,\ninput[type=\"radio\"]:focus,\ninput[type=\"checkbox\"]:focus {\n .tab-focus();\n}\n\n// Adjust output element\noutput {\n display: block;\n padding-top: (@padding-base-vertical + 1);\n font-size: @font-size-base;\n line-height: @line-height-base;\n color: @input-color;\n}\n\n\n// Common form controls\n//\n// Shared size and type resets for form controls. Apply `.form-control` to any\n// of the following form controls:\n//\n// select\n// textarea\n// input[type=\"text\"]\n// input[type=\"password\"]\n// input[type=\"datetime\"]\n// input[type=\"datetime-local\"]\n// input[type=\"date\"]\n// input[type=\"month\"]\n// input[type=\"time\"]\n// input[type=\"week\"]\n// input[type=\"number\"]\n// input[type=\"email\"]\n// input[type=\"url\"]\n// input[type=\"search\"]\n// input[type=\"tel\"]\n// input[type=\"color\"]\n\n.form-control {\n display: block;\n width: 100%;\n height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)\n padding: @padding-base-vertical @padding-base-horizontal;\n font-size: @font-size-base;\n line-height: @line-height-base;\n color: @input-color;\n background-color: @input-bg;\n background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n border: 1px solid @input-border;\n border-radius: @input-border-radius;\n .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));\n .transition(~\"border-color ease-in-out .15s, box-shadow ease-in-out .15s\");\n\n // Customize the `:focus` state to imitate native WebKit styles.\n .form-control-focus();\n\n // Placeholder\n .placeholder();\n\n // Disabled and read-only inputs\n //\n // HTML5 says that controls under a fieldset > legend:first-child won't be\n // disabled if the fieldset is disabled. Due to implementation difficulty, we\n // don't honor that edge case; we style them as disabled anyway.\n &[disabled],\n &[readonly],\n fieldset[disabled] & {\n cursor: not-allowed;\n background-color: @input-bg-disabled;\n opacity: 1; // iOS fix for unreadable disabled content\n }\n\n // Reset height for `textarea`s\n textarea& {\n height: auto;\n }\n}\n\n\n// Search inputs in iOS\n//\n// This overrides the extra rounded corners on search inputs in iOS so that our\n// `.form-control` class can properly style them. Note that this cannot simply\n// be added to `.form-control` as it's not specific enough. For details, see\n// https://github.com/twbs/bootstrap/issues/11586.\n\ninput[type=\"search\"] {\n -webkit-appearance: none;\n}\n\n\n// Special styles for iOS date input\n//\n// In Mobile Safari, date inputs require a pixel line-height that matches the\n// given height of the input.\n\ninput[type=\"date\"] {\n line-height: @input-height-base;\n}\n\n\n// Form groups\n//\n// Designed to help with the organization and spacing of vertical forms. For\n// horizontal forms, use the predefined grid classes.\n\n.form-group {\n margin-bottom: 15px;\n}\n\n\n// Checkboxes and radios\n//\n// Indent the labels to position radios/checkboxes as hanging controls.\n\n.radio,\n.checkbox {\n display: block;\n min-height: @line-height-computed; // clear the floating input if there is no label text\n margin-top: 10px;\n margin-bottom: 10px;\n padding-left: 20px;\n label {\n display: inline;\n font-weight: normal;\n cursor: pointer;\n }\n}\n.radio input[type=\"radio\"],\n.radio-inline input[type=\"radio\"],\n.checkbox input[type=\"checkbox\"],\n.checkbox-inline input[type=\"checkbox\"] {\n float: left;\n margin-left: -20px;\n}\n.radio + .radio,\n.checkbox + .checkbox {\n margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing\n}\n\n// Radios and checkboxes on same line\n.radio-inline,\n.checkbox-inline {\n display: inline-block;\n padding-left: 20px;\n margin-bottom: 0;\n vertical-align: middle;\n font-weight: normal;\n cursor: pointer;\n}\n.radio-inline + .radio-inline,\n.checkbox-inline + .checkbox-inline {\n margin-top: 0;\n margin-left: 10px; // space out consecutive inline controls\n}\n\n// Apply same disabled cursor tweak as for inputs\n//\n// Note: Neither radios nor checkboxes can be readonly.\ninput[type=\"radio\"],\ninput[type=\"checkbox\"],\n.radio,\n.radio-inline,\n.checkbox,\n.checkbox-inline {\n &[disabled],\n fieldset[disabled] & {\n cursor: not-allowed;\n }\n}\n\n\n// Form control sizing\n//\n// Build on `.form-control` with modifier classes to decrease or increase the\n// height and font-size of form controls.\n\n.input-sm {\n .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);\n}\n\n.input-lg {\n .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);\n}\n\n\n// Form control feedback states\n//\n// Apply contextual and semantic states to individual form controls.\n\n.has-feedback {\n // Enable absolute positioning\n position: relative;\n\n // Ensure icons don't overlap text\n .form-control {\n padding-right: (@input-height-base * 1.25);\n }\n\n // Feedback icon (requires .glyphicon classes)\n .form-control-feedback {\n position: absolute;\n top: (@line-height-computed + 5); // Height of the `label` and its margin\n right: 0;\n display: block;\n width: @input-height-base;\n height: @input-height-base;\n line-height: @input-height-base;\n text-align: center;\n }\n}\n\n// Feedback states\n.has-success {\n .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);\n}\n.has-warning {\n .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg);\n}\n.has-error {\n .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);\n}\n\n\n// Static form control text\n//\n// Apply class to a `p` element to make any string of text align with labels in\n// a horizontal form layout.\n\n.form-control-static {\n margin-bottom: 0; // Remove default margin from `p`\n}\n\n\n// Help text\n//\n// Apply to any element you wish to create light text for placement immediately\n// below a form control. Use for general help, formatting, or instructional text.\n\n.help-block {\n display: block; // account for any element using help-block\n margin-top: 5px;\n margin-bottom: 10px;\n color: lighten(@text-color, 25%); // lighten the text some for contrast\n}\n\n\n\n// Inline forms\n//\n// Make forms appear inline(-block) by adding the `.form-inline` class. Inline\n// forms begin stacked on extra small (mobile) devices and then go inline when\n// viewports reach <768px.\n//\n// Requires wrapping inputs and labels with `.form-group` for proper display of\n// default HTML form controls and our custom form controls (e.g., input groups).\n//\n// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.\n\n.form-inline {\n\n // Kick in the inline\n @media (min-width: @screen-sm-min) {\n // Inline-block all the things for \"inline\"\n .form-group {\n display: inline-block;\n margin-bottom: 0;\n vertical-align: middle;\n }\n\n // In navbar-form, allow folks to *not* use `.form-group`\n .form-control {\n display: inline-block;\n width: auto; // Prevent labels from stacking above inputs in `.form-group`\n vertical-align: middle;\n }\n // Input groups need that 100% width though\n .input-group > .form-control {\n width: 100%;\n }\n\n .control-label {\n margin-bottom: 0;\n vertical-align: middle;\n }\n\n // Remove default margin on radios/checkboxes that were used for stacking, and\n // then undo the floating of radios and checkboxes to match (which also avoids\n // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).\n .radio,\n .checkbox {\n display: inline-block;\n margin-top: 0;\n margin-bottom: 0;\n padding-left: 0;\n vertical-align: middle;\n }\n .radio input[type=\"radio\"],\n .checkbox input[type=\"checkbox\"] {\n float: none;\n margin-left: 0;\n }\n\n // Validation states\n //\n // Reposition the icon because it's now within a grid column and columns have\n // `position: relative;` on them. Also accounts for the grid gutter padding.\n .has-feedback .form-control-feedback {\n top: 0;\n }\n }\n}\n\n\n// Horizontal forms\n//\n// Horizontal forms are built on grid classes and allow you to create forms with\n// labels on the left and inputs on the right.\n\n.form-horizontal {\n\n // Consistent vertical alignment of labels, radios, and checkboxes\n .control-label,\n .radio,\n .checkbox,\n .radio-inline,\n .checkbox-inline {\n margin-top: 0;\n margin-bottom: 0;\n padding-top: (@padding-base-vertical + 1); // Default padding plus a border\n }\n // Account for padding we're adding to ensure the alignment and of help text\n // and other content below items\n .radio,\n .checkbox {\n min-height: (@line-height-computed + (@padding-base-vertical + 1));\n }\n\n // Make form groups behave like rows\n .form-group {\n .make-row();\n }\n\n .form-control-static {\n padding-top: (@padding-base-vertical + 1);\n }\n\n // Only right align form labels here when the columns stop stacking\n @media (min-width: @screen-sm-min) {\n .control-label {\n text-align: right;\n }\n }\n\n // Validation states\n //\n // Reposition the icon because it's now within a grid column and columns have\n // `position: relative;` on them. Also accounts for the grid gutter padding.\n .has-feedback .form-control-feedback {\n top: 0;\n right: (@grid-gutter-width / 2);\n }\n}\n","//\n// Buttons\n// --------------------------------------------------\n\n\n// Base styles\n// --------------------------------------------------\n\n.btn {\n display: inline-block;\n margin-bottom: 0; // For input.btn\n font-weight: @btn-font-weight;\n text-align: center;\n vertical-align: middle;\n cursor: pointer;\n background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n border: 1px solid transparent;\n white-space: nowrap;\n .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);\n .user-select(none);\n\n &,\n &:active,\n &.active {\n &:focus {\n .tab-focus();\n }\n }\n\n &:hover,\n &:focus {\n color: @btn-default-color;\n text-decoration: none;\n }\n\n &:active,\n &.active {\n outline: 0;\n background-image: none;\n .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n }\n\n &.disabled,\n &[disabled],\n fieldset[disabled] & {\n cursor: not-allowed;\n pointer-events: none; // Future-proof disabling of clicks\n .opacity(.65);\n .box-shadow(none);\n }\n}\n\n\n// Alternate buttons\n// --------------------------------------------------\n\n.btn-default {\n .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);\n}\n.btn-primary {\n .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);\n}\n// Success appears as green\n.btn-success {\n .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);\n}\n// Info appears as blue-green\n.btn-info {\n .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);\n}\n// Warning appears as orange\n.btn-warning {\n .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);\n}\n// Danger and error appear as red\n.btn-danger {\n .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);\n}\n\n\n// Link buttons\n// -------------------------\n\n// Make a button look and behave like a link\n.btn-link {\n color: @link-color;\n font-weight: normal;\n cursor: pointer;\n border-radius: 0;\n\n &,\n &:active,\n &[disabled],\n fieldset[disabled] & {\n background-color: transparent;\n .box-shadow(none);\n }\n &,\n &:hover,\n &:focus,\n &:active {\n border-color: transparent;\n }\n &:hover,\n &:focus {\n color: @link-hover-color;\n text-decoration: underline;\n background-color: transparent;\n }\n &[disabled],\n fieldset[disabled] & {\n &:hover,\n &:focus {\n color: @btn-link-disabled-color;\n text-decoration: none;\n }\n }\n}\n\n\n// Button Sizes\n// --------------------------------------------------\n\n.btn-lg {\n // line-height: ensure even-numbered height of button next to large input\n .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);\n}\n.btn-sm {\n // line-height: ensure proper height of button next to small input\n .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);\n}\n.btn-xs {\n .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);\n}\n\n\n// Block button\n// --------------------------------------------------\n\n.btn-block {\n display: block;\n width: 100%;\n padding-left: 0;\n padding-right: 0;\n}\n\n// Vertically space out multiple block buttons\n.btn-block + .btn-block {\n margin-top: 5px;\n}\n\n// Specificity overrides\ninput[type=\"submit\"],\ninput[type=\"reset\"],\ninput[type=\"button\"] {\n &.btn-block {\n width: 100%;\n }\n}\n","//\n// Button groups\n// --------------------------------------------------\n\n// Make the div behave like a button\n.btn-group,\n.btn-group-vertical {\n position: relative;\n display: inline-block;\n vertical-align: middle; // match .btn alignment given font-size hack above\n > .btn {\n position: relative;\n float: left;\n // Bring the \"active\" button to the front\n &:hover,\n &:focus,\n &:active,\n &.active {\n z-index: 2;\n }\n &:focus {\n // Remove focus outline when dropdown JS adds it after closing the menu\n outline: none;\n }\n }\n}\n\n// Prevent double borders when buttons are next to each other\n.btn-group {\n .btn + .btn,\n .btn + .btn-group,\n .btn-group + .btn,\n .btn-group + .btn-group {\n margin-left: -1px;\n }\n}\n\n// Optional: Group multiple button groups together for a toolbar\n.btn-toolbar {\n margin-left: -5px; // Offset the first child's margin\n &:extend(.clearfix all);\n\n .btn-group,\n .input-group {\n float: left;\n }\n > .btn,\n > .btn-group,\n > .input-group {\n margin-left: 5px;\n }\n}\n\n.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {\n border-radius: 0;\n}\n\n// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match\n.btn-group > .btn:first-child {\n margin-left: 0;\n &:not(:last-child):not(.dropdown-toggle) {\n .border-right-radius(0);\n }\n}\n// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it\n.btn-group > .btn:last-child:not(:first-child),\n.btn-group > .dropdown-toggle:not(:first-child) {\n .border-left-radius(0);\n}\n\n// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)\n.btn-group > .btn-group {\n float: left;\n}\n.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {\n border-radius: 0;\n}\n.btn-group > .btn-group:first-child {\n > .btn:last-child,\n > .dropdown-toggle {\n .border-right-radius(0);\n }\n}\n.btn-group > .btn-group:last-child > .btn:first-child {\n .border-left-radius(0);\n}\n\n// On active and open, don't show outline\n.btn-group .dropdown-toggle:active,\n.btn-group.open .dropdown-toggle {\n outline: 0;\n}\n\n\n// Sizing\n//\n// Remix the default button sizing classes into new ones for easier manipulation.\n\n.btn-group-xs > .btn { &:extend(.btn-xs); }\n.btn-group-sm > .btn { &:extend(.btn-sm); }\n.btn-group-lg > .btn { &:extend(.btn-lg); }\n\n\n// Split button dropdowns\n// ----------------------\n\n// Give the line between buttons some depth\n.btn-group > .btn + .dropdown-toggle {\n padding-left: 8px;\n padding-right: 8px;\n}\n.btn-group > .btn-lg + .dropdown-toggle {\n padding-left: 12px;\n padding-right: 12px;\n}\n\n// The clickable button for toggling the menu\n// Remove the gradient and set the same inset shadow as the :active state\n.btn-group.open .dropdown-toggle {\n .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n\n // Show no shadow for `.btn-link` since it has no other button styles.\n &.btn-link {\n .box-shadow(none);\n }\n}\n\n\n// Reposition the caret\n.btn .caret {\n margin-left: 0;\n}\n// Carets in other button sizes\n.btn-lg .caret {\n border-width: @caret-width-large @caret-width-large 0;\n border-bottom-width: 0;\n}\n// Upside down carets for .dropup\n.dropup .btn-lg .caret {\n border-width: 0 @caret-width-large @caret-width-large;\n}\n\n\n// Vertical button groups\n// ----------------------\n\n.btn-group-vertical {\n > .btn,\n > .btn-group,\n > .btn-group > .btn {\n display: block;\n float: none;\n width: 100%;\n max-width: 100%;\n }\n\n // Clear floats so dropdown menus can be properly placed\n > .btn-group {\n &:extend(.clearfix all);\n > .btn {\n float: none;\n }\n }\n\n > .btn + .btn,\n > .btn + .btn-group,\n > .btn-group + .btn,\n > .btn-group + .btn-group {\n margin-top: -1px;\n margin-left: 0;\n }\n}\n\n.btn-group-vertical > .btn {\n &:not(:first-child):not(:last-child) {\n border-radius: 0;\n }\n &:first-child:not(:last-child) {\n border-top-right-radius: @border-radius-base;\n .border-bottom-radius(0);\n }\n &:last-child:not(:first-child) {\n border-bottom-left-radius: @border-radius-base;\n .border-top-radius(0);\n }\n}\n.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {\n border-radius: 0;\n}\n.btn-group-vertical > .btn-group:first-child:not(:last-child) {\n > .btn:last-child,\n > .dropdown-toggle {\n .border-bottom-radius(0);\n }\n}\n.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {\n .border-top-radius(0);\n}\n\n\n\n// Justified button groups\n// ----------------------\n\n.btn-group-justified {\n display: table;\n width: 100%;\n table-layout: fixed;\n border-collapse: separate;\n > .btn,\n > .btn-group {\n float: none;\n display: table-cell;\n width: 1%;\n }\n > .btn-group .btn {\n width: 100%;\n }\n}\n\n\n// Checkbox and radio options\n[data-toggle=\"buttons\"] > .btn > input[type=\"radio\"],\n[data-toggle=\"buttons\"] > .btn > input[type=\"checkbox\"] {\n display: none;\n}\n","//\n// Component animations\n// --------------------------------------------------\n\n// Heads up!\n//\n// We don't use the `.opacity()` mixin here since it causes a bug with text\n// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.\n\n.fade {\n opacity: 0;\n .transition(opacity .15s linear);\n &.in {\n opacity: 1;\n }\n}\n\n.collapse {\n display: none;\n &.in {\n display: block;\n }\n}\n.collapsing {\n position: relative;\n height: 0;\n overflow: hidden;\n .transition(height .35s ease);\n}\n","//\n// Glyphicons for Bootstrap\n//\n// Since icons are fonts, they can be placed anywhere text is placed and are\n// thus automatically sized to match the surrounding child. To use, create an\n// inline element with the appropriate classes, like so:\n//\n// <a href=\"#\"><span class=\"glyphicon glyphicon-star\"></span> Star</a>\n\n// Import the fonts\n@font-face {\n font-family: 'Glyphicons Halflings';\n src: ~\"url('@{icon-font-path}@{icon-font-name}.eot')\";\n src: ~\"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')\",\n ~\"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')\",\n ~\"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')\",\n ~\"url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg')\";\n}\n\n// Catchall baseclass\n.glyphicon {\n position: relative;\n top: 1px;\n display: inline-block;\n font-family: 'Glyphicons Halflings';\n font-style: normal;\n font-weight: normal;\n line-height: 1;\n -webkit-font-smoothing: antialiased;\n -moz-osx-font-smoothing: grayscale;\n}\n\n// Individual icons\n.glyphicon-asterisk { &:before { content: \"\\2a\"; } }\n.glyphicon-plus { &:before { content: \"\\2b\"; } }\n.glyphicon-euro { &:before { content: \"\\20ac\"; } }\n.glyphicon-minus { &:before { content: \"\\2212\"; } }\n.glyphicon-cloud { &:before { content: \"\\2601\"; } }\n.glyphicon-envelope { &:before { content: \"\\2709\"; } }\n.glyphicon-pencil { &:before { content: \"\\270f\"; } }\n.glyphicon-glass { &:before { content: \"\\e001\"; } }\n.glyphicon-music { &:before { content: \"\\e002\"; } }\n.glyphicon-search { &:before { content: \"\\e003\"; } }\n.glyphicon-heart { &:before { content: \"\\e005\"; } }\n.glyphicon-star { &:before { content: \"\\e006\"; } }\n.glyphicon-star-empty { &:before { content: \"\\e007\"; } }\n.glyphicon-user { &:before { content: \"\\e008\"; } }\n.glyphicon-film { &:before { content: \"\\e009\"; } }\n.glyphicon-th-large { &:before { content: \"\\e010\"; } }\n.glyphicon-th { &:before { content: \"\\e011\"; } }\n.glyphicon-th-list { &:before { content: \"\\e012\"; } }\n.glyphicon-ok { &:before { content: \"\\e013\"; } }\n.glyphicon-remove { &:before { content: \"\\e014\"; } }\n.glyphicon-zoom-in { &:before { content: \"\\e015\"; } }\n.glyphicon-zoom-out { &:before { content: \"\\e016\"; } }\n.glyphicon-off { &:before { content: \"\\e017\"; } }\n.glyphicon-signal { &:before { content: \"\\e018\"; } }\n.glyphicon-cog { &:before { content: \"\\e019\"; } }\n.glyphicon-trash { &:before { content: \"\\e020\"; } }\n.glyphicon-home { &:before { content: \"\\e021\"; } }\n.glyphicon-file { &:before { content: \"\\e022\"; } }\n.glyphicon-time { &:before { content: \"\\e023\"; } }\n.glyphicon-road { &:before { content: \"\\e024\"; } }\n.glyphicon-download-alt { &:before { content: \"\\e025\"; } }\n.glyphicon-download { &:before { content: \"\\e026\"; } }\n.glyphicon-upload { &:before { content: \"\\e027\"; } }\n.glyphicon-inbox { &:before { content: \"\\e028\"; } }\n.glyphicon-play-circle { &:before { content: \"\\e029\"; } }\n.glyphicon-repeat { &:before { content: \"\\e030\"; } }\n.glyphicon-refresh { &:before { content: \"\\e031\"; } }\n.glyphicon-list-alt { &:before { content: \"\\e032\"; } }\n.glyphicon-lock { &:before { content: \"\\e033\"; } }\n.glyphicon-flag { &:before { content: \"\\e034\"; } }\n.glyphicon-headphones { &:before { content: \"\\e035\"; } }\n.glyphicon-volume-off { &:before { content: \"\\e036\"; } }\n.glyphicon-volume-down { &:before { content: \"\\e037\"; } }\n.glyphicon-volume-up { &:before { content: \"\\e038\"; } }\n.glyphicon-qrcode { &:before { content: \"\\e039\"; } }\n.glyphicon-barcode { &:before { content: \"\\e040\"; } }\n.glyphicon-tag { &:before { content: \"\\e041\"; } }\n.glyphicon-tags { &:before { content: \"\\e042\"; } }\n.glyphicon-book { &:before { content: \"\\e043\"; } }\n.glyphicon-bookmark { &:before { content: \"\\e044\"; } }\n.glyphicon-print { &:before { content: \"\\e045\"; } }\n.glyphicon-camera { &:before { content: \"\\e046\"; } }\n.glyphicon-font { &:before { content: \"\\e047\"; } }\n.glyphicon-bold { &:before { content: \"\\e048\"; } }\n.glyphicon-italic { &:before { content: \"\\e049\"; } }\n.glyphicon-text-height { &:before { content: \"\\e050\"; } }\n.glyphicon-text-width { &:before { content: \"\\e051\"; } }\n.glyphicon-align-left { &:before { content: \"\\e052\"; } }\n.glyphicon-align-center { &:before { content: \"\\e053\"; } }\n.glyphicon-align-right { &:before { content: \"\\e054\"; } }\n.glyphicon-align-justify { &:before { content: \"\\e055\"; } }\n.glyphicon-list { &:before { content: \"\\e056\"; } }\n.glyphicon-indent-left { &:before { content: \"\\e057\"; } }\n.glyphicon-indent-right { &:before { content: \"\\e058\"; } }\n.glyphicon-facetime-video { &:before { content: \"\\e059\"; } }\n.glyphicon-picture { &:before { content: \"\\e060\"; } }\n.glyphicon-map-marker { &:before { content: \"\\e062\"; } }\n.glyphicon-adjust { &:before { content: \"\\e063\"; } }\n.glyphicon-tint { &:before { content: \"\\e064\"; } }\n.glyphicon-edit { &:before { content: \"\\e065\"; } }\n.glyphicon-share { &:before { content: \"\\e066\"; } }\n.glyphicon-check { &:before { content: \"\\e067\"; } }\n.glyphicon-move { &:before { content: \"\\e068\"; } }\n.glyphicon-step-backward { &:before { content: \"\\e069\"; } }\n.glyphicon-fast-backward { &:before { content: \"\\e070\"; } }\n.glyphicon-backward { &:before { content: \"\\e071\"; } }\n.glyphicon-play { &:before { content: \"\\e072\"; } }\n.glyphicon-pause { &:before { content: \"\\e073\"; } }\n.glyphicon-stop { &:before { content: \"\\e074\"; } }\n.glyphicon-forward { &:before { content: \"\\e075\"; } }\n.glyphicon-fast-forward { &:before { content: \"\\e076\"; } }\n.glyphicon-step-forward { &:before { content: \"\\e077\"; } }\n.glyphicon-eject { &:before { content: \"\\e078\"; } }\n.glyphicon-chevron-left { &:before { content: \"\\e079\"; } }\n.glyphicon-chevron-right { &:before { content: \"\\e080\"; } }\n.glyphicon-plus-sign { &:before { content: \"\\e081\"; } }\n.glyphicon-minus-sign { &:before { content: \"\\e082\"; } }\n.glyphicon-remove-sign { &:before { content: \"\\e083\"; } }\n.glyphicon-ok-sign { &:before { content: \"\\e084\"; } }\n.glyphicon-question-sign { &:before { content: \"\\e085\"; } }\n.glyphicon-info-sign { &:before { content: \"\\e086\"; } }\n.glyphicon-screenshot { &:before { content: \"\\e087\"; } }\n.glyphicon-remove-circle { &:before { content: \"\\e088\"; } }\n.glyphicon-ok-circle { &:before { content: \"\\e089\"; } }\n.glyphicon-ban-circle { &:before { content: \"\\e090\"; } }\n.glyphicon-arrow-left { &:before { content: \"\\e091\"; } }\n.glyphicon-arrow-right { &:before { content: \"\\e092\"; } }\n.glyphicon-arrow-up { &:before { content: \"\\e093\"; } }\n.glyphicon-arrow-down { &:before { content: \"\\e094\"; } }\n.glyphicon-share-alt { &:before { content: \"\\e095\"; } }\n.glyphicon-resize-full { &:before { content: \"\\e096\"; } }\n.glyphicon-resize-small { &:before { content: \"\\e097\"; } }\n.glyphicon-exclamation-sign { &:before { content: \"\\e101\"; } }\n.glyphicon-gift { &:before { content: \"\\e102\"; } }\n.glyphicon-leaf { &:before { content: \"\\e103\"; } }\n.glyphicon-fire { &:before { content: \"\\e104\"; } }\n.glyphicon-eye-open { &:before { content: \"\\e105\"; } }\n.glyphicon-eye-close { &:before { content: \"\\e106\"; } }\n.glyphicon-warning-sign { &:before { content: \"\\e107\"; } }\n.glyphicon-plane { &:before { content: \"\\e108\"; } }\n.glyphicon-calendar { &:before { content: \"\\e109\"; } }\n.glyphicon-random { &:before { content: \"\\e110\"; } }\n.glyphicon-comment { &:before { content: \"\\e111\"; } }\n.glyphicon-magnet { &:before { content: \"\\e112\"; } }\n.glyphicon-chevron-up { &:before { content: \"\\e113\"; } }\n.glyphicon-chevron-down { &:before { content: \"\\e114\"; } }\n.glyphicon-retweet { &:before { content: \"\\e115\"; } }\n.glyphicon-shopping-cart { &:before { content: \"\\e116\"; } }\n.glyphicon-folder-close { &:before { content: \"\\e117\"; } }\n.glyphicon-folder-open { &:before { content: \"\\e118\"; } }\n.glyphicon-resize-vertical { &:before { content: \"\\e119\"; } }\n.glyphicon-resize-horizontal { &:before { content: \"\\e120\"; } }\n.glyphicon-hdd { &:before { content: \"\\e121\"; } }\n.glyphicon-bullhorn { &:before { content: \"\\e122\"; } }\n.glyphicon-bell { &:before { content: \"\\e123\"; } }\n.glyphicon-certificate { &:before { content: \"\\e124\"; } }\n.glyphicon-thumbs-up { &:before { content: \"\\e125\"; } }\n.glyphicon-thumbs-down { &:before { content: \"\\e126\"; } }\n.glyphicon-hand-right { &:before { content: \"\\e127\"; } }\n.glyphicon-hand-left { &:before { content: \"\\e128\"; } }\n.glyphicon-hand-up { &:before { content: \"\\e129\"; } }\n.glyphicon-hand-down { &:before { content: \"\\e130\"; } }\n.glyphicon-circle-arrow-right { &:before { content: \"\\e131\"; } }\n.glyphicon-circle-arrow-left { &:before { content: \"\\e132\"; } }\n.glyphicon-circle-arrow-up { &:before { content: \"\\e133\"; } }\n.glyphicon-circle-arrow-down { &:before { content: \"\\e134\"; } }\n.glyphicon-globe { &:before { content: \"\\e135\"; } }\n.glyphicon-wrench { &:before { content: \"\\e136\"; } }\n.glyphicon-tasks { &:before { content: \"\\e137\"; } }\n.glyphicon-filter { &:before { content: \"\\e138\"; } }\n.glyphicon-briefcase { &:before { content: \"\\e139\"; } }\n.glyphicon-fullscreen { &:before { content: \"\\e140\"; } }\n.glyphicon-dashboard { &:before { content: \"\\e141\"; } }\n.glyphicon-paperclip { &:before { content: \"\\e142\"; } }\n.glyphicon-heart-empty { &:before { content: \"\\e143\"; } }\n.glyphicon-link { &:before { content: \"\\e144\"; } }\n.glyphicon-phone { &:before { content: \"\\e145\"; } }\n.glyphicon-pushpin { &:before { content: \"\\e146\"; } }\n.glyphicon-usd { &:before { content: \"\\e148\"; } }\n.glyphicon-gbp { &:before { content: \"\\e149\"; } }\n.glyphicon-sort { &:before { content: \"\\e150\"; } }\n.glyphicon-sort-by-alphabet { &:before { content: \"\\e151\"; } }\n.glyphicon-sort-by-alphabet-alt { &:before { content: \"\\e152\"; } }\n.glyphicon-sort-by-order { &:before { content: \"\\e153\"; } }\n.glyphicon-sort-by-order-alt { &:before { content: \"\\e154\"; } }\n.glyphicon-sort-by-attributes { &:before { content: \"\\e155\"; } }\n.glyphicon-sort-by-attributes-alt { &:before { content: \"\\e156\"; } }\n.glyphicon-unchecked { &:before { content: \"\\e157\"; } }\n.glyphicon-expand { &:before { content: \"\\e158\"; } }\n.glyphicon-collapse-down { &:before { content: \"\\e159\"; } }\n.glyphicon-collapse-up { &:before { content: \"\\e160\"; } }\n.glyphicon-log-in { &:before { content: \"\\e161\"; } }\n.glyphicon-flash { &:before { content: \"\\e162\"; } }\n.glyphicon-log-out { &:before { content: \"\\e163\"; } }\n.glyphicon-new-window { &:before { content: \"\\e164\"; } }\n.glyphicon-record { &:before { content: \"\\e165\"; } }\n.glyphicon-save { &:before { content: \"\\e166\"; } }\n.glyphicon-open { &:before { content: \"\\e167\"; } }\n.glyphicon-saved { &:before { content: \"\\e168\"; } }\n.glyphicon-import { &:before { content: \"\\e169\"; } }\n.glyphicon-export { &:before { content: \"\\e170\"; } }\n.glyphicon-send { &:before { content: \"\\e171\"; } }\n.glyphicon-floppy-disk { &:before { content: \"\\e172\"; } }\n.glyphicon-floppy-saved { &:before { content: \"\\e173\"; } }\n.glyphicon-floppy-remove { &:before { content: \"\\e174\"; } }\n.glyphicon-floppy-save { &:before { content: \"\\e175\"; } }\n.glyphicon-floppy-open { &:before { content: \"\\e176\"; } }\n.glyphicon-credit-card { &:before { content: \"\\e177\"; } }\n.glyphicon-transfer { &:before { content: \"\\e178\"; } }\n.glyphicon-cutlery { &:before { content: \"\\e179\"; } }\n.glyphicon-header { &:before { content: \"\\e180\"; } }\n.glyphicon-compressed { &:before { content: \"\\e181\"; } }\n.glyphicon-earphone { &:before { content: \"\\e182\"; } }\n.glyphicon-phone-alt { &:before { content: \"\\e183\"; } }\n.glyphicon-tower { &:before { content: \"\\e184\"; } }\n.glyphicon-stats { &:before { content: \"\\e185\"; } }\n.glyphicon-sd-video { &:before { content: \"\\e186\"; } }\n.glyphicon-hd-video { &:before { content: \"\\e187\"; } }\n.glyphicon-subtitles { &:before { content: \"\\e188\"; } }\n.glyphicon-sound-stereo { &:before { content: \"\\e189\"; } }\n.glyphicon-sound-dolby { &:before { content: \"\\e190\"; } }\n.glyphicon-sound-5-1 { &:before { content: \"\\e191\"; } }\n.glyphicon-sound-6-1 { &:before { content: \"\\e192\"; } }\n.glyphicon-sound-7-1 { &:before { content: \"\\e193\"; } }\n.glyphicon-copyright-mark { &:before { content: \"\\e194\"; } }\n.glyphicon-registration-mark { &:before { content: \"\\e195\"; } }\n.glyphicon-cloud-download { &:before { content: \"\\e197\"; } }\n.glyphicon-cloud-upload { &:before { content: \"\\e198\"; } }\n.glyphicon-tree-conifer { &:before { content: \"\\e199\"; } }\n.glyphicon-tree-deciduous { &:before { content: \"\\e200\"; } }\n","//\n// Dropdown menus\n// --------------------------------------------------\n\n\n// Dropdown arrow/caret\n.caret {\n display: inline-block;\n width: 0;\n height: 0;\n margin-left: 2px;\n vertical-align: middle;\n border-top: @caret-width-base solid;\n border-right: @caret-width-base solid transparent;\n border-left: @caret-width-base solid transparent;\n}\n\n// The dropdown wrapper (div)\n.dropdown {\n position: relative;\n}\n\n// Prevent the focus on the dropdown toggle when closing dropdowns\n.dropdown-toggle:focus {\n outline: 0;\n}\n\n// The dropdown menu (ul)\n.dropdown-menu {\n position: absolute;\n top: 100%;\n left: 0;\n z-index: @zindex-dropdown;\n display: none; // none by default, but block on \"open\" of the menu\n float: left;\n min-width: 160px;\n padding: 5px 0;\n margin: 2px 0 0; // override default ul\n list-style: none;\n font-size: @font-size-base;\n background-color: @dropdown-bg;\n border: 1px solid @dropdown-fallback-border; // IE8 fallback\n border: 1px solid @dropdown-border;\n border-radius: @border-radius-base;\n .box-shadow(0 6px 12px rgba(0,0,0,.175));\n background-clip: padding-box;\n\n // Aligns the dropdown menu to right\n //\n // Deprecated as of 3.1.0 in favor of `.dropdown-menu-[dir]`\n &.pull-right {\n right: 0;\n left: auto;\n }\n\n // Dividers (basically an hr) within the dropdown\n .divider {\n .nav-divider(@dropdown-divider-bg);\n }\n\n // Links within the dropdown menu\n > li > a {\n display: block;\n padding: 3px 20px;\n clear: both;\n font-weight: normal;\n line-height: @line-height-base;\n color: @dropdown-link-color;\n white-space: nowrap; // prevent links from randomly breaking onto new lines\n }\n}\n\n// Hover/Focus state\n.dropdown-menu > li > a {\n &:hover,\n &:focus {\n text-decoration: none;\n color: @dropdown-link-hover-color;\n background-color: @dropdown-link-hover-bg;\n }\n}\n\n// Active state\n.dropdown-menu > .active > a {\n &,\n &:hover,\n &:focus {\n color: @dropdown-link-active-color;\n text-decoration: none;\n outline: 0;\n background-color: @dropdown-link-active-bg;\n }\n}\n\n// Disabled state\n//\n// Gray out text and ensure the hover/focus state remains gray\n\n.dropdown-menu > .disabled > a {\n &,\n &:hover,\n &:focus {\n color: @dropdown-link-disabled-color;\n }\n}\n// Nuke hover/focus effects\n.dropdown-menu > .disabled > a {\n &:hover,\n &:focus {\n text-decoration: none;\n background-color: transparent;\n background-image: none; // Remove CSS gradient\n .reset-filter();\n cursor: not-allowed;\n }\n}\n\n// Open state for the dropdown\n.open {\n // Show the menu\n > .dropdown-menu {\n display: block;\n }\n\n // Remove the outline when :focus is triggered\n > a {\n outline: 0;\n }\n}\n\n// Menu positioning\n//\n// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown\n// menu with the parent.\n.dropdown-menu-right {\n left: auto; // Reset the default from `.dropdown-menu`\n right: 0;\n}\n// With v3, we enabled auto-flipping if you have a dropdown within a right\n// aligned nav component. To enable the undoing of that, we provide an override\n// to restore the default dropdown menu alignment.\n//\n// This is only for left-aligning a dropdown menu within a `.navbar-right` or\n// `.pull-right` nav component.\n.dropdown-menu-left {\n left: 0;\n right: auto;\n}\n\n// Dropdown section headers\n.dropdown-header {\n display: block;\n padding: 3px 20px;\n font-size: @font-size-small;\n line-height: @line-height-base;\n color: @dropdown-header-color;\n}\n\n// Backdrop to catch body clicks on mobile, etc.\n.dropdown-backdrop {\n position: fixed;\n left: 0;\n right: 0;\n bottom: 0;\n top: 0;\n z-index: (@zindex-dropdown - 10);\n}\n\n// Right aligned dropdowns\n.pull-right > .dropdown-menu {\n right: 0;\n left: auto;\n}\n\n// Allow for dropdowns to go bottom up (aka, dropup-menu)\n//\n// Just add .dropup after the standard .dropdown class and you're set, bro.\n// TODO: abstract this so that the navbar fixed styles are not placed here?\n\n.dropup,\n.navbar-fixed-bottom .dropdown {\n // Reverse the caret\n .caret {\n border-top: 0;\n border-bottom: @caret-width-base solid;\n content: \"\";\n }\n // Different positioning for bottom up menu\n .dropdown-menu {\n top: auto;\n bottom: 100%;\n margin-bottom: 1px;\n }\n}\n\n\n// Component alignment\n//\n// Reiterate per navbar.less and the modified component alignment there.\n\n@media (min-width: @grid-float-breakpoint) {\n .navbar-right {\n .dropdown-menu {\n .dropdown-menu-right();\n }\n // Necessary for overrides of the default right aligned menu.\n // Will remove come v4 in all likelihood.\n .dropdown-menu-left {\n .dropdown-menu-left();\n }\n }\n}\n\n","//\n// Input groups\n// --------------------------------------------------\n\n// Base styles\n// -------------------------\n.input-group {\n position: relative; // For dropdowns\n display: table;\n border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table\n\n // Undo padding and float of grid classes\n &[class*=\"col-\"] {\n float: none;\n padding-left: 0;\n padding-right: 0;\n }\n\n .form-control {\n // Ensure that the input is always above the *appended* addon button for\n // proper border colors.\n position: relative;\n z-index: 2;\n\n // IE9 fubars the placeholder attribute in text inputs and the arrows on\n // select elements in input groups. To fix it, we float the input. Details:\n // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855\n float: left;\n\n width: 100%;\n margin-bottom: 0;\n }\n}\n\n// Sizing options\n//\n// Remix the default form control sizing classes into new ones for easier\n// manipulation.\n\n.input-group-lg > .form-control,\n.input-group-lg > .input-group-addon,\n.input-group-lg > .input-group-btn > .btn { .input-lg(); }\n.input-group-sm > .form-control,\n.input-group-sm > .input-group-addon,\n.input-group-sm > .input-group-btn > .btn { .input-sm(); }\n\n\n// Display as table-cell\n// -------------------------\n.input-group-addon,\n.input-group-btn,\n.input-group .form-control {\n display: table-cell;\n\n &:not(:first-child):not(:last-child) {\n border-radius: 0;\n }\n}\n// Addon and addon wrapper for buttons\n.input-group-addon,\n.input-group-btn {\n width: 1%;\n white-space: nowrap;\n vertical-align: middle; // Match the inputs\n}\n\n// Text input groups\n// -------------------------\n.input-group-addon {\n padding: @padding-base-vertical @padding-base-horizontal;\n font-size: @font-size-base;\n font-weight: normal;\n line-height: 1;\n color: @input-color;\n text-align: center;\n background-color: @input-group-addon-bg;\n border: 1px solid @input-group-addon-border-color;\n border-radius: @border-radius-base;\n\n // Sizing\n &.input-sm {\n padding: @padding-small-vertical @padding-small-horizontal;\n font-size: @font-size-small;\n border-radius: @border-radius-small;\n }\n &.input-lg {\n padding: @padding-large-vertical @padding-large-horizontal;\n font-size: @font-size-large;\n border-radius: @border-radius-large;\n }\n\n // Nuke default margins from checkboxes and radios to vertically center within.\n input[type=\"radio\"],\n input[type=\"checkbox\"] {\n margin-top: 0;\n }\n}\n\n// Reset rounded corners\n.input-group .form-control:first-child,\n.input-group-addon:first-child,\n.input-group-btn:first-child > .btn,\n.input-group-btn:first-child > .btn-group > .btn,\n.input-group-btn:first-child > .dropdown-toggle,\n.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),\n.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {\n .border-right-radius(0);\n}\n.input-group-addon:first-child {\n border-right: 0;\n}\n.input-group .form-control:last-child,\n.input-group-addon:last-child,\n.input-group-btn:last-child > .btn,\n.input-group-btn:last-child > .btn-group > .btn,\n.input-group-btn:last-child > .dropdown-toggle,\n.input-group-btn:first-child > .btn:not(:first-child),\n.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {\n .border-left-radius(0);\n}\n.input-group-addon:last-child {\n border-left: 0;\n}\n\n// Button input groups\n// -------------------------\n.input-group-btn {\n position: relative;\n // Jankily prevent input button groups from wrapping with `white-space` and\n // `font-size` in combination with `inline-block` on buttons.\n font-size: 0;\n white-space: nowrap;\n\n // Negative margin for spacing, position for bringing hovered/focused/actived\n // element above the siblings.\n > .btn {\n position: relative;\n + .btn {\n margin-left: -1px;\n }\n // Bring the \"active\" button to the front\n &:hover,\n &:focus,\n &:active {\n z-index: 2;\n }\n }\n\n // Negative margin to only have a 1px border between the two\n &:first-child {\n > .btn,\n > .btn-group {\n margin-right: -1px;\n }\n }\n &:last-child {\n > .btn,\n > .btn-group {\n margin-left: -1px;\n }\n }\n}\n","//\n// Navs\n// --------------------------------------------------\n\n\n// Base class\n// --------------------------------------------------\n\n.nav {\n margin-bottom: 0;\n padding-left: 0; // Override default ul/ol\n list-style: none;\n &:extend(.clearfix all);\n\n > li {\n position: relative;\n display: block;\n\n > a {\n position: relative;\n display: block;\n padding: @nav-link-padding;\n &:hover,\n &:focus {\n text-decoration: none;\n background-color: @nav-link-hover-bg;\n }\n }\n\n // Disabled state sets text to gray and nukes hover/tab effects\n &.disabled > a {\n color: @nav-disabled-link-color;\n\n &:hover,\n &:focus {\n color: @nav-disabled-link-hover-color;\n text-decoration: none;\n background-color: transparent;\n cursor: not-allowed;\n }\n }\n }\n\n // Open dropdowns\n .open > a {\n &,\n &:hover,\n &:focus {\n background-color: @nav-link-hover-bg;\n border-color: @link-color;\n }\n }\n\n // Nav dividers (deprecated with v3.0.1)\n //\n // This should have been removed in v3 with the dropping of `.nav-list`, but\n // we missed it. We don't currently support this anywhere, but in the interest\n // of maintaining backward compatibility in case you use it, it's deprecated.\n .nav-divider {\n .nav-divider();\n }\n\n // Prevent IE8 from misplacing imgs\n //\n // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989\n > li > a > img {\n max-width: none;\n }\n}\n\n\n// Tabs\n// -------------------------\n\n// Give the tabs something to sit on\n.nav-tabs {\n border-bottom: 1px solid @nav-tabs-border-color;\n > li {\n float: left;\n // Make the list-items overlay the bottom border\n margin-bottom: -1px;\n\n // Actual tabs (as links)\n > a {\n margin-right: 2px;\n line-height: @line-height-base;\n border: 1px solid transparent;\n border-radius: @border-radius-base @border-radius-base 0 0;\n &:hover {\n border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;\n }\n }\n\n // Active state, and its :hover to override normal :hover\n &.active > a {\n &,\n &:hover,\n &:focus {\n color: @nav-tabs-active-link-hover-color;\n background-color: @nav-tabs-active-link-hover-bg;\n border: 1px solid @nav-tabs-active-link-hover-border-color;\n border-bottom-color: transparent;\n cursor: default;\n }\n }\n }\n // pulling this in mainly for less shorthand\n &.nav-justified {\n .nav-justified();\n .nav-tabs-justified();\n }\n}\n\n\n// Pills\n// -------------------------\n.nav-pills {\n > li {\n float: left;\n\n // Links rendered as pills\n > a {\n border-radius: @nav-pills-border-radius;\n }\n + li {\n margin-left: 2px;\n }\n\n // Active state\n &.active > a {\n &,\n &:hover,\n &:focus {\n color: @nav-pills-active-link-hover-color;\n background-color: @nav-pills-active-link-hover-bg;\n }\n }\n }\n}\n\n\n// Stacked pills\n.nav-stacked {\n > li {\n float: none;\n + li {\n margin-top: 2px;\n margin-left: 0; // no need for this gap between nav items\n }\n }\n}\n\n\n// Nav variations\n// --------------------------------------------------\n\n// Justified nav links\n// -------------------------\n\n.nav-justified {\n width: 100%;\n\n > li {\n float: none;\n > a {\n text-align: center;\n margin-bottom: 5px;\n }\n }\n\n > .dropdown .dropdown-menu {\n top: auto;\n left: auto;\n }\n\n @media (min-width: @screen-sm-min) {\n > li {\n display: table-cell;\n width: 1%;\n > a {\n margin-bottom: 0;\n }\n }\n }\n}\n\n// Move borders to anchors instead of bottom of list\n//\n// Mixin for adding on top the shared `.nav-justified` styles for our tabs\n.nav-tabs-justified {\n border-bottom: 0;\n\n > li > a {\n // Override margin from .nav-tabs\n margin-right: 0;\n border-radius: @border-radius-base;\n }\n\n > .active > a,\n > .active > a:hover,\n > .active > a:focus {\n border: 1px solid @nav-tabs-justified-link-border-color;\n }\n\n @media (min-width: @screen-sm-min) {\n > li > a {\n border-bottom: 1px solid @nav-tabs-justified-link-border-color;\n border-radius: @border-radius-base @border-radius-base 0 0;\n }\n > .active > a,\n > .active > a:hover,\n > .active > a:focus {\n border-bottom-color: @nav-tabs-justified-active-link-border-color;\n }\n }\n}\n\n\n// Tabbable tabs\n// -------------------------\n\n// Hide tabbable panes to start, show them when `.active`\n.tab-content {\n > .tab-pane {\n display: none;\n }\n > .active {\n display: block;\n }\n}\n\n\n// Dropdowns\n// -------------------------\n\n// Specific dropdowns\n.nav-tabs .dropdown-menu {\n // make dropdown border overlap tab border\n margin-top: -1px;\n // Remove the top rounded corners here since there is a hard edge above the menu\n .border-top-radius(0);\n}\n","//\n// Navbars\n// --------------------------------------------------\n\n\n// Wrapper and base class\n//\n// Provide a static navbar from which we expand to create full-width, fixed, and\n// other navbar variations.\n\n.navbar {\n position: relative;\n min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)\n margin-bottom: @navbar-margin-bottom;\n border: 1px solid transparent;\n\n // Prevent floats from breaking the navbar\n &:extend(.clearfix all);\n\n @media (min-width: @grid-float-breakpoint) {\n border-radius: @navbar-border-radius;\n }\n}\n\n\n// Navbar heading\n//\n// Groups `.navbar-brand` and `.navbar-toggle` into a single component for easy\n// styling of responsive aspects.\n\n.navbar-header {\n &:extend(.clearfix all);\n\n @media (min-width: @grid-float-breakpoint) {\n float: left;\n }\n}\n\n\n// Navbar collapse (body)\n//\n// Group your navbar content into this for easy collapsing and expanding across\n// various device sizes. By default, this content is collapsed when <768px, but\n// will expand past that for a horizontal display.\n//\n// To start (on mobile devices) the navbar links, forms, and buttons are stacked\n// vertically and include a `max-height` to overflow in case you have too much\n// content for the user's viewport.\n\n.navbar-collapse {\n max-height: @navbar-collapse-max-height;\n overflow-x: visible;\n padding-right: @navbar-padding-horizontal;\n padding-left: @navbar-padding-horizontal;\n border-top: 1px solid transparent;\n box-shadow: inset 0 1px 0 rgba(255,255,255,.1);\n &:extend(.clearfix all);\n -webkit-overflow-scrolling: touch;\n\n &.in {\n overflow-y: auto;\n }\n\n @media (min-width: @grid-float-breakpoint) {\n width: auto;\n border-top: 0;\n box-shadow: none;\n\n &.collapse {\n display: block !important;\n height: auto !important;\n padding-bottom: 0; // Override default setting\n overflow: visible !important;\n }\n\n &.in {\n overflow-y: visible;\n }\n\n // Undo the collapse side padding for navbars with containers to ensure\n // alignment of right-aligned contents.\n .navbar-fixed-top &,\n .navbar-static-top &,\n .navbar-fixed-bottom & {\n padding-left: 0;\n padding-right: 0;\n }\n }\n}\n\n\n// Both navbar header and collapse\n//\n// When a container is present, change the behavior of the header and collapse.\n\n.container,\n.container-fluid {\n > .navbar-header,\n > .navbar-collapse {\n margin-right: -@navbar-padding-horizontal;\n margin-left: -@navbar-padding-horizontal;\n\n @media (min-width: @grid-float-breakpoint) {\n margin-right: 0;\n margin-left: 0;\n }\n }\n}\n\n\n//\n// Navbar alignment options\n//\n// Display the navbar across the entirety of the page or fixed it to the top or\n// bottom of the page.\n\n// Static top (unfixed, but 100% wide) navbar\n.navbar-static-top {\n z-index: @zindex-navbar;\n border-width: 0 0 1px;\n\n @media (min-width: @grid-float-breakpoint) {\n border-radius: 0;\n }\n}\n\n// Fix the top/bottom navbars when screen real estate supports it\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n position: fixed;\n right: 0;\n left: 0;\n z-index: @zindex-navbar-fixed;\n\n // Undo the rounded corners\n @media (min-width: @grid-float-breakpoint) {\n border-radius: 0;\n }\n}\n.navbar-fixed-top {\n top: 0;\n border-width: 0 0 1px;\n}\n.navbar-fixed-bottom {\n bottom: 0;\n margin-bottom: 0; // override .navbar defaults\n border-width: 1px 0 0;\n}\n\n\n// Brand/project name\n\n.navbar-brand {\n float: left;\n padding: @navbar-padding-vertical @navbar-padding-horizontal;\n font-size: @font-size-large;\n line-height: @line-height-computed;\n height: @navbar-height;\n\n &:hover,\n &:focus {\n text-decoration: none;\n }\n\n @media (min-width: @grid-float-breakpoint) {\n .navbar > .container &,\n .navbar > .container-fluid & {\n margin-left: -@navbar-padding-horizontal;\n }\n }\n}\n\n\n// Navbar toggle\n//\n// Custom button for toggling the `.navbar-collapse`, powered by the collapse\n// JavaScript plugin.\n\n.navbar-toggle {\n position: relative;\n float: right;\n margin-right: @navbar-padding-horizontal;\n padding: 9px 10px;\n .navbar-vertical-align(34px);\n background-color: transparent;\n background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n border: 1px solid transparent;\n border-radius: @border-radius-base;\n\n // We remove the `outline` here, but later compensate by attaching `:hover`\n // styles to `:focus`.\n &:focus {\n outline: none;\n }\n\n // Bars\n .icon-bar {\n display: block;\n width: 22px;\n height: 2px;\n border-radius: 1px;\n }\n .icon-bar + .icon-bar {\n margin-top: 4px;\n }\n\n @media (min-width: @grid-float-breakpoint) {\n display: none;\n }\n}\n\n\n// Navbar nav links\n//\n// Builds on top of the `.nav` components with its own modifier class to make\n// the nav the full height of the horizontal nav (above 768px).\n\n.navbar-nav {\n margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;\n\n > li > a {\n padding-top: 10px;\n padding-bottom: 10px;\n line-height: @line-height-computed;\n }\n\n @media (max-width: @grid-float-breakpoint-max) {\n // Dropdowns get custom display when collapsed\n .open .dropdown-menu {\n position: static;\n float: none;\n width: auto;\n margin-top: 0;\n background-color: transparent;\n border: 0;\n box-shadow: none;\n > li > a,\n .dropdown-header {\n padding: 5px 15px 5px 25px;\n }\n > li > a {\n line-height: @line-height-computed;\n &:hover,\n &:focus {\n background-image: none;\n }\n }\n }\n }\n\n // Uncollapse the nav\n @media (min-width: @grid-float-breakpoint) {\n float: left;\n margin: 0;\n\n > li {\n float: left;\n > a {\n padding-top: @navbar-padding-vertical;\n padding-bottom: @navbar-padding-vertical;\n }\n }\n\n &.navbar-right:last-child {\n margin-right: -@navbar-padding-horizontal;\n }\n }\n}\n\n\n// Component alignment\n//\n// Repurpose the pull utilities as their own navbar utilities to avoid specificity\n// issues with parents and chaining. Only do this when the navbar is uncollapsed\n// though so that navbar contents properly stack and align in mobile.\n\n@media (min-width: @grid-float-breakpoint) {\n .navbar-left { .pull-left(); }\n .navbar-right { .pull-right(); }\n}\n\n\n// Navbar form\n//\n// Extension of the `.form-inline` with some extra flavor for optimum display in\n// our navbars.\n\n.navbar-form {\n margin-left: -@navbar-padding-horizontal;\n margin-right: -@navbar-padding-horizontal;\n padding: 10px @navbar-padding-horizontal;\n border-top: 1px solid transparent;\n border-bottom: 1px solid transparent;\n @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);\n .box-shadow(@shadow);\n\n // Mixin behavior for optimum display\n .form-inline();\n\n .form-group {\n @media (max-width: @grid-float-breakpoint-max) {\n margin-bottom: 5px;\n }\n }\n\n // Vertically center in expanded, horizontal navbar\n .navbar-vertical-align(@input-height-base);\n\n // Undo 100% width for pull classes\n @media (min-width: @grid-float-breakpoint) {\n width: auto;\n border: 0;\n margin-left: 0;\n margin-right: 0;\n padding-top: 0;\n padding-bottom: 0;\n .box-shadow(none);\n\n // Outdent the form if last child to line up with content down the page\n &.navbar-right:last-child {\n margin-right: -@navbar-padding-horizontal;\n }\n }\n}\n\n\n// Dropdown menus\n\n// Menu position and menu carets\n.navbar-nav > li > .dropdown-menu {\n margin-top: 0;\n .border-top-radius(0);\n}\n// Menu position and menu caret support for dropups via extra dropup class\n.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {\n .border-bottom-radius(0);\n}\n\n\n// Buttons in navbars\n//\n// Vertically center a button within a navbar (when *not* in a form).\n\n.navbar-btn {\n .navbar-vertical-align(@input-height-base);\n\n &.btn-sm {\n .navbar-vertical-align(@input-height-small);\n }\n &.btn-xs {\n .navbar-vertical-align(22);\n }\n}\n\n\n// Text in navbars\n//\n// Add a class to make any element properly align itself vertically within the navbars.\n\n.navbar-text {\n .navbar-vertical-align(@line-height-computed);\n\n @media (min-width: @grid-float-breakpoint) {\n float: left;\n margin-left: @navbar-padding-horizontal;\n margin-right: @navbar-padding-horizontal;\n\n // Outdent the form if last child to line up with content down the page\n &.navbar-right:last-child {\n margin-right: 0;\n }\n }\n}\n\n// Alternate navbars\n// --------------------------------------------------\n\n// Default navbar\n.navbar-default {\n background-color: @navbar-default-bg;\n border-color: @navbar-default-border;\n\n .navbar-brand {\n color: @navbar-default-brand-color;\n &:hover,\n &:focus {\n color: @navbar-default-brand-hover-color;\n background-color: @navbar-default-brand-hover-bg;\n }\n }\n\n .navbar-text {\n color: @navbar-default-color;\n }\n\n .navbar-nav {\n > li > a {\n color: @navbar-default-link-color;\n\n &:hover,\n &:focus {\n color: @navbar-default-link-hover-color;\n background-color: @navbar-default-link-hover-bg;\n }\n }\n > .active > a {\n &,\n &:hover,\n &:focus {\n color: @navbar-default-link-active-color;\n background-color: @navbar-default-link-active-bg;\n }\n }\n > .disabled > a {\n &,\n &:hover,\n &:focus {\n color: @navbar-default-link-disabled-color;\n background-color: @navbar-default-link-disabled-bg;\n }\n }\n }\n\n .navbar-toggle {\n border-color: @navbar-default-toggle-border-color;\n &:hover,\n &:focus {\n background-color: @navbar-default-toggle-hover-bg;\n }\n .icon-bar {\n background-color: @navbar-default-toggle-icon-bar-bg;\n }\n }\n\n .navbar-collapse,\n .navbar-form {\n border-color: @navbar-default-border;\n }\n\n // Dropdown menu items\n .navbar-nav {\n // Remove background color from open dropdown\n > .open > a {\n &,\n &:hover,\n &:focus {\n background-color: @navbar-default-link-active-bg;\n color: @navbar-default-link-active-color;\n }\n }\n\n @media (max-width: @grid-float-breakpoint-max) {\n // Dropdowns get custom display when collapsed\n .open .dropdown-menu {\n > li > a {\n color: @navbar-default-link-color;\n &:hover,\n &:focus {\n color: @navbar-default-link-hover-color;\n background-color: @navbar-default-link-hover-bg;\n }\n }\n > .active > a {\n &,\n &:hover,\n &:focus {\n color: @navbar-default-link-active-color;\n background-color: @navbar-default-link-active-bg;\n }\n }\n > .disabled > a {\n &,\n &:hover,\n &:focus {\n color: @navbar-default-link-disabled-color;\n background-color: @navbar-default-link-disabled-bg;\n }\n }\n }\n }\n }\n\n\n // Links in navbars\n //\n // Add a class to ensure links outside the navbar nav are colored correctly.\n\n .navbar-link {\n color: @navbar-default-link-color;\n &:hover {\n color: @navbar-default-link-hover-color;\n }\n }\n\n}\n\n// Inverse navbar\n\n.navbar-inverse {\n background-color: @navbar-inverse-bg;\n border-color: @navbar-inverse-border;\n\n .navbar-brand {\n color: @navbar-inverse-brand-color;\n &:hover,\n &:focus {\n color: @navbar-inverse-brand-hover-color;\n background-color: @navbar-inverse-brand-hover-bg;\n }\n }\n\n .navbar-text {\n color: @navbar-inverse-color;\n }\n\n .navbar-nav {\n > li > a {\n color: @navbar-inverse-link-color;\n\n &:hover,\n &:focus {\n color: @navbar-inverse-link-hover-color;\n background-color: @navbar-inverse-link-hover-bg;\n }\n }\n > .active > a {\n &,\n &:hover,\n &:focus {\n color: @navbar-inverse-link-active-color;\n background-color: @navbar-inverse-link-active-bg;\n }\n }\n > .disabled > a {\n &,\n &:hover,\n &:focus {\n color: @navbar-inverse-link-disabled-color;\n background-color: @navbar-inverse-link-disabled-bg;\n }\n }\n }\n\n // Darken the responsive nav toggle\n .navbar-toggle {\n border-color: @navbar-inverse-toggle-border-color;\n &:hover,\n &:focus {\n background-color: @navbar-inverse-toggle-hover-bg;\n }\n .icon-bar {\n background-color: @navbar-inverse-toggle-icon-bar-bg;\n }\n }\n\n .navbar-collapse,\n .navbar-form {\n border-color: darken(@navbar-inverse-bg, 7%);\n }\n\n // Dropdowns\n .navbar-nav {\n > .open > a {\n &,\n &:hover,\n &:focus {\n background-color: @navbar-inverse-link-active-bg;\n color: @navbar-inverse-link-active-color;\n }\n }\n\n @media (max-width: @grid-float-breakpoint-max) {\n // Dropdowns get custom display\n .open .dropdown-menu {\n > .dropdown-header {\n border-color: @navbar-inverse-border;\n }\n .divider {\n background-color: @navbar-inverse-border;\n }\n > li > a {\n color: @navbar-inverse-link-color;\n &:hover,\n &:focus {\n color: @navbar-inverse-link-hover-color;\n background-color: @navbar-inverse-link-hover-bg;\n }\n }\n > .active > a {\n &,\n &:hover,\n &:focus {\n color: @navbar-inverse-link-active-color;\n background-color: @navbar-inverse-link-active-bg;\n }\n }\n > .disabled > a {\n &,\n &:hover,\n &:focus {\n color: @navbar-inverse-link-disabled-color;\n background-color: @navbar-inverse-link-disabled-bg;\n }\n }\n }\n }\n }\n\n .navbar-link {\n color: @navbar-inverse-link-color;\n &:hover {\n color: @navbar-inverse-link-hover-color;\n }\n }\n\n}\n","//\n// Utility classes\n// --------------------------------------------------\n\n\n// Floats\n// -------------------------\n\n.clearfix {\n .clearfix();\n}\n.center-block {\n .center-block();\n}\n.pull-right {\n float: right !important;\n}\n.pull-left {\n float: left !important;\n}\n\n\n// Toggling content\n// -------------------------\n\n// Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1\n.hide {\n display: none !important;\n}\n.show {\n display: block !important;\n}\n.invisible {\n visibility: hidden;\n}\n.text-hide {\n .text-hide();\n}\n\n\n// Hide from screenreaders and browsers\n//\n// Credit: HTML5 Boilerplate\n\n.hidden {\n display: none !important;\n visibility: hidden !important;\n}\n\n\n// For Affix plugin\n// -------------------------\n\n.affix {\n position: fixed;\n}\n","//\n// Breadcrumbs\n// --------------------------------------------------\n\n\n.breadcrumb {\n padding: @breadcrumb-padding-vertical @breadcrumb-padding-horizontal;\n margin-bottom: @line-height-computed;\n list-style: none;\n background-color: @breadcrumb-bg;\n border-radius: @border-radius-base;\n\n > li {\n display: inline-block;\n\n + li:before {\n content: \"@{breadcrumb-separator}\\00a0\"; // Unicode space added since inline-block means non-collapsing white-space\n padding: 0 5px;\n color: @breadcrumb-color;\n }\n }\n\n > .active {\n color: @breadcrumb-active-color;\n }\n}\n","//\n// Pagination (multiple pages)\n// --------------------------------------------------\n.pagination {\n display: inline-block;\n padding-left: 0;\n margin: @line-height-computed 0;\n border-radius: @border-radius-base;\n\n > li {\n display: inline; // Remove list-style and block-level defaults\n > a,\n > span {\n position: relative;\n float: left; // Collapse white-space\n padding: @padding-base-vertical @padding-base-horizontal;\n line-height: @line-height-base;\n text-decoration: none;\n color: @pagination-color;\n background-color: @pagination-bg;\n border: 1px solid @pagination-border;\n margin-left: -1px;\n }\n &:first-child {\n > a,\n > span {\n margin-left: 0;\n .border-left-radius(@border-radius-base);\n }\n }\n &:last-child {\n > a,\n > span {\n .border-right-radius(@border-radius-base);\n }\n }\n }\n\n > li > a,\n > li > span {\n &:hover,\n &:focus {\n color: @pagination-hover-color;\n background-color: @pagination-hover-bg;\n border-color: @pagination-hover-border;\n }\n }\n\n > .active > a,\n > .active > span {\n &,\n &:hover,\n &:focus {\n z-index: 2;\n color: @pagination-active-color;\n background-color: @pagination-active-bg;\n border-color: @pagination-active-border;\n cursor: default;\n }\n }\n\n > .disabled {\n > span,\n > span:hover,\n > span:focus,\n > a,\n > a:hover,\n > a:focus {\n color: @pagination-disabled-color;\n background-color: @pagination-disabled-bg;\n border-color: @pagination-disabled-border;\n cursor: not-allowed;\n }\n }\n}\n\n// Sizing\n// --------------------------------------------------\n\n// Large\n.pagination-lg {\n .pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @border-radius-large);\n}\n\n// Small\n.pagination-sm {\n .pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @border-radius-small);\n}\n","//\n// Pager pagination\n// --------------------------------------------------\n\n\n.pager {\n padding-left: 0;\n margin: @line-height-computed 0;\n list-style: none;\n text-align: center;\n &:extend(.clearfix all);\n li {\n display: inline;\n > a,\n > span {\n display: inline-block;\n padding: 5px 14px;\n background-color: @pager-bg;\n border: 1px solid @pager-border;\n border-radius: @pager-border-radius;\n }\n\n > a:hover,\n > a:focus {\n text-decoration: none;\n background-color: @pager-hover-bg;\n }\n }\n\n .next {\n > a,\n > span {\n float: right;\n }\n }\n\n .previous {\n > a,\n > span {\n float: left;\n }\n }\n\n .disabled {\n > a,\n > a:hover,\n > a:focus,\n > span {\n color: @pager-disabled-color;\n background-color: @pager-bg;\n cursor: not-allowed;\n }\n }\n\n}\n","//\n// Labels\n// --------------------------------------------------\n\n.label {\n display: inline;\n padding: .2em .6em .3em;\n font-size: 75%;\n font-weight: bold;\n line-height: 1;\n color: @label-color;\n text-align: center;\n white-space: nowrap;\n vertical-align: baseline;\n border-radius: .25em;\n\n // Add hover effects, but only for links\n &[href] {\n &:hover,\n &:focus {\n color: @label-link-hover-color;\n text-decoration: none;\n cursor: pointer;\n }\n }\n\n // Empty labels collapse automatically (not available in IE8)\n &:empty {\n display: none;\n }\n\n // Quick fix for labels in buttons\n .btn & {\n position: relative;\n top: -1px;\n }\n}\n\n// Colors\n// Contextual variations (linked labels get darker on :hover)\n\n.label-default {\n .label-variant(@label-default-bg);\n}\n\n.label-primary {\n .label-variant(@label-primary-bg);\n}\n\n.label-success {\n .label-variant(@label-success-bg);\n}\n\n.label-info {\n .label-variant(@label-info-bg);\n}\n\n.label-warning {\n .label-variant(@label-warning-bg);\n}\n\n.label-danger {\n .label-variant(@label-danger-bg);\n}\n","//\n// Badges\n// --------------------------------------------------\n\n\n// Base classes\n.badge {\n display: inline-block;\n min-width: 10px;\n padding: 3px 7px;\n font-size: @font-size-small;\n font-weight: @badge-font-weight;\n color: @badge-color;\n line-height: @badge-line-height;\n vertical-align: baseline;\n white-space: nowrap;\n text-align: center;\n background-color: @badge-bg;\n border-radius: @badge-border-radius;\n\n // Empty badges collapse automatically (not available in IE8)\n &:empty {\n display: none;\n }\n\n // Quick fix for badges in buttons\n .btn & {\n position: relative;\n top: -1px;\n }\n .btn-xs & {\n top: 0;\n padding: 1px 5px;\n }\n}\n\n// Hover state, but only for links\na.badge {\n &:hover,\n &:focus {\n color: @badge-link-hover-color;\n text-decoration: none;\n cursor: pointer;\n }\n}\n\n// Account for counters in navs\na.list-group-item.active > .badge,\n.nav-pills > .active > a > .badge {\n color: @badge-active-color;\n background-color: @badge-active-bg;\n}\n.nav-pills > li > a > .badge {\n margin-left: 3px;\n}\n","//\n// Jumbotron\n// --------------------------------------------------\n\n\n.jumbotron {\n padding: @jumbotron-padding;\n margin-bottom: @jumbotron-padding;\n color: @jumbotron-color;\n background-color: @jumbotron-bg;\n\n h1,\n .h1 {\n color: @jumbotron-heading-color;\n }\n p {\n margin-bottom: (@jumbotron-padding / 2);\n font-size: @jumbotron-font-size;\n font-weight: 200;\n }\n\n .container & {\n border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container\n }\n\n .container {\n max-width: 100%;\n }\n\n @media screen and (min-width: @screen-sm-min) {\n padding-top: (@jumbotron-padding * 1.6);\n padding-bottom: (@jumbotron-padding * 1.6);\n\n .container & {\n padding-left: (@jumbotron-padding * 2);\n padding-right: (@jumbotron-padding * 2);\n }\n\n h1,\n .h1 {\n font-size: (@font-size-base * 4.5);\n }\n }\n}\n","//\n// Alerts\n// --------------------------------------------------\n\n\n// Base styles\n// -------------------------\n\n.alert {\n padding: @alert-padding;\n margin-bottom: @line-height-computed;\n border: 1px solid transparent;\n border-radius: @alert-border-radius;\n\n // Headings for larger alerts\n h4 {\n margin-top: 0;\n // Specified for the h4 to prevent conflicts of changing @headings-color\n color: inherit;\n }\n // Provide class for links that match alerts\n .alert-link {\n font-weight: @alert-link-font-weight;\n }\n\n // Improve alignment and spacing of inner content\n > p,\n > ul {\n margin-bottom: 0;\n }\n > p + p {\n margin-top: 5px;\n }\n}\n\n// Dismissable alerts\n//\n// Expand the right padding and account for the close button's positioning.\n\n.alert-dismissable {\n padding-right: (@alert-padding + 20);\n\n // Adjust close link position\n .close {\n position: relative;\n top: -2px;\n right: -21px;\n color: inherit;\n }\n}\n\n// Alternate styles\n//\n// Generate contextual modifier classes for colorizing the alert.\n\n.alert-success {\n .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);\n}\n.alert-info {\n .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text);\n}\n.alert-warning {\n .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text);\n}\n.alert-danger {\n .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);\n}\n","//\n// Progress bars\n// --------------------------------------------------\n\n\n// Bar animations\n// -------------------------\n\n// WebKit\n@-webkit-keyframes progress-bar-stripes {\n from { background-position: 40px 0; }\n to { background-position: 0 0; }\n}\n\n// Spec and IE10+\n@keyframes progress-bar-stripes {\n from { background-position: 40px 0; }\n to { background-position: 0 0; }\n}\n\n\n\n// Bar itself\n// -------------------------\n\n// Outer container\n.progress {\n overflow: hidden;\n height: @line-height-computed;\n margin-bottom: @line-height-computed;\n background-color: @progress-bg;\n border-radius: @border-radius-base;\n .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));\n}\n\n// Bar of progress\n.progress-bar {\n float: left;\n width: 0%;\n height: 100%;\n font-size: @font-size-small;\n line-height: @line-height-computed;\n color: @progress-bar-color;\n text-align: center;\n background-color: @progress-bar-bg;\n .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));\n .transition(width .6s ease);\n}\n\n// Striped bars\n.progress-striped .progress-bar {\n #gradient > .striped();\n background-size: 40px 40px;\n}\n\n// Call animation for the active one\n.progress.active .progress-bar {\n .animation(progress-bar-stripes 2s linear infinite);\n}\n\n\n\n// Variations\n// -------------------------\n\n.progress-bar-success {\n .progress-bar-variant(@progress-bar-success-bg);\n}\n\n.progress-bar-info {\n .progress-bar-variant(@progress-bar-info-bg);\n}\n\n.progress-bar-warning {\n .progress-bar-variant(@progress-bar-warning-bg);\n}\n\n.progress-bar-danger {\n .progress-bar-variant(@progress-bar-danger-bg);\n}\n","// Media objects\n// Source: http://stubbornella.org/content/?p=497\n// --------------------------------------------------\n\n\n// Common styles\n// -------------------------\n\n// Clear the floats\n.media,\n.media-body {\n overflow: hidden;\n zoom: 1;\n}\n\n// Proper spacing between instances of .media\n.media,\n.media .media {\n margin-top: 15px;\n}\n.media:first-child {\n margin-top: 0;\n}\n\n// For images and videos, set to block\n.media-object {\n display: block;\n}\n\n// Reset margins on headings for tighter default spacing\n.media-heading {\n margin: 0 0 5px;\n}\n\n\n// Media image alignment\n// -------------------------\n\n.media {\n > .pull-left {\n margin-right: 10px;\n }\n > .pull-right {\n margin-left: 10px;\n }\n}\n\n\n// Media list variation\n// -------------------------\n\n// Undo default ul/ol styles\n.media-list {\n padding-left: 0;\n list-style: none;\n}\n","//\n// List groups\n// --------------------------------------------------\n\n\n// Base class\n//\n// Easily usable on <ul>, <ol>, or <div>.\n\n.list-group {\n // No need to set list-style: none; since .list-group-item is block level\n margin-bottom: 20px;\n padding-left: 0; // reset padding because ul and ol\n}\n\n\n// Individual list items\n//\n// Use on `li`s or `div`s within the `.list-group` parent.\n\n.list-group-item {\n position: relative;\n display: block;\n padding: 10px 15px;\n // Place the border on the list items and negative margin up for better styling\n margin-bottom: -1px;\n background-color: @list-group-bg;\n border: 1px solid @list-group-border;\n\n // Round the first and last items\n &:first-child {\n .border-top-radius(@list-group-border-radius);\n }\n &:last-child {\n margin-bottom: 0;\n .border-bottom-radius(@list-group-border-radius);\n }\n\n // Align badges within list items\n > .badge {\n float: right;\n }\n > .badge + .badge {\n margin-right: 5px;\n }\n}\n\n\n// Linked list items\n//\n// Use anchor elements instead of `li`s or `div`s to create linked list items.\n// Includes an extra `.active` modifier class for showing selected items.\n\na.list-group-item {\n color: @list-group-link-color;\n\n .list-group-item-heading {\n color: @list-group-link-heading-color;\n }\n\n // Hover state\n &:hover,\n &:focus {\n text-decoration: none;\n background-color: @list-group-hover-bg;\n }\n\n // Active class on item itself, not parent\n &.active,\n &.active:hover,\n &.active:focus {\n z-index: 2; // Place active items above their siblings for proper border styling\n color: @list-group-active-color;\n background-color: @list-group-active-bg;\n border-color: @list-group-active-border;\n\n // Force color to inherit for custom content\n .list-group-item-heading {\n color: inherit;\n }\n .list-group-item-text {\n color: @list-group-active-text-color;\n }\n }\n}\n\n\n// Contextual variants\n//\n// Add modifier classes to change text and background color on individual items.\n// Organizationally, this must come after the `:hover` states.\n\n.list-group-item-variant(success; @state-success-bg; @state-success-text);\n.list-group-item-variant(info; @state-info-bg; @state-info-text);\n.list-group-item-variant(warning; @state-warning-bg; @state-warning-text);\n.list-group-item-variant(danger; @state-danger-bg; @state-danger-text);\n\n\n// Custom content options\n//\n// Extra classes for creating well-formatted content within `.list-group-item`s.\n\n.list-group-item-heading {\n margin-top: 0;\n margin-bottom: 5px;\n}\n.list-group-item-text {\n margin-bottom: 0;\n line-height: 1.3;\n}\n","//\n// Panels\n// --------------------------------------------------\n\n\n// Base class\n.panel {\n margin-bottom: @line-height-computed;\n background-color: @panel-bg;\n border: 1px solid transparent;\n border-radius: @panel-border-radius;\n .box-shadow(0 1px 1px rgba(0,0,0,.05));\n}\n\n// Panel contents\n.panel-body {\n padding: @panel-body-padding;\n &:extend(.clearfix all);\n}\n\n// Optional heading\n.panel-heading {\n padding: 10px 15px;\n border-bottom: 1px solid transparent;\n .border-top-radius((@panel-border-radius - 1));\n\n > .dropdown .dropdown-toggle {\n color: inherit;\n }\n}\n\n// Within heading, strip any `h*` tag of its default margins for spacing.\n.panel-title {\n margin-top: 0;\n margin-bottom: 0;\n font-size: ceil((@font-size-base * 1.125));\n color: inherit;\n\n > a {\n color: inherit;\n }\n}\n\n// Optional footer (stays gray in every modifier class)\n.panel-footer {\n padding: 10px 15px;\n background-color: @panel-footer-bg;\n border-top: 1px solid @panel-inner-border;\n .border-bottom-radius((@panel-border-radius - 1));\n}\n\n\n// List groups in panels\n//\n// By default, space out list group content from panel headings to account for\n// any kind of custom content between the two.\n\n.panel {\n > .list-group {\n margin-bottom: 0;\n\n .list-group-item {\n border-width: 1px 0;\n border-radius: 0;\n }\n\n // Add border top radius for first one\n &:first-child {\n .list-group-item:first-child {\n border-top: 0;\n .border-top-radius((@panel-border-radius - 1));\n }\n }\n // Add border bottom radius for last one\n &:last-child {\n .list-group-item:last-child {\n border-bottom: 0;\n .border-bottom-radius((@panel-border-radius - 1));\n }\n }\n }\n}\n// Collapse space between when there's no additional content.\n.panel-heading + .list-group {\n .list-group-item:first-child {\n border-top-width: 0;\n }\n}\n\n\n// Tables in panels\n//\n// Place a non-bordered `.table` within a panel (not within a `.panel-body`) and\n// watch it go full width.\n\n.panel {\n > .table,\n > .table-responsive > .table {\n margin-bottom: 0;\n }\n // Add border top radius for first one\n > .table:first-child,\n > .table-responsive:first-child > .table:first-child {\n .border-top-radius((@panel-border-radius - 1));\n\n > thead:first-child,\n > tbody:first-child {\n > tr:first-child {\n td:first-child,\n th:first-child {\n border-top-left-radius: (@panel-border-radius - 1);\n }\n td:last-child,\n th:last-child {\n border-top-right-radius: (@panel-border-radius - 1);\n }\n }\n }\n }\n // Add border bottom radius for last one\n > .table:last-child,\n > .table-responsive:last-child > .table:last-child {\n .border-bottom-radius((@panel-border-radius - 1));\n\n > tbody:last-child,\n > tfoot:last-child {\n > tr:last-child {\n td:first-child,\n th:first-child {\n border-bottom-left-radius: (@panel-border-radius - 1);\n }\n td:last-child,\n th:last-child {\n border-bottom-right-radius: (@panel-border-radius - 1);\n }\n }\n }\n }\n > .panel-body + .table,\n > .panel-body + .table-responsive {\n border-top: 1px solid @table-border-color;\n }\n > .table > tbody:first-child > tr:first-child th,\n > .table > tbody:first-child > tr:first-child td {\n border-top: 0;\n }\n > .table-bordered,\n > .table-responsive > .table-bordered {\n border: 0;\n > thead,\n > tbody,\n > tfoot {\n > tr {\n > th:first-child,\n > td:first-child {\n border-left: 0;\n }\n > th:last-child,\n > td:last-child {\n border-right: 0;\n }\n }\n }\n > thead,\n > tbody {\n > tr:first-child {\n > td,\n > th {\n border-bottom: 0;\n }\n }\n }\n > tbody,\n > tfoot {\n > tr:last-child {\n > td,\n > th {\n border-bottom: 0;\n }\n }\n }\n }\n > .table-responsive {\n border: 0;\n margin-bottom: 0;\n }\n}\n\n\n// Collapsable panels (aka, accordion)\n//\n// Wrap a series of panels in `.panel-group` to turn them into an accordion with\n// the help of our collapse JavaScript plugin.\n\n.panel-group {\n margin-bottom: @line-height-computed;\n\n // Tighten up margin so it's only between panels\n .panel {\n margin-bottom: 0;\n border-radius: @panel-border-radius;\n overflow: hidden; // crop contents when collapsed\n + .panel {\n margin-top: 5px;\n }\n }\n\n .panel-heading {\n border-bottom: 0;\n + .panel-collapse .panel-body {\n border-top: 1px solid @panel-inner-border;\n }\n }\n .panel-footer {\n border-top: 0;\n + .panel-collapse .panel-body {\n border-bottom: 1px solid @panel-inner-border;\n }\n }\n}\n\n\n// Contextual variations\n.panel-default {\n .panel-variant(@panel-default-border; @panel-default-text; @panel-default-heading-bg; @panel-default-border);\n}\n.panel-primary {\n .panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border);\n}\n.panel-success {\n .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border);\n}\n.panel-info {\n .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);\n}\n.panel-warning {\n .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border);\n}\n.panel-danger {\n .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border);\n}\n","//\n// Wells\n// --------------------------------------------------\n\n\n// Base class\n.well {\n min-height: 20px;\n padding: 19px;\n margin-bottom: 20px;\n background-color: @well-bg;\n border: 1px solid @well-border;\n border-radius: @border-radius-base;\n .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));\n blockquote {\n border-color: #ddd;\n border-color: rgba(0,0,0,.15);\n }\n}\n\n// Sizes\n.well-lg {\n padding: 24px;\n border-radius: @border-radius-large;\n}\n.well-sm {\n padding: 9px;\n border-radius: @border-radius-small;\n}\n","//\n// Close icons\n// --------------------------------------------------\n\n\n.close {\n float: right;\n font-size: (@font-size-base * 1.5);\n font-weight: @close-font-weight;\n line-height: 1;\n color: @close-color;\n text-shadow: @close-text-shadow;\n .opacity(.2);\n\n &:hover,\n &:focus {\n color: @close-color;\n text-decoration: none;\n cursor: pointer;\n .opacity(.5);\n }\n\n // Additional properties for button version\n // iOS requires the button element instead of an anchor tag.\n // If you want the anchor version, it requires `href=\"#\"`.\n button& {\n padding: 0;\n cursor: pointer;\n background: transparent;\n border: 0;\n -webkit-appearance: none;\n }\n}\n","//\n// Modals\n// --------------------------------------------------\n\n// .modal-open - body class for killing the scroll\n// .modal - container to scroll within\n// .modal-dialog - positioning shell for the actual modal\n// .modal-content - actual modal w/ bg and corners and shit\n\n// Kill the scroll on the body\n.modal-open {\n overflow: hidden;\n}\n\n// Container that the modal scrolls within\n.modal {\n display: none;\n overflow: auto;\n overflow-y: scroll;\n position: fixed;\n top: 0;\n right: 0;\n bottom: 0;\n left: 0;\n z-index: @zindex-modal;\n -webkit-overflow-scrolling: touch;\n\n // Prevent Chrome on Windows from adding a focus outline. For details, see\n // https://github.com/twbs/bootstrap/pull/10951.\n outline: 0;\n\n // When fading in the modal, animate it to slide down\n &.fade .modal-dialog {\n .translate(0, -25%);\n .transition-transform(~\"0.3s ease-out\");\n }\n &.in .modal-dialog { .translate(0, 0)}\n}\n\n// Shell div to position the modal with bottom padding\n.modal-dialog {\n position: relative;\n width: auto;\n margin: 10px;\n}\n\n// Actual modal\n.modal-content {\n position: relative;\n background-color: @modal-content-bg;\n border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)\n border: 1px solid @modal-content-border-color;\n border-radius: @border-radius-large;\n .box-shadow(0 3px 9px rgba(0,0,0,.5));\n background-clip: padding-box;\n // Remove focus outline from opened modal\n outline: none;\n}\n\n// Modal background\n.modal-backdrop {\n position: fixed;\n top: 0;\n right: 0;\n bottom: 0;\n left: 0;\n z-index: @zindex-modal-background;\n background-color: @modal-backdrop-bg;\n // Fade for backdrop\n &.fade { .opacity(0); }\n &.in { .opacity(@modal-backdrop-opacity); }\n}\n\n// Modal header\n// Top section of the modal w/ title and dismiss\n.modal-header {\n padding: @modal-title-padding;\n border-bottom: 1px solid @modal-header-border-color;\n min-height: (@modal-title-padding + @modal-title-line-height);\n}\n// Close icon\n.modal-header .close {\n margin-top: -2px;\n}\n\n// Title text within header\n.modal-title {\n margin: 0;\n line-height: @modal-title-line-height;\n}\n\n// Modal body\n// Where all modal content resides (sibling of .modal-header and .modal-footer)\n.modal-body {\n position: relative;\n padding: @modal-inner-padding;\n}\n\n// Footer (for actions)\n.modal-footer {\n margin-top: 15px;\n padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding;\n text-align: right; // right align buttons\n border-top: 1px solid @modal-footer-border-color;\n &:extend(.clearfix all); // clear it in case folks use .pull-* classes on buttons\n\n // Properly space out buttons\n .btn + .btn {\n margin-left: 5px;\n margin-bottom: 0; // account for input[type=\"submit\"] which gets the bottom margin like all other inputs\n }\n // but override that for button groups\n .btn-group .btn + .btn {\n margin-left: -1px;\n }\n // and override it for block buttons as well\n .btn-block + .btn-block {\n margin-left: 0;\n }\n}\n\n// Scale up the modal\n@media (min-width: @screen-sm-min) {\n // Automatically set modal's width for larger viewports\n .modal-dialog {\n width: @modal-md;\n margin: 30px auto;\n }\n .modal-content {\n .box-shadow(0 5px 15px rgba(0,0,0,.5));\n }\n\n // Modal sizes\n .modal-sm { width: @modal-sm; }\n}\n\n@media (min-width: @screen-md-min) {\n .modal-lg { width: @modal-lg; }\n}\n","//\n// Tooltips\n// --------------------------------------------------\n\n\n// Base class\n.tooltip {\n position: absolute;\n z-index: @zindex-tooltip;\n display: block;\n visibility: visible;\n font-size: @font-size-small;\n line-height: 1.4;\n .opacity(0);\n\n &.in { .opacity(@tooltip-opacity); }\n &.top { margin-top: -3px; padding: @tooltip-arrow-width 0; }\n &.right { margin-left: 3px; padding: 0 @tooltip-arrow-width; }\n &.bottom { margin-top: 3px; padding: @tooltip-arrow-width 0; }\n &.left { margin-left: -3px; padding: 0 @tooltip-arrow-width; }\n}\n\n// Wrapper for the tooltip content\n.tooltip-inner {\n max-width: @tooltip-max-width;\n padding: 3px 8px;\n color: @tooltip-color;\n text-align: center;\n text-decoration: none;\n background-color: @tooltip-bg;\n border-radius: @border-radius-base;\n}\n\n// Arrows\n.tooltip-arrow {\n position: absolute;\n width: 0;\n height: 0;\n border-color: transparent;\n border-style: solid;\n}\n.tooltip {\n &.top .tooltip-arrow {\n bottom: 0;\n left: 50%;\n margin-left: -@tooltip-arrow-width;\n border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n border-top-color: @tooltip-arrow-color;\n }\n &.top-left .tooltip-arrow {\n bottom: 0;\n left: @tooltip-arrow-width;\n border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n border-top-color: @tooltip-arrow-color;\n }\n &.top-right .tooltip-arrow {\n bottom: 0;\n right: @tooltip-arrow-width;\n border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n border-top-color: @tooltip-arrow-color;\n }\n &.right .tooltip-arrow {\n top: 50%;\n left: 0;\n margin-top: -@tooltip-arrow-width;\n border-width: @tooltip-arrow-width @tooltip-arrow-width @tooltip-arrow-width 0;\n border-right-color: @tooltip-arrow-color;\n }\n &.left .tooltip-arrow {\n top: 50%;\n right: 0;\n margin-top: -@tooltip-arrow-width;\n border-width: @tooltip-arrow-width 0 @tooltip-arrow-width @tooltip-arrow-width;\n border-left-color: @tooltip-arrow-color;\n }\n &.bottom .tooltip-arrow {\n top: 0;\n left: 50%;\n margin-left: -@tooltip-arrow-width;\n border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n border-bottom-color: @tooltip-arrow-color;\n }\n &.bottom-left .tooltip-arrow {\n top: 0;\n left: @tooltip-arrow-width;\n border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n border-bottom-color: @tooltip-arrow-color;\n }\n &.bottom-right .tooltip-arrow {\n top: 0;\n right: @tooltip-arrow-width;\n border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n border-bottom-color: @tooltip-arrow-color;\n }\n}\n","//\n// Popovers\n// --------------------------------------------------\n\n\n.popover {\n position: absolute;\n top: 0;\n left: 0;\n z-index: @zindex-popover;\n display: none;\n max-width: @popover-max-width;\n padding: 1px;\n text-align: left; // Reset given new insertion method\n background-color: @popover-bg;\n background-clip: padding-box;\n border: 1px solid @popover-fallback-border-color;\n border: 1px solid @popover-border-color;\n border-radius: @border-radius-large;\n .box-shadow(0 5px 10px rgba(0,0,0,.2));\n\n // Overrides for proper insertion\n white-space: normal;\n\n // Offset the popover to account for the popover arrow\n &.top { margin-top: -@popover-arrow-width; }\n &.right { margin-left: @popover-arrow-width; }\n &.bottom { margin-top: @popover-arrow-width; }\n &.left { margin-left: -@popover-arrow-width; }\n}\n\n.popover-title {\n margin: 0; // reset heading margin\n padding: 8px 14px;\n font-size: @font-size-base;\n font-weight: normal;\n line-height: 18px;\n background-color: @popover-title-bg;\n border-bottom: 1px solid darken(@popover-title-bg, 5%);\n border-radius: 5px 5px 0 0;\n}\n\n.popover-content {\n padding: 9px 14px;\n}\n\n// Arrows\n//\n// .arrow is outer, .arrow:after is inner\n\n.popover > .arrow {\n &,\n &:after {\n position: absolute;\n display: block;\n width: 0;\n height: 0;\n border-color: transparent;\n border-style: solid;\n }\n}\n.popover > .arrow {\n border-width: @popover-arrow-outer-width;\n}\n.popover > .arrow:after {\n border-width: @popover-arrow-width;\n content: \"\";\n}\n\n.popover {\n &.top > .arrow {\n left: 50%;\n margin-left: -@popover-arrow-outer-width;\n border-bottom-width: 0;\n border-top-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n border-top-color: @popover-arrow-outer-color;\n bottom: -@popover-arrow-outer-width;\n &:after {\n content: \" \";\n bottom: 1px;\n margin-left: -@popover-arrow-width;\n border-bottom-width: 0;\n border-top-color: @popover-arrow-color;\n }\n }\n &.right > .arrow {\n top: 50%;\n left: -@popover-arrow-outer-width;\n margin-top: -@popover-arrow-outer-width;\n border-left-width: 0;\n border-right-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n border-right-color: @popover-arrow-outer-color;\n &:after {\n content: \" \";\n left: 1px;\n bottom: -@popover-arrow-width;\n border-left-width: 0;\n border-right-color: @popover-arrow-color;\n }\n }\n &.bottom > .arrow {\n left: 50%;\n margin-left: -@popover-arrow-outer-width;\n border-top-width: 0;\n border-bottom-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n border-bottom-color: @popover-arrow-outer-color;\n top: -@popover-arrow-outer-width;\n &:after {\n content: \" \";\n top: 1px;\n margin-left: -@popover-arrow-width;\n border-top-width: 0;\n border-bottom-color: @popover-arrow-color;\n }\n }\n\n &.left > .arrow {\n top: 50%;\n right: -@popover-arrow-outer-width;\n margin-top: -@popover-arrow-outer-width;\n border-right-width: 0;\n border-left-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n border-left-color: @popover-arrow-outer-color;\n &:after {\n content: \" \";\n right: 1px;\n border-right-width: 0;\n border-left-color: @popover-arrow-color;\n bottom: -@popover-arrow-width;\n }\n }\n\n}\n","//\n// Responsive: Utility classes\n// --------------------------------------------------\n\n\n// IE10 in Windows (Phone) 8\n//\n// Support for responsive views via media queries is kind of borked in IE10, for\n// Surface/desktop in split view and for Windows Phone 8. This particular fix\n// must be accompanied by a snippet of JavaScript to sniff the user agent and\n// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at\n// our Getting Started page for more information on this bug.\n//\n// For more information, see the following:\n//\n// Issue: https://github.com/twbs/bootstrap/issues/10497\n// Docs: http://getbootstrap.com/getting-started/#browsers\n// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/\n\n@-ms-viewport {\n width: device-width;\n}\n\n\n// Visibility utilities\n.visible-xs,\n.visible-sm,\n.visible-md,\n.visible-lg {\n .responsive-invisibility();\n}\n\n.visible-xs {\n @media (max-width: @screen-xs-max) {\n .responsive-visibility();\n }\n}\n.visible-sm {\n @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n .responsive-visibility();\n }\n}\n.visible-md {\n @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n .responsive-visibility();\n }\n}\n.visible-lg {\n @media (min-width: @screen-lg-min) {\n .responsive-visibility();\n }\n}\n\n.hidden-xs {\n @media (max-width: @screen-xs-max) {\n .responsive-invisibility();\n }\n}\n.hidden-sm {\n @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n .responsive-invisibility();\n }\n}\n.hidden-md {\n @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n .responsive-invisibility();\n }\n}\n.hidden-lg {\n @media (min-width: @screen-lg-min) {\n .responsive-invisibility();\n }\n}\n\n\n// Print utilities\n//\n// Media queries are placed on the inside to be mixin-friendly.\n\n.visible-print {\n .responsive-invisibility();\n\n @media print {\n .responsive-visibility();\n }\n}\n\n.hidden-print {\n @media print {\n .responsive-invisibility();\n }\n}\n"]}
\ No newline at end of file
diff --git a/setup/pub/bootstrap/css/bootstrap.min.css b/setup/pub/bootstrap/css/bootstrap.min.css
deleted file mode 100644
index 560399c8c4db64cbd40066ae38482be91f886589..0000000000000000000000000000000000000000
--- a/setup/pub/bootstrap/css/bootstrap.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Bootstrap v3.1.1 (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
-/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*{text-shadow:none!important;color:#000!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:before,:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive,.thumbnail>img,.thumbnail a>img,.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:400;line-height:1;color:#999}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-muted{color:#999}.text-primary{color:#428bca}a.text-primary:hover{color:#3071a9}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#428bca}a.bg-primary:hover{background-color:#3071a9}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#999}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;white-space:nowrap;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*=col-]{position:static;float:none;display:table-column}table td[class*=col-],table th[class*=col-]{position:static;float:none;display:table-cell}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover,.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}@media (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0;min-width:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=radio],input[type=checkbox]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=radio]:focus,input[type=checkbox]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}input[type=date]{line-height:34px}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px}.radio label,.checkbox label{display:inline;font-weight:400;cursor:pointer}.radio input[type=radio],.radio-inline input[type=radio],.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:400;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type=radio][disabled],input[type=checkbox][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type=radio],fieldset[disabled] input[type=checkbox],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.has-feedback .form-control-feedback{position:absolute;top:25px;right:0;display:block;width:34px;height:34px;line-height:34px;text-align:center}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.form-inline .radio input[type=radio],.form-inline .checkbox input[type=checkbox]{float:none;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-control-static{padding-top:7px}@media (min-width:768px){.form-horizontal .control-label{text-align:right}}.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:active:focus,.btn.active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#428bca;font-weight:400;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg,.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs,.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0}.btn-block+.btn-block{margin-top:5px}input[type=submit].btn-block,input[type=reset].btn-block,input[type=button].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#428bca}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#999}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-bottom-left-radius:4px;border-top-right-radius:0;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle=buttons]>.btn>input[type=radio],[data-toggle=buttons]>.btn>input[type=checkbox]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon + .form-control{min-width: 70px;}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=radio],.input-group-addon input[type=checkbox]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:0;padding-right:0}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px;font-size:18px;line-height:20px;height:50px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{margin-left:-15px;margin-right:-15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.navbar-form .radio input[type=radio],.navbar-form .checkbox input[type=checkbox]{float:none;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{content:"/\00a0";padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857143;text-decoration:none;color:#428bca;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{color:#2a6496;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca;cursor:default}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:20px 0;list-style:none;text-align:center}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:gray}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron h1,.jumbotron .h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.container .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-left:60px;padding-right:60px}.jumbotron h1,.jumbotron .h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img,.thumbnail a>img{margin-left:auto;margin-right:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#428bca}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,a.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:hover,a.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,a.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:hover,a.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:hover,a.list-group-item-warning:focus{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,a.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px;overflow:hidden}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ebccd1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{display:none;overflow:auto;overflow-y:scroll;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);background-clip:padding-box;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5;min-height:16.42857143px}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:20px}.modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1030;display:block;visibility:visible;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0)}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{margin-top:-3px;padding:5px 0}.tooltip.right{margin-left:3px;padding:0 5px}.tooltip.bottom{margin-top:3px;padding:5px 0}.tooltip.left{margin-left:-3px;padding:0 5px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;right:5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);white-space:normal}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{margin:0;padding:8px 14px;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{border-width:10px;content:""}.popover.top>.arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:rgba(0,0,0,.25);bottom:-11px}.popover.top>.arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#fff}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:rgba(0,0,0,.25)}.popover.right>.arrow:after{content:" ";left:1px;bottom:-10px;border-left-width:0;border-right-color:#fff}.popover.bottom>.arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25);top:-11px}.popover.bottom>.arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{content:" ";right:1px;border-right-width:0;border-left-color:#fff;bottom:-10px}.carousel{position:relative}.carousel-inner{position:relative;overflow:hidden;width:100%}.carousel-inner>.item{display:none;position:relative;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;left:0;bottom:0;width:15%;opacity:.5;filter:alpha(opacity=50);font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-control.left{background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,.5) 0),color-stop(rgba(0,0,0,.0001) 100%));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1)}.carousel-control.right{left:auto;right:0;background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,.0001) 0),color-stop(rgba(0,0,0,.5) 100%));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1)}.carousel-control:hover,.carousel-control:focus{outline:0;color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;margin-left:-30%;padding-left:0;list-style:none;text-align:center}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;border:1px solid #fff;border-radius:10px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0)}.carousel-indicators .active{margin:0;width:12px;height:12px;background-color:#fff}.carousel-caption{position:absolute;left:15%;right:15%;bottom:20px;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{left:20%;right:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.panel-body:before,.panel-body:after,.modal-footer:before,.modal-footer:after{content:" ";display:table}.clearfix:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.panel-body:after,.modal-footer:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}}@media print{.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.eot b/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index 4a4ca865d67e86f961bc6e2ef00bffa4e34bb9ed..0000000000000000000000000000000000000000
Binary files a/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.svg b/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index 23c0e3bd2b2ffa789bb58e7481c03b6ed0bffab1..0000000000000000000000000000000000000000
--- a/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1200"><font-face units-per-em="1200" ascent="960" descent="-240"/><glyph/><glyph/><glyph/><glyph/><glyph unicode="*" d="M100 500v200h259L176 883l141 141 183-183v259h200V841l183 183 141-141-183-183h259V500H841l183-183-141-141-183 183V100H500v259L317 176 176 317l183 183H100z"/><glyph unicode="+" d="M0 400v300h400v400h300V700h400V400H700V0H400v400H0z"/><glyph/><glyph horiz-adv-x="652"/><glyph horiz-adv-x="1304"/><glyph horiz-adv-x="652"/><glyph horiz-adv-x="1304"/><glyph horiz-adv-x="434"/><glyph horiz-adv-x="326"/><glyph horiz-adv-x="217"/><glyph horiz-adv-x="217"/><glyph horiz-adv-x="163"/><glyph horiz-adv-x="260"/><glyph horiz-adv-x="72"/><glyph horiz-adv-x="260"/><glyph horiz-adv-x="326"/><glyph unicode="€" d="M100 500l100 100h113q0 47 5 100H100l100 100h135q37 167 112 257 117 141 297 141 242 0 354-189 60-103 66-209H983q0 55-25.5 99T894 967t-75 36.5-67 12.5q-24 0-52.5-10T637 974t-65.5-67T521 800h379L800 700H500q-6-46-6-100h406L800 500H500q9-74 33-132t52.5-91 62-54.5 59-29T753 186q29 0 66 13t75 37 63.5 67.5T983 400h174q-31-172-128-278Q922 5 755 5 550 5 431 163q-36 46-69 131.5T317 500H100z"/><glyph unicode="−" d="M200 400h900v300H200V400z"/><glyph unicode="â—¼" horiz-adv-x="500" d="M0 0z"/><glyph unicode="â˜" d="M-14 494q0-80 56.5-137T178 300h750q120 0 205 86.5t85 207.5-85 207-205 86q-46 0-90-14-44 97-134.5 156.5T503 1089q-152 0-260-107.5T135 721q0-25 2-37-66-14-108.5-67.5T-14 494z"/><glyph unicode="✉" d="M0 100l400 400 200-200 200 200 400-400H0zm0 200v600l300-300zm0 800l600-603 600 603H0zm900-500l300 300V300z"/><glyph unicode="âœ" d="M-13-13L320 99 97 322zm200 416l214-214 614 614-214 214zm700 700l214-214 99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13-33 13t-33-13z"/><glyph unicode="î€" d="M0 1200h1200L700 650V100h300V0H200v100h300v550z"/><glyph unicode="" d="M14 84q18-55 86-75.5T247 14q65 21 109 69t44 90v606l600 155V413q-64 16-138-7-79-26-122.5-83T714 212q18-55 86-75.5t147 4.5q70 23 111.5 63.5T1100 300v881q0 10-7 15.5t-17 2.5l-752-193q-10-3-17-12.5t-7-19.5V285q-64 17-138-7-79-25-122.5-82T14 84z"/><glyph unicode="" d="M23 693q0 200 142 342t342 142 342-142 142-342q0-142-78-261l300-300q7-8 7-18t-7-18L1104-13q-8-7-18-7t-18 7L768 287q-119-78-261-78-200 0-342 142T23 693zm153 0q0-136 97-233t234-97 233.5 96.5T837 693t-96.5 233.5T507 1023t-234-97-97-233z"/><glyph unicode="" d="M100 784q0 64 28 123t73 100.5 104.5 64 119 20.5 120-38.5T649 949q48 69 109.5 105t121.5 38 118.5-20.5 102.5-64 71-100.5 27-123q0-57-33.5-117.5t-94-124.5T945 414.5 795 262 649 88q-62 85-145.5 174T354 414.5 227.5 542t-94 124.5T100 784z"/><glyph unicode="" d="M-72 800h479l146 400h2l146-400h472L791 522 936 73 552 348 170 73l146 447zM168 71l2 1z"/><glyph unicode="" d="M-72 800h479l146 400h2l146-400h472L791 522 936 73 552 348 170 73l146 447zM168 71l2 1zm69 629l196-142-73-226 192 140 195-141-74 229 193 140H631l-77 211-78-211H237z"/><glyph unicode="" d="M0 0v143l400 257v100q-37 0-68.5 74.5T300 700v200q0 124 88 212t212 88 212-88 88-212V700q0-51-31.5-125.5T800 500V400l400-257V0H0z"/><glyph unicode="" d="M0 0v1100h1200V0H0zm100 100h100v100H100V100zm0 200h100v100H100V300zm0 200h100v100H100V500zm0 200h100v100H100V700zm0 200h100v100H100V900zm200-800h600v400H300V100zm0 500h600v400H300V600zm700-500h100v100h-100V100zm0 200h100v100h-100V300zm0 200h100v100h-100V500zm0 200h100v100h-100V700zm0 200h100v100h-100V900z"/><glyph unicode="î€" d="M0 50v400q0 21 14.5 35.5T50 500h400q21 0 35.5-14.5T500 450V50q0-21-14.5-35.5T450 0H50Q29 0 14.5 14.5T0 50zm0 600v400q0 21 14.5 35.5T50 1100h400q21 0 35.5-14.5T500 1050V650q0-21-14.5-35.5T450 600H50q-21 0-35.5 14.5T0 650zM600 50v400q0 21 14.5 35.5T650 500h400q21 0 35.5-14.5T1100 450V50q0-21-14.5-35.5T1050 0H650q-21 0-35.5 14.5T600 50zm0 600v400q0 21 14.5 35.5T650 1100h400q21 0 35.5-14.5t14.5-35.5V650q0-21-14.5-35.5T1050 600H650q-21 0-35.5 14.5T600 650z"/><glyph unicode="" d="M0 50v200q0 21 14.5 35.5T50 300h200q21 0 35.5-14.5T300 250V50q0-21-14.5-35.5T250 0H50Q29 0 14.5 14.5T0 50zm0 400v200q0 21 14.5 35.5T50 700h200q21 0 35.5-14.5T300 650V450q0-21-14.5-35.5T250 400H50q-21 0-35.5 14.5T0 450zm0 400v200q0 21 14.5 35.5T50 1100h200q21 0 35.5-14.5T300 1050V850q0-21-14.5-35.5T250 800H50q-21 0-35.5 14.5T0 850zM400 50v200q0 21 14.5 35.5T450 300h200q21 0 35.5-14.5T700 250V50q0-21-14.5-35.5T650 0H450q-21 0-35.5 14.5T400 50zm0 400v200q0 21 14.5 35.5T450 700h200q21 0 35.5-14.5T700 650V450q0-21-14.5-35.5T650 400H450q-21 0-35.5 14.5T400 450zm0 400v200q0 21 14.5 35.5T450 1100h200q21 0 35.5-14.5T700 1050V850q0-21-14.5-35.5T650 800H450q-21 0-35.5 14.5T400 850zM800 50v200q0 21 14.5 35.5T850 300h200q21 0 35.5-14.5T1100 250V50q0-21-14.5-35.5T1050 0H850q-21 0-35.5 14.5T800 50zm0 400v200q0 21 14.5 35.5T850 700h200q21 0 35.5-14.5T1100 650V450q0-21-14.5-35.5T1050 400H850q-21 0-35.5 14.5T800 450zm0 400v200q0 21 14.5 35.5T850 1100h200q21 0 35.5-14.5t14.5-35.5V850q0-21-14.5-35.5T1050 800H850q-21 0-35.5 14.5T800 850z"/><glyph unicode="" d="M0 50v200q0 21 14.5 35.5T50 300h200q21 0 35.5-14.5T300 250V50q0-21-14.5-35.5T250 0H50Q29 0 14.5 14.5T0 50zm0 400q0-21 14.5-35.5T50 400h200q21 0 35.5 14.5T300 450v200q0 21-14.5 35.5T250 700H50q-21 0-35.5-14.5T0 650V450zm0 400v200q0 21 14.5 35.5T50 1100h200q21 0 35.5-14.5T300 1050V850q0-21-14.5-35.5T250 800H50q-21 0-35.5 14.5T0 850zM400 50v200q0 21 14.5 35.5T450 300h700q21 0 35.5-14.5T1200 250V50q0-21-14.5-35.5T1150 0H450q-21 0-35.5 14.5T400 50zm0 400v200q0 21 14.5 35.5T450 700h700q21 0 35.5-14.5T1200 650V450q0-21-14.5-35.5T1150 400H450q-21 0-35.5 14.5T400 450zm0 400v200q0 21 14.5 35.5T450 1100h700q21 0 35.5-14.5t14.5-35.5V850q0-21-14.5-35.5T1150 800H450q-21 0-35.5 14.5T400 850z"/><glyph unicode="" d="M29 454L448 34l818 820-212 212-607-607-206 207z"/><glyph unicode="" d="M106 318l282 282-282 282 212 212 282-282 282 282 212-212-282-282 282-282-212-212-282 282-282-282z"/><glyph unicode="" d="M23 693q0 200 142 342t342 142 342-142 142-342q0-142-78-261l300-300q7-8 7-18t-7-18L1104-13q-8-7-18-7t-18 7L768 287q-119-78-261-78-200 0-342 142T23 693zm153 0q0-136 97-233t234-97 233.5 96.5T837 693t-96.5 233.5T507 1023t-234-97-97-233zm124-93v200h100v100h200V800h100V600H600V500H400v100H300z"/><glyph unicode="" d="M23 694q0 200 142 342t342 142 342-142 142-342q0-141-78-262l300-299q7-7 7-18t-7-18L1104-12q-8-8-18-8t-18 8L768 288q-119-78-261-78-200 0-342 142T23 694zm153 0q0-136 97-233t234-97 233.5 97T837 694t-96.5 233-233.5 97-234-97-97-233zm124-93h400v200H300V601z"/><glyph unicode="" d="M23 600q0 183 105 331t272 210V975q-103-55-165-155t-62-220q0-177 125-302t302-125 302 125 125 302q0 120-62 220T800 975v166q167-62 272-210t105-331q0-118-45.5-224.5t-123-184-184-123T600 23 375.5 68.5t-184 123-123 184T23 600zm477 150q0-21 14.5-35.5T550 700h100q21 0 35.5 14.5T700 750v400q0 21-14.5 35.5T650 1200H550q-21 0-35.5-14.5T500 1150V750z"/><glyph unicode="" d="M100 1h200v300H100V1zm300 0v500h200V1H400zm300 0v800h200V1H700zm300 0v1200h200V1h-200z"/><glyph unicode="" d="M26 601q0-33 6-74l151-38 2-6q14-49 38-93l3-5-80-134q45-59 105-105l133 81 5-3q45-26 94-39l5-2 38-151q40-5 74-5 27 0 74 5l38 151 6 2q46 13 93 39l5 3 134-81q56 44 104 105l-80 134 3 5q24 44 39 93l1 6 152 38q5 40 5 74 0 28-5 73l-152 38-1 6q-16 51-39 93l-3 5 80 134q-44 58-104 105l-134-81-5 3q-45 25-93 39l-6 1-38 152q-40 5-74 5-27 0-74-5l-38-152-5-1q-50-14-94-39l-5-3-133 81q-59-47-105-105l80-134-3-5q-25-47-38-93l-2-6-151-38q-6-48-6-73zm359 0q0 88 63 151t152 63 152-63 63-151q0-89-63-152t-152-63-152 63-63 152z"/><glyph unicode="î€ " d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5T500 1300h300q41 0 70.5-29.5T900 1200v-100h275q10 0 17.5-7.5t7.5-17.5v-50q0-11-7-18t-18-7H125q-11 0-18 7t-7 18zm100-925v800h900V100q0-41-29.5-71T1000-1H300q-41 0-70.5 30T200 100zm100 0h100v700H300V100zm200 0h100v700H500V100zm0 1000h300v100H500v-100zM700 100h100v700H700V100zm200 0h100v700H900V100z"/><glyph unicode="" d="M1 601l656 644 644-644h-200V1H801v400H501V1H201v600H1z"/><glyph unicode="" d="M100 25v1150q0 11 7 18t18 7h475V700h400V25q0-11-7-18t-18-7H125q-11 0-18 7t-7 18zm600 775v300l300-300H700z"/><glyph unicode="" d="M4 600q0 162 80 299t217 217 299 80 299-80 217-217 80-299-80-299T899 84 600 4 301 84 84 301 4 600zm182 0q0-171 121.5-292.5T600 186t292.5 121.5T1014 600 892.5 892.5 600 1014 307.5 892.5 186 600zm314-100v400h100V600h200V500H500z"/><glyph unicode="" d="M-100 0l431 1200h209l-21-300h162l-20 300h208L1300 0H762l-41 400H479L439 0h-539zm588 500h224l-27 300H515z"/><glyph unicode="" d="M0 0v400h490L200 700h200v500h300V700h200L610 400h490V0H0zm813 200h175v100H813V200z"/><glyph unicode="" d="M1 600q0 122 47.5 233T176 1024t191 127.5 233 47.5 233-47.5 191-127.5 127.5-191 47.5-233-47.5-233T1024 176 833 48.5 600 1 367 48.5 176 176 48.5 367 1 600zm187 0q0-170 121-291t291-121 291 121 121 291-121 291-291 121-291-121-121-291zm162 0h150v300h200V600h150L600 300z"/><glyph unicode="" d="M4 600q0 162 80 299t217 217 299 80 299-80 217-217 80-299-80-299T899 84 600 4 301 84 84 301 4 600zm182 0q0-171 121.5-292.5T600 186t292.5 121.5T1014 600 892.5 892.5 600 1014 307.5 892.5 186 600zm164 0l250 300 250-300H700V300H500v300H350z"/><glyph unicode="" d="M0 25v475l200 700h800l199-700 1-475q0-11-7-18t-18-7H25Q14 0 7 7T0 25zm200 475h200l50-200h300l50 200h200l-97 500H297z"/><glyph unicode="" d="M4 600q0 162 80 299t217 217 299 80 299-80 217-217 80-299-80-299T899 84 600 4 301 84 84 301 4 600zm182 0q0-172 121.5-293T600 186t292.5 121T1014 600q0 171-121.5 292.5T600 1014 307.5 892.5 186 600zm314-203v401l297-200z"/><glyph unicode="" d="M23 600q0-118 45.5-224.5t123-184 184-123T600 23t224.5 45.5 184 123 123 184T1177 600h-150q0-177-125-302T600 173 298 298 173 600t125 302 302 125q136 0 246-81L700 800h400v400l-145-145q-157 122-355 122-118 0-224.5-45.5t-184-123-123-184T23 600z"/><glyph unicode="" d="M23 600q0 118 45.5 224.5t123 184 184 123T600 1177q198 0 355-122l145 145V800H700l147 147q-112 80-247 80-177 0-302-125T173 600H23zM100 0v400h400L353 253q112-80 247-80 177 0 302 125t125 302h150q0-118-45.5-224.5t-123-184-184-123T600 23q-198 0-355 122z"/><glyph unicode="" d="M100 0h1100v1200H100V0zm100 100v900h900V100H200zm100 100v100h100V200H300zm0 200v100h100V400H300zm0 200v100h100V600H300zm0 200v100h100V800H300zm200-600h500v100H500V200zm0 200v100h500V400H500zm0 200v100h500V600H500zm0 200v100h500V800H500z"/><glyph unicode="" d="M0 100v600q0 41 29.5 70.5T100 800h100v200q0 82 59 141t141 59h300q82 0 141-59t59-141V800h100q41 0 70.5-29.5T1100 700V100q0-41-29.5-70.5T1000 0H100Q59 0 29.5 29.5T0 100zm400 700h300v150q0 21-14.5 35.5T650 1000H450q-21 0-35.5-14.5T400 950V800z"/><glyph unicode="" d="M100 0v1100h100V0H100zm200 400q60 60 127.5 84T555 501.5t122-23 119-30 110-11 103 42 91 120.5v500q-40-81-101.5-115.5T871 955t-138 25-139.5 40-125.5 25-103-29.5T300 900V400z"/><glyph unicode="" d="M0 275q0-11 7-18t18-7h50q11 0 18 7t7 18v300q0 127 70.5 231.5T355 968t245 57 245-57 184.5-161.5T1100 575V275q0-11 7-18t18-7h50q11 0 18 7t7 18v300q0 116-49.5 227t-131 192.5-192.5 131-227 49.5-227-49.5-192.5-131T49.5 802 0 575V275zM200 20v460q0 8 6 14t14 6h160q8 0 14-6t6-14V20q0-8-6-14t-14-6H220q-8 0-14 6t-6 14zm600 0v460q0 8 6 14t14 6h160q8 0 14-6t6-14V20q0-8-6-14t-14-6H820q-8 0-14 6t-6 14z"/><glyph unicode="" d="M0 400h300l300-200v800L300 800H0V400zm688 59l141 141-141 141 71 71 141-141 141 141 71-71-141-141 141-141-71-71-141 141-141-141z"/><glyph unicode="" d="M0 400h300l300-200v800L300 800H0V400zm700 457l69 53q111-135 111-310 0-169-106-302l-67 54q86 110 86 248 0 146-93 257z"/><glyph unicode="" d="M0 401v400h300l300 200V201L300 401H0zm702 457l69 53q111-135 111-310 0-170-106-303l-67 55q86 110 86 248 0 145-93 257zm187 93l7-8q123-151 123-344 0-189-119-339l-7-8 81-66 6 8q142 178 142 405 0 230-144 408l-6 8z"/><glyph unicode="" d="M0 0h500v500H300v100H200V500H0V0zm0 600h100v100h400v100h100v100H500v300H0V600zm100-500v300h300V100H100zm0 700v300h300V800H100zm100-600v100h100V200H200zm0 700h100v100H200V900zm300-400v100h300V300h200V200H900V100H700v100H600v100h100v200H500zM600 0v100h100V0H600zm0 1000h100V700h200V400h300v200h-200v100h200v500H600v-200zm200-200v300h300V800H800zM900 0v100h300V0H900zm0 900v100h100V900H900zm200-700v100h100V200h-100z"/><glyph unicode="î€" d="M0 200h100v1000H0V200zM100 0v100h300V0H100zm100 200v1000h100V200H200zM500 0v91h100V0H500zm0 200v1000h200V200H500zM700 0v91h100V0H700zm100 200v1000h100V200H800zM900 0v91h200V0H900zm100 200v1000h200V200h-200z"/><glyph unicode="î" d="M0 700l1 475q0 10 7.5 17.5T26 1200h474l700-700L700 0zm148 253q0-42 29-71 30-30 71.5-30t71.5 30q29 29 29 71t-29 71q-30 30-71.5 30t-71.5-30q-29-29-29-71z"/><glyph unicode="î‚" d="M1 700l1 475q0 11 7 18t18 7h474l700-700L701 0zm147 253q0-42 30-71 29-30 71-30t71 30q30 29 30 71t-30 71q-29 30-71 30t-71-30q-30-29-30-71zm553 247h100l700-700L1001 0l-50 50 450 450z"/><glyph unicode="îƒ" d="M100 0v1025l175 175h925V200l-100-100v1000H350l-100-100h750V0H100z"/><glyph unicode="î„" d="M200 0l450 444L1100 1v1150q0 20-14.5 35t-35.5 15H250q-21 0-35.5-15t-14.5-35V0z"/><glyph unicode="î…" d="M0 100v700h200l100-200h600l100 200h200V100h-200v200H200V100H0zm253 729l40-124h592l62 124-94 346q-2 11-10 18t-18 7H375q-10 0-18-7t-10-18zm28-805l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5-7t11.5-17l38-152q2-10-3.5-17T900 0H300q-10 0-15.5 7T281 24z"/><glyph unicode="î†" d="M0 200q0-41 29.5-70.5T100 100h1000q41 0 70.5 29.5T1200 200v600q0 41-29.5 70.5T1100 900H950q-4 8-11.5 21.5t-33 48-53 61-69 48T700 1100H500q-41 0-82-20.5t-70-50-52-59-34-50.5l-12-20H100q-41 0-70.5-29.5T0 800V200zm356 300q0 100 72 172t172 72 172-72 72-172-72-172-172-72-172 72-72 172zm138 0q0-44 31-75t75-31 75 31 31 75-31 75-75 31-75-31-31-75zm406 200v100h100V700H900z"/><glyph unicode="î‡" d="M53 0h365v66q-41 0-72 11t-49 38 1 71l92 234h391l82-222q16-45-5.5-88.5T783 66V0h417v66q-34 1-74 43-18 19-33 42t-21 37l-6 13-385 998h-93L189 193q-24-48-52-75-12-12-33-25T68 73l-15-7V0zm363 521l178 457 46-140 116-317H416z"/><glyph unicode="îˆ" d="M100 0v89q41 7 70.5 32.5T200 187v827q0 28-1 39.5t-5.5 26-15.5 21-29 14-49 14.5v71l471-1q120 0 213-88t93-228q0-55-11.5-101.5t-28-74T804 660t-28-28l-12-7q8-3 21.5-9t48-31.5 60.5-58 47.5-91.5T963 306q0-84-59-156.5t-142-111T600 0H100zm300 200h161q89 0 153 48.5T778 381q0 90-62.5 154.5T559 600H400V200zm0 500h139q76 0 130 61.5T723 900q0 82-84 130.5T400 1079V700z"/><glyph unicode="î‰" d="M200 0v57q77 7 134.5 40.5T400 178l173 849q10 56-10 74t-91 37q-6 1-10.5 2.5t-9.5 2.5v57h425l2-57q-33-8-62-25.5t-46-37-29.5-38T724 1012l-5-12-128-825q-10-52 14-82t95-36V0H200z"/><glyph unicode="î" d="M-75 200H0v800h-75l125 167 125-167h-75V200h75L50 33zm375 700v300h1000V900h-50q0 29-8 48.5t-18.5 30-33.5 15-39.5 5.5-50.5 1H900V150l100-50V0H600v100l100 50v850H500q-34 0-50.5-1t-40-5.5-33.5-15-18.5-30T349 900h-49z"/><glyph unicode="î‘" d="M33 51l167 125v-75h800v75l167-125-167-125V1H200v-75zm67 850v300h1000V901h-50q0 29-8 48.5t-18 30-33.5 15-40 5.5-50.5 1H700V351l100-50V201H400v100l100 50v650H300q-34 0-50.5-1t-39.5-5.5-33.5-15-18.5-30-8-48.5h-50z"/><glyph unicode="î’" d="M0 50q0-20 14.5-35T50 0h1100q21 0 35.5 15t14.5 35v100q0 21-14.5 35.5T1150 200H50q-21 0-35.5-14.5T0 150V50zm0 300q0-20 14.5-35T50 300h800q21 0 35.5 15t14.5 35v100q0 21-14.5 35.5T850 500H50q-21 0-35.5-14.5T0 450V350zm0 300q0-20 14.5-35T50 600h1000q21 0 35.5 15t14.5 35v100q0 21-14.5 35.5T1050 800H50q-21 0-35.5-14.5T0 750V650zm0 300q0-20 14.5-35T50 900h600q21 0 35.5 15t14.5 35v100q0 21-14.5 35.5T650 1100H50q-21 0-35.5-14.5T0 1050V950z"/><glyph unicode="î“" d="M0 50q0-20 14.5-35T50 0h1100q21 0 35.5 15t14.5 35v100q0 21-14.5 35.5T1150 200H50q-21 0-35.5-14.5T0 150V50zm0 600q0-20 14.5-35T50 600h1100q21 0 35.5 15t14.5 35v100q0 21-14.5 35.5T1150 800H50q-21 0-35.5-14.5T0 750V650zm200-300q0-20 14.5-35t35.5-15h700q21 0 35.5 15t14.5 35v100q0 21-14.5 35.5T950 500H250q-21 0-35.5-14.5T200 450V350zm0 600q0-20 14.5-35t35.5-15h700q21 0 35.5 15t14.5 35v100q0 21-14.5 35.5T950 1100H250q-21 0-35.5-14.5T200 1050V950z"/><glyph unicode="î”" d="M0 50v100q0 21 14.5 35.5T50 200h1100q21 0 35.5-14.5T1200 150V50q0-20-14.5-35T1150 0H50Q29 0 14.5 15T0 50zm100 600v100q0 21 14.5 35.5T150 800h1000q21 0 35.5-14.5T1200 750V650q0-20-14.5-35t-35.5-15H150q-21 0-35.5 15T100 650zm200-300v100q0 21 14.5 35.5T350 500h800q21 0 35.5-14.5T1200 450V350q0-20-14.5-35t-35.5-15H350q-21 0-35.5 15T300 350zm200 600v100q0 21 14.5 35.5T550 1100h600q21 0 35.5-14.5t14.5-35.5V950q0-20-14.5-35t-35.5-15H550q-21 0-35.5 15T500 950z"/><glyph unicode="î•" d="M0 50v100q0 21 14.5 35.5T50 200h1100q21 0 35.5-14.5T1200 150V50q0-20-14.5-35T1150 0H50Q29 0 14.5 15T0 50zm0 300v100q0 21 14.5 35.5T50 500h1100q21 0 35.5-14.5T1200 450V350q0-20-14.5-35t-35.5-15H50q-21 0-35.5 15T0 350zm0 300v100q0 21 14.5 35.5T50 800h1100q21 0 35.5-14.5T1200 750V650q0-20-14.5-35t-35.5-15H50q-21 0-35.5 15T0 650zm0 300v100q0 21 14.5 35.5T50 1100h1100q21 0 35.5-14.5t14.5-35.5V950q0-20-14.5-35t-35.5-15H50q-21 0-35.5 15T0 950z"/><glyph unicode="î–" d="M0 50v100q0 21 14.5 35.5T50 200h100q21 0 35.5-14.5T200 150V50q0-20-14.5-35T150 0H50Q29 0 14.5 15T0 50zm0 300v100q0 21 14.5 35.5T50 500h100q21 0 35.5-14.5T200 450V350q0-20-14.5-35T150 300H50q-21 0-35.5 15T0 350zm0 300v100q0 21 14.5 35.5T50 800h100q21 0 35.5-14.5T200 750V650q0-20-14.5-35T150 600H50q-21 0-35.5 15T0 650zm0 300v100q0 21 14.5 35.5T50 1100h100q21 0 35.5-14.5T200 1050V950q0-20-14.5-35T150 900H50q-21 0-35.5 15T0 950zM300 50v100q0 21 14.5 35.5T350 200h800q21 0 35.5-14.5T1200 150V50q0-20-14.5-35T1150 0H350q-21 0-35.5 15T300 50zm0 300v100q0 21 14.5 35.5T350 500h800q21 0 35.5-14.5T1200 450V350q0-20-14.5-35t-35.5-15H350q-21 0-35.5 15T300 350zm0 300v100q0 21 14.5 35.5T350 800h800q21 0 35.5-14.5T1200 750V650q0-20-14.5-35t-35.5-15H350q-21 0-35.5 15T300 650zm0 300v100q0 21 14.5 35.5T350 1100h800q21 0 35.5-14.5t14.5-35.5V950q0-20-14.5-35t-35.5-15H350q-21 0-35.5 15T300 950z"/><glyph unicode="î—" d="M-101 500v100h201v75l166-125-166-125v75h-201zM300 0h100v1100H300V0zm200 50q0-20 14.5-35T550 0h600q20 0 35 15t15 35v100q0 21-15 35.5t-35 14.5H550q-21 0-35.5-14.5T500 150V50zm0 300q0-20 14.5-35t35.5-15h300q20 0 35 15t15 35v100q0 21-15 35.5T850 500H550q-21 0-35.5-14.5T500 450V350zm0 300q0-20 14.5-35t35.5-15h500q20 0 35 15t15 35v100q0 21-15 35.5t-35 14.5H550q-21 0-35.5-14.5T500 750V650zm0 300q0-20 14.5-35t35.5-15h100q20 0 35 15t15 35v100q0 21-15 35.5t-35 14.5H550q-21 0-35.5-14.5T500 1050V950z"/><glyph unicode="î˜" d="M1 50q0-20 14.5-35T51 0h600q20 0 35 15t15 35v100q0 21-15 35.5T651 200H51q-21 0-35.5-14.5T1 150V50zm0 300q0-20 14.5-35T51 300h300q20 0 35 15t15 35v100q0 21-15 35.5T351 500H51q-21 0-35.5-14.5T1 450V350zm0 300q0-20 14.5-35T51 600h500q20 0 35 15t15 35v100q0 21-15 35.5T551 800H51q-21 0-35.5-14.5T1 750V650zm0 300q0-20 14.5-35T51 900h100q20 0 35 15t15 35v100q0 21-15 35.5t-35 14.5H51q-21 0-35.5-14.5T1 1050V950zM801 0v1100h100V0H801zm133 550l167-125v75h200v100h-200v75z"/><glyph unicode="î™" d="M0 275v650q0 31 22 53t53 22h750q31 0 53-22t22-53V275q0-31-22-53t-53-22H75q-31 0-53 22T0 275zm900 325l300 300V300z"/><glyph unicode="î " d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5-13t12.5-31V44q0-18-12.5-31T1156 0H44Q26 0 13 13T0 44zm100 219l247 182 298-131-74 156 293 318 236-288v500H100V263zm108 487q0 56 39 95t95 39 95-39 39-95-39-95-95-39-95 39-39 95z"/><glyph unicode="î¢" d="M148 745q0 124 60.5 231.5t165 172T600 1213q123 0 227-63t164.5-169.5T1052 751t-73-272q-73-114-166.5-237T662 53l-57-66q-10 9-27 26t-66.5 70.5-96 109-104 135.5T211 483q-63 139-63 262zm194 27q0-107 75.5-182.5T599 514q107 0 182.5 75.5T857 772t-75.5 182-182.5 75-182-75.5T342 772z"/><glyph unicode="î£" d="M1 600q0 122 47.5 233T176 1024t191 127.5 233 47.5 233-47.5 191-127.5 127.5-191 47.5-233-47.5-233T1024 176 833 48.5 600 1 367 48.5 176 176 48.5 367 1 600zm172 0q0-177 125.5-302T600 173v854q-176 0-301.5-125T173 600z"/><glyph unicode="î¤" d="M117 406q0 94 34 186t88.5 172.5 112 159 115 177T554 1295q21-71 57.5-142.5t76-130.5 83-118.5 82-117 70-116 50-125.5T991 409q0-89-39-165.5T850 117 710 37.5 554 4q-114 6-211.5 53T181 196t-64 210zm126 8q14-82 59.5-136T439 198l16 98q-7 6-18 17t-34 48-33 77q-15 73-14 143.5T366 704l9 51q-92-110-119.5-185T243 414z"/><glyph unicode="î¥" d="M0 400v300q0 165 117.5 282.5T400 1100q366-6 397-14L611 900H300q-41 0-70.5-29.5T200 800V300q0-41 29.5-70.5T300 200h500q41 0 70.5 29.5T900 300v125l200 200V400q0-165-117.5-282.5T700 0H400Q235 0 117.5 117.5T0 400zm436-59l161 50 412 412-114 113-405-405zm559 674l113-113 113 113-21 85-92 28z"/><glyph unicode="î¦" d="M0 400v300q0 165 117.5 282.5T400 1100h261l2-80q-133-32-218-120H300q-41 0-70.5-29.5T200 800V300q0-41 29.5-70.5T300 200h500q41 0 70.5 29.5T900 300l200 153v-53q0-165-117.5-282.5T700 0H400Q235 0 117.5 117.5T0 400zm423 124q30 38 81.5 64t103 35.5 99 14T784 641l29-1V431l360 324-359 318V857q-7 0-19-1t-48-8-69.5-18.5-76.5-37-76.5-59-62-88T423 524z"/><glyph unicode="î§" d="M0 400v300q0 165 117.5 282.5T400 1100h300q61 0 127-23L649 900H300q-41 0-70.5-29.5T200 800V300q0-41 29.5-70.5T300 200h500q41 0 70.5 29.5T900 300v69l200 200V400q0-165-117.5-282.5T700 0H400Q235 0 117.5 117.5T0 400zm342 232l283-284 567 567-137 137-430-431-146 147z"/><glyph unicode="î¨" d="M0 603l300 296V701h200v200H300l300 300 295-300H700V701h200v198l300-296-300-300v198H700V301h195L600 1 300 301h200v200H300V303z"/><glyph unicode="î©" d="M200 50v1000q0 21 14.5 35.5T250 1100h100q21 0 35.5-14.5T400 1050V613l500 487V0L400 488V50q0-21-14.5-35.5T350 0H250q-21 0-35.5 14.5T200 50z"/><glyph unicode="î°" d="M0 50v1000q0 21 14.5 35.5T50 1100h100q21 0 35.5-14.5T200 1050V613l500 487V613l500 487V0L700 488V0L200 488V50q0-21-14.5-35.5T150 0H50Q29 0 14.5 14.5T0 50z"/><glyph unicode="î±" d="M136 550l564 550V613l500 487V0L700 488V0z"/><glyph unicode="î²" d="M200 0l900 550-900 550V0z"/><glyph unicode="î³" d="M200 150q0-21 14.5-35.5T250 100h200q21 0 35.5 14.5T500 150v800q0 21-14.5 35.5T450 1000H250q-21 0-35.5-14.5T200 950V150zm400 0q0-21 14.5-35.5T650 100h200q21 0 35.5 14.5T900 150v800q0 21-14.5 35.5T850 1000H650q-21 0-35.5-14.5T600 950V150z"/><glyph unicode="î´" d="M200 150q0-20 14.5-35t35.5-15h800q21 0 35.5 15t14.5 35v800q0 21-14.5 35.5T1050 1000H250q-21 0-35.5-14.5T200 950V150z"/><glyph unicode="îµ" d="M0 0v1100l500-487v487l564-550L500 0v488z"/><glyph unicode="î¶" d="M0 0v1100l500-487v487l500-487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5-14.5t14.5-35.5V50q0-21-14.5-35.5T1150 0h-100q-21 0-35.5 14.5T1000 50v438L500 0v488z"/><glyph unicode="î·" d="M300 0v1100l500-487v437q0 21 14.5 35.5T850 1100h100q21 0 35.5-14.5t14.5-35.5V50q0-21-14.5-35.5T950 0H850q-21 0-35.5 14.5T800 50v438z"/><glyph unicode="î¸" d="M100 250v100q0 21 14.5 35.5T150 400h1000q21 0 35.5-14.5T1200 350V250q0-21-14.5-35.5T1150 200H150q-21 0-35.5 14.5T100 250zm0 250h1100l-550 564z"/><glyph unicode="î¹" d="M185 599L777 7l240 240-353 353 353 353-240 240z"/><glyph unicode="î‚€" d="M272 194l353 353-353 353 241 240 572-571 21-22-1-1v-1L513-46z"/><glyph unicode="î‚" d="M3 600q0 162 80 299.5T300.5 1117t299.5 80 299.5-80T1117 899.5t80-299.5-80-299.5T899.5 83 600 3 300.5 83 83 300.5 3 600zm297-100h200V300h200v200h200v200H700v200H500V700H300V500z"/><glyph unicode="î‚‚" d="M3 600q0 162 80 299.5T300.5 1117t299.5 80 299.5-80T1117 899.5t80-299.5-80-299.5T899.5 83 600 3 300.5 83 83 300.5 3 600zm297-100h600v200H300V500z"/><glyph unicode="" d="M3 600q0 162 80 299.5T300.5 1117t299.5 80 299.5-80T1117 899.5t80-299.5-80-299.5T899.5 83 600 3 300.5 83 83 300.5 3 600zm243-141l213-213 141 142 141-142 213 213-142 141 142 141-213 212-141-141-141 142-212-213 141-141z"/><glyph unicode="î‚„" d="M3 600q0 162 80 299.5T300.5 1117t299.5 80 299.5-80T1117 899.5t80-299.5-80-299.5T899.5 83 600 3 300.5 83 83 300.5 3 600zm267-49l276-277 411 411-175 174-236-236-102 102z"/><glyph unicode="î‚…" d="M3 600q0 162 80 299.5T300.5 1117t299.5 80 299.5-80T1117 899.5t80-299.5-80-299.5T899.5 83 600 3 300.5 83 83 300.5 3 600zm361 100h143q4 0 11.5-1t11-1 6.5 3 3 9 1 11 3.5 8.5 3.5 6 5.5 4 6.5 2.5 9 1.5 9 .5h24q19 0 30-10t11-26q0-22-4-28t-27-22q-5-1-12.5-3t-27-13.5-34-27-26.5-46-11-68.5h200q5 3 14 8t31.5 25.5T785 579t31 69 14 94q0 51-17.5 89t-42 58-58.5 32-58.5 15-51.5 3q-50 0-90.5-12t-75-38.5T383 814t-19-114zm136-400h200v100H500V300z"/><glyph unicode="" d="M3 600q0 162 80 299.5T300.5 1117t299.5 80 299.5-80T1117 899.5t80-299.5-80-299.5T899.5 83 600 3 300.5 83 83 300.5 3 600zm397-300h400v100H700v300H400V600h100V400H400V300zm100 500h200v100H500V800z"/><glyph unicode="" d="M0 500v200h195q31 125 98.5 199.5T500 1000v200h200v-200q54-20 113-60t112.5-105.5T997 700h203V500H997q-25-102-116.5-186T700 197V0H500v197q-140 27-208 102.5T194 500H0zm290 0q24-73 79.5-127.5T500 294v206h200V294q149 48 201 206H700v200h200q-25 74-75.5 127T700 904V700H500v203q-75-23-130-77t-79-126h209V500H290z"/><glyph unicode="" d="M4 600q0 162 80 299t217 217 299 80 299-80 217-217 80-299-80-299T899 84 600 4 301 84 84 301 4 600zm182 0q0-171 121.5-292.5T600 186t292.5 121.5T1014 600 892.5 892.5 600 1014 307.5 892.5 186 600zm170-135l135 135-135 135 109 109 135-135 135 135 109-109-135-135 135-135-109-109-135 135-135-135z"/><glyph unicode="" d="M4 600q0 162 80 299t217 217 299 80 299-80 217-217 80-299-80-299T899 84 600 4 301 84 84 301 4 600zm182 0q0-171 121.5-292.5T600 186t292.5 121.5T1014 600 892.5 892.5 600 1014 307.5 892.5 186 600zm136-63l141 141 87-87 204 205 142-142-346-345z"/><glyph unicode="î‚" d="M4 600q0 162 80 299t217 217 299 80 299-80 217-217 80-299-80-299T899 84 600 4 301 84 84 301 4 600zm182 0q0-115 62-215l568 567q-100 62-216 62-171 0-292.5-121.5T186 600zm205-355q97-59 209-59 171 0 292.5 121.5T1014 600q0 112-59 209z"/><glyph unicode="î‚‘" d="M0 547l600 453V700h600V400H600V99z"/><glyph unicode="î‚’" d="M0 400v300h600v300l600-453L600 99v301H0z"/><glyph unicode="î‚“" d="M204 600l450 600 444-600H800V0H500v600H204z"/><glyph unicode="î‚”" d="M104 600h296v600h300V600h298L549 0z"/><glyph unicode="î‚•" d="M0 200q6 132 41 238.5t103.5 193 184 138T600 829v271l600-453-600-448v301q-95-2-183-20t-170-52-147-92.5T0 200z"/><glyph unicode="î‚–" d="M0 0v400l129-129 294 294 142-142-294-294L400 0H0zm635 777l142-142 294 294 129-129v400H800l129-129z"/><glyph unicode="î‚—" d="M34 176l295 295-129 129h400V200L471 330 176 35zm566 424v400l129-129 295 295 142-141-295-295 129-130H600z"/><glyph unicode="î„" d="M23 600q0 118 45.5 224.5t123 184 184 123T600 1177t224.5-45.5 184-123 123-184T1177 600t-45.5-224.5-123-184-184-123T600 23 375.5 68.5t-184 123-123 184T23 600zm433 251l58-302q4-20 21.5-34.5T573 500h54q20 0 37.5 14.5T686 549l58 302q4 20-8 34.5T704 900H497q-21 0-33-14.5t-8-34.5zm44-551h200v100H500V300z"/><glyph unicode="î„‚" d="M0 800h100V600h400v300h200V600h400v200h100v100h-111q1 1 1 6.5t-1.5 15-3.5 17.5l-34 172q-11 39-41.5 63t-69.5 24q-32 0-61-17l-239-144q-22-13-40-35-19 24-40 36l-238 144q-33 18-62 18-39 0-69.5-23t-40.5-61l-35-177q-2-8-3-18t-1-15v-6H0V800zM100 0h400v400H100V0zm100 900q-3 0 14 48t36 96l18 47 213-191H200zM700 0v400h400V0H700zm31 900l202 197q5-12 12-32.5t23-64 25-72 7-28.5H731z"/><glyph unicode="" d="M0-22v143l216 193q-9 53-13 83t-5.5 94 9 113T245 718t74 124q47 60 99.5 102.5t103 68 127.5 48 145.5 37.5 184.5 43.5 220 58.5q0-189-22-343t-59-258-89-181.5-108.5-120-122-68-125.5-30-121.5-1.5T444 210.5t-87.5 17T300 235l-99-55zm238.5 322.5Q258 294 325 377q55 66 367 234 70 38 118.5 69.5t102 79 99 111.5 86.5 148q22 50 24 60t-6 19q-7 5-17 5t-26.5-14.5-33.5-39.5q-35-51-113.5-108.5T786 851l-61-32Q356 622 267 418q-48-111-28.5-117.5z"/><glyph unicode="î„„" d="M111 408q0-33 5-63 9-56 44-119.5T265 117q31-21 64-16t62 23.5 57 49.5 48 61.5 35 60.5q32 66 39 184.5T557 638q79-80 122-164t26-184q-5-33-20.5-69.5T647 140q-10-19-14.5-29t-12-26-9-23.5-3-19T611 27t11-9.5 19.5-5T672 15t42 8q57 20 91 34t87.5 44.5 87 64T1045 254t47 122q38 172-44.5 341.5T801 996q22-44 43-129 39-159-32-154-15 2-33 9-79 33-120.5 100t-44 175.5T663 1255q-13-8-34-23.5t-72.5-66.5-88.5-105.5-60-138-8-166.5q2-12 8-41.5t8-43 6-39.5 3.5-39.5-1-33.5-6-31.5-13.5-24-21-20.5-31-12q-38-10-67 13t-40.5 61.5-15 81.5 10.5 75q-52-46-83.5-101t-39-107-7.5-85z"/><glyph unicode="î„…" d="M-61 600l26 40q6 10 20 30t49 63.5 74.5 85.5 97 90T322 992.5t132.5 59T600 1075t145.5-23.5 132.5-59T994.5 909t97-90 74.5-85.5 49-63.5 20-30l26-40-26-40q-6-10-20-30t-49-63.5-74.5-85.5-97-90T878 207.5t-132.5-59T600 125t-145.5 23.5-132.5 59T205.5 291t-97 90T34 466.5-15 530t-20 30zm181 0q7-10 40.5-58t56-78.5 68-77.5 87.5-75 103-49.5T600 240t123.5 20T824 305.5t85.5 71.5 66.5 75.5 58 81.5 47 66q-1 1-28.5 37.5t-42 55-43.5 53-57.5 63.5-58.5 54q49-74 49-163 0-124-88-212t-212-88-212 88-88 212q0 85 46 158-102-87-226-258zm257 56q49-124 154-191l105 105q-37 24-75 72t-57 84l-20 36z"/><glyph unicode="" d="M-61 600l26 40q6 10 20 30t49 63.5 74.5 85.5 97 90T322 992.5t132.5 59T600 1075q61 0 121-17l37 142h148L592 0H444l37 143q-82 21-165 71.5t-140 102-109.5 112-72 88.5-29.5 43zm181 0q210-282 393-336l37 141q-107 18-178.5 101.5T300 700q0 85 46 158-102-87-226-258zm257 56q49-124 154-191l47 47 23 87q-30 28-59 69t-44 68l-14 26zm403-495l38 145q22 15 44.5 34t46 44 40.5 44 41 50.5 33.5 43.5 33 44 24.5 34q-97 127-140 175l39 146q67-54 131.5-125.5T1199 692t36-52l26-40-26-40q-7-12-25.5-38t-63.5-79.5-95.5-102.5-124-100T780 161z"/><glyph unicode="" d="M-97.5 34Q-84 0-47 0h1294q37 0 50.5 35.5T1290 103L648 1159q-20 34-48 36.5t-48-29.5L-90 100q-21-32-7.5-66zM155 200l445 723 445-723H700v100H500V200H155zm345 400l100-300 100 300v100H500V600z"/><glyph unicode="" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44 106-44 44-106V711l363-325q15-14 26-38.5t11-44.5v-41q0-20-12-26.5t-29 5.5L800 490V227q100-91 100-113V50q0-20-13-28.5t-32 .5l-94 78H539l-94-78q-19-9-32-.5T400 50v64q0 22 100 113v263L141 241q-17-12-29-5.5T100 262z"/><glyph unicode="" d="M0 50q0-20 14.5-35T50 0h1000q21 0 35.5 15t14.5 35v750H0V50zm0 850h1100v150q0 21-14.5 35.5T1050 1100H900v100H800v-100H300v100H200v-100H50q-21 0-35.5-14.5T0 1050V900zm100-800v100h100V100H100zm0 200v100h100V300H100zm0 200v100h100V500H100zm200-400v100h100V100H300zm0 200v100h100V300H300zm0 200v100h100V500H300zm200-400v100h100V100H500zm0 200v100h100V300H500zm0 200v100h100V500H500zm200-400v100h100V100H700zm0 200v100h100V300H700zm0 200v100h100V500H700zm200-400v100h100V100H900zm0 200v100h100V300H900zm0 200v100h100V500H900z"/><glyph unicode="î„" d="M0 200v200h259l600 600h241v198l300-295-300-300v197H941L341 200H0zm0 600h259l122-122 141 142-181 180H0V800zm678-419l141 142 122-123h159v198l300-295L1100 3v197H859z"/><glyph unicode="î„‘" d="M0 400v600q0 41 29.5 70.5T100 1100h1000q41 0 70.5-29.5t29.5-70.5V400q0-41-29.5-70.5T1100 300H504L200 0v300H100q-41 0-70.5 29.5T0 400z"/><glyph unicode="î„’" d="M100 600v200h300V550q0-113 6-145 17-92 102-117 39-11 92-11 37 0 66.5 5.5t50 15.5 36 24 24 31.5 14 37.5 7 42 2.5 45 0 47v275h300V600q0-42-3-83t-15-104-31.5-116-58-109.5-89-96.5-129-65.5T600 0 425.5 25.5 296.5 91t-89 96.5-58 109.5T118 413t-15 104-3 83zm0 300v300h300V900H100zm700 0v300h300V900H800z"/><glyph unicode="î„“" d="M-30 411l227-227 352 353 353-353 226 227-578 579z"/><glyph unicode="î„”" d="M70 797l580-579 578 579-226 227-353-353-352 353z"/><glyph unicode="î„•" d="M-198 700l299 283 300-283H198V300h385l215-200H-2v600h-196zm600 300l215-200h381V400H800l299-283 299 283h-200v600H402z"/><glyph unicode="î„–" d="M18 939q-5 24 10 42 14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35-14.5t15-35.5-15-35.5-35-14.5h-54L889 139q-2-4-6-10.5T864 111t-33-11h-31V50q0-20-14.5-35T750 0t-35.5 15T700 50v50H400V50q0-20-14.5-35T350 0t-35.5 15T300 50v50h-50q-21 0-35.5 15T200 150q0 21 14.5 35.5T250 200h535l48 200H200q-32 0-54.5 21T118 464z"/><glyph unicode="î„—" d="M0 0v800h1200V0H0zm0 900v100h200q0 41 29.5 70.5T300 1100h300q41 0 70.5-29.5T700 1000h500V900H0z"/><glyph unicode="" d="M1 0l300 700h1200L1201 0H1zm0 400v600h200q0 41 29.5 70.5T301 1100h300q41 0 70.5-29.5T701 1000h500V800H201z"/><glyph unicode="î„™" d="M302 300h198v600H302l298 300 298-300H700V300h198L600 0z"/><glyph unicode="î„ " d="M0 600l300 298V700h600v198l300-298-300-297v197H300V303z"/><glyph unicode="î„¡" d="M0 100v100q0 41 29.5 70.5T100 300h1000q41 0 70.5-29.5T1200 200V100q0-41-29.5-70.5T1100 0H100Q59 0 29.5 29.5T0 100zm31 300l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5-22.5T997 1132l172-732H31zm769-300h100v100H800V100zm200 0h100v100h-100V100z"/><glyph unicode="î„¢" d="M-101 600v50q0 24 25 49t50 38l25 13V500l-11 5.5-24 14-30 21.5-24 27.5-11 31.5zm201-100v273l.5 7 1.5 5.5 2 5 3 4 4.5 3.5 6 1.5 7.5.5h200l675 250V200L325 400h-38l47-276q2-12-3-17.5t-11-6-21-.5h-91q-20 0-34.5 14T155 149q-55 337-55 351zm1000-300v850q0 21 14.5 35.5t35.5 14.5q20 0 35-14.5t15-35.5V200q0-20-15-35t-35-15q-21 0-35.5 15t-14.5 35z"/><glyph unicode="î„£" d="M74 350q0 21 13.5 35.5T121 400h18l117 173 63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29-10.5t3-29.5q-18-36-18-37 83-19 144-82.5T881 900l63-327 118-173h17q20 0 33.5-14.5T1126 350q0-20-13-40t-31-27q-8-3-23-8.5t-65-20-103-25T758.5 210 600 201q-125 0-245.5 20.5T176 262l-58 20q-18 7-31 27.5T74 350zm423-240q12-49 40-79.5T600 0t63 30.5 39 79.5q-48-6-102-6t-103 6z"/><glyph unicode="" d="M21 445l233-45-78-224 224 78 45-233 155 179L755 21l45 233 224-78-78 224 234 45-180 155 180 156-234 44 78 225-224-78-45 233-155-180-155 180-45-233-224 78 78-225-233-44 179-156z"/><glyph unicode="î„¥" d="M0 200h200v600H0V200zm300 75q0-75 100-75h61q124-100 139-100h250q46 0 83 57l238 344q29 31 29 74v100q0 44-30.5 84.5T1100 800H772q28 118 28 125v150q0 44-30.5 84.5T700 1200h-50q-27 0-51-20t-38-48l-96-198-145-196q-20-26-20-63V275zm100 25v375l150 213 100 212h50V925l-50-225h450V575L850 200H636L500 300H400z"/><glyph unicode="" d="M0 400v600h200V400H0zm300 125v400q0 75 100 75h61q124 100 139 100h250q46 0 83-57l238-344q29-31 29-74V525q0-44-30.5-84.5T1100 400H772q28-118 28-125V125q0-44-30.5-84.5T700 0h-50q-27 0-51 20t-38 48l-96 198-145 196q-20 26-20 63zm100 0l150-212 100-213h50v175l-50 225h450v125l-250 375H636L500 900H400V525z"/><glyph unicode="" d="M8 200v600h200V200H8zm300 75v525q0 17 14 35.5t28 28.5l14 9 362 230q14 6 25 6 17 0 29-12l109-112q14-14 14-34 0-18-11-32l-85-121h302q85 0 138.5-38t53.5-110-54.5-111-138.5-39h-107L871 161q-7-22-20.5-41.5T822 100H481q-7 0-90 81t-83 94zm100 14l100-89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20-9 34.5t-25 14.5H712l-6.5.5-6 1-5 1.5-5.5 2.5-4 4-4 5.5q-5 12-5 20 0 14 10 27l147 183-86 83-339-236V289z"/><glyph unicode="" d="M-101 651q0 72 54 110t139 38l302-1-85 121q-11 16-11 32 0 21 14 34l109 113q13 12 29 12 11 0 25-6l365-230q7-4 17-10.5t26.5-26T900 801V275q0-13-86-93.5T720 101H379q-16 0-29.5 20T330 162L200 501H93q-84 0-139 39t-55 111zm100-50h222q15 0 28.5-20.5T269 540l131-339h293l107 89v502l-343 237-87-83 145-184q10-11 10-26 0-11-5-20-1-3-3.5-5.5l-4-4-5-2.5-5.5-1.5-6.5-1-6.5-.5H-1V601zm1001-400v600h200V201h-200z"/><glyph unicode="î„©" d="M97 719l230-363q4-6 10.5-15.5t26-25T400 300h525q13 0 94 83t81 90v342q0 15-20 28.5t-41 19.5L700 994v106q0 84-39 139t-111 55-110-53.5-38-138.5V800l-121 84q-15 12-33.5 11.5T215 882L103 772q-22-22-6-53zm75 20l83 86 183-146q22-18 47-5 3 1 5.5 3.5l4 4 2.5 5 1.5 5.5 1 6.5.5 6.5v470q0 22 25 31t50-.5 25-30.5V973q0-16 20-29.5t41-19.5l339-130V500l-89-100H408zM400 0v200h600V0H400z"/><glyph unicode="î„°" d="M2 585q-16-31 6-53l112-110q13-13 32-13.5t34 10.5l121 85q0-51-.5-153.5T306 202q0-84 38.5-138T455 10t111 55 39 139v106l339 131q20 6 40.5 19.5T1005 489v342q0 7-81 90t-94 83H305q-17 0-35.5-14T241 962l-10-15zm75-20l236 339h503l89-100V510L565 380q-20-6-40-20t-20-29V129q0-22-25-31t-50 0-25 31v470.5l-1.5 11.5-5 12-9.5 7q-24 13-46-5L159 479zm228 539v200h600v-200H305z"/><glyph unicode="" d="M5 597q0 122 47.5 232.5T180 1020t190.5 127.5T603 1195q162 0 299.5-80T1120 897t80-300-80-299.5T902.5 80 603 0 303 80 85 297.5 5 597zm293 104l2-201h300l-2-194 402 294-402 298V701H298z"/><glyph unicode="" d="M0 597q0 122 47.5 232.5T175 1020t190.5 127.5T597 1195q122 0 232.5-47.5T1020 1020t127.5-190.5T1195 597q0-162-80-299.5T897 80 597 0 297.5 80 80 297.5 0 597zm200 3l402-294-2 194h300l2 201H602v197z"/><glyph unicode="" d="M5 597q0 122 47.5 232.5T180 1020t190.5 127.5T603 1195q162 0 299.5-80T1120 897t80-300-80-299.5T902.5 80 603 0 303 80 85 297.5 5 597zm295 3h200V300h200v300h200l-300 400z"/><glyph unicode="î„´" d="M5 597q0 122 47.5 232.5T180 1020t190.5 127.5T603 1195q162 0 299.5-80T1120 897t80-300-80-299.5T902.5 80 603 0 303 80 85 297.5 5 597zm295 3l300-400 300 400H700v300H500V600H300z"/><glyph unicode="" d="M5 597q0 122 47.5 232.5T180 1020t190.5 127.5T603 1195q121 0 231.5-47.5T1025 1020t127.5-190.5T1200 597q0-162-80-299.5T902.5 80 603 0 303 80 85 297.5 5 597zm249 183q-8-33 5.5-92.5T267 600q0-9 17-44t16-60q12 0 23-5.5t23-15 20-13.5q24-12 108-42 22-8 53-31.5t59.5-38.5 57.5-11q8-18-15-55t-20-57q42-71 87-80 0-6-3-15.5t-3.5-14.5 4.5-17q104-3 221 112 30 29 47 47t34.5 49 20.5 62q-14 9-37 9.5t-36 7.5q-14 7-49 15t-52 19q-9 0-39.5-.5T757 419t-39-6.5-39-16.5q-50-35-66-12-4 2-3.5 25.5t.5 25.5q-6 13-26.5 17t-24.5 7q2 22-2 41t-16.5 28-38.5-20q-23-25-42 4-19 28-8 58 6 16 22 22 6-1 26-1.5t33.5-4T553 573q12-19 32-37.5t34-27.5l14-8q0 3 9.5 39.5T648 597q-4 23 14.5 44.5T685 673q5 14 10 35t8.5 31 15.5 22.5 34 21.5q-6 18 10 37 8 0 23.5-1.5T811 817t20.5 4.5T852 837q-10 23-30.5 42.5t-38 30-49 26.5-43.5 23q11 39 2 44 31-13 58-14.5t39 3.5l11 4q7 36-16.5 53.5T720 1078t-56 23q-19-3-37 0-15-12-36.5-21t-34.5-12-44-8-39-6q-15-3-45.5.5T382 1052q-21-7-52-26.5T296 991q-3-11 6.5-22.5T311 950q-3-34-27.5-90.5T254 780zm264 136q3 12 16 30t16 25q10-10 18.5-10t14 6 14.5 14.5 16 12.5q0-24 17-66.5t17-43.5q-9 2-31 5t-36 5-32 8-30 14zm174 87h1-1z"/><glyph unicode="" d="M0 164.5Q0 186 15 202l600 599q-33 101 6 201.5T756 1157q164 92 306-9l-259-138 145-232 251 126q13-175-151-267-123-70-253-23L199 18Q184 2 162.5 2T126 18L15 128Q0 143 0 164.5z"/><glyph unicode="î„·" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5T100 396h1000q41 0 70.5-29.5T1200 296V196q0-41-29.5-70.5T1100 96H100q-41 0-70.5 29.5T0 196zm0 400v100q0 41 29.5 70.5T100 796h1000q41 0 70.5-29.5T1200 696V596q0-41-29.5-70.5T1100 496H100q-41 0-70.5 29.5T0 596zm0 400v100q0 41 29.5 70.5T100 1196h1000q41 0 70.5-29.5t29.5-70.5V996q0-41-29.5-70.5T1100 896H100q-41 0-70.5 29.5T0 996zm600-400h500v100H600V596zm200-400h300v100H800V196zm100 800h200v100H900V996z"/><glyph unicode="" d="M100 1100v100h1000v-100H100zm50-100h900L700 500V200L500 0v500z"/><glyph unicode="" d="M0 200v200h1200V200q0-41-29.5-70.5T1100 100H100q-41 0-70.5 29.5T0 200zm0 300v400q0 41 29.5 70.5T100 1000h300v100q0 41 29.5 70.5T500 1200h200q41 0 70.5-29.5T800 1100v-100h300q41 0 70.5-29.5T1200 900V500H700v100H500V500H0zm500 500h200v100H500v-100z"/><glyph unicode="î…€" d="M0 0v400l129-129 200 200 142-142-200-200L400 0H0zm0 800l129 129 200-200 142 142-200 200 129 129H0V800zm729-471l142 142 200-200 129 129V0H800l129 129zm0 542l200 200-129 129h400V800l-129 129-200-200z"/><glyph unicode="î…" d="M0 596q0 162 80 299t217 217 299 80 299-80 217-217 80-299-80-299T895 80 596 0 297 80 80 297 0 596zm182 0q0-172 121.5-293T596 182t292.5 121T1010 596q0 171-121.5 292.5T596 1010 303.5 888.5 182 596zm109 59q0 23 15.5 38.5T345 709t39-16 16-38q0-23-16-39t-39-16q-22 0-38 16t-16 39zm109 195q0 22 16 38.5t39 16.5q22 0 38-16t16-39-16-39-38-16q-23 0-39 16.5T400 850zm114-241q0 32 20.5 56.5T586 695l122 126 1 1q-9 14-9 28 0 22 16 38.5t39 16.5q22 0 38-16t16-39-16-39-38-16q-14 0-29 10l-55-145q17-22 17-51 0-36-25.5-61.5T601 522t-61.5 25.5T514 609zm286 46q0 22 16 38t39 16 38.5-15.5T909 655t-16-39-38-16q-23 0-39 16t-16 39z"/><glyph unicode="î…‚" d="M-40 375q-13-95 35-173 35-57 94-89t129-32q63 0 119 28 33 16 65 40.5t52.5 45.5 59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87-117 104-20 2-29 2-46 0-78.5-16.5T717 932L328 536l-7-7 69-67 377 373q20 22 39 38 23 23 50 23 38 0 53-36 16-39-20-75L342 238q-52-52-125-52-55 0-100 33t-54 96q-5 35 2.5 66T97 444t42 50 56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54T861 1097q25 0 48-4 95-17 154-94.5t51-175.5q-7-101-98-192L764 382 511 126l7-7 69-60 517 511q67 67 95 157t11 183q-16 87-67 154t-130 103q-69 33-152 33-107 0-197-55-40-24-111-95L41 538q-68-68-81-163z"/><glyph unicode="î…ƒ" d="M80 784q0 131 98.5 229.5T409 1112q143 0 241-129 103 129 246 129 129 0 226-98.5t97-229.5q0-46-17.5-91t-61-99-77-89.5T959 399Q762 208 666 77l-17-23-16 23q-43 58-100 122.5T441 299 340 399q-71 70-104.5 105.5t-77 89.5-61 99T80 784zm170 0q0-27 30.5-70t61.5-75.5 95-94.5l22-22q93-90 190-201 82 92 195 203l12 12q64 62 97.5 97t64.5 79 31 72q0 71-48 119.5T896 952q-74 0-132-83L646 698 532 872q-51 80-123 80-60 0-109.5-49.5T250 784z"/><glyph unicode="î…„" d="M57 353q0-95 66-159L264 52q68-66 159-66 93 0 159 66l283 283q66 66 66 159t-66 159L724 794q-8 9-19 17L600 706l212-212-389-389-247 248 95 95-18 18q-46 45-75 101l-55-55q-66-66-66-159zm212 353q0-93 66-159l141-141q7-7 19-17l105 105-212 212 389 389 247-247-95-96 18-17q47-49 77-100l29 29q35 35 62.5 88t27.5 96q0 93-66 159l-141 141q-66 66-159 66-95 0-159-66L335 865q-66-64-66-159z"/><glyph unicode="î……" d="M200 100v953q0 21 30 46t81 48 129 38 163 15 162-15 127-38 79-48 29-46V100q0-41-29.5-70.5T900 0H300q-41 0-70.5 29.5T200 100zm100 200h600v700H300V300zm196-150q0-43 30.5-73.5T600 46t73.5 30.5T704 150t-30.5 73.5T600 254t-73.5-30.5T496 150z"/><glyph unicode="î…†" d="M0 0l303 380 207 208-210 212h300l267 279-35 36q-15 14-15 35t15 35q14 15 35 15t35-15l283-282q15-15 15-36t-15-35q-14-15-35-15t-35 15l-36 35-279-267V300L588 510 380 303z"/><glyph unicode="î…ˆ" d="M295 433h139q5-77 48.5-126.5T600 242v335q-6 1-15.5 4t-11.5 3q-46 14-79 26.5t-72 36-62.5 52-40 72.5-16.5 99q0 92 44 159.5t109 101 144 40.5v78h100v-79q38-4 72.5-13.5T848 1125t71-53.5 51.5-84T995 869H836q-8 72-35 109.5T700 1029V722l64-14q34-7 64-16.5t70-31.5 67.5-52 47.5-80.5 20-112.5q0-139-89-224T700 95V18H600v78q-152 17-237 104-40 40-52.5 93.5T295 433zm171 456q0-29 8-51t16.5-34 29.5-22.5 31-13.5 38-10q7-2 11-3v274q-61-8-97.5-37.5T466 889zm234-652q170 18 170 151 0 64-44 99.5T700 548V237z"/><glyph unicode="î…‰" d="M100 600v100h166q-24 49-44 104-10 26-14.5 55.5t-3 72.5 25 90 68.5 87q97 88 263 88 129 0 230-89t101-208H739q0 52-34 89.5t-74 51.5-76 14q-37 0-79-14.5t-62-35.5q-41-44-41-101 0-28 16.5-69.5t28-62.5 41.5-72h241V600H503q8-50-2.5-115T469 391q-41-59-99-113 35 11 84 18t70 7q33 1 103-16t103-17q76 0 136 30l50-147q-41-25-80.5-36.5t-59-13T715 102q-23 0-128 33t-155 29q-39-4-82-17t-66-25l-24-11-55 145 16.5 11 15.5 10 13.5 9.5 14.5 12 14.5 14L297 331q48 55 54 126.5T321 600H100z"/><glyph unicode="î…" d="M2 300L300 0l298 300H400v900H200V300H2zm600 600l298 300 298-300h-198V0H800v900H602z"/><glyph unicode="î…‘" d="M2 300h198v900h200V300h198L300 0zM700 0v200h100V100h200V0H700zm0 400v100h300V300h-99V200H801v100h99v100H700zm0 300v500h300V700H900v100H800V700H700zm101 200h100v200H801V900z"/><glyph unicode="î…’" d="M2 300h198v900h200V300h198L300 0zM700 0v500h300V0H900v100H800V0H700zm0 700v200h100V800h200V700H700zm0 400v100h300v-200h-99V900H801v100h99v100H700zm101-900h100v200H801V200z"/><glyph unicode="î…“" d="M2 300L300 0l298 300H400v900H200V300H2zm798-200v400h300V0h-100v100H800zm0 1000v100h200V700H900v400H800zm101-900h100v200H901V200z"/><glyph unicode="î…”" d="M2 300L300 0l298 300H400v900H200V300H2zm798 100v100h200V0H900v400H800zm0 400v400h300V700h-100v100H800zm101 100h100v200H901V900z"/><glyph unicode="î…•" d="M2 300L300 0l298 300H400v900H200V300H2zm698-200v200h500V100H700zm0 300v200h400V400H700zm0 300v200h300V700H700zm0 300v200h200v-200H700z"/><glyph unicode="î…–" d="M2 300L300 0l298 300H400v900H200V300H2zm698-200v200h200V100H700zm0 300v200h300V400H700zm0 300v200h400V700H700zm0 300v200h500v-200H700z"/><glyph unicode="î…—" d="M0 400v300q0 165 117.5 282.5T400 1100h300q162 0 281-118.5T1100 700V400q0-165-118.5-282.5T700 0H400Q235 0 117.5 117.5T0 400zm200-100q0-41 29.5-70.5T300 200h500q41 0 70.5 29.5T900 300v500q0 41-29.5 70.5T800 900H300q-41 0-70.5-29.5T200 800V300z"/><glyph unicode="î…˜" d="M0 400v300q0 163 119 281.5T400 1100h300q165 0 282.5-117.5T1100 700V400q0-165-117.5-282.5T700 0H400Q237 0 118.5 117.5T0 400zm200-100q0-41 29.5-70.5T300 200h500q41 0 70.5 29.5T900 300v500q0 41-29.5 70.5T800 900H300q-41 0-70.5-29.5T200 800V300zm200 0l333 250-333 250V300z"/><glyph unicode="î…™" d="M0 400v300q0 163 117.5 281.5T400 1100h300q163 0 281.5-119T1100 700V400q0-165-117.5-282.5T700 0H400Q235 0 117.5 117.5T0 400zm200-100q0-41 29.5-70.5T300 200h500q41 0 70.5 29.5T900 300v500q0 41-29.5 70.5T800 900H300q-41 0-70.5-29.5T200 800V300zm100 400l250-333 250 333H300z"/><glyph unicode="î… " d="M0 400v300q0 165 117.5 282.5T400 1100h300q165 0 282.5-117.5T1100 700V400q0-162-118.5-281T700 0H400Q235 0 117.5 118.5T0 400zm200-100q0-41 29.5-70.5T300 200h500q41 0 70.5 29.5T900 300v500q0 41-29.5 70.5T800 900H300q-41 0-70.5-29.5T200 800V300zm100 100h500L550 733z"/><glyph unicode="î…¡" d="M0 400v300h300v200l400-350-400-350v200H0zM500 0v200h500q41 0 70.5 29.5T1100 300v500q0 41-29.5 70.5T1000 900H500v200h400q165 0 282.5-117.5T1300 700V400q0-165-117.5-282.5T900 0H500z"/><glyph unicode="î…¢" d="M217 519q8-19 31-19h302Q395 62 390 42q-5-21 4-32l9-8h9q14 0 26 15 11 13 274.5 321.5T977 647q14 19 5 36-8 17-31 17l-301-1q1 4 78 219.5t79 227.5q2 15-5 27l-9 9h-9q-15 0-25-16-4-6-98-111.5t-228.5-257T223 560q-16-19-6-41z"/><glyph unicode="î…£" d="M0 400q0-165 117.5-282.5T400 0h300q47 0 100 15v185H300q-41 0-70.5 29.5T200 300v500q0 41 29.5 70.5T300 900h500v185q-14 4-114 7.5t-193 5.5l-93 2q-165 0-282.5-117.5T0 700V400zm600 0v300h300v200l400-350-400-350v200H600z"/><glyph unicode="î…¤" d="M0 400q0-165 117.5-282.5T400 0h300q163 0 281.5 117.5T1100 400v98l-78 73-122-123V300q0-41-29.5-70.5T800 200H300q-41 0-70.5 29.5T200 300v500q0 41 29.5 70.5T300 900h156l118 122-74 78H400q-165 0-282.5-117.5T0 700V400zm496 309l353 342-149 149h500V700l-149 149-342-353z"/><glyph unicode="î…¥" d="M4 600q0 162 80 299t217 217 299 80 299-80 217-217 80-299-80-299T899 84 600 4 301 84 84 301 4 600zm182 0q0-171 121.5-292.5T600 186t292.5 121.5T1014 600 892.5 892.5 600 1014 307.5 892.5 186 600zm220 0q0 80 57 137t137 57 137-57 57-137-57-137-137-57-137 57-57 137z"/><glyph unicode="î…¦" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19-7.5t8-17.5V0H0zm100 800l445-500 450 500H700v400H400V800H100zm800-650h100v50H900v-50z"/><glyph unicode="î…§" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19-7.5t8-17.5V0H0zm100 700h300V400h300v300h295l-445 500zm800-550h100v50H900v-50z"/><glyph unicode="î…¨" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19-7.5t8-17.5V0H0zm100 705l305-305 596 596-154 155-442-442-150 151zm800-555h100v50H900v-50z"/><glyph unicode="î…©" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19-7.5t8-17.5V0H0zm100 988l97-98 212 213-97 97zm100-588l697 1 3 699-250-239-149 149-212-212 149-149zm700-250h100v50H900v-50z"/><glyph unicode="î…°" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19-7.5t8-17.5V0H0zm200 612l212-212 98 97-213 212zm100 588l239-250-149-149 212-212 149 148 249-237-1 697zM900 150h100v50H900v-50z"/><glyph unicode="î…±" d="M23 415l1177 784V120L725 392 415-1v416H23zm471-205l672 938-672-712V210z"/><glyph unicode="î…²" d="M0 150v1000q0 20 14.5 35t35.5 15h250V900h500v300h100l200-200V150q0-21-15-35.5t-35-14.5H900v400H200V100H50q-21 0-35.5 14.5T0 150zm600 850h100v200H600v-200z"/><glyph unicode="î…³" d="M0 150v1000q0 20 14.5 35t35.5 15h250V900h500v300h100l200-200V782L824 507 704 627 578 500H200V100H50q-21 0-35.5 14.5T0 150zm581 156l123 123 120-120 353 352 123-123L825 62zm19 694h100v200H600v-200z"/><glyph unicode="î…´" d="M0 150v1000q0 20 14.5 35t35.5 15h250V900h500v300h100l200-200V731L997 628 827 798 529 500H200V100H50q-21 0-35.5 14.5T0 150zm600 850h100v200H600v-200zm100-867l170 170-170 170 127 127 170-170 170 170 127-128-170-169 170-170L1167 6 997 176 827 6z"/><glyph unicode="î…µ" d="M0 150v1000q0 20 14.5 35t35.5 15h250V900h500v300h100l200-200V700H700V500H200V100H50q-21 0-35.5 14.5T0 150zm600 150L900 0l300 300h-200v300H800V300H600zm0 700v200h100v-200H600z"/><glyph unicode="î…¶" d="M0 150v1000q0 20 14.5 35t35.5 15h250V900h500v300h100l200-200V598L900 798 602 500H200V100H50q-21 0-35.5 14.5T0 150zm600 150h200V0h200v300h200L900 600zm0 700v200h100v-200H600z"/><glyph unicode="î…·" d="M0 250q0-21 14.5-35.5T50 200h1100q21 0 35.5 14.5T1200 250v550H0V250zm0 650h1200v150q0 21-14.5 35.5T1150 1100H50q-21 0-35.5-14.5T0 1050V900zm100-600v200h400V300H100z"/><glyph unicode="î…¸" d="M0 400l300 298V500h400V300H300V102zm100 400v200h100V800H100zm200 0v200h100V800H300zm200 0v200h400v198l300-298-300-298v198H500zm300-500v200h100V300H800zm200 0h100v200h-100V300z"/><glyph unicode="î…¹" d="M100 700v400l50 100 50-100V800h100v300l50 100 50-100V800h100v300l50 100 50-100V700L500 497V50q0-21-14.5-35.5T450 0H250q-21 0-35.5 14.5T200 50v447zm700-103q0-29 10.5-55.5t25-43 29-28.5 25.5-18l10-5V50q0-21 14.5-35.5T950 0h200q21 0 35.5 14.5T1200 50v1106q0 31-18 40.5t-44-7.5l-276-116q-25-17-43.5-51.5T800 956V597z"/><glyph unicode="" d="M100 0h400v56q-75 0-87.5 6T400 106v394h500V106q0-38-12.5-44T800 56V0h400v56q-4 0-11 .5t-24 3-30 7-24 15-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56H800v-56q75 0 87.5-6t12.5-44V600H400v394q0 38 12.5 44t87.5 6v56H100v-56q4 0 11-.5t24-3 30-7 24-15 11-24.5V106q0-22-25-34.5T125 58l-25-2V0z"/><glyph unicode="î†" d="M0 300q0-41 29.5-70.5T100 200h300q41 0 70.5 29.5T500 300v500q0 41-29.5 70.5T400 900H100q-41 0-70.5-29.5T0 800V300zm100-200h400l200 200h105l295 98V100H675L575 0H200zm0 200v200h300V300H100zm0 300v200h300V600H100zm0 400h400l200-200v-98l295 98h105v200H675l-100 100H200zm600-598v163l400 133V535z"/><glyph unicode="" d="M16.5 974.5q.5-21.5 16-90t46.5-140T183 567t175-208q103-103 207.5-176t180-103.5 137-47T975 16l31 1 163 162q17 18 13.5 41t-22.5 37L968 393q-19 14-45 12t-42-19L763 268Q621 369 495 495T268 763l118 118q17 17 20 41.5T395 967l-139 194q-14 19-36.5 22t-40.5-14L17 1007q-1-11-.5-32.5z"/><glyph unicode="" d="M0 50v212q0 20 10.5 45.5T35 347l365 303v50q0 4 1 10.5t12 22.5 30 28.5 60 23 97 10.5 97-10 60-23.5 30-27.5 12-24l1-10v-50l365-303q14-14 24.5-39.5T1200 262V50q0-21-14.5-35.5T1150 0H50Q30 0 15 14.5T0 50zm0 662q0-21 14.5-33.5T49 670l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300-24V762q0-21 14.5-38t34.5-21l202-33q20-4 34.5 8.5T1200 712v200q-6 8-19 20.5t-63 45-112 57-171 45-235 20.5q-92 0-175-10.5t-141.5-27T175 1026t-81.5-40T40 949.5 9 922l-9-10V712z"/><glyph unicode="" d="M100 0v100h1100V0H100zm75 200h950l-125 150v250l100 100v400h-100V900H900v200H700V900H600v200H400V900H300v200H200V700l100-100V350z"/><glyph unicode="" d="M100 0h300v400q0 41-29.5 70.5T300 500H200q-41 0-70.5-29.5T100 400V0zm400 0v1000q0 41 29.5 70.5T600 1100h100q41 0 70.5-29.5T800 1000V0H500zm400 0v700q0 41 29.5 70.5T1000 800h100q41 0 70.5-29.5T1200 700V0H900z"/><glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212-88t88-212V300q0-124-88-212T900 0H200Q76 0-12 88t-88 212zm200-100h900v700H100V200zm100 100h300v300H300v100h200v100H200V500h200V400H200V300zm400 0h200v100h100v300H800v100H600V300zm100 100v300h100V400H700z"/><glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212-88t88-212V300q0-124-88-212T900 0H200Q76 0-12 88t-88 212zm200-100h900v700H100V200zm100 100h100v200h100V300h100v500H400V600H300v200H200V300zm400 0h200v100h100v300H800v100H600V300zm100 100v300h100V400H700z"/><glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212-88t88-212V300q0-124-88-212T900 0H200Q76 0-12 88t-88 212zm200-100h900v700H100V200zm100 100h300v100H300v300h200v100H200V300zm400 0h300v100H700v300h200v100H600V300z"/><glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212-88t88-212V300q0-124-88-212T900 0H200Q76 0-12 88t-88 212zm200-100h900v700H100V200zm100 350l300-150v300zm400-150l300 150-300 150V400z"/><glyph unicode="î†" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212-88t88-212V300q0-124-88-212T900 0H200Q76 0-12 88t-88 212zm200-100h900v700H100V200zm100 100v500h700V300H200zm100 100h130q41 0 68 42t27 107-28.5 108-66.5 43H300V400zm275 149q0-65 27-107t68-42h130v300H670q-38 0-66.5-43T575 549z"/><glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212-88t88-212V300q0-124-88-212T900 0H200Q76 0-12 88t-88 212zm200-100h900v700H100V200zm100 100h300v300H300v100h200v100H200V500h200V400H200V300zm401 0h100v100H601V300zm99 400h100V300h100v500H700V700z"/><glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212-88t88-212V300q0-124-88-212T900 0H200Q76 0-12 88t-88 212zm200-100h900v700H100V200zm100 100h300v400H300v100H200V300zm101 100v200h100V400H301zm300-100h100v100H601V300zm99 400h100V300h100v500H700V700z"/><glyph unicode="" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212-88t88-212V300q0-124-88-212T900 0H200Q76 0-12 88t-88 212zm200-100h900v700H100V200zm100 500v100h300V500h-99V400H301v100h99v200H200zm1-400v100h100V300H201zm400 0v100h100V300H601zm99 400v100h200V300H800v400H700z"/><glyph unicode="" d="M4 600q0 162 80 299t217 217 299 80 299-80 217-217 80-299-80-299T899 84 600 4 301 84 84 301 4 600zm182 0q0-171 121.5-292.5T600 186t292.5 121.5T1014 600 892.5 892.5 600 1014 307.5 892.5 186 600zm214-100v200l100 100h300V700H500V500h300V400H500z"/><glyph unicode="" d="M0 600q0 162 80 299t217 217 299 80 299-80 217-217 80-299-80-299T895 84 596 4 297 84 80 301 0 600zm182 0q0-171 121.5-292.5T596 186t292.5 121.5T1010 600 888.5 892.5 596 1014 303.5 892.5 182 600zm218-200v400h300l100-100V600H700v100H500V600h200V500H500V400H400zm300 0v100h100V400H700z"/><glyph unicode="" d="M-14 494q0-80 56.5-137T178 300h222v300h400V300h128q120 0 205 86.5t85 207.5-85 207-205 86q-46 0-90-14-44 97-134.5 156.5T503 1089q-152 0-260-107.5T135 721q0-25 2-37-66-14-108.5-67.5T-14 494zm314-294h200v300h200V200h200L600-100z"/><glyph unicode="" d="M-14 494q0-80 56.5-137T178 300h8l414 414 403-403q94 26 154.5 104.5T1218 594q0 120-85 206.5T928 887q-46 0-90-14-44 97-134.5 156.5T503 1089q-152 0-260-107.5T135 721q0-25 2-37-66-14-108.5-67.5T-14 494zm314-294l300 300 300-300H700v-300H500v300H300z"/><glyph unicode="" d="M100 200h400V45L425 0h350l-75 45v155h400L830 500h170L730 800h170l-300 333-300-333h170L200 500h170z"/><glyph unicode="" d="M121 700q0-53 28.5-97t75.5-65q-4-16-4-38 0-74 52.5-126.5T400 321q56 0 100 30V45L425 0h350l-75 45v306q46-30 100-30 74 0 126.5 52.5T979 500q0 24-9 55 50 32 79.5 83t29.5 112q0 90-61.5 155.5T867 977q-26 89-99.5 145.5T600 1179q-116 0-197.5-81.5T321 900q0-4 1-11.5t1-11.5q-14 2-23 2-74 0-126.5-52.5T121 700z"/></font></defs></svg>
\ No newline at end of file
diff --git a/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.ttf b/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100644
index 67fa00bf83801d2fa568546b982c80d27f6ef74e..0000000000000000000000000000000000000000
Binary files a/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.ttf and /dev/null differ
diff --git a/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.woff b/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index 8c54182aa5d4d1ab3c9171976b615c1dcb1dc187..0000000000000000000000000000000000000000
Binary files a/setup/pub/bootstrap/fonts/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/setup/pub/fonts/icons/icons.eot b/setup/pub/fonts/icons/icons.eot
new file mode 100644
index 0000000000000000000000000000000000000000..e93c814b902b8e01cade6a7acb955fc3cfaf1fb5
Binary files /dev/null and b/setup/pub/fonts/icons/icons.eot differ
diff --git a/setup/pub/fonts/icons/icons.svg b/setup/pub/fonts/icons/icons.svg
new file mode 100644
index 0000000000000000000000000000000000000000..54b4ad6acdce076f3006bc427b0c3e2567f7a51f
--- /dev/null
+++ b/setup/pub/fonts/icons/icons.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1024"><font-face units-per-em="1024" ascent="960" descent="-64"/><glyph horiz-adv-x="512"/><glyph unicode="" d="M924.704 654.336L408.8 138.464 305.6 241.632l515.936 515.904 103.168-103.2zM202.432 551.2L512 241.664l-103.2-103.2L99.296 448l103.136 103.2z"/><glyph unicode="î˜" d="M930.432 674.592L407.52 151.68l-69.728 69.696L860.704 744.32l69.728-69.728zM163.328 535.2l313.728-313.824-69.728-69.696-313.76 313.792 69.76 69.728z"/><glyph unicode="" d="M215.68 357.728L285.44 288 512 514.56 738.592 288l69.728 69.728L512 654.016zM512 960c282.336 0 512-229.696 512-512S794.304-64 512-64 0 165.696 0 448s229.696 512 512 512zM512-.704c247.424 0 448.704 201.28 448.704 448.704S759.424 896.704 512 896.704 63.296 695.424 63.296 448C63.296 200.608 264.576-.704 512-.704z"/><glyph unicode="" d="M821.568 654.336L305.664 138.464l-103.2 103.168 515.904 515.904 103.2-103.2zm-103.2-515.872L202.464 654.368l103.2 103.168L821.6 241.664l-103.232-103.2z"/><glyph unicode="" d="M738.592 151.68L215.68 674.624l69.728 69.696L808.32 221.376l-69.728-69.696zm69.728 522.944L285.408 151.68l-69.728 69.696L738.56 744.32l69.76-69.696z"/><glyph unicode="" d="M808.32 538.272L738.56 608 512 381.44 285.408 608l-69.728-69.728L512 241.984zM512-64C229.664-64 0 165.696 0 448s229.664 512 512 512c282.304 0 512-229.696 512-512S794.304-64 512-64zm0 960.704c-247.424 0-448.704-201.28-448.704-448.704S264.576-.704 512-.704 960.704 200.576 960.704 448 759.424 896.704 512 896.704z"/><glyph unicode="" d="M512 875.296L16.8 20.704h990.4L512 875.296zm49.952-750.656H457.28v101.152h104.672V124.64zM536 267.424h-52.16l-29.056 240.64V638.88h109.568V508.064L536 267.424z"/></font></defs></svg>
\ No newline at end of file
diff --git a/setup/pub/fonts/icons/icons.ttf b/setup/pub/fonts/icons/icons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..0490128bbdb73a7c76495e402e64683ff5029c6d
Binary files /dev/null and b/setup/pub/fonts/icons/icons.ttf differ
diff --git a/setup/pub/fonts/icons/icons.woff b/setup/pub/fonts/icons/icons.woff
new file mode 100644
index 0000000000000000000000000000000000000000..1a999afc1bd5225d3f4bdf21495caa4cfab03557
Binary files /dev/null and b/setup/pub/fonts/icons/icons.woff differ
diff --git a/setup/pub/fonts/icons/icons.woff2 b/setup/pub/fonts/icons/icons.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..bf8bba758ec2c8728cba2464b41f2dc413fd4ca4
Binary files /dev/null and b/setup/pub/fonts/icons/icons.woff2 differ
diff --git a/setup/pub/fonts/icons/selection.json b/setup/pub/fonts/icons/selection.json
new file mode 100644
index 0000000000000000000000000000000000000000..1fe67b6c2705c805832d2662ed38c93913d5e78c
--- /dev/null
+++ b/setup/pub/fonts/icons/selection.json
@@ -0,0 +1,286 @@
+{
+ "IcoMoonType": "selection",
+ "icons": [
+ {
+ "icon": {
+ "paths": [
+ "M924.704 305.664l-515.904 515.872-103.2-103.168 515.936-515.904 103.168 103.2z",
+ "M202.432 408.8l309.568 309.536-103.2 103.2-309.504-309.536 103.136-103.2z"
+ ],
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "grid": 0,
+ "tags": [
+ "checkmark-thick"
+ ]
+ },
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "properties": {
+ "order": 1,
+ "id": 6,
+ "prevSize": 32,
+ "code": 58880,
+ "name": "checkmark-thick"
+ },
+ "setIdx": 0,
+ "iconIdx": 0
+ },
+ {
+ "icon": {
+ "paths": [
+ "M930.432 285.408l-522.912 522.912-69.728-69.696 522.912-522.944 69.728 69.728z",
+ "M163.328 424.8l313.728 313.824-69.728 69.696-313.76-313.792 69.76-69.728z"
+ ],
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "grid": 0,
+ "tags": [
+ "checkmark"
+ ]
+ },
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "properties": {
+ "order": 2,
+ "id": 5,
+ "prevSize": 32,
+ "code": 58881,
+ "name": "checkmark"
+ },
+ "setIdx": 0,
+ "iconIdx": 1
+ },
+ {
+ "icon": {
+ "paths": [
+ "M215.68 602.272l69.76 69.728 226.56-226.56 226.592 226.56 69.728-69.728-296.32-296.288z",
+ "M512 0c282.336 0 512 229.696 512 512s-229.696 512-512 512-512-229.696-512-512 229.696-512 512-512zM512 960.704c247.424 0 448.704-201.28 448.704-448.704s-201.28-448.704-448.704-448.704-448.704 201.28-448.704 448.704c0 247.392 201.28 448.704 448.704 448.704z"
+ ],
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "grid": 0,
+ "tags": [
+ "collapse"
+ ]
+ },
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "properties": {
+ "order": 3,
+ "id": 4,
+ "prevSize": 32,
+ "code": 58882,
+ "name": "collapse"
+ },
+ "setIdx": 0,
+ "iconIdx": 2
+ },
+ {
+ "icon": {
+ "paths": [
+ "M821.568 305.664l-515.904 515.872-103.2-103.168 515.904-515.904 103.2 103.2z",
+ "M718.368 821.536l-515.904-515.904 103.2-103.168 515.936 515.872-103.232 103.2z"
+ ],
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "grid": 0,
+ "tags": [
+ "error-thick"
+ ]
+ },
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "properties": {
+ "order": 4,
+ "id": 3,
+ "prevSize": 32,
+ "code": 58883,
+ "name": "error-thick"
+ },
+ "setIdx": 0,
+ "iconIdx": 3
+ },
+ {
+ "icon": {
+ "paths": [
+ "M738.592 808.32l-522.912-522.944 69.728-69.696 522.912 522.944-69.728 69.696z",
+ "M808.32 285.376l-522.912 522.944-69.728-69.696 522.88-522.944 69.76 69.696z"
+ ],
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "grid": 0,
+ "tags": [
+ "error"
+ ]
+ },
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "properties": {
+ "order": 5,
+ "id": 2,
+ "prevSize": 32,
+ "code": 58884,
+ "name": "error"
+ },
+ "setIdx": 0,
+ "iconIdx": 4
+ },
+ {
+ "icon": {
+ "paths": [
+ "M808.32 421.728l-69.76-69.728-226.56 226.56-226.592-226.56-69.728 69.728 296.32 296.288z",
+ "M512 1024c-282.336 0-512-229.696-512-512s229.664-512 512-512c282.304 0 512 229.696 512 512s-229.696 512-512 512zM512 63.296c-247.424 0-448.704 201.28-448.704 448.704s201.28 448.704 448.704 448.704c247.424 0 448.704-201.28 448.704-448.704s-201.28-448.704-448.704-448.704z"
+ ],
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "grid": 0,
+ "tags": [
+ "expand"
+ ]
+ },
+ "attrs": [
+ {
+ "visibility": false
+ },
+ {
+ "visibility": false
+ }
+ ],
+ "properties": {
+ "order": 6,
+ "id": 1,
+ "prevSize": 32,
+ "code": 58885,
+ "name": "expand"
+ },
+ "setIdx": 0,
+ "iconIdx": 5
+ },
+ {
+ "icon": {
+ "paths": [
+ "M512 84.704l-495.2 854.592h990.4l-495.2-854.592zM561.952 835.36h-104.672v-101.152h104.672v101.152zM536 692.576h-52.16l-29.056-240.64v-130.816h109.568v130.816l-28.352 240.64z"
+ ],
+ "attrs": [
+ {
+ "visibility": false
+ }
+ ],
+ "grid": 0,
+ "tags": [
+ "warning"
+ ]
+ },
+ "attrs": [
+ {
+ "visibility": false
+ }
+ ],
+ "properties": {
+ "order": 7,
+ "id": 0,
+ "prevSize": 32,
+ "code": 58886,
+ "name": "warning"
+ },
+ "setIdx": 0,
+ "iconIdx": 6
+ }
+ ],
+ "height": 1024,
+ "metadata": {
+ "name": "icomoon"
+ },
+ "preferences": {
+ "showGlyphs": true,
+ "showQuickUse": true,
+ "showQuickUse2": true,
+ "showSVGs": true,
+ "fontPref": {
+ "prefix": "icon-",
+ "metadata": {
+ "fontFamily": "icomoon"
+ },
+ "metrics": {
+ "emSize": 1024,
+ "baseline": 6.25,
+ "whitespace": 50
+ }
+ },
+ "imagePref": {
+ "prefix": "icon-",
+ "png": true,
+ "useClassSelector": true
+ },
+ "historySize": 100,
+ "showCodes": true,
+ "search": ""
+ }
+}
diff --git a/setup/pub/fonts/opensans/bold/opensans-700.eot b/setup/pub/fonts/opensans/bold/opensans-700.eot
new file mode 100644
index 0000000000000000000000000000000000000000..5d20d916338a5890a033952e2e07ba7380f5a7d3
Binary files /dev/null and b/setup/pub/fonts/opensans/bold/opensans-700.eot differ
diff --git a/setup/pub/fonts/opensans/bold/opensans-700.svg b/setup/pub/fonts/opensans/bold/opensans-700.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9ece85702115257f3b83bf03449e15e996ab6da8
--- /dev/null
+++ b/setup/pub/fonts/opensans/bold/opensans-700.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1169"><font-face units-per-em="2048" ascent="1638" descent="-410"/><glyph unicode="ï¬" horiz-adv-x="1417" d="M41 0zm737 889H514V0H209v889H41v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zm162 518q0 149 166 149t166-149q0-71-41.5-110.5T1106 1257q-166 0-166 150zM1258 0H953v1118h305V0z"/><glyph unicode="fl" horiz-adv-x="1417" d="M41 0zm737 889H514V0H209v889H41v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zM1258 0H953v1556h305V0z"/><glyph unicode="ffi" horiz-adv-x="2208" d="M41 0zm737 889H514V0H209v889H41v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zm793 0h-264V0h-305v889H834v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zm159 518q0 149 166 149t166-149q0-71-41.5-110.5T1896 1257q-166 0-166 150zM2048 0h-305v1118h305V0z"/><glyph unicode="ffl" horiz-adv-x="2208" d="M41 0zm737 889H514V0H209v889H41v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zm793 0h-264V0h-305v889H834v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889zM2048 0h-305v1556h305V0z"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="1044"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph unicode="!" horiz-adv-x="586" d="M416 485H172l-51 977h346zM117 143q0 84 45 127t131 43q83 0 128.5-44T467 143q0-79-46-124.5T293-27q-84 0-130 44.5T117 143z"/><glyph unicode="&quot;" horiz-adv-x="967" d="M412 1462l-41-528H174l-41 528h279zm422 0l-41-528H596l-41 528h279z"/><glyph unicode="#" horiz-adv-x="1323" d="M999 844l-47-232h258V406H913L836 0H616l78 406H500L424 0H209l74 406H45v206h277l47 232H117v209h289l77 407h219l-77-407h198l78 407h215l-78-407h240V844H999zM539 612h196l47 232H586z"/><glyph unicode="$" d="M1092 457q0-159-115-255.5T655 86v-205H518V82q-244 5-428 86v264q87-43 209.5-76T518 317v310l-67 26q-198 78-280.5 169.5T88 1049q0 145 113.5 238.5T518 1401v153h137v-149q229-10 414-92l-94-234q-156 64-320 78V862q195-75 277.5-130t121-121 38.5-154zm-301-15q0 42-34 71t-102 60V324q136 23 136 118zm-402 607q0-44 30.5-72.5T518 918v235q-129-19-129-104z"/><glyph unicode="%" horiz-adv-x="1845" d="M315 1024q0-127 22.5-189.5T410 772q96 0 96 252 0 250-96 250-50 0-72.5-61.5T315 1024zm443 2q0-230-89-345.5T408 565q-165 0-255 118.5T63 1026q0 457 345 457 169 0 259.5-118.5T758 1026zm688 436L635 0H395l811 1462h240zM1339 440q0-127 22.5-189.5T1434 188q96 0 96 252 0 250-96 250-50 0-72.5-61.5T1339 440zm443 2q0-229-89-344.5T1432-18q-165 0-255 118.5T1087 442q0 457 345 457 169 0 259.5-118.5T1782 442z"/><glyph unicode="&" horiz-adv-x="1536" d="M1536 0h-377l-115 113Q853-20 612-20 368-20 225 92T82 395q0 137 60.5 233.5T350 809q-75 86-109 164.5T207 1145q0 152 116.5 245t311.5 93q186 0 297.5-86.5T1044 1165q0-119-69-217.5T752 760l284-277q71 117 123 301h318q-36-135-99-263.5T1235 293zM403 424q0-86 64.5-137T633 236q126 0 227 61L528 627q-58-44-91.5-92T403 424zm359 709q0 53-36 83.5t-93 30.5q-67 0-105.5-32t-38.5-91q0-88 95-194 86 48 132 94.5t46 108.5z"/><glyph unicode="'" horiz-adv-x="545" d="M412 1462l-41-528H174l-41 528h279z"/><glyph unicode="(" horiz-adv-x="694" d="M82 561q0 265 77.5 496T383 1462h250q-141-193-213-424t-72-475q0-245 73.5-473.5T631-324H383Q236-154 159 73T82 561z"/><glyph unicode=")" horiz-adv-x="694" d="M612 561q0-263-77.5-490T311-324H63Q198-140 272 88.5T346 563q0 244-72 475T61 1462h250q147-175 224-406.5T612 561z"/><glyph unicode="*" horiz-adv-x="1116" d="M688 1556l-41-368 373 104 33-252-340-24 223-297-227-121-156 313-137-311-236 119 221 297-338 26 39 250 365-104-41 368h262z"/><glyph unicode="+" d="M475 612H88v219h387v390h219V831h387V612H694V227H475v385z"/><glyph unicode="," horiz-adv-x="594" d="M459 215Q407 13 283-264H63Q128 2 164 238h280z"/><glyph unicode="-" horiz-adv-x="659" d="M61 424v250h537V424H61z"/><glyph unicode="." horiz-adv-x="584" d="M117 143q0 84 45 127t131 43q83 0 128.5-44T467 143q0-79-46-124.5T293-27q-84 0-130 44.5T117 143z"/><glyph unicode="/" horiz-adv-x="846" d="M836 1462L291 0H14l545 1462h277z"/><glyph unicode="0" d="M1096 731q0-383-125.5-567T584-20q-253 0-381.5 190T74 731q0 387 125 570.5T584 1485q253 0 382.5-192T1096 731zm-715 0q0-269 46.5-385.5T584 229q108 0 156 118t48 384q0 269-48.5 386.5T584 1235q-109 0-156-117.5T381 731z"/><glyph unicode="1" d="M846 0H537v846l3 139 5 152q-77-77-107-101L270 901l-149 186 471 375h254V0z"/><glyph unicode="2" d="M1104 0H82v215l367 371q163 167 213 231.5T734 937t22 114q0 88-48.5 131T578 1225q-85 0-165-39t-167-111L78 1274q108 92 179 130t155 58.5 188 20.5q137 0 242-50t163-140 58-206q0-101-35.5-189.5T917.5 716 655 451L467 274v-14h637V0z"/><glyph unicode="3" d="M1047 1135q0-137-83-233T731 770v-6q177-22 268-107.5t91-230.5q0-211-153-328.5T500-20Q262-20 78 59v263q85-43 187-70t202-27q153 0 226 52t73 167q0 103-84 146t-268 43H303v237h113q170 0 248.5 44.5T743 1067q0 166-208 166-72 0-146.5-24T223 1126L80 1339q200 144 477 144 227 0 358.5-92t131.5-256z"/><glyph unicode="4" d="M1137 303H961V0H659v303H35v215l641 944h285V543h176V303zM659 543v248q0 62 5 180t8 137h-8q-37-82-89-160L307 543h352z"/><glyph unicode="5" d="M614 934q212 0 337.5-119T1077 489q0-245-151-377T494-20q-244 0-394 79v267q79-42 184-68.5T483 231q283 0 283 232 0 221-293 221-53 0-117-10.5T252 651l-123 66 55 745h793v-262H455l-27-287 35 7q61 14 151 14z"/><glyph unicode="6" d="M72 621q0 434 183.5 646T805 1479q125 0 196-15v-247q-89 20-176 20-159 0-259.5-48T415 1047t-59-267h13q99 170 317 170 196 0 307-123t111-340q0-234-132-370.5T606-20q-162 0-282.5 75t-186 219T72 621zm528-394q99 0 152 66.5T805 483q0 107-49.5 168.5T606 713q-94 0-160.5-61T379 510q0-119 62.5-201T600 227z"/><glyph unicode="7" d="M227 0l549 1200H55v260h1049v-194L551 0H227z"/><glyph unicode="8" d="M586 1481q210 0 338.5-95.5T1053 1128q0-112-62-199.5T791 772q164-88 235.5-183.5T1098 379q0-180-141-289.5T586-20Q346-20 209 82T72 371q0 125 66.5 222T352 764q-125 79-180 169t-55 197q0 157 130 254t339 97zM358 389q0-86 60-134t164-48q115 0 172 49.5T811 387q0 67-56.5 125.5T571 637q-213-98-213-248zm226 866q-79 0-127.5-40.5T408 1106q0-60 38.5-107.5T586 901q98 46 137 94t39 111q0 69-50 109t-128 40z"/><glyph unicode="9" d="M1098 838q0-432-182-645T365-20Q235-20 168-6v248q84-21 176-21 155 0 255 45.5t153 143T813 678h-12q-58-94-134-132t-190-38q-191 0-301 122.5T66 971q0 235 133.5 371.5T563 1479q162 0 283.5-76t186.5-220.5 65-344.5zm-529 393q-96 0-150-66t-54-190q0-106 49-168t149-62q94 0 161 61.5T791 948q0 119-62.5 201T569 1231z"/><glyph unicode=":" horiz-adv-x="584" d="M117 143q0 84 45 127t131 43q83 0 128.5-44T467 143q0-79-46-124.5T293-27q-84 0-130 44.5T117 143zm0 826q0 84 45 127t131 43q83 0 128.5-44T467 969q0-81-46.5-125.5T293 799q-84 0-130 44t-46 126z"/><glyph unicode=";" horiz-adv-x="594" d="M444 238l15-23Q407 13 283-264H63Q128 2 164 238h280zM117 969q0 84 45 127t131 43q83 0 128.5-44T467 969q0-81-46.5-125.5T293 799q-84 0-130 44t-46 126z"/><glyph unicode="<" d="M1081 203L88 641v143l993 496v-240L397 723l684-281V203z"/><glyph unicode="=" d="M88 805v219h993V805H88zm0-387v219h993V418H88z"/><glyph unicode=">" d="M88 442l684 281-684 317v240l993-496V641L88 203v239z"/><glyph unicode="?" horiz-adv-x="977" d="M276 485v74q0 96 41 167t150 151q105 75 138.5 122t33.5 105q0 65-48 99t-134 34q-150 0-342-98L6 1358q223 125 473 125 206 0 327.5-99T928 1120q0-110-50-190T688 750q-96-71-121.5-108T541 545v-60H276zm-32-342q0 84 45 127t131 43q83 0 128.5-44T594 143q0-79-46-124.5T420-27q-84 0-130 44.5T244 143z"/><glyph unicode="@" horiz-adv-x="1837" d="M1735 752q0-144-46-263.5T1559 301t-195-68q-74 0-131 35.5t-82 93.5h-16q-108-129-275-129-177 0-279 106.5T479 631q0 211 134 340t350 129q86 0 189.5-16.5T1323 1044l-23-489q0-139 76-139 64 0 102 93.5t38 244.5q0 161-67 284.5T1260.5 1227 983 1292q-202 0-351-83T403.5 969.5 324 608q0-276 147.5-423.5T899 37q106 0 233 23.5t250 68.5V-63q-214-91-475-91-380 0-592.5 200T102 602q0 247 108.5 448.5t309 316T981 1481q220 0 393-90t267-256 94-383zM711 627q0-211 172-211 90 0 137 63.5t57 206.5l13 221q-51 11-115 11-125 0-194.5-78T711 627z"/><glyph unicode="A" horiz-adv-x="1413" d="M1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381z"/><glyph unicode="B" horiz-adv-x="1376" d="M184 1462h455q311 0 451.5-88.5T1231 1092q0-131-61.5-215T1006 776v-10q139-31 200.5-116t61.5-226q0-200-144.5-312T731 0H184v1462zm310-579h180q126 0 182.5 39t56.5 129q0 84-61.5 120.5T657 1208H494V883zm0-246V256h202q128 0 189 49t61 150q0 182-260 182H494z"/><glyph unicode="C" horiz-adv-x="1305" d="M805 1225q-175 0-271-131.5T438 727q0-489 367-489 154 0 373 77V55Q998-20 776-20q-319 0-488 193.5T119 729q0 228 83 399.5t238.5 263T805 1483q213 0 428-103l-100-252q-82 39-165 68t-163 29z"/><glyph unicode="D" horiz-adv-x="1516" d="M1397 745q0-361-205.5-553T598 0H184v1462h459q358 0 556-189t198-528zm-322-8q0 471-416 471H494V256h133q448 0 448 481z"/><glyph unicode="E" horiz-adv-x="1147" d="M1026 0H184v1462h842v-254H494V887h495V633H494V256h532V0z"/><glyph unicode="F" horiz-adv-x="1124" d="M489 0H184v1462h838v-254H489V831h496V578H489V0z"/><glyph unicode="G" horiz-adv-x="1483" d="M739 821h580V63q-141-46-265.5-64.5T799-20q-331 0-505.5 194.5T119 733q0 354 202.5 552T883 1483q225 0 434-90l-103-248q-160 80-333 80-201 0-322-135T438 727q0-238 97.5-363.5T819 238q97 0 197 20v305H739v258z"/><glyph unicode="H" horiz-adv-x="1567" d="M1382 0h-309v631H494V0H184v1462h310V889h579v573h309V0z"/><glyph unicode="I" horiz-adv-x="678" d="M184 0v1462h310V0H184z"/><glyph unicode="J" horiz-adv-x="678" d="M31-430q-105 0-183 22v258q80-20 146-20 102 0 146 63.5T184 92v1370h310V94q0-256-117-390T31-430z"/><glyph unicode="K" horiz-adv-x="1360" d="M1360 0h-352L625 616l-131-94V0H184v1462h310V793l122 172 396 497h344L846 815z"/><glyph unicode="L" horiz-adv-x="1157" d="M184 0v1462h310V256h593V0H184z"/><glyph unicode="M" horiz-adv-x="1931" d="M803 0L451 1147h-9q19-350 19-467V0H184v1462h422L952 344h6l367 1118h422V0h-289v692q0 49 1.5 113t13.5 340h-9L1087 0H803z"/><glyph unicode="N" horiz-adv-x="1665" d="M1481 0h-394L451 1106h-9q19-293 19-418V0H184v1462h391l635-1095h7q-15 285-15 403v692h279V0z"/><glyph unicode="O" horiz-adv-x="1630" d="M1511 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733z"/><glyph unicode="P" horiz-adv-x="1286" d="M494 774h102q143 0 214 56.5T881 995q0 109-59.5 161T635 1208H494V774zm700 232q0-236-147.5-361T627 520H494V0H184v1462h467q266 0 404.5-114.5T1194 1006z"/><glyph unicode="Q" horiz-adv-x="1630" d="M1511 733q0-258-91.5-432.5T1151 45l352-393h-397L838-20h-23q-336 0-516 195T119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733z"/><glyph unicode="R" horiz-adv-x="1352" d="M494 813h100q147 0 217 49t70 154q0 104-71.5 148T588 1208h-94V813zm0-252V0H184v1462h426q298 0 441-108.5t143-329.5q0-129-71-229.5T922 637q330-493 430-637h-344L659 561H494z"/><glyph unicode="S" horiz-adv-x="1128" d="M1047 406q0-198-142.5-312T508-20Q274-20 94 68v288q148-66 250.5-93T532 236q102 0 156.5 39T743 391q0 43-24 76.5T648.5 532 459 631q-134 63-201 121T151 887t-40 180q0 194 131.5 305T606 1483q114 0 217.5-27t216.5-76l-100-241q-117 48-193.5 67T596 1225q-88 0-135-41t-47-107q0-41 19-71.5t60.5-59T690 844q205-98 281-196.5t76-241.5z"/><glyph unicode="T" horiz-adv-x="1186" d="M748 0H438v1204H41v258h1104v-258H748V0z"/><glyph unicode="U" horiz-adv-x="1548" d="M1374 1462V516q0-162-72.5-284T1092 45 768-20q-282 0-438 144.5T174 520v942h309V567q0-169 68-248t225-79q152 0 220.5 79.5T1065 569v893h309z"/><glyph unicode="V" horiz-adv-x="1331" d="M1018 1462h313L834 0H496L0 1462h313l275-870q23-77 47.5-179.5T666 270q11 92 75 322z"/><glyph unicode="W" horiz-adv-x="1980" d="M1608 0h-353l-198 768q-11 41-37.5 169.5T989 1110q-6-54-30-173.5T922 766L725 0H373L0 1462h305l187-798q49-221 71-383 6 57 27.5 176.5T631 643l213 819h293l213-819q14-55 35-168t32-194q10 78 32 194.5t40 188.5l186 798h305z"/><glyph unicode="X" horiz-adv-x="1366" d="M1366 0h-354L672 553 332 0H0l485 754-454 708h342l315-526 309 526h334L872 737z"/><glyph unicode="Y" horiz-adv-x="1278" d="M639 860l305 602h334L793 569V0H485v559L0 1462h336z"/><glyph unicode="Z" horiz-adv-x="1186" d="M1137 0H49v201l701 1005H68v256h1050v-200L418 256h719V0z"/><glyph unicode="[" horiz-adv-x="678" d="M627-324H143v1786h484v-211H403V-113h224v-211z"/><glyph unicode="\" horiz-adv-x="846" d="M289 1462L834 0H557L12 1462h277z"/><glyph unicode="]" horiz-adv-x="678" d="M51-113h223v1364H51v211h484V-324H51v211z"/><glyph unicode="^" horiz-adv-x="1090" d="M8 520l438 950h144l495-950H846l-322 643-280-643H8z"/><glyph unicode="_" horiz-adv-x="842" d="M846-324H-4v140h850v-140z"/><glyph unicode="`" horiz-adv-x="1243" d="M707 1241q-63 44-185 142.5T332 1548v21h342q63-101 235-301v-27H707z"/><glyph unicode="a" horiz-adv-x="1237" d="M870 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92z"/><glyph unicode="b" horiz-adv-x="1296" d="M782 1139q198 0 310-154.5T1204 561q0-277-115.5-429T774-20q-197 0-309 143h-21L393 0H160v1556h305v-362q0-69-12-221h12q107 166 317 166zm-98-244q-113 0-165-69.5T465 596v-33q0-180 53.5-258T688 227q94 0 149.5 86.5T893 565t-56 247.5T684 895z"/><glyph unicode="c" horiz-adv-x="1053" d="M614-20Q92-20 92 553q0 285 142 435.5T641 1139q194 0 348-76l-90-236q-72 29-134 47.5T641 893q-238 0-238-338 0-328 238-328 88 0 163 23.5T954 324V63Q880 16 804.5-2T614-20z"/><glyph unicode="d" horiz-adv-x="1296" d="M514-20q-197 0-309.5 153T92 557q0 275 114.5 428.5T522 1139q211 0 322-164h10q-23 125-23 223v358h306V0H903l-59 145h-13Q727-20 514-20zm107 243q117 0 171.5 68T852 522v33q0 180-55.5 258T616 891q-102 0-158.5-86.5T401 553t57-247.5T621 223z"/><glyph unicode="e" horiz-adv-x="1210" d="M623 922q-97 0-152-61.5T408 686h428q-2 113-59 174.5T623 922zm43-942q-270 0-422 149T92 551q0 281 140.5 434.5T621 1139q237 0 369-135t132-373V483H401q5-130 77-203t202-73q101 0 191 21t188 67V59Q979 19 888-.5T666-20z"/><glyph unicode="f" horiz-adv-x="793" d="M778 889H514V0H209v889H41v147l168 82v82q0 191 94 279t301 88q158 0 281-47l-78-224q-92 29-170 29-65 0-94-38.5t-29-98.5v-70h264V889z"/><glyph unicode="g" horiz-adv-x="1157" d="M1133 1118V963l-175-45q48-75 48-168 0-180-125.5-280.5T532 369l-55 3-45 5q-47-36-47-80 0-66 168-66h190q184 0 280.5-79T1120-80q0-196-163.5-304T487-492q-234 0-357.5 81.5T6-182Q6-81 69-13t185 97q-47 20-82 65.5T137 246q0 64 37 106.5T281 436q-88 38-139.5 122T90 756q0 183 119 283t340 100q47 0 111.5-8.5T743 1118h390zM270-158q0-63 60.5-99T500-293q164 0 257 45t93 123q0 63-55 87T625-14H467q-84 0-140.5-39.5T270-158zm111 910q0-91 41.5-144T549 555q86 0 126 53t40 144q0 202-166 202-168 0-168-202z"/><glyph unicode="h" horiz-adv-x="1346" d="M1192 0H887v653q0 242-180 242-128 0-185-87t-57-282V0H160v1556h305v-317q0-37-7-174l-7-90h16q102 164 324 164 197 0 299-106t102-304V0z"/><glyph unicode="i" horiz-adv-x="625" d="M147 1407q0 149 166 149t166-149q0-71-41.5-110.5T313 1257q-166 0-166 150zM465 0H160v1118h305V0z"/><glyph unicode="j" horiz-adv-x="625" d="M70-492q-117 0-201 25v240q70-19 143-19 77 0 112.5 43T160-76v1194h305V-121q0-178-103-274.5T70-492zm77 1899q0 149 166 149t166-149q0-71-41.5-110.5T313 1257q-166 0-166 150z"/><glyph unicode="k" horiz-adv-x="1270" d="M453 608l133 170 313 340h344L799 633 1270 0H918L596 453 465 348V0H160v1556h305V862l-16-254h4z"/><glyph unicode="l" horiz-adv-x="625" d="M465 0H160v1556h305V0z"/><glyph unicode="m" horiz-adv-x="2011" d="M1161 0H856v653q0 121-40.5 181.5T688 895q-117 0-170-86t-53-283V0H160v1118h233l41-143h17q45 77 130 120.5t195 43.5q251 0 340-164h27q45 78 132.5 121t197.5 43q190 0 287.5-97.5T1858 729V0h-306v653q0 121-40.5 181.5T1384 895q-112 0-167.5-80T1161 561V0z"/><glyph unicode="n" horiz-adv-x="1346" d="M1192 0H887v653q0 121-43 181.5T707 895q-128 0-185-85.5T465 526V0H160v1118h233l41-143h17q51 81 140.5 122.5T795 1139q195 0 296-105.5T1192 729V0z"/><glyph unicode="o" horiz-adv-x="1268" d="M403 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307z"/><glyph unicode="p" horiz-adv-x="1296" d="M774-20q-197 0-309 143h-16q16-140 16-162v-453H160v1610h248l43-145h14q107 166 317 166 198 0 310-153t112-425q0-179-52.5-311T1002 49 774-20zm-90 915q-113 0-165-69.5T465 596v-33q0-180 53.5-258T688 227q205 0 205 338 0 165-50.5 247.5T684 895z"/><glyph unicode="q" horiz-adv-x="1296" d="M623 219q116 0 170 66.5T852 518v37q0 180-55.5 258T618 891q-215 0-215-338 0-168 53.5-251T623 219zM514-20q-198 0-310 152.5T92 557q0 274 114.5 428T520 1139q106 0 185-40t139-124h8l27 143h258V-492H831v469q0 61 13 168h-13Q782 64 701 22T514-20z"/><glyph unicode="r" horiz-adv-x="930" d="M784 1139q62 0 103-9l-23-286q-37 10-90 10-146 0-227.5-75T465 569V0H160v1118h231l45-188h15q52 94 140.5 151.5T784 1139z"/><glyph unicode="s" horiz-adv-x="1018" d="M940 332q0-172-119.5-262T463-20Q341-20 255-3.5T94 45v252q85-40 191.5-67T473 203q166 0 166 96 0 36-22 58.5t-76 51T397 475q-129 54-189.5 100t-88 105.5T92 827q0 149 115.5 230.5T535 1139q202 0 393-88l-92-220q-84 36-157 59t-149 23q-135 0-135-73 0-41 43.5-71T629 680q131-53 192-99t90-106 29-143z"/><glyph unicode="t" horiz-adv-x="889" d="M631 223q80 0 192 35V31Q709-20 543-20q-183 0-266.5 92.5T193 350v539H47v129l168 102 88 236h195v-238h313V889H498V350q0-65 36.5-96t96.5-31z"/><glyph unicode="u" horiz-adv-x="1346" d="M952 0l-41 143h-16Q846 65 756 22.5T551-20Q354-20 254 85.5T154 389v729h305V465q0-121 43-181.5T639 223q128 0 185 85.5T881 592v526h305V0H952z"/><glyph unicode="v" horiz-adv-x="1165" d="M426 0L0 1118h319l216-637q36-121 45-229h6q5 96 45 229l215 637h319L739 0H426z"/><glyph unicode="w" horiz-adv-x="1753" d="M1079 0l-86 391-116 494h-7L666 0H338L20 1118h304l129-495q31-133 63-367h6q4 76 35 241l16 85 138 536h336l131-536q4-22 12.5-65t16.5-91.5 14.5-95 7.5-74.5h6q9 72 32 197.5t33 169.5l134 495h299L1411 0h-332z"/><glyph unicode="x" horiz-adv-x="1184" d="M389 571L29 1118h346l217-356 219 356h346L793 571 1174 0H827L592 383 356 0H10z"/><glyph unicode="y" horiz-adv-x="1165" d="M0 1118h334l211-629q27-82 37-194h6q11 103 43 194l207 629h327L692-143q-65-175-185.5-262T225-492q-79 0-155 17v242q55-13 120-13 81 0 141.5 49.5T426-47l18 55z"/><glyph unicode="z" horiz-adv-x="999" d="M938 0H55v180l518 705H86v233h834V920L416 233h522V0z"/><glyph unicode="{" horiz-adv-x="807" d="M287 270q0 87-65.5 133T31 449v239q126 0 191 44t65 126v326q0 153 97 215.5t341 62.5v-225q-99-3-136.5-38T551 1096V797q-6-188-234-222v-12q234-35 234-212V43q0-68 37-103t137-38v-226q-244 0-341 62.5T287-45v315z"/><glyph unicode="|" horiz-adv-x="1128" d="M455 1550h219V-465H455v2015z"/><glyph unicode="}" horiz-adv-x="807" d="M520-45q0-112-41-169t-135.5-83.5T82-324v226q99 2 136.5 36T256 43v310q0 86 59 139.5T489 563v12q-227 34-233 222v299q0 70-37 104t-137 37v225q167 0 262-26.5t135.5-84T520 1184V856q0-84 61.5-126T776 688V449q-125 0-190.5-41T520 270V-45z"/><glyph unicode="~" d="M322 672q-55 0-117.5-33.5T88 551v231q103 109 256 109 73 0 137.5-16T621 827q129-55 227-55 53 0 116 32t117 89V662Q980 553 825 553q-66 0-126 13t-150 50q-131 56-227 56z"/><glyph unicode="¡" horiz-adv-x="586" d="M168 606h244l51-975H117zm299 342q0-84-45-127t-131-43q-83 0-128.5 44T117 948q0 81 46.5 125.5T291 1118q84 0 130-44t46-126z"/><glyph unicode="¢" d="M563 176q-420 59-420 565 0 261 104.5 403T563 1317v166h178v-158q166-9 299-74l-90-235q-72 29-134 47t-124 18q-121 0-179-83.5T455 743q0-327 237-327 82 0 148 15.5t166 60.5V238q-127-61-265-70V-20H563v196z"/><glyph unicode="£" d="M700 1483q195 0 390-82l-93-230q-157 64-272 64-78 0-120-44.5T563 1063V870h375V651H563V508q0-170-151-248h718V0H82v248q103 44 141.5 101T262 506v145H84v219h178v195q0 201 114.5 309.5T700 1483z"/><glyph unicode="¤" d="M188 723q0 102 54 197l-129 127 147 147 127-127q91 53 197 53 105 0 196-55l127 129 150-143-129-129q53-89 53-199 0-107-53-199l125-125-146-145-127 125q-95-51-196-51-115 0-199 51L260 256 115 401l127 125q-54 93-54 197zm207 0q0-77 54.5-132.5T584 535q81 0 136.5 55T776 723q0 80-56.5 135T584 913q-78 0-133.5-56T395 723z"/><glyph unicode="Â¥" d="M584 860l264 602h313L778 715h195V537H727V399h246V221H727V0H440v221H193v178h247v138H193v178h190L6 1462h316z"/><glyph unicode="¦" horiz-adv-x="1128" d="M455 1550h219V735H455v815zm0-1200h219v-815H455v815z"/><glyph unicode="§" horiz-adv-x="995" d="M121 805q0 79 36 144.5t97 105.5q-133 84-133 233 0 131 111.5 210t293.5 79q170 0 363-84l-82-190q-68 32-138.5 57.5T520 1386q-81 0-118-23t-37-71q0-49 49.5-86t163.5-82q163-64 240-148.5T895 782q0-177-125-260 62-40 93.5-92.5T895 303q0-148-119.5-235.5T455-20q-203 0-349 79v207q81-41 180-69.5T455 168q194 0 194 117 0 39-18.5 63T567 397.5 442 457q-183 74-252 152.5T121 805zm223 22q0-67 65-119t181-98q78 57 78 146 0 68-50.5 115T434 967q-37-14-63.5-53.5T344 827z"/><glyph unicode="¨" horiz-adv-x="1243" d="M279 1405q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T418 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T823 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T682 1405z"/><glyph unicode="©" horiz-adv-x="1704" d="M895 1010q-97 0-150-74t-53-205q0-280 203-280 57 0 123 15t123 44V319q-120-57-252-57-204 0-316 125T461 733q0 220 110.5 342.5T881 1198q149 0 305-78l-74-168q-113 58-217 58zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm142 0q0-164 82-305.5t224-223T852 121q164 0 305.5 82t223 224 81.5 304q0 164-82 305.5t-224 223-304 81.5q-164 0-305.5-82t-223-224T242 731z"/><glyph unicode="ª" horiz-adv-x="784" d="M561 764l-31 110q-43-58-105-90t-136-32q-117 0-179.5 58.5T47 975q0 109 82.5 163.5T397 1202l99 4q0 117-127 117-81 0-217-61l-66 135q66 32 145.5 57t178.5 25q137 0 211.5-71t74.5-202V764H561zM252 977q0-38 23-56t55-18q77 0 121.5 41.5T496 1051v36l-99-6q-145-10-145-104z"/><glyph unicode="«" horiz-adv-x="1260" d="M82 573l371 455 219-119-279-348 279-348L453 94 82 547v26zm506 0l370 455 220-119-279-348 279-348L958 94 588 547v26z"/><glyph unicode="¬" d="M1081 248H862v364H88v219h993V248z"/><glyph unicode="Â" horiz-adv-x="659" d="M61 424zm0 0v250h537V424H61z"/><glyph unicode="®" horiz-adv-x="1704" d="M1157 905q0-170-143-233l237-400H997L819 610h-47V272H543v916h264q181 0 265.5-70t84.5-213zM772 778h31q66 0 94.5 28.5T926 901q0 65-28 92t-97 27h-29V778zm-672-47q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm142 0q0-164 82-305.5t224-223T852 121q164 0 305.5 82t223 224 81.5 304q0 164-82 305.5t-224 223-304 81.5q-164 0-305.5-82t-223-224T242 731z"/><glyph unicode="¯" horiz-adv-x="1024" d="M1030 1556H-6v201h1036v-201z"/><glyph unicode="°" horiz-adv-x="877" d="M92 1137q0 92 46 172t126 127 174 47q92 0 172.5-46t127-127 46.5-173q0-93-46.5-173.5T611 838t-173-45q-145 0-245.5 99.5T92 1137zm191 0q0-64 44.5-109T438 983t111 46 45 108q0 63-45.5 110T438 1294q-64 0-109.5-46T283 1137z"/><glyph unicode="±" d="M475 674H88v219h387v389h219V893h387V674H694V289H475v385zM88 0v219h993V0H88z"/><glyph unicode="²" horiz-adv-x="776" d="M702 586H55v168l224 219q102 100 130.5 144.5T438 1212q0 38-24 58t-64 20q-81 0-180-88L47 1354q147 129 336 129 137 0 216-66.5t79-183.5q0-85-47-160T455 881l-105-95h352V586z"/><glyph unicode="³" horiz-adv-x="776" d="M666 1249q0-143-170-198v-13q94-20 146-75t52-134q0-121-88-190.5T332 569q-143 0-273 70v190q148-90 271-90 143 0 143 107 0 53-44 79.5T307 952H195v160h92q83 0 123.5 26t40.5 83q0 38-25 63t-76 25q-47 0-89-19t-99-59L61 1372q62 47 137.5 78t178.5 31q127 0 208-64t81-168z"/><glyph unicode="´" horiz-adv-x="1243" d="M332 1241v27q172 200 235 301h342v-21q-52-52-177.5-154.5T535 1241H332z"/><glyph unicode="µ" horiz-adv-x="1352" d="M465 465q0-121 44-181.5T647 223q126 0 183 86.5T887 592v526h305V0H961l-43 150h-15Q861 65 801 22.5T653-20q-62 0-114 23t-84 67l5-85 5-157v-320H160v1610h305V465z"/><glyph unicode="¶" horiz-adv-x="1341" d="M1167-260h-161v1616H840V-260H678v819q-62-18-146-18-216 0-317.5 125T113 1042q0 260 109 387t341 127h604V-260z"/><glyph unicode="·" horiz-adv-x="584" d="M117 723q0 84 45 127t131 43q83 0 128.5-44T467 723q0-81-46.5-125.5T293 553q-84 0-130 44t-46 126z"/><glyph unicode="¸" horiz-adv-x="420" d="M418-250q0-128-75.5-185T109-492q-78 0-146 21v168q27-7 72.5-14t70.5-7q72 0 72 62 0 83-166 108L90 0h193l-27-61q74-24 118-74.5T418-250z"/><glyph unicode="¹" horiz-adv-x="776" d="M584 586H346v446l3 112 5 95q-27-36-75-78l-78-61-109 127 301 235h191V586z"/><glyph unicode="º" horiz-adv-x="795" d="M737 1116q0-171-91.5-267.5T395 752q-153 0-245.5 98.5T57 1116q0 169 89.5 266t252.5 97q152 0 245-98.5t93-264.5zm-477 0q0-100 32.5-150.5T397 915t103.5 50.5T532 1116t-31.5 149.5T397 1315t-104.5-49.5T260 1116z"/><glyph unicode="»" horiz-adv-x="1260" d="M1178 547L807 94 588 213l278 348-278 348 219 119 371-455v-26zm-506 0L301 94 82 213l278 348L82 909l219 119 371-455v-26z"/><glyph unicode="¼" horiz-adv-x="1804" d="M46 0zm492 586H300v446l3 112 5 95q-27-36-75-78l-78-61-109 127 301 235h191V586zm832 876L559 0H320l811 1462h239zm312-1310h-125V1h-238v151H936v154l385 577h236V320h125V152zm-363 168v164q0 86 6 184-9-26-35.5-80t-41.5-77l-127-191h198z"/><glyph unicode="½" horiz-adv-x="1804" d="M46 0zm492 586H300v446l3 112 5 95q-27-36-75-78l-78-61-109 127 301 235h191V586zm832 876L559 0H320l811 1462h239zM1716 1h-647v168l224 219q102 100 130.5 144.5T1452 627q0 38-24 58t-64 20q-81 0-180-88l-123 152q147 129 336 129 137 0 216-66.5t79-183.5q0-85-47-160t-176-192l-105-95h352V1z"/><glyph unicode="¾" horiz-adv-x="1804" d="M90 0zm607 1249q0-143-170-198v-13q94-20 146-75t52-134q0-121-88-190.5T363 569q-143 0-273 70v190q148-90 271-90 143 0 143 107 0 53-44 79.5T338 952H226v160h92q83 0 123.5 26t40.5 83q0 38-25 63t-76 25q-47 0-89-19t-99-59L92 1372q62 47 137.5 78t178.5 31q127 0 208-64t81-168zm744 213L630 0H391l811 1462h239zm271-1310h-125V1h-238v151H966v154l385 577h236V320h125V152zm-363 168v164q0 86 6 184-9-26-35.5-80t-41.5-77l-127-191h198z"/><glyph unicode="¿" horiz-adv-x="977" d="M713 606v-74q0-98-44.5-169T516 215Q407 137 378.5 93T350-14q0-57 43.5-94T526-145q79 0 169 29t186 71l102-221q-98-56-221.5-90.5T532-391q-220 0-345.5 96.5T61-29q0 108 48.5 187T301 342q95 70 121.5 107t26.5 98v59h264zm32 342q0-84-45-127t-131-43q-83 0-128.5 44T395 948q0 81 46.5 125.5T569 1118q84 0 130-44t46-126z"/><glyph unicode="À" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zm-186 971q-63 44-185 142.5T338 1886v21h342q63-101 235-301v-27H713z"/><glyph unicode="Ã" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zm-358 971v27q172 200 235 301h342v-21q-52-52-177.5-154.5T744 1579H541z"/><glyph unicode="Â" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zm39 971q-157 93-234 176-78-81-229-176H272v27q189 189 256 301h357q31-52 107.5-141.5T1141 1606v-27H938z"/><glyph unicode="Ã" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zM543 1684q-31 0-59.5-26.5T442 1577H293q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T799 1798t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T850 1579q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="Ä" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zM365 1743q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T504 1610q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T909 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T768 1743z"/><glyph unicode="Ã…" horiz-adv-x="1413" d="M0 0zm1079 0L973 348H440L334 0H0l516 1468h379L1413 0h-334zM899 608q-147 473-165.5 535t-26.5 98q-33-128-189-633h381zm60 959q0-108-71-174t-183-66-180 64-68 174q0 108 67.5 172.5T705 1802q110 0 182-66t72-169zm-158-2q0 45-27 70.5t-69 25.5-69-25.5-27-70.5 24-71 72-26q42 0 69 26t27 71z"/><glyph unicode="Æ" horiz-adv-x="1950" d="M1829 0H956v348H465L315 0H0l655 1462h1174v-254h-563V887h526V633h-526V256h563V0zM578 608h378v590H829z"/><glyph unicode="Ç" horiz-adv-x="1305" d="M119 0zm686 1225q-175 0-271-131.5T438 727q0-489 367-489 154 0 373 77V55Q998-20 776-20q-319 0-488 193.5T119 729q0 228 83 399.5t238.5 263T805 1483q213 0 428-103l-100-252q-82 39-165 68t-163 29zM959-250q0-128-75.5-185T650-492q-78 0-146 21v168q27-7 72.5-14t70.5-7q72 0 72 62 0 83-166 108L631 0h193l-27-61q74-24 118-74.5T959-250z"/><glyph unicode="È" horiz-adv-x="1147" d="M184 0zm842 0H184v1462h842v-254H494V887h495V633H494V256h532V0zM634 1579q-63 44-185 142.5T259 1886v21h342q63-101 235-301v-27H634z"/><glyph unicode="É" horiz-adv-x="1147" d="M184 0zm842 0H184v1462h842v-254H494V887h495V633H494V256h532V0zM424 1579v27q172 200 235 301h342v-21q-52-52-177.5-154.5T627 1579H424z"/><glyph unicode="Ê" horiz-adv-x="1147" d="M175 0zm851 0H184v1462h842v-254H494V887h495V633H494V256h532V0zM841 1579q-157 93-234 176-78-81-229-176H175v27q189 189 256 301h357q31-52 107.5-141.5T1044 1606v-27H841z"/><glyph unicode="Ë" horiz-adv-x="1147" d="M184 0zm842 0H184v1462h842v-254H494V887h495V633H494V256h532V0zM272 1743q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T411 1610q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T816 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T675 1743z"/><glyph unicode="ÃŒ" horiz-adv-x="678" d="M0 0zm184 0v1462h310V0H184zm133 1579q-63 44-185 142.5T-58 1886v21h342q63-101 235-301v-27H317z"/><glyph unicode="Ã" horiz-adv-x="678" d="M167 0zm17 0v1462h310V0H184zm-17 1579v27q172 200 235 301h342v-21q-52-52-177.5-154.5T370 1579H167z"/><glyph unicode="ÃŽ" horiz-adv-x="678" d="M0 0zm184 0v1462h310V0H184zm386 1579q-157 93-234 176-78-81-229-176H-96v27q189 189 256 301h357q31-52 107.5-141.5T773 1606v-27H570z"/><glyph unicode="Ã" horiz-adv-x="678" d="M0 0zm184 0v1462h310V0H184zM-3 1743q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T136 1610q-64 0-101.5 35T-3 1743zm403 0q0 70 40.5 102.5T541 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T400 1743z"/><glyph unicode="Ã" horiz-adv-x="1516" d="M47 850h137v612h459q358 0 556-189t198-528q0-361-205.5-553T598 0H184v596H47v254zm1028-113q0 232-104 351.5T657 1208H494V850h237V596H494V256h131q450 0 450 481z"/><glyph unicode="Ñ" horiz-adv-x="1665" d="M184 0zm1297 0h-394L451 1106h-9q19-293 19-418V0H184v1462h391l635-1095h7q-15 285-15 403v692h279V0zM668 1684q-31 0-59.5-26.5T567 1577H418q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T924 1798t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T975 1579q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="Ã’" horiz-adv-x="1630" d="M119 0zm1392 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733zm380 846q-63 44-185 142.5T449 1886v21h342q63-101 235-301v-27H824z"/><glyph unicode="Ó" horiz-adv-x="1630" d="M119 0zm1392 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733zm214 846v27q172 200 235 301h342v-21q-52-52-177.5-154.5T861 1579H658z"/><glyph unicode="Ô" horiz-adv-x="1630" d="M119 0zm1392 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733zm603 846q-157 93-234 176-78-81-229-176H381v27q189 189 256 301h357q31-52 107.5-141.5T1250 1606v-27h-203z"/><glyph unicode="Õ" horiz-adv-x="1630" d="M119 0zm1392 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733zm208 951q-31 0-59.5-26.5T551 1577H402q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T908 1798t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T959 1579q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="Ö" horiz-adv-x="1630" d="M119 0zm1392 733q0-363-180-558T815-20 299 175 119 735t180.5 557.5T817 1485t515.5-194T1511 733zm-1067 0q0-245 93-369t278-124q371 0 371 493 0 494-369 494-185 0-279-124.5T444 733zm30 1010q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T613 1610q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T1018 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T877 1743z"/><glyph unicode="×" d="M428 723l-299 301 152 154 301-299 305 299 153-150-305-305 301-303-149-152-305 301-301-299-150 152z"/><glyph unicode="Ø" horiz-adv-x="1630" d="M1511 733q0-363-180-558T815-20q-197 0-336 65L389-90 227 18l90 136Q119 348 119 735q0 365 180.5 557.5T817 1485q198 0 344-70l84 125 160-104-88-131q194-194 194-572zm-1067 0q0-191 56-307l506 756q-84 45-189 45-185 0-279-124.5T444 733zm742 0q0 180-51 297L635 279q76-39 180-39 371 0 371 493z"/><glyph unicode="Ù" horiz-adv-x="1548" d="M174 0zm1200 1462V516q0-162-72.5-284T1092 45 768-20q-282 0-438 144.5T174 520v942h309V567q0-169 68-248t225-79q152 0 220.5 79.5T1065 569v893h309zm-624 117q-63 44-185 142.5T375 1886v21h342q63-101 235-301v-27H750z"/><glyph unicode="Ú" horiz-adv-x="1548" d="M174 0zm1200 1462V516q0-162-72.5-284T1092 45 768-20q-282 0-438 144.5T174 520v942h309V567q0-169 68-248t225-79q152 0 220.5 79.5T1065 569v893h309zm-772 117v27q172 200 235 301h342v-21q-52-52-177.5-154.5T805 1579H602z"/><glyph unicode="Û" horiz-adv-x="1548" d="M174 0zm1200 1462V516q0-162-72.5-284T1092 45 768-20q-282 0-438 144.5T174 520v942h309V567q0-169 68-248t225-79q152 0 220.5 79.5T1065 569v893h309zm-368 117q-157 93-234 176-78-81-229-176H340v27q189 189 256 301h357q31-52 107.5-141.5T1209 1606v-27h-203z"/><glyph unicode="Ãœ" horiz-adv-x="1548" d="M174 0zm1200 1462V516q0-162-72.5-284T1092 45 768-20q-282 0-438 144.5T174 520v942h309V567q0-169 68-248t225-79q152 0 220.5 79.5T1065 569v893h309zm-941 281q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T572 1610q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T977 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T836 1743z"/><glyph unicode="Ã" horiz-adv-x="1278" d="M0 0zm639 860l305 602h334L793 569V0H485v559L0 1462h336zm-178 719v27q172 200 235 301h342v-21q-52-52-177.5-154.5T664 1579H461z"/><glyph unicode="Þ" horiz-adv-x="1286" d="M1194 770q0-229-142.5-353T647 293H494V0H184v1462h310v-229h178q254 0 388-119t134-344zM494 543h100q145 0 216 52.5T881 770q0 107-63.5 159T618 981H494V543z"/><glyph unicode="ß" horiz-adv-x="1456" d="M1249 1241q0-64-21-112.5t-53-86.5-69-67-69-53-53-45-21-43q0-27 26.5-53t92.5-66q146-91 198.5-140t78-110 25.5-139q0-172-116.5-259T924-20q-99 0-171 14.5T621 43v242q53-36 135.5-61T903 199q168 0 168 123 0 41-16 66.5T998 444t-115 72q-126 72-175 131.5T659 788q0 64 35 117t105 102q77 55 108 95t31 86q0 60-63.5 100.5T711 1329q-116 0-181-52.5T465 1128V0H160v1139q0 201 146.5 314.5T711 1567q244 0 391-88.5t147-237.5z"/><glyph unicode="à " horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm-166 723q-63 44-185 142.5T239 1548v21h342q63-101 235-301v-27H614z"/><glyph unicode="á" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm-339 723v27q172 200 235 301h342v-21q-52-52-177.5-154.5T644 1241H441z"/><glyph unicode="â" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm63 722q-157 93-234 176-78-81-229-176H177v27q189 189 256 301h357q31-52 107.5-141.5T1046 1267v-27H843z"/><glyph unicode="ã" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm-313 828q-31 0-59.5-26.5T366 1239H217q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T723 1460t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T774 1241q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="ä" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm-495 887q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T424 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T829 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T688 1405z"/><glyph unicode="Ã¥" horiz-adv-x="1237" d="M86 0zm784 0l-59 152h-8Q726 55 644.5 17.5T432-20q-161 0-253.5 92T86 334q0 178 124.5 262.5T586 690l194 6v49q0 170-174 170-134 0-315-81l-101 206q193 101 428 101 225 0 345-98t120-298V0H870zm-90 518l-118-4q-133-4-198-48t-65-134q0-129 148-129 106 0 169.5 61T780 426v92zm103 961q0-108-71-174t-183-66-180 64-68 174q0 108 67.5 172.5T629 1714q110 0 182-66t72-169zm-158-2q0 45-27 70.5t-69 25.5-69-25.5-27-70.5 24-71 72-26q42 0 69 26t27 71z"/><glyph unicode="æ" horiz-adv-x="1878" d="M1329-20q-137 0-249.5 50.5T895 186Q797 69 698.5 24.5T442-20q-161 0-258.5 94.5T86 334q0 178 121 262.5T569 690l191 6v84q0 69-44.5 102T594 915q-140 0-305-77l-99 202q189 101 422 101 227 0 342-131 66 64 152.5 96.5T1313 1139q221 0 349-137.5T1790 631V483h-723q5-130 77-203t202-73q196 0 380 88V59q-79-39-171-59t-226-20zM760 518l-113-4q-124-4-186-47.5T399 332q0-129 140-129 101 0 161 61t60 162v92zm547 404q-217 0-234-236h430q-2 112-55 174t-141 62z"/><glyph unicode="ç" horiz-adv-x="1053" d="M92 0zm522-20Q92-20 92 553q0 285 142 435.5T641 1139q194 0 348-76l-90-236q-72 29-134 47.5T641 893q-238 0-238-338 0-328 238-328 88 0 163 23.5T954 324V63Q880 16 804.5-2T614-20zm191-230q0-128-75.5-185T496-492q-78 0-146 21v168q27-7 72.5-14t70.5-7q72 0 72 62 0 83-166 108L477 0h193l-27-61q74-24 118-74.5T805-250z"/><glyph unicode="è" horiz-adv-x="1210" d="M92 0zm531 922q-97 0-152-61.5T408 686h428q-2 113-59 174.5T623 922zm43-942q-270 0-422 149T92 551q0 281 140.5 434.5T621 1139q237 0 369-135t132-373V483H401q5-130 77-203t202-73q101 0 191 21t188 67V59Q979 19 888-.5T666-20zm-46 1261q-63 44-185 142.5T245 1548v21h342q63-101 235-301v-27H620z"/><glyph unicode="é" horiz-adv-x="1210" d="M92 0zm531 922q-97 0-152-61.5T408 686h428q-2 113-59 174.5T623 922zm43-942q-270 0-422 149T92 551q0 281 140.5 434.5T621 1139q237 0 369-135t132-373V483H401q5-130 77-203t202-73q101 0 191 21t188 67V59Q979 19 888-.5T666-20zM447 1241v27q172 200 235 301h342v-21q-52-52-177.5-154.5T650 1241H447z"/><glyph unicode="ê" horiz-adv-x="1210" d="M92 0zm531 922q-97 0-152-61.5T408 686h428q-2 113-59 174.5T623 922zm43-942q-270 0-422 149T92 551q0 281 140.5 434.5T621 1139q237 0 369-135t132-373V483H401q5-130 77-203t202-73q101 0 191 21t188 67V59Q979 19 888-.5T666-20zm194 1261q-157 93-234 176-78-81-229-176H194v27q189 189 256 301h357q31-52 107.5-141.5T1063 1268v-27H860z"/><glyph unicode="ë" horiz-adv-x="1210" d="M92 0zm531 922q-97 0-152-61.5T408 686h428q-2 113-59 174.5T623 922zm43-942q-270 0-422 149T92 551q0 281 140.5 434.5T621 1139q237 0 369-135t132-373V483H401q5-130 77-203t202-73q101 0 191 21t188 67V59Q979 19 888-.5T666-20zM297 1405q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T436 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T841 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T700 1405z"/><glyph unicode="ì" horiz-adv-x="625" d="M0 0zm465 0H160v1118h305V0zM274 1241q-63 44-185 142.5T-101 1548v21h342q63-101 235-301v-27H274z"/><glyph unicode="Ã" horiz-adv-x="625" d="M145 0zm320 0H160v1118h305V0zM145 1241v27q172 200 235 301h342v-21q-52-52-177.5-154.5T348 1241H145z"/><glyph unicode="î" horiz-adv-x="625" d="M0 0zm465 0H160v1118h305V0zm79 1241q-157 93-234 176-78-81-229-176h-203v27q189 189 256 301h357q31-52 107.5-141.5T747 1268v-27H544z"/><glyph unicode="ï" horiz-adv-x="625" d="M0 0zm465 0H160v1118h305V0zM-29 1405q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T110 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T515 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T374 1405z"/><glyph unicode="ð" horiz-adv-x="1268" d="M510 1303q-80 53-152 92l101 176q144-65 258-141l225 139 100-154-170-104q156-143 230-324.5t74-413.5q0-280-145-436.5T631-20q-245 0-392 137T92 489q0 233 130 369.5T573 995q205 0 275-98l8 4q-67 162-192 281l-230-142-100 156zm354-771q0 108-61 173t-168 65q-121 0-176.5-68.5T403 487q0-140 60-211t172-71q123 0 176 82t53 245z"/><glyph unicode="ñ" horiz-adv-x="1346" d="M160 0zm1032 0H887v653q0 121-43 181.5T707 895q-128 0-185-85.5T465 526V0H160v1118h233l41-143h17q51 81 140.5 122.5T795 1139q195 0 296-105.5T1192 729V0zM508 1346q-31 0-59.5-26.5T407 1239H258q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T764 1460t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T815 1241q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="ò" horiz-adv-x="1268" d="M92 0zm311 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307zm-564 680q-63 44-185 142.5T237 1548v21h342q63-101 235-301v-27H612z"/><glyph unicode="ó" horiz-adv-x="1268" d="M92 0zm311 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307zm-709 680v27q172 200 235 301h342v-21q-52-52-177.5-154.5T670 1241H467z"/><glyph unicode="ô" horiz-adv-x="1268" d="M92 0zm311 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307zm-312 680q-157 93-234 176-78-81-229-176H198v27q189 189 256 301h357q31-52 107.5-141.5T1067 1268v-27H864z"/><glyph unicode="õ" horiz-adv-x="1268" d="M92 0zm311 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307zm-707 785q-31 0-59.5-26.5T368 1239H219q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T725 1460t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T776 1241q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph unicode="ö" horiz-adv-x="1268" d="M92 0zm311 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm773 0q0-273-144-427T631-20q-161 0-284 70.5T158 253 92 561q0 274 143 426t402 152q161 0 284-70t189-201 66-307zm-885 844q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T430 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T835 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T694 1405z"/><glyph unicode="÷" d="M88 612v219h993V612H88zm356-239q0 76 37 113.5T584 524t102.5-39T723 373q0-70-37-111t-102-41-102.5 39T444 373zm0 698q0 75 37 113.5t103 38.5q67 0 103-40.5t36-111.5q0-70-37-110.5T584 920t-102.5 39-37.5 112z"/><glyph unicode="ø" horiz-adv-x="1268" d="M1176 561q0-273-144-427T631-20q-126 0-234 45L330-76 176 29l68 100Q92 285 92 561q0 274 143 426t402 152q132 0 248-52l55 82 152-108-58-84q142-155 142-416zm-773 0q0-94 19-166l317 475q-43 23-106 23-122 0-176-82.5T403 561zm461 0q0 81-12 141L543 240q38-15 92-15 122 0 175.5 84.5T864 561z"/><glyph unicode="ù" horiz-adv-x="1346" d="M154 0zm798 0l-41 143h-16Q846 65 756 22.5T551-20Q354-20 254 85.5T154 389v729h305V465q0-121 43-181.5T639 223q128 0 185 85.5T881 592v526h305V0H952zM620 1241q-63 44-185 142.5T245 1548v21h342q63-101 235-301v-27H620z"/><glyph unicode="ú" horiz-adv-x="1346" d="M154 0zm798 0l-41 143h-16Q846 65 756 22.5T551-20Q354-20 254 85.5T154 389v729h305V465q0-121 43-181.5T639 223q128 0 185 85.5T881 592v526h305V0H952zM498 1241v27q172 200 235 301h342v-21q-52-52-177.5-154.5T701 1241H498z"/><glyph unicode="û" horiz-adv-x="1346" d="M154 0zm798 0l-41 143h-16Q846 65 756 22.5T551-20Q354-20 254 85.5T154 389v729h305V465q0-121 43-181.5T639 223q128 0 185 85.5T881 592v526h305V0H952zm-51 1241q-157 93-234 176-78-81-229-176H235v27q189 189 256 301h357q31-52 107.5-141.5T1104 1268v-27H901z"/><glyph unicode="ü" horiz-adv-x="1346" d="M154 0zm798 0l-41 143h-16Q846 65 756 22.5T551-20Q354-20 254 85.5T154 389v729h305V465q0-121 43-181.5T639 223q128 0 185 85.5T881 592v526h305V0H952zM326 1405q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T465 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T870 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T729 1405z"/><glyph unicode="ý" horiz-adv-x="1165" d="M0 0zm0 1118h334l211-629q27-82 37-194h6q11 103 43 194l207 629h327L692-143q-65-175-185.5-262T225-492q-79 0-155 17v242q55-13 120-13 81 0 141.5 49.5T426-47l18 55zm393 123v27q172 200 235 301h342v-21q-52-52-177.5-154.5T596 1241H393z"/><glyph unicode="þ" horiz-adv-x="1296" d="M465 973q50 81 131 123.5t186 42.5q198 0 310-154.5T1204 561q0-273-111.5-427T782-20q-213 0-317 137h-14l7-62 7-94v-453H160v2048h305v-391l-7-120-7-72h14zm219-78q-113 0-165-69.5T465 596v-33q0-180 53.5-258T688 227q205 0 205 338 0 165-50.5 247.5T684 895z"/><glyph unicode="ÿ" horiz-adv-x="1165" d="M0 0zm0 1118h334l211-629q27-82 37-194h6q11 103 43 194l207 629h327L692-143q-65-175-185.5-262T225-492q-79 0-155 17v242q55-13 120-13 81 0 141.5 49.5T426-47l18 55zm243 287q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T382 1272q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T787 1540q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T646 1405z"/><glyph unicode="ı" horiz-adv-x="625" d="M465 0H160v1118h305V0z"/><glyph unicode="Å’" horiz-adv-x="1993" d="M1872 0H999q-38-9-109-14.5T774-20q-319 0-487 197T119 735q0 363 169.5 556.5T776 1485q61 0 127-7t101-16h868v-254h-563V887h526V633h-526V256h563V0zM776 1227q-166 0-252-125.5T438 733q0-244 86-368.5T774 240q65 0 126 10.5t99 28.5v907q-35 19-101.5 30T776 1227z"/><glyph unicode="Å“" horiz-adv-x="2003" d="M1446-20q-271 0-420 155Q885-20 635-20q-162 0-286 70T158.5 252 92 561q0 277 141.5 427.5T633 1139q112 0 212-39.5T1016 983q144 156 383 156 244 0 380-135t136-373V483h-746v-8q7-127 81.5-197.5T1458 207q107 0 200 21t193 67V59q-81-39-175.5-59T1446-20zM403 561q0-166 54.5-251T635 225q122 0 175.5 84.5T864 561q0 166-54 249t-177 83q-122 0-176-82.5T403 561zm1002 361q-94 0-156-57.5T1178 686h450q-2 111-60.5 173.5T1405 922z"/><glyph unicode="Ÿ" horiz-adv-x="1278" d="M0 0zm639 860l305 602h334L793 569V0H485v559L0 1462h336zm-342 883q0 65 37.5 100t101.5 35q66 0 103.5-37t37.5-98q0-60-38-96.5T436 1610q-64 0-101.5 35t-37.5 98zm403 0q0 70 40.5 102.5T841 1878q65 0 103.5-36t38.5-99q0-61-39-97t-103-36q-60 0-100.5 32.5T700 1743z"/><glyph unicode="ˆ" horiz-adv-x="1243" d="M852 1241q-157 93-234 176-78-81-229-176H186v27q189 189 256 301h357q31-52 107.5-141.5T1055 1268v-27H852z"/><glyph unicode="Ëš" horiz-adv-x="1182" d="M842 1479q0-108-71-174t-183-66-180 64-68 174q0 108 67.5 172.5T588 1714q110 0 182-66t72-169zm-158-2q0 45-27 70.5t-69 25.5-69-25.5-27-70.5 24-71 72-26q42 0 69 26t27 71z"/><glyph unicode="Ëœ" horiz-adv-x="1243" d="M457 1346q-31 0-59.5-26.5T356 1239H207q11 145 82.5 227t189.5 82q41 0 80.5-16.5t78-36T713 1460t73-16q31 0 59.5 26t41.5 80h149q-11-145-83.5-227T764 1241q-41 0-80.5 16.5t-78 36-75.5 36-73 16.5z"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="635"/><glyph horiz-adv-x="476"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="238"/><glyph horiz-adv-x="381"/><glyph horiz-adv-x="105"/><glyph unicode="â€" horiz-adv-x="659" d="M61 424v250h537V424H61z"/><glyph unicode="‑" horiz-adv-x="659" d="M61 424v250h537V424H61z"/><glyph unicode="‒" horiz-adv-x="659" d="M61 424v250h537V424H61z"/><glyph unicode="–" horiz-adv-x="1024" d="M82 436v230h860V436H82z"/><glyph unicode="—" horiz-adv-x="2048" d="M82 436v230h1884V436H82z"/><glyph unicode="‘" horiz-adv-x="444" d="M39 961l-14 22q22 91 72.5 228.5T201 1462h219q-66-267-101-501H39z"/><glyph unicode="’" horiz-adv-x="444" d="M406 1462l14-22q-50-197-176-479H25q69 296 100 501h281z"/><glyph unicode="‚" horiz-adv-x="596" d="M459 215Q407 13 283-264H63Q128 2 164 238h280z"/><glyph unicode="“" horiz-adv-x="911" d="M492 983q22 91 72.5 228.5T668 1462h219q-66-267-101-501H506zm-467 0q22 91 72.5 228.5T201 1462h219q-66-267-101-501H39z"/><glyph unicode="â€" horiz-adv-x="911" d="M420 1440q-50-197-176-479H25q69 296 100 501h281zm467 0q-50-197-176-479H492q69 296 100 501h280z"/><glyph unicode="„" horiz-adv-x="1061" d="M459 215Q407 13 283-264H63Q128 2 164 238h280zm467 0Q874 13 750-264H530Q595 2 631 238h280z"/><glyph unicode="•" horiz-adv-x="770" d="M98 748q0 154 74 235.5t213 81.5q137 0 212-82t75-235q0-152-75.5-235T385 430q-138 0-212.5 83T98 748z"/><glyph unicode="…" horiz-adv-x="1751" d="M117 143q0 84 45 127t131 43q83 0 128.5-44T467 143q0-79-46-124.5T293-27q-84 0-130 44.5T117 143zm583 0q0 84 45 127t132 43q83 0 128.5-44t45.5-126q0-79-46-124.5T877-27q-85 0-131 44.5T700 143zm584 0q0 84 45 127t131 43q83 0 128.5-44t45.5-126q0-79-46-124.5T1460-27q-84 0-130 44.5T1284 143z"/><glyph horiz-adv-x="381"/><glyph unicode="‹" horiz-adv-x="754" d="M82 573l371 455 219-119-279-348 279-348L453 94 82 547v26z"/><glyph unicode="›" horiz-adv-x="754" d="M672 547L301 94 82 213l278 348L82 909l219 119 371-455v-26z"/><glyph unicode="â„" horiz-adv-x="266" d="M657 1462L-154 0h-239l811 1462h239z"/><glyph horiz-adv-x="476"/><glyph unicode="â´" horiz-adv-x="776" d="M758 737H633V586H395v151H12v154l385 577h236V905h125V737zM395 905v164q0 86 6 184-9-26-35.5-80t-41.5-77L197 905h198z"/><glyph unicode="€" d="M803 1225q-122 0-201-70.5T500 950h403V774H485l-2-35v-47l2-33h355V481H502q51-243 321-243 143 0 275 57V39Q982-20 805-20q-245 0-403 133T203 481H66v178h118q-4 23-4 62l2 53H66v176h133q37 242 199 382.5T803 1473q188 0 352-82l-98-232q-69 31-129 48.5T803 1225z"/><glyph unicode="â„¢" horiz-adv-x="1534" d="M381 741H213v572H16v149h564v-149H381V741zm575 0l-165 529h-7l4-111V741H625v721h247l160-510 170 510h240V741h-168v408l4 121h-6l-174-529H956z"/><glyph unicode="" horiz-adv-x="1120" d="M0 1120h1120V0H0v1120z"/><glyph horiz-adv-x="1296" d="M0 0z"/><hkern u1="&quot;" u2="Ÿ" k="-20"/><hkern u1="&quot;" u2="Å“" k="123"/><hkern u1="&quot;" u2="ü" k="61"/><hkern u1="&quot;" u2="û" k="61"/><hkern u1="&quot;" u2="ú" k="61"/><hkern u1="&quot;" u2="ù" k="61"/><hkern u1="&quot;" u2="ø" k="123"/><hkern u1="&quot;" u2="ö" k="123"/><hkern u1="&quot;" u2="õ" k="123"/><hkern u1="&quot;" u2="ô" k="123"/><hkern u1="&quot;" u2="ó" k="123"/><hkern u1="&quot;" u2="ò" k="123"/><hkern u1="&quot;" u2="ë" k="123"/><hkern u1="&quot;" u2="ê" k="123"/><hkern u1="&quot;" u2="é" k="123"/><hkern u1="&quot;" u2="è" k="123"/><hkern u1="&quot;" u2="ç" k="123"/><hkern u1="&quot;" u2="æ" k="82"/><hkern u1="&quot;" u2="Ã¥" k="82"/><hkern u1="&quot;" u2="ä" k="82"/><hkern u1="&quot;" u2="ã" k="82"/><hkern u1="&quot;" u2="â" k="82"/><hkern u1="&quot;" u2="á" k="82"/><hkern u1="&quot;" u2="à " k="123"/><hkern u1="&quot;" u2="Ã" k="-20"/><hkern u1="&quot;" u2="Ã…" k="143"/><hkern u1="&quot;" u2="Ä" k="143"/><hkern u1="&quot;" u2="Ã" k="143"/><hkern u1="&quot;" u2="Â" k="143"/><hkern u1="&quot;" u2="Ã" k="143"/><hkern u1="&quot;" u2="À" k="143"/><hkern u1="&quot;" u2="u" k="61"/><hkern u1="&quot;" u2="s" k="61"/><hkern u1="&quot;" u2="r" k="61"/><hkern u1="&quot;" u2="q" k="123"/><hkern u1="&quot;" u2="p" k="61"/><hkern u1="&quot;" u2="o" k="123"/><hkern u1="&quot;" u2="n" k="61"/><hkern u1="&quot;" u2="m" k="61"/><hkern u1="&quot;" u2="g" k="61"/><hkern u1="&quot;" u2="e" k="123"/><hkern u1="&quot;" u2="d" k="123"/><hkern u1="&quot;" u2="c" k="123"/><hkern u1="&quot;" u2="a" k="82"/><hkern u1="&quot;" u2="Y" k="-20"/><hkern u1="&quot;" u2="W" k="-41"/><hkern u1="&quot;" u2="V" k="-41"/><hkern u1="&quot;" u2="T" k="-41"/><hkern u1="&quot;" u2="A" k="143"/><hkern u1="'" u2="Ÿ" k="-20"/><hkern u1="'" u2="Å“" k="123"/><hkern u1="'" u2="ü" k="61"/><hkern u1="'" u2="û" k="61"/><hkern u1="'" u2="ú" k="61"/><hkern u1="'" u2="ù" k="61"/><hkern u1="'" u2="ø" k="123"/><hkern u1="'" u2="ö" k="123"/><hkern u1="'" u2="õ" k="123"/><hkern u1="'" u2="ô" k="123"/><hkern u1="'" u2="ó" k="123"/><hkern u1="'" u2="ò" k="123"/><hkern u1="'" u2="ë" k="123"/><hkern u1="'" u2="ê" k="123"/><hkern u1="'" u2="é" k="123"/><hkern u1="'" u2="è" k="123"/><hkern u1="'" u2="ç" k="123"/><hkern u1="'" u2="æ" k="82"/><hkern u1="'" u2="Ã¥" k="82"/><hkern u1="'" u2="ä" k="82"/><hkern u1="'" u2="ã" k="82"/><hkern u1="'" u2="â" k="82"/><hkern u1="'" u2="á" k="82"/><hkern u1="'" u2="à " k="123"/><hkern u1="'" u2="Ã" k="-20"/><hkern u1="'" u2="Ã…" k="143"/><hkern u1="'" u2="Ä" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="Â" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="À" k="143"/><hkern u1="'" u2="u" k="61"/><hkern u1="'" u2="s" k="61"/><hkern u1="'" u2="r" k="61"/><hkern u1="'" u2="q" k="123"/><hkern u1="'" u2="p" k="61"/><hkern u1="'" u2="o" k="123"/><hkern u1="'" u2="n" k="61"/><hkern u1="'" u2="m" k="61"/><hkern u1="'" u2="g" k="61"/><hkern u1="'" u2="e" k="123"/><hkern u1="'" u2="d" k="123"/><hkern u1="'" u2="c" k="123"/><hkern u1="'" u2="a" k="82"/><hkern u1="'" u2="Y" k="-20"/><hkern u1="'" u2="W" k="-41"/><hkern u1="'" u2="V" k="-41"/><hkern u1="'" u2="T" k="-41"/><hkern u1="'" u2="A" k="143"/><hkern u1="(" u2="J" k="-184"/><hkern u1="," u2="Ÿ" k="123"/><hkern u1="," u2="Å’" k="102"/><hkern u1="," u2="Ã" k="123"/><hkern u1="," u2="Ãœ" k="41"/><hkern u1="," u2="Û" k="41"/><hkern u1="," u2="Ú" k="41"/><hkern u1="," u2="Ù" k="41"/><hkern u1="," u2="Ø" k="102"/><hkern u1="," u2="Ö" k="102"/><hkern u1="," u2="Õ" k="102"/><hkern u1="," u2="Ô" k="102"/><hkern u1="," u2="Ó" k="102"/><hkern u1="," u2="Ã’" k="102"/><hkern u1="," u2="Ç" k="102"/><hkern u1="," u2="Y" k="123"/><hkern u1="," u2="W" k="123"/><hkern u1="," u2="V" k="123"/><hkern u1="," u2="U" k="41"/><hkern u1="," u2="T" k="143"/><hkern u1="," u2="Q" k="102"/><hkern u1="," u2="O" k="102"/><hkern u1="," u2="G" k="102"/><hkern u1="," u2="C" k="102"/><hkern u1="-" u2="T" k="82"/><hkern u1="." u2="Ÿ" k="123"/><hkern u1="." u2="Å’" k="102"/><hkern u1="." u2="Ã" k="123"/><hkern u1="." u2="Ãœ" k="41"/><hkern u1="." u2="Û" k="41"/><hkern u1="." u2="Ú" k="41"/><hkern u1="." u2="Ù" k="41"/><hkern u1="." u2="Ø" k="102"/><hkern u1="." u2="Ö" k="102"/><hkern u1="." u2="Õ" k="102"/><hkern u1="." u2="Ô" k="102"/><hkern u1="." u2="Ó" k="102"/><hkern u1="." u2="Ã’" k="102"/><hkern u1="." u2="Ç" k="102"/><hkern u1="." u2="Y" k="123"/><hkern u1="." u2="W" k="123"/><hkern u1="." u2="V" k="123"/><hkern u1="." u2="U" k="41"/><hkern u1="." u2="T" k="143"/><hkern u1="." u2="Q" k="102"/><hkern u1="." u2="O" k="102"/><hkern u1="." u2="G" k="102"/><hkern u1="." u2="C" k="102"/><hkern u1="A" u2="â€" k="143"/><hkern u1="A" u2="’" k="143"/><hkern u1="A" u2="Ÿ" k="123"/><hkern u1="A" u2="Å’" k="41"/><hkern u1="A" u2="Ã" k="123"/><hkern u1="A" u2="Ø" k="41"/><hkern u1="A" u2="Ö" k="41"/><hkern u1="A" u2="Õ" k="41"/><hkern u1="A" u2="Ô" k="41"/><hkern u1="A" u2="Ó" k="41"/><hkern u1="A" u2="Ã’" k="41"/><hkern u1="A" u2="Ç" k="41"/><hkern u1="A" u2="Y" k="123"/><hkern u1="A" u2="W" k="82"/><hkern u1="A" u2="V" k="82"/><hkern u1="A" u2="T" k="143"/><hkern u1="A" u2="Q" k="41"/><hkern u1="A" u2="O" k="41"/><hkern u1="A" u2="J" k="-266"/><hkern u1="A" u2="G" k="41"/><hkern u1="A" u2="C" k="41"/><hkern u1="A" u2="'" k="143"/><hkern u1="A" u2="&quot;" k="143"/><hkern u1="B" u2="„" k="82"/><hkern u1="B" u2="‚" k="82"/><hkern u1="B" u2="Ÿ" k="20"/><hkern u1="B" u2="Ã" k="20"/><hkern u1="B" u2="Ã…" k="41"/><hkern u1="B" u2="Ä" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="Â" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="À" k="41"/><hkern u1="B" u2="Z" k="20"/><hkern u1="B" u2="Y" k="20"/><hkern u1="B" u2="X" k="41"/><hkern u1="B" u2="W" k="20"/><hkern u1="B" u2="V" k="20"/><hkern u1="B" u2="T" k="61"/><hkern u1="B" u2="A" k="41"/><hkern u1="B" u2="." k="82"/><hkern u1="B" u2="," k="82"/><hkern u1="C" u2="Å’" k="41"/><hkern u1="C" u2="Ø" k="41"/><hkern u1="C" u2="Ö" k="41"/><hkern u1="C" u2="Õ" k="41"/><hkern u1="C" u2="Ô" k="41"/><hkern u1="C" u2="Ó" k="41"/><hkern u1="C" u2="Ã’" k="41"/><hkern u1="C" u2="Ç" k="41"/><hkern u1="C" u2="Q" k="41"/><hkern u1="C" u2="O" k="41"/><hkern u1="C" u2="G" k="41"/><hkern u1="C" u2="C" k="41"/><hkern u1="D" u2="„" k="82"/><hkern u1="D" u2="‚" k="82"/><hkern u1="D" u2="Ÿ" k="20"/><hkern u1="D" u2="Ã" k="20"/><hkern u1="D" u2="Ã…" k="41"/><hkern u1="D" u2="Ä" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="Â" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="À" k="41"/><hkern u1="D" u2="Z" k="20"/><hkern u1="D" u2="Y" k="20"/><hkern u1="D" u2="X" k="41"/><hkern u1="D" u2="W" k="20"/><hkern u1="D" u2="V" k="20"/><hkern u1="D" u2="T" k="61"/><hkern u1="D" u2="A" k="41"/><hkern u1="D" u2="." k="82"/><hkern u1="D" u2="," k="82"/><hkern u1="E" u2="J" k="-123"/><hkern u1="F" u2="„" k="123"/><hkern u1="F" u2="‚" k="123"/><hkern u1="F" u2="Ã…" k="41"/><hkern u1="F" u2="Ä" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="Â" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="À" k="41"/><hkern u1="F" u2="A" k="41"/><hkern u1="F" u2="?" k="-41"/><hkern u1="F" u2="." k="123"/><hkern u1="F" u2="," k="123"/><hkern u1="K" u2="Å’" k="41"/><hkern u1="K" u2="Ø" k="41"/><hkern u1="K" u2="Ö" k="41"/><hkern u1="K" u2="Õ" k="41"/><hkern u1="K" u2="Ô" k="41"/><hkern u1="K" u2="Ó" k="41"/><hkern u1="K" u2="Ã’" k="41"/><hkern u1="K" u2="Ç" k="41"/><hkern u1="K" u2="Q" k="41"/><hkern u1="K" u2="O" k="41"/><hkern u1="K" u2="G" k="41"/><hkern u1="K" u2="C" k="41"/><hkern u1="L" u2="â€" k="164"/><hkern u1="L" u2="’" k="164"/><hkern u1="L" u2="Ÿ" k="61"/><hkern u1="L" u2="Å’" k="41"/><hkern u1="L" u2="Ã" k="61"/><hkern u1="L" u2="Ãœ" k="20"/><hkern u1="L" u2="Û" k="20"/><hkern u1="L" u2="Ú" k="20"/><hkern u1="L" u2="Ù" k="20"/><hkern u1="L" u2="Ø" k="41"/><hkern u1="L" u2="Ö" k="41"/><hkern u1="L" u2="Õ" k="41"/><hkern u1="L" u2="Ô" k="41"/><hkern u1="L" u2="Ó" k="41"/><hkern u1="L" u2="Ã’" k="41"/><hkern u1="L" u2="Ç" k="41"/><hkern u1="L" u2="Y" k="61"/><hkern u1="L" u2="W" k="41"/><hkern u1="L" u2="V" k="41"/><hkern u1="L" u2="U" k="20"/><hkern u1="L" u2="T" k="41"/><hkern u1="L" u2="Q" k="41"/><hkern u1="L" u2="O" k="41"/><hkern u1="L" u2="G" k="41"/><hkern u1="L" u2="C" k="41"/><hkern u1="L" u2="'" k="164"/><hkern u1="L" u2="&quot;" k="164"/><hkern u1="O" u2="„" k="82"/><hkern u1="O" u2="‚" k="82"/><hkern u1="O" u2="Ÿ" k="20"/><hkern u1="O" u2="Ã" k="20"/><hkern u1="O" u2="Ã…" k="41"/><hkern u1="O" u2="Ä" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="Â" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="À" k="41"/><hkern u1="O" u2="Z" k="20"/><hkern u1="O" u2="Y" k="20"/><hkern u1="O" u2="X" k="41"/><hkern u1="O" u2="W" k="20"/><hkern u1="O" u2="V" k="20"/><hkern u1="O" u2="T" k="61"/><hkern u1="O" u2="A" k="41"/><hkern u1="O" u2="." k="82"/><hkern u1="O" u2="," k="82"/><hkern u1="P" u2="„" k="266"/><hkern u1="P" u2="‚" k="266"/><hkern u1="P" u2="Ã…" k="102"/><hkern u1="P" u2="Ä" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="Â" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="À" k="102"/><hkern u1="P" u2="Z" k="20"/><hkern u1="P" u2="X" k="41"/><hkern u1="P" u2="A" k="102"/><hkern u1="P" u2="." k="266"/><hkern u1="P" u2="," k="266"/><hkern u1="Q" u2="„" k="82"/><hkern u1="Q" u2="‚" k="82"/><hkern u1="Q" u2="Ÿ" k="20"/><hkern u1="Q" u2="Ã" k="20"/><hkern u1="Q" u2="Ã…" k="41"/><hkern u1="Q" u2="Ä" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="Â" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="À" k="41"/><hkern u1="Q" u2="Z" k="20"/><hkern u1="Q" u2="Y" k="20"/><hkern u1="Q" u2="X" k="41"/><hkern u1="Q" u2="W" k="20"/><hkern u1="Q" u2="V" k="20"/><hkern u1="Q" u2="T" k="61"/><hkern u1="Q" u2="A" k="41"/><hkern u1="Q" u2="." k="82"/><hkern u1="Q" u2="," k="82"/><hkern u1="T" u2="„" k="123"/><hkern u1="T" u2="‚" k="123"/><hkern u1="T" u2="—" k="82"/><hkern u1="T" u2="–" k="82"/><hkern u1="T" u2="Å“" k="143"/><hkern u1="T" u2="Å’" k="41"/><hkern u1="T" u2="ý" k="41"/><hkern u1="T" u2="ü" k="102"/><hkern u1="T" u2="û" k="102"/><hkern u1="T" u2="ú" k="102"/><hkern u1="T" u2="ù" k="102"/><hkern u1="T" u2="ø" k="143"/><hkern u1="T" u2="ö" k="143"/><hkern u1="T" u2="õ" k="143"/><hkern u1="T" u2="ô" k="143"/><hkern u1="T" u2="ó" k="143"/><hkern u1="T" u2="ò" k="143"/><hkern u1="T" u2="ë" k="143"/><hkern u1="T" u2="ê" k="143"/><hkern u1="T" u2="é" k="143"/><hkern u1="T" u2="è" k="143"/><hkern u1="T" u2="ç" k="143"/><hkern u1="T" u2="æ" k="164"/><hkern u1="T" u2="Ã¥" k="164"/><hkern u1="T" u2="ä" k="164"/><hkern u1="T" u2="ã" k="164"/><hkern u1="T" u2="â" k="164"/><hkern u1="T" u2="á" k="164"/><hkern u1="T" u2="à " k="143"/><hkern u1="T" u2="Ø" k="41"/><hkern u1="T" u2="Ö" k="41"/><hkern u1="T" u2="Õ" k="41"/><hkern u1="T" u2="Ô" k="41"/><hkern u1="T" u2="Ó" k="41"/><hkern u1="T" u2="Ã’" k="41"/><hkern u1="T" u2="Ç" k="41"/><hkern u1="T" u2="Ã…" k="143"/><hkern u1="T" u2="Ä" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="Â" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="À" k="143"/><hkern u1="T" u2="z" k="82"/><hkern u1="T" u2="y" k="41"/><hkern u1="T" u2="x" k="41"/><hkern u1="T" u2="w" k="41"/><hkern u1="T" u2="v" k="41"/><hkern u1="T" u2="u" k="102"/><hkern u1="T" u2="s" k="123"/><hkern u1="T" u2="r" k="102"/><hkern u1="T" u2="q" k="143"/><hkern u1="T" u2="p" k="102"/><hkern u1="T" u2="o" k="143"/><hkern u1="T" u2="n" k="102"/><hkern u1="T" u2="m" k="102"/><hkern u1="T" u2="g" k="143"/><hkern u1="T" u2="e" k="143"/><hkern u1="T" u2="d" k="143"/><hkern u1="T" u2="c" k="143"/><hkern u1="T" u2="a" k="164"/><hkern u1="T" u2="T" k="-41"/><hkern u1="T" u2="Q" k="41"/><hkern u1="T" u2="O" k="41"/><hkern u1="T" u2="G" k="41"/><hkern u1="T" u2="C" k="41"/><hkern u1="T" u2="A" k="143"/><hkern u1="T" u2="?" k="-41"/><hkern u1="T" u2="." k="123"/><hkern u1="T" u2="-" k="82"/><hkern u1="T" u2="," k="123"/><hkern u1="U" u2="„" k="41"/><hkern u1="U" u2="‚" k="41"/><hkern u1="U" u2="Ã…" k="20"/><hkern u1="U" u2="Ä" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="Â" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="À" k="20"/><hkern u1="U" u2="A" k="20"/><hkern u1="U" u2="." k="41"/><hkern u1="U" u2="," k="41"/><hkern u1="V" u2="„" k="102"/><hkern u1="V" u2="‚" k="102"/><hkern u1="V" u2="Å“" k="41"/><hkern u1="V" u2="Å’" k="20"/><hkern u1="V" u2="ü" k="20"/><hkern u1="V" u2="û" k="20"/><hkern u1="V" u2="ú" k="20"/><hkern u1="V" u2="ù" k="20"/><hkern u1="V" u2="ø" k="41"/><hkern u1="V" u2="ö" k="41"/><hkern u1="V" u2="õ" k="41"/><hkern u1="V" u2="ô" k="41"/><hkern u1="V" u2="ó" k="41"/><hkern u1="V" u2="ò" k="41"/><hkern u1="V" u2="ë" k="41"/><hkern u1="V" u2="ê" k="41"/><hkern u1="V" u2="é" k="41"/><hkern u1="V" u2="è" k="41"/><hkern u1="V" u2="ç" k="41"/><hkern u1="V" u2="æ" k="41"/><hkern u1="V" u2="Ã¥" k="41"/><hkern u1="V" u2="ä" k="41"/><hkern u1="V" u2="ã" k="41"/><hkern u1="V" u2="â" k="41"/><hkern u1="V" u2="á" k="41"/><hkern u1="V" u2="à " k="41"/><hkern u1="V" u2="Ø" k="20"/><hkern u1="V" u2="Ö" k="20"/><hkern u1="V" u2="Õ" k="20"/><hkern u1="V" u2="Ô" k="20"/><hkern u1="V" u2="Ó" k="20"/><hkern u1="V" u2="Ã’" k="20"/><hkern u1="V" u2="Ç" k="20"/><hkern u1="V" u2="Ã…" k="82"/><hkern u1="V" u2="Ä" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="Â" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="À" k="82"/><hkern u1="V" u2="u" k="20"/><hkern u1="V" u2="s" k="20"/><hkern u1="V" u2="r" k="20"/><hkern u1="V" u2="q" k="41"/><hkern u1="V" u2="p" k="20"/><hkern u1="V" u2="o" k="41"/><hkern u1="V" u2="n" k="20"/><hkern u1="V" u2="m" k="20"/><hkern u1="V" u2="g" k="20"/><hkern u1="V" u2="e" k="41"/><hkern u1="V" u2="d" k="41"/><hkern u1="V" u2="c" k="41"/><hkern u1="V" u2="a" k="41"/><hkern u1="V" u2="Q" k="20"/><hkern u1="V" u2="O" k="20"/><hkern u1="V" u2="G" k="20"/><hkern u1="V" u2="C" k="20"/><hkern u1="V" u2="A" k="82"/><hkern u1="V" u2="?" k="-41"/><hkern u1="V" u2="." k="102"/><hkern u1="V" u2="," k="102"/><hkern u1="W" u2="„" k="102"/><hkern u1="W" u2="‚" k="102"/><hkern u1="W" u2="Å“" k="41"/><hkern u1="W" u2="Å’" k="20"/><hkern u1="W" u2="ü" k="20"/><hkern u1="W" u2="û" k="20"/><hkern u1="W" u2="ú" k="20"/><hkern u1="W" u2="ù" k="20"/><hkern u1="W" u2="ø" k="41"/><hkern u1="W" u2="ö" k="41"/><hkern u1="W" u2="õ" k="41"/><hkern u1="W" u2="ô" k="41"/><hkern u1="W" u2="ó" k="41"/><hkern u1="W" u2="ò" k="41"/><hkern u1="W" u2="ë" k="41"/><hkern u1="W" u2="ê" k="41"/><hkern u1="W" u2="é" k="41"/><hkern u1="W" u2="è" k="41"/><hkern u1="W" u2="ç" k="41"/><hkern u1="W" u2="æ" k="41"/><hkern u1="W" u2="Ã¥" k="41"/><hkern u1="W" u2="ä" k="41"/><hkern u1="W" u2="ã" k="41"/><hkern u1="W" u2="â" k="41"/><hkern u1="W" u2="á" k="41"/><hkern u1="W" u2="à " k="41"/><hkern u1="W" u2="Ø" k="20"/><hkern u1="W" u2="Ö" k="20"/><hkern u1="W" u2="Õ" k="20"/><hkern u1="W" u2="Ô" k="20"/><hkern u1="W" u2="Ó" k="20"/><hkern u1="W" u2="Ã’" k="20"/><hkern u1="W" u2="Ç" k="20"/><hkern u1="W" u2="Ã…" k="82"/><hkern u1="W" u2="Ä" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="Â" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="À" k="82"/><hkern u1="W" u2="u" k="20"/><hkern u1="W" u2="s" k="20"/><hkern u1="W" u2="r" k="20"/><hkern u1="W" u2="q" k="41"/><hkern u1="W" u2="p" k="20"/><hkern u1="W" u2="o" k="41"/><hkern u1="W" u2="n" k="20"/><hkern u1="W" u2="m" k="20"/><hkern u1="W" u2="g" k="20"/><hkern u1="W" u2="e" k="41"/><hkern u1="W" u2="d" k="41"/><hkern u1="W" u2="c" k="41"/><hkern u1="W" u2="a" k="41"/><hkern u1="W" u2="Q" k="20"/><hkern u1="W" u2="O" k="20"/><hkern u1="W" u2="G" k="20"/><hkern u1="W" u2="C" k="20"/><hkern u1="W" u2="A" k="82"/><hkern u1="W" u2="?" k="-41"/><hkern u1="W" u2="." k="102"/><hkern u1="W" u2="," k="102"/><hkern u1="X" u2="Å’" k="41"/><hkern u1="X" u2="Ø" k="41"/><hkern u1="X" u2="Ö" k="41"/><hkern u1="X" u2="Õ" k="41"/><hkern u1="X" u2="Ô" k="41"/><hkern u1="X" u2="Ó" k="41"/><hkern u1="X" u2="Ã’" k="41"/><hkern u1="X" u2="Ç" k="41"/><hkern u1="X" u2="Q" k="41"/><hkern u1="X" u2="O" k="41"/><hkern u1="X" u2="G" k="41"/><hkern u1="X" u2="C" k="41"/><hkern u1="Y" u2="„" k="123"/><hkern u1="Y" u2="‚" k="123"/><hkern u1="Y" u2="Å“" k="102"/><hkern u1="Y" u2="Å’" k="41"/><hkern u1="Y" u2="ü" k="61"/><hkern u1="Y" u2="û" k="61"/><hkern u1="Y" u2="ú" k="61"/><hkern u1="Y" u2="ù" k="61"/><hkern u1="Y" u2="ø" k="102"/><hkern u1="Y" u2="ö" k="102"/><hkern u1="Y" u2="õ" k="102"/><hkern u1="Y" u2="ô" k="102"/><hkern u1="Y" u2="ó" k="102"/><hkern u1="Y" u2="ò" k="102"/><hkern u1="Y" u2="ë" k="102"/><hkern u1="Y" u2="ê" k="102"/><hkern u1="Y" u2="é" k="102"/><hkern u1="Y" u2="è" k="102"/><hkern u1="Y" u2="ç" k="102"/><hkern u1="Y" u2="æ" k="102"/><hkern u1="Y" u2="Ã¥" k="102"/><hkern u1="Y" u2="ä" k="102"/><hkern u1="Y" u2="ã" k="102"/><hkern u1="Y" u2="â" k="102"/><hkern u1="Y" u2="á" k="102"/><hkern u1="Y" u2="à " k="102"/><hkern u1="Y" u2="Ø" k="41"/><hkern u1="Y" u2="Ö" k="41"/><hkern u1="Y" u2="Õ" k="41"/><hkern u1="Y" u2="Ô" k="41"/><hkern u1="Y" u2="Ó" k="41"/><hkern u1="Y" u2="Ã’" k="41"/><hkern u1="Y" u2="Ç" k="41"/><hkern u1="Y" u2="Ã…" k="123"/><hkern u1="Y" u2="Ä" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="Â" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="À" k="123"/><hkern u1="Y" u2="z" k="41"/><hkern u1="Y" u2="u" k="61"/><hkern u1="Y" u2="s" k="82"/><hkern u1="Y" u2="r" k="61"/><hkern u1="Y" u2="q" k="102"/><hkern u1="Y" u2="p" k="61"/><hkern u1="Y" u2="o" k="102"/><hkern u1="Y" u2="n" k="61"/><hkern u1="Y" u2="m" k="61"/><hkern u1="Y" u2="g" k="41"/><hkern u1="Y" u2="e" k="102"/><hkern u1="Y" u2="d" k="102"/><hkern u1="Y" u2="c" k="102"/><hkern u1="Y" u2="a" k="102"/><hkern u1="Y" u2="Q" k="41"/><hkern u1="Y" u2="O" k="41"/><hkern u1="Y" u2="G" k="41"/><hkern u1="Y" u2="C" k="41"/><hkern u1="Y" u2="A" k="123"/><hkern u1="Y" u2="?" k="-41"/><hkern u1="Y" u2="." k="123"/><hkern u1="Y" u2="," k="123"/><hkern u1="Z" u2="Å’" k="20"/><hkern u1="Z" u2="Ø" k="20"/><hkern u1="Z" u2="Ö" k="20"/><hkern u1="Z" u2="Õ" k="20"/><hkern u1="Z" u2="Ô" k="20"/><hkern u1="Z" u2="Ó" k="20"/><hkern u1="Z" u2="Ã’" k="20"/><hkern u1="Z" u2="Ç" k="20"/><hkern u1="Z" u2="Q" k="20"/><hkern u1="Z" u2="O" k="20"/><hkern u1="Z" u2="G" k="20"/><hkern u1="Z" u2="C" k="20"/><hkern u1="[" u2="J" k="-184"/><hkern u1="a" u2="â€" k="20"/><hkern u1="a" u2="’" k="20"/><hkern u1="a" u2="'" k="20"/><hkern u1="a" u2="&quot;" k="20"/><hkern u1="b" u2="â€" k="20"/><hkern u1="b" u2="’" k="20"/><hkern u1="b" u2="ý" k="41"/><hkern u1="b" u2="z" k="20"/><hkern u1="b" u2="y" k="41"/><hkern u1="b" u2="x" k="41"/><hkern u1="b" u2="w" k="41"/><hkern u1="b" u2="v" k="41"/><hkern u1="b" u2="'" k="20"/><hkern u1="b" u2="&quot;" k="20"/><hkern u1="c" u2="â€" k="-41"/><hkern u1="c" u2="’" k="-41"/><hkern u1="c" u2="'" k="-41"/><hkern u1="c" u2="&quot;" k="-41"/><hkern u1="e" u2="â€" k="20"/><hkern u1="e" u2="’" k="20"/><hkern u1="e" u2="ý" k="41"/><hkern u1="e" u2="z" k="20"/><hkern u1="e" u2="y" k="41"/><hkern u1="e" u2="x" k="41"/><hkern u1="e" u2="w" k="41"/><hkern u1="e" u2="v" k="41"/><hkern u1="e" u2="'" k="20"/><hkern u1="e" u2="&quot;" k="20"/><hkern u1="f" u2="â€" k="-123"/><hkern u1="f" u2="’" k="-123"/><hkern u1="f" u2="'" k="-123"/><hkern u1="f" u2="&quot;" k="-123"/><hkern u1="h" u2="â€" k="20"/><hkern u1="h" u2="’" k="20"/><hkern u1="h" u2="'" k="20"/><hkern u1="h" u2="&quot;" k="20"/><hkern u1="k" u2="Å“" k="41"/><hkern u1="k" u2="ø" k="41"/><hkern u1="k" u2="ö" k="41"/><hkern u1="k" u2="õ" k="41"/><hkern u1="k" u2="ô" k="41"/><hkern u1="k" u2="ó" k="41"/><hkern u1="k" u2="ò" k="41"/><hkern u1="k" u2="ë" k="41"/><hkern u1="k" u2="ê" k="41"/><hkern u1="k" u2="é" k="41"/><hkern u1="k" u2="è" k="41"/><hkern u1="k" u2="ç" k="41"/><hkern u1="k" u2="à " k="41"/><hkern u1="k" u2="q" k="41"/><hkern u1="k" u2="o" k="41"/><hkern u1="k" u2="e" k="41"/><hkern u1="k" u2="d" k="41"/><hkern u1="k" u2="c" k="41"/><hkern u1="m" u2="â€" k="20"/><hkern u1="m" u2="’" k="20"/><hkern u1="m" u2="'" k="20"/><hkern u1="m" u2="&quot;" k="20"/><hkern u1="n" u2="â€" k="20"/><hkern u1="n" u2="’" k="20"/><hkern u1="n" u2="'" k="20"/><hkern u1="n" u2="&quot;" k="20"/><hkern u1="o" u2="â€" k="20"/><hkern u1="o" u2="’" k="20"/><hkern u1="o" u2="ý" k="41"/><hkern u1="o" u2="z" k="20"/><hkern u1="o" u2="y" k="41"/><hkern u1="o" u2="x" k="41"/><hkern u1="o" u2="w" k="41"/><hkern u1="o" u2="v" k="41"/><hkern u1="o" u2="'" k="20"/><hkern u1="o" u2="&quot;" k="20"/><hkern u1="p" u2="â€" k="20"/><hkern u1="p" u2="’" k="20"/><hkern u1="p" u2="ý" k="41"/><hkern u1="p" u2="z" k="20"/><hkern u1="p" u2="y" k="41"/><hkern u1="p" u2="x" k="41"/><hkern u1="p" u2="w" k="41"/><hkern u1="p" u2="v" k="41"/><hkern u1="p" u2="'" k="20"/><hkern u1="p" u2="&quot;" k="20"/><hkern u1="r" u2="â€" k="-82"/><hkern u1="r" u2="’" k="-82"/><hkern u1="r" u2="Å“" k="41"/><hkern u1="r" u2="ø" k="41"/><hkern u1="r" u2="ö" k="41"/><hkern u1="r" u2="õ" k="41"/><hkern u1="r" u2="ô" k="41"/><hkern u1="r" u2="ó" k="41"/><hkern u1="r" u2="ò" k="41"/><hkern u1="r" u2="ë" k="41"/><hkern u1="r" u2="ê" k="41"/><hkern u1="r" u2="é" k="41"/><hkern u1="r" u2="è" k="41"/><hkern u1="r" u2="ç" k="41"/><hkern u1="r" u2="æ" k="41"/><hkern u1="r" u2="Ã¥" k="41"/><hkern u1="r" u2="ä" k="41"/><hkern u1="r" u2="ã" k="41"/><hkern u1="r" u2="â" k="41"/><hkern u1="r" u2="á" k="41"/><hkern u1="r" u2="à " k="41"/><hkern u1="r" u2="q" k="41"/><hkern u1="r" u2="o" k="41"/><hkern u1="r" u2="g" k="20"/><hkern u1="r" u2="e" k="41"/><hkern u1="r" u2="d" k="41"/><hkern u1="r" u2="c" k="41"/><hkern u1="r" u2="a" k="41"/><hkern u1="r" u2="'" k="-82"/><hkern u1="r" u2="&quot;" k="-82"/><hkern u1="t" u2="â€" k="-41"/><hkern u1="t" u2="’" k="-41"/><hkern u1="t" u2="'" k="-41"/><hkern u1="t" u2="&quot;" k="-41"/><hkern u1="v" u2="„" k="82"/><hkern u1="v" u2="â€" k="-82"/><hkern u1="v" u2="‚" k="82"/><hkern u1="v" u2="’" k="-82"/><hkern u1="v" u2="?" k="-41"/><hkern u1="v" u2="." k="82"/><hkern u1="v" u2="," k="82"/><hkern u1="v" u2="'" k="-82"/><hkern u1="v" u2="&quot;" k="-82"/><hkern u1="w" u2="„" k="82"/><hkern u1="w" u2="â€" k="-82"/><hkern u1="w" u2="‚" k="82"/><hkern u1="w" u2="’" k="-82"/><hkern u1="w" u2="?" k="-41"/><hkern u1="w" u2="." k="82"/><hkern u1="w" u2="," k="82"/><hkern u1="w" u2="'" k="-82"/><hkern u1="w" u2="&quot;" k="-82"/><hkern u1="x" u2="Å“" k="41"/><hkern u1="x" u2="ø" k="41"/><hkern u1="x" u2="ö" k="41"/><hkern u1="x" u2="õ" k="41"/><hkern u1="x" u2="ô" k="41"/><hkern u1="x" u2="ó" k="41"/><hkern u1="x" u2="ò" k="41"/><hkern u1="x" u2="ë" k="41"/><hkern u1="x" u2="ê" k="41"/><hkern u1="x" u2="é" k="41"/><hkern u1="x" u2="è" k="41"/><hkern u1="x" u2="ç" k="41"/><hkern u1="x" u2="à " k="41"/><hkern u1="x" u2="q" k="41"/><hkern u1="x" u2="o" k="41"/><hkern u1="x" u2="e" k="41"/><hkern u1="x" u2="d" k="41"/><hkern u1="x" u2="c" k="41"/><hkern u1="y" u2="„" k="82"/><hkern u1="y" u2="â€" k="-82"/><hkern u1="y" u2="‚" k="82"/><hkern u1="y" u2="’" k="-82"/><hkern u1="y" u2="?" k="-41"/><hkern u1="y" u2="." k="82"/><hkern u1="y" u2="," k="82"/><hkern u1="y" u2="'" k="-82"/><hkern u1="y" u2="&quot;" k="-82"/><hkern u1="{" u2="J" k="-184"/><hkern u1="À" u2="â€" k="143"/><hkern u1="À" u2="’" k="143"/><hkern u1="À" u2="Ÿ" k="123"/><hkern u1="À" u2="Å’" k="41"/><hkern u1="À" u2="Ã" k="123"/><hkern u1="À" u2="Ø" k="41"/><hkern u1="À" u2="Ö" k="41"/><hkern u1="À" u2="Õ" k="41"/><hkern u1="À" u2="Ô" k="41"/><hkern u1="À" u2="Ó" k="41"/><hkern u1="À" u2="Ã’" k="41"/><hkern u1="À" u2="Ç" k="41"/><hkern u1="À" u2="Y" k="123"/><hkern u1="À" u2="W" k="82"/><hkern u1="À" u2="V" k="82"/><hkern u1="À" u2="T" k="143"/><hkern u1="À" u2="Q" k="41"/><hkern u1="À" u2="O" k="41"/><hkern u1="À" u2="J" k="-266"/><hkern u1="À" u2="G" k="41"/><hkern u1="À" u2="C" k="41"/><hkern u1="À" u2="'" k="143"/><hkern u1="À" u2="&quot;" k="143"/><hkern u1="Ã" u2="â€" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&quot;" k="143"/><hkern u1="Â" u2="â€" k="143"/><hkern u1="Â" u2="’" k="143"/><hkern u1="Â" u2="Ÿ" k="123"/><hkern u1="Â" u2="Å’" k="41"/><hkern u1="Â" u2="Ã" k="123"/><hkern u1="Â" u2="Ø" k="41"/><hkern u1="Â" u2="Ö" k="41"/><hkern u1="Â" u2="Õ" k="41"/><hkern u1="Â" u2="Ô" k="41"/><hkern u1="Â" u2="Ó" k="41"/><hkern u1="Â" u2="Ã’" k="41"/><hkern u1="Â" u2="Ç" k="41"/><hkern u1="Â" u2="Y" k="123"/><hkern u1="Â" u2="W" k="82"/><hkern u1="Â" u2="V" k="82"/><hkern u1="Â" u2="T" k="143"/><hkern u1="Â" u2="Q" k="41"/><hkern u1="Â" u2="O" k="41"/><hkern u1="Â" u2="J" k="-266"/><hkern u1="Â" u2="G" k="41"/><hkern u1="Â" u2="C" k="41"/><hkern u1="Â" u2="'" k="143"/><hkern u1="Â" u2="&quot;" k="143"/><hkern u1="Ã" u2="â€" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&quot;" k="143"/><hkern u1="Ä" u2="â€" k="143"/><hkern u1="Ä" u2="’" k="143"/><hkern u1="Ä" u2="Ÿ" k="123"/><hkern u1="Ä" u2="Å’" k="41"/><hkern u1="Ä" u2="Ã" k="123"/><hkern u1="Ä" u2="Ø" k="41"/><hkern u1="Ä" u2="Ö" k="41"/><hkern u1="Ä" u2="Õ" k="41"/><hkern u1="Ä" u2="Ô" k="41"/><hkern u1="Ä" u2="Ó" k="41"/><hkern u1="Ä" u2="Ã’" k="41"/><hkern u1="Ä" u2="Ç" k="41"/><hkern u1="Ä" u2="Y" k="123"/><hkern u1="Ä" u2="W" k="82"/><hkern u1="Ä" u2="V" k="82"/><hkern u1="Ä" u2="T" k="143"/><hkern u1="Ä" u2="Q" k="41"/><hkern u1="Ä" u2="O" k="41"/><hkern u1="Ä" u2="J" k="-266"/><hkern u1="Ä" u2="G" k="41"/><hkern u1="Ä" u2="C" k="41"/><hkern u1="Ä" u2="'" k="143"/><hkern u1="Ä" u2="&quot;" k="143"/><hkern u1="Ã…" u2="â€" k="143"/><hkern u1="Ã…" u2="’" k="143"/><hkern u1="Ã…" u2="Ÿ" k="123"/><hkern u1="Ã…" u2="Å’" k="41"/><hkern u1="Ã…" u2="Ã" k="123"/><hkern u1="Ã…" u2="Ø" k="41"/><hkern u1="Ã…" u2="Ö" k="41"/><hkern u1="Ã…" u2="Õ" k="41"/><hkern u1="Ã…" u2="Ô" k="41"/><hkern u1="Ã…" u2="Ó" k="41"/><hkern u1="Ã…" u2="Ã’" k="41"/><hkern u1="Ã…" u2="Ç" k="41"/><hkern u1="Ã…" u2="Y" k="123"/><hkern u1="Ã…" u2="W" k="82"/><hkern u1="Ã…" u2="V" k="82"/><hkern u1="Ã…" u2="T" k="143"/><hkern u1="Ã…" u2="Q" k="41"/><hkern u1="Ã…" u2="O" k="41"/><hkern u1="Ã…" u2="J" k="-266"/><hkern u1="Ã…" u2="G" k="41"/><hkern u1="Ã…" u2="C" k="41"/><hkern u1="Ã…" u2="'" k="143"/><hkern u1="Ã…" u2="&quot;" k="143"/><hkern u1="Æ" u2="J" k="-123"/><hkern u1="Ç" u2="Å’" k="41"/><hkern u1="Ç" u2="Ø" k="41"/><hkern u1="Ç" u2="Ö" k="41"/><hkern u1="Ç" u2="Õ" k="41"/><hkern u1="Ç" u2="Ô" k="41"/><hkern u1="Ç" u2="Ó" k="41"/><hkern u1="Ç" u2="Ã’" k="41"/><hkern u1="Ç" u2="Ç" k="41"/><hkern u1="Ç" u2="Q" k="41"/><hkern u1="Ç" u2="O" k="41"/><hkern u1="Ç" u2="G" k="41"/><hkern u1="Ç" u2="C" k="41"/><hkern u1="È" u2="J" k="-123"/><hkern u1="É" u2="J" k="-123"/><hkern u1="Ê" u2="J" k="-123"/><hkern u1="Ë" u2="J" k="-123"/><hkern u1="Ã" u2="„" k="82"/><hkern u1="Ã" u2="‚" k="82"/><hkern u1="Ã" u2="Ÿ" k="20"/><hkern u1="Ã" u2="Ã" k="20"/><hkern u1="Ã" u2="Ã…" k="41"/><hkern u1="Ã" u2="Ä" k="41"/><hkern u1="Ã" u2="Ã" k="41"/><hkern u1="Ã" u2="Â" k="41"/><hkern u1="Ã" u2="Ã" k="41"/><hkern u1="Ã" u2="À" k="41"/><hkern u1="Ã" u2="Z" k="20"/><hkern u1="Ã" u2="Y" k="20"/><hkern u1="Ã" u2="X" k="41"/><hkern u1="Ã" u2="W" k="20"/><hkern u1="Ã" u2="V" k="20"/><hkern u1="Ã" u2="T" k="61"/><hkern u1="Ã" u2="A" k="41"/><hkern u1="Ã" u2="." k="82"/><hkern u1="Ã" u2="," k="82"/><hkern u1="Ã’" u2="„" k="82"/><hkern u1="Ã’" u2="‚" k="82"/><hkern u1="Ã’" u2="Ÿ" k="20"/><hkern u1="Ã’" u2="Ã" k="20"/><hkern u1="Ã’" u2="Ã…" k="41"/><hkern u1="Ã’" u2="Ä" k="41"/><hkern u1="Ã’" u2="Ã" k="41"/><hkern u1="Ã’" u2="Â" k="41"/><hkern u1="Ã’" u2="Ã" k="41"/><hkern u1="Ã’" u2="À" k="41"/><hkern u1="Ã’" u2="Z" k="20"/><hkern u1="Ã’" u2="Y" k="20"/><hkern u1="Ã’" u2="X" k="41"/><hkern u1="Ã’" u2="W" k="20"/><hkern u1="Ã’" u2="V" k="20"/><hkern u1="Ã’" u2="T" k="61"/><hkern u1="Ã’" u2="A" k="41"/><hkern u1="Ã’" u2="." k="82"/><hkern u1="Ã’" u2="," k="82"/><hkern u1="Ó" u2="„" k="82"/><hkern u1="Ó" u2="‚" k="82"/><hkern u1="Ó" u2="Ÿ" k="20"/><hkern u1="Ó" u2="Ã" k="20"/><hkern u1="Ó" u2="Ã…" k="41"/><hkern u1="Ó" u2="Ä" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="Â" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="À" k="41"/><hkern u1="Ó" u2="Z" k="20"/><hkern u1="Ó" u2="Y" k="20"/><hkern u1="Ó" u2="X" k="41"/><hkern u1="Ó" u2="W" k="20"/><hkern u1="Ó" u2="V" k="20"/><hkern u1="Ó" u2="T" k="61"/><hkern u1="Ó" u2="A" k="41"/><hkern u1="Ó" u2="." k="82"/><hkern u1="Ó" u2="," k="82"/><hkern u1="Ô" u2="„" k="82"/><hkern u1="Ô" u2="‚" k="82"/><hkern u1="Ô" u2="Ÿ" k="20"/><hkern u1="Ô" u2="Ã" k="20"/><hkern u1="Ô" u2="Ã…" k="41"/><hkern u1="Ô" u2="Ä" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="Â" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="À" k="41"/><hkern u1="Ô" u2="Z" k="20"/><hkern u1="Ô" u2="Y" k="20"/><hkern u1="Ô" u2="X" k="41"/><hkern u1="Ô" u2="W" k="20"/><hkern u1="Ô" u2="V" k="20"/><hkern u1="Ô" u2="T" k="61"/><hkern u1="Ô" u2="A" k="41"/><hkern u1="Ô" u2="." k="82"/><hkern u1="Ô" u2="," k="82"/><hkern u1="Õ" u2="„" k="82"/><hkern u1="Õ" u2="‚" k="82"/><hkern u1="Õ" u2="Ÿ" k="20"/><hkern u1="Õ" u2="Ã" k="20"/><hkern u1="Õ" u2="Ã…" k="41"/><hkern u1="Õ" u2="Ä" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="Â" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="À" k="41"/><hkern u1="Õ" u2="Z" k="20"/><hkern u1="Õ" u2="Y" k="20"/><hkern u1="Õ" u2="X" k="41"/><hkern u1="Õ" u2="W" k="20"/><hkern u1="Õ" u2="V" k="20"/><hkern u1="Õ" u2="T" k="61"/><hkern u1="Õ" u2="A" k="41"/><hkern u1="Õ" u2="." k="82"/><hkern u1="Õ" u2="," k="82"/><hkern u1="Ö" u2="„" k="82"/><hkern u1="Ö" u2="‚" k="82"/><hkern u1="Ö" u2="Ÿ" k="20"/><hkern u1="Ö" u2="Ã" k="20"/><hkern u1="Ö" u2="Ã…" k="41"/><hkern u1="Ö" u2="Ä" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="Â" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="À" k="41"/><hkern u1="Ö" u2="Z" k="20"/><hkern u1="Ö" u2="Y" k="20"/><hkern u1="Ö" u2="X" k="41"/><hkern u1="Ö" u2="W" k="20"/><hkern u1="Ö" u2="V" k="20"/><hkern u1="Ö" u2="T" k="61"/><hkern u1="Ö" u2="A" k="41"/><hkern u1="Ö" u2="." k="82"/><hkern u1="Ö" u2="," k="82"/><hkern u1="Ø" u2="„" k="82"/><hkern u1="Ø" u2="‚" k="82"/><hkern u1="Ø" u2="Ÿ" k="20"/><hkern u1="Ø" u2="Ã" k="20"/><hkern u1="Ø" u2="Ã…" k="41"/><hkern u1="Ø" u2="Ä" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="Â" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="À" k="41"/><hkern u1="Ø" u2="Z" k="20"/><hkern u1="Ø" u2="Y" k="20"/><hkern u1="Ø" u2="X" k="41"/><hkern u1="Ø" u2="W" k="20"/><hkern u1="Ø" u2="V" k="20"/><hkern u1="Ø" u2="T" k="61"/><hkern u1="Ø" u2="A" k="41"/><hkern u1="Ø" u2="." k="82"/><hkern u1="Ø" u2="," k="82"/><hkern u1="Ù" u2="„" k="41"/><hkern u1="Ù" u2="‚" k="41"/><hkern u1="Ù" u2="Ã…" k="20"/><hkern u1="Ù" u2="Ä" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="Â" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="À" k="20"/><hkern u1="Ù" u2="A" k="20"/><hkern u1="Ù" u2="." k="41"/><hkern u1="Ù" u2="," k="41"/><hkern u1="Ú" u2="„" k="41"/><hkern u1="Ú" u2="‚" k="41"/><hkern u1="Ú" u2="Ã…" k="20"/><hkern u1="Ú" u2="Ä" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="Â" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="À" k="20"/><hkern u1="Ú" u2="A" k="20"/><hkern u1="Ú" u2="." k="41"/><hkern u1="Ú" u2="," k="41"/><hkern u1="Û" u2="„" k="41"/><hkern u1="Û" u2="‚" k="41"/><hkern u1="Û" u2="Ã…" k="20"/><hkern u1="Û" u2="Ä" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="Â" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="À" k="20"/><hkern u1="Û" u2="A" k="20"/><hkern u1="Û" u2="." k="41"/><hkern u1="Û" u2="," k="41"/><hkern u1="Ãœ" u2="„" k="41"/><hkern u1="Ãœ" u2="‚" k="41"/><hkern u1="Ãœ" u2="Ã…" k="20"/><hkern u1="Ãœ" u2="Ä" k="20"/><hkern u1="Ãœ" u2="Ã" k="20"/><hkern u1="Ãœ" u2="Â" k="20"/><hkern u1="Ãœ" u2="Ã" k="20"/><hkern u1="Ãœ" u2="À" k="20"/><hkern u1="Ãœ" u2="A" k="20"/><hkern u1="Ãœ" u2="." k="41"/><hkern u1="Ãœ" u2="," k="41"/><hkern u1="Ã" u2="„" k="123"/><hkern u1="Ã" u2="‚" k="123"/><hkern u1="Ã" u2="Å“" k="102"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="ü" k="61"/><hkern u1="Ã" u2="û" k="61"/><hkern u1="Ã" u2="ú" k="61"/><hkern u1="Ã" u2="ù" k="61"/><hkern u1="Ã" u2="ø" k="102"/><hkern u1="Ã" u2="ö" k="102"/><hkern u1="Ã" u2="õ" k="102"/><hkern u1="Ã" u2="ô" k="102"/><hkern u1="Ã" u2="ó" k="102"/><hkern u1="Ã" u2="ò" k="102"/><hkern u1="Ã" u2="ë" k="102"/><hkern u1="Ã" u2="ê" k="102"/><hkern u1="Ã" u2="é" k="102"/><hkern u1="Ã" u2="è" k="102"/><hkern u1="Ã" u2="ç" k="102"/><hkern u1="Ã" u2="æ" k="102"/><hkern u1="Ã" u2="Ã¥" k="102"/><hkern u1="Ã" u2="ä" k="102"/><hkern u1="Ã" u2="ã" k="102"/><hkern u1="Ã" u2="â" k="102"/><hkern u1="Ã" u2="á" k="102"/><hkern u1="Ã" u2="à " k="102"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Ã…" k="123"/><hkern u1="Ã" u2="Ä" k="123"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Â" k="123"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="À" k="123"/><hkern u1="Ã" u2="z" k="41"/><hkern u1="Ã" u2="u" k="61"/><hkern u1="Ã" u2="s" k="82"/><hkern u1="Ã" u2="r" k="61"/><hkern u1="Ã" u2="q" k="102"/><hkern u1="Ã" u2="p" k="61"/><hkern u1="Ã" u2="o" k="102"/><hkern u1="Ã" u2="n" k="61"/><hkern u1="Ã" u2="m" k="61"/><hkern u1="Ã" u2="g" k="41"/><hkern u1="Ã" u2="e" k="102"/><hkern u1="Ã" u2="d" k="102"/><hkern u1="Ã" u2="c" k="102"/><hkern u1="Ã" u2="a" k="102"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="A" k="123"/><hkern u1="Ã" u2="?" k="-41"/><hkern u1="Ã" u2="." k="123"/><hkern u1="Ã" u2="," k="123"/><hkern u1="Þ" u2="„" k="266"/><hkern u1="Þ" u2="‚" k="266"/><hkern u1="Þ" u2="Ã…" k="102"/><hkern u1="Þ" u2="Ä" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="Â" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="À" k="102"/><hkern u1="Þ" u2="Z" k="20"/><hkern u1="Þ" u2="X" k="41"/><hkern u1="Þ" u2="A" k="102"/><hkern u1="Þ" u2="." k="266"/><hkern u1="Þ" u2="," k="266"/><hkern u1="à " u2="â€" k="20"/><hkern u1="à " u2="’" k="20"/><hkern u1="à " u2="'" k="20"/><hkern u1="à " u2="&quot;" k="20"/><hkern u1="á" u2="â€" k="20"/><hkern u1="á" u2="’" k="20"/><hkern u1="á" u2="'" k="20"/><hkern u1="á" u2="&quot;" k="20"/><hkern u1="â" u2="â€" k="20"/><hkern u1="â" u2="’" k="20"/><hkern u1="â" u2="'" k="20"/><hkern u1="â" u2="&quot;" k="20"/><hkern u1="ã" u2="â€" k="20"/><hkern u1="ã" u2="’" k="20"/><hkern u1="ã" u2="'" k="20"/><hkern u1="ã" u2="&quot;" k="20"/><hkern u1="ä" u2="â€" k="20"/><hkern u1="ä" u2="’" k="20"/><hkern u1="ä" u2="'" k="20"/><hkern u1="ä" u2="&quot;" k="20"/><hkern u1="Ã¥" u2="â€" k="20"/><hkern u1="Ã¥" u2="’" k="20"/><hkern u1="Ã¥" u2="'" k="20"/><hkern u1="Ã¥" u2="&quot;" k="20"/><hkern u1="è" u2="â€" k="20"/><hkern u1="è" u2="’" k="20"/><hkern u1="è" u2="ý" k="41"/><hkern u1="è" u2="z" k="20"/><hkern u1="è" u2="y" k="41"/><hkern u1="è" u2="x" k="41"/><hkern u1="è" u2="w" k="41"/><hkern u1="è" u2="v" k="41"/><hkern u1="è" u2="'" k="20"/><hkern u1="è" u2="&quot;" k="20"/><hkern u1="é" u2="â€" k="20"/><hkern u1="é" u2="’" k="20"/><hkern u1="é" u2="ý" k="41"/><hkern u1="é" u2="z" k="20"/><hkern u1="é" u2="y" k="41"/><hkern u1="é" u2="x" k="41"/><hkern u1="é" u2="w" k="41"/><hkern u1="é" u2="v" k="41"/><hkern u1="é" u2="'" k="20"/><hkern u1="é" u2="&quot;" k="20"/><hkern u1="ê" u2="â€" k="20"/><hkern u1="ê" u2="’" k="20"/><hkern u1="ê" u2="ý" k="41"/><hkern u1="ê" u2="z" k="20"/><hkern u1="ê" u2="y" k="41"/><hkern u1="ê" u2="x" k="41"/><hkern u1="ê" u2="w" k="41"/><hkern u1="ê" u2="v" k="41"/><hkern u1="ê" u2="'" k="20"/><hkern u1="ê" u2="&quot;" k="20"/><hkern u1="ë" u2="â€" k="20"/><hkern u1="ë" u2="’" k="20"/><hkern u1="ë" u2="ý" k="41"/><hkern u1="ë" u2="z" k="20"/><hkern u1="ë" u2="y" k="41"/><hkern u1="ë" u2="x" k="41"/><hkern u1="ë" u2="w" k="41"/><hkern u1="ë" u2="v" k="41"/><hkern u1="ë" u2="'" k="20"/><hkern u1="ë" u2="&quot;" k="20"/><hkern u1="ð" u2="â€" k="20"/><hkern u1="ð" u2="’" k="20"/><hkern u1="ð" u2="ý" k="41"/><hkern u1="ð" u2="z" k="20"/><hkern u1="ð" u2="y" k="41"/><hkern u1="ð" u2="x" k="41"/><hkern u1="ð" u2="w" k="41"/><hkern u1="ð" u2="v" k="41"/><hkern u1="ð" u2="'" k="20"/><hkern u1="ð" u2="&quot;" k="20"/><hkern u1="ò" u2="â€" k="20"/><hkern u1="ò" u2="’" k="20"/><hkern u1="ò" u2="ý" k="41"/><hkern u1="ò" u2="z" k="20"/><hkern u1="ò" u2="y" k="41"/><hkern u1="ò" u2="x" k="41"/><hkern u1="ò" u2="w" k="41"/><hkern u1="ò" u2="v" k="41"/><hkern u1="ò" u2="'" k="20"/><hkern u1="ò" u2="&quot;" k="20"/><hkern u1="ó" u2="â€" k="20"/><hkern u1="ó" u2="’" k="20"/><hkern u1="ó" u2="ý" k="41"/><hkern u1="ó" u2="z" k="20"/><hkern u1="ó" u2="y" k="41"/><hkern u1="ó" u2="x" k="41"/><hkern u1="ó" u2="w" k="41"/><hkern u1="ó" u2="v" k="41"/><hkern u1="ó" u2="'" k="20"/><hkern u1="ó" u2="&quot;" k="20"/><hkern u1="ô" u2="â€" k="20"/><hkern u1="ô" u2="’" k="20"/><hkern u1="ô" u2="ý" k="41"/><hkern u1="ô" u2="z" k="20"/><hkern u1="ô" u2="y" k="41"/><hkern u1="ô" u2="x" k="41"/><hkern u1="ô" u2="w" k="41"/><hkern u1="ô" u2="v" k="41"/><hkern u1="ô" u2="'" k="20"/><hkern u1="ô" u2="&quot;" k="20"/><hkern u1="ö" u2="â€" k="41"/><hkern u1="ö" u2="’" k="41"/><hkern u1="ö" u2="'" k="41"/><hkern u1="ö" u2="&quot;" k="41"/><hkern u1="ø" u2="â€" k="20"/><hkern u1="ø" u2="’" k="20"/><hkern u1="ø" u2="ý" k="41"/><hkern u1="ø" u2="z" k="20"/><hkern u1="ø" u2="y" k="41"/><hkern u1="ø" u2="x" k="41"/><hkern u1="ø" u2="w" k="41"/><hkern u1="ø" u2="v" k="41"/><hkern u1="ø" u2="'" k="20"/><hkern u1="ø" u2="&quot;" k="20"/><hkern u1="ý" u2="„" k="82"/><hkern u1="ý" u2="â€" k="-82"/><hkern u1="ý" u2="‚" k="82"/><hkern u1="ý" u2="’" k="-82"/><hkern u1="ý" u2="?" k="-41"/><hkern u1="ý" u2="." k="82"/><hkern u1="ý" u2="," k="82"/><hkern u1="ý" u2="'" k="-82"/><hkern u1="ý" u2="&quot;" k="-82"/><hkern u1="þ" u2="â€" k="20"/><hkern u1="þ" u2="’" k="20"/><hkern u1="þ" u2="ý" k="41"/><hkern u1="þ" u2="z" k="20"/><hkern u1="þ" u2="y" k="41"/><hkern u1="þ" u2="x" k="41"/><hkern u1="þ" u2="w" k="41"/><hkern u1="þ" u2="v" k="41"/><hkern u1="þ" u2="'" k="20"/><hkern u1="þ" u2="&quot;" k="20"/><hkern u1="ÿ" u2="„" k="82"/><hkern u1="ÿ" u2="â€" k="-82"/><hkern u1="ÿ" u2="‚" k="82"/><hkern u1="ÿ" u2="’" k="-82"/><hkern u1="ÿ" u2="?" k="-41"/><hkern u1="ÿ" u2="." k="82"/><hkern u1="ÿ" u2="," k="82"/><hkern u1="ÿ" u2="'" k="-82"/><hkern u1="ÿ" u2="&quot;" k="-82"/><hkern u1="Å’" u2="J" k="-123"/><hkern u1="Ÿ" u2="„" k="123"/><hkern u1="Ÿ" u2="‚" k="123"/><hkern u1="Ÿ" u2="Å“" k="102"/><hkern u1="Ÿ" u2="Å’" k="41"/><hkern u1="Ÿ" u2="ü" k="61"/><hkern u1="Ÿ" u2="û" k="61"/><hkern u1="Ÿ" u2="ú" k="61"/><hkern u1="Ÿ" u2="ù" k="61"/><hkern u1="Ÿ" u2="ø" k="102"/><hkern u1="Ÿ" u2="ö" k="102"/><hkern u1="Ÿ" u2="õ" k="102"/><hkern u1="Ÿ" u2="ô" k="102"/><hkern u1="Ÿ" u2="ó" k="102"/><hkern u1="Ÿ" u2="ò" k="102"/><hkern u1="Ÿ" u2="ë" k="102"/><hkern u1="Ÿ" u2="ê" k="102"/><hkern u1="Ÿ" u2="é" k="102"/><hkern u1="Ÿ" u2="è" k="102"/><hkern u1="Ÿ" u2="ç" k="102"/><hkern u1="Ÿ" u2="æ" k="102"/><hkern u1="Ÿ" u2="Ã¥" k="102"/><hkern u1="Ÿ" u2="ä" k="102"/><hkern u1="Ÿ" u2="ã" k="102"/><hkern u1="Ÿ" u2="â" k="102"/><hkern u1="Ÿ" u2="á" k="102"/><hkern u1="Ÿ" u2="à " k="102"/><hkern u1="Ÿ" u2="Ø" k="41"/><hkern u1="Ÿ" u2="Ö" k="41"/><hkern u1="Ÿ" u2="Õ" k="41"/><hkern u1="Ÿ" u2="Ô" k="41"/><hkern u1="Ÿ" u2="Ó" k="41"/><hkern u1="Ÿ" u2="Ã’" k="41"/><hkern u1="Ÿ" u2="Ç" k="41"/><hkern u1="Ÿ" u2="Ã…" k="123"/><hkern u1="Ÿ" u2="Ä" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="Â" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="À" k="123"/><hkern u1="Ÿ" u2="z" k="41"/><hkern u1="Ÿ" u2="u" k="61"/><hkern u1="Ÿ" u2="s" k="82"/><hkern u1="Ÿ" u2="r" k="61"/><hkern u1="Ÿ" u2="q" k="102"/><hkern u1="Ÿ" u2="p" k="61"/><hkern u1="Ÿ" u2="o" k="102"/><hkern u1="Ÿ" u2="n" k="61"/><hkern u1="Ÿ" u2="m" k="61"/><hkern u1="Ÿ" u2="g" k="41"/><hkern u1="Ÿ" u2="e" k="102"/><hkern u1="Ÿ" u2="d" k="102"/><hkern u1="Ÿ" u2="c" k="102"/><hkern u1="Ÿ" u2="a" k="102"/><hkern u1="Ÿ" u2="Q" k="41"/><hkern u1="Ÿ" u2="O" k="41"/><hkern u1="Ÿ" u2="G" k="41"/><hkern u1="Ÿ" u2="C" k="41"/><hkern u1="Ÿ" u2="A" k="123"/><hkern u1="Ÿ" u2="?" k="-41"/><hkern u1="Ÿ" u2="." k="123"/><hkern u1="Ÿ" u2="," k="123"/><hkern u1="–" u2="T" k="82"/><hkern u1="—" u2="T" k="82"/><hkern u1="‘" u2="Ÿ" k="-20"/><hkern u1="‘" u2="Å“" k="123"/><hkern u1="‘" u2="ü" k="61"/><hkern u1="‘" u2="û" k="61"/><hkern u1="‘" u2="ú" k="61"/><hkern u1="‘" u2="ù" k="61"/><hkern u1="‘" u2="ø" k="123"/><hkern u1="‘" u2="ö" k="123"/><hkern u1="‘" u2="õ" k="123"/><hkern u1="‘" u2="ô" k="123"/><hkern u1="‘" u2="ó" k="123"/><hkern u1="‘" u2="ò" k="123"/><hkern u1="‘" u2="ë" k="123"/><hkern u1="‘" u2="ê" k="123"/><hkern u1="‘" u2="é" k="123"/><hkern u1="‘" u2="è" k="123"/><hkern u1="‘" u2="ç" k="123"/><hkern u1="‘" u2="æ" k="82"/><hkern u1="‘" u2="Ã¥" k="82"/><hkern u1="‘" u2="ä" k="82"/><hkern u1="‘" u2="ã" k="82"/><hkern u1="‘" u2="â" k="82"/><hkern u1="‘" u2="á" k="82"/><hkern u1="‘" u2="à " k="123"/><hkern u1="‘" u2="Ã" k="-20"/><hkern u1="‘" u2="Ã…" k="143"/><hkern u1="‘" u2="Ä" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="Â" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="À" k="143"/><hkern u1="‘" u2="u" k="61"/><hkern u1="‘" u2="s" k="61"/><hkern u1="‘" u2="r" k="61"/><hkern u1="‘" u2="q" k="123"/><hkern u1="‘" u2="p" k="61"/><hkern u1="‘" u2="o" k="123"/><hkern u1="‘" u2="n" k="61"/><hkern u1="‘" u2="m" k="61"/><hkern u1="‘" u2="g" k="61"/><hkern u1="‘" u2="e" k="123"/><hkern u1="‘" u2="d" k="123"/><hkern u1="‘" u2="c" k="123"/><hkern u1="‘" u2="a" k="82"/><hkern u1="‘" u2="Y" k="-20"/><hkern u1="‘" u2="W" k="-41"/><hkern u1="‘" u2="V" k="-41"/><hkern u1="‘" u2="T" k="-41"/><hkern u1="‘" u2="A" k="143"/><hkern u1="’" u2="Ÿ" k="-20"/><hkern u1="’" u2="Å“" k="123"/><hkern u1="’" u2="ü" k="61"/><hkern u1="’" u2="û" k="61"/><hkern u1="’" u2="ú" k="61"/><hkern u1="’" u2="ù" k="61"/><hkern u1="’" u2="ø" k="123"/><hkern u1="’" u2="ö" k="123"/><hkern u1="’" u2="õ" k="123"/><hkern u1="’" u2="ô" k="123"/><hkern u1="’" u2="ó" k="123"/><hkern u1="’" u2="ò" k="123"/><hkern u1="’" u2="ë" k="123"/><hkern u1="’" u2="ê" k="123"/><hkern u1="’" u2="é" k="123"/><hkern u1="’" u2="è" k="123"/><hkern u1="’" u2="ç" k="123"/><hkern u1="’" u2="æ" k="82"/><hkern u1="’" u2="Ã¥" k="82"/><hkern u1="’" u2="ä" k="82"/><hkern u1="’" u2="ã" k="82"/><hkern u1="’" u2="â" k="82"/><hkern u1="’" u2="á" k="82"/><hkern u1="’" u2="à " k="123"/><hkern u1="’" u2="Ã" k="-20"/><hkern u1="’" u2="Ã…" k="143"/><hkern u1="’" u2="Ä" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="Â" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="À" k="143"/><hkern u1="’" u2="u" k="61"/><hkern u1="’" u2="s" k="61"/><hkern u1="’" u2="r" k="61"/><hkern u1="’" u2="q" k="123"/><hkern u1="’" u2="p" k="61"/><hkern u1="’" u2="o" k="123"/><hkern u1="’" u2="n" k="61"/><hkern u1="’" u2="m" k="61"/><hkern u1="’" u2="g" k="61"/><hkern u1="’" u2="e" k="123"/><hkern u1="’" u2="d" k="123"/><hkern u1="’" u2="c" k="123"/><hkern u1="’" u2="a" k="82"/><hkern u1="’" u2="Y" k="-20"/><hkern u1="’" u2="W" k="-41"/><hkern u1="’" u2="V" k="-41"/><hkern u1="’" u2="T" k="-41"/><hkern u1="’" u2="A" k="143"/><hkern u1="‚" u2="Ÿ" k="123"/><hkern u1="‚" u2="Å’" k="102"/><hkern u1="‚" u2="Ã" k="123"/><hkern u1="‚" u2="Ãœ" k="41"/><hkern u1="‚" u2="Û" k="41"/><hkern u1="‚" u2="Ú" k="41"/><hkern u1="‚" u2="Ù" k="41"/><hkern u1="‚" u2="Ø" k="102"/><hkern u1="‚" u2="Ö" k="102"/><hkern u1="‚" u2="Õ" k="102"/><hkern u1="‚" u2="Ô" k="102"/><hkern u1="‚" u2="Ó" k="102"/><hkern u1="‚" u2="Ã’" k="102"/><hkern u1="‚" u2="Ç" k="102"/><hkern u1="‚" u2="Y" k="123"/><hkern u1="‚" u2="W" k="123"/><hkern u1="‚" u2="V" k="123"/><hkern u1="‚" u2="U" k="41"/><hkern u1="‚" u2="T" k="143"/><hkern u1="‚" u2="Q" k="102"/><hkern u1="‚" u2="O" k="102"/><hkern u1="‚" u2="G" k="102"/><hkern u1="‚" u2="C" k="102"/><hkern u1="“" u2="Ÿ" k="-20"/><hkern u1="“" u2="Å“" k="123"/><hkern u1="“" u2="ü" k="61"/><hkern u1="“" u2="û" k="61"/><hkern u1="“" u2="ú" k="61"/><hkern u1="“" u2="ù" k="61"/><hkern u1="“" u2="ø" k="123"/><hkern u1="“" u2="ö" k="123"/><hkern u1="“" u2="õ" k="123"/><hkern u1="“" u2="ô" k="123"/><hkern u1="“" u2="ó" k="123"/><hkern u1="“" u2="ò" k="123"/><hkern u1="“" u2="ë" k="123"/><hkern u1="“" u2="ê" k="123"/><hkern u1="“" u2="é" k="123"/><hkern u1="“" u2="è" k="123"/><hkern u1="“" u2="ç" k="123"/><hkern u1="“" u2="æ" k="82"/><hkern u1="“" u2="Ã¥" k="82"/><hkern u1="“" u2="ä" k="82"/><hkern u1="“" u2="ã" k="82"/><hkern u1="“" u2="â" k="82"/><hkern u1="“" u2="á" k="82"/><hkern u1="“" u2="à " k="123"/><hkern u1="“" u2="Ã" k="-20"/><hkern u1="“" u2="Ã…" k="143"/><hkern u1="“" u2="Ä" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="Â" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="À" k="143"/><hkern u1="“" u2="u" k="61"/><hkern u1="“" u2="s" k="61"/><hkern u1="“" u2="r" k="61"/><hkern u1="“" u2="q" k="123"/><hkern u1="“" u2="p" k="61"/><hkern u1="“" u2="o" k="123"/><hkern u1="“" u2="n" k="61"/><hkern u1="“" u2="m" k="61"/><hkern u1="“" u2="g" k="61"/><hkern u1="“" u2="e" k="123"/><hkern u1="“" u2="d" k="123"/><hkern u1="“" u2="c" k="123"/><hkern u1="“" u2="a" k="82"/><hkern u1="“" u2="Y" k="-20"/><hkern u1="“" u2="W" k="-41"/><hkern u1="“" u2="V" k="-41"/><hkern u1="“" u2="T" k="-41"/><hkern u1="“" u2="A" k="143"/><hkern u1="„" u2="Ÿ" k="123"/><hkern u1="„" u2="Å’" k="102"/><hkern u1="„" u2="Ã" k="123"/><hkern u1="„" u2="Ãœ" k="41"/><hkern u1="„" u2="Û" k="41"/><hkern u1="„" u2="Ú" k="41"/><hkern u1="„" u2="Ù" k="41"/><hkern u1="„" u2="Ø" k="102"/><hkern u1="„" u2="Ö" k="102"/><hkern u1="„" u2="Õ" k="102"/><hkern u1="„" u2="Ô" k="102"/><hkern u1="„" u2="Ó" k="102"/><hkern u1="„" u2="Ã’" k="102"/><hkern u1="„" u2="Ç" k="102"/><hkern u1="„" u2="Y" k="123"/><hkern u1="„" u2="W" k="123"/><hkern u1="„" u2="V" k="123"/><hkern u1="„" u2="U" k="41"/><hkern u1="„" u2="T" k="143"/><hkern u1="„" u2="Q" k="102"/><hkern u1="„" u2="O" k="102"/><hkern u1="„" u2="G" k="102"/><hkern u1="„" u2="C" k="102"/></font></defs></svg>
\ No newline at end of file
diff --git a/setup/pub/fonts/opensans/bold/opensans-700.ttf b/setup/pub/fonts/opensans/bold/opensans-700.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..2109c958e3c5ca5a4e1956f4151cc2438e058c24
Binary files /dev/null and b/setup/pub/fonts/opensans/bold/opensans-700.ttf differ
diff --git a/setup/pub/fonts/opensans/bold/opensans-700.woff b/setup/pub/fonts/opensans/bold/opensans-700.woff
new file mode 100644
index 0000000000000000000000000000000000000000..1205787b0ed50db71ebd4f8a7f85d106721ff258
Binary files /dev/null and b/setup/pub/fonts/opensans/bold/opensans-700.woff differ
diff --git a/setup/pub/fonts/opensans/bold/opensans-700.woff2 b/setup/pub/fonts/opensans/bold/opensans-700.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..f3f0160bc8d06aa0be167614ef32e56d2c4b60a9
Binary files /dev/null and b/setup/pub/fonts/opensans/bold/opensans-700.woff2 differ
diff --git a/setup/pub/fonts/opensans/light/opensans-300.eot b/setup/pub/fonts/opensans/light/opensans-300.eot
new file mode 100644
index 0000000000000000000000000000000000000000..14868406aa7d728a88d63963f119635813b5d30e
Binary files /dev/null and b/setup/pub/fonts/opensans/light/opensans-300.eot differ
diff --git a/setup/pub/fonts/opensans/light/opensans-300.svg b/setup/pub/fonts/opensans/light/opensans-300.svg
new file mode 100644
index 0000000000000000000000000000000000000000..efddfe75be637ac5d0732adb65498ca8fc1ff8d2
--- /dev/null
+++ b/setup/pub/fonts/opensans/light/opensans-300.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1169"><font-face units-per-em="2048" ascent="1638" descent="-410"/><glyph unicode="ï¬" horiz-adv-x="1077" d="M29 0zm557 1001H330V0h-99v1001H29v58l202 37v84q0 200 73.5 293.5T545 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T330 1188v-101h256v-86zM895 0h-99v1087h99V0zM782 1389q0 96 63 96 31 0 48.5-25t17.5-71q0-45-17.5-71t-48.5-26q-63 0-63 97z"/><glyph unicode="fl" horiz-adv-x="1077" d="M29 0zm557 1001H330V0h-99v1001H29v58l202 37v84q0 200 73.5 293.5T545 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T330 1188v-101h256v-86zM895 0h-99v1556h99V0z"/><glyph unicode="ffi" horiz-adv-x="1692" d="M29 0zm557 1001H330V0h-99v1001H29v58l202 37v84q0 200 73.5 293.5T545 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T330 1188v-101h256v-86zm614 0H944V0h-99v1001H643v58l202 37v84q0 200 73.5 293.5T1159 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T944 1188v-101h256v-86zM1510 0h-99v1087h99V0zm-113 1389q0 96 63 96 31 0 48.5-25t17.5-71q0-45-17.5-71t-48.5-26q-63 0-63 97z"/><glyph unicode="ffl" horiz-adv-x="1692" d="M29 0zm557 1001H330V0h-99v1001H29v58l202 37v84q0 200 73.5 293.5T545 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T330 1188v-101h256v-86zm614 0H944V0h-99v1001H643v58l202 37v84q0 200 73.5 293.5T1159 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T944 1188v-101h256v-86zM1510 0h-99v1556h99V0z"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="1044"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph unicode="!" horiz-adv-x="492" d="M276 377h-61l-29 1085h119zM164 78q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98z"/><glyph unicode="&quot;" horiz-adv-x="723" d="M260 1462l-33-528h-61l-33 528h127zm330 0l-33-528h-61l-33 528h127z"/><glyph unicode="#" horiz-adv-x="1323" d="M967 928l-76-398h303v-79H874L788 0h-90l88 451H426L340 0h-88l86 451H55v79h299l76 398H133v80h311l86 454h91l-89-454h365l88 454h86l-88-454h285v-80H967zM440 530h363l78 398H518z"/><glyph unicode="$" d="M991 440q0-133-99-217T618 117v-236h-81v232q-92 2-200.5 22.5T164 186v103q75-36 179.5-61T537 203v508q-145 44-215 88T220 903t-32 146q0 124 94.5 208.5T537 1362v192h81v-190q197-9 351-72l-33-90q-141 62-318 72V788q213-66 293-144t80-204zm-110 4q0 85-63 140.5T618 680V209q122 13 192.5 75T881 444zm-584 605q0-86 57-141t183-93v453q-119-16-179.5-76T297 1049z"/><glyph unicode="%" horiz-adv-x="1653" d="M211 1026q0-186 45-279.5T397 653q193 0 193 373 0 184-49.5 276.5T397 1395q-96 0-141-92.5T211 1026zm477 0q0-226-75-343.5T397 565q-133 0-208.5 120.5T113 1026q0 223 72 340t212 117q139 0 215-120.5t76-336.5zm375-588q0-185 45-277.5T1249 68q193 0 193 370 0 369-193 369-96 0-141-91.5T1063 438zm477 0q0-226-74-343.5T1251-23q-136 0-211 121.5T965 438q0 225 73.5 341T1251 895q137 0 213-120t76-337zm-260 1024L469 0h-96l811 1462h96z"/><glyph unicode="&" horiz-adv-x="1460" d="M123 371q0 138 73.5 235T471 811l-75 82q-66 71-98 139t-32 142q0 143 95.5 227t256.5 84q155 0 245.5-81t90.5-224q0-105-70-192.5T631 793l452-457q61 72 104 157t75 201h96q-63-246-209-426L1415 0h-135l-193 197q-92-90-164-131.5T765.5 2 571-20Q362-20 242.5 83T123 371zM578 70q128 0 234.5 43.5T1022 260L539 745q-136-72-196.5-122.5t-88-109.5T227 375q0-143 93-224t258-81zM373 1176q0-79 40-146t152-174q159 85 221 159t62 169q0 94-62 152.5T618 1395q-114 0-179.5-58T373 1176z"/><glyph unicode="'" horiz-adv-x="393" d="M260 1462l-33-528h-61l-33 528h127z"/><glyph unicode="(" horiz-adv-x="557" d="M82 561q0 265 77.5 496T383 1462h113q-148-182-227-412.5T190 563q0-483 304-887H383Q236-154 159 73T82 561z"/><glyph unicode=")" horiz-adv-x="557" d="M475 561q0-263-77.5-490T174-324H63Q367 80 367 563q0 257-79 487.5T61 1462h113q147-175 224-406.5T475 561z"/><glyph unicode="*" horiz-adv-x="1128" d="M631 1556l-37-405 405 104 21-131-395-39 247-340-124-71-191 379-180-379-125 71 242 340-390 39 19 131 401-104-39 405h146z"/><glyph unicode="+" d="M625 764h434v-82H625V250h-82v432H111v82h432v434h82V764z"/><glyph unicode="," horiz-adv-x="440" d="M295 238l12-21Q232-48 133-264H68q77 275 110 502h117z"/><glyph unicode="-" horiz-adv-x="659" d="M92 512v82h475v-82H92z"/><glyph unicode="." horiz-adv-x="487" d="M162 78q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98z"/><glyph unicode="/" horiz-adv-x="698" d="M674 1462L129 0H25l544 1462h105z"/><glyph unicode="0" d="M1055 735q0-385-117.5-570T582-20q-229 0-348 190.5T115 735q0 382 115.5 566T582 1485q231 0 352-190.5T1055 735zm-832 0q0-340 89-502.5T582 70q189 0 275.5 168T944 735q0 324-86.5 492T582 1395t-274-168-85-492z"/><glyph unicode="1" d="M682 0h-98v1065q0 145 12 301-15-15-31-29t-309-243l-57 71 397 297h86V0z"/><glyph unicode="2" d="M1028 0H113v88l389 406q164 170 230 260t97 172 31 172q0 131-86 213t-223 82q-183 0-350-133l-54 69q183 154 406 154 191 0 300.5-102T963 1100q0-145-73.5-280.5T621 485L246 100v-4h782V0z"/><glyph unicode="3" d="M979 1118q0-136-85.5-229T664 770v-6q176-22 268-112t92-242q0-205-139.5-317.5T483-20Q260-20 94 63v99q84-44 188.5-69T479 68q221 0 332 89.5T922 410q0 145-113.5 223T475 711H317v96h160q182 0 288.5 86.5T872 1128q0 122-86.5 195.5T559 1397q-109 0-199-30.5T158 1262l-49 67q85 71 205 112.5t243 41.5q202 0 312-95.5T979 1118z"/><glyph unicode="4" d="M1141 373H889V0h-94v373H43v67l725 1030h121V459h252v-86zm-346 86v418q0 302 14 507h-8q-20-37-123-188L162 459h633z"/><glyph unicode="5" d="M537 879q234 0 368.5-113T1040 455q0-225-140-350T514-20Q405-20 307 1.5T143 63v103q108-55 192-76.5T514 68q192 0 308 101.5T938 444q0 163-113 256t-307 93q-130 0-272-39l-60 39 58 669h704v-96H338l-45-516q156 29 244 29z"/><glyph unicode="6" d="M131 623q0 285 77.5 479.5t220 288.5 343.5 94q94 0 172-23v-88q-73 27-176 27-247 0-384.5-178T229 705h13q76 98 174 148t207 50q205 0 320.5-117T1059 463q0-224-121.5-353.5T610-20q-222 0-350.5 169.5T131 623zM610 68q164 0 255 103t91 294q0 168-90 262t-245 94q-102 0-189.5-45T292 656.5 240 504q0-111 49.5-213.5t134-162.5T610 68z"/><glyph unicode="7" d="M334 0l602 1366H109v96h946v-73L451 0H334z"/><glyph unicode="8" d="M582 1487q186 0 299.5-95T995 1135q0-112-70.5-198T696 778q192-79 270-173t78-228q0-181-126.5-289T578-20Q357-20 239 81T121 375q0 131 83 230t257 169q-161 76-227 160.5T168 1137q0 105 53 184.5T369.5 1444t212.5 43zM223 360q0-138 93.5-214T578 70q164 0 264 80.5T942 369q0 124-78.5 201.5T561 733q-184-71-261-157t-77-216zm357 1037q-141 0-226.5-69.5T268 1137q0-70 31.5-123.5t91-97T590 815q163 63 234 139t71 183q0 120-84.5 190T580 1397z"/><glyph unicode="9" d="M1036 842q0-288-75.5-482t-220-287T391-20Q287-20 199 6v86q43-14 103.5-21.5T395 63q247 0 387 178.5T938 762h-12q-73-96-174-147.5T541 563q-203 0-316.5 112T111 993q0 220 124.5 356T559 1485q144 0 252-75.5T977.5 1188t58.5-346zm-477 555q-158 0-252-106.5T213 999q0-174 87-264t249-90q101 0 188.5 45t139 119.5T928 961q0 117-46.5 219t-130 159.5T559 1397z"/><glyph unicode=":" horiz-adv-x="487" d="M162 78q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98zm0 893q0 98 80 98 82 0 82-98 0-53-23.5-76T242 872q-34 0-57 23t-23 76z"/><glyph unicode=";" horiz-adv-x="487" d="M303 238l12-21Q240-48 141-264H76q29 97 62 245.5T186 238h117zM162 971q0 98 80 98 82 0 82-98 0-53-23.5-76T242 872q-34 0-57 23t-23 76z"/><glyph unicode="<" d="M1059 266L111 682v61l948 474v-95L236 717l823-355v-96z"/><glyph unicode="=" d="M111 885v82h948v-82H111zm0-408v82h948v-82H111z"/><glyph unicode=">" d="M111 362l823 355-823 405v95l948-474v-61L111 266v96z"/><glyph unicode="?" horiz-adv-x="862" d="M293 377v37q0 123 37.5 201T469 782l91 79q72 61 103 121t31 138q0 127-83.5 202T391 1397q-79 0-148-17.5T94 1323l-37 80q110 48 184.5 64t153.5 16q183 0 288-98.5T788 1114q0-68-18-119t-50.5-94.5-78.5-84T539 729q-64-54-98.5-98.5t-50-93.5T375 391v-14h-82zM260 78q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98z"/><glyph unicode="@" horiz-adv-x="1815" d="M1702 725q0-228-90.5-366T1366 221q-89 0-144.5 54T1157 422h-4q-43-100-124-150.5T840 221q-148 0-229 96.5T530 588q0 202 120.5 330.5T965 1047q138 0 286-41l-22-464v-30q0-104 35-156.5t116-52.5q103 0 168.5 116.5T1614 723q0 194-79 340t-225.5 224.5T975 1366q-230 0-405.5-99.5T299.5 985 205 567q0-322 167-497.5T846-106q93 0 188.5 18T1266-18v-99q-203-80-414-80-349 0-544 200.5T113 561q0 256 108.5 460.5t307 317.5T977 1452q215 0 380.5-89t255-254.5T1702 725zM633 590q0-143 55-215t174-72q255 0 273 346l16 291q-79 27-193 27-149 0-237-102.5T633 590z"/><glyph unicode="A" horiz-adv-x="1229" d="M911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174z"/><glyph unicode="B" horiz-adv-x="1284" d="M207 1462h401q271 0 398-92t127-278q0-127-77.5-211.5T829 772v-6q175-26 257.5-110.5T1169 420q0-202-134-311T655 0H207v1462zm102-651h322q206 0 299.5 68.5T1024 1094t-105.5 212-314.5 66H309V811zm0-90V90h344q406 0 406 330 0 301-428 301H309z"/><glyph unicode="C" horiz-adv-x="1272" d="M831 1391q-275 0-433-176T240 733q0-313 149-486T815 74q184 0 338 47V31q-145-51-362-51-308 0-485 199T129 735q0 223 84.5 393t243 262.5T825 1483q214 0 383-80l-41-92q-160 80-336 80z"/><glyph unicode="D" horiz-adv-x="1446" d="M1317 745q0-368-193-556.5T557 0H207v1462h395q350 0 532.5-183T1317 745zm-111-4q0 314-159.5 472.5T578 1372H309V90h242q655 0 655 651z"/><glyph unicode="E" horiz-adv-x="1130" d="M1006 0H207v1462h799v-94H309V815h658v-94H309V94h697V0z"/><glyph unicode="F" horiz-adv-x="1028" d="M309 0H207v1462h801v-94H309V748h660v-95H309V0z"/><glyph unicode="G" horiz-adv-x="1481" d="M782 737h539V70q-212-90-477-90-346 0-530.5 195.5T129 729q0 223 91.5 395.5t262 266.5 391.5 94q239 0 429-88l-41-92q-190 88-394 88-289 0-458.5-178.5T240 733q0-330 161-496.5T874 70q202 0 343 57v514H782v96z"/><glyph unicode="H" horiz-adv-x="1473" d="M1266 0h-103v719H309V0H207v1462h102V813h854v649h103V0z"/><glyph unicode="I" horiz-adv-x="516" d="M207 0v1462h102V0H207z"/><glyph unicode="J" horiz-adv-x="506" d="M-33-369q-92 0-151 27v88q78-20 149-20 242 0 242 264v1472h102V0q0-369-342-369z"/><glyph unicode="K" horiz-adv-x="1190" d="M1190 0h-125L504 772 309 600V0H207v1462h102V702l162 162 573 598h130L575 844z"/><glyph unicode="L" horiz-adv-x="1051" d="M207 0v1462h102V96h697V0H207z"/><glyph unicode="M" horiz-adv-x="1767" d="M850 0L305 1350h-8q8-124 8-254V0h-98v1462h158L883 176h6l518 1286h154V0h-103v1108q0 116 12 240h-8L915 0h-65z"/><glyph unicode="N" horiz-adv-x="1477" d="M1270 0h-103L301 1298h-8q12-232 12-350V0h-98v1462h102l865-1296h6q-9 180-9 342v954h99V0z"/><glyph unicode="O" horiz-adv-x="1565" d="M1436 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733z"/><glyph unicode="P" horiz-adv-x="1198" d="M1087 1042q0-212-144-325T535 604H309V0H207v1462h358q522 0 522-420zM309 692h201q247 0 357 81.5T977 1038q0 169-104 250.5T551 1370H309V692z"/><glyph unicode="Q" horiz-adv-x="1565" d="M1436 733q0-294-126-486.5T961 0l333-348h-166L846-18l-33-2h-31q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733z"/><glyph unicode="R" horiz-adv-x="1217" d="M309 637V0H207v1462h348q272 0 402-100.5t130-302.5q0-147-77.5-248T774 666L1171 0h-122L672 637H309zm0 88h279q185 0 287 82.5T977 1051q0 167-100 243t-326 76H309V725z"/><glyph unicode="S" horiz-adv-x="1116" d="M1014 377q0-183-134.5-290T522-20q-268 0-411 59v102q158-67 403-67 180 0 285.5 82.5T905 373q0 83-35 137.5T756 610t-232 97q-224 77-309.5 166.5T129 1112q0 164 128.5 267.5T588 1483q206 0 387-78l-37-88q-182 76-348 76-162 0-258-75t-96-204q0-81 29.5-133t96.5-93.5T592 788q171-59 257-114.5t125.5-126T1014 377z"/><glyph unicode="T" horiz-adv-x="1073" d="M588 0H485v1366H10v96h1053v-96H588V0z"/><glyph unicode="U" horiz-adv-x="1473" d="M1282 1462V516q0-252-146-394T729-20q-254 0-396.5 142.5T190 520v942h103V516q0-211 117-328.5T741 70q209 0 324 115.5T1180 506v956h102z"/><glyph unicode="V" horiz-adv-x="1182" d="M1071 1462h111L635 0h-90L0 1462h109l368-995q84-225 113-338 20 75 79 233z"/><glyph unicode="W" horiz-adv-x="1827" d="M1372 0h-84L967 1128q-40 139-60 228-16-87-45.5-200T539 0h-86L51 1462h107l256-942q15-57 28-105.5t23.5-91 19-82T500 162q24 136 102 413l250 887h113l293-1018q51-176 73-284 13 72 33.5 153T1673 1462h103z"/><glyph unicode="X" horiz-adv-x="1102" d="M1102 0H985L553 682 113 0H0l492 762-447 700h115l395-626 401 626h109L612 764z"/><glyph unicode="Y" horiz-adv-x="1081" d="M543 662l428 800h110L594 565V0H489v557L0 1462h117z"/><glyph unicode="Z" horiz-adv-x="1180" d="M1098 0H82v76l856 1290H121v96h954v-76L217 96h881V0z"/><glyph unicode="[" horiz-adv-x="653" d="M602-324H174v1786h428v-94H272V-229h330v-95z"/><glyph unicode="\" horiz-adv-x="698" d="M127 1462L674 0H571L25 1462h102z"/><glyph unicode="]" horiz-adv-x="653" d="M51-229h330v1597H51v94h428V-324H51v95z"/><glyph unicode="^" d="M88 561l465 912h68l460-912H981l-395 791-398-791H88z"/><glyph unicode="_" horiz-adv-x="842" d="M846-266H-4v82h850v-82z"/><glyph unicode="`" horiz-adv-x="1182" d="M776 1241h-69q-96 79-188.5 171.5T393 1552v17h142q26-48 98.5-142T776 1257v-16z"/><glyph unicode="a" horiz-adv-x="1085" d="M842 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70z"/><glyph unicode="b" horiz-adv-x="1219" d="M641 1108q228 0 343.5-143.5T1100 545q0-271-121.5-418T637-20q-116 0-209 48T281 164h-9L244 0h-62v1556h99v-391q0-88-4-162l-3-85h7q62 98 149.5 144t210.5 46zm-2-90q-192 0-275-110t-83-363v-17q0-246 86.5-353T637 68q178 0 268 124.5T995 547q0 471-356 471z"/><glyph unicode="c" horiz-adv-x="973" d="M616-20q-233 0-365 147T119 537q0 270 137 420.5T631 1108q141 0 270-49l-27-88q-141 47-245 47-200 0-303-123.5T223 539q0-220 103-344.5T614 70q148 0 275 53V31Q785-20 616-20z"/><glyph unicode="d" horiz-adv-x="1219" d="M580 1108q118 0 204-43t154-147h6q-6 126-6 247v391h98V0h-65l-25 166h-8Q814-20 582-20q-225 0-344 140T119 528q0 282 118 431t343 149zm0-90q-178 0-267.5-125T223 530q0-462 359-462 184 0 270 107t86 353v17q0 252-84.5 362.5T580 1018z"/><glyph unicode="e" horiz-adv-x="1124" d="M621-20q-237 0-369.5 146T119 535q0 260 128 416.5T592 1108q192 0 303-134t111-364v-80H223q2-224 104.5-342T621 70q93 0 163.5 13T963 139V49Q871 9 793-5.5T621-20zm-29 1040q-157 0-252-103.5T229 618h672q0 189-82 295.5T592 1020z"/><glyph unicode="f" horiz-adv-x="614" d="M586 1001H330V0h-99v1001H29v58l202 37v84q0 200 73.5 293.5T545 1567q90 0 180-27l-23-86q-80 25-159 25-116 0-164.5-68.5T330 1188v-101h256v-86z"/><glyph unicode="g" horiz-adv-x="1071" d="M1030 1087v-69l-225-14q90-112 90-246 0-157-104.5-254.5T510 406q-74 0-104 6-59-31-90-73t-31-89q0-52 39.5-76T457 150h190q177 0 271-71.5t94-211.5q0-172-139.5-265.5T475-492q-205 0-317.5 79T45-193Q45-81 114.5-7T303 94q-49 21-78.5 59.5T195 242q0 109 139 192-95 39-148 122.5T133 748q0 163 103.5 261.5T516 1108q107 0 166-21h348zM150-184q0-224 333-224 428 0 428 273 0 98-67 142T627 51H449q-299 0-299-235zm83 932q0-126 76.5-195.5T514 483q136 0 208.5 69T795 752q0 139-74.5 208.5T512 1030q-130 0-204.5-74.5T233 748z"/><glyph unicode="h" horiz-adv-x="1208" d="M940 0v705q0 164-69 238.5T657 1018q-195 0-285.5-98.5T281 600V0h-99v1556h99v-495l-5-139h7q61 98 154 142t231 44q370 0 370-397V0h-98z"/><glyph unicode="i" horiz-adv-x="463" d="M281 0h-99v1087h99V0zM168 1389q0 96 63 96 31 0 48.5-25t17.5-71q0-45-17.5-71t-48.5-26q-63 0-63 97z"/><glyph unicode="j" horiz-adv-x="463" d="M37-492q-80 0-135 25v86q69-20 129-20 151 0 151 176v1312h99V-211q0-135-63.5-208T37-492zm131 1881q0 96 63 96 31 0 48.5-25t17.5-71q0-45-17.5-71t-48.5-26q-63 0-63 97z"/><glyph unicode="k" horiz-adv-x="991" d="M279 477l555 610h120L526 623 991 0H872L459 549 281 387V0h-99v1556h99V776l-7-299h5z"/><glyph unicode="l" horiz-adv-x="463" d="M281 0h-99v1556h99V0z"/><glyph unicode="m" horiz-adv-x="1808" d="M1540 0v713q0 159-62 232t-190 73q-167 0-247-92t-80-289V0H860v743q0 275-252 275-171 0-249-99.5T281 600V0h-99v1087h82l21-149h6q45 81 128 125.5t183 44.5q257 0 330-193h4q53 93 142.5 143t203.5 50q178 0 267-95t89-302V0h-98z"/><glyph unicode="n" horiz-adv-x="1208" d="M940 0v705q0 164-69 238.5T657 1018q-195 0-285.5-98.5T281 600V0h-99v1087h84l19-149h6q106 170 377 170 370 0 370-397V0h-98z"/><glyph unicode="o" horiz-adv-x="1200" d="M1081 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545z"/><glyph unicode="p" horiz-adv-x="1219" d="M647-20q-251 0-366 188h-7l3-84q4-74 4-162v-414h-99v1579h84l19-155h6q112 176 358 176 220 0 335.5-144.5T1100 543q0-268-121.5-415.5T647-20zm-2 88q167 0 258.5 124T995 539q0 479-346 479-190 0-279-104.5T281 573v-32q0-255 85.5-364T645 68z"/><glyph unicode="q" horiz-adv-x="1219" d="M569-20q-214 0-332 142T119 532q0 275 118 425.5T575 1108q236 0 353-174h6l18 153h84V-492h-98v414q0 122 6 248h-6Q820-20 569-20zm2 88q198 0 282.5 109T938 543v12q0 245-85 354t-271 109q-176 0-267.5-124T223 530q0-229 89.5-345.5T571 68z"/><glyph unicode="r" horiz-adv-x="797" d="M610 1108q69 0 148-14l-19-95q-68 17-141 17-139 0-228-118t-89-298V0h-99v1087h84l10-196h7q67 120 143 168.5t184 48.5z"/><glyph unicode="s" horiz-adv-x="954" d="M856 283q0-146-111-224.5T430-20Q212-20 84 47v107q164-82 346-82 161 0 244.5 53.5T758 268q0 82-66.5 138T473 516q-163 59-229 101.5t-99.5 96T111 844q0 122 102.5 193t286.5 71q176 0 334-66l-37-90q-160 66-297 66-133 0-211-44t-78-122q0-85 60.5-136T508 602q147-53 214-95.5T822.5 410 856 283z"/><glyph unicode="t" horiz-adv-x="686" d="M469 68q94 0 164 16V4q-72-24-166-24-144 0-212.5 77T186 299v702H25v58l161 45 50 246h51v-263h319v-86H287V313q0-125 44-185t138-60z"/><glyph unicode="u" horiz-adv-x="1208" d="M268 1087V383q0-164 69-238.5T551 70q194 0 285.5 98T928 487v600h98V0h-84l-18 150h-6Q812-20 541-20q-371 0-371 397v710h98z"/><glyph unicode="v" horiz-adv-x="940" d="M420 0L0 1087h102l281-739q56-142 84-248h6q41 136 84 250l281 737h102L520 0H420z"/><glyph unicode="w" horiz-adv-x="1481" d="M1051 0L813 727q-23 74-59 217h-6l-21-74-45-145L440 0h-98L31 1087h106l174-630q61-234 80-344h6q59 234 86 311l224 663h90l213-661q72-235 88-311h6q8 65 80 348l166 624h100L1155 0h-104z"/><glyph unicode="x" horiz-adv-x="1020" d="M449 559L70 1087h114l324-458 321 458h109L565 559 965 0H850L508 485 164 0H55z"/><glyph unicode="y" horiz-adv-x="940" d="M0 1087h102l230-610Q437 196 465 98h6q42 129 137 385l230 604h102L453-176q-59-154-99-208t-93.5-81T131-492q-57 0-127 21v86q58-16 125-16 51 0 90 24t70.5 74.5 73 160T416 0z"/><glyph unicode="z" horiz-adv-x="944" d="M858 0H82v63l645 936H129v88h727v-63L207 88h651V0z"/><glyph unicode="{" horiz-adv-x="723" d="M389-27q0-102 59.5-152.5T651-233v-91q-195 0-277.5 75T291-18v337q0 205-230 209v80q122 2 176 51t54 148v350q0 299 360 305v-90q-138-5-200-58t-62-157V852q0-130-44-194t-142-85v-8q97-20 141.5-83.5T389 295V-27z"/><glyph unicode="|" horiz-adv-x="1108" d="M508 1561h92V-506h-92v2067z"/><glyph unicode="}" horiz-adv-x="723" d="M334 295q0 123 44.5 186.5T520 565v8q-97 20-141.5 84T334 852v305q0 103-61.5 156.5T72 1372v90q174 0 267-77.5t93-227.5V807q0-100 54.5-148.5T662 608v-80q-230-4-230-209V-18q0-155-82.5-230.5T72-324v91q141 2 201.5 52.5T334-27v322z"/><glyph unicode="~" d="M334 745q-49 0-108-30.5T111 625v94q108 110 233 110 61 0 115-13.5T614 758q126-58 220-58 56 0 109.5 30.5T1059 825v-96q-48-49-104.5-81T825 616q-116 0-270 72-124 57-221 57z"/><glyph unicode="¡" horiz-adv-x="492" d="M215 711h61l29-1086H186zm-49 299q0 98 80 98 82 0 82-98 0-53-23.5-76T246 911q-34 0-57 23t-23 76z"/><glyph unicode="¢" d="M602 190q-186 30-288.5 175T211 745q0 232 102.5 381.5T602 1309v174h82v-166h14q131 0 275-55l-31-84q-134 51-237 51-187 0-288.5-122.5T315 748q0-225 100.5-349.5T696 274q131 0 267 58v-92q-110-56-267-56h-12V-20h-82v210z"/><glyph unicode="£" d="M412 676V420q0-116-35-196T264 96h809V0H78v84q110 21 171.5 110T311 418v258H100v82h211v297q0 204 98 315t281 111q175 0 330-68l-35-86q-157 66-295 66-141 0-209.5-81T412 1059V758h411v-82H412z"/><glyph unicode="¤" d="M991 723q0-151-90-256l139-141-59-60-137 142q-110-93-260-93-153 0-260 93L186 266l-59 60 139 141q-90 106-90 256 0 147 90 258l-139 141 59 60 138-142q103 93 260 93 155 0 260-93l137 142 59-60-139-141q90-111 90-258zM584 395q134 0 228.5 95.5T907 723q0 136-95 233t-228 97q-134 0-229-97t-95-233 94.5-232T584 395z"/><glyph unicode="Â¥" d="M586 666l428 796h110L692 674h283v-82H637V387h338v-82H637V0H532v305H195v82h337v205H195v82h278L43 1462h117z"/><glyph unicode="¦" horiz-adv-x="1108" d="M508 1561h92V797h-92v764zm0-1303h92v-764h-92v764z"/><glyph unicode="§" horiz-adv-x="1057" d="M145 813q0 83 50.5 152.5T334 1073q-86 47-125 102t-39 136q0 117 101.5 183.5T547 1561q175 0 336-64l-35-80q-91 34-158.5 47T545 1477q-134 0-205.5-44.5T268 1313q0-54 25.5-88.5T379 1159t188-74q192-64 264-132.5T903 782q0-173-186-274 86-42 129-96t43-136q0-135-113-207.5T465-4q-92 0-171 15T129 63v95q182-78 332-78 162 0 247 49.5T793 270q0 55-25 87.5T679.5 423 489 502q-200 73-272 141.5T145 813zm101 12q0-65 31.5-104T383 646t250-99q82 41 126 98t44 121q0 62-32 102t-108.5 77-236.5 87q-81-23-130.5-79T246 825z"/><glyph unicode="¨" horiz-adv-x="1182" d="M336 1389q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="©" horiz-adv-x="1704" d="M897 1092q-142 0-222.5-94.5T594 733q0-186 74.5-275T889 369q84 0 198 43v-88q-102-45-208-45-187 0-288.5 115T489 725q0 208 111 332.5T897 1182q119 0 227-52l-37-83q-98 45-190 45zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm93 0q0-178 88.5-329.5T522 161t330-89 329.5 88.5T1422 401t89 330q0 174-85.5 325t-239 243-334.5 92q-176 0-328.5-88.5T282 1060t-89-329z"/><glyph unicode="ª" horiz-adv-x="686" d="M512 813l-25 72q-84-84-202-84-95 0-151 49T78 989q0 100 80 151.5t241 59.5l95 4v43q0 77-38 114.5T350 1399q-87 0-196-49l-33 73q117 56 231 56 228 0 228-215V813h-68zM168 993q0-54 35-85t96-31q90 0 142.5 50t52.5 142v64l-88-5q-116-6-177-36.5T168 993z"/><glyph unicode="«" horiz-adv-x="885" d="M82 543l309 393 62-43-254-363 254-362-62-43L82 516v27zm360 0l310 393 61-43-254-363 254-362-61-43-310 391v27z"/><glyph unicode="¬" d="M1038 764V270h-82v412H111v82h927z"/><glyph unicode="Â" horiz-adv-x="659" d="M92 512zm0 0v82h475v-82H92z"/><glyph unicode="®" horiz-adv-x="1704" d="M709 731h112q91 0 143 46.5t52 135.5q0 172-197 172H709V731zm411 187q0-79-38.5-139.5T971 684l237-393h-121L877 651H709V291H608v880h211q143 0 222-62t79-191zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm93 0q0-178 88.5-329.5T522 161t330-89 329.5 88.5T1422 401t89 330q0 174-85.5 325t-239 243-334.5 92q-176 0-328.5-88.5T282 1060t-89-329z"/><glyph unicode="¯" horiz-adv-x="1024" d="M1030 1556H-6v82h1036v-82z"/><glyph unicode="°" horiz-adv-x="877" d="M139 1184q0 132 86.5 215.5T438 1483t212.5-83.5T737 1184t-86.5-215.5T438 885q-130 0-214.5 83T139 1184zm90 0q0-91 61-154t148-63q86 0 147.5 62t61.5 155q0 92-60 154.5T438 1401q-90 0-149.5-64T229 1184z"/><glyph unicode="±" d="M111 1zm0 0v82h948V1H111zm514 763h434v-82H625V250h-82v432H111v82h432v434h82V764z"/><glyph unicode="²" horiz-adv-x="688" d="M629 586H53v78l242 237q125 121 172 193t47 149q0 71-46.5 112.5T344 1397q-108 0-217-82l-49 65q119 103 270 103 124 0 194-63.5t70-174.5q0-47-13-89t-40-85.5-68.5-90T182 674h447v-88z"/><glyph unicode="³" horiz-adv-x="688" d="M616 1260q0-78-44-131.5T455 1053q186-45 186-211 0-130-88.5-201.5T305 569q-144 0-264 60v88q136-62 266-62 115 0 174.5 49T541 840q0 83-59.5 122T303 1001H172v84h135q105 0 158 43.5t53 120.5q0 67-47 107.5T344 1397q-128 0-246-78l-47 70q130 94 293 94 127 0 199.5-60t72.5-163z"/><glyph unicode="´" horiz-adv-x="1182" d="M393 1257q73 79 144.5 171.5T635 1569h141v-17q-36-52-122.5-138T463 1241h-70v16z"/><glyph unicode="µ" horiz-adv-x="1221" d="M281 1087V383q0-164 69-238.5T563 70q194 0 285.5 98T940 487v600h98V0h-84l-18 150h-6Q880 73 780 26.5T563-20q-99 0-167.5 27.5T276 92q5-92 5-170v-414h-99v1579h99z"/><glyph unicode="¶" horiz-adv-x="1341" d="M1106-260h-100v1722H778V-260H678v819q-64-18-146-18-216 0-317.5 125T113 1042q0 260 109 387t341 127h543V-260z"/><glyph unicode="·" horiz-adv-x="487" d="M162 623zm0 98q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98z"/><glyph unicode="¸" horiz-adv-x="420" d="M393-291q0-100-67.5-150.5T137-492q-68 0-94 11v88q30-10 92-10 78 0 119 28t41 80q0 94-193 121L195 0h96l-66-117q168-37 168-174z"/><glyph unicode="¹" horiz-adv-x="688" d="M350 1462h92V586h-98v547q0 99 12 233-26-23-233-145l-47 77z"/><glyph unicode="º" horiz-adv-x="739" d="M670 1141q0-161-80-250.5T367 801t-220 86-77 254q0 162 78 250t223 88q142 0 220.5-87t78.5-251zm-510 0q0-264 209-264t209 264q0 131-50 194.5T369 1399t-159-63.5-50-194.5z"/><glyph unicode="»" horiz-adv-x="885" d="M803 518L494 125l-62 43 254 362-254 363 62 43 309-391v-27zm-361 0L133 125l-61 43 254 362L72 893l61 43 309-391v-27z"/><glyph unicode="¼" horiz-adv-x="1516" d="M59 0zm274 1462h92V586h-98v547q0 99 12 233-26-23-233-145l-47 77zm815 0L337 0h-94l811 1462h94zm244-1220h-129V1h-90v241H760v60l407 581h96V320h129v-78zm-219 78v221q0 132 8 232-6-12-21.5-35.5T864 320h309z"/><glyph unicode="½" horiz-adv-x="1516" d="M11 0zm274 1462h92V586h-98v547q0 99 12 233-26-23-233-145l-47 77zm788 0L262 0h-94l811 1462h94zM1403 1H827v78l242 237q125 121 172 193t47 149q0 71-46.5 112.5T1118 812q-108 0-217-82l-49 65q119 103 270 103 124 0 194-63.5t70-174.5q0-47-13-89t-40-85.5-68.5-90T956 89h447V1z"/><glyph unicode="¾" horiz-adv-x="1516" d="M41 0zm575 1260q0-78-44-131.5T455 1053q186-45 186-211 0-130-88.5-201.5T305 569q-144 0-264 60v88q136-62 266-62 115 0 174.5 49T541 840q0 83-59.5 122T303 1001H172v84h135q105 0 158 43.5t53 120.5q0 67-47 107.5T344 1397q-128 0-246-78l-47 70q130 94 293 94 127 0 199.5-60t72.5-163zm684 202L489 0h-94l811 1462h94zm195-1220h-129V1h-90v241H863v60l407 581h96V320h129v-78zm-219 78v221q0 132 8 232-6-12-21.5-35.5T967 320h309z"/><glyph unicode="¿" horiz-adv-x="862" d="M569 711v-37q0-125-39.5-204.5T393 305l-90-79q-73-61-104-120.5T168-33q0-124 82-200t221-76q125 0 233 46l64 27 37-79q-111-48-185.5-64T467-395q-184 0-288.5 99T74-27q0 70 20 124t58.5 102T324 358q64 53 98.5 98.5t49.5 94T487 696v15h82zm-129 299q0 98 80 98 82 0 82-98 0-53-23.5-76T520 911q-34 0-57 23t-23 76z"/><glyph unicode="À" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm366 971h-69q-96 79-188.5 171.5T337 1890v17h142q26-48 98.5-142T720 1595v-16z"/><glyph unicode="Ã" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm150 987q73 79 144.5 171.5T746 1907h141v-17q-36-52-122.5-138T574 1579h-70v16z"/><glyph unicode="Â" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm-26 987q62 67 131.5 156T570 1907h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Ã" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm430 973q-36 0-75 18.5T608 1671q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T360 1581h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="Ä" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm13 1119q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="Ã…" horiz-adv-x="1229" d="M0 0zm911 516H317L113 0H0l588 1468h65L1229 0h-115zm-557 92h523l-199 527q-25 62-60 172-27-96-59-174zm482 1002q0-97-60-155t-157-58-157 58-60 155q0 94 60 152.5t157 58.5 157-59 60-152zm-354 0q0-66 37.5-103.5T619 1469t99.5 37.5T756 1610q0 64-39 101.5t-98 37.5q-62 0-99.5-38T482 1610z"/><glyph unicode="Æ" horiz-adv-x="1653" d="M1528 0H811v516H336L109 0H-2l653 1462h877v-94H913V815h576v-94H913V94h615V0zM377 608h434v760H711z"/><glyph unicode="Ç" horiz-adv-x="1272" d="M129 0zm702 1391q-275 0-433-176T240 733q0-313 149-486T815 74q184 0 338 47V31q-145-51-362-51-308 0-485 199T129 735q0 223 84.5 393t243 262.5T825 1483q214 0 383-80l-41-92q-160 80-336 80zm80-1682q0-100-67.5-150.5T655-492q-68 0-94 11v88q30-10 92-10 78 0 119 28t41 80q0 94-193 121L713 0h96l-66-117q168-37 168-174z"/><glyph unicode="È" horiz-adv-x="1130" d="M207 0zm799 0H207v1462h799v-94H309V815h658v-94H309V94h697V0zM697 1579h-69q-96 79-188.5 171.5T314 1890v17h142q26-48 98.5-142T697 1595v-16z"/><glyph unicode="É" horiz-adv-x="1130" d="M207 0zm799 0H207v1462h799v-94H309V815h658v-94H309V94h697V0zM463 1595q73 79 144.5 171.5T705 1907h141v-17q-36-52-122.5-138T533 1579h-70v16z"/><glyph unicode="Ê" horiz-adv-x="1130" d="M207 0zm799 0H207v1462h799v-94H309V815h658v-94H309V94h697V0zM315 1595q62 67 131.5 156T557 1907h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Ë" horiz-adv-x="1130" d="M207 0zm799 0H207v1462h799v-94H309V815h658v-94H309V94h697V0zM354 1727q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ÃŒ" horiz-adv-x="516" d="M0 0zm207 0v1462h102V0H207zm113 1579h-69q-96 79-188.5 171.5T-63 1890v17H79q26-48 98.5-142T320 1595v-16z"/><glyph unicode="Ã" horiz-adv-x="516" d="M191 0zm16 0v1462h102V0H207zm-16 1595q73 79 144.5 171.5T433 1907h141v-17q-36-52-122.5-138T261 1579h-70v16z"/><glyph unicode="ÃŽ" horiz-adv-x="516" d="M0 0zm207 0v1462h102V0H207zM-32 1595q62 67 131.5 156T210 1907h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Ã" horiz-adv-x="516" d="M5 0zm202 0v1462h102V0H207zM5 1727q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="Ã" horiz-adv-x="1466" d="M1317 745q0-368-193-556.5T557 0H207v678H47v94h160v690h395q350 0 532.5-183T1317 745zm-111-4q0 314-159.5 472.5T578 1372H309V772h406v-94H309V90h242q655 0 655 651z"/><glyph unicode="Ñ" horiz-adv-x="1477" d="M207 0zm1063 0h-103L301 1298h-8q12-232 12-350V0h-98v1462h102l865-1296h6q-9 180-9 342v954h99V0zM897 1581q-36 0-75 18.5T721 1671q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T473 1581h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="Ã’" horiz-adv-x="1565" d="M129 0zm1307 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733zm645 846h-69q-96 79-188.5 171.5T502 1890v17h142q26-48 98.5-142T885 1595v-16z"/><glyph unicode="Ó" horiz-adv-x="1565" d="M129 0zm1307 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733zm446 862q73 79 144.5 171.5T928 1907h141v-17q-36-52-122.5-138T756 1579h-70v16z"/><glyph unicode="Ô" horiz-adv-x="1565" d="M129 0zm1307 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733zm252 862q62 67 131.5 156T734 1907h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Õ" horiz-adv-x="1565" d="M129 0zm1307 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733zm700 848q-36 0-75 18.5T764 1671q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T516 1581h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="Ö" horiz-adv-x="1565" d="M129 0zm1307 733q0-348-174-550.5T782-20q-305 0-479 202.5T129 735q0 349 175.5 549.5T784 1485q306 0 479-201.5T1436 733zm-1196 0q0-314 140-485.5T782 76q264 0 403.5 170T1325 733q0 316-139.5 484.5T784 1386q-261 0-402.5-170T240 733zm289 994q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="×" d="M584 780l409 408 58-58-408-407 406-408-58-57-407 408-406-408-57 57 405 408-407 407 57 58z"/><glyph unicode="Ø" horiz-adv-x="1565" d="M1436 733q0-348-174-550.5T782-20q-236 0-395 120L301-20l-74 59 90 127Q129 366 129 735q0 349 175.5 549.5T784 1485q232 0 392-121l108 152 72-60-111-153q191-207 191-570zm-111 0q0 315-139 486L444 182Q577 76 782 76q264 0 403.5 170T1325 733zm-1085 0q0-312 139-483l739 1034q-133 102-334 102-261 0-402.5-170T240 733z"/><glyph unicode="Ù" horiz-adv-x="1473" d="M190 0zm1092 1462V516q0-252-146-394T729-20q-254 0-396.5 142.5T190 520v942h103V516q0-211 117-328.5T741 70q209 0 324 115.5T1180 506v956h102zm-449 117h-69q-96 79-188.5 171.5T450 1890v17h142q26-48 98.5-142T833 1595v-16z"/><glyph unicode="Ú" horiz-adv-x="1473" d="M190 0zm1092 1462V516q0-252-146-394T729-20q-254 0-396.5 142.5T190 520v942h103V516q0-211 117-328.5T741 70q209 0 324 115.5T1180 506v956h102zm-649 133q73 79 144.5 171.5T875 1907h141v-17q-36-52-122.5-138T703 1579h-70v16z"/><glyph unicode="Û" horiz-adv-x="1473" d="M190 0zm1092 1462V516q0-252-146-394T729-20q-254 0-396.5 142.5T190 520v942h103V516q0-211 117-328.5T741 70q209 0 324 115.5T1180 506v956h102zm-838 133q62 67 131.5 156T686 1907h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Ãœ" horiz-adv-x="1473" d="M190 0zm1092 1462V516q0-252-146-394T729-20q-254 0-396.5 142.5T190 520v942h103V516q0-211 117-328.5T741 70q209 0 324 115.5T1180 506v956h102zm-801 265q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="Ã" horiz-adv-x="1081" d="M0 0zm543 662l428 800h110L594 565V0H489v557L0 1462h117zm-109 933q73 79 144.5 171.5T676 1907h141v-17q-36-52-122.5-138T504 1579h-70v16z"/><glyph unicode="Þ" horiz-adv-x="1198" d="M1087 778q0-212-144-325T535 340H309V0H207v1462h102v-264h256q522 0 522-420zM309 428h201q247 0 357 81.5T977 774q0 169-104 250.5T551 1106H309V428z"/><glyph unicode="ß" horiz-adv-x="1194" d="M961 1284q0-139-139-250-81-64-110.5-100.5T682 858q0-44 14.5-68t51.5-57 102-78q106-75 151.5-124.5t68-103T1092 307q0-156-88-241.5T758-20q-95 0-174.5 18.5T457 47v107q65-38 148.5-62T758 68q114 0 174.5 54.5T993 283q0 83-39 144T805 563q-127 87-175 147t-48 146q0 60 32.5 110T721 1074q74 57 106.5 105.5T860 1286q0 93-70 143t-202 50q-145 0-226-69t-81-196V0h-99v1206q0 173 103.5 267t292.5 94q188 0 285.5-72.5T961 1284z"/><glyph unicode="à " horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zm196 1171h-69q-96 79-188.5 171.5T255 1552v17h142q26-48 98.5-142T638 1257v-16z"/><glyph unicode="á" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zm-20 1187q73 79 144.5 171.5T664 1569h141v-17q-36-52-122.5-138T492 1241h-70v16z"/><glyph unicode="â" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zM251 1257q62 67 131.5 156T493 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="ã" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zm255 1173q-36 0-75 18.5T521 1333q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T273 1243h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="ä" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zM282 1389q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="Ã¥" horiz-adv-x="1085" d="M98 0zm744 0l-25 172h-8Q727 67 640.5 23.5T436-20q-160 0-249 82T98 289q0 159 132.5 247T614 629l207 6v72q0 155-63 234t-203 79q-151 0-313-84l-37 86q179 84 354 84 179 0 267.5-93T915 723V0h-73zM442 70q174 0 274.5 99.5T817 446v107l-190-8q-229-11-326.5-71.5T203 285q0-102 62.5-158.5T442 70zm317 1386q0-97-60-155t-157-58-157 58-60 155q0 94 60 152.5t157 58.5 157-59 60-152zm-354 0q0-66 37.5-103.5T542 1315t99.5 37.5T679 1456q0 64-39 101.5t-98 37.5q-62 0-99.5-38T405 1456z"/><glyph unicode="æ" horiz-adv-x="1731" d="M1243-20q-295 0-397 256-68-133-168-194.5T426-20q-156 0-242 82.5T98 289q0 154 125 243t377 97l201 6v72q0 155-61.5 234T541 1020q-148 0-305-84l-37 86q173 84 346 84 261 0 325-211 111 213 347 213 184 0 289.5-134.5T1612 610v-80H897q0-460 348-460 85 0 150 12t174 57V49q-92-41-165-55t-161-14zM434 70q169 0 266 99.5T797 446v107l-187-8q-219-11-313-71.5T203 285q0-102 61-158.5T434 70zm783 950q-284 0-314-402h604q0 188-77.5 295T1217 1020z"/><glyph unicode="ç" horiz-adv-x="973" d="M119 0zm497-20q-233 0-365 147T119 537q0 270 137 420.5T631 1108q141 0 270-49l-27-88q-141 47-245 47-200 0-303-123.5T223 539q0-220 103-344.5T614 70q148 0 275 53V31Q785-20 616-20zm107-271q0-100-67.5-150.5T467-492q-68 0-94 11v88q30-10 92-10 78 0 119 28t41 80q0 94-193 121L525 0h96l-66-117q168-37 168-174z"/><glyph unicode="è" horiz-adv-x="1124" d="M119 0zm502-20q-237 0-369.5 146T119 535q0 260 128 416.5T592 1108q192 0 303-134t111-364v-80H223q2-224 104.5-342T621 70q93 0 163.5 13T963 139V49Q871 9 793-5.5T621-20zm-29 1040q-157 0-252-103.5T229 618h672q0 189-82 295.5T592 1020zm93 221h-69q-96 79-188.5 171.5T302 1552v17h142q26-48 98.5-142T685 1257v-16z"/><glyph unicode="é" horiz-adv-x="1124" d="M119 0zm502-20q-237 0-369.5 146T119 535q0 260 128 416.5T592 1108q192 0 303-134t111-364v-80H223q2-224 104.5-342T621 70q93 0 163.5 13T963 139V49Q871 9 793-5.5T621-20zm-29 1040q-157 0-252-103.5T229 618h672q0 189-82 295.5T592 1020zm-140 237q73 79 144.5 171.5T694 1569h141v-17q-36-52-122.5-138T522 1241h-70v16z"/><glyph unicode="ê" horiz-adv-x="1124" d="M119 0zm502-20q-237 0-369.5 146T119 535q0 260 128 416.5T592 1108q192 0 303-134t111-364v-80H223q2-224 104.5-342T621 70q93 0 163.5 13T963 139V49Q871 9 793-5.5T621-20zm-29 1040q-157 0-252-103.5T229 618h672q0 189-82 295.5T592 1020zm-302 237q62 67 131.5 156T532 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="ë" horiz-adv-x="1124" d="M119 0zm502-20q-237 0-369.5 146T119 535q0 260 128 416.5T592 1108q192 0 303-134t111-364v-80H223q2-224 104.5-342T621 70q93 0 163.5 13T963 139V49Q871 9 793-5.5T621-20zm-29 1040q-157 0-252-103.5T229 618h672q0 189-82 295.5T592 1020zm-261 369q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ì" horiz-adv-x="463" d="M0 0zm281 0h-99v1087h99V0zm68 1241h-69q-96 79-188.5 171.5T-34 1552v17h142q26-48 98.5-142T349 1257v-16z"/><glyph unicode="Ã" horiz-adv-x="463" d="M107 0zm174 0h-99v1087h99V0zM107 1257q73 79 144.5 171.5T349 1569h141v-17q-36-52-122.5-138T177 1241h-70v16z"/><glyph unicode="î" horiz-adv-x="463" d="M0 0zm281 0h-99v1087h99V0zM-58 1257q62 67 131.5 156T184 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="ï" horiz-adv-x="463" d="M0 0zm281 0h-99v1087h99V0zM-21 1389q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ð" horiz-adv-x="1174" d="M1055 559q0-276-124-427.5T582-20q-214 0-339.5 130T117 471q0 228 126.5 357.5T586 958q108 0 187.5-33T922 829l4 2q-64 270-269 459l-270-157-49 77 244 146q-86 62-199 119l45 81q147-69 248-145l225 137 49-84-202-121q154-151 230.5-353t76.5-431zm-105-2q0 146-97 228.5T586 868q-185 0-275-100.5T221 463q0-186 94.5-289.5T584 70q179 0 272.5 123T950 557z"/><glyph unicode="ñ" horiz-adv-x="1208" d="M182 0zm758 0v705q0 164-69 238.5T657 1018q-195 0-285.5-98.5T281 600V0h-99v1087h84l19-149h6q106 170 377 170 370 0 370-397V0h-98zM779 1243q-36 0-75 18.5T603 1333q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T355 1243h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="ò" horiz-adv-x="1200" d="M119 0zm962 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545zm495 696h-69q-96 79-188.5 171.5T335 1552v17h142q26-48 98.5-142T718 1257v-16z"/><glyph unicode="ó" horiz-adv-x="1200" d="M119 0zm962 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545zm276 712q73 79 144.5 171.5T741 1569h141v-17q-36-52-122.5-138T569 1241h-70v16z"/><glyph unicode="ô" horiz-adv-x="1200" d="M119 0zm962 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545zm86 712q62 67 131.5 156T551 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="õ" horiz-adv-x="1200" d="M119 0zm962 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545zm538 698q-36 0-75 18.5T585 1333q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T337 1243h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph unicode="ö" horiz-adv-x="1200" d="M119 0zm962 545q0-266-129-415.5T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q224 0 351.5-150.5T1081 545zm-858 0q0-224 98.5-349.5T600 70t278.5 125.5T977 545q0 225-99.5 349T598 1018 320.5 894.5 223 545zm123 844q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="÷" d="M111 682v82h948v-82H111zm393 393q0 99 80 99 82 0 82-99 0-52-23.5-75T584 977q-34 0-57 23t-23 75zm0-704q0 98 80 98 82 0 82-98 0-53-23.5-76T584 272q-34 0-57 23t-23 76z"/><glyph unicode="ø" horiz-adv-x="1200" d="M1081 545q0-266-129-415.5T596-20q-173 0-291 98L219-35l-72 58 93 120Q119 296 119 545q0 266 129 414.5T602 1108q179 0 301-104l96 124 74-55-104-137q112-147 112-391zm-858 0q0-200 78-322l543 705q-98 90-246 90-180 0-277.5-123.5T223 545zm754 0q0 190-72 309L362 152q94-82 238-82 180 0 278.5 125.5T977 545z"/><glyph unicode="ù" horiz-adv-x="1208" d="M170 0zm98 1087V383q0-164 69-238.5T551 70q194 0 285.5 98T928 487v600h98V0h-84l-18 150h-6Q812-20 541-20q-371 0-371 397v710h98zm419 154h-69q-96 79-188.5 171.5T304 1552v17h142q26-48 98.5-142T687 1257v-16z"/><glyph unicode="ú" horiz-adv-x="1208" d="M170 0zm98 1087V383q0-164 69-238.5T551 70q194 0 285.5 98T928 487v600h98V0h-84l-18 150h-6Q812-20 541-20q-371 0-371 397v710h98zm227 170q73 79 144.5 171.5T737 1569h141v-17q-36-52-122.5-138T565 1241h-70v16z"/><glyph unicode="û" horiz-adv-x="1208" d="M170 0zm98 1087V383q0-164 69-238.5T551 70q194 0 285.5 98T928 487v600h98V0h-84l-18 150h-6Q812-20 541-20q-371 0-371 397v710h98zm45 170q62 67 131.5 156T555 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="ü" horiz-adv-x="1208" d="M170 0zm98 1087V383q0-164 69-238.5T551 70q194 0 285.5 98T928 487v600h98V0h-84l-18 150h-6Q812-20 541-20q-371 0-371 397v710h98zm82 302q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ý" horiz-adv-x="940" d="M0 0zm0 1087h102l230-610Q437 196 465 98h6q42 129 137 385l230 604h102L453-176q-59-154-99-208t-93.5-81T131-492q-57 0-127 21v86q58-16 125-16 51 0 90 24t70.5 74.5 73 160T416 0zm361 170q73 79 144.5 171.5T603 1569h141v-17q-36-52-122.5-138T431 1241h-70v16z"/><glyph unicode="þ" horiz-adv-x="1219" d="M281 918q114 190 368 190 220 0 335.5-144.5T1100 543q0-268-121.5-415.5T647-20q-251 0-366 188h-7l3-84q4-74 4-162v-414h-99v2048h99v-391l-7-247h7zM645 68q167 0 258.5 124T995 539q0 479-348 479-193 0-279.5-105T281 559v-18q0-255 85.5-364T645 68z"/><glyph unicode="ÿ" horiz-adv-x="940" d="M0 0zm0 1087h102l230-610Q437 196 465 98h6q42 129 137 385l230 604h102L453-176q-59-154-99-208t-93.5-81T131-492q-57 0-127 21v86q58-16 125-16 51 0 90 24t70.5 74.5 73 160T416 0zm214 302q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ı" horiz-adv-x="463" d="M281 0h-99v1087h99V0z"/><glyph unicode="Å’" horiz-adv-x="1839" d="M1714 0H958q-76-16-176-16-305 0-479 200T129 735q0 347 174.5 545.5T784 1479q78 0 183-17h747v-94h-655V815h616v-94h-616V94h655V0zM782 80q109 0 174 18v1266q-62 16-172 16-262 0-403-167.5T240 733q0-315 140.5-484T782 80z"/><glyph unicode="Å“" horiz-adv-x="1942" d="M1438-20q-156 0-266.5 67.5T1006 246Q947 118 848 49T596-20q-143 0-252 69T177 247t-58 298q0 266 129 414.5T602 1108q151 0 251-70t157-209q110 279 399 279 192 0 303-134t111-364v-80h-762q2-230 100.5-345T1438 70q93 0 163.5 13t178.5 56V49q-92-40-170-54.5T1438-20zM223 545q0-224 98.5-349.5T600 70q174 0 265 122.5T956 545q0 224-93 348.5T598 1018q-180 0-277.5-123.5T223 545zm1186 475q-155 0-242-104t-102-298h653q0 189-82 295.5T1409 1020z"/><glyph unicode="Ÿ" horiz-adv-x="1081" d="M0 0zm543 662l428 800h110L594 565V0H489v557L0 1462h117zM288 1727q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86zm381 0q0 46 15.5 66t47.5 20q64 0 64-86t-64-86q-63 0-63 86z"/><glyph unicode="ˆ" horiz-adv-x="1182" d="M299 1257q62 67 131.5 156T541 1569h98q68-120 242-312v-16h-70q-122 101-221 207-108-114-221-207h-70v16z"/><glyph unicode="Ëš" horiz-adv-x="1182" d="M805 1456q0-97-60-155t-157-58-157 58-60 155q0 94 60 152.5t157 58.5 157-59 60-152zm-354 0q0-66 37.5-103.5T588 1315t99.5 37.5T725 1456q0 64-39 101.5t-98 37.5q-62 0-99.5-38T451 1456z"/><glyph unicode="Ëœ" horiz-adv-x="1182" d="M780 1243q-36 0-75 18.5T604 1333q-32 26-62.5 46t-62.5 20q-45 0-75-34.5T356 1243h-73q10 111 63 174.5t137 63.5q48 0 88-25t82-59q34-28 66-50t61-22q46 0 77 36.5t48 119.5h76q-16-116-69-177t-132-61z"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="635"/><glyph horiz-adv-x="476"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="238"/><glyph horiz-adv-x="381"/><glyph horiz-adv-x="105"/><glyph unicode="â€" horiz-adv-x="659" d="M92 512v82h475v-82H92z"/><glyph unicode="‑" horiz-adv-x="659" d="M92 512v82h475v-82H92z"/><glyph unicode="‒" horiz-adv-x="659" d="M92 512v82h475v-82H92z"/><glyph unicode="–" horiz-adv-x="1024" d="M82 512v82h860v-82H82z"/><glyph unicode="—" horiz-adv-x="2048" d="M82 512v82h1884v-82H82z"/><glyph unicode="‘" horiz-adv-x="297" d="M41 961l-12 20q32 112 81.5 251t92.5 230h65q-30-101-64.5-257T158 961H41z"/><glyph unicode="’" horiz-adv-x="297" d="M256 1462l12-20q-75-265-174-481H29q29 96 61 241.5t49 259.5h117z"/><glyph unicode="‚" horiz-adv-x="451" d="M68 0zm227 238l12-20Q232-47 133-263H68q29 96 61 241.5T178 238h117z"/><glyph unicode="“" horiz-adv-x="614" d="M358 961l-12 20q34 120 83 255t91 226h66q-30-98-63-248.5T475 961H358zm-317 0l-12 20q32 112 81.5 251t92.5 230h65q-30-101-64.5-257T158 961H41z"/><glyph unicode="â€" horiz-adv-x="614" d="M256 1462l12-20q-75-265-174-481H29q29 96 61 241.5t49 259.5h117zm317 0l13-20q-36-128-85-261t-89-220h-66q30 98 63 248.5t48 252.5h116z"/><glyph unicode="„" horiz-adv-x="768" d="M68 0zm227 238l12-20Q232-47 133-263H68q29 96 61 241.5T178 238h117zm317 0l13-20Q589 90 540-43t-89-220h-66q30 98 63 248.5T496 238h116z"/><glyph unicode="•" horiz-adv-x="770" d="M231 748q0 89 40.5 134.5T385 928t113.5-47T539 748q0-85-41-133t-113-48-113 47-41 134z"/><glyph unicode="…" horiz-adv-x="1466" d="M162 0zm0 78q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98zm489 0q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98zm490 0q0 98 80 98 82 0 82-98t-82-98q-80 0-80 98z"/><glyph horiz-adv-x="381"/><glyph unicode="‹" horiz-adv-x="524" d="M82 543l309 393 62-43-254-363 254-362-62-43L82 516v27z"/><glyph unicode="›" horiz-adv-x="524" d="M442 518L133 125l-61 43 254 362L72 893l61 43 309-391v-27z"/><glyph unicode="â„" horiz-adv-x="246" d="M573 1462L-238 0h-94l811 1462h94z"/><glyph horiz-adv-x="476"/><glyph unicode="â´" horiz-adv-x="688" d="M657 827H528V586h-90v241H25v60l407 581h96V905h129v-78zm-219 78v221q0 132 8 232-6-12-21.5-35.5T129 905h309z"/><glyph unicode="€" d="M803 1397q-174 0-288-125.5T360 907h502v-82H352l-4-104v-24q0-65 4-87h449v-82H358q30-217 147.5-338.5T807 68q148 0 287 65V39Q1013 5 943.5-7.5T803-20q-228 0-367.5 140T254 528H74v82h172q-4 38-4 113l4 102H74v82h184q39 272 183 425t362 153q88 0 161-17t148-57l-39-86q-132 72-270 72z"/><glyph unicode="â„¢" horiz-adv-x="1485" d="M313 741h-86v643H10v78h522v-78H313V741zm600 0l-221 609h-6l4-201V741h-82v721h125l221-606 224 606h125V741h-86v398l4 207h-7L987 741h-74z"/><glyph unicode="−" d="M111 682v82h948v-82H111z"/><glyph unicode="" horiz-adv-x="1085" d="M0 1085h1085V0H0v1085z"/><glyph horiz-adv-x="1219" d="M0 0z"/><hkern u1="&quot;" u2="Ÿ" k="-20"/><hkern u1="&quot;" u2="Å“" k="123"/><hkern u1="&quot;" u2="ü" k="61"/><hkern u1="&quot;" u2="û" k="61"/><hkern u1="&quot;" u2="ú" k="61"/><hkern u1="&quot;" u2="ù" k="61"/><hkern u1="&quot;" u2="ø" k="123"/><hkern u1="&quot;" u2="ö" k="123"/><hkern u1="&quot;" u2="õ" k="123"/><hkern u1="&quot;" u2="ô" k="123"/><hkern u1="&quot;" u2="ó" k="123"/><hkern u1="&quot;" u2="ò" k="123"/><hkern u1="&quot;" u2="ë" k="123"/><hkern u1="&quot;" u2="ê" k="123"/><hkern u1="&quot;" u2="é" k="123"/><hkern u1="&quot;" u2="è" k="123"/><hkern u1="&quot;" u2="ç" k="123"/><hkern u1="&quot;" u2="æ" k="82"/><hkern u1="&quot;" u2="Ã¥" k="82"/><hkern u1="&quot;" u2="ä" k="82"/><hkern u1="&quot;" u2="ã" k="82"/><hkern u1="&quot;" u2="â" k="82"/><hkern u1="&quot;" u2="á" k="82"/><hkern u1="&quot;" u2="à " k="123"/><hkern u1="&quot;" u2="Ã" k="-20"/><hkern u1="&quot;" u2="Ã…" k="143"/><hkern u1="&quot;" u2="Ä" k="143"/><hkern u1="&quot;" u2="Ã" k="143"/><hkern u1="&quot;" u2="Â" k="143"/><hkern u1="&quot;" u2="Ã" k="143"/><hkern u1="&quot;" u2="À" k="143"/><hkern u1="&quot;" u2="u" k="61"/><hkern u1="&quot;" u2="s" k="61"/><hkern u1="&quot;" u2="r" k="61"/><hkern u1="&quot;" u2="q" k="123"/><hkern u1="&quot;" u2="p" k="61"/><hkern u1="&quot;" u2="o" k="123"/><hkern u1="&quot;" u2="n" k="61"/><hkern u1="&quot;" u2="m" k="61"/><hkern u1="&quot;" u2="g" k="61"/><hkern u1="&quot;" u2="e" k="123"/><hkern u1="&quot;" u2="d" k="123"/><hkern u1="&quot;" u2="c" k="123"/><hkern u1="&quot;" u2="a" k="82"/><hkern u1="&quot;" u2="Y" k="-20"/><hkern u1="&quot;" u2="W" k="-41"/><hkern u1="&quot;" u2="V" k="-41"/><hkern u1="&quot;" u2="T" k="-41"/><hkern u1="&quot;" u2="A" k="143"/><hkern u1="'" u2="Ÿ" k="-20"/><hkern u1="'" u2="Å“" k="123"/><hkern u1="'" u2="ü" k="61"/><hkern u1="'" u2="û" k="61"/><hkern u1="'" u2="ú" k="61"/><hkern u1="'" u2="ù" k="61"/><hkern u1="'" u2="ø" k="123"/><hkern u1="'" u2="ö" k="123"/><hkern u1="'" u2="õ" k="123"/><hkern u1="'" u2="ô" k="123"/><hkern u1="'" u2="ó" k="123"/><hkern u1="'" u2="ò" k="123"/><hkern u1="'" u2="ë" k="123"/><hkern u1="'" u2="ê" k="123"/><hkern u1="'" u2="é" k="123"/><hkern u1="'" u2="è" k="123"/><hkern u1="'" u2="ç" k="123"/><hkern u1="'" u2="æ" k="82"/><hkern u1="'" u2="Ã¥" k="82"/><hkern u1="'" u2="ä" k="82"/><hkern u1="'" u2="ã" k="82"/><hkern u1="'" u2="â" k="82"/><hkern u1="'" u2="á" k="82"/><hkern u1="'" u2="à " k="123"/><hkern u1="'" u2="Ã" k="-20"/><hkern u1="'" u2="Ã…" k="143"/><hkern u1="'" u2="Ä" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="Â" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="À" k="143"/><hkern u1="'" u2="u" k="61"/><hkern u1="'" u2="s" k="61"/><hkern u1="'" u2="r" k="61"/><hkern u1="'" u2="q" k="123"/><hkern u1="'" u2="p" k="61"/><hkern u1="'" u2="o" k="123"/><hkern u1="'" u2="n" k="61"/><hkern u1="'" u2="m" k="61"/><hkern u1="'" u2="g" k="61"/><hkern u1="'" u2="e" k="123"/><hkern u1="'" u2="d" k="123"/><hkern u1="'" u2="c" k="123"/><hkern u1="'" u2="a" k="82"/><hkern u1="'" u2="Y" k="-20"/><hkern u1="'" u2="W" k="-41"/><hkern u1="'" u2="V" k="-41"/><hkern u1="'" u2="T" k="-41"/><hkern u1="'" u2="A" k="143"/><hkern u1="(" u2="J" k="-184"/><hkern u1="," u2="Ÿ" k="123"/><hkern u1="," u2="Å’" k="102"/><hkern u1="," u2="Ã" k="123"/><hkern u1="," u2="Ãœ" k="41"/><hkern u1="," u2="Û" k="41"/><hkern u1="," u2="Ú" k="41"/><hkern u1="," u2="Ù" k="41"/><hkern u1="," u2="Ø" k="102"/><hkern u1="," u2="Ö" k="102"/><hkern u1="," u2="Õ" k="102"/><hkern u1="," u2="Ô" k="102"/><hkern u1="," u2="Ó" k="102"/><hkern u1="," u2="Ã’" k="102"/><hkern u1="," u2="Ç" k="102"/><hkern u1="," u2="Y" k="123"/><hkern u1="," u2="W" k="123"/><hkern u1="," u2="V" k="123"/><hkern u1="," u2="U" k="41"/><hkern u1="," u2="T" k="143"/><hkern u1="," u2="Q" k="102"/><hkern u1="," u2="O" k="102"/><hkern u1="," u2="G" k="102"/><hkern u1="," u2="C" k="102"/><hkern u1="-" u2="T" k="82"/><hkern u1="." u2="Ÿ" k="123"/><hkern u1="." u2="Å’" k="102"/><hkern u1="." u2="Ã" k="123"/><hkern u1="." u2="Ãœ" k="41"/><hkern u1="." u2="Û" k="41"/><hkern u1="." u2="Ú" k="41"/><hkern u1="." u2="Ù" k="41"/><hkern u1="." u2="Ø" k="102"/><hkern u1="." u2="Ö" k="102"/><hkern u1="." u2="Õ" k="102"/><hkern u1="." u2="Ô" k="102"/><hkern u1="." u2="Ó" k="102"/><hkern u1="." u2="Ã’" k="102"/><hkern u1="." u2="Ç" k="102"/><hkern u1="." u2="Y" k="123"/><hkern u1="." u2="W" k="123"/><hkern u1="." u2="V" k="123"/><hkern u1="." u2="U" k="41"/><hkern u1="." u2="T" k="143"/><hkern u1="." u2="Q" k="102"/><hkern u1="." u2="O" k="102"/><hkern u1="." u2="G" k="102"/><hkern u1="." u2="C" k="102"/><hkern u1="A" u2="â€" k="143"/><hkern u1="A" u2="’" k="143"/><hkern u1="A" u2="Ÿ" k="123"/><hkern u1="A" u2="Å’" k="41"/><hkern u1="A" u2="Ã" k="123"/><hkern u1="A" u2="Ø" k="41"/><hkern u1="A" u2="Ö" k="41"/><hkern u1="A" u2="Õ" k="41"/><hkern u1="A" u2="Ô" k="41"/><hkern u1="A" u2="Ó" k="41"/><hkern u1="A" u2="Ã’" k="41"/><hkern u1="A" u2="Ç" k="41"/><hkern u1="A" u2="Y" k="123"/><hkern u1="A" u2="W" k="82"/><hkern u1="A" u2="V" k="82"/><hkern u1="A" u2="T" k="143"/><hkern u1="A" u2="Q" k="41"/><hkern u1="A" u2="O" k="41"/><hkern u1="A" u2="J" k="-266"/><hkern u1="A" u2="G" k="41"/><hkern u1="A" u2="C" k="41"/><hkern u1="A" u2="'" k="143"/><hkern u1="A" u2="&quot;" k="143"/><hkern u1="B" u2="„" k="82"/><hkern u1="B" u2="‚" k="82"/><hkern u1="B" u2="Ÿ" k="20"/><hkern u1="B" u2="Ã" k="20"/><hkern u1="B" u2="Ã…" k="41"/><hkern u1="B" u2="Ä" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="Â" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="À" k="41"/><hkern u1="B" u2="Z" k="20"/><hkern u1="B" u2="Y" k="20"/><hkern u1="B" u2="X" k="41"/><hkern u1="B" u2="W" k="20"/><hkern u1="B" u2="V" k="20"/><hkern u1="B" u2="T" k="61"/><hkern u1="B" u2="A" k="41"/><hkern u1="B" u2="." k="82"/><hkern u1="B" u2="," k="82"/><hkern u1="C" u2="Å’" k="41"/><hkern u1="C" u2="Ø" k="41"/><hkern u1="C" u2="Ö" k="41"/><hkern u1="C" u2="Õ" k="41"/><hkern u1="C" u2="Ô" k="41"/><hkern u1="C" u2="Ó" k="41"/><hkern u1="C" u2="Ã’" k="41"/><hkern u1="C" u2="Ç" k="41"/><hkern u1="C" u2="Q" k="41"/><hkern u1="C" u2="O" k="41"/><hkern u1="C" u2="G" k="41"/><hkern u1="C" u2="C" k="41"/><hkern u1="D" u2="„" k="82"/><hkern u1="D" u2="‚" k="82"/><hkern u1="D" u2="Ÿ" k="20"/><hkern u1="D" u2="Ã" k="20"/><hkern u1="D" u2="Ã…" k="41"/><hkern u1="D" u2="Ä" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="Â" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="À" k="41"/><hkern u1="D" u2="Z" k="20"/><hkern u1="D" u2="Y" k="20"/><hkern u1="D" u2="X" k="41"/><hkern u1="D" u2="W" k="20"/><hkern u1="D" u2="V" k="20"/><hkern u1="D" u2="T" k="61"/><hkern u1="D" u2="A" k="41"/><hkern u1="D" u2="." k="82"/><hkern u1="D" u2="," k="82"/><hkern u1="E" u2="J" k="-123"/><hkern u1="F" u2="„" k="123"/><hkern u1="F" u2="‚" k="123"/><hkern u1="F" u2="Ã…" k="41"/><hkern u1="F" u2="Ä" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="Â" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="À" k="41"/><hkern u1="F" u2="A" k="41"/><hkern u1="F" u2="?" k="-41"/><hkern u1="F" u2="." k="123"/><hkern u1="F" u2="," k="123"/><hkern u1="K" u2="Å’" k="41"/><hkern u1="K" u2="Ø" k="41"/><hkern u1="K" u2="Ö" k="41"/><hkern u1="K" u2="Õ" k="41"/><hkern u1="K" u2="Ô" k="41"/><hkern u1="K" u2="Ó" k="41"/><hkern u1="K" u2="Ã’" k="41"/><hkern u1="K" u2="Ç" k="41"/><hkern u1="K" u2="Q" k="41"/><hkern u1="K" u2="O" k="41"/><hkern u1="K" u2="G" k="41"/><hkern u1="K" u2="C" k="41"/><hkern u1="L" u2="â€" k="164"/><hkern u1="L" u2="’" k="164"/><hkern u1="L" u2="Ÿ" k="61"/><hkern u1="L" u2="Å’" k="41"/><hkern u1="L" u2="Ã" k="61"/><hkern u1="L" u2="Ãœ" k="20"/><hkern u1="L" u2="Û" k="20"/><hkern u1="L" u2="Ú" k="20"/><hkern u1="L" u2="Ù" k="20"/><hkern u1="L" u2="Ø" k="41"/><hkern u1="L" u2="Ö" k="41"/><hkern u1="L" u2="Õ" k="41"/><hkern u1="L" u2="Ô" k="41"/><hkern u1="L" u2="Ó" k="41"/><hkern u1="L" u2="Ã’" k="41"/><hkern u1="L" u2="Ç" k="41"/><hkern u1="L" u2="Y" k="61"/><hkern u1="L" u2="W" k="41"/><hkern u1="L" u2="V" k="41"/><hkern u1="L" u2="U" k="20"/><hkern u1="L" u2="T" k="41"/><hkern u1="L" u2="Q" k="41"/><hkern u1="L" u2="O" k="41"/><hkern u1="L" u2="G" k="41"/><hkern u1="L" u2="C" k="41"/><hkern u1="L" u2="'" k="164"/><hkern u1="L" u2="&quot;" k="164"/><hkern u1="O" u2="„" k="82"/><hkern u1="O" u2="‚" k="82"/><hkern u1="O" u2="Ÿ" k="20"/><hkern u1="O" u2="Ã" k="20"/><hkern u1="O" u2="Ã…" k="41"/><hkern u1="O" u2="Ä" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="Â" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="À" k="41"/><hkern u1="O" u2="Z" k="20"/><hkern u1="O" u2="Y" k="20"/><hkern u1="O" u2="X" k="41"/><hkern u1="O" u2="W" k="20"/><hkern u1="O" u2="V" k="20"/><hkern u1="O" u2="T" k="61"/><hkern u1="O" u2="A" k="41"/><hkern u1="O" u2="." k="82"/><hkern u1="O" u2="," k="82"/><hkern u1="P" u2="„" k="266"/><hkern u1="P" u2="‚" k="266"/><hkern u1="P" u2="Ã…" k="102"/><hkern u1="P" u2="Ä" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="Â" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="À" k="102"/><hkern u1="P" u2="Z" k="20"/><hkern u1="P" u2="X" k="41"/><hkern u1="P" u2="A" k="102"/><hkern u1="P" u2="." k="266"/><hkern u1="P" u2="," k="266"/><hkern u1="Q" u2="„" k="82"/><hkern u1="Q" u2="‚" k="82"/><hkern u1="Q" u2="Ÿ" k="20"/><hkern u1="Q" u2="Ã" k="20"/><hkern u1="Q" u2="Ã…" k="41"/><hkern u1="Q" u2="Ä" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="Â" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="À" k="41"/><hkern u1="Q" u2="Z" k="20"/><hkern u1="Q" u2="Y" k="20"/><hkern u1="Q" u2="X" k="41"/><hkern u1="Q" u2="W" k="20"/><hkern u1="Q" u2="V" k="20"/><hkern u1="Q" u2="T" k="61"/><hkern u1="Q" u2="A" k="41"/><hkern u1="Q" u2="." k="82"/><hkern u1="Q" u2="," k="82"/><hkern u1="T" u2="„" k="123"/><hkern u1="T" u2="‚" k="123"/><hkern u1="T" u2="—" k="82"/><hkern u1="T" u2="–" k="82"/><hkern u1="T" u2="Å“" k="143"/><hkern u1="T" u2="Å’" k="41"/><hkern u1="T" u2="ý" k="41"/><hkern u1="T" u2="ü" k="102"/><hkern u1="T" u2="û" k="102"/><hkern u1="T" u2="ú" k="102"/><hkern u1="T" u2="ù" k="102"/><hkern u1="T" u2="ø" k="143"/><hkern u1="T" u2="ö" k="143"/><hkern u1="T" u2="õ" k="143"/><hkern u1="T" u2="ô" k="143"/><hkern u1="T" u2="ó" k="143"/><hkern u1="T" u2="ò" k="143"/><hkern u1="T" u2="ë" k="143"/><hkern u1="T" u2="ê" k="143"/><hkern u1="T" u2="é" k="143"/><hkern u1="T" u2="è" k="143"/><hkern u1="T" u2="ç" k="143"/><hkern u1="T" u2="æ" k="164"/><hkern u1="T" u2="Ã¥" k="164"/><hkern u1="T" u2="ä" k="164"/><hkern u1="T" u2="ã" k="164"/><hkern u1="T" u2="â" k="164"/><hkern u1="T" u2="á" k="164"/><hkern u1="T" u2="à " k="143"/><hkern u1="T" u2="Ø" k="41"/><hkern u1="T" u2="Ö" k="41"/><hkern u1="T" u2="Õ" k="41"/><hkern u1="T" u2="Ô" k="41"/><hkern u1="T" u2="Ó" k="41"/><hkern u1="T" u2="Ã’" k="41"/><hkern u1="T" u2="Ç" k="41"/><hkern u1="T" u2="Ã…" k="143"/><hkern u1="T" u2="Ä" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="Â" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="À" k="143"/><hkern u1="T" u2="z" k="82"/><hkern u1="T" u2="y" k="41"/><hkern u1="T" u2="x" k="41"/><hkern u1="T" u2="w" k="41"/><hkern u1="T" u2="v" k="41"/><hkern u1="T" u2="u" k="102"/><hkern u1="T" u2="s" k="123"/><hkern u1="T" u2="r" k="102"/><hkern u1="T" u2="q" k="143"/><hkern u1="T" u2="p" k="102"/><hkern u1="T" u2="o" k="143"/><hkern u1="T" u2="n" k="102"/><hkern u1="T" u2="m" k="102"/><hkern u1="T" u2="g" k="143"/><hkern u1="T" u2="e" k="143"/><hkern u1="T" u2="d" k="143"/><hkern u1="T" u2="c" k="143"/><hkern u1="T" u2="a" k="164"/><hkern u1="T" u2="T" k="-41"/><hkern u1="T" u2="Q" k="41"/><hkern u1="T" u2="O" k="41"/><hkern u1="T" u2="G" k="41"/><hkern u1="T" u2="C" k="41"/><hkern u1="T" u2="A" k="143"/><hkern u1="T" u2="?" k="-41"/><hkern u1="T" u2="." k="123"/><hkern u1="T" u2="-" k="82"/><hkern u1="T" u2="," k="123"/><hkern u1="U" u2="„" k="41"/><hkern u1="U" u2="‚" k="41"/><hkern u1="U" u2="Ã…" k="20"/><hkern u1="U" u2="Ä" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="Â" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="À" k="20"/><hkern u1="U" u2="A" k="20"/><hkern u1="U" u2="." k="41"/><hkern u1="U" u2="," k="41"/><hkern u1="V" u2="„" k="102"/><hkern u1="V" u2="‚" k="102"/><hkern u1="V" u2="Å“" k="41"/><hkern u1="V" u2="Å’" k="20"/><hkern u1="V" u2="ü" k="20"/><hkern u1="V" u2="û" k="20"/><hkern u1="V" u2="ú" k="20"/><hkern u1="V" u2="ù" k="20"/><hkern u1="V" u2="ø" k="41"/><hkern u1="V" u2="ö" k="41"/><hkern u1="V" u2="õ" k="41"/><hkern u1="V" u2="ô" k="41"/><hkern u1="V" u2="ó" k="41"/><hkern u1="V" u2="ò" k="41"/><hkern u1="V" u2="ë" k="41"/><hkern u1="V" u2="ê" k="41"/><hkern u1="V" u2="é" k="41"/><hkern u1="V" u2="è" k="41"/><hkern u1="V" u2="ç" k="41"/><hkern u1="V" u2="æ" k="41"/><hkern u1="V" u2="Ã¥" k="41"/><hkern u1="V" u2="ä" k="41"/><hkern u1="V" u2="ã" k="41"/><hkern u1="V" u2="â" k="41"/><hkern u1="V" u2="á" k="41"/><hkern u1="V" u2="à " k="41"/><hkern u1="V" u2="Ø" k="20"/><hkern u1="V" u2="Ö" k="20"/><hkern u1="V" u2="Õ" k="20"/><hkern u1="V" u2="Ô" k="20"/><hkern u1="V" u2="Ó" k="20"/><hkern u1="V" u2="Ã’" k="20"/><hkern u1="V" u2="Ç" k="20"/><hkern u1="V" u2="Ã…" k="82"/><hkern u1="V" u2="Ä" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="Â" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="À" k="82"/><hkern u1="V" u2="u" k="20"/><hkern u1="V" u2="s" k="20"/><hkern u1="V" u2="r" k="20"/><hkern u1="V" u2="q" k="41"/><hkern u1="V" u2="p" k="20"/><hkern u1="V" u2="o" k="41"/><hkern u1="V" u2="n" k="20"/><hkern u1="V" u2="m" k="20"/><hkern u1="V" u2="g" k="20"/><hkern u1="V" u2="e" k="41"/><hkern u1="V" u2="d" k="41"/><hkern u1="V" u2="c" k="41"/><hkern u1="V" u2="a" k="41"/><hkern u1="V" u2="Q" k="20"/><hkern u1="V" u2="O" k="20"/><hkern u1="V" u2="G" k="20"/><hkern u1="V" u2="C" k="20"/><hkern u1="V" u2="A" k="82"/><hkern u1="V" u2="?" k="-41"/><hkern u1="V" u2="." k="102"/><hkern u1="V" u2="," k="102"/><hkern u1="W" u2="„" k="102"/><hkern u1="W" u2="‚" k="102"/><hkern u1="W" u2="Å“" k="41"/><hkern u1="W" u2="Å’" k="20"/><hkern u1="W" u2="ü" k="20"/><hkern u1="W" u2="û" k="20"/><hkern u1="W" u2="ú" k="20"/><hkern u1="W" u2="ù" k="20"/><hkern u1="W" u2="ø" k="41"/><hkern u1="W" u2="ö" k="41"/><hkern u1="W" u2="õ" k="41"/><hkern u1="W" u2="ô" k="41"/><hkern u1="W" u2="ó" k="41"/><hkern u1="W" u2="ò" k="41"/><hkern u1="W" u2="ë" k="41"/><hkern u1="W" u2="ê" k="41"/><hkern u1="W" u2="é" k="41"/><hkern u1="W" u2="è" k="41"/><hkern u1="W" u2="ç" k="41"/><hkern u1="W" u2="æ" k="41"/><hkern u1="W" u2="Ã¥" k="41"/><hkern u1="W" u2="ä" k="41"/><hkern u1="W" u2="ã" k="41"/><hkern u1="W" u2="â" k="41"/><hkern u1="W" u2="á" k="41"/><hkern u1="W" u2="à " k="41"/><hkern u1="W" u2="Ø" k="20"/><hkern u1="W" u2="Ö" k="20"/><hkern u1="W" u2="Õ" k="20"/><hkern u1="W" u2="Ô" k="20"/><hkern u1="W" u2="Ó" k="20"/><hkern u1="W" u2="Ã’" k="20"/><hkern u1="W" u2="Ç" k="20"/><hkern u1="W" u2="Ã…" k="82"/><hkern u1="W" u2="Ä" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="Â" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="À" k="82"/><hkern u1="W" u2="u" k="20"/><hkern u1="W" u2="s" k="20"/><hkern u1="W" u2="r" k="20"/><hkern u1="W" u2="q" k="41"/><hkern u1="W" u2="p" k="20"/><hkern u1="W" u2="o" k="41"/><hkern u1="W" u2="n" k="20"/><hkern u1="W" u2="m" k="20"/><hkern u1="W" u2="g" k="20"/><hkern u1="W" u2="e" k="41"/><hkern u1="W" u2="d" k="41"/><hkern u1="W" u2="c" k="41"/><hkern u1="W" u2="a" k="41"/><hkern u1="W" u2="Q" k="20"/><hkern u1="W" u2="O" k="20"/><hkern u1="W" u2="G" k="20"/><hkern u1="W" u2="C" k="20"/><hkern u1="W" u2="A" k="82"/><hkern u1="W" u2="?" k="-41"/><hkern u1="W" u2="." k="102"/><hkern u1="W" u2="," k="102"/><hkern u1="X" u2="Å’" k="41"/><hkern u1="X" u2="Ø" k="41"/><hkern u1="X" u2="Ö" k="41"/><hkern u1="X" u2="Õ" k="41"/><hkern u1="X" u2="Ô" k="41"/><hkern u1="X" u2="Ó" k="41"/><hkern u1="X" u2="Ã’" k="41"/><hkern u1="X" u2="Ç" k="41"/><hkern u1="X" u2="Q" k="41"/><hkern u1="X" u2="O" k="41"/><hkern u1="X" u2="G" k="41"/><hkern u1="X" u2="C" k="41"/><hkern u1="Y" u2="„" k="123"/><hkern u1="Y" u2="‚" k="123"/><hkern u1="Y" u2="Å“" k="102"/><hkern u1="Y" u2="Å’" k="41"/><hkern u1="Y" u2="ü" k="61"/><hkern u1="Y" u2="û" k="61"/><hkern u1="Y" u2="ú" k="61"/><hkern u1="Y" u2="ù" k="61"/><hkern u1="Y" u2="ø" k="102"/><hkern u1="Y" u2="ö" k="102"/><hkern u1="Y" u2="õ" k="102"/><hkern u1="Y" u2="ô" k="102"/><hkern u1="Y" u2="ó" k="102"/><hkern u1="Y" u2="ò" k="102"/><hkern u1="Y" u2="ë" k="102"/><hkern u1="Y" u2="ê" k="102"/><hkern u1="Y" u2="é" k="102"/><hkern u1="Y" u2="è" k="102"/><hkern u1="Y" u2="ç" k="102"/><hkern u1="Y" u2="æ" k="102"/><hkern u1="Y" u2="Ã¥" k="102"/><hkern u1="Y" u2="ä" k="102"/><hkern u1="Y" u2="ã" k="102"/><hkern u1="Y" u2="â" k="102"/><hkern u1="Y" u2="á" k="102"/><hkern u1="Y" u2="à " k="102"/><hkern u1="Y" u2="Ø" k="41"/><hkern u1="Y" u2="Ö" k="41"/><hkern u1="Y" u2="Õ" k="41"/><hkern u1="Y" u2="Ô" k="41"/><hkern u1="Y" u2="Ó" k="41"/><hkern u1="Y" u2="Ã’" k="41"/><hkern u1="Y" u2="Ç" k="41"/><hkern u1="Y" u2="Ã…" k="123"/><hkern u1="Y" u2="Ä" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="Â" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="À" k="123"/><hkern u1="Y" u2="z" k="41"/><hkern u1="Y" u2="u" k="61"/><hkern u1="Y" u2="s" k="82"/><hkern u1="Y" u2="r" k="61"/><hkern u1="Y" u2="q" k="102"/><hkern u1="Y" u2="p" k="61"/><hkern u1="Y" u2="o" k="102"/><hkern u1="Y" u2="n" k="61"/><hkern u1="Y" u2="m" k="61"/><hkern u1="Y" u2="g" k="41"/><hkern u1="Y" u2="e" k="102"/><hkern u1="Y" u2="d" k="102"/><hkern u1="Y" u2="c" k="102"/><hkern u1="Y" u2="a" k="102"/><hkern u1="Y" u2="Q" k="41"/><hkern u1="Y" u2="O" k="41"/><hkern u1="Y" u2="G" k="41"/><hkern u1="Y" u2="C" k="41"/><hkern u1="Y" u2="A" k="123"/><hkern u1="Y" u2="?" k="-41"/><hkern u1="Y" u2="." k="123"/><hkern u1="Y" u2="," k="123"/><hkern u1="Z" u2="Å’" k="20"/><hkern u1="Z" u2="Ø" k="20"/><hkern u1="Z" u2="Ö" k="20"/><hkern u1="Z" u2="Õ" k="20"/><hkern u1="Z" u2="Ô" k="20"/><hkern u1="Z" u2="Ó" k="20"/><hkern u1="Z" u2="Ã’" k="20"/><hkern u1="Z" u2="Ç" k="20"/><hkern u1="Z" u2="Q" k="20"/><hkern u1="Z" u2="O" k="20"/><hkern u1="Z" u2="G" k="20"/><hkern u1="Z" u2="C" k="20"/><hkern u1="[" u2="J" k="-184"/><hkern u1="a" u2="â€" k="20"/><hkern u1="a" u2="’" k="20"/><hkern u1="a" u2="'" k="20"/><hkern u1="a" u2="&quot;" k="20"/><hkern u1="b" u2="â€" k="20"/><hkern u1="b" u2="’" k="20"/><hkern u1="b" u2="ý" k="41"/><hkern u1="b" u2="z" k="20"/><hkern u1="b" u2="y" k="41"/><hkern u1="b" u2="x" k="41"/><hkern u1="b" u2="w" k="41"/><hkern u1="b" u2="v" k="41"/><hkern u1="b" u2="'" k="20"/><hkern u1="b" u2="&quot;" k="20"/><hkern u1="c" u2="â€" k="-41"/><hkern u1="c" u2="’" k="-41"/><hkern u1="c" u2="'" k="-41"/><hkern u1="c" u2="&quot;" k="-41"/><hkern u1="e" u2="â€" k="20"/><hkern u1="e" u2="’" k="20"/><hkern u1="e" u2="ý" k="41"/><hkern u1="e" u2="z" k="20"/><hkern u1="e" u2="y" k="41"/><hkern u1="e" u2="x" k="41"/><hkern u1="e" u2="w" k="41"/><hkern u1="e" u2="v" k="41"/><hkern u1="e" u2="'" k="20"/><hkern u1="e" u2="&quot;" k="20"/><hkern u1="f" u2="â€" k="-123"/><hkern u1="f" u2="’" k="-123"/><hkern u1="f" u2="'" k="-123"/><hkern u1="f" u2="&quot;" k="-123"/><hkern u1="h" u2="â€" k="20"/><hkern u1="h" u2="’" k="20"/><hkern u1="h" u2="'" k="20"/><hkern u1="h" u2="&quot;" k="20"/><hkern u1="k" u2="Å“" k="41"/><hkern u1="k" u2="ø" k="41"/><hkern u1="k" u2="ö" k="41"/><hkern u1="k" u2="õ" k="41"/><hkern u1="k" u2="ô" k="41"/><hkern u1="k" u2="ó" k="41"/><hkern u1="k" u2="ò" k="41"/><hkern u1="k" u2="ë" k="41"/><hkern u1="k" u2="ê" k="41"/><hkern u1="k" u2="é" k="41"/><hkern u1="k" u2="è" k="41"/><hkern u1="k" u2="ç" k="41"/><hkern u1="k" u2="à " k="41"/><hkern u1="k" u2="q" k="41"/><hkern u1="k" u2="o" k="41"/><hkern u1="k" u2="e" k="41"/><hkern u1="k" u2="d" k="41"/><hkern u1="k" u2="c" k="41"/><hkern u1="m" u2="â€" k="20"/><hkern u1="m" u2="’" k="20"/><hkern u1="m" u2="'" k="20"/><hkern u1="m" u2="&quot;" k="20"/><hkern u1="n" u2="â€" k="20"/><hkern u1="n" u2="’" k="20"/><hkern u1="n" u2="'" k="20"/><hkern u1="n" u2="&quot;" k="20"/><hkern u1="o" u2="â€" k="20"/><hkern u1="o" u2="’" k="20"/><hkern u1="o" u2="ý" k="41"/><hkern u1="o" u2="z" k="20"/><hkern u1="o" u2="y" k="41"/><hkern u1="o" u2="x" k="41"/><hkern u1="o" u2="w" k="41"/><hkern u1="o" u2="v" k="41"/><hkern u1="o" u2="'" k="20"/><hkern u1="o" u2="&quot;" k="20"/><hkern u1="p" u2="â€" k="20"/><hkern u1="p" u2="’" k="20"/><hkern u1="p" u2="ý" k="41"/><hkern u1="p" u2="z" k="20"/><hkern u1="p" u2="y" k="41"/><hkern u1="p" u2="x" k="41"/><hkern u1="p" u2="w" k="41"/><hkern u1="p" u2="v" k="41"/><hkern u1="p" u2="'" k="20"/><hkern u1="p" u2="&quot;" k="20"/><hkern u1="r" u2="â€" k="-82"/><hkern u1="r" u2="’" k="-82"/><hkern u1="r" u2="Å“" k="41"/><hkern u1="r" u2="ø" k="41"/><hkern u1="r" u2="ö" k="41"/><hkern u1="r" u2="õ" k="41"/><hkern u1="r" u2="ô" k="41"/><hkern u1="r" u2="ó" k="41"/><hkern u1="r" u2="ò" k="41"/><hkern u1="r" u2="ë" k="41"/><hkern u1="r" u2="ê" k="41"/><hkern u1="r" u2="é" k="41"/><hkern u1="r" u2="è" k="41"/><hkern u1="r" u2="ç" k="41"/><hkern u1="r" u2="æ" k="41"/><hkern u1="r" u2="Ã¥" k="41"/><hkern u1="r" u2="ä" k="41"/><hkern u1="r" u2="ã" k="41"/><hkern u1="r" u2="â" k="41"/><hkern u1="r" u2="á" k="41"/><hkern u1="r" u2="à " k="41"/><hkern u1="r" u2="q" k="41"/><hkern u1="r" u2="o" k="41"/><hkern u1="r" u2="g" k="20"/><hkern u1="r" u2="e" k="41"/><hkern u1="r" u2="d" k="41"/><hkern u1="r" u2="c" k="41"/><hkern u1="r" u2="a" k="41"/><hkern u1="r" u2="'" k="-82"/><hkern u1="r" u2="&quot;" k="-82"/><hkern u1="t" u2="â€" k="-41"/><hkern u1="t" u2="’" k="-41"/><hkern u1="t" u2="'" k="-41"/><hkern u1="t" u2="&quot;" k="-41"/><hkern u1="v" u2="„" k="82"/><hkern u1="v" u2="â€" k="-82"/><hkern u1="v" u2="‚" k="82"/><hkern u1="v" u2="’" k="-82"/><hkern u1="v" u2="?" k="-41"/><hkern u1="v" u2="." k="82"/><hkern u1="v" u2="," k="82"/><hkern u1="v" u2="'" k="-82"/><hkern u1="v" u2="&quot;" k="-82"/><hkern u1="w" u2="„" k="82"/><hkern u1="w" u2="â€" k="-82"/><hkern u1="w" u2="‚" k="82"/><hkern u1="w" u2="’" k="-82"/><hkern u1="w" u2="?" k="-41"/><hkern u1="w" u2="." k="82"/><hkern u1="w" u2="," k="82"/><hkern u1="w" u2="'" k="-82"/><hkern u1="w" u2="&quot;" k="-82"/><hkern u1="x" u2="Å“" k="41"/><hkern u1="x" u2="ø" k="41"/><hkern u1="x" u2="ö" k="41"/><hkern u1="x" u2="õ" k="41"/><hkern u1="x" u2="ô" k="41"/><hkern u1="x" u2="ó" k="41"/><hkern u1="x" u2="ò" k="41"/><hkern u1="x" u2="ë" k="41"/><hkern u1="x" u2="ê" k="41"/><hkern u1="x" u2="é" k="41"/><hkern u1="x" u2="è" k="41"/><hkern u1="x" u2="ç" k="41"/><hkern u1="x" u2="à " k="41"/><hkern u1="x" u2="q" k="41"/><hkern u1="x" u2="o" k="41"/><hkern u1="x" u2="e" k="41"/><hkern u1="x" u2="d" k="41"/><hkern u1="x" u2="c" k="41"/><hkern u1="y" u2="„" k="82"/><hkern u1="y" u2="â€" k="-82"/><hkern u1="y" u2="‚" k="82"/><hkern u1="y" u2="’" k="-82"/><hkern u1="y" u2="?" k="-41"/><hkern u1="y" u2="." k="82"/><hkern u1="y" u2="," k="82"/><hkern u1="y" u2="'" k="-82"/><hkern u1="y" u2="&quot;" k="-82"/><hkern u1="{" u2="J" k="-184"/><hkern u1="À" u2="â€" k="143"/><hkern u1="À" u2="’" k="143"/><hkern u1="À" u2="Ÿ" k="123"/><hkern u1="À" u2="Å’" k="41"/><hkern u1="À" u2="Ã" k="123"/><hkern u1="À" u2="Ø" k="41"/><hkern u1="À" u2="Ö" k="41"/><hkern u1="À" u2="Õ" k="41"/><hkern u1="À" u2="Ô" k="41"/><hkern u1="À" u2="Ó" k="41"/><hkern u1="À" u2="Ã’" k="41"/><hkern u1="À" u2="Ç" k="41"/><hkern u1="À" u2="Y" k="123"/><hkern u1="À" u2="W" k="82"/><hkern u1="À" u2="V" k="82"/><hkern u1="À" u2="T" k="143"/><hkern u1="À" u2="Q" k="41"/><hkern u1="À" u2="O" k="41"/><hkern u1="À" u2="J" k="-266"/><hkern u1="À" u2="G" k="41"/><hkern u1="À" u2="C" k="41"/><hkern u1="À" u2="'" k="143"/><hkern u1="À" u2="&quot;" k="143"/><hkern u1="Ã" u2="â€" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&quot;" k="143"/><hkern u1="Â" u2="â€" k="143"/><hkern u1="Â" u2="’" k="143"/><hkern u1="Â" u2="Ÿ" k="123"/><hkern u1="Â" u2="Å’" k="41"/><hkern u1="Â" u2="Ã" k="123"/><hkern u1="Â" u2="Ø" k="41"/><hkern u1="Â" u2="Ö" k="41"/><hkern u1="Â" u2="Õ" k="41"/><hkern u1="Â" u2="Ô" k="41"/><hkern u1="Â" u2="Ó" k="41"/><hkern u1="Â" u2="Ã’" k="41"/><hkern u1="Â" u2="Ç" k="41"/><hkern u1="Â" u2="Y" k="123"/><hkern u1="Â" u2="W" k="82"/><hkern u1="Â" u2="V" k="82"/><hkern u1="Â" u2="T" k="143"/><hkern u1="Â" u2="Q" k="41"/><hkern u1="Â" u2="O" k="41"/><hkern u1="Â" u2="J" k="-266"/><hkern u1="Â" u2="G" k="41"/><hkern u1="Â" u2="C" k="41"/><hkern u1="Â" u2="'" k="143"/><hkern u1="Â" u2="&quot;" k="143"/><hkern u1="Ã" u2="â€" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&quot;" k="143"/><hkern u1="Ä" u2="â€" k="143"/><hkern u1="Ä" u2="’" k="143"/><hkern u1="Ä" u2="Ÿ" k="123"/><hkern u1="Ä" u2="Å’" k="41"/><hkern u1="Ä" u2="Ã" k="123"/><hkern u1="Ä" u2="Ø" k="41"/><hkern u1="Ä" u2="Ö" k="41"/><hkern u1="Ä" u2="Õ" k="41"/><hkern u1="Ä" u2="Ô" k="41"/><hkern u1="Ä" u2="Ó" k="41"/><hkern u1="Ä" u2="Ã’" k="41"/><hkern u1="Ä" u2="Ç" k="41"/><hkern u1="Ä" u2="Y" k="123"/><hkern u1="Ä" u2="W" k="82"/><hkern u1="Ä" u2="V" k="82"/><hkern u1="Ä" u2="T" k="143"/><hkern u1="Ä" u2="Q" k="41"/><hkern u1="Ä" u2="O" k="41"/><hkern u1="Ä" u2="J" k="-266"/><hkern u1="Ä" u2="G" k="41"/><hkern u1="Ä" u2="C" k="41"/><hkern u1="Ä" u2="'" k="143"/><hkern u1="Ä" u2="&quot;" k="143"/><hkern u1="Ã…" u2="â€" k="143"/><hkern u1="Ã…" u2="’" k="143"/><hkern u1="Ã…" u2="Ÿ" k="123"/><hkern u1="Ã…" u2="Å’" k="41"/><hkern u1="Ã…" u2="Ã" k="123"/><hkern u1="Ã…" u2="Ø" k="41"/><hkern u1="Ã…" u2="Ö" k="41"/><hkern u1="Ã…" u2="Õ" k="41"/><hkern u1="Ã…" u2="Ô" k="41"/><hkern u1="Ã…" u2="Ó" k="41"/><hkern u1="Ã…" u2="Ã’" k="41"/><hkern u1="Ã…" u2="Ç" k="41"/><hkern u1="Ã…" u2="Y" k="123"/><hkern u1="Ã…" u2="W" k="82"/><hkern u1="Ã…" u2="V" k="82"/><hkern u1="Ã…" u2="T" k="143"/><hkern u1="Ã…" u2="Q" k="41"/><hkern u1="Ã…" u2="O" k="41"/><hkern u1="Ã…" u2="J" k="-266"/><hkern u1="Ã…" u2="G" k="41"/><hkern u1="Ã…" u2="C" k="41"/><hkern u1="Ã…" u2="'" k="143"/><hkern u1="Ã…" u2="&quot;" k="143"/><hkern u1="Æ" u2="J" k="-123"/><hkern u1="Ç" u2="Å’" k="41"/><hkern u1="Ç" u2="Ø" k="41"/><hkern u1="Ç" u2="Ö" k="41"/><hkern u1="Ç" u2="Õ" k="41"/><hkern u1="Ç" u2="Ô" k="41"/><hkern u1="Ç" u2="Ó" k="41"/><hkern u1="Ç" u2="Ã’" k="41"/><hkern u1="Ç" u2="Ç" k="41"/><hkern u1="Ç" u2="Q" k="41"/><hkern u1="Ç" u2="O" k="41"/><hkern u1="Ç" u2="G" k="41"/><hkern u1="Ç" u2="C" k="41"/><hkern u1="È" u2="J" k="-123"/><hkern u1="É" u2="J" k="-123"/><hkern u1="Ê" u2="J" k="-123"/><hkern u1="Ë" u2="J" k="-123"/><hkern u1="Ã" u2="„" k="82"/><hkern u1="Ã" u2="‚" k="82"/><hkern u1="Ã" u2="Ÿ" k="20"/><hkern u1="Ã" u2="Ã" k="20"/><hkern u1="Ã" u2="Ã…" k="41"/><hkern u1="Ã" u2="Ä" k="41"/><hkern u1="Ã" u2="Ã" k="41"/><hkern u1="Ã" u2="Â" k="41"/><hkern u1="Ã" u2="Ã" k="41"/><hkern u1="Ã" u2="À" k="41"/><hkern u1="Ã" u2="Z" k="20"/><hkern u1="Ã" u2="Y" k="20"/><hkern u1="Ã" u2="X" k="41"/><hkern u1="Ã" u2="W" k="20"/><hkern u1="Ã" u2="V" k="20"/><hkern u1="Ã" u2="T" k="61"/><hkern u1="Ã" u2="A" k="41"/><hkern u1="Ã" u2="." k="82"/><hkern u1="Ã" u2="," k="82"/><hkern u1="Ã’" u2="„" k="82"/><hkern u1="Ã’" u2="‚" k="82"/><hkern u1="Ã’" u2="Ÿ" k="20"/><hkern u1="Ã’" u2="Ã" k="20"/><hkern u1="Ã’" u2="Ã…" k="41"/><hkern u1="Ã’" u2="Ä" k="41"/><hkern u1="Ã’" u2="Ã" k="41"/><hkern u1="Ã’" u2="Â" k="41"/><hkern u1="Ã’" u2="Ã" k="41"/><hkern u1="Ã’" u2="À" k="41"/><hkern u1="Ã’" u2="Z" k="20"/><hkern u1="Ã’" u2="Y" k="20"/><hkern u1="Ã’" u2="X" k="41"/><hkern u1="Ã’" u2="W" k="20"/><hkern u1="Ã’" u2="V" k="20"/><hkern u1="Ã’" u2="T" k="61"/><hkern u1="Ã’" u2="A" k="41"/><hkern u1="Ã’" u2="." k="82"/><hkern u1="Ã’" u2="," k="82"/><hkern u1="Ó" u2="„" k="82"/><hkern u1="Ó" u2="‚" k="82"/><hkern u1="Ó" u2="Ÿ" k="20"/><hkern u1="Ó" u2="Ã" k="20"/><hkern u1="Ó" u2="Ã…" k="41"/><hkern u1="Ó" u2="Ä" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="Â" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="À" k="41"/><hkern u1="Ó" u2="Z" k="20"/><hkern u1="Ó" u2="Y" k="20"/><hkern u1="Ó" u2="X" k="41"/><hkern u1="Ó" u2="W" k="20"/><hkern u1="Ó" u2="V" k="20"/><hkern u1="Ó" u2="T" k="61"/><hkern u1="Ó" u2="A" k="41"/><hkern u1="Ó" u2="." k="82"/><hkern u1="Ó" u2="," k="82"/><hkern u1="Ô" u2="„" k="82"/><hkern u1="Ô" u2="‚" k="82"/><hkern u1="Ô" u2="Ÿ" k="20"/><hkern u1="Ô" u2="Ã" k="20"/><hkern u1="Ô" u2="Ã…" k="41"/><hkern u1="Ô" u2="Ä" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="Â" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="À" k="41"/><hkern u1="Ô" u2="Z" k="20"/><hkern u1="Ô" u2="Y" k="20"/><hkern u1="Ô" u2="X" k="41"/><hkern u1="Ô" u2="W" k="20"/><hkern u1="Ô" u2="V" k="20"/><hkern u1="Ô" u2="T" k="61"/><hkern u1="Ô" u2="A" k="41"/><hkern u1="Ô" u2="." k="82"/><hkern u1="Ô" u2="," k="82"/><hkern u1="Õ" u2="„" k="82"/><hkern u1="Õ" u2="‚" k="82"/><hkern u1="Õ" u2="Ÿ" k="20"/><hkern u1="Õ" u2="Ã" k="20"/><hkern u1="Õ" u2="Ã…" k="41"/><hkern u1="Õ" u2="Ä" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="Â" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="À" k="41"/><hkern u1="Õ" u2="Z" k="20"/><hkern u1="Õ" u2="Y" k="20"/><hkern u1="Õ" u2="X" k="41"/><hkern u1="Õ" u2="W" k="20"/><hkern u1="Õ" u2="V" k="20"/><hkern u1="Õ" u2="T" k="61"/><hkern u1="Õ" u2="A" k="41"/><hkern u1="Õ" u2="." k="82"/><hkern u1="Õ" u2="," k="82"/><hkern u1="Ö" u2="„" k="82"/><hkern u1="Ö" u2="‚" k="82"/><hkern u1="Ö" u2="Ÿ" k="20"/><hkern u1="Ö" u2="Ã" k="20"/><hkern u1="Ö" u2="Ã…" k="41"/><hkern u1="Ö" u2="Ä" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="Â" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="À" k="41"/><hkern u1="Ö" u2="Z" k="20"/><hkern u1="Ö" u2="Y" k="20"/><hkern u1="Ö" u2="X" k="41"/><hkern u1="Ö" u2="W" k="20"/><hkern u1="Ö" u2="V" k="20"/><hkern u1="Ö" u2="T" k="61"/><hkern u1="Ö" u2="A" k="41"/><hkern u1="Ö" u2="." k="82"/><hkern u1="Ö" u2="," k="82"/><hkern u1="Ø" u2="„" k="82"/><hkern u1="Ø" u2="‚" k="82"/><hkern u1="Ø" u2="Ÿ" k="20"/><hkern u1="Ø" u2="Ã" k="20"/><hkern u1="Ø" u2="Ã…" k="41"/><hkern u1="Ø" u2="Ä" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="Â" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="À" k="41"/><hkern u1="Ø" u2="Z" k="20"/><hkern u1="Ø" u2="Y" k="20"/><hkern u1="Ø" u2="X" k="41"/><hkern u1="Ø" u2="W" k="20"/><hkern u1="Ø" u2="V" k="20"/><hkern u1="Ø" u2="T" k="61"/><hkern u1="Ø" u2="A" k="41"/><hkern u1="Ø" u2="." k="82"/><hkern u1="Ø" u2="," k="82"/><hkern u1="Ù" u2="„" k="41"/><hkern u1="Ù" u2="‚" k="41"/><hkern u1="Ù" u2="Ã…" k="20"/><hkern u1="Ù" u2="Ä" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="Â" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="À" k="20"/><hkern u1="Ù" u2="A" k="20"/><hkern u1="Ù" u2="." k="41"/><hkern u1="Ù" u2="," k="41"/><hkern u1="Ú" u2="„" k="41"/><hkern u1="Ú" u2="‚" k="41"/><hkern u1="Ú" u2="Ã…" k="20"/><hkern u1="Ú" u2="Ä" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="Â" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="À" k="20"/><hkern u1="Ú" u2="A" k="20"/><hkern u1="Ú" u2="." k="41"/><hkern u1="Ú" u2="," k="41"/><hkern u1="Û" u2="„" k="41"/><hkern u1="Û" u2="‚" k="41"/><hkern u1="Û" u2="Ã…" k="20"/><hkern u1="Û" u2="Ä" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="Â" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="À" k="20"/><hkern u1="Û" u2="A" k="20"/><hkern u1="Û" u2="." k="41"/><hkern u1="Û" u2="," k="41"/><hkern u1="Ãœ" u2="„" k="41"/><hkern u1="Ãœ" u2="‚" k="41"/><hkern u1="Ãœ" u2="Ã…" k="20"/><hkern u1="Ãœ" u2="Ä" k="20"/><hkern u1="Ãœ" u2="Ã" k="20"/><hkern u1="Ãœ" u2="Â" k="20"/><hkern u1="Ãœ" u2="Ã" k="20"/><hkern u1="Ãœ" u2="À" k="20"/><hkern u1="Ãœ" u2="A" k="20"/><hkern u1="Ãœ" u2="." k="41"/><hkern u1="Ãœ" u2="," k="41"/><hkern u1="Ã" u2="„" k="123"/><hkern u1="Ã" u2="‚" k="123"/><hkern u1="Ã" u2="Å“" k="102"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="ü" k="61"/><hkern u1="Ã" u2="û" k="61"/><hkern u1="Ã" u2="ú" k="61"/><hkern u1="Ã" u2="ù" k="61"/><hkern u1="Ã" u2="ø" k="102"/><hkern u1="Ã" u2="ö" k="102"/><hkern u1="Ã" u2="õ" k="102"/><hkern u1="Ã" u2="ô" k="102"/><hkern u1="Ã" u2="ó" k="102"/><hkern u1="Ã" u2="ò" k="102"/><hkern u1="Ã" u2="ë" k="102"/><hkern u1="Ã" u2="ê" k="102"/><hkern u1="Ã" u2="é" k="102"/><hkern u1="Ã" u2="è" k="102"/><hkern u1="Ã" u2="ç" k="102"/><hkern u1="Ã" u2="æ" k="102"/><hkern u1="Ã" u2="Ã¥" k="102"/><hkern u1="Ã" u2="ä" k="102"/><hkern u1="Ã" u2="ã" k="102"/><hkern u1="Ã" u2="â" k="102"/><hkern u1="Ã" u2="á" k="102"/><hkern u1="Ã" u2="à " k="102"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Ã…" k="123"/><hkern u1="Ã" u2="Ä" k="123"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Â" k="123"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="À" k="123"/><hkern u1="Ã" u2="z" k="41"/><hkern u1="Ã" u2="u" k="61"/><hkern u1="Ã" u2="s" k="82"/><hkern u1="Ã" u2="r" k="61"/><hkern u1="Ã" u2="q" k="102"/><hkern u1="Ã" u2="p" k="61"/><hkern u1="Ã" u2="o" k="102"/><hkern u1="Ã" u2="n" k="61"/><hkern u1="Ã" u2="m" k="61"/><hkern u1="Ã" u2="g" k="41"/><hkern u1="Ã" u2="e" k="102"/><hkern u1="Ã" u2="d" k="102"/><hkern u1="Ã" u2="c" k="102"/><hkern u1="Ã" u2="a" k="102"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="A" k="123"/><hkern u1="Ã" u2="?" k="-41"/><hkern u1="Ã" u2="." k="123"/><hkern u1="Ã" u2="," k="123"/><hkern u1="Þ" u2="„" k="266"/><hkern u1="Þ" u2="‚" k="266"/><hkern u1="Þ" u2="Ã…" k="102"/><hkern u1="Þ" u2="Ä" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="Â" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="À" k="102"/><hkern u1="Þ" u2="Z" k="20"/><hkern u1="Þ" u2="X" k="41"/><hkern u1="Þ" u2="A" k="102"/><hkern u1="Þ" u2="." k="266"/><hkern u1="Þ" u2="," k="266"/><hkern u1="à " u2="â€" k="20"/><hkern u1="à " u2="’" k="20"/><hkern u1="à " u2="'" k="20"/><hkern u1="à " u2="&quot;" k="20"/><hkern u1="á" u2="â€" k="20"/><hkern u1="á" u2="’" k="20"/><hkern u1="á" u2="'" k="20"/><hkern u1="á" u2="&quot;" k="20"/><hkern u1="â" u2="â€" k="20"/><hkern u1="â" u2="’" k="20"/><hkern u1="â" u2="'" k="20"/><hkern u1="â" u2="&quot;" k="20"/><hkern u1="ã" u2="â€" k="20"/><hkern u1="ã" u2="’" k="20"/><hkern u1="ã" u2="'" k="20"/><hkern u1="ã" u2="&quot;" k="20"/><hkern u1="ä" u2="â€" k="20"/><hkern u1="ä" u2="’" k="20"/><hkern u1="ä" u2="'" k="20"/><hkern u1="ä" u2="&quot;" k="20"/><hkern u1="Ã¥" u2="â€" k="20"/><hkern u1="Ã¥" u2="’" k="20"/><hkern u1="Ã¥" u2="'" k="20"/><hkern u1="Ã¥" u2="&quot;" k="20"/><hkern u1="è" u2="â€" k="20"/><hkern u1="è" u2="’" k="20"/><hkern u1="è" u2="ý" k="41"/><hkern u1="è" u2="z" k="20"/><hkern u1="è" u2="y" k="41"/><hkern u1="è" u2="x" k="41"/><hkern u1="è" u2="w" k="41"/><hkern u1="è" u2="v" k="41"/><hkern u1="è" u2="'" k="20"/><hkern u1="è" u2="&quot;" k="20"/><hkern u1="é" u2="â€" k="20"/><hkern u1="é" u2="’" k="20"/><hkern u1="é" u2="ý" k="41"/><hkern u1="é" u2="z" k="20"/><hkern u1="é" u2="y" k="41"/><hkern u1="é" u2="x" k="41"/><hkern u1="é" u2="w" k="41"/><hkern u1="é" u2="v" k="41"/><hkern u1="é" u2="'" k="20"/><hkern u1="é" u2="&quot;" k="20"/><hkern u1="ê" u2="â€" k="20"/><hkern u1="ê" u2="’" k="20"/><hkern u1="ê" u2="ý" k="41"/><hkern u1="ê" u2="z" k="20"/><hkern u1="ê" u2="y" k="41"/><hkern u1="ê" u2="x" k="41"/><hkern u1="ê" u2="w" k="41"/><hkern u1="ê" u2="v" k="41"/><hkern u1="ê" u2="'" k="20"/><hkern u1="ê" u2="&quot;" k="20"/><hkern u1="ë" u2="â€" k="20"/><hkern u1="ë" u2="’" k="20"/><hkern u1="ë" u2="ý" k="41"/><hkern u1="ë" u2="z" k="20"/><hkern u1="ë" u2="y" k="41"/><hkern u1="ë" u2="x" k="41"/><hkern u1="ë" u2="w" k="41"/><hkern u1="ë" u2="v" k="41"/><hkern u1="ë" u2="'" k="20"/><hkern u1="ë" u2="&quot;" k="20"/><hkern u1="ð" u2="â€" k="20"/><hkern u1="ð" u2="’" k="20"/><hkern u1="ð" u2="ý" k="41"/><hkern u1="ð" u2="z" k="20"/><hkern u1="ð" u2="y" k="41"/><hkern u1="ð" u2="x" k="41"/><hkern u1="ð" u2="w" k="41"/><hkern u1="ð" u2="v" k="41"/><hkern u1="ð" u2="'" k="20"/><hkern u1="ð" u2="&quot;" k="20"/><hkern u1="ò" u2="â€" k="20"/><hkern u1="ò" u2="’" k="20"/><hkern u1="ò" u2="ý" k="41"/><hkern u1="ò" u2="z" k="20"/><hkern u1="ò" u2="y" k="41"/><hkern u1="ò" u2="x" k="41"/><hkern u1="ò" u2="w" k="41"/><hkern u1="ò" u2="v" k="41"/><hkern u1="ò" u2="'" k="20"/><hkern u1="ò" u2="&quot;" k="20"/><hkern u1="ó" u2="â€" k="20"/><hkern u1="ó" u2="’" k="20"/><hkern u1="ó" u2="ý" k="41"/><hkern u1="ó" u2="z" k="20"/><hkern u1="ó" u2="y" k="41"/><hkern u1="ó" u2="x" k="41"/><hkern u1="ó" u2="w" k="41"/><hkern u1="ó" u2="v" k="41"/><hkern u1="ó" u2="'" k="20"/><hkern u1="ó" u2="&quot;" k="20"/><hkern u1="ô" u2="â€" k="20"/><hkern u1="ô" u2="’" k="20"/><hkern u1="ô" u2="ý" k="41"/><hkern u1="ô" u2="z" k="20"/><hkern u1="ô" u2="y" k="41"/><hkern u1="ô" u2="x" k="41"/><hkern u1="ô" u2="w" k="41"/><hkern u1="ô" u2="v" k="41"/><hkern u1="ô" u2="'" k="20"/><hkern u1="ô" u2="&quot;" k="20"/><hkern u1="ö" u2="â€" k="41"/><hkern u1="ö" u2="’" k="41"/><hkern u1="ö" u2="'" k="41"/><hkern u1="ö" u2="&quot;" k="41"/><hkern u1="ø" u2="â€" k="20"/><hkern u1="ø" u2="’" k="20"/><hkern u1="ø" u2="ý" k="41"/><hkern u1="ø" u2="z" k="20"/><hkern u1="ø" u2="y" k="41"/><hkern u1="ø" u2="x" k="41"/><hkern u1="ø" u2="w" k="41"/><hkern u1="ø" u2="v" k="41"/><hkern u1="ø" u2="'" k="20"/><hkern u1="ø" u2="&quot;" k="20"/><hkern u1="ý" u2="„" k="82"/><hkern u1="ý" u2="â€" k="-82"/><hkern u1="ý" u2="‚" k="82"/><hkern u1="ý" u2="’" k="-82"/><hkern u1="ý" u2="?" k="-41"/><hkern u1="ý" u2="." k="82"/><hkern u1="ý" u2="," k="82"/><hkern u1="ý" u2="'" k="-82"/><hkern u1="ý" u2="&quot;" k="-82"/><hkern u1="þ" u2="â€" k="20"/><hkern u1="þ" u2="’" k="20"/><hkern u1="þ" u2="ý" k="41"/><hkern u1="þ" u2="z" k="20"/><hkern u1="þ" u2="y" k="41"/><hkern u1="þ" u2="x" k="41"/><hkern u1="þ" u2="w" k="41"/><hkern u1="þ" u2="v" k="41"/><hkern u1="þ" u2="'" k="20"/><hkern u1="þ" u2="&quot;" k="20"/><hkern u1="ÿ" u2="„" k="82"/><hkern u1="ÿ" u2="â€" k="-82"/><hkern u1="ÿ" u2="‚" k="82"/><hkern u1="ÿ" u2="’" k="-82"/><hkern u1="ÿ" u2="?" k="-41"/><hkern u1="ÿ" u2="." k="82"/><hkern u1="ÿ" u2="," k="82"/><hkern u1="ÿ" u2="'" k="-82"/><hkern u1="ÿ" u2="&quot;" k="-82"/><hkern u1="Å’" u2="J" k="-123"/><hkern u1="Ÿ" u2="„" k="123"/><hkern u1="Ÿ" u2="‚" k="123"/><hkern u1="Ÿ" u2="Å“" k="102"/><hkern u1="Ÿ" u2="Å’" k="41"/><hkern u1="Ÿ" u2="ü" k="61"/><hkern u1="Ÿ" u2="û" k="61"/><hkern u1="Ÿ" u2="ú" k="61"/><hkern u1="Ÿ" u2="ù" k="61"/><hkern u1="Ÿ" u2="ø" k="102"/><hkern u1="Ÿ" u2="ö" k="102"/><hkern u1="Ÿ" u2="õ" k="102"/><hkern u1="Ÿ" u2="ô" k="102"/><hkern u1="Ÿ" u2="ó" k="102"/><hkern u1="Ÿ" u2="ò" k="102"/><hkern u1="Ÿ" u2="ë" k="102"/><hkern u1="Ÿ" u2="ê" k="102"/><hkern u1="Ÿ" u2="é" k="102"/><hkern u1="Ÿ" u2="è" k="102"/><hkern u1="Ÿ" u2="ç" k="102"/><hkern u1="Ÿ" u2="æ" k="102"/><hkern u1="Ÿ" u2="Ã¥" k="102"/><hkern u1="Ÿ" u2="ä" k="102"/><hkern u1="Ÿ" u2="ã" k="102"/><hkern u1="Ÿ" u2="â" k="102"/><hkern u1="Ÿ" u2="á" k="102"/><hkern u1="Ÿ" u2="à " k="102"/><hkern u1="Ÿ" u2="Ø" k="41"/><hkern u1="Ÿ" u2="Ö" k="41"/><hkern u1="Ÿ" u2="Õ" k="41"/><hkern u1="Ÿ" u2="Ô" k="41"/><hkern u1="Ÿ" u2="Ó" k="41"/><hkern u1="Ÿ" u2="Ã’" k="41"/><hkern u1="Ÿ" u2="Ç" k="41"/><hkern u1="Ÿ" u2="Ã…" k="123"/><hkern u1="Ÿ" u2="Ä" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="Â" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="À" k="123"/><hkern u1="Ÿ" u2="z" k="41"/><hkern u1="Ÿ" u2="u" k="61"/><hkern u1="Ÿ" u2="s" k="82"/><hkern u1="Ÿ" u2="r" k="61"/><hkern u1="Ÿ" u2="q" k="102"/><hkern u1="Ÿ" u2="p" k="61"/><hkern u1="Ÿ" u2="o" k="102"/><hkern u1="Ÿ" u2="n" k="61"/><hkern u1="Ÿ" u2="m" k="61"/><hkern u1="Ÿ" u2="g" k="41"/><hkern u1="Ÿ" u2="e" k="102"/><hkern u1="Ÿ" u2="d" k="102"/><hkern u1="Ÿ" u2="c" k="102"/><hkern u1="Ÿ" u2="a" k="102"/><hkern u1="Ÿ" u2="Q" k="41"/><hkern u1="Ÿ" u2="O" k="41"/><hkern u1="Ÿ" u2="G" k="41"/><hkern u1="Ÿ" u2="C" k="41"/><hkern u1="Ÿ" u2="A" k="123"/><hkern u1="Ÿ" u2="?" k="-41"/><hkern u1="Ÿ" u2="." k="123"/><hkern u1="Ÿ" u2="," k="123"/><hkern u1="–" u2="T" k="82"/><hkern u1="—" u2="T" k="82"/><hkern u1="‘" u2="Ÿ" k="-20"/><hkern u1="‘" u2="Å“" k="123"/><hkern u1="‘" u2="ü" k="61"/><hkern u1="‘" u2="û" k="61"/><hkern u1="‘" u2="ú" k="61"/><hkern u1="‘" u2="ù" k="61"/><hkern u1="‘" u2="ø" k="123"/><hkern u1="‘" u2="ö" k="123"/><hkern u1="‘" u2="õ" k="123"/><hkern u1="‘" u2="ô" k="123"/><hkern u1="‘" u2="ó" k="123"/><hkern u1="‘" u2="ò" k="123"/><hkern u1="‘" u2="ë" k="123"/><hkern u1="‘" u2="ê" k="123"/><hkern u1="‘" u2="é" k="123"/><hkern u1="‘" u2="è" k="123"/><hkern u1="‘" u2="ç" k="123"/><hkern u1="‘" u2="æ" k="82"/><hkern u1="‘" u2="Ã¥" k="82"/><hkern u1="‘" u2="ä" k="82"/><hkern u1="‘" u2="ã" k="82"/><hkern u1="‘" u2="â" k="82"/><hkern u1="‘" u2="á" k="82"/><hkern u1="‘" u2="à " k="123"/><hkern u1="‘" u2="Ã" k="-20"/><hkern u1="‘" u2="Ã…" k="143"/><hkern u1="‘" u2="Ä" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="Â" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="À" k="143"/><hkern u1="‘" u2="u" k="61"/><hkern u1="‘" u2="s" k="61"/><hkern u1="‘" u2="r" k="61"/><hkern u1="‘" u2="q" k="123"/><hkern u1="‘" u2="p" k="61"/><hkern u1="‘" u2="o" k="123"/><hkern u1="‘" u2="n" k="61"/><hkern u1="‘" u2="m" k="61"/><hkern u1="‘" u2="g" k="61"/><hkern u1="‘" u2="e" k="123"/><hkern u1="‘" u2="d" k="123"/><hkern u1="‘" u2="c" k="123"/><hkern u1="‘" u2="a" k="82"/><hkern u1="‘" u2="Y" k="-20"/><hkern u1="‘" u2="W" k="-41"/><hkern u1="‘" u2="V" k="-41"/><hkern u1="‘" u2="T" k="-41"/><hkern u1="‘" u2="A" k="143"/><hkern u1="’" u2="Ÿ" k="-20"/><hkern u1="’" u2="Å“" k="123"/><hkern u1="’" u2="ü" k="61"/><hkern u1="’" u2="û" k="61"/><hkern u1="’" u2="ú" k="61"/><hkern u1="’" u2="ù" k="61"/><hkern u1="’" u2="ø" k="123"/><hkern u1="’" u2="ö" k="123"/><hkern u1="’" u2="õ" k="123"/><hkern u1="’" u2="ô" k="123"/><hkern u1="’" u2="ó" k="123"/><hkern u1="’" u2="ò" k="123"/><hkern u1="’" u2="ë" k="123"/><hkern u1="’" u2="ê" k="123"/><hkern u1="’" u2="é" k="123"/><hkern u1="’" u2="è" k="123"/><hkern u1="’" u2="ç" k="123"/><hkern u1="’" u2="æ" k="82"/><hkern u1="’" u2="Ã¥" k="82"/><hkern u1="’" u2="ä" k="82"/><hkern u1="’" u2="ã" k="82"/><hkern u1="’" u2="â" k="82"/><hkern u1="’" u2="á" k="82"/><hkern u1="’" u2="à " k="123"/><hkern u1="’" u2="Ã" k="-20"/><hkern u1="’" u2="Ã…" k="143"/><hkern u1="’" u2="Ä" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="Â" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="À" k="143"/><hkern u1="’" u2="u" k="61"/><hkern u1="’" u2="s" k="61"/><hkern u1="’" u2="r" k="61"/><hkern u1="’" u2="q" k="123"/><hkern u1="’" u2="p" k="61"/><hkern u1="’" u2="o" k="123"/><hkern u1="’" u2="n" k="61"/><hkern u1="’" u2="m" k="61"/><hkern u1="’" u2="g" k="61"/><hkern u1="’" u2="e" k="123"/><hkern u1="’" u2="d" k="123"/><hkern u1="’" u2="c" k="123"/><hkern u1="’" u2="a" k="82"/><hkern u1="’" u2="Y" k="-20"/><hkern u1="’" u2="W" k="-41"/><hkern u1="’" u2="V" k="-41"/><hkern u1="’" u2="T" k="-41"/><hkern u1="’" u2="A" k="143"/><hkern u1="‚" u2="Ÿ" k="123"/><hkern u1="‚" u2="Å’" k="102"/><hkern u1="‚" u2="Ã" k="123"/><hkern u1="‚" u2="Ãœ" k="41"/><hkern u1="‚" u2="Û" k="41"/><hkern u1="‚" u2="Ú" k="41"/><hkern u1="‚" u2="Ù" k="41"/><hkern u1="‚" u2="Ø" k="102"/><hkern u1="‚" u2="Ö" k="102"/><hkern u1="‚" u2="Õ" k="102"/><hkern u1="‚" u2="Ô" k="102"/><hkern u1="‚" u2="Ó" k="102"/><hkern u1="‚" u2="Ã’" k="102"/><hkern u1="‚" u2="Ç" k="102"/><hkern u1="‚" u2="Y" k="123"/><hkern u1="‚" u2="W" k="123"/><hkern u1="‚" u2="V" k="123"/><hkern u1="‚" u2="U" k="41"/><hkern u1="‚" u2="T" k="143"/><hkern u1="‚" u2="Q" k="102"/><hkern u1="‚" u2="O" k="102"/><hkern u1="‚" u2="G" k="102"/><hkern u1="‚" u2="C" k="102"/><hkern u1="“" u2="Ÿ" k="-20"/><hkern u1="“" u2="Å“" k="123"/><hkern u1="“" u2="ü" k="61"/><hkern u1="“" u2="û" k="61"/><hkern u1="“" u2="ú" k="61"/><hkern u1="“" u2="ù" k="61"/><hkern u1="“" u2="ø" k="123"/><hkern u1="“" u2="ö" k="123"/><hkern u1="“" u2="õ" k="123"/><hkern u1="“" u2="ô" k="123"/><hkern u1="“" u2="ó" k="123"/><hkern u1="“" u2="ò" k="123"/><hkern u1="“" u2="ë" k="123"/><hkern u1="“" u2="ê" k="123"/><hkern u1="“" u2="é" k="123"/><hkern u1="“" u2="è" k="123"/><hkern u1="“" u2="ç" k="123"/><hkern u1="“" u2="æ" k="82"/><hkern u1="“" u2="Ã¥" k="82"/><hkern u1="“" u2="ä" k="82"/><hkern u1="“" u2="ã" k="82"/><hkern u1="“" u2="â" k="82"/><hkern u1="“" u2="á" k="82"/><hkern u1="“" u2="à " k="123"/><hkern u1="“" u2="Ã" k="-20"/><hkern u1="“" u2="Ã…" k="143"/><hkern u1="“" u2="Ä" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="Â" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="À" k="143"/><hkern u1="“" u2="u" k="61"/><hkern u1="“" u2="s" k="61"/><hkern u1="“" u2="r" k="61"/><hkern u1="“" u2="q" k="123"/><hkern u1="“" u2="p" k="61"/><hkern u1="“" u2="o" k="123"/><hkern u1="“" u2="n" k="61"/><hkern u1="“" u2="m" k="61"/><hkern u1="“" u2="g" k="61"/><hkern u1="“" u2="e" k="123"/><hkern u1="“" u2="d" k="123"/><hkern u1="“" u2="c" k="123"/><hkern u1="“" u2="a" k="82"/><hkern u1="“" u2="Y" k="-20"/><hkern u1="“" u2="W" k="-41"/><hkern u1="“" u2="V" k="-41"/><hkern u1="“" u2="T" k="-41"/><hkern u1="“" u2="A" k="143"/><hkern u1="„" u2="Ÿ" k="123"/><hkern u1="„" u2="Å’" k="102"/><hkern u1="„" u2="Ã" k="123"/><hkern u1="„" u2="Ãœ" k="41"/><hkern u1="„" u2="Û" k="41"/><hkern u1="„" u2="Ú" k="41"/><hkern u1="„" u2="Ù" k="41"/><hkern u1="„" u2="Ø" k="102"/><hkern u1="„" u2="Ö" k="102"/><hkern u1="„" u2="Õ" k="102"/><hkern u1="„" u2="Ô" k="102"/><hkern u1="„" u2="Ó" k="102"/><hkern u1="„" u2="Ã’" k="102"/><hkern u1="„" u2="Ç" k="102"/><hkern u1="„" u2="Y" k="123"/><hkern u1="„" u2="W" k="123"/><hkern u1="„" u2="V" k="123"/><hkern u1="„" u2="U" k="41"/><hkern u1="„" u2="T" k="143"/><hkern u1="„" u2="Q" k="102"/><hkern u1="„" u2="O" k="102"/><hkern u1="„" u2="G" k="102"/><hkern u1="„" u2="C" k="102"/></font></defs></svg>
\ No newline at end of file
diff --git a/setup/pub/fonts/opensans/light/opensans-300.ttf b/setup/pub/fonts/opensans/light/opensans-300.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..63af664cde6abb0083a37fb7f9d561c461997f49
Binary files /dev/null and b/setup/pub/fonts/opensans/light/opensans-300.ttf differ
diff --git a/setup/pub/fonts/opensans/light/opensans-300.woff b/setup/pub/fonts/opensans/light/opensans-300.woff
new file mode 100644
index 0000000000000000000000000000000000000000..e786074813a27d0a7a249047832988d5bf0fe756
Binary files /dev/null and b/setup/pub/fonts/opensans/light/opensans-300.woff differ
diff --git a/setup/pub/fonts/opensans/light/opensans-300.woff2 b/setup/pub/fonts/opensans/light/opensans-300.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..f7615ae2399b4691cc9e8ea082f7f951799665ce
Binary files /dev/null and b/setup/pub/fonts/opensans/light/opensans-300.woff2 differ
diff --git a/setup/pub/fonts/opensans/regular/opensans-400.eot b/setup/pub/fonts/opensans/regular/opensans-400.eot
new file mode 100644
index 0000000000000000000000000000000000000000..6bbc3cf58cb011a6b4bf3cb1612ce212608f7274
Binary files /dev/null and b/setup/pub/fonts/opensans/regular/opensans-400.eot differ
diff --git a/setup/pub/fonts/opensans/regular/opensans-400.svg b/setup/pub/fonts/opensans/regular/opensans-400.svg
new file mode 100644
index 0000000000000000000000000000000000000000..3a4a57d6f20a8e990372542ddf8a554722d169a5
--- /dev/null
+++ b/setup/pub/fonts/opensans/regular/opensans-400.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1171"><font-face units-per-em="2048" ascent="1638" descent="-410"/><glyph unicode="ï¬" horiz-adv-x="1212" d="M29 0zm641 967H391V0H225v967H29v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5T391 1167v-71h279V967zM1036 0H870v1096h166V0zM856 1393q0 57 28 83.5t70 26.5q40 0 69-27t29-83-29-83.5-69-27.5q-42 0-70 27.5t-28 83.5z"/><glyph unicode="fl" horiz-adv-x="1212" d="M29 0zm641 967H391V0H225v967H29v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5T391 1167v-71h279V967zM1036 0H870v1556h166V0z"/><glyph unicode="ffi" horiz-adv-x="1909" d="M29 0zm1329 967h-279V0H913v967H717v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5t-45-200.5v-71h279V967zm-688 0H391V0H225v967H29v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5T391 1167v-71h279V967zM1731 0h-166v1096h166V0zm-180 1393q0 57 28 83.5t70 26.5q40 0 69-27t29-83-29-83.5-69-27.5q-42 0-70 27.5t-28 83.5z"/><glyph unicode="ffl" horiz-adv-x="1909" d="M29 0zm1329 967h-279V0H913v967H717v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5t-45-200.5v-71h279V967zm-688 0H391V0H225v967H29v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5T391 1167v-71h279V967zM1731 0h-166v1556h166V0z"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="1044"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph unicode="!" horiz-adv-x="547" d="M326 403H221l-51 1059h207zM152 106q0 136 120 136 58 0 89.5-35T393 106q0-64-32-99.5T272-29q-52 0-86 31.5T152 106z"/><glyph unicode="&quot;" horiz-adv-x="821" d="M319 1462l-40-528H174l-41 528h186zm369 0l-41-528H543l-41 528h186z"/><glyph unicode="#" horiz-adv-x="1323" d="M981 899l-66-340h283V430H891L807 0H670l84 430H451L369 0H233l80 430H51v129h287l68 340H129v127h299l82 436h139l-82-436h305l84 436h134l-84-436h264V899H981zM475 559h303l66 340H541z"/><glyph unicode="$" d="M1036 449q0-136-102-224.5T649 113v-232H520v223q-112 0-217 17.5T131 170v156q83-37 191.5-60.5T520 242v440q-205 65-287.5 151T150 1055q0 131 101.5 215T520 1372v182h129v-180q184-5 355-74l-52-131q-149 59-303 70V805q157-50 235-97.5t115-109 37-149.5zm-170-13q0 72-44.5 116.5T649 641V252q217 30 217 184zm-547 621q0-76 45-122t156-87v387q-99-16-150-62.5T319 1057z"/><glyph unicode="%" horiz-adv-x="1686" d="M242 1026q0-170 37-255t120-85q164 0 164 340 0 338-164 338-83 0-120-84t-37-254zm458 0q0-228-76.5-344.5T399 565q-140 0-217.5 119T104 1026q0 227 74.5 342T399 1483q145 0 223-119t78-338zm422-586q0-171 37-255.5t121-84.5 124 83.5 40 256.5q0 171-40 253.5T1280 776t-121-82.5-37-253.5zm459 0q0-227-76.5-343.5T1280-20q-142 0-218.5 119T985 440q0 227 74.5 342T1280 897q142 0 221.5-117.5T1581 440zm-258 1022L512 0H365l811 1462h147z"/><glyph unicode="&" horiz-adv-x="1495" d="M414 1171q0-69 36-131.5T573 889q129 75 179.5 138.5T803 1174q0 77-51.5 125.5T614 1348q-89 0-144.5-48T414 1171zM569 129q241 0 400 154L532 707q-111-68-157-112.5T307 499t-22-116q0-117 77.5-185.5T569 129zM113 379q0 130 69.5 230T432 811q-85 95-115.5 144T268 1057t-18 110q0 150 98 234t273 84q162 0 255-83.5t93-232.5q0-107-68-197.5T676 788l407-391q56 62 89.5 145.5T1229 725h168q-68-286-205-434L1491 0h-229l-185 178Q959 72 837 26T565-20Q350-20 231.5 86T113 379z"/><glyph unicode="'" horiz-adv-x="453" d="M319 1462l-40-528H174l-41 528h186z"/><glyph unicode="(" horiz-adv-x="606" d="M82 561q0 265 77.5 496T383 1462h162q-144-193-216.5-424T256 563q0-240 74-469t213-418H383Q236-154 159 73T82 561z"/><glyph unicode=")" horiz-adv-x="606" d="M524 561q0-263-77.5-490T223-324H63Q202-136 276 93.5T350 563q0 244-72.5 475T61 1462h162q147-175 224-406.5T524 561z"/><glyph unicode="*" horiz-adv-x="1130" d="M657 1556l-43-395 398 111 26-182-381-31 248-326-172-94-176 362-160-362-176 94 242 326-377 31 29 182 391-111-43 395h194z"/><glyph unicode="+" d="M653 791h412V653H653V227H514v426H104v138h410v428h139V791z"/><glyph unicode="," horiz-adv-x="502" d="M350 238l15-23q-26-100-75-232.5T188-264H63Q90-160 122.5-7T168 238h182z"/><glyph unicode="-" horiz-adv-x="659" d="M84 473v152h491V473H84z"/><glyph unicode="." horiz-adv-x="545" d="M152 106q0 67 30.5 101.5T270 242q58 0 90.5-34.5T393 106q0-65-33-100t-90-35q-51 0-84.5 31.5T152 106z"/><glyph unicode="/" horiz-adv-x="752" d="M731 1462L186 0H20l545 1462h166z"/><glyph unicode="0" d="M1069 733q0-379-119.5-566T584-20q-236 0-359 191.5T102 733q0 382 119 567t363 185q238 0 361.5-193T1069 733zm-799 0q0-319 75-464.5T584 123q166 0 240.5 147.5T899 733t-74.5 461.5T584 1341q-164 0-239-144.5T270 733z"/><glyph unicode="1" d="M715 0H553v1042q0 130 8 246-21-21-47-44t-238-195l-88 114 387 299h140V0z"/><glyph unicode="2" d="M1061 0H100v143l385 387q176 178 232 254t84 148 28 155q0 117-71 185.5T561 1341q-91 0-172.5-30T207 1202l-88 113q202 168 440 168 206 0 323-105.5T999 1094q0-139-78-275T629 475L309 162v-8h752V0z"/><glyph unicode="3" d="M1006 1118q0-140-78.5-229T705 770v-8q176-22 261-112t85-236q0-209-145-321.5T494-20Q378-20 281.5-2.5T94 59v158q95-47 202.5-71.5T500 121q379 0 379 297 0 266-418 266H317v143h146q171 0 271 75.5T834 1112q0 107-73.5 168T561 1341q-96 0-181-26t-194-96l-84 112q90 71 207.5 111.5T557 1483q213 0 331-97.5t118-267.5z"/><glyph unicode="4" d="M1130 336H913V0H754v336H43v145l694 989h176V487h217V336zM754 487v486q0 143 10 323h-8q-48-96-90-159L209 487h545z"/><glyph unicode="5" d="M557 893q231 0 363.5-114.5T1053 465q0-227-144.5-356T510-20q-247 0-377 79v160q70-45 174-70.5T512 123q176 0 273.5 83T883 446q0 306-375 306-95 0-254-29l-86 55 55 684h727v-153H365l-37-439q115 23 229 23z"/><glyph unicode="6" d="M117 625q0 431 167.5 644.5T780 1483q113 0 178-19v-143q-77 25-176 25-235 0-359-146.5T287 739h12q110 172 348 172 197 0 310.5-119T1071 469q0-228-124.5-358.5T610-20q-227 0-360 170.5T117 625zm491-504q142 0 220.5 89.5T907 469q0 145-73 228t-218 83q-90 0-165-37T331.5 641 287 506q0-103 40-192t113.5-141T608 121z"/><glyph unicode="7" d="M285 0l606 1309H94v153h973v-133L469 0H285z"/><glyph unicode="8" d="M584 1483q200 0 317-93t117-257q0-108-67-197T737 774q178-85 253-178.5t75-216.5q0-182-127-290.5T590-20Q356-20 230 82.5T104 373q0 251 306 391-138 78-198 168.5T152 1135q0 159 117.5 253.5T584 1483zM268 369q0-120 83.5-187T586 115q149 0 232 70t83 192q0 97-78 172.5T551 696q-149-64-216-141.5T268 369zm314 979q-125 0-196-60t-71-160q0-92 59-158t218-132q143 60 202.5 129t59.5 161q0 101-72.5 160.5T582 1348z"/><glyph unicode="9" d="M1061 838q0-858-664-858-116 0-184 20v143q80-26 182-26 240 0 362.5 148.5T891 721h-12q-55-83-146-126.5T528 551q-194 0-308 116T106 991q0 228 127.5 360T569 1483q149 0 260.5-76.5t171.5-223 60-345.5zm-492 503q-143 0-221-92t-78-256q0-144 72-226.5T561 684q91 0 167.5 37T849 822t44 134q0 105-41 194t-114.5 140-168.5 51z"/><glyph unicode=":" horiz-adv-x="545" d="M152 106q0 67 30.5 101.5T270 242q58 0 90.5-34.5T393 106q0-65-33-100t-90-35q-51 0-84.5 31.5T152 106zm0 883q0 135 118 135 123 0 123-135 0-65-33-100t-90-35q-51 0-84.5 31.5T152 989z"/><glyph unicode=";" horiz-adv-x="545" d="M350 238l15-23q-26-100-75-232.5T188-264H63Q90-160 122.5-7T168 238h182zM147 989q0 135 119 135 123 0 123-135 0-65-33-100t-90-35q-58 0-88.5 35T147 989z"/><glyph unicode="<" d="M1065 242L104 664v98l961 479v-149L283 721l782-328V242z"/><glyph unicode="=" d="M119 858v137h930V858H119zm0-409v137h930V449H119z"/><glyph unicode=">" d="M104 393l783 326-783 373v149l961-479v-98L104 242v151z"/><glyph unicode="?" horiz-adv-x="879" d="M289 403v54q0 117 36 192.5T459 809q136 115 171.5 173t35.5 140q0 102-65.5 157.5T412 1335q-79 0-154-18.5T86 1249l-59 135q189 99 395 99 191 0 297-94t106-265q0-73-19.5-128.5t-57.5-105T584 731q-101-86-133.5-143T418 436v-33H289zm-49-297q0 136 120 136 58 0 89.5-35T481 106q0-64-32-99.5T360-29q-52 0-86 31.5T240 106z"/><glyph unicode="@" horiz-adv-x="1841" d="M1720 729q0-142-44-260t-124-183-184-65q-86 0-145 52t-70 133h-8q-40-87-114.5-136T854 221q-150 0-234.5 102.5T535 602q0 204 118 331.5T963 1061q68 0 154-12.5t155-34.5l-25-470v-22q0-178 133-178 91 0 148 107.5t57 279.5q0 181-74 317t-210.5 209.5T987 1331q-223 0-388-92.5t-252-264T260 578q0-305 161-469T885-55q210 0 436 86v-133q-192-84-436-84-363 0-563.5 199.5T121 571q0 260 107 463t305 314.5T987 1460q215 0 382.5-90.5t259-257T1720 729zM686 598q0-254 195-254 207 0 225 313l14 261q-72 20-157 20-130 0-203.5-90T686 598z"/><glyph unicode="A" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473z"/><glyph unicode="B" horiz-adv-x="1327" d="M201 1462h413q291 0 421-87t130-275q0-130-72.5-214.5T881 776v-10q333-57 333-350 0-196-132.5-306T711 0H201v1462zm170-626h280q180 0 259 56.5t79 190.5q0 123-88 177.5T621 1315H371V836zm0-144V145h305q177 0 266.5 68.5T1032 428q0 136-91.5 200T662 692H371z"/><glyph unicode="C" horiz-adv-x="1292" d="M827 1331q-241 0-380.5-160.5T307 731q0-287 134.5-443.5T825 131q153 0 349 55V37q-152-57-375-57-323 0-498.5 196T125 733q0 226 84.5 396t244 262 375.5 92q230 0 402-84l-72-146q-166 78-332 78z"/><glyph unicode="D" horiz-adv-x="1493" d="M1368 745q0-362-196.5-553.5T606 0H201v1462h448q341 0 530-189t189-528zm-180-6q0 286-143.5 431T618 1315H371V147h207q304 0 457 149.5T1188 739z"/><glyph unicode="E" horiz-adv-x="1139" d="M1016 0H201v1462h815v-151H371V840h606V690H371V152h645V0z"/><glyph unicode="F" horiz-adv-x="1057" d="M371 0H201v1462h815v-151H371V776h606V625H371V0z"/><glyph unicode="G" horiz-adv-x="1491" d="M844 766h497V55q-116-37-236-56T827-20q-332 0-517 197.5T125 731q0 228 91.5 399.5t263.5 262 403 90.5q234 0 436-86l-66-150q-198 84-381 84-267 0-417-159T305 731q0-296 144.5-449T874 129q152 0 297 35v450H844v152z"/><glyph unicode="H" horiz-adv-x="1511" d="M1311 0h-170v688H371V0H201v1462h170V840h770v622h170V0z"/><glyph unicode="I" horiz-adv-x="571" d="M201 0v1462h170V0H201z"/><glyph unicode="J" horiz-adv-x="547" d="M-12-385q-94 0-148 27v145q71-20 148-20 99 0 150.5 60T190 0v1462h170V14q0-190-96-294.5T-12-385z"/><glyph unicode="K" horiz-adv-x="1257" d="M1257 0h-200L524 709 371 573V0H201v1462h170V737l663 725h201L647 827z"/><glyph unicode="L" horiz-adv-x="1063" d="M201 0v1462h170V154h645V0H201z"/><glyph unicode="M" horiz-adv-x="1849" d="M848 0L352 1296h-8q14-154 14-366V0H201v1462h256L920 256h8l467 1206h254V0h-170v942q0 162 14 352h-8L985 0H848z"/><glyph unicode="N" horiz-adv-x="1544" d="M1343 0h-194L350 1227h-8q16-216 16-396V0H201v1462h192l797-1222h8q-2 27-9 173.5t-5 209.5v839h159V0z"/><glyph unicode="O" horiz-adv-x="1595" d="M1470 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733z"/><glyph unicode="P" horiz-adv-x="1233" d="M1128 1036q0-222-151.5-341.5T543 575H371V0H201v1462h379q548 0 548-426zM371 721h153q226 0 327 73t101 234q0 145-95 216t-296 71H371V721z"/><glyph unicode="Q" horiz-adv-x="1595" d="M1470 733q0-281-113-467T1038 14l348-362h-247L854-18l-55-2q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733z"/><glyph unicode="R" horiz-adv-x="1266" d="M371 608V0H201v1462h401q269 0 397.5-103t128.5-310q0-290-294-392L1231 0h-201L676 608H371zm0 146h233q180 0 264 71.5t84 214.5q0 145-85.5 209T592 1313H371V754z"/><glyph unicode="S" horiz-adv-x="1124" d="M1026 389q0-193-140-301T506-20q-260 0-400 67v164q90-38 196-60t210-22q170 0 256 64.5T854 373q0 76-30.5 124.5t-102 89.5T504 680q-204 73-291.5 173T125 1114q0 169 127 269t336 100q218 0 401-80l-53-148q-181 76-352 76-135 0-211-58t-76-161q0-76 28-124.5t94.5-89T623 809q230-82 316.5-176t86.5-244z"/><glyph unicode="T" horiz-adv-x="1133" d="M651 0H481v1311H18v151h1096v-151H651V0z"/><glyph unicode="U" horiz-adv-x="1491" d="M1305 1462V516q0-250-151-393T739-20 330.5 124 186 520v942h170V508q0-183 100-281t294-98q185 0 285 98.5T1135 510v952h170z"/><glyph unicode="V" horiz-adv-x="1219" d="M1036 1462h183L692 0H524L0 1462h180l336-946q58-163 92-317 36 162 94 323z"/><glyph unicode="W" horiz-adv-x="1896" d="M1477 0h-168l-295 979q-21 65-47 164t-27 119q-22-132-70-289L584 0H416L27 1462h180l231-903q48-190 70-344 27 183 80 358l262 889h180l275-897q48-155 81-350 19 142 72 346l230 901h180z"/><glyph unicode="X" horiz-adv-x="1182" d="M1174 0H981L588 643 188 0H8l486 764-453 698h188l363-579 366 579h181L686 770z"/><glyph unicode="Y" horiz-adv-x="1147" d="M573 731l390 731h184L659 567V0H487v559L0 1462h186z"/><glyph unicode="Z" horiz-adv-x="1169" d="M1087 0H82v133l776 1176H106v153h959v-133L289 154h798V0z"/><glyph unicode="[" horiz-adv-x="674" d="M623-324H166v1786h457v-141H334V-182h289v-142z"/><glyph unicode="\" horiz-adv-x="752" d="M186 1462L733 0H567L23 1462h163z"/><glyph unicode="]" horiz-adv-x="674" d="M51-182h289v1503H51v141h457V-324H51v142z"/><glyph unicode="^" horiz-adv-x="1110" d="M49 551l434 922h99l477-922H907l-372 745-334-745H49z"/><glyph unicode="_" horiz-adv-x="918" d="M922-315H-4v131h926v-131z"/><glyph unicode="`" horiz-adv-x="1182" d="M786 1241H676q-65 52-154 148t-129 159v21h203q32-69 89-159.5T786 1266v-25z"/><glyph unicode="a" horiz-adv-x="1139" d="M850 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117z"/><glyph unicode="b" horiz-adv-x="1255" d="M686 1114q216 0 335.5-147.5T1141 549t-120.5-419.5T686-20q-107 0-195.5 39.5T342 141h-12L295 0H176v1556h166v-378q0-127-8-228h8q116 164 344 164zm-24-139q-170 0-245-97.5T342 549t77-330.5T666 119q153 0 228 111.5T969 551q0 214-75 319T662 975z"/><glyph unicode="c" horiz-adv-x="975" d="M614-20q-238 0-368.5 146.5T115 541q0 275 132.5 425T625 1116q79 0 158-17t124-40l-51-141q-55 22-120 36.5T621 969q-334 0-334-426 0-202 81.5-310T610 125q137 0 281 59V37Q781-20 614-20z"/><glyph unicode="d" horiz-adv-x="1255" d="M922 147h-9Q798-20 569-20q-215 0-334.5 147T115 545t120 421 334 150q223 0 342-162h13l-7 79-4 77v446h166V0H944zm-332-28q170 0 246.5 92.5T913 510v35q0 233-77.5 332.5T588 977q-146 0-223.5-113.5T287 543q0-210 77-317t226-107z"/><glyph unicode="e" horiz-adv-x="1149" d="M639-20q-243 0-383.5 148T115 539q0 265 130.5 421T596 1116q206 0 326-135.5T1042 623V518H287q5-193 97.5-293T645 125q177 0 350 74V51Q907 13 828.5-3.5T639-20zm-45 997q-132 0-210.5-86T291 653h573q0 157-70 240.5T594 977z"/><glyph unicode="f" horiz-adv-x="694" d="M670 967H391V0H225v967H29v75l196 60v61q0 404 353 404 87 0 204-35l-43-133q-96 31-164 31-94 0-139-62.5T391 1167v-71h279V967z"/><glyph unicode="g" horiz-adv-x="1122" d="M1073 1096V991l-203-24q28-35 50-91.5T942 748q0-161-110-257t-302-96q-49 0-92 8-106-56-106-141 0-45 37-66.5T496 174h194q178 0 273.5-75t95.5-218q0-182-146-277.5T487-492q-215 0-331.5 80T39-186q0 100 64 173t180 99q-42 19-70.5 59T184 238q0 60 32 105t101 87q-85 35-138.5 119T125 741q0 180 108 277.5t306 97.5q86 0 155-20h379zM199-184q0-89 75-135t215-46q209 0 309.5 62.5T899-133q0 89-55 123.5T637 25H438q-113 0-176-54t-63-155zm90 929q0-115 65-174t181-59q243 0 243 236 0 247-246 247-117 0-180-63t-63-187z"/><glyph unicode="h" horiz-adv-x="1257" d="M926 0v709q0 134-61 200t-191 66q-173 0-252.5-94T342 573V0H176v1556h166v-471q0-85-8-141h10q49 79 139.5 124.5T690 1114q201 0 301.5-95.5T1092 715V0H926z"/><glyph unicode="i" horiz-adv-x="518" d="M342 0H176v1096h166V0zM162 1393q0 57 28 83.5t70 26.5q40 0 69-27t29-83-29-83.5-69-27.5q-42 0-70 27.5t-28 83.5z"/><glyph unicode="j" horiz-adv-x="518" d="M43-492q-95 0-154 25v135q69-20 136-20 78 0 114.5 42.5T176-180v1276h166V-168q0-324-299-324zm119 1885q0 57 28 83.5t70 26.5q40 0 69-27t29-83-29-83.5-69-27.5q-42 0-70 27.5t-28 83.5z"/><glyph unicode="k" horiz-adv-x="1075" d="M340 561q43 61 131 160l354 375h197L578 629 1053 0H852L465 518 340 410V0H176v1556h164V731q0-55-8-170h8z"/><glyph unicode="l" horiz-adv-x="518" d="M342 0H176v1556h166V0z"/><glyph unicode="m" horiz-adv-x="1905" d="M1573 0v713q0 131-56 196.5T1343 975q-155 0-229-89t-74-274V0H874v713q0 131-56 196.5T643 975q-156 0-228.5-93.5T342 575V0H176v1096h135l27-150h8q47 80 132.5 125t191.5 45q257 0 336-186h8q49 86 142 136t212 50q186 0 278.5-95.5T1739 715V0h-166z"/><glyph unicode="n" horiz-adv-x="1257" d="M926 0v709q0 134-61 200t-191 66q-172 0-252-93t-80-307V0H176v1096h135l27-150h8q51 81 143 125.5t205 44.5q198 0 298-95.5T1092 715V0H926z"/><glyph unicode="o" horiz-adv-x="1237" d="M1122 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319z"/><glyph unicode="p" horiz-adv-x="1255" d="M686-20q-107 0-195.5 39.5T342 141h-12q12-96 12-182v-451H176v1588h135l23-150h8q64 90 149 130t195 40q218 0 336.5-149T1141 549q0-270-120.5-419.5T686-20zm-24 995q-168 0-243-93t-77-296v-37q0-231 77-330.5T666 119q142 0 222.5 115T969 551q0 205-80.5 314.5T662 975z"/><glyph unicode="q" horiz-adv-x="1255" d="M590 119q166 0 242 89t81 300v37q0 230-78 331T588 977q-146 0-223.5-113.5T287 543t76.5-315.5T590 119zM565-20q-212 0-331 149T115 545q0 269 120 420t334 151q225 0 346-170h9l24 150h131V-492H913v469q0 100 11 170h-13Q796-20 565-20z"/><glyph unicode="r" horiz-adv-x="836" d="M676 1116q73 0 131-12l-23-154q-68 15-120 15-133 0-227.5-108T342 588V0H176v1096h137l19-203h8q61 107 147 165t189 58z"/><glyph unicode="s" horiz-adv-x="977" d="M883 299q0-153-114-236T449-20q-218 0-340 69v154q79-40 169.5-63T453 117q130 0 200 41.5T723 285q0 64-55.5 109.5T451 502q-153 57-217.5 99.5t-96 96.5T106 827q0 134 109 211.5t299 77.5q177 0 346-72l-59-135q-165 68-299 68-118 0-178-37t-60-102q0-44 22.5-75t72.5-59 192-81q195-71 263.5-143T883 299z"/><glyph unicode="t" horiz-adv-x="723" d="M530 117q44 0 85 6.5t65 13.5V10q-27-13-79.5-21.5T506-20q-318 0-318 335v652H31v80l157 69 70 234h96v-254h318V967H354V322q0-99 47-152t129-53z"/><glyph unicode="u" horiz-adv-x="1257" d="M332 1096V385q0-134 61-200t191-66q172 0 251.5 94T915 520v576h166V0H944l-24 147h-9Q860 66 769.5 23T563-20q-200 0-299.5 95T164 379v717h168z"/><glyph unicode="v" horiz-adv-x="1026" d="M416 0L0 1096h178l236-650q80-228 94-296h8q11 53 69.5 219.5T848 1096h178L610 0H416z"/><glyph unicode="w" horiz-adv-x="1593" d="M1071 0L870 643q-19 59-71 268h-8q-40-175-70-270L514 0H322L23 1096h174q106-413 161.5-629T422 176h8q11 57 35.5 147.5T508 467l201 629h180l196-629q56-172 76-289h8q4 36 21.5 111t208.5 807h172L1268 0h-197z"/><glyph unicode="x" horiz-adv-x="1073" d="M440 561L59 1096h189l289-420 288 420h187L631 561 1032 0H844L537 444 227 0H39z"/><glyph unicode="y" horiz-adv-x="1032" d="M2 1096h178l240-625q79-214 98-309h8q13 51 54.5 174.5T852 1096h178L559-152q-70-185-163.5-262.5T166-492q-76 0-150 17v133q55-12 123-12 171 0 244 192L444-6z"/><glyph unicode="z" horiz-adv-x="958" d="M877 0H82v113l598 854H119v129h743V967L272 129h605V0z"/><glyph unicode="{" horiz-adv-x="776" d="M475 12q0-102 58.5-148T705-184v-140q-190 2-294 87T307 2v303q0 104-63 148.5T61 498v141q130 2 188 48t58 142v306q0 155 108 241t290 86v-139q-230-6-230-199V829q0-215-223-254v-12q223-39 223-254V12z"/><glyph unicode="|" horiz-adv-x="1128" d="M494 1556h141V-496H494v2052z"/><glyph unicode="}" horiz-adv-x="776" d="M522 575q-223 39-223 254v295q0 193-227 199v139q184 0 289.5-87T467 1135V829q0-97 59-142.5T715 639V498q-122 0-185-44.5T467 305V2q0-153-102.5-238.5T72-324v140q111 2 169 48t58 148v297q0 114 55 174t168 80v12z"/><glyph unicode="~" d="M338 713q-53 0-116.5-33.5T104 592v151q100 109 244 109 68 0 124.5-14T618 786q66-28 115-41.5t96-13.5q54 0 118 32t118 89V702Q963 592 821 592q-72 0-135 16.5T551 657q-75 32-120 44t-93 12z"/><glyph unicode="¡" horiz-adv-x="547" d="M219 684h105l51-1057H168zm174 299q0-135-121-135-60 0-90 35.5T152 983q0 63 31.5 99t88.5 36q51 0 86-32t35-103z"/><glyph unicode="¢" d="M971 240q-105-54-252-60V-20H586v206q-203 32-299.5 168.5T190 741q0 508 396 570v172h135v-164q75-3 146-19.5t120-39.5l-49-140q-133 51-242 51-172 0-253-105.5T362 743q0-212 79.5-313.5T688 328q141 0 283 59V240z"/><glyph unicode="£" d="M682 1481q190 0 360-84l-61-133q-154 77-297 77-123 0-185.5-62T436 1077V782h422V655H436V434q0-100-32.5-168T297 154h795V0H63v141q205 47 205 291v223H70v127h198v316q0 178 112 280.5T682 1481z"/><glyph unicode="¤" d="M184 723q0 122 74 229l-135 140 94 92 135-133q104 73 234 73 127 0 229-73l137 133 95-92-134-138q74-113 74-231 0-131-74-234l131-135-92-92-137 133q-102-71-229-71-134 0-234 73L217 264l-92 92 133 136q-74 107-74 231zm129 0q0-112 78.5-192T586 451t195 79.5T860 723q0 114-80 195t-194 81q-116 0-194.5-82T313 723z"/><glyph unicode="Â¥" d="M584 735l379 727h174L721 692h262V565H666V395h317V268H666V0H502v268H186v127h316v170H186v127h256L31 1462h178z"/><glyph unicode="¦" horiz-adv-x="1128" d="M494 1556h141V780H494v776zm0-1275h141v-777H494v777z"/><glyph unicode="§" horiz-adv-x="1057" d="M139 809q0 86 43 154.5T303 1069q-74 40-116 95.5T145 1305q0 121 103.5 190.5T549 1565q94 0 173.5-14.5T899 1497l-53-131q-98 39-165.5 52.5T537 1432q-116 0-174-29.5t-58-93.5q0-60 61.5-102t215.5-97q186-68 261-143.5T918 784q0-90-41-160.5T762 512q153-81 153-227 0-140-117-216.5T469-8Q251-8 123 57v148q78-37 175-59.5T477 123q134 0 204.5 38T752 270q0 46-24 75t-78 58-169 72q-142 52-209 97T172 674t-33 135zm146 20q0-77 66-129.5T584 586l49-19q137 80 137 191 0 83-73.5 139T438 1010q-68-19-110.5-69T285 829z"/><glyph unicode="¨" horiz-adv-x="1182" d="M309 1393q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T399 1294q-37 0-63.5 24.5T309 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T780 1294t-63.5 24.5T690 1393z"/><glyph unicode="©" horiz-adv-x="1704" d="M893 1059q-125 0-192.5-87T633 731q0-168 63.5-249T891 401q86 0 211 45V322q-48-20-98.5-34T883 274q-194 0-298 120.5T481 731q0 209 110.5 332T893 1186q128 0 246-60l-58-118q-108 51-188 51zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm105 0q0-173 87-323.5t237.5-237T852 84q174 0 323 87t236.5 235.5T1499 731q0 174-87 323t-235.5 236.5T852 1378q-174 0-323-87t-236.5-235.5T205 731z"/><glyph unicode="ª" horiz-adv-x="725" d="M532 801l-24 84q-92-97-232-97-95 0-150.5 49.5T70 989t77 154.5 242 58.5l117 4v39q0 133-148 133-100 0-204-51l-43 96q114 56 247 56 130 0 198.5-52.5T625 1253V801h-93zM193 989q0-100 112-100 201 0 201 180v49l-98-4q-112-4-163.5-32.5T193 989z"/><glyph unicode="«" horiz-adv-x="1018" d="M82 551l342 407 119-69-289-350 289-351-119-71L82 524v27zm395 0l344 407 117-69-287-350 287-351-117-71-344 407v27z"/><glyph unicode="¬" d="M1065 791V264H928v389H104v138h961z"/><glyph unicode="Â" horiz-adv-x="659" d="M84 473zm0 0v152h491V473H84z"/><glyph unicode="®" horiz-adv-x="1704" d="M723 762h108q80 0 128.5 41.5T1008 909q0 75-43 107.5T829 1049H723V762zm434 151q0-80-42.5-141.5T995 680l238-395h-168L858 639H723V285H575v891h261q166 0 243.5-65t77.5-198zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm105 0q0-173 87-323.5t237.5-237T852 84q174 0 323 87t236.5 235.5T1499 731q0 174-87 323t-235.5 236.5T852 1378q-174 0-323-87t-236.5-235.5T205 731z"/><glyph unicode="¯" horiz-adv-x="1024" d="M1030 1556H-6v127h1036v-127z"/><glyph unicode="°" horiz-adv-x="877" d="M127 1171q0 130 90.5 221t220.5 91 221-90.5 91-221.5q0-84-41-155.5T595 902t-157-42q-130 0-220.5 90T127 1171zm115 0q0-82 58.5-139T440 975q80 0 137.5 56.5T635 1171q0 84-56.5 140.5T440 1368q-83 0-140.5-57T242 1171z"/><glyph unicode="±" d="M104 1zm549 790h412V653H653V227H514v426H104v138h410v428h139V791zM104 1v138h961V1H104z"/><glyph unicode="²" horiz-adv-x="711" d="M653 586H49v104l236 230q89 86 130 134.5t57.5 86.5 16.5 92q0 68-40 102.5T346 1370q-52 0-101-19t-118-69l-66 88q131 111 283 111 132 0 205.5-65t73.5-177q0-80-44.5-155.5T387 870L213 705h440V586z"/><glyph unicode="³" horiz-adv-x="711" d="M627 1255q0-80-41-131.5T477 1049q176-47 176-209 0-128-92-199.5T301 569q-152 0-268 56v123q147-68 270-68 211 0 211 162 0 145-231 145H166v107h119q103 0 152.5 39.5T487 1241q0 61-40 95t-107 34q-66 0-122-21.5T106 1292l-69 90q63 45 133 72t164 27q136 0 214.5-59.5T627 1255z"/><glyph unicode="´" horiz-adv-x="1182" d="M393 1266q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H393v25z"/><glyph unicode="µ" horiz-adv-x="1268" d="M342 381q0-262 254-262 171 0 250.5 94.5T926 520v576h166V0H956l-26 147h-10Q809-20 580-20q-150 0-238 92h-10q10-84 10-244v-320H176v1588h166V381z"/><glyph unicode="¶" horiz-adv-x="1341" d="M1120-260h-114v1712H793V-260H678v819q-62-18-146-18-216 0-317.5 125T113 1042q0 260 109 387t341 127h557V-260z"/><glyph unicode="·" horiz-adv-x="545" d="M152 723q0 66 31 100.5t87 34.5q58 0 90.5-34.5T393 723q0-65-33-100t-90-35q-51 0-84.5 31.5T152 723z"/><glyph unicode="¸" horiz-adv-x="465" d="M436-289q0-97-76.5-150T133-492q-51 0-96 9v106q45-8 104-8 79 0 119.5 20t40.5 74q0 43-39.5 69.5T113-178L201 0h110l-55-115q180-39 180-174z"/><glyph unicode="¹" horiz-adv-x="711" d="M338 1462h143V586H348v579q0 91 6 181-22-22-49-44.5T143 1184l-67 96z"/><glyph unicode="º" horiz-adv-x="768" d="M702 1135q0-164-85.5-255.5T381 788q-146 0-230.5 93T66 1135q0 163 84 253.5t235 90.5q152 0 234.5-91t82.5-253zm-514 0q0-122 45.5-183T383 891q105 0 151 61t46 183q0 123-46 182t-151 59q-103 0-149-59t-46-182z"/><glyph unicode="»" horiz-adv-x="1018" d="M936 524L592 117l-117 71 287 351-287 350 117 69 344-407v-27zm-395 0L197 117 80 188l287 351L80 889l117 69 344-407v-27z"/><glyph unicode="¼" horiz-adv-x="1597" d="M75 0zm1223 1462L395 0H252l903 1462h143zm-961 0h143V586H347v579q0 91 6 181-22-22-49-44.5T142 1184l-67 96zM1489 203h-125V1h-145v202H817v101l408 579h139V320h125V203zm-270 117v195q0 134 6 209-5-12-17-31.5t-27-42l-30-45-26-39.5-168-246h262z"/><glyph unicode="½" horiz-adv-x="1597" d="M46 0zm1184 1462L327 0H184l903 1462h143zm-922 0h143V586H318v579q0 91 6 181-22-22-49-44.5T113 1184l-67 96zM1499 1H895v104l236 230q89 86 130 134.5t57.5 86.5 16.5 92q0 68-40 102.5T1192 785q-52 0-101-19t-118-69l-66 88q131 111 283 111 132 0 205.5-65t73.5-177q0-80-44.5-155.5T1233 285l-174-165h440V1z"/><glyph unicode="¾" horiz-adv-x="1597" d="M26 0zm594 1255q0-80-41-131.5T470 1049q176-47 176-209 0-128-92-199.5T294 569q-152 0-268 56v123q147-68 270-68 211 0 211 162 0 145-231 145H159v107h119q103 0 152.5 39.5T480 1241q0 61-40 95t-107 34q-66 0-122-21.5T99 1292l-69 90q63 45 133 72t164 27q136 0 214.5-59.5T620 1255zm770 207L487 0H344l903 1462h143zm179-1259h-125V1h-145v202H897v101l408 579h139V320h125V203zm-270 117v195q0 134 6 209-5-12-17-31.5t-27-42l-30-45-26-39.5-168-246h262z"/><glyph unicode="¿" horiz-adv-x="879" d="M590 684v-51q0-122-37.5-196T418 279Q297 173 266.5 135.5t-43-76T211-35q0-100 66-156.5T465-248q80 0 155 19t173 67l59-135q-197-96-395-96-190 0-298 93T51-37q0 70 17.5 122.5t49.5 97 76.5 85.5 98.5 88q101 88 133.5 146T459 653v31h131zm49 299q0-135-121-135-59 0-90 34.5T397 983q0 64 33 99.5t88 35.5q51 0 86-32t35-103z"/><glyph unicode="À" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zm-161 961H614q-65 52-154 148t-129 159v21h203q32-69 89-159.5T724 1604v-25z"/><glyph unicode="Ã" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zm-359 986q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H526v25z"/><glyph unicode="Â" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zm-582 984q127 136 178 200t74 105h166q22-42 76.5-108.5T977 1602v-23H858q-88 55-221 186-136-134-219-186H303v23z"/><glyph unicode="Ã" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zm-93 963q-43 0-84 18.5t-80.5 41-76 41T481 1700q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T487 1837q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T792 1581z"/><glyph unicode="Ä" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zM364 1731q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T454 1632q-37 0-63.5 24.5T364 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T835 1632t-63.5 24.5T745 1731z"/><glyph unicode="Ã…" horiz-adv-x="1296" d="M0 0zm1120 0L938 465H352L172 0H0l578 1468h143L1296 0h-176zM885 618l-170 453q-33 86-68 211-22-96-63-211L412 618h473zm-15 969q0-98-61.5-157.5T645 1370q-101 0-161 58.5T424 1585t60.5 155.5T645 1798q101 0 163-59.5t62-151.5zm-108-2q0 56-33 86.5t-84 30.5-84-30.5-33-86.5 30-86.5 87-30.5q52 0 84.5 30.5T762 1585z"/><glyph unicode="Æ" horiz-adv-x="1788" d="M1665 0H915v465H401L174 0H-2l698 1462h969v-151h-580V840h541V690h-541V152h580V0zM469 618h446v693H797z"/><glyph unicode="Ç" horiz-adv-x="1292" d="M125 0zm702 1331q-241 0-380.5-160.5T307 731q0-287 134.5-443.5T825 131q153 0 349 55V37q-152-57-375-57-323 0-498.5 196T125 733q0 226 84.5 396t244 262 375.5 92q230 0 402-84l-72-146q-166 78-332 78zM950-289q0-97-76.5-150T647-492q-51 0-96 9v106q45-8 104-8 79 0 119.5 20t40.5 74q0 43-39.5 69.5T627-178L715 0h110l-55-115q180-39 180-174z"/><glyph unicode="È" horiz-adv-x="1139" d="M201 0zm815 0H201v1462h815v-151H371V840h606V690H371V152h645V0zM713 1579H603q-65 52-154 148t-129 159v21h203q32-69 89-159.5T713 1604v-25z"/><glyph unicode="É" horiz-adv-x="1139" d="M201 0zm815 0H201v1462h815v-151H371V840h606V690H371V152h645V0zM456 1604q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H456v25z"/><glyph unicode="Ê" horiz-adv-x="1139" d="M201 0zm815 0H201v1462h815v-151H371V840h606V690H371V152h645V0zM263 1602q127 136 178 200t74 105h166q22-42 76.5-108.5T937 1602v-23H818q-88 55-221 186-136-134-219-186H263v23z"/><glyph unicode="Ë" horiz-adv-x="1139" d="M201 0zm815 0H201v1462h815v-151H371V840h606V690H371V152h645V0zM327 1731q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T417 1632q-37 0-63.5 24.5T327 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T798 1632t-63.5 24.5T708 1731z"/><glyph unicode="ÃŒ" horiz-adv-x="571" d="M5 0zm196 0v1462h170V0H201zm197 1579H288q-65 52-154 148T5 1886v21h203q32-69 89-159.5T398 1604v-25z"/><glyph unicode="Ã" horiz-adv-x="571" d="M179 0zm22 0v1462h170V0H201zm-22 1604q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H179v25z"/><glyph unicode="ÃŽ" horiz-adv-x="571" d="M0 0zm201 0v1462h170V0H201zM-57 1602q127 136 178 200t74 105h166q22-42 76.5-108.5T617 1602v-23H498q-88 55-221 186-136-134-219-186H-57v23z"/><glyph unicode="Ã" horiz-adv-x="571" d="M5 0zm196 0v1462h170V0H201zM5 1731q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T95 1632q-37 0-63.5 24.5T5 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T476 1632t-63.5 24.5T386 1731z"/><glyph unicode="Ã" horiz-adv-x="1479" d="M1352 745q0-362-196.5-553.5T590 0H201v649H47v150h154v663h434q337 0 527-187.5T1352 745zm-181-6q0 576-569 576H371V799h379V649H371V147h190q610 0 610 592z"/><glyph unicode="Ñ" horiz-adv-x="1544" d="M201 0zm1142 0h-194L350 1227h-8q16-216 16-396V0H201v1462h192l797-1222h8q-2 27-9 173.5t-5 209.5v839h159V0zM935 1581q-43 0-84 18.5t-80.5 41-76 41T624 1700q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T630 1837q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T935 1581z"/><glyph unicode="Ã’" horiz-adv-x="1595" d="M125 0zm1345 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733zm602 846H797q-65 52-154 148t-129 159v21h203q32-69 89-159.5T907 1604v-25z"/><glyph unicode="Ó" horiz-adv-x="1595" d="M125 0zm1345 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733zm354 871q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H659v25z"/><glyph unicode="Ô" horiz-adv-x="1595" d="M125 0zm1345 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733zm143 869q127 136 178 200t74 105h166q22-42 76.5-108.5T1122 1602v-23h-119q-88 55-221 186-136-134-219-186H448v23z"/><glyph unicode="Õ" horiz-adv-x="1595" d="M125 0zm1345 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733zm637 848q-43 0-84 18.5t-80.5 41-76 41T631 1700q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T637 1837q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T942 1581z"/><glyph unicode="Ö" horiz-adv-x="1595" d="M125 0zm1345 733q0-351-177.5-552T799-20q-323 0-498.5 197.5T125 735q0 357 176 553.5T801 1485q315 0 492-200t177-552zm-1165 0q0-297 126.5-450.5T799 129q243 0 367 153t124 451q0 295-123.5 447.5T801 1333q-243 0-369.5-153.5T305 733zm217 998q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T612 1632q-37 0-63.5 24.5T522 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T993 1632t-63.5 24.5T903 1731z"/><glyph unicode="×" d="M940 1176l96-99-352-354 350-352-96-99-354 351-348-351-101 99 350 352-352 352 100 101 353-355z"/><glyph unicode="Ø" horiz-adv-x="1595" d="M1470 733q0-351-177.5-552T799-20Q564-20 416 80L315-61 195 18l108 154Q125 370 125 735q0 357 176 553.5T801 1485q209 0 366-94l97 135 120-80-106-148q192-202 192-565zm-180 0q0 272-110 426L508 211q115-82 291-82 243 0 367 153t124 451zm-985 0q0-262 101-416l669 943q-106 73-274 73-243 0-369.5-153.5T305 733z"/><glyph unicode="Ù" horiz-adv-x="1491" d="M186 0zm1119 1462V516q0-250-151-393T739-20 330.5 124 186 520v942h170V508q0-183 100-281t294-98q185 0 285 98.5T1135 510v952h170zm-449 117H746q-65 52-154 148t-129 159v21h203q32-69 89-159.5T856 1604v-25z"/><glyph unicode="Ú" horiz-adv-x="1491" d="M186 0zm1119 1462V516q0-250-151-393T739-20 330.5 124 186 520v942h170V508q0-183 100-281t294-98q185 0 285 98.5T1135 510v952h170zm-705 142q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H600v25z"/><glyph unicode="Û" horiz-adv-x="1491" d="M186 0zm1119 1462V516q0-250-151-393T739-20 330.5 124 186 520v942h170V508q0-183 100-281t294-98q185 0 285 98.5T1135 510v952h170zm-912 140q127 136 178 200t74 105h166q22-42 76.5-108.5T1067 1602v-23H948q-88 55-221 186-136-134-219-186H393v23z"/><glyph unicode="Ãœ" horiz-adv-x="1491" d="M186 0zm1119 1462V516q0-250-151-393T739-20 330.5 124 186 520v942h170V508q0-183 100-281t294-98q185 0 285 98.5T1135 510v952h170zm-844 269q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T551 1632q-37 0-63.5 24.5T461 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T932 1632t-63.5 24.5T842 1731z"/><glyph unicode="Ã" horiz-adv-x="1147" d="M0 0zm573 731l390 731h184L659 567V0H487v559L0 1462h186zm-131 873q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H442v25z"/><glyph unicode="Þ" horiz-adv-x="1251" d="M1145 784q0-227-151.5-346T555 319H371V0H201v1462h170v-256h215q281 0 420-103.5T1145 784zM371 465h168q226 0 327 71.5T967 772q0 149-95 218t-297 69H371V465z"/><glyph unicode="ß" horiz-adv-x="1274" d="M1049 1266q0-135-143-250-88-70-116-103.5T762 846q0-32 13.5-53t49-49.5T938 664q140-95 191-173.5t51-179.5q0-160-97-245.5T807-20q-188 0-295 69v154q63-39 141-62.5T803 117q215 0 215 182 0 75-41.5 128.5T825 551q-127 82-175 143.5T602 840q0 63 34.5 116T742 1062q75 57 107 102t32 98q0 80-68 122.5T618 1427q-276 0-276-223V0H176v1202q0 178 110 271.5t332 93.5q206 0 318.5-78.5T1049 1266z"/><glyph unicode="à " horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zm197 1124H562q-65 52-154 148t-129 159v21h203q32-69 89-159.5T672 1266v-25z"/><glyph unicode="á" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zm-39 1149q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H436v25z"/><glyph unicode="â" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zM228 1264q127 136 178 200t74 105h166q22-42 76.5-108.5T902 1264v-23H783q-88 55-221 186-136-134-219-186H228v23z"/><glyph unicode="ã" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zm246 1126q-43 0-84 18.5t-80.5 41-76 41T410 1362q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T416 1499q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T721 1243z"/><glyph unicode="ä" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zM279 1393q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T369 1294q-37 0-63.5 24.5T279 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T750 1294t-63.5 24.5T660 1393z"/><glyph unicode="Ã¥" horiz-adv-x="1139" d="M94 0zm756 0l-33 156h-8Q727 53 645.5 16.5T442-20q-163 0-255.5 84T94 303q0 332 531 348l186 6v68q0 129-55.5 190.5T578 977q-137 0-310-84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5-87T973 748V0H850zM475 117q155 0 243.5 85T807 440v99l-166-7q-198-7-285.5-61.5T268 301q0-90 54.5-137T475 117zm329 1341q0-98-61.5-157.5T579 1241q-101 0-161 58.5T358 1456t60.5 155.5T579 1669q101 0 163-59.5t62-151.5zm-108-2q0 56-33 86.5t-84 30.5-84-30.5-33-86.5 30-86.5 87-30.5q52 0 84.5 30.5T696 1456z"/><glyph unicode="æ" horiz-adv-x="1757" d="M94 303q0 161 124 250.5T596 651l184 6v68q0 129-58 190.5T545 977q-144 0-307-84l-52 127q74 41 173.5 67.5T557 1114q130 0 212.5-43.5T893 932q53 88 138.5 136t195.5 48q192 0 308-133.5T1651 627V520H950q8-395 322-395 91 0 169.5 17.5T1604 199V51q-86-38-160.5-54.5T1268-20q-289 0-414 233Q773 86 674.5 33T442-20q-163 0-255.5 85T94 303zm174-2q0-95 53.5-139.5T463 117q145 0 229 84.5T776 440v99l-158-7q-186-8-268-62.5T268 301zm957 676q-121 0-190.5-83T954 653h519q0 156-64 240t-184 84z"/><glyph unicode="ç" horiz-adv-x="975" d="M115 0zm499-20q-238 0-368.5 146.5T115 541q0 275 132.5 425T625 1116q79 0 158-17t124-40l-51-141q-55 22-120 36.5T621 969q-334 0-334-426 0-202 81.5-310T610 125q137 0 281 59V37Q781-20 614-20zm148-269q0-97-76.5-150T459-492q-51 0-96 9v106q45-8 104-8 79 0 119.5 20t40.5 74q0 43-39.5 69.5T439-178L527 0h110l-55-115q180-39 180-174z"/><glyph unicode="è" horiz-adv-x="1149" d="M115 0zm524-20q-243 0-383.5 148T115 539q0 265 130.5 421T596 1116q206 0 326-135.5T1042 623V518H287q5-193 97.5-293T645 125q177 0 350 74V51Q907 13 828.5-3.5T639-20zm-45 997q-132 0-210.5-86T291 653h573q0 157-70 240.5T594 977zm117 264H601q-65 52-154 148t-129 159v21h203q32-69 89-159.5T711 1266v-25z"/><glyph unicode="é" horiz-adv-x="1149" d="M115 0zm524-20q-243 0-383.5 148T115 539q0 265 130.5 421T596 1116q206 0 326-135.5T1042 623V518H287q5-193 97.5-293T645 125q177 0 350 74V51Q907 13 828.5-3.5T639-20zm-45 997q-132 0-210.5-86T291 653h573q0 157-70 240.5T594 977zm-123 289q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H471v25z"/><glyph unicode="ê" horiz-adv-x="1149" d="M115 0zm524-20q-243 0-383.5 148T115 539q0 265 130.5 421T596 1116q206 0 326-135.5T1042 623V518H287q5-193 97.5-293T645 125q177 0 350 74V51Q907 13 828.5-3.5T639-20zm-45 997q-132 0-210.5-86T291 653h573q0 157-70 240.5T594 977zm-335 287q127 136 178 200t74 105h166q22-42 76.5-108.5T933 1264v-23H814q-88 55-221 186-136-134-219-186H259v23z"/><glyph unicode="ë" horiz-adv-x="1149" d="M115 0zm524-20q-243 0-383.5 148T115 539q0 265 130.5 421T596 1116q206 0 326-135.5T1042 623V518H287q5-193 97.5-293T645 125q177 0 350 74V51Q907 13 828.5-3.5T639-20zm-45 997q-132 0-210.5-86T291 653h573q0 157-70 240.5T594 977zm-275 416q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T409 1294q-37 0-63.5 24.5T319 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T790 1294t-63.5 24.5T700 1393z"/><glyph unicode="ì" horiz-adv-x="518" d="M0 0zm342 0H176v1096h166V0zm13 1241H245q-65 52-154 148t-129 159v21h203q32-69 89-159.5T355 1266v-25z"/><glyph unicode="Ã" horiz-adv-x="518" d="M169 0zm173 0H176v1096h166V0zM169 1266q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H169v25z"/><glyph unicode="î" horiz-adv-x="518" d="M0 0zm342 0H176v1096h166V0zM-77 1264q127 136 178 200t74 105h166q22-42 76.5-108.5T597 1264v-23H478q-88 55-221 186-136-134-219-186H-77v23z"/><glyph unicode="ï" horiz-adv-x="518" d="M0 0zm342 0H176v1096h166V0zM-20 1393q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T70 1294q-37 0-63.5 24.5T-20 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T451 1294t-63.5 24.5T361 1393z"/><glyph unicode="ð" horiz-adv-x="1221" d="M1122 563q0-281-130.5-432T614-20q-222 0-361.5 134.5T113 475q0 230 131.5 361T596 967q226 0 326-121l8 4q-57 214-262 405l-271-155-73 108 233 133q-92 62-186 111l69 117q156-73 258-148l238 138 76-107-207-119q152-143 234.5-342t82.5-428zm-168-51q0 147-90 232t-246 85q-337 0-337-360 0-167 87.5-258.5T618 119q175 0 255.5 100.5T954 512z"/><glyph unicode="ñ" horiz-adv-x="1257" d="M176 0zm750 0v709q0 134-61 200t-191 66q-172 0-252-93t-80-307V0H176v1096h135l27-150h8q51 81 143 125.5t205 44.5q198 0 298-95.5T1092 715V0H926zM802 1243q-43 0-84 18.5t-80.5 41-76 41T491 1362q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T497 1499q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T802 1243z"/><glyph unicode="ò" horiz-adv-x="1237" d="M115 0zm1007 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319zm455 692H632q-65 52-154 148t-129 159v21h203q32-69 89-159.5T742 1266v-25z"/><glyph unicode="ó" horiz-adv-x="1237" d="M115 0zm1007 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319zm192 717q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H479v25z"/><glyph unicode="ô" horiz-adv-x="1237" d="M115 0zm1007 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319zm-5 715q127 136 178 200t74 105h166q22-42 76.5-108.5T956 1264v-23H837q-88 55-221 186-136-134-219-186H282v23z"/><glyph unicode="õ" horiz-adv-x="1237" d="M115 0zm1007 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319zm486 694q-43 0-84 18.5t-80.5 41-76 41T462 1362q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T468 1499q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T773 1243z"/><glyph unicode="ö" horiz-adv-x="1237" d="M115 0zm1007 549q0-268-135-418.5T614-20q-147 0-261 69T177 247t-62 302q0 268 134 417.5T621 1116q230 0 365.5-153T1122 549zm-835 0q0-210 84-320t247-110 247.5 109.5T950 549q0 209-84.5 317.5T616 975q-163 0-246-107t-83-319zm49 844q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T426 1294q-37 0-63.5 24.5T336 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T807 1294t-63.5 24.5T717 1393z"/><glyph unicode="÷" d="M104 653v138h961V653H104zm367-280q0 60 29.5 90.5T584 494q52 0 81-31.5t29-89.5q0-57-29.5-89T584 252q-52 0-82.5 31.5T471 373zm0 698q0 60 29.5 90.5T584 1192q52 0 81-31.5t29-89.5q0-57-29.5-89T584 950q-52 0-82.5 31.5T471 1071z"/><glyph unicode="ø" horiz-adv-x="1237" d="M1122 549q0-268-135-418.5T614-20q-154 0-266 69L264-68 150 10l94 131Q115 293 115 549q0 268 134 417.5T621 1116q154 0 270-76l84 119 117-76-97-133q127-152 127-401zm-835 0q0-171 53-273l465 646q-75 53-189 53-163 0-246-107t-83-319zm663 0q0 164-51 264L434 170q71-51 184-51 163 0 247.5 109.5T950 549z"/><glyph unicode="ù" horiz-adv-x="1257" d="M164 0zm168 1096V385q0-134 61-200t191-66q172 0 251.5 94T915 520v576h166V0H944l-24 147h-9Q860 66 769.5 23T563-20q-200 0-299.5 95T164 379v717h168zm394 145H616q-65 52-154 148t-129 159v21h203q32-69 89-159.5T726 1266v-25z"/><glyph unicode="ú" horiz-adv-x="1257" d="M164 0zm168 1096V385q0-134 61-200t191-66q172 0 251.5 94T915 520v576h166V0H944l-24 147h-9Q860 66 769.5 23T563-20q-200 0-299.5 95T164 379v717h168zm174 170q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H506v25z"/><glyph unicode="û" horiz-adv-x="1257" d="M164 0zm168 1096V385q0-134 61-200t191-66q172 0 251.5 94T915 520v576h166V0H944l-24 147h-9Q860 66 769.5 23T563-20q-200 0-299.5 95T164 379v717h168zm-46 168q127 136 178 200t74 105h166q22-42 76.5-108.5T960 1264v-23H841q-88 55-221 186-136-134-219-186H286v23z"/><glyph unicode="ü" horiz-adv-x="1257" d="M164 0zm168 1096V385q0-134 61-200t191-66q172 0 251.5 94T915 520v576h166V0H944l-24 147h-9Q860 66 769.5 23T563-20q-200 0-299.5 95T164 379v717h168zm10 297q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T432 1294q-37 0-63.5 24.5T342 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T813 1294t-63.5 24.5T723 1393z"/><glyph unicode="ý" horiz-adv-x="1032" d="M2 0zm0 1096h178l240-625q79-214 98-309h8q13 51 54.5 174.5T852 1096h178L559-152q-70-185-163.5-262.5T166-492q-76 0-150 17v133q55-12 123-12 171 0 244 192L444-6zm409 170q48 62 103.5 150t87.5 153h202v-21q-44-65-131-160t-151-147H411v25z"/><glyph unicode="þ" horiz-adv-x="1255" d="M344 948q66 89 151 128.5t191 39.5q215 0 335-150t120-417q0-268-120.5-418.5T686-20q-222 0-344 161h-12l4-34q8-77 8-140v-459H176v2048h166v-466q0-52-6-142h8zm320 27q-168 0-244-92t-78-293v-41q0-231 77-330.5T666 119q303 0 303 432 0 215-74 319.5T664 975z"/><glyph unicode="ÿ" horiz-adv-x="1032" d="M2 0zm0 1096h178l240-625q79-214 98-309h8q13 51 54.5 174.5T852 1096h178L559-152q-70-185-163.5-262.5T166-492q-76 0-150 17v133q55-12 123-12 171 0 244 192L444-6zm232 297q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T324 1294q-37 0-63.5 24.5T234 1393zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T705 1294t-63.5 24.5T615 1393z"/><glyph unicode="ı" horiz-adv-x="518" d="M342 0H176v1096h166V0z"/><glyph unicode="Å’" horiz-adv-x="1890" d="M1767 0H999Q897-20 805-20q-327 0-503.5 196.5T125 735q0 360 174 555t494 195q102 0 192-23h782v-151h-589V840h551V690h-551V152h589V0zM811 1333q-249 0-377.5-152.5T305 733q0-297 128.5-450.5T809 129q112 0 199 33v1141q-87 30-197 30z"/><glyph unicode="Å“" horiz-adv-x="1929" d="M1430-20q-293 0-418 235Q950 99 845.5 39.5T604-20q-223 0-357 152.5T113 549q0 265 131 415t366 150q131 0 233.5-59.5T1008 881q58 112 154 172.5t222 60.5q201 0 320-132.5T1823 623V518h-729q8-393 338-393 94 0 174.5 17.5T1774 199V51q-88-39-164-55t-180-16zM287 549q0-211 76-320.5T606 119q163 0 239.5 106.5T922 541q0 221-77.5 327.5T602 975q-166 0-240.5-108T287 549zm1095 426q-127 0-199.5-82T1098 653h544q0 158-66 240t-194 82z"/><glyph unicode="Ÿ" horiz-adv-x="1147" d="M0 0zm573 731l390 731h184L659 567V0H487v559L0 1462h186zM294 1731q0 52 26.5 75t63.5 23q38 0 65.5-23t27.5-75q0-50-27.5-74.5T384 1632q-37 0-63.5 24.5T294 1731zm381 0q0 52 26.5 75t63.5 23 64.5-23 27.5-75q0-50-27.5-74.5T765 1632t-63.5 24.5T675 1731z"/><glyph unicode="ˆ" horiz-adv-x="1212" d="M268 1264q127 136 178 200t74 105h166q22-42 76.5-108.5T942 1264v-23H823q-88 55-221 186-136-134-219-186H268v23z"/><glyph unicode="Ëš" horiz-adv-x="1182" d="M813 1458q0-98-61.5-157.5T588 1241q-101 0-161 58.5T367 1456t60.5 155.5T588 1669q101 0 163-59.5t62-151.5zm-108-2q0 56-33 86.5t-84 30.5-84-30.5-33-86.5 30-86.5 87-30.5q52 0 84.5 30.5T705 1456z"/><glyph unicode="Ëœ" horiz-adv-x="1212" d="M788 1243q-43 0-84 18.5t-80.5 41-76 41T477 1362q-50 0-75.5-30t-39.5-91h-98q13 121 70.5 189.5T483 1499q46 0 89-18.5t82-41 75-41 68-18.5q49 0 73 29.5t39 91.5h99q-13-121-69.5-189.5T788 1243z"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="635"/><glyph horiz-adv-x="476"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="238"/><glyph horiz-adv-x="381"/><glyph horiz-adv-x="105"/><glyph unicode="â€" horiz-adv-x="659" d="M84 473v152h491V473H84z"/><glyph unicode="‑" horiz-adv-x="659" d="M84 473v152h491V473H84z"/><glyph unicode="‒" horiz-adv-x="659" d="M84 473v152h491V473H84z"/><glyph unicode="–" horiz-adv-x="1024" d="M82 473v152h860V473H82z"/><glyph unicode="—" horiz-adv-x="2048" d="M82 473v152h1884V473H82z"/><glyph unicode="‘" horiz-adv-x="348" d="M37 961l-12 22q22 90 71 224t105 255h123q-66-254-103-501H37z"/><glyph unicode="’" horiz-adv-x="348" d="M309 1462l15-22q-26-100-75-232.5T147 961H25q70 285 102 501h182z"/><glyph unicode="‚" horiz-adv-x="502" d="M63 0zm287 238l15-23q-26-100-75-232.5T188-264H63Q90-160 122.5-7T168 238h182z"/><glyph unicode="“" horiz-adv-x="717" d="M406 961l-15 22q56 215 178 479h123q-30-115-59.5-259.5T590 961H406zm-369 0l-12 22q22 90 71 224t105 255h123q-66-254-103-501H37z"/><glyph unicode="â€" horiz-adv-x="717" d="M309 1462l15-22q-26-100-75-232.5T147 961H25q70 285 102 501h182zm369 0l14-22q-24-91-72-224T516 961H391q26 100 59 254t46 247h182z"/><glyph unicode="„" horiz-adv-x="829" d="M25 0zm284 238l15-22q-26-100-75-232.5T147-263H25Q95 22 127 238h182zm369 0l14-22q-24-91-72-224T516-263H391q26 100 59 254t46 247h182z"/><glyph unicode="•" horiz-adv-x="770" d="M164 748q0 121 56.5 184T385 995q105 0 163-62t58-185q0-119-57.5-183.5T385 500q-107 0-164 65.5T164 748z"/><glyph unicode="…" horiz-adv-x="1606" d="M152 0zm0 106q0 67 30.5 101.5T270 242q58 0 90.5-34.5T393 106q0-65-33-100t-90-35q-51 0-84.5 31.5T152 106zm530 0q0 67 30.5 101.5T800 242q58 0 90.5-34.5T923 106q0-65-33-100t-90-35q-51 0-84.5 31.5T682 106zm531 0q0 67 30.5 101.5T1331 242q58 0 90.5-34.5T1454 106q0-65-33-100t-90-35q-51 0-84.5 31.5T1213 106z"/><glyph horiz-adv-x="381"/><glyph unicode="‹" horiz-adv-x="623" d="M82 551l342 407 119-69-289-350 289-351-119-71L82 524v27z"/><glyph unicode="›" horiz-adv-x="623" d="M541 524L197 117 80 188l287 351L80 889l117 69 344-407v-27z"/><glyph unicode="â„" horiz-adv-x="266" d="M655 1462L-248 0h-143l903 1462h143z"/><glyph horiz-adv-x="476"/><glyph unicode="â´" horiz-adv-x="711" d="M692 788H567V586H422v202H20v101l408 579h139V905h125V788zM422 905v195q0 134 6 209-5-12-17-31.5t-27-42l-30-45-26-39.5-168-246h262z"/><glyph unicode="€" horiz-adv-x="1208" d="M795 1333q-319 0-398-403h510V801H383l-2-57v-64l2-45h463V506H399q37-180 138.5-278.5T809 129q156 0 309 66V45Q972-20 801-20q-237 0-381.5 134.5T229 506H63v129h152l-2 42v44l2 80H63v129h164q39 261 185 407t383 146q201 0 366-97l-71-139q-166 86-295 86z"/><glyph unicode="â„¢" horiz-adv-x="1589" d="M369 741H246v615H37v106h543v-106H369V741zm600 0l-201 559h-8l6-129V741H647v721h187l196-559 203 559h180V741h-127v420l6 137h-8l-211-557H969z"/><glyph unicode="−" d="M104 653v138h961V653H104z"/><glyph unicode="" horiz-adv-x="1095" d="M0 1095h1095V0H0v1095z"/><glyph horiz-adv-x="1255" d="M0 0z"/><hkern u1="&quot;" u2="Ÿ" k="-20"/><hkern u1="&quot;" u2="Å“" k="123"/><hkern u1="&quot;" u2="ü" k="61"/><hkern u1="&quot;" u2="û" k="61"/><hkern u1="&quot;" u2="ú" k="61"/><hkern u1="&quot;" u2="ù" k="61"/><hkern u1="&quot;" u2="ø" k="123"/><hkern u1="&quot;" u2="ö" k="123"/><hkern u1="&quot;" u2="õ" k="123"/><hkern u1="&quot;" u2="ô" k="123"/><hkern u1="&quot;" u2="ó" k="123"/><hkern u1="&quot;" u2="ò" k="123"/><hkern u1="&quot;" u2="ë" k="123"/><hkern u1="&quot;" u2="ê" k="123"/><hkern u1="&quot;" u2="é" k="123"/><hkern u1="&quot;" u2="è" k="123"/><hkern u1="&quot;" u2="ç" k="123"/><hkern u1="&quot;" u2="æ" k="82"/><hkern u1="&quot;" u2="Ã¥" k="82"/><hkern u1="&quot;" u2="ä" k="82"/><hkern u1="&quot;" u2="ã" k="82"/><hkern u1="&quot;" u2="â" k="82"/><hkern u1="&quot;" u2="á" k="82"/><hkern u1="&quot;" u2="à " k="123"/><hkern u1="&quot;" u2="Ã" k="-20"/><hkern u1="&quot;" u2="Ã…" k="143"/><hkern u1="&quot;" u2="Ä" k="143"/><hkern u1="&quot;" u2="Ã" k="143"/><hkern u1="&quot;" u2="Â" k="143"/><hkern u1="&quot;" u2="Ã" k="143"/><hkern u1="&quot;" u2="À" k="143"/><hkern u1="&quot;" u2="u" k="61"/><hkern u1="&quot;" u2="s" k="61"/><hkern u1="&quot;" u2="r" k="61"/><hkern u1="&quot;" u2="q" k="123"/><hkern u1="&quot;" u2="p" k="61"/><hkern u1="&quot;" u2="o" k="123"/><hkern u1="&quot;" u2="n" k="61"/><hkern u1="&quot;" u2="m" k="61"/><hkern u1="&quot;" u2="g" k="61"/><hkern u1="&quot;" u2="e" k="123"/><hkern u1="&quot;" u2="d" k="123"/><hkern u1="&quot;" u2="c" k="123"/><hkern u1="&quot;" u2="a" k="82"/><hkern u1="&quot;" u2="Y" k="-20"/><hkern u1="&quot;" u2="W" k="-41"/><hkern u1="&quot;" u2="V" k="-41"/><hkern u1="&quot;" u2="T" k="-41"/><hkern u1="&quot;" u2="A" k="143"/><hkern u1="'" u2="Ÿ" k="-20"/><hkern u1="'" u2="Å“" k="123"/><hkern u1="'" u2="ü" k="61"/><hkern u1="'" u2="û" k="61"/><hkern u1="'" u2="ú" k="61"/><hkern u1="'" u2="ù" k="61"/><hkern u1="'" u2="ø" k="123"/><hkern u1="'" u2="ö" k="123"/><hkern u1="'" u2="õ" k="123"/><hkern u1="'" u2="ô" k="123"/><hkern u1="'" u2="ó" k="123"/><hkern u1="'" u2="ò" k="123"/><hkern u1="'" u2="ë" k="123"/><hkern u1="'" u2="ê" k="123"/><hkern u1="'" u2="é" k="123"/><hkern u1="'" u2="è" k="123"/><hkern u1="'" u2="ç" k="123"/><hkern u1="'" u2="æ" k="82"/><hkern u1="'" u2="Ã¥" k="82"/><hkern u1="'" u2="ä" k="82"/><hkern u1="'" u2="ã" k="82"/><hkern u1="'" u2="â" k="82"/><hkern u1="'" u2="á" k="82"/><hkern u1="'" u2="à " k="123"/><hkern u1="'" u2="Ã" k="-20"/><hkern u1="'" u2="Ã…" k="143"/><hkern u1="'" u2="Ä" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="Â" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="À" k="143"/><hkern u1="'" u2="u" k="61"/><hkern u1="'" u2="s" k="61"/><hkern u1="'" u2="r" k="61"/><hkern u1="'" u2="q" k="123"/><hkern u1="'" u2="p" k="61"/><hkern u1="'" u2="o" k="123"/><hkern u1="'" u2="n" k="61"/><hkern u1="'" u2="m" k="61"/><hkern u1="'" u2="g" k="61"/><hkern u1="'" u2="e" k="123"/><hkern u1="'" u2="d" k="123"/><hkern u1="'" u2="c" k="123"/><hkern u1="'" u2="a" k="82"/><hkern u1="'" u2="Y" k="-20"/><hkern u1="'" u2="W" k="-41"/><hkern u1="'" u2="V" k="-41"/><hkern u1="'" u2="T" k="-41"/><hkern u1="'" u2="A" k="143"/><hkern u1="(" u2="J" k="-184"/><hkern u1="," u2="Ÿ" k="123"/><hkern u1="," u2="Å’" k="102"/><hkern u1="," u2="Ã" k="123"/><hkern u1="," u2="Ãœ" k="41"/><hkern u1="," u2="Û" k="41"/><hkern u1="," u2="Ú" k="41"/><hkern u1="," u2="Ù" k="41"/><hkern u1="," u2="Ø" k="102"/><hkern u1="," u2="Ö" k="102"/><hkern u1="," u2="Õ" k="102"/><hkern u1="," u2="Ô" k="102"/><hkern u1="," u2="Ó" k="102"/><hkern u1="," u2="Ã’" k="102"/><hkern u1="," u2="Ç" k="102"/><hkern u1="," u2="Y" k="123"/><hkern u1="," u2="W" k="123"/><hkern u1="," u2="V" k="123"/><hkern u1="," u2="U" k="41"/><hkern u1="," u2="T" k="143"/><hkern u1="," u2="Q" k="102"/><hkern u1="," u2="O" k="102"/><hkern u1="," u2="G" k="102"/><hkern u1="," u2="C" k="102"/><hkern u1="-" u2="T" k="82"/><hkern u1="." u2="Ÿ" k="123"/><hkern u1="." u2="Å’" k="102"/><hkern u1="." u2="Ã" k="123"/><hkern u1="." u2="Ãœ" k="41"/><hkern u1="." u2="Û" k="41"/><hkern u1="." u2="Ú" k="41"/><hkern u1="." u2="Ù" k="41"/><hkern u1="." u2="Ø" k="102"/><hkern u1="." u2="Ö" k="102"/><hkern u1="." u2="Õ" k="102"/><hkern u1="." u2="Ô" k="102"/><hkern u1="." u2="Ó" k="102"/><hkern u1="." u2="Ã’" k="102"/><hkern u1="." u2="Ç" k="102"/><hkern u1="." u2="Y" k="123"/><hkern u1="." u2="W" k="123"/><hkern u1="." u2="V" k="123"/><hkern u1="." u2="U" k="41"/><hkern u1="." u2="T" k="143"/><hkern u1="." u2="Q" k="102"/><hkern u1="." u2="O" k="102"/><hkern u1="." u2="G" k="102"/><hkern u1="." u2="C" k="102"/><hkern u1="A" u2="â€" k="143"/><hkern u1="A" u2="’" k="143"/><hkern u1="A" u2="Ÿ" k="123"/><hkern u1="A" u2="Å’" k="41"/><hkern u1="A" u2="Ã" k="123"/><hkern u1="A" u2="Ø" k="41"/><hkern u1="A" u2="Ö" k="41"/><hkern u1="A" u2="Õ" k="41"/><hkern u1="A" u2="Ô" k="41"/><hkern u1="A" u2="Ó" k="41"/><hkern u1="A" u2="Ã’" k="41"/><hkern u1="A" u2="Ç" k="41"/><hkern u1="A" u2="Y" k="123"/><hkern u1="A" u2="W" k="82"/><hkern u1="A" u2="V" k="82"/><hkern u1="A" u2="T" k="143"/><hkern u1="A" u2="Q" k="41"/><hkern u1="A" u2="O" k="41"/><hkern u1="A" u2="J" k="-266"/><hkern u1="A" u2="G" k="41"/><hkern u1="A" u2="C" k="41"/><hkern u1="A" u2="'" k="143"/><hkern u1="A" u2="&quot;" k="143"/><hkern u1="B" u2="„" k="82"/><hkern u1="B" u2="‚" k="82"/><hkern u1="B" u2="Ÿ" k="20"/><hkern u1="B" u2="Ã" k="20"/><hkern u1="B" u2="Ã…" k="41"/><hkern u1="B" u2="Ä" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="Â" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="À" k="41"/><hkern u1="B" u2="Z" k="20"/><hkern u1="B" u2="Y" k="20"/><hkern u1="B" u2="X" k="41"/><hkern u1="B" u2="W" k="20"/><hkern u1="B" u2="V" k="20"/><hkern u1="B" u2="T" k="61"/><hkern u1="B" u2="A" k="41"/><hkern u1="B" u2="." k="82"/><hkern u1="B" u2="," k="82"/><hkern u1="C" u2="Å’" k="41"/><hkern u1="C" u2="Ø" k="41"/><hkern u1="C" u2="Ö" k="41"/><hkern u1="C" u2="Õ" k="41"/><hkern u1="C" u2="Ô" k="41"/><hkern u1="C" u2="Ó" k="41"/><hkern u1="C" u2="Ã’" k="41"/><hkern u1="C" u2="Ç" k="41"/><hkern u1="C" u2="Q" k="41"/><hkern u1="C" u2="O" k="41"/><hkern u1="C" u2="G" k="41"/><hkern u1="C" u2="C" k="41"/><hkern u1="D" u2="„" k="82"/><hkern u1="D" u2="‚" k="82"/><hkern u1="D" u2="Ÿ" k="20"/><hkern u1="D" u2="Ã" k="20"/><hkern u1="D" u2="Ã…" k="41"/><hkern u1="D" u2="Ä" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="Â" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="À" k="41"/><hkern u1="D" u2="Z" k="20"/><hkern u1="D" u2="Y" k="20"/><hkern u1="D" u2="X" k="41"/><hkern u1="D" u2="W" k="20"/><hkern u1="D" u2="V" k="20"/><hkern u1="D" u2="T" k="61"/><hkern u1="D" u2="A" k="41"/><hkern u1="D" u2="." k="82"/><hkern u1="D" u2="," k="82"/><hkern u1="E" u2="J" k="-123"/><hkern u1="F" u2="„" k="123"/><hkern u1="F" u2="‚" k="123"/><hkern u1="F" u2="Ã…" k="41"/><hkern u1="F" u2="Ä" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="Â" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="À" k="41"/><hkern u1="F" u2="A" k="41"/><hkern u1="F" u2="?" k="-41"/><hkern u1="F" u2="." k="123"/><hkern u1="F" u2="," k="123"/><hkern u1="K" u2="Å’" k="41"/><hkern u1="K" u2="Ø" k="41"/><hkern u1="K" u2="Ö" k="41"/><hkern u1="K" u2="Õ" k="41"/><hkern u1="K" u2="Ô" k="41"/><hkern u1="K" u2="Ó" k="41"/><hkern u1="K" u2="Ã’" k="41"/><hkern u1="K" u2="Ç" k="41"/><hkern u1="K" u2="Q" k="41"/><hkern u1="K" u2="O" k="41"/><hkern u1="K" u2="G" k="41"/><hkern u1="K" u2="C" k="41"/><hkern u1="L" u2="â€" k="164"/><hkern u1="L" u2="’" k="164"/><hkern u1="L" u2="Ÿ" k="61"/><hkern u1="L" u2="Å’" k="41"/><hkern u1="L" u2="Ã" k="61"/><hkern u1="L" u2="Ãœ" k="20"/><hkern u1="L" u2="Û" k="20"/><hkern u1="L" u2="Ú" k="20"/><hkern u1="L" u2="Ù" k="20"/><hkern u1="L" u2="Ø" k="41"/><hkern u1="L" u2="Ö" k="41"/><hkern u1="L" u2="Õ" k="41"/><hkern u1="L" u2="Ô" k="41"/><hkern u1="L" u2="Ó" k="41"/><hkern u1="L" u2="Ã’" k="41"/><hkern u1="L" u2="Ç" k="41"/><hkern u1="L" u2="Y" k="61"/><hkern u1="L" u2="W" k="41"/><hkern u1="L" u2="V" k="41"/><hkern u1="L" u2="U" k="20"/><hkern u1="L" u2="T" k="41"/><hkern u1="L" u2="Q" k="41"/><hkern u1="L" u2="O" k="41"/><hkern u1="L" u2="G" k="41"/><hkern u1="L" u2="C" k="41"/><hkern u1="L" u2="'" k="164"/><hkern u1="L" u2="&quot;" k="164"/><hkern u1="O" u2="„" k="82"/><hkern u1="O" u2="‚" k="82"/><hkern u1="O" u2="Ÿ" k="20"/><hkern u1="O" u2="Ã" k="20"/><hkern u1="O" u2="Ã…" k="41"/><hkern u1="O" u2="Ä" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="Â" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="À" k="41"/><hkern u1="O" u2="Z" k="20"/><hkern u1="O" u2="Y" k="20"/><hkern u1="O" u2="X" k="41"/><hkern u1="O" u2="W" k="20"/><hkern u1="O" u2="V" k="20"/><hkern u1="O" u2="T" k="61"/><hkern u1="O" u2="A" k="41"/><hkern u1="O" u2="." k="82"/><hkern u1="O" u2="," k="82"/><hkern u1="P" u2="„" k="266"/><hkern u1="P" u2="‚" k="266"/><hkern u1="P" u2="Ã…" k="102"/><hkern u1="P" u2="Ä" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="Â" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="À" k="102"/><hkern u1="P" u2="Z" k="20"/><hkern u1="P" u2="X" k="41"/><hkern u1="P" u2="A" k="102"/><hkern u1="P" u2="." k="266"/><hkern u1="P" u2="," k="266"/><hkern u1="Q" u2="„" k="82"/><hkern u1="Q" u2="‚" k="82"/><hkern u1="Q" u2="Ÿ" k="20"/><hkern u1="Q" u2="Ã" k="20"/><hkern u1="Q" u2="Ã…" k="41"/><hkern u1="Q" u2="Ä" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="Â" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="À" k="41"/><hkern u1="Q" u2="Z" k="20"/><hkern u1="Q" u2="Y" k="20"/><hkern u1="Q" u2="X" k="41"/><hkern u1="Q" u2="W" k="20"/><hkern u1="Q" u2="V" k="20"/><hkern u1="Q" u2="T" k="61"/><hkern u1="Q" u2="A" k="41"/><hkern u1="Q" u2="." k="82"/><hkern u1="Q" u2="," k="82"/><hkern u1="T" u2="„" k="123"/><hkern u1="T" u2="‚" k="123"/><hkern u1="T" u2="—" k="82"/><hkern u1="T" u2="–" k="82"/><hkern u1="T" u2="Å“" k="143"/><hkern u1="T" u2="Å’" k="41"/><hkern u1="T" u2="ý" k="41"/><hkern u1="T" u2="ü" k="102"/><hkern u1="T" u2="û" k="102"/><hkern u1="T" u2="ú" k="102"/><hkern u1="T" u2="ù" k="102"/><hkern u1="T" u2="ø" k="143"/><hkern u1="T" u2="ö" k="143"/><hkern u1="T" u2="õ" k="143"/><hkern u1="T" u2="ô" k="143"/><hkern u1="T" u2="ó" k="143"/><hkern u1="T" u2="ò" k="143"/><hkern u1="T" u2="ë" k="143"/><hkern u1="T" u2="ê" k="143"/><hkern u1="T" u2="é" k="143"/><hkern u1="T" u2="è" k="143"/><hkern u1="T" u2="ç" k="143"/><hkern u1="T" u2="æ" k="164"/><hkern u1="T" u2="Ã¥" k="164"/><hkern u1="T" u2="ä" k="164"/><hkern u1="T" u2="ã" k="164"/><hkern u1="T" u2="â" k="164"/><hkern u1="T" u2="á" k="164"/><hkern u1="T" u2="à " k="143"/><hkern u1="T" u2="Ø" k="41"/><hkern u1="T" u2="Ö" k="41"/><hkern u1="T" u2="Õ" k="41"/><hkern u1="T" u2="Ô" k="41"/><hkern u1="T" u2="Ó" k="41"/><hkern u1="T" u2="Ã’" k="41"/><hkern u1="T" u2="Ç" k="41"/><hkern u1="T" u2="Ã…" k="143"/><hkern u1="T" u2="Ä" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="Â" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="À" k="143"/><hkern u1="T" u2="z" k="82"/><hkern u1="T" u2="y" k="41"/><hkern u1="T" u2="x" k="41"/><hkern u1="T" u2="w" k="41"/><hkern u1="T" u2="v" k="41"/><hkern u1="T" u2="u" k="102"/><hkern u1="T" u2="s" k="123"/><hkern u1="T" u2="r" k="102"/><hkern u1="T" u2="q" k="143"/><hkern u1="T" u2="p" k="102"/><hkern u1="T" u2="o" k="143"/><hkern u1="T" u2="n" k="102"/><hkern u1="T" u2="m" k="102"/><hkern u1="T" u2="g" k="143"/><hkern u1="T" u2="e" k="143"/><hkern u1="T" u2="d" k="143"/><hkern u1="T" u2="c" k="143"/><hkern u1="T" u2="a" k="164"/><hkern u1="T" u2="T" k="-41"/><hkern u1="T" u2="Q" k="41"/><hkern u1="T" u2="O" k="41"/><hkern u1="T" u2="G" k="41"/><hkern u1="T" u2="C" k="41"/><hkern u1="T" u2="A" k="143"/><hkern u1="T" u2="?" k="-41"/><hkern u1="T" u2="." k="123"/><hkern u1="T" u2="-" k="82"/><hkern u1="T" u2="," k="123"/><hkern u1="U" u2="„" k="41"/><hkern u1="U" u2="‚" k="41"/><hkern u1="U" u2="Ã…" k="20"/><hkern u1="U" u2="Ä" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="Â" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="À" k="20"/><hkern u1="U" u2="A" k="20"/><hkern u1="U" u2="." k="41"/><hkern u1="U" u2="," k="41"/><hkern u1="V" u2="„" k="102"/><hkern u1="V" u2="‚" k="102"/><hkern u1="V" u2="Å“" k="41"/><hkern u1="V" u2="Å’" k="20"/><hkern u1="V" u2="ü" k="20"/><hkern u1="V" u2="û" k="20"/><hkern u1="V" u2="ú" k="20"/><hkern u1="V" u2="ù" k="20"/><hkern u1="V" u2="ø" k="41"/><hkern u1="V" u2="ö" k="41"/><hkern u1="V" u2="õ" k="41"/><hkern u1="V" u2="ô" k="41"/><hkern u1="V" u2="ó" k="41"/><hkern u1="V" u2="ò" k="41"/><hkern u1="V" u2="ë" k="41"/><hkern u1="V" u2="ê" k="41"/><hkern u1="V" u2="é" k="41"/><hkern u1="V" u2="è" k="41"/><hkern u1="V" u2="ç" k="41"/><hkern u1="V" u2="æ" k="41"/><hkern u1="V" u2="Ã¥" k="41"/><hkern u1="V" u2="ä" k="41"/><hkern u1="V" u2="ã" k="41"/><hkern u1="V" u2="â" k="41"/><hkern u1="V" u2="á" k="41"/><hkern u1="V" u2="à " k="41"/><hkern u1="V" u2="Ø" k="20"/><hkern u1="V" u2="Ö" k="20"/><hkern u1="V" u2="Õ" k="20"/><hkern u1="V" u2="Ô" k="20"/><hkern u1="V" u2="Ó" k="20"/><hkern u1="V" u2="Ã’" k="20"/><hkern u1="V" u2="Ç" k="20"/><hkern u1="V" u2="Ã…" k="82"/><hkern u1="V" u2="Ä" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="Â" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="À" k="82"/><hkern u1="V" u2="u" k="20"/><hkern u1="V" u2="s" k="20"/><hkern u1="V" u2="r" k="20"/><hkern u1="V" u2="q" k="41"/><hkern u1="V" u2="p" k="20"/><hkern u1="V" u2="o" k="41"/><hkern u1="V" u2="n" k="20"/><hkern u1="V" u2="m" k="20"/><hkern u1="V" u2="g" k="20"/><hkern u1="V" u2="e" k="41"/><hkern u1="V" u2="d" k="41"/><hkern u1="V" u2="c" k="41"/><hkern u1="V" u2="a" k="41"/><hkern u1="V" u2="Q" k="20"/><hkern u1="V" u2="O" k="20"/><hkern u1="V" u2="G" k="20"/><hkern u1="V" u2="C" k="20"/><hkern u1="V" u2="A" k="82"/><hkern u1="V" u2="?" k="-41"/><hkern u1="V" u2="." k="102"/><hkern u1="V" u2="," k="102"/><hkern u1="W" u2="„" k="102"/><hkern u1="W" u2="‚" k="102"/><hkern u1="W" u2="Å“" k="41"/><hkern u1="W" u2="Å’" k="20"/><hkern u1="W" u2="ü" k="20"/><hkern u1="W" u2="û" k="20"/><hkern u1="W" u2="ú" k="20"/><hkern u1="W" u2="ù" k="20"/><hkern u1="W" u2="ø" k="41"/><hkern u1="W" u2="ö" k="41"/><hkern u1="W" u2="õ" k="41"/><hkern u1="W" u2="ô" k="41"/><hkern u1="W" u2="ó" k="41"/><hkern u1="W" u2="ò" k="41"/><hkern u1="W" u2="ë" k="41"/><hkern u1="W" u2="ê" k="41"/><hkern u1="W" u2="é" k="41"/><hkern u1="W" u2="è" k="41"/><hkern u1="W" u2="ç" k="41"/><hkern u1="W" u2="æ" k="41"/><hkern u1="W" u2="Ã¥" k="41"/><hkern u1="W" u2="ä" k="41"/><hkern u1="W" u2="ã" k="41"/><hkern u1="W" u2="â" k="41"/><hkern u1="W" u2="á" k="41"/><hkern u1="W" u2="à " k="41"/><hkern u1="W" u2="Ø" k="20"/><hkern u1="W" u2="Ö" k="20"/><hkern u1="W" u2="Õ" k="20"/><hkern u1="W" u2="Ô" k="20"/><hkern u1="W" u2="Ó" k="20"/><hkern u1="W" u2="Ã’" k="20"/><hkern u1="W" u2="Ç" k="20"/><hkern u1="W" u2="Ã…" k="82"/><hkern u1="W" u2="Ä" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="Â" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="À" k="82"/><hkern u1="W" u2="u" k="20"/><hkern u1="W" u2="s" k="20"/><hkern u1="W" u2="r" k="20"/><hkern u1="W" u2="q" k="41"/><hkern u1="W" u2="p" k="20"/><hkern u1="W" u2="o" k="41"/><hkern u1="W" u2="n" k="20"/><hkern u1="W" u2="m" k="20"/><hkern u1="W" u2="g" k="20"/><hkern u1="W" u2="e" k="41"/><hkern u1="W" u2="d" k="41"/><hkern u1="W" u2="c" k="41"/><hkern u1="W" u2="a" k="41"/><hkern u1="W" u2="Q" k="20"/><hkern u1="W" u2="O" k="20"/><hkern u1="W" u2="G" k="20"/><hkern u1="W" u2="C" k="20"/><hkern u1="W" u2="A" k="82"/><hkern u1="W" u2="?" k="-41"/><hkern u1="W" u2="." k="102"/><hkern u1="W" u2="," k="102"/><hkern u1="X" u2="Å’" k="41"/><hkern u1="X" u2="Ø" k="41"/><hkern u1="X" u2="Ö" k="41"/><hkern u1="X" u2="Õ" k="41"/><hkern u1="X" u2="Ô" k="41"/><hkern u1="X" u2="Ó" k="41"/><hkern u1="X" u2="Ã’" k="41"/><hkern u1="X" u2="Ç" k="41"/><hkern u1="X" u2="Q" k="41"/><hkern u1="X" u2="O" k="41"/><hkern u1="X" u2="G" k="41"/><hkern u1="X" u2="C" k="41"/><hkern u1="Y" u2="„" k="123"/><hkern u1="Y" u2="‚" k="123"/><hkern u1="Y" u2="Å“" k="102"/><hkern u1="Y" u2="Å’" k="41"/><hkern u1="Y" u2="ü" k="61"/><hkern u1="Y" u2="û" k="61"/><hkern u1="Y" u2="ú" k="61"/><hkern u1="Y" u2="ù" k="61"/><hkern u1="Y" u2="ø" k="102"/><hkern u1="Y" u2="ö" k="102"/><hkern u1="Y" u2="õ" k="102"/><hkern u1="Y" u2="ô" k="102"/><hkern u1="Y" u2="ó" k="102"/><hkern u1="Y" u2="ò" k="102"/><hkern u1="Y" u2="ë" k="102"/><hkern u1="Y" u2="ê" k="102"/><hkern u1="Y" u2="é" k="102"/><hkern u1="Y" u2="è" k="102"/><hkern u1="Y" u2="ç" k="102"/><hkern u1="Y" u2="æ" k="102"/><hkern u1="Y" u2="Ã¥" k="102"/><hkern u1="Y" u2="ä" k="102"/><hkern u1="Y" u2="ã" k="102"/><hkern u1="Y" u2="â" k="102"/><hkern u1="Y" u2="á" k="102"/><hkern u1="Y" u2="à " k="102"/><hkern u1="Y" u2="Ø" k="41"/><hkern u1="Y" u2="Ö" k="41"/><hkern u1="Y" u2="Õ" k="41"/><hkern u1="Y" u2="Ô" k="41"/><hkern u1="Y" u2="Ó" k="41"/><hkern u1="Y" u2="Ã’" k="41"/><hkern u1="Y" u2="Ç" k="41"/><hkern u1="Y" u2="Ã…" k="123"/><hkern u1="Y" u2="Ä" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="Â" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="À" k="123"/><hkern u1="Y" u2="z" k="41"/><hkern u1="Y" u2="u" k="61"/><hkern u1="Y" u2="s" k="82"/><hkern u1="Y" u2="r" k="61"/><hkern u1="Y" u2="q" k="102"/><hkern u1="Y" u2="p" k="61"/><hkern u1="Y" u2="o" k="102"/><hkern u1="Y" u2="n" k="61"/><hkern u1="Y" u2="m" k="61"/><hkern u1="Y" u2="g" k="41"/><hkern u1="Y" u2="e" k="102"/><hkern u1="Y" u2="d" k="102"/><hkern u1="Y" u2="c" k="102"/><hkern u1="Y" u2="a" k="102"/><hkern u1="Y" u2="Q" k="41"/><hkern u1="Y" u2="O" k="41"/><hkern u1="Y" u2="G" k="41"/><hkern u1="Y" u2="C" k="41"/><hkern u1="Y" u2="A" k="123"/><hkern u1="Y" u2="?" k="-41"/><hkern u1="Y" u2="." k="123"/><hkern u1="Y" u2="," k="123"/><hkern u1="Z" u2="Å’" k="20"/><hkern u1="Z" u2="Ø" k="20"/><hkern u1="Z" u2="Ö" k="20"/><hkern u1="Z" u2="Õ" k="20"/><hkern u1="Z" u2="Ô" k="20"/><hkern u1="Z" u2="Ó" k="20"/><hkern u1="Z" u2="Ã’" k="20"/><hkern u1="Z" u2="Ç" k="20"/><hkern u1="Z" u2="Q" k="20"/><hkern u1="Z" u2="O" k="20"/><hkern u1="Z" u2="G" k="20"/><hkern u1="Z" u2="C" k="20"/><hkern u1="[" u2="J" k="-184"/><hkern u1="a" u2="â€" k="20"/><hkern u1="a" u2="’" k="20"/><hkern u1="a" u2="'" k="20"/><hkern u1="a" u2="&quot;" k="20"/><hkern u1="b" u2="â€" k="20"/><hkern u1="b" u2="’" k="20"/><hkern u1="b" u2="ý" k="41"/><hkern u1="b" u2="z" k="20"/><hkern u1="b" u2="y" k="41"/><hkern u1="b" u2="x" k="41"/><hkern u1="b" u2="w" k="41"/><hkern u1="b" u2="v" k="41"/><hkern u1="b" u2="'" k="20"/><hkern u1="b" u2="&quot;" k="20"/><hkern u1="c" u2="â€" k="-41"/><hkern u1="c" u2="’" k="-41"/><hkern u1="c" u2="'" k="-41"/><hkern u1="c" u2="&quot;" k="-41"/><hkern u1="e" u2="â€" k="20"/><hkern u1="e" u2="’" k="20"/><hkern u1="e" u2="ý" k="41"/><hkern u1="e" u2="z" k="20"/><hkern u1="e" u2="y" k="41"/><hkern u1="e" u2="x" k="41"/><hkern u1="e" u2="w" k="41"/><hkern u1="e" u2="v" k="41"/><hkern u1="e" u2="'" k="20"/><hkern u1="e" u2="&quot;" k="20"/><hkern u1="f" u2="â€" k="-123"/><hkern u1="f" u2="’" k="-123"/><hkern u1="f" u2="'" k="-123"/><hkern u1="f" u2="&quot;" k="-123"/><hkern u1="h" u2="â€" k="20"/><hkern u1="h" u2="’" k="20"/><hkern u1="h" u2="'" k="20"/><hkern u1="h" u2="&quot;" k="20"/><hkern u1="k" u2="Å“" k="41"/><hkern u1="k" u2="ø" k="41"/><hkern u1="k" u2="ö" k="41"/><hkern u1="k" u2="õ" k="41"/><hkern u1="k" u2="ô" k="41"/><hkern u1="k" u2="ó" k="41"/><hkern u1="k" u2="ò" k="41"/><hkern u1="k" u2="ë" k="41"/><hkern u1="k" u2="ê" k="41"/><hkern u1="k" u2="é" k="41"/><hkern u1="k" u2="è" k="41"/><hkern u1="k" u2="ç" k="41"/><hkern u1="k" u2="à " k="41"/><hkern u1="k" u2="q" k="41"/><hkern u1="k" u2="o" k="41"/><hkern u1="k" u2="e" k="41"/><hkern u1="k" u2="d" k="41"/><hkern u1="k" u2="c" k="41"/><hkern u1="m" u2="â€" k="20"/><hkern u1="m" u2="’" k="20"/><hkern u1="m" u2="'" k="20"/><hkern u1="m" u2="&quot;" k="20"/><hkern u1="n" u2="â€" k="20"/><hkern u1="n" u2="’" k="20"/><hkern u1="n" u2="'" k="20"/><hkern u1="n" u2="&quot;" k="20"/><hkern u1="o" u2="â€" k="20"/><hkern u1="o" u2="’" k="20"/><hkern u1="o" u2="ý" k="41"/><hkern u1="o" u2="z" k="20"/><hkern u1="o" u2="y" k="41"/><hkern u1="o" u2="x" k="41"/><hkern u1="o" u2="w" k="41"/><hkern u1="o" u2="v" k="41"/><hkern u1="o" u2="'" k="20"/><hkern u1="o" u2="&quot;" k="20"/><hkern u1="p" u2="â€" k="20"/><hkern u1="p" u2="’" k="20"/><hkern u1="p" u2="ý" k="41"/><hkern u1="p" u2="z" k="20"/><hkern u1="p" u2="y" k="41"/><hkern u1="p" u2="x" k="41"/><hkern u1="p" u2="w" k="41"/><hkern u1="p" u2="v" k="41"/><hkern u1="p" u2="'" k="20"/><hkern u1="p" u2="&quot;" k="20"/><hkern u1="r" u2="â€" k="-82"/><hkern u1="r" u2="’" k="-82"/><hkern u1="r" u2="Å“" k="41"/><hkern u1="r" u2="ø" k="41"/><hkern u1="r" u2="ö" k="41"/><hkern u1="r" u2="õ" k="41"/><hkern u1="r" u2="ô" k="41"/><hkern u1="r" u2="ó" k="41"/><hkern u1="r" u2="ò" k="41"/><hkern u1="r" u2="ë" k="41"/><hkern u1="r" u2="ê" k="41"/><hkern u1="r" u2="é" k="41"/><hkern u1="r" u2="è" k="41"/><hkern u1="r" u2="ç" k="41"/><hkern u1="r" u2="æ" k="41"/><hkern u1="r" u2="Ã¥" k="41"/><hkern u1="r" u2="ä" k="41"/><hkern u1="r" u2="ã" k="41"/><hkern u1="r" u2="â" k="41"/><hkern u1="r" u2="á" k="41"/><hkern u1="r" u2="à " k="41"/><hkern u1="r" u2="q" k="41"/><hkern u1="r" u2="o" k="41"/><hkern u1="r" u2="g" k="20"/><hkern u1="r" u2="e" k="41"/><hkern u1="r" u2="d" k="41"/><hkern u1="r" u2="c" k="41"/><hkern u1="r" u2="a" k="41"/><hkern u1="r" u2="'" k="-82"/><hkern u1="r" u2="&quot;" k="-82"/><hkern u1="t" u2="â€" k="-41"/><hkern u1="t" u2="’" k="-41"/><hkern u1="t" u2="'" k="-41"/><hkern u1="t" u2="&quot;" k="-41"/><hkern u1="v" u2="„" k="82"/><hkern u1="v" u2="â€" k="-82"/><hkern u1="v" u2="‚" k="82"/><hkern u1="v" u2="’" k="-82"/><hkern u1="v" u2="?" k="-41"/><hkern u1="v" u2="." k="82"/><hkern u1="v" u2="," k="82"/><hkern u1="v" u2="'" k="-82"/><hkern u1="v" u2="&quot;" k="-82"/><hkern u1="w" u2="„" k="82"/><hkern u1="w" u2="â€" k="-82"/><hkern u1="w" u2="‚" k="82"/><hkern u1="w" u2="’" k="-82"/><hkern u1="w" u2="?" k="-41"/><hkern u1="w" u2="." k="82"/><hkern u1="w" u2="," k="82"/><hkern u1="w" u2="'" k="-82"/><hkern u1="w" u2="&quot;" k="-82"/><hkern u1="x" u2="Å“" k="41"/><hkern u1="x" u2="ø" k="41"/><hkern u1="x" u2="ö" k="41"/><hkern u1="x" u2="õ" k="41"/><hkern u1="x" u2="ô" k="41"/><hkern u1="x" u2="ó" k="41"/><hkern u1="x" u2="ò" k="41"/><hkern u1="x" u2="ë" k="41"/><hkern u1="x" u2="ê" k="41"/><hkern u1="x" u2="é" k="41"/><hkern u1="x" u2="è" k="41"/><hkern u1="x" u2="ç" k="41"/><hkern u1="x" u2="à " k="41"/><hkern u1="x" u2="q" k="41"/><hkern u1="x" u2="o" k="41"/><hkern u1="x" u2="e" k="41"/><hkern u1="x" u2="d" k="41"/><hkern u1="x" u2="c" k="41"/><hkern u1="y" u2="„" k="82"/><hkern u1="y" u2="â€" k="-82"/><hkern u1="y" u2="‚" k="82"/><hkern u1="y" u2="’" k="-82"/><hkern u1="y" u2="?" k="-41"/><hkern u1="y" u2="." k="82"/><hkern u1="y" u2="," k="82"/><hkern u1="y" u2="'" k="-82"/><hkern u1="y" u2="&quot;" k="-82"/><hkern u1="{" u2="J" k="-184"/><hkern u1="À" u2="â€" k="143"/><hkern u1="À" u2="’" k="143"/><hkern u1="À" u2="Ÿ" k="123"/><hkern u1="À" u2="Å’" k="41"/><hkern u1="À" u2="Ã" k="123"/><hkern u1="À" u2="Ø" k="41"/><hkern u1="À" u2="Ö" k="41"/><hkern u1="À" u2="Õ" k="41"/><hkern u1="À" u2="Ô" k="41"/><hkern u1="À" u2="Ó" k="41"/><hkern u1="À" u2="Ã’" k="41"/><hkern u1="À" u2="Ç" k="41"/><hkern u1="À" u2="Y" k="123"/><hkern u1="À" u2="W" k="82"/><hkern u1="À" u2="V" k="82"/><hkern u1="À" u2="T" k="143"/><hkern u1="À" u2="Q" k="41"/><hkern u1="À" u2="O" k="41"/><hkern u1="À" u2="J" k="-266"/><hkern u1="À" u2="G" k="41"/><hkern u1="À" u2="C" k="41"/><hkern u1="À" u2="'" k="143"/><hkern u1="À" u2="&quot;" k="143"/><hkern u1="Ã" u2="â€" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&quot;" k="143"/><hkern u1="Â" u2="â€" k="143"/><hkern u1="Â" u2="’" k="143"/><hkern u1="Â" u2="Ÿ" k="123"/><hkern u1="Â" u2="Å’" k="41"/><hkern u1="Â" u2="Ã" k="123"/><hkern u1="Â" u2="Ø" k="41"/><hkern u1="Â" u2="Ö" k="41"/><hkern u1="Â" u2="Õ" k="41"/><hkern u1="Â" u2="Ô" k="41"/><hkern u1="Â" u2="Ó" k="41"/><hkern u1="Â" u2="Ã’" k="41"/><hkern u1="Â" u2="Ç" k="41"/><hkern u1="Â" u2="Y" k="123"/><hkern u1="Â" u2="W" k="82"/><hkern u1="Â" u2="V" k="82"/><hkern u1="Â" u2="T" k="143"/><hkern u1="Â" u2="Q" k="41"/><hkern u1="Â" u2="O" k="41"/><hkern u1="Â" u2="J" k="-266"/><hkern u1="Â" u2="G" k="41"/><hkern u1="Â" u2="C" k="41"/><hkern u1="Â" u2="'" k="143"/><hkern u1="Â" u2="&quot;" k="143"/><hkern u1="Ã" u2="â€" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&quot;" k="143"/><hkern u1="Ä" u2="â€" k="143"/><hkern u1="Ä" u2="’" k="143"/><hkern u1="Ä" u2="Ÿ" k="123"/><hkern u1="Ä" u2="Å’" k="41"/><hkern u1="Ä" u2="Ã" k="123"/><hkern u1="Ä" u2="Ø" k="41"/><hkern u1="Ä" u2="Ö" k="41"/><hkern u1="Ä" u2="Õ" k="41"/><hkern u1="Ä" u2="Ô" k="41"/><hkern u1="Ä" u2="Ó" k="41"/><hkern u1="Ä" u2="Ã’" k="41"/><hkern u1="Ä" u2="Ç" k="41"/><hkern u1="Ä" u2="Y" k="123"/><hkern u1="Ä" u2="W" k="82"/><hkern u1="Ä" u2="V" k="82"/><hkern u1="Ä" u2="T" k="143"/><hkern u1="Ä" u2="Q" k="41"/><hkern u1="Ä" u2="O" k="41"/><hkern u1="Ä" u2="J" k="-266"/><hkern u1="Ä" u2="G" k="41"/><hkern u1="Ä" u2="C" k="41"/><hkern u1="Ä" u2="'" k="143"/><hkern u1="Ä" u2="&quot;" k="143"/><hkern u1="Ã…" u2="â€" k="143"/><hkern u1="Ã…" u2="’" k="143"/><hkern u1="Ã…" u2="Ÿ" k="123"/><hkern u1="Ã…" u2="Å’" k="41"/><hkern u1="Ã…" u2="Ã" k="123"/><hkern u1="Ã…" u2="Ø" k="41"/><hkern u1="Ã…" u2="Ö" k="41"/><hkern u1="Ã…" u2="Õ" k="41"/><hkern u1="Ã…" u2="Ô" k="41"/><hkern u1="Ã…" u2="Ó" k="41"/><hkern u1="Ã…" u2="Ã’" k="41"/><hkern u1="Ã…" u2="Ç" k="41"/><hkern u1="Ã…" u2="Y" k="123"/><hkern u1="Ã…" u2="W" k="82"/><hkern u1="Ã…" u2="V" k="82"/><hkern u1="Ã…" u2="T" k="143"/><hkern u1="Ã…" u2="Q" k="41"/><hkern u1="Ã…" u2="O" k="41"/><hkern u1="Ã…" u2="J" k="-266"/><hkern u1="Ã…" u2="G" k="41"/><hkern u1="Ã…" u2="C" k="41"/><hkern u1="Ã…" u2="'" k="143"/><hkern u1="Ã…" u2="&quot;" k="143"/><hkern u1="Æ" u2="J" k="-123"/><hkern u1="Ç" u2="Å’" k="41"/><hkern u1="Ç" u2="Ø" k="41"/><hkern u1="Ç" u2="Ö" k="41"/><hkern u1="Ç" u2="Õ" k="41"/><hkern u1="Ç" u2="Ô" k="41"/><hkern u1="Ç" u2="Ó" k="41"/><hkern u1="Ç" u2="Ã’" k="41"/><hkern u1="Ç" u2="Ç" k="41"/><hkern u1="Ç" u2="Q" k="41"/><hkern u1="Ç" u2="O" k="41"/><hkern u1="Ç" u2="G" k="41"/><hkern u1="Ç" u2="C" k="41"/><hkern u1="È" u2="J" k="-123"/><hkern u1="É" u2="J" k="-123"/><hkern u1="Ê" u2="J" k="-123"/><hkern u1="Ë" u2="J" k="-123"/><hkern u1="Ã" u2="„" k="82"/><hkern u1="Ã" u2="‚" k="82"/><hkern u1="Ã" u2="Ÿ" k="20"/><hkern u1="Ã" u2="Ã" k="20"/><hkern u1="Ã" u2="Ã…" k="41"/><hkern u1="Ã" u2="Ä" k="41"/><hkern u1="Ã" u2="Ã" k="41"/><hkern u1="Ã" u2="Â" k="41"/><hkern u1="Ã" u2="Ã" k="41"/><hkern u1="Ã" u2="À" k="41"/><hkern u1="Ã" u2="Z" k="20"/><hkern u1="Ã" u2="Y" k="20"/><hkern u1="Ã" u2="X" k="41"/><hkern u1="Ã" u2="W" k="20"/><hkern u1="Ã" u2="V" k="20"/><hkern u1="Ã" u2="T" k="61"/><hkern u1="Ã" u2="A" k="41"/><hkern u1="Ã" u2="." k="82"/><hkern u1="Ã" u2="," k="82"/><hkern u1="Ã’" u2="„" k="82"/><hkern u1="Ã’" u2="‚" k="82"/><hkern u1="Ã’" u2="Ÿ" k="20"/><hkern u1="Ã’" u2="Ã" k="20"/><hkern u1="Ã’" u2="Ã…" k="41"/><hkern u1="Ã’" u2="Ä" k="41"/><hkern u1="Ã’" u2="Ã" k="41"/><hkern u1="Ã’" u2="Â" k="41"/><hkern u1="Ã’" u2="Ã" k="41"/><hkern u1="Ã’" u2="À" k="41"/><hkern u1="Ã’" u2="Z" k="20"/><hkern u1="Ã’" u2="Y" k="20"/><hkern u1="Ã’" u2="X" k="41"/><hkern u1="Ã’" u2="W" k="20"/><hkern u1="Ã’" u2="V" k="20"/><hkern u1="Ã’" u2="T" k="61"/><hkern u1="Ã’" u2="A" k="41"/><hkern u1="Ã’" u2="." k="82"/><hkern u1="Ã’" u2="," k="82"/><hkern u1="Ó" u2="„" k="82"/><hkern u1="Ó" u2="‚" k="82"/><hkern u1="Ó" u2="Ÿ" k="20"/><hkern u1="Ó" u2="Ã" k="20"/><hkern u1="Ó" u2="Ã…" k="41"/><hkern u1="Ó" u2="Ä" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="Â" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="À" k="41"/><hkern u1="Ó" u2="Z" k="20"/><hkern u1="Ó" u2="Y" k="20"/><hkern u1="Ó" u2="X" k="41"/><hkern u1="Ó" u2="W" k="20"/><hkern u1="Ó" u2="V" k="20"/><hkern u1="Ó" u2="T" k="61"/><hkern u1="Ó" u2="A" k="41"/><hkern u1="Ó" u2="." k="82"/><hkern u1="Ó" u2="," k="82"/><hkern u1="Ô" u2="„" k="82"/><hkern u1="Ô" u2="‚" k="82"/><hkern u1="Ô" u2="Ÿ" k="20"/><hkern u1="Ô" u2="Ã" k="20"/><hkern u1="Ô" u2="Ã…" k="41"/><hkern u1="Ô" u2="Ä" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="Â" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="À" k="41"/><hkern u1="Ô" u2="Z" k="20"/><hkern u1="Ô" u2="Y" k="20"/><hkern u1="Ô" u2="X" k="41"/><hkern u1="Ô" u2="W" k="20"/><hkern u1="Ô" u2="V" k="20"/><hkern u1="Ô" u2="T" k="61"/><hkern u1="Ô" u2="A" k="41"/><hkern u1="Ô" u2="." k="82"/><hkern u1="Ô" u2="," k="82"/><hkern u1="Õ" u2="„" k="82"/><hkern u1="Õ" u2="‚" k="82"/><hkern u1="Õ" u2="Ÿ" k="20"/><hkern u1="Õ" u2="Ã" k="20"/><hkern u1="Õ" u2="Ã…" k="41"/><hkern u1="Õ" u2="Ä" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="Â" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="À" k="41"/><hkern u1="Õ" u2="Z" k="20"/><hkern u1="Õ" u2="Y" k="20"/><hkern u1="Õ" u2="X" k="41"/><hkern u1="Õ" u2="W" k="20"/><hkern u1="Õ" u2="V" k="20"/><hkern u1="Õ" u2="T" k="61"/><hkern u1="Õ" u2="A" k="41"/><hkern u1="Õ" u2="." k="82"/><hkern u1="Õ" u2="," k="82"/><hkern u1="Ö" u2="„" k="82"/><hkern u1="Ö" u2="‚" k="82"/><hkern u1="Ö" u2="Ÿ" k="20"/><hkern u1="Ö" u2="Ã" k="20"/><hkern u1="Ö" u2="Ã…" k="41"/><hkern u1="Ö" u2="Ä" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="Â" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="À" k="41"/><hkern u1="Ö" u2="Z" k="20"/><hkern u1="Ö" u2="Y" k="20"/><hkern u1="Ö" u2="X" k="41"/><hkern u1="Ö" u2="W" k="20"/><hkern u1="Ö" u2="V" k="20"/><hkern u1="Ö" u2="T" k="61"/><hkern u1="Ö" u2="A" k="41"/><hkern u1="Ö" u2="." k="82"/><hkern u1="Ö" u2="," k="82"/><hkern u1="Ø" u2="„" k="82"/><hkern u1="Ø" u2="‚" k="82"/><hkern u1="Ø" u2="Ÿ" k="20"/><hkern u1="Ø" u2="Ã" k="20"/><hkern u1="Ø" u2="Ã…" k="41"/><hkern u1="Ø" u2="Ä" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="Â" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="À" k="41"/><hkern u1="Ø" u2="Z" k="20"/><hkern u1="Ø" u2="Y" k="20"/><hkern u1="Ø" u2="X" k="41"/><hkern u1="Ø" u2="W" k="20"/><hkern u1="Ø" u2="V" k="20"/><hkern u1="Ø" u2="T" k="61"/><hkern u1="Ø" u2="A" k="41"/><hkern u1="Ø" u2="." k="82"/><hkern u1="Ø" u2="," k="82"/><hkern u1="Ù" u2="„" k="41"/><hkern u1="Ù" u2="‚" k="41"/><hkern u1="Ù" u2="Ã…" k="20"/><hkern u1="Ù" u2="Ä" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="Â" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="À" k="20"/><hkern u1="Ù" u2="A" k="20"/><hkern u1="Ù" u2="." k="41"/><hkern u1="Ù" u2="," k="41"/><hkern u1="Ú" u2="„" k="41"/><hkern u1="Ú" u2="‚" k="41"/><hkern u1="Ú" u2="Ã…" k="20"/><hkern u1="Ú" u2="Ä" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="Â" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="À" k="20"/><hkern u1="Ú" u2="A" k="20"/><hkern u1="Ú" u2="." k="41"/><hkern u1="Ú" u2="," k="41"/><hkern u1="Û" u2="„" k="41"/><hkern u1="Û" u2="‚" k="41"/><hkern u1="Û" u2="Ã…" k="20"/><hkern u1="Û" u2="Ä" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="Â" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="À" k="20"/><hkern u1="Û" u2="A" k="20"/><hkern u1="Û" u2="." k="41"/><hkern u1="Û" u2="," k="41"/><hkern u1="Ãœ" u2="„" k="41"/><hkern u1="Ãœ" u2="‚" k="41"/><hkern u1="Ãœ" u2="Ã…" k="20"/><hkern u1="Ãœ" u2="Ä" k="20"/><hkern u1="Ãœ" u2="Ã" k="20"/><hkern u1="Ãœ" u2="Â" k="20"/><hkern u1="Ãœ" u2="Ã" k="20"/><hkern u1="Ãœ" u2="À" k="20"/><hkern u1="Ãœ" u2="A" k="20"/><hkern u1="Ãœ" u2="." k="41"/><hkern u1="Ãœ" u2="," k="41"/><hkern u1="Ã" u2="„" k="123"/><hkern u1="Ã" u2="‚" k="123"/><hkern u1="Ã" u2="Å“" k="102"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="ü" k="61"/><hkern u1="Ã" u2="û" k="61"/><hkern u1="Ã" u2="ú" k="61"/><hkern u1="Ã" u2="ù" k="61"/><hkern u1="Ã" u2="ø" k="102"/><hkern u1="Ã" u2="ö" k="102"/><hkern u1="Ã" u2="õ" k="102"/><hkern u1="Ã" u2="ô" k="102"/><hkern u1="Ã" u2="ó" k="102"/><hkern u1="Ã" u2="ò" k="102"/><hkern u1="Ã" u2="ë" k="102"/><hkern u1="Ã" u2="ê" k="102"/><hkern u1="Ã" u2="é" k="102"/><hkern u1="Ã" u2="è" k="102"/><hkern u1="Ã" u2="ç" k="102"/><hkern u1="Ã" u2="æ" k="102"/><hkern u1="Ã" u2="Ã¥" k="102"/><hkern u1="Ã" u2="ä" k="102"/><hkern u1="Ã" u2="ã" k="102"/><hkern u1="Ã" u2="â" k="102"/><hkern u1="Ã" u2="á" k="102"/><hkern u1="Ã" u2="à " k="102"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Ã…" k="123"/><hkern u1="Ã" u2="Ä" k="123"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Â" k="123"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="À" k="123"/><hkern u1="Ã" u2="z" k="41"/><hkern u1="Ã" u2="u" k="61"/><hkern u1="Ã" u2="s" k="82"/><hkern u1="Ã" u2="r" k="61"/><hkern u1="Ã" u2="q" k="102"/><hkern u1="Ã" u2="p" k="61"/><hkern u1="Ã" u2="o" k="102"/><hkern u1="Ã" u2="n" k="61"/><hkern u1="Ã" u2="m" k="61"/><hkern u1="Ã" u2="g" k="41"/><hkern u1="Ã" u2="e" k="102"/><hkern u1="Ã" u2="d" k="102"/><hkern u1="Ã" u2="c" k="102"/><hkern u1="Ã" u2="a" k="102"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="A" k="123"/><hkern u1="Ã" u2="?" k="-41"/><hkern u1="Ã" u2="." k="123"/><hkern u1="Ã" u2="," k="123"/><hkern u1="Þ" u2="„" k="266"/><hkern u1="Þ" u2="‚" k="266"/><hkern u1="Þ" u2="Ã…" k="102"/><hkern u1="Þ" u2="Ä" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="Â" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="À" k="102"/><hkern u1="Þ" u2="Z" k="20"/><hkern u1="Þ" u2="X" k="41"/><hkern u1="Þ" u2="A" k="102"/><hkern u1="Þ" u2="." k="266"/><hkern u1="Þ" u2="," k="266"/><hkern u1="à " u2="â€" k="20"/><hkern u1="à " u2="’" k="20"/><hkern u1="à " u2="'" k="20"/><hkern u1="à " u2="&quot;" k="20"/><hkern u1="á" u2="â€" k="20"/><hkern u1="á" u2="’" k="20"/><hkern u1="á" u2="'" k="20"/><hkern u1="á" u2="&quot;" k="20"/><hkern u1="â" u2="â€" k="20"/><hkern u1="â" u2="’" k="20"/><hkern u1="â" u2="'" k="20"/><hkern u1="â" u2="&quot;" k="20"/><hkern u1="ã" u2="â€" k="20"/><hkern u1="ã" u2="’" k="20"/><hkern u1="ã" u2="'" k="20"/><hkern u1="ã" u2="&quot;" k="20"/><hkern u1="ä" u2="â€" k="20"/><hkern u1="ä" u2="’" k="20"/><hkern u1="ä" u2="'" k="20"/><hkern u1="ä" u2="&quot;" k="20"/><hkern u1="Ã¥" u2="â€" k="20"/><hkern u1="Ã¥" u2="’" k="20"/><hkern u1="Ã¥" u2="'" k="20"/><hkern u1="Ã¥" u2="&quot;" k="20"/><hkern u1="è" u2="â€" k="20"/><hkern u1="è" u2="’" k="20"/><hkern u1="è" u2="ý" k="41"/><hkern u1="è" u2="z" k="20"/><hkern u1="è" u2="y" k="41"/><hkern u1="è" u2="x" k="41"/><hkern u1="è" u2="w" k="41"/><hkern u1="è" u2="v" k="41"/><hkern u1="è" u2="'" k="20"/><hkern u1="è" u2="&quot;" k="20"/><hkern u1="é" u2="â€" k="20"/><hkern u1="é" u2="’" k="20"/><hkern u1="é" u2="ý" k="41"/><hkern u1="é" u2="z" k="20"/><hkern u1="é" u2="y" k="41"/><hkern u1="é" u2="x" k="41"/><hkern u1="é" u2="w" k="41"/><hkern u1="é" u2="v" k="41"/><hkern u1="é" u2="'" k="20"/><hkern u1="é" u2="&quot;" k="20"/><hkern u1="ê" u2="â€" k="20"/><hkern u1="ê" u2="’" k="20"/><hkern u1="ê" u2="ý" k="41"/><hkern u1="ê" u2="z" k="20"/><hkern u1="ê" u2="y" k="41"/><hkern u1="ê" u2="x" k="41"/><hkern u1="ê" u2="w" k="41"/><hkern u1="ê" u2="v" k="41"/><hkern u1="ê" u2="'" k="20"/><hkern u1="ê" u2="&quot;" k="20"/><hkern u1="ë" u2="â€" k="20"/><hkern u1="ë" u2="’" k="20"/><hkern u1="ë" u2="ý" k="41"/><hkern u1="ë" u2="z" k="20"/><hkern u1="ë" u2="y" k="41"/><hkern u1="ë" u2="x" k="41"/><hkern u1="ë" u2="w" k="41"/><hkern u1="ë" u2="v" k="41"/><hkern u1="ë" u2="'" k="20"/><hkern u1="ë" u2="&quot;" k="20"/><hkern u1="ð" u2="â€" k="20"/><hkern u1="ð" u2="’" k="20"/><hkern u1="ð" u2="ý" k="41"/><hkern u1="ð" u2="z" k="20"/><hkern u1="ð" u2="y" k="41"/><hkern u1="ð" u2="x" k="41"/><hkern u1="ð" u2="w" k="41"/><hkern u1="ð" u2="v" k="41"/><hkern u1="ð" u2="'" k="20"/><hkern u1="ð" u2="&quot;" k="20"/><hkern u1="ò" u2="â€" k="20"/><hkern u1="ò" u2="’" k="20"/><hkern u1="ò" u2="ý" k="41"/><hkern u1="ò" u2="z" k="20"/><hkern u1="ò" u2="y" k="41"/><hkern u1="ò" u2="x" k="41"/><hkern u1="ò" u2="w" k="41"/><hkern u1="ò" u2="v" k="41"/><hkern u1="ò" u2="'" k="20"/><hkern u1="ò" u2="&quot;" k="20"/><hkern u1="ó" u2="â€" k="20"/><hkern u1="ó" u2="’" k="20"/><hkern u1="ó" u2="ý" k="41"/><hkern u1="ó" u2="z" k="20"/><hkern u1="ó" u2="y" k="41"/><hkern u1="ó" u2="x" k="41"/><hkern u1="ó" u2="w" k="41"/><hkern u1="ó" u2="v" k="41"/><hkern u1="ó" u2="'" k="20"/><hkern u1="ó" u2="&quot;" k="20"/><hkern u1="ô" u2="â€" k="20"/><hkern u1="ô" u2="’" k="20"/><hkern u1="ô" u2="ý" k="41"/><hkern u1="ô" u2="z" k="20"/><hkern u1="ô" u2="y" k="41"/><hkern u1="ô" u2="x" k="41"/><hkern u1="ô" u2="w" k="41"/><hkern u1="ô" u2="v" k="41"/><hkern u1="ô" u2="'" k="20"/><hkern u1="ô" u2="&quot;" k="20"/><hkern u1="ö" u2="â€" k="41"/><hkern u1="ö" u2="’" k="41"/><hkern u1="ö" u2="'" k="41"/><hkern u1="ö" u2="&quot;" k="41"/><hkern u1="ø" u2="â€" k="20"/><hkern u1="ø" u2="’" k="20"/><hkern u1="ø" u2="ý" k="41"/><hkern u1="ø" u2="z" k="20"/><hkern u1="ø" u2="y" k="41"/><hkern u1="ø" u2="x" k="41"/><hkern u1="ø" u2="w" k="41"/><hkern u1="ø" u2="v" k="41"/><hkern u1="ø" u2="'" k="20"/><hkern u1="ø" u2="&quot;" k="20"/><hkern u1="ý" u2="„" k="82"/><hkern u1="ý" u2="â€" k="-82"/><hkern u1="ý" u2="‚" k="82"/><hkern u1="ý" u2="’" k="-82"/><hkern u1="ý" u2="?" k="-41"/><hkern u1="ý" u2="." k="82"/><hkern u1="ý" u2="," k="82"/><hkern u1="ý" u2="'" k="-82"/><hkern u1="ý" u2="&quot;" k="-82"/><hkern u1="þ" u2="â€" k="20"/><hkern u1="þ" u2="’" k="20"/><hkern u1="þ" u2="ý" k="41"/><hkern u1="þ" u2="z" k="20"/><hkern u1="þ" u2="y" k="41"/><hkern u1="þ" u2="x" k="41"/><hkern u1="þ" u2="w" k="41"/><hkern u1="þ" u2="v" k="41"/><hkern u1="þ" u2="'" k="20"/><hkern u1="þ" u2="&quot;" k="20"/><hkern u1="ÿ" u2="„" k="82"/><hkern u1="ÿ" u2="â€" k="-82"/><hkern u1="ÿ" u2="‚" k="82"/><hkern u1="ÿ" u2="’" k="-82"/><hkern u1="ÿ" u2="?" k="-41"/><hkern u1="ÿ" u2="." k="82"/><hkern u1="ÿ" u2="," k="82"/><hkern u1="ÿ" u2="'" k="-82"/><hkern u1="ÿ" u2="&quot;" k="-82"/><hkern u1="Å’" u2="J" k="-123"/><hkern u1="Ÿ" u2="„" k="123"/><hkern u1="Ÿ" u2="‚" k="123"/><hkern u1="Ÿ" u2="Å“" k="102"/><hkern u1="Ÿ" u2="Å’" k="41"/><hkern u1="Ÿ" u2="ü" k="61"/><hkern u1="Ÿ" u2="û" k="61"/><hkern u1="Ÿ" u2="ú" k="61"/><hkern u1="Ÿ" u2="ù" k="61"/><hkern u1="Ÿ" u2="ø" k="102"/><hkern u1="Ÿ" u2="ö" k="102"/><hkern u1="Ÿ" u2="õ" k="102"/><hkern u1="Ÿ" u2="ô" k="102"/><hkern u1="Ÿ" u2="ó" k="102"/><hkern u1="Ÿ" u2="ò" k="102"/><hkern u1="Ÿ" u2="ë" k="102"/><hkern u1="Ÿ" u2="ê" k="102"/><hkern u1="Ÿ" u2="é" k="102"/><hkern u1="Ÿ" u2="è" k="102"/><hkern u1="Ÿ" u2="ç" k="102"/><hkern u1="Ÿ" u2="æ" k="102"/><hkern u1="Ÿ" u2="Ã¥" k="102"/><hkern u1="Ÿ" u2="ä" k="102"/><hkern u1="Ÿ" u2="ã" k="102"/><hkern u1="Ÿ" u2="â" k="102"/><hkern u1="Ÿ" u2="á" k="102"/><hkern u1="Ÿ" u2="à " k="102"/><hkern u1="Ÿ" u2="Ø" k="41"/><hkern u1="Ÿ" u2="Ö" k="41"/><hkern u1="Ÿ" u2="Õ" k="41"/><hkern u1="Ÿ" u2="Ô" k="41"/><hkern u1="Ÿ" u2="Ó" k="41"/><hkern u1="Ÿ" u2="Ã’" k="41"/><hkern u1="Ÿ" u2="Ç" k="41"/><hkern u1="Ÿ" u2="Ã…" k="123"/><hkern u1="Ÿ" u2="Ä" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="Â" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="À" k="123"/><hkern u1="Ÿ" u2="z" k="41"/><hkern u1="Ÿ" u2="u" k="61"/><hkern u1="Ÿ" u2="s" k="82"/><hkern u1="Ÿ" u2="r" k="61"/><hkern u1="Ÿ" u2="q" k="102"/><hkern u1="Ÿ" u2="p" k="61"/><hkern u1="Ÿ" u2="o" k="102"/><hkern u1="Ÿ" u2="n" k="61"/><hkern u1="Ÿ" u2="m" k="61"/><hkern u1="Ÿ" u2="g" k="41"/><hkern u1="Ÿ" u2="e" k="102"/><hkern u1="Ÿ" u2="d" k="102"/><hkern u1="Ÿ" u2="c" k="102"/><hkern u1="Ÿ" u2="a" k="102"/><hkern u1="Ÿ" u2="Q" k="41"/><hkern u1="Ÿ" u2="O" k="41"/><hkern u1="Ÿ" u2="G" k="41"/><hkern u1="Ÿ" u2="C" k="41"/><hkern u1="Ÿ" u2="A" k="123"/><hkern u1="Ÿ" u2="?" k="-41"/><hkern u1="Ÿ" u2="." k="123"/><hkern u1="Ÿ" u2="," k="123"/><hkern u1="–" u2="T" k="82"/><hkern u1="—" u2="T" k="82"/><hkern u1="‘" u2="Ÿ" k="-20"/><hkern u1="‘" u2="Å“" k="123"/><hkern u1="‘" u2="ü" k="61"/><hkern u1="‘" u2="û" k="61"/><hkern u1="‘" u2="ú" k="61"/><hkern u1="‘" u2="ù" k="61"/><hkern u1="‘" u2="ø" k="123"/><hkern u1="‘" u2="ö" k="123"/><hkern u1="‘" u2="õ" k="123"/><hkern u1="‘" u2="ô" k="123"/><hkern u1="‘" u2="ó" k="123"/><hkern u1="‘" u2="ò" k="123"/><hkern u1="‘" u2="ë" k="123"/><hkern u1="‘" u2="ê" k="123"/><hkern u1="‘" u2="é" k="123"/><hkern u1="‘" u2="è" k="123"/><hkern u1="‘" u2="ç" k="123"/><hkern u1="‘" u2="æ" k="82"/><hkern u1="‘" u2="Ã¥" k="82"/><hkern u1="‘" u2="ä" k="82"/><hkern u1="‘" u2="ã" k="82"/><hkern u1="‘" u2="â" k="82"/><hkern u1="‘" u2="á" k="82"/><hkern u1="‘" u2="à " k="123"/><hkern u1="‘" u2="Ã" k="-20"/><hkern u1="‘" u2="Ã…" k="143"/><hkern u1="‘" u2="Ä" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="Â" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="À" k="143"/><hkern u1="‘" u2="u" k="61"/><hkern u1="‘" u2="s" k="61"/><hkern u1="‘" u2="r" k="61"/><hkern u1="‘" u2="q" k="123"/><hkern u1="‘" u2="p" k="61"/><hkern u1="‘" u2="o" k="123"/><hkern u1="‘" u2="n" k="61"/><hkern u1="‘" u2="m" k="61"/><hkern u1="‘" u2="g" k="61"/><hkern u1="‘" u2="e" k="123"/><hkern u1="‘" u2="d" k="123"/><hkern u1="‘" u2="c" k="123"/><hkern u1="‘" u2="a" k="82"/><hkern u1="‘" u2="Y" k="-20"/><hkern u1="‘" u2="W" k="-41"/><hkern u1="‘" u2="V" k="-41"/><hkern u1="‘" u2="T" k="-41"/><hkern u1="‘" u2="A" k="143"/><hkern u1="’" u2="Ÿ" k="-20"/><hkern u1="’" u2="Å“" k="123"/><hkern u1="’" u2="ü" k="61"/><hkern u1="’" u2="û" k="61"/><hkern u1="’" u2="ú" k="61"/><hkern u1="’" u2="ù" k="61"/><hkern u1="’" u2="ø" k="123"/><hkern u1="’" u2="ö" k="123"/><hkern u1="’" u2="õ" k="123"/><hkern u1="’" u2="ô" k="123"/><hkern u1="’" u2="ó" k="123"/><hkern u1="’" u2="ò" k="123"/><hkern u1="’" u2="ë" k="123"/><hkern u1="’" u2="ê" k="123"/><hkern u1="’" u2="é" k="123"/><hkern u1="’" u2="è" k="123"/><hkern u1="’" u2="ç" k="123"/><hkern u1="’" u2="æ" k="82"/><hkern u1="’" u2="Ã¥" k="82"/><hkern u1="’" u2="ä" k="82"/><hkern u1="’" u2="ã" k="82"/><hkern u1="’" u2="â" k="82"/><hkern u1="’" u2="á" k="82"/><hkern u1="’" u2="à " k="123"/><hkern u1="’" u2="Ã" k="-20"/><hkern u1="’" u2="Ã…" k="143"/><hkern u1="’" u2="Ä" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="Â" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="À" k="143"/><hkern u1="’" u2="u" k="61"/><hkern u1="’" u2="s" k="61"/><hkern u1="’" u2="r" k="61"/><hkern u1="’" u2="q" k="123"/><hkern u1="’" u2="p" k="61"/><hkern u1="’" u2="o" k="123"/><hkern u1="’" u2="n" k="61"/><hkern u1="’" u2="m" k="61"/><hkern u1="’" u2="g" k="61"/><hkern u1="’" u2="e" k="123"/><hkern u1="’" u2="d" k="123"/><hkern u1="’" u2="c" k="123"/><hkern u1="’" u2="a" k="82"/><hkern u1="’" u2="Y" k="-20"/><hkern u1="’" u2="W" k="-41"/><hkern u1="’" u2="V" k="-41"/><hkern u1="’" u2="T" k="-41"/><hkern u1="’" u2="A" k="143"/><hkern u1="‚" u2="Ÿ" k="123"/><hkern u1="‚" u2="Å’" k="102"/><hkern u1="‚" u2="Ã" k="123"/><hkern u1="‚" u2="Ãœ" k="41"/><hkern u1="‚" u2="Û" k="41"/><hkern u1="‚" u2="Ú" k="41"/><hkern u1="‚" u2="Ù" k="41"/><hkern u1="‚" u2="Ø" k="102"/><hkern u1="‚" u2="Ö" k="102"/><hkern u1="‚" u2="Õ" k="102"/><hkern u1="‚" u2="Ô" k="102"/><hkern u1="‚" u2="Ó" k="102"/><hkern u1="‚" u2="Ã’" k="102"/><hkern u1="‚" u2="Ç" k="102"/><hkern u1="‚" u2="Y" k="123"/><hkern u1="‚" u2="W" k="123"/><hkern u1="‚" u2="V" k="123"/><hkern u1="‚" u2="U" k="41"/><hkern u1="‚" u2="T" k="143"/><hkern u1="‚" u2="Q" k="102"/><hkern u1="‚" u2="O" k="102"/><hkern u1="‚" u2="G" k="102"/><hkern u1="‚" u2="C" k="102"/><hkern u1="“" u2="Ÿ" k="-20"/><hkern u1="“" u2="Å“" k="123"/><hkern u1="“" u2="ü" k="61"/><hkern u1="“" u2="û" k="61"/><hkern u1="“" u2="ú" k="61"/><hkern u1="“" u2="ù" k="61"/><hkern u1="“" u2="ø" k="123"/><hkern u1="“" u2="ö" k="123"/><hkern u1="“" u2="õ" k="123"/><hkern u1="“" u2="ô" k="123"/><hkern u1="“" u2="ó" k="123"/><hkern u1="“" u2="ò" k="123"/><hkern u1="“" u2="ë" k="123"/><hkern u1="“" u2="ê" k="123"/><hkern u1="“" u2="é" k="123"/><hkern u1="“" u2="è" k="123"/><hkern u1="“" u2="ç" k="123"/><hkern u1="“" u2="æ" k="82"/><hkern u1="“" u2="Ã¥" k="82"/><hkern u1="“" u2="ä" k="82"/><hkern u1="“" u2="ã" k="82"/><hkern u1="“" u2="â" k="82"/><hkern u1="“" u2="á" k="82"/><hkern u1="“" u2="à " k="123"/><hkern u1="“" u2="Ã" k="-20"/><hkern u1="“" u2="Ã…" k="143"/><hkern u1="“" u2="Ä" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="Â" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="À" k="143"/><hkern u1="“" u2="u" k="61"/><hkern u1="“" u2="s" k="61"/><hkern u1="“" u2="r" k="61"/><hkern u1="“" u2="q" k="123"/><hkern u1="“" u2="p" k="61"/><hkern u1="“" u2="o" k="123"/><hkern u1="“" u2="n" k="61"/><hkern u1="“" u2="m" k="61"/><hkern u1="“" u2="g" k="61"/><hkern u1="“" u2="e" k="123"/><hkern u1="“" u2="d" k="123"/><hkern u1="“" u2="c" k="123"/><hkern u1="“" u2="a" k="82"/><hkern u1="“" u2="Y" k="-20"/><hkern u1="“" u2="W" k="-41"/><hkern u1="“" u2="V" k="-41"/><hkern u1="“" u2="T" k="-41"/><hkern u1="“" u2="A" k="143"/><hkern u1="„" u2="Ÿ" k="123"/><hkern u1="„" u2="Å’" k="102"/><hkern u1="„" u2="Ã" k="123"/><hkern u1="„" u2="Ãœ" k="41"/><hkern u1="„" u2="Û" k="41"/><hkern u1="„" u2="Ú" k="41"/><hkern u1="„" u2="Ù" k="41"/><hkern u1="„" u2="Ø" k="102"/><hkern u1="„" u2="Ö" k="102"/><hkern u1="„" u2="Õ" k="102"/><hkern u1="„" u2="Ô" k="102"/><hkern u1="„" u2="Ó" k="102"/><hkern u1="„" u2="Ã’" k="102"/><hkern u1="„" u2="Ç" k="102"/><hkern u1="„" u2="Y" k="123"/><hkern u1="„" u2="W" k="123"/><hkern u1="„" u2="V" k="123"/><hkern u1="„" u2="U" k="41"/><hkern u1="„" u2="T" k="143"/><hkern u1="„" u2="Q" k="102"/><hkern u1="„" u2="O" k="102"/><hkern u1="„" u2="G" k="102"/><hkern u1="„" u2="C" k="102"/></font></defs></svg>
\ No newline at end of file
diff --git a/setup/pub/fonts/opensans/regular/opensans-400.ttf b/setup/pub/fonts/opensans/regular/opensans-400.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..c537f8382a42986cc5e0d5a06b1460df4f0a5e25
Binary files /dev/null and b/setup/pub/fonts/opensans/regular/opensans-400.ttf differ
diff --git a/setup/pub/fonts/opensans/regular/opensans-400.woff b/setup/pub/fonts/opensans/regular/opensans-400.woff
new file mode 100644
index 0000000000000000000000000000000000000000..e231183dce4c7b452afc9e7799586fd285e146f4
Binary files /dev/null and b/setup/pub/fonts/opensans/regular/opensans-400.woff differ
diff --git a/setup/pub/fonts/opensans/regular/opensans-400.woff2 b/setup/pub/fonts/opensans/regular/opensans-400.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..38ae1b57d6b689ab9ece36ee3a49255fc9a6f3f1
Binary files /dev/null and b/setup/pub/fonts/opensans/regular/opensans-400.woff2 differ
diff --git a/setup/pub/fonts/opensans/semibold/opensans-600.eot b/setup/pub/fonts/opensans/semibold/opensans-600.eot
new file mode 100644
index 0000000000000000000000000000000000000000..d8375dd0ab130207f023358d62ef6ff357108b7f
Binary files /dev/null and b/setup/pub/fonts/opensans/semibold/opensans-600.eot differ
diff --git a/setup/pub/fonts/opensans/semibold/opensans-600.svg b/setup/pub/fonts/opensans/semibold/opensans-600.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d3e4516be5727b6515d25e4eab111ad23289b37a
--- /dev/null
+++ b/setup/pub/fonts/opensans/semibold/opensans-600.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"><defs><font horiz-adv-x="1169"><font-face units-per-em="2048" ascent="1638" descent="-410"/><glyph unicode="ï¬" horiz-adv-x="1315" d="M35 0zm688 928H453V0H217v928H35v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T453 1178v-72h270V928zM1146 0H911v1106h235V0zM897 1399q0 63 34.5 97t98.5 34q62 0 96.5-34t34.5-97q0-60-34.5-94.5T1030 1270q-64 0-98.5 34.5T897 1399z"/><glyph unicode="fl" horiz-adv-x="1315" d="M35 0zm688 928H453V0H217v928H35v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T453 1178v-72h270V928zM1146 0H911v1556h235V0z"/><glyph unicode="ffi" horiz-adv-x="2058" d="M35 0zm688 928H453V0H217v928H35v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T453 1178v-72h270V928zm743 0h-270V0H960v928H778v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T1196 1178v-72h270V928zM1890 0h-235v1106h235V0zm-249 1399q0 63 34.5 97t98.5 34q62 0 96.5-34t34.5-97q0-60-34.5-94.5T1774 1270q-64 0-98.5 34.5T1641 1399z"/><glyph unicode="ffl" horiz-adv-x="2058" d="M35 0zm688 928H453V0H217v928H35v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T453 1178v-72h270V928zm743 0h-270V0H960v928H778v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T1196 1178v-72h270V928zM1890 0h-235v1556h235V0z"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="2048"/><glyph horiz-adv-x="1044"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph horiz-adv-x="532"/><glyph unicode="!" horiz-adv-x="565" d="M371 444H197l-52 1018h277zM133 125q0 74 39 112.5T283 276q71 0 109-40t38-111-38.5-112.5T283-29q-71 0-110.5 40T133 125z"/><glyph unicode="&quot;" horiz-adv-x="893" d="M365 1462l-41-528H174l-41 528h232zm395 0l-41-528H569l-41 528h232z"/><glyph unicode="#" horiz-adv-x="1323" d="M989 870l-55-284h270V418H901L821 0H643l80 418H475L395 0H221l76 418H47v168h283l57 284H123v168h293l80 422h180l-80-422h252l80 422h174l-80-422h252V870H989zM506 586h250l57 284H563z"/><glyph unicode="$" d="M1063 453q0-145-106-239T651 98v-217H518V92q-248 4-407 76v211q86-42 201-70.5T518 279v374l-84 31q-164 63-239.5 150.5T119 1051q0 138 107.5 227T518 1386v168h133v-165q203-7 385-82l-73-183q-157 62-312 74V834l76-29q190-73 263-154t73-198zm-236-15q0 58-40.5 95.5T651 606V287q176 27 176 151zm-473 615q0-57 35.5-95T518 883v311q-80-12-122-49t-42-92z"/><glyph unicode="%" horiz-adv-x="1765" d="M279 1024q0-149 29-222t95-73q132 0 132 295t-132 295q-66 0-95-73t-29-222zm450 2q0-230-82.5-345.5T403 565q-152 0-235.5 119.5T84 1026q0 457 319 457 157 0 241.5-118.5T729 1026zm502-586q0-149 29.5-223t95.5-74q131 0 131 297 0 293-131 293-66 0-95.5-72T1231 440zm450 0q0-230-83-345T1356-20q-152 0-236 118.5T1036 440q0 457 320 457 154 0 239.5-118t85.5-339zm-297 1022L573 0H379l811 1462h194z"/><glyph unicode="&" horiz-adv-x="1516" d="M451 1147q0-63 33.5-119T578 909q113 64 158.5 119.5T782 1153q0 65-43.5 104T623 1296q-79 0-125.5-40.5T451 1147zm149-965q183 0 313 107L530 666q-106-68-146-127.5T344 403q0-98 69.5-159.5T600 182zM96 387q0 131 64 228.5T391 809q-95 111-129.5 187.5T227 1155q0 152 108.5 240t291.5 88q177 0 278-85.5t101-230.5q0-114-67.5-207T713 774l346-334q81 107 135 314h242q-70-284-224-463L1513 0h-303l-149 145Q959 63 843.5 21.5T588-20Q358-20 227 89T96 387z"/><glyph unicode="'" horiz-adv-x="498" d="M365 1462l-41-528H174l-41 528h232z"/><glyph unicode="(" horiz-adv-x="649" d="M82 561q0 265 77.5 496T383 1462h205q-139-188-213-421.5T301 563t74-473 211-414H383Q236-154 159 73T82 561z"/><glyph unicode=")" horiz-adv-x="649" d="M567 561q0-263-77.5-490T266-324H63Q201-137 274.5 91T348 563q0 245-74 477.5T61 1462h205q147-175 224-406.5T567 561z"/><glyph unicode="*" horiz-adv-x="1122" d="M672 1556l-41-382 385 108 28-217-360-29 236-311-199-107-166 338-149-338-205 107 231 311-358 29 35 217 376-108-41 382h228z"/><glyph unicode="+" d="M494 633H96v178h398v408h180V811h399V633H674V227H494v406z"/><glyph unicode="," horiz-adv-x="547" d="M412 215Q364 29 236-264H63Q132 6 166 238h231z"/><glyph unicode="-" horiz-adv-x="659" d="M72 449v200h514V449H72z"/><glyph unicode="." horiz-adv-x="563" d="M133 125q0 73 38 112t110 39q73 0 111-40.5T430 125q0-71-38.5-112.5T281-29 171 12t-38 113z"/><glyph unicode="/" horiz-adv-x="799" d="M782 1462L238 0H16l545 1462h221z"/><glyph unicode="0" d="M1081 731q0-381-122.5-566T584-20q-244 0-370 191T88 731q0 387 122.5 570.5T584 1485q245 0 371-192t126-562zm-755 0q0-299 61.5-427T584 176t197.5 130T844 731q0 294-62.5 425.5T584 1288t-196.5-129T326 731z"/><glyph unicode="1" d="M780 0H545v944q0 169 8 268-23-24-56.5-53T272 975l-118 149 430 338h196V0z"/><glyph unicode="2" d="M1081 0H90v178l377 379q167 171 221.5 242.5T768 934t25 135q0 99-59.5 156T569 1282q-84 0-162.5-31T225 1139L98 1294q122 103 237 146t245 43q204 0 327-106.5t123-286.5q0-99-35.5-188t-109-183.5T641 463L387 217v-10h694V0z"/><glyph unicode="3" d="M1026 1126q0-139-81-231.5T717 770v-8q176-22 264-109.5t88-232.5q0-211-149-325.5T496-20Q253-20 86 59v209q93-46 197-71t200-25q170 0 254 63t84 195q0 117-93 172t-292 55H309v191h129q350 0 350 242 0 94-61 145t-180 51q-83 0-160-23.5T205 1171L90 1335q201 148 467 148 221 0 345-95t124-262z"/><glyph unicode="4" d="M1133 319H936V0H707v319H39v181l668 966h229V514h197V319zM707 514v367q0 196 10 321h-8q-28-66-88-160L258 514h449z"/><glyph unicode="5" d="M586 913q221 0 350-117t129-319q0-234-146.5-365.5T502-20q-245 0-385 79v213q81-46 186-71t195-25q159 0 242 71t83 208q0 262-334 262-47 0-116-9.5T252 686l-105 62 56 714h760v-209H410l-33-362q35 6 85.5 14t123.5 8z"/><glyph unicode="6" d="M94 623q0 858 699 858 110 0 186-17v-196q-76 22-176 22-235 0-353-126T322 760h12q47 81 132 125.5T666 930q199 0 310-122t111-331q0-230-128.5-363.5T608-20q-157 0-273 75.5t-178.5 220T94 623zm510-449q121 0 186.5 78T856 475q0 126-61.5 198T610 745q-76 0-140-32.5t-101-89T332 508q0-141 76.5-237.5T604 174z"/><glyph unicode="7" d="M256 0l578 1253H74v207h1011v-164L510 0H256z"/><glyph unicode="8" d="M584 1481q208 0 329-95.5t121-255.5q0-225-270-358 172-86 244.5-181t72.5-212q0-181-133-290T588-20Q350-20 219 82T88 371q0 122 68.5 219.5T381 764q-134 80-191 169t-57 200q0 159 125 253.5t326 94.5zM313 379q0-104 73-161.5T584 160q129 0 200.5 59.5T856 381q0 81-66 148T590 653l-29 13q-132-58-190-127.5T313 379zm269 921q-100 0-161-49.5T360 1116q0-52 22-93t64-74.5T588 868q120 53 169.5 111.5T807 1116q0 85-61.5 134.5T582 1300z"/><glyph unicode="9" d="M1079 838q0-432-174-645T381-20Q248-20 190-4v197q89-25 179-25 238 0 355 128t128 402h-12q-59-90-142.5-130T502 528q-194 0-305 121T86 981q0 229 128.5 364.5T565 1481q156 0 272-76t179-220.5 63-346.5zm-510 448q-122 0-187-79.5T317 983q0-125 60.5-196.5T561 715q119 0 200 71t81 166q0 89-34.5 166.5T711 1241t-142 45z"/><glyph unicode=":" horiz-adv-x="563" d="M133 125q0 73 38 112t110 39q73 0 111-40.5T430 125q0-71-38.5-112.5T281-29 171 12t-38 113zm0 854q0 151 148 151 75 0 112-40t37-111-38.5-112.5T281 825t-110 41-38 113z"/><glyph unicode=";" horiz-adv-x="569" d="M397 238l15-23Q364 29 236-264H63Q132 6 166 238h231zM131 979q0 151 148 151 75 0 112-40t37-111-38.5-112.5T279 825t-110 41-38 113z"/><glyph unicode="<" d="M1073 221L96 651v121l977 488v-195L340 721l733-303V221z"/><glyph unicode="=" d="M102 831v179h963V831H102zm0-399v178h963V432H102z"/><glyph unicode=">" d="M96 418l733 303-733 344v195l977-488V651L96 221v197z"/><glyph unicode="?" horiz-adv-x="928" d="M283 444v64q0 110 40 183t140 151q119 94 153.5 146t34.5 124q0 84-56 129t-161 45q-95 0-176-27t-158-65l-84 176q203 113 435 113 196 0 311-96t115-265q0-75-22-133.5T788.5 877 635 739q-93-73-124.5-121T479 489v-45H283zm-41-319q0 151 147 151 72 0 110-39.5T537 125q0-71-38.5-112.5T389-29 280 11.5 242 125z"/><glyph unicode="@" horiz-adv-x="1839" d="M1726 739q0-143-45-261.5T1554.5 293 1366 227q-79 0-137 42t-78 114h-12q-49-78-121-117t-162-39q-163 0-256.5 105T506 616q0 206 124 334.5T963 1079q76 0 168.5-13.5T1296 1028l-22-465v-24q0-160 104-160 79 0 125.5 102t46.5 260q0 171-70 300.5T1281 1241t-296 70q-213 0-370.5-88T374 971.5 291 592q0-290 155-446T891-10q221 0 461 90V-84q-210-86-457-86-370 0-577 199.5T111 586q0 261 112 464.5T533.5 1362 983 1470q217 0 386.5-90t263-256.5T1726 739zM698 612q0-233 183-233 193 0 211 293l12 239q-63 17-135 17-128 0-199.5-85T698 612z"/><glyph unicode="A" horiz-adv-x="1354" d="M1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426z"/><glyph unicode="B" horiz-adv-x="1352" d="M193 1462h434q302 0 436.5-88t134.5-278q0-128-66-213T942 776v-10q154-29 226.5-114.5T1241 420q0-197-137.5-308.5T721 0H193v1462zm239-604h230q150 0 219 47.5t69 161.5q0 103-74.5 149T639 1262H432V858zm0-194V201h254q150 0 226.5 57.5T989 440q0 114-78 169t-237 55H432z"/><glyph unicode="C" horiz-adv-x="1298" d="M815 1278q-206 0-324-146T373 729q0-269 113.5-407T815 184q93 0 180 18.5t181 47.5V45q-172-65-390-65-321 0-493 194.5T121 731q0 228 83.5 399T446 1392t371 91q224 0 414-94l-86-199q-74 35-156.5 61.5T815 1278z"/><glyph unicode="D" horiz-adv-x="1503" d="M1382 745q0-362-201-553.5T602 0H193v1462h452q349 0 543-188t194-529zm-252-8q0 525-491 525H432V201h170q528 0 528 536z"/><glyph unicode="E" horiz-adv-x="1143" d="M1020 0H193v1462h827v-202H432V862h551V662H432V203h588V0z"/><glyph unicode="F" horiz-adv-x="1090" d="M430 0H193v1462h825v-202H430V803h551V600H430V0z"/><glyph unicode="G" horiz-adv-x="1487" d="M791 793h538V59q-132-43-253.5-61T813-20q-332 0-512 196.5T121 731q0 353 203 552.5T883 1483q229 0 434-88l-84-199q-178 82-356 82-234 0-370-147T371 729q0-268 122.5-407.5T846 182q116 0 248 29v377H791v205z"/><glyph unicode="H" horiz-adv-x="1538" d="M1346 0h-240v659H432V0H193v1462h239V864h674v598h240V0z"/><glyph unicode="I" horiz-adv-x="625" d="M193 0v1462h239V0H193z"/><glyph unicode="J" horiz-adv-x="612" d="M8-408q-98 0-164 25v201q84-21 146-21 196 0 196 248v1417h240V53q0-224-106.5-342.5T8-408z"/><glyph unicode="K" horiz-adv-x="1309" d="M1309 0h-277L573 662 432 547V0H193v1462h239V764q98 120 195 231l395 467h272q-383-450-549-641z"/><glyph unicode="L" horiz-adv-x="1110" d="M193 0v1462h239V205h619V0H193z"/><glyph unicode="M" horiz-adv-x="1890" d="M825 0L401 1221h-8q17-272 17-510V0H193v1462h337L936 299h6l418 1163h338V0h-230v723q0 109 5.5 284t9.5 212h-8L1036 0H825z"/><glyph unicode="N" horiz-adv-x="1604" d="M1411 0h-293L399 1165h-8l5-65q14-186 14-340V0H193v1462h290l717-1159h6q-2 23-8 167.5t-6 225.5v766h219V0z"/><glyph unicode="O" horiz-adv-x="1612" d="M1491 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733z"/><glyph unicode="P" horiz-adv-x="1260" d="M1161 1020q0-229-150-351T584 547H432V0H193v1462h421q274 0 410.5-112t136.5-330zM432 748h127q184 0 270 64t86 200q0 126-77 188t-240 62H432V748z"/><glyph unicode="Q" horiz-adv-x="1612" d="M1491 733q0-266-101.5-448T1094 29l350-377h-322L846-20h-39q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733z"/><glyph unicode="R" horiz-adv-x="1309" d="M432 782h166q167 0 242 62t75 184q0 124-81 178t-244 54H432V782zm0-198V0H193v1462h413q283 0 419-106t136-320q0-273-284-389L1290 0h-272L668 584H432z"/><glyph unicode="S" horiz-adv-x="1126" d="M1036 397q0-195-141-306T506-20 100 57v226q100-47 212.5-74T522 182q142 0 209.5 54T799 381q0 82-62 139T481 655q-200 81-282 185t-82 250q0 183 130 288t349 105q210 0 418-92l-76-195q-195 82-348 82-116 0-176-50.5T354 1094q0-57 24-97.5t79-76.5 198-95q161-67 236-125t110-131 35-172z"/><glyph unicode="T" horiz-adv-x="1159" d="M698 0H459v1257H29v205h1099v-205H698V0z"/><glyph unicode="U" horiz-adv-x="1520" d="M1339 1462V516q0-162-69.5-283.5t-201-187T754-20q-272 0-423 144T180 520v942h240V537q0-181 84-267t258-86q338 0 338 355v923h239z"/><glyph unicode="V" horiz-adv-x="1274" d="M1026 1462h248L762 0H510L0 1462h246l305-909q24-65 51-167.5T637 233q13 76 40 176t44 148z"/><glyph unicode="W" horiz-adv-x="1937" d="M1542 0h-260l-248 872q-16 57-40 164.5T965 1186q-10-64-32.5-166T895 868L653 0H393L204 732 12 1462h244l209-852q49-205 70-362 11 85 33 190t40 170l238 854h237l244-858q35-119 74-356 15 143 72 364l208 850h242z"/><glyph unicode="X" horiz-adv-x="1274" d="M1270 0H995L629 598 260 0H4l485 758-454 704h266l338-553 338 553h258L778 754z"/><glyph unicode="Y" horiz-adv-x="1212" d="M606 795l346 667h260L725 567V0H485v559L0 1462h260z"/><glyph unicode="Z" horiz-adv-x="1178" d="M1112 0H66v166l737 1091H86v205h1006v-168L352 205h760V0z"/><glyph unicode="[" horiz-adv-x="676" d="M625-324H154v1786h471v-176H369V-147h256v-177z"/><glyph unicode="\" horiz-adv-x="799" d="M238 1462L782 0H561L16 1462h222z"/><glyph unicode="]" horiz-adv-x="676" d="M51-147h256v1433H51v176h469V-324H51v177z"/><glyph unicode="^" horiz-adv-x="1100" d="M29 535l436 935h121l485-935H877l-349 694-307-694H29z"/><glyph unicode="_" horiz-adv-x="879" d="M883-319H-4v135h887v-135z"/><glyph unicode="`" horiz-adv-x="1212" d="M690 1241q-69 52-174.5 150.5T362 1548v21h273q38-70 103.5-161T848 1266v-25H690z"/><glyph unicode="a" horiz-adv-x="1188" d="M860 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160z"/><glyph unicode="b" horiz-adv-x="1276" d="M733 1126q207 0 322.5-150T1171 555q0-272-117-423.5T729-20q-210 0-326 151h-16L344 0H168v1556h235v-370q0-41-4-122t-6-103h10q112 165 330 165zm-61-192q-142 0-204.5-83.5T403 571v-16q0-202 64-292.5T676 172q125 0 189.5 99T930 557q0 377-258 377z"/><glyph unicode="c" horiz-adv-x="1014" d="M614-20q-251 0-381.5 146.5T102 547q0 279 136.5 429T633 1126q175 0 315-65l-71-189q-149 58-246 58-287 0-287-381 0-186 71.5-279.5T625 176q157 0 297 78V49Q859 12 787.5-4T614-20z"/><glyph unicode="d" horiz-adv-x="1276" d="M541-20q-207 0-323 150T102 551q0 272 117.5 423.5T545 1126q218 0 332-161h12q-17 119-17 188v403h236V0H924l-41 145h-11Q759-20 541-20zm63 190q145 0 211 81.5T883 516v33q0 209-68 297t-213 88q-124 0-191-100.5T344 547q0-184 65-280.5T604 170z"/><glyph unicode="e" horiz-adv-x="1180" d="M651-20q-258 0-403.5 150.5T102 545q0 271 135 426t371 155q219 0 346-133t127-366V500H344q5-161 87-247.5T662 166q98 0 182.5 18.5T1026 246V55Q940 14 852-3T651-20zm-43 968q-112 0-179.5-71T348 670h502q-2 137-66 207.5T608 948z"/><glyph unicode="f" horiz-adv-x="743" d="M723 928H453V0H217v928H35v110l182 72v72q0 196 92 290.5t281 94.5q124 0 244-41l-62-178q-87 28-166 28-80 0-116.5-49.5T453 1178v-72h270V928z"/><glyph unicode="g" horiz-adv-x="1139" d="M1102 1106V977l-189-35q26-35 43-86t17-108q0-171-118-269t-325-98q-53 0-96 8-76-47-76-110 0-38 35.5-57T524 203h193q183 0 278-78t95-225q0-188-155-290T487-492q-226 0-345 80T23-184Q23-82 87.5-12.5T268 84q-47 20-77.5 64.5T160 242q0 62 35 105t104 85q-86 37-139.5 120.5T106 748q0 180 113.5 279t323.5 99q47 0 98.5-6.5T719 1106h383zM233-172q0-76 68.5-117T494-330q192 0 286 55t94 146q0 72-51.5 102.5T631 4H453Q352 4 292.5-43.5T233-172zm101 920q0-104 53.5-160T541 532q204 0 204 218 0 108-50.5 166.5T541 975q-102 0-154.5-58T334 748z"/><glyph unicode="h" horiz-adv-x="1300" d="M1141 0H905v680q0 128-51.5 191T690 934q-148 0-217.5-88.5T403 549V0H168v1556h235v-395q0-95-12-203h15q48 80 133.5 124t199.5 44q402 0 402-405V0z"/><glyph unicode="i" horiz-adv-x="571" d="M403 0H168v1106h235V0zM154 1399q0 63 34.5 97t98.5 34q62 0 96.5-34t34.5-97q0-60-34.5-94.5T287 1270q-64 0-98.5 34.5T154 1399z"/><glyph unicode="j" horiz-adv-x="571" d="M55-492q-106 0-176 25v186q68-18 139-18 150 0 150 170v1235h235V-145q0-171-89.5-259T55-492zm99 1891q0 63 34.5 97t98.5 34q62 0 96.5-34t34.5-97q0-60-34.5-94.5T287 1270q-64 0-98.5 34.5T154 1399z"/><glyph unicode="k" horiz-adv-x="1171" d="M395 584l133 166 334 356h271L688 631 1161 0H885L530 485 401 379V0H168v1556h233V797l-12-213h6z"/><glyph unicode="l" horiz-adv-x="571" d="M403 0H168v1556h235V0z"/><glyph unicode="m" horiz-adv-x="1958" d="M1100 0H864v682q0 127-48 189.5T666 934q-136 0-199.5-88.5T403 551V0H168v1106h184l33-145h12q46 79 133.5 122t192.5 43q255 0 338-174h16q49 82 138 128t204 46q198 0 288.5-100t90.5-305V0h-235v682q0 127-48.5 189.5T1364 934q-137 0-200.5-85.5T1100 586V0z"/><glyph unicode="n" horiz-adv-x="1300" d="M1141 0H905v680q0 128-51.5 191T690 934q-149 0-218-88t-69-295V0H168v1106h184l33-145h12q50 79 142 122t204 43q398 0 398-405V0z"/><glyph unicode="o" horiz-adv-x="1251" d="M1149 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555z"/><glyph unicode="p" horiz-adv-x="1276" d="M729-20q-210 0-326 151h-14Q403-9 403-39v-453H168v1598h190q8-31 33-148h12q110 168 330 168 207 0 322.5-150T1171 555t-117.5-423T729-20zm-57 954q-140 0-204.5-82T403 590v-35q0-202 64-292.5T676 172q122 0 188 100t66 285q0 186-65.5 281.5T672 934z"/><glyph unicode="q" horiz-adv-x="1276" d="M606 168q148 0 212.5 85.5T883 512v37q0 205-66.5 295T602 934q-126 0-192-100t-66-287q0-379 262-379zM539-20q-205 0-321 150.5T102 551t118 422.5T545 1126q104 0 186.5-38.5T879 961h8l26 145h195V-492H872v469q0 44 4 93t7 75h-13Q766-20 539-20z"/><glyph unicode="r" horiz-adv-x="883" d="M729 1126q71 0 117-10l-23-219q-50 12-104 12-141 0-228.5-92T403 578V0H168v1106h184l31-195h12q55 99 143.5 157t190.5 58z"/><glyph unicode="s" horiz-adv-x="997" d="M911 315q0-162-118-248.5T455-20q-221 0-355 67v203q195-90 363-90 217 0 217 131 0 42-24 70t-79 58-153 68q-191 74-258.5 148T98 827q0 142 114.5 220.5T524 1126q195 0 369-79l-76-177q-179 74-301 74-186 0-186-106 0-52 48.5-88T590 651q137-53 199-97t92-101.5T911 315z"/><glyph unicode="t" horiz-adv-x="805" d="M580 170q86 0 172 27V20Q713 3 651.5-8.5T524-20q-334 0-334 352v596H39v104l162 86 80 234h145v-246h315V928H426V336q0-85 42.5-125.5T580 170z"/><glyph unicode="u" horiz-adv-x="1300" d="M948 0l-33 145h-12Q854 68 763.5 24T557-20Q356-20 257 80t-99 303v723h237V424q0-127 52-190.5T610 170q148 0 217.5 88.5T897 555v551h236V0H948z"/><glyph unicode="v" horiz-adv-x="1096" d="M420 0L0 1106h248l225-643q58-162 70-262h8q9 72 70 262l225 643h250L674 0H420z"/><glyph unicode="w" horiz-adv-x="1673" d="M1075 0L932 516q-26 82-94 381h-9q-58-270-92-383L590 0H330L20 1106h240l141-545q48-202 68-346h6q10 73 30.5 167.5T541 524l168 582h258l163-582q15-49 37.5-150t26.5-157h8q15 123 70 344l143 545h236L1339 0h-264z"/><glyph unicode="x" horiz-adv-x="1128" d="M414 565L43 1106h268l252-387 254 387h266L711 565 1102 0H836L563 414 291 0H25z"/><glyph unicode="y" horiz-adv-x="1098" d="M0 1106h256l225-627q51-134 68-252h8q9 55 33 133.5T844 1106h254L625-147Q496-492 195-492q-78 0-152 17v186q53-12 121-12 170 0 239 197L444 0z"/><glyph unicode="z" horiz-adv-x="979" d="M907 0H68v145l559 781H102v180h789V942L344 180h563V0z"/><glyph unicode="{" horiz-adv-x="791" d="M311 287q0 186-266 186v191q135 0 200.5 45.5T311 848v311q0 156 108.5 229.5T745 1462v-182q-114-5-165.5-46.5T528 1110V813q0-199-229-238v-12q229-36 229-237V27q0-82 51-124t166-44v-183q-231 2-332.5 78.5T311 2v285z"/><glyph unicode="|" horiz-adv-x="1128" d="M473 1552h180V-481H473v2033z"/><glyph unicode="}" horiz-adv-x="760" d="M463-20q0-156-99.5-229T45-324v183q95 1 148 38.5T246 27v262q0 121 53 187t176 87v12q-229 39-229 238v297q0 82-45.5 123.5T45 1280v182q223 0 320.5-76.5T463 1135V848q0-100 63.5-142T715 664V473q-123 0-187.5-42.5T463 287V-20z"/><glyph unicode="~" d="M330 692q-50 0-111.5-30T96 571v191q99 108 250 108 66 0 125-13t147-50q131-55 220-55 52 0 114.5 31t120.5 89V682Q968 571 823 571q-65 0-127.5 15.5T549 637q-127 55-219 55z"/><glyph unicode="¡" horiz-adv-x="565" d="M193 645h174l51-1016H141zm237 320q0-74-37.5-113T281 813q-72 0-110 39.5T133 965q0 69 38 111t110 42 110.5-40.5T430 965z"/><glyph unicode="¢" d="M987 238q-119-59-258-64V-20H573v200q-207 31-307 171T166 741q0 254 100.5 397T573 1313v170h158v-162q152-5 283-66l-70-188q-146 59-250 59-146 0-216-95t-70-288q0-194 72-283t210-89q75 0 142.5 15T987 438V238z"/><glyph unicode="£" d="M690 1481q194 0 375-82l-76-182q-162 71-284 71-205 0-205-219V825h397V653H500V471q0-91-33-155T354 207h756V0H72v195q98 30 145 96t47 178v184H76v172h188v256q0 188 113.5 294T690 1481z"/><glyph unicode="¤" d="M186 723q0 109 64 213l-133 133 121 119 131-129q100 63 215 63t213-65l133 131 121-117-131-133q63-100 63-215 0-119-63-217l129-129-119-119-133 129q-99-61-213-61-126 0-215 61L238 260 119 379l131 129q-64 99-64 215zm168 0q0-98 68-164.5T584 492q97 0 165 66.5T817 723q0 97-68 165t-165 68q-93 0-161.5-68T354 723z"/><glyph unicode="Â¥" d="M584 797l321 665h244L750 702h227V551H696V397h281V244H696V0H471v244H188v153h283v154H188v151h224L18 1462h246z"/><glyph unicode="¦" horiz-adv-x="1128" d="M473 1552h180V758H473v794zm0-1237h180v-796H473v796z"/><glyph unicode="§" horiz-adv-x="1026" d="M129 807q0 80 38.5 145.5T279 1061q-146 83-146 235 0 129 109.5 202t294.5 73q91 0 174-17t182-59l-68-162q-116 50-176 63t-121 13q-194 0-194-109 0-54 55-93.5t191-90.5q175-68 250-146.5T905 782q0-177-139-266 139-80 139-223 0-142-118-224.5T461-14q-212 0-346 71v179q77-40 173-65.5T465 145q235 0 235 131 0 43-21 70t-71 54-147 65q-141 55-206 101.5t-95.5 105T129 807zm184 20q0-45 24-80t78.5-69T610 588q109 65 109 168 0 75-62 126.5T436 987q-54-16-88.5-61.5T313 827z"/><glyph unicode="¨" horiz-adv-x="1212" d="M293 1399q0 62 33.5 89.5T408 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T801 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="©" horiz-adv-x="1704" d="M893 1034q-111 0-171-80.5T662 731q0-147 54-226t177-79q55 0 118 15t109 36V319q-115-51-235-51-197 0-305.5 120.5T471 731q0 214 110 337.5T887 1192q138 0 274-70l-65-143q-106 55-203 55zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm123 0q0-170 84.5-315.5T538 186t314-84q170 0 316 85.5t229.5 230T1481 731q0 168-84.5 314.5t-231 230.5-313.5 84q-168 0-312.5-83T309 1048t-86-317z"/><glyph unicode="ª" horiz-adv-x="754" d="M547 782l-29 97q-46-55-105-82t-130-27q-113 0-169.5 52.5T57 981q0 104 84 159.5t252 61.5l107 4q0 72-34.5 108T362 1350q-90 0-210-56l-54 115q144 70 285 70 138 0 207-62.5t69-187.5V782H547zm-146 316q-71-2-125.5-34T221 983q0-88 96-88 91 0 137 41t46 123v43z"/><glyph unicode="«" horiz-adv-x="1139" d="M82 561l356 432 168-94-282-350 282-348-168-97L82 535v26zm450 0l357 432 168-94-283-350 283-348-168-97-357 431v26z"/><glyph unicode="¬" d="M1073 256H895v377H96v178h977V256z"/><glyph unicode="Â" horiz-adv-x="659" d="M72 449zm0 0v200h514V449H72z"/><glyph unicode="®" horiz-adv-x="1704" d="M748 770h69q74 0 112 35t38 100q0 72-36.5 100.5T815 1034h-67V770zm409 139q0-171-153-233l237-397h-211L838 625h-90V279H559v903h262q174 0 255-68t81-205zM100 731q0 200 100 375t275 276 377 101q200 0 375-100t276-275 101-377q0-197-97-370T1235 84 852-20Q645-20 470 83.5T197.5 360 100 731zm123 0q0-170 84.5-315.5T538 186t314-84q170 0 316 85.5t229.5 230T1481 731q0 168-84.5 314.5t-231 230.5-313.5 84q-168 0-312.5-83T309 1048t-86-317z"/><glyph unicode="¯" horiz-adv-x="1024" d="M1030 1556H-6v164h1036v-164z"/><glyph unicode="°" horiz-adv-x="877" d="M109 1153q0 135 95 232.5t234 97.5q138 0 233-96t95-234q0-139-96-233.5T438 825q-88 0-164.5 43.5T153 988t-44 165zm153 0q0-70 51-122t125-52 125 51.5 51 122.5q0 76-52 127t-124 51-124-52-52-126z"/><glyph unicode="±" d="M494 664H96v178h398v407h180V842h399V664H674V258H494v406zM96 0v178h977V0H96z"/><glyph unicode="²" horiz-adv-x="743" d="M678 586H51v135l230 225q117 112 149.5 165t32.5 112q0 52-32 79t-83 27q-93 0-201-88l-94 121q139 119 309 119 136 0 211.5-66t75.5-180q0-83-46-158.5T420 874L281 745h397V586z"/><glyph unicode="³" horiz-adv-x="743" d="M645 1251q0-75-40.5-122.5T485 1042q94-21 141.5-76T674 834q0-127-93-196t-266-69q-148 0-270 62v157q145-79 270-79 179 0 179 135 0 125-199 125H180v133h105q184 0 184 129 0 52-34.5 80t-90.5 28q-57 0-105.5-20T133 1262l-84 114q61 46 134 75.5t171 29.5q134 0 212.5-61.5T645 1251z"/><glyph unicode="´" horiz-adv-x="1212" d="M362 1241v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T518 1241H362z"/><glyph unicode="µ" horiz-adv-x="1309" d="M403 422q0-252 218-252 146 0 215 88.5T905 555v551h236V0H958l-34 147h-13Q863 64 791.5 22T616-20q-140 0-219 90h-4q3-28 6.5-117t3.5-125v-320H168v1598h235V422z"/><glyph unicode="¶" horiz-adv-x="1341" d="M1143-260h-137v1663H815V-260H678v819q-62-18-146-18-216 0-317.5 125T113 1042q0 260 109 387t341 127h580V-260z"/><glyph unicode="·" horiz-adv-x="563" d="M133 723q0 73 38 112t110 39q73 0 111-40.5T430 723q0-71-38.5-112.5T281 569t-110 41-38 113z"/><glyph unicode="¸" horiz-adv-x="442" d="M426-270q0-222-305-222-66 0-121 15v137q54-14 123-14 54 0 85.5 16.5T240-276q0 85-179 110L145 0h152l-41-88q80-21 125-68.5T426-270z"/><glyph unicode="¹" horiz-adv-x="743" d="M532 586H346v512l3 103 5 91q-17-18-40.5-40T172 1141l-88 112 281 209h167V586z"/><glyph unicode="º" horiz-adv-x="780" d="M719 1124q0-164-87.5-259T387 770q-150 0-238 95.5T61 1124q0 169 88.5 262t241.5 93q152 0 240-94.5t88-260.5zm-496 0q0-111 39-166t127-55 127 55 39 166q0 113-39 167.5T389 1346t-127-54.5-39-167.5z"/><glyph unicode="»" horiz-adv-x="1139" d="M1057 535L698 104l-168 97 283 348-283 350 168 94 359-432v-26zm-451 0L248 104 80 201l282 348L80 899l168 94 358-432v-26z"/><glyph unicode="¼" horiz-adv-x="1700" d="M60 0zm1273 1462L477 0H285l858 1462h190zM508 586H322v512l3 103 5 91q-17-18-40.5-40T148 1141l-88 112 281 209h167V586zm1077-409h-125V1h-192v176H876v127l396 579h188V320h125V177zm-317 143v178q0 97 6 197-52-104-88-158l-148-217h230z"/><glyph unicode="½" horiz-adv-x="1700" d="M46 0zm1252 1462L442 0H250l858 1462h190zM494 586H308v512l3 103 5 91q-17-18-40.5-40T134 1141l-88 112 281 209h167V586zM1608 1H981v135l230 225q117 112 149.5 165t32.5 112q0 52-32 79t-83 27q-93 0-201-88l-94 121q139 119 309 119 136 0 211.5-66t75.5-180q0-83-46-158.5T1350 289l-139-129h397V1z"/><glyph unicode="¾" horiz-adv-x="1700" d="M55 0zm1360 1462L559 0H367l858 1462h190zm225-1285h-125V1h-192v176H931v127l396 579h188V320h125V177zm-317 143v178q0 97 6 197-52-104-88-158l-148-217h230zm-668 931q0-75-40.5-122.5T495 1042q94-21 141.5-76T684 834q0-127-93-196t-266-69q-148 0-270 62v157q145-79 270-79 179 0 179 135 0 125-199 125H190v133h105q184 0 184 129 0 52-34.5 80t-90.5 28q-57 0-105.5-20T143 1262l-84 114q61 46 134 75.5t171 29.5q134 0 212.5-61.5T655 1251z"/><glyph unicode="¿" horiz-adv-x="928" d="M651 645v-63q0-106-41-181T467 246Q343 148 312 99T281-25q0-78 54-125t161-47q90 0 174 27.5T836-104l82-179Q698-393 494-393q-207 0-323 95.5T55-33q0 73 21 130t64 109 157 142q94 76 125 124.5T453 600v45h198zm41 320q0-74-37.5-113T543 813q-72 0-110 39.5T395 965q0 69 38 111t110 42 110.5-40.5T692 965z"/><glyph unicode="À" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zm-229 967q-69 52-174.5 150.5T334 1886v21h273q38-70 103.5-161T820 1604v-25H662z"/><glyph unicode="Ã" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zm-359 967v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T688 1579H532z"/><glyph unicode="Â" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zm6 967q-123 73-228 180-103-103-225-180H286v25q191 198 254 303h260q63-110 256-303v-25H897z"/><glyph unicode="Ã" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zm-70 967q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H281q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T836 1749q79 0 106 115h125q-12-134-77-209.5T821 1579z"/><glyph unicode="Ä" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zM363 1737q0 62 33.5 89.5T478 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T871 1854q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="Ã…" horiz-adv-x="1354" d="M0 0zm1100 0L954 406H395L252 0H0l547 1468h260L1354 0h-254zM891 612l-137 398q-15 40-41.5 126T676 1262q-27-123-79-269L465 612h426zm22 965q0-102-65.5-165.5T674 1348t-172 62.5-64 164.5q0 101 63.5 163.5T674 1801q104 0 171.5-62t67.5-162zm-133-2q0 50-30 78.5t-76 28.5q-47 0-77-28.5t-30-78.5q0-106 107-106 46 0 76 27.5t30 78.5z"/><glyph unicode="Æ" horiz-adv-x="1868" d="M1747 0H936v406H432L244 0H-2l678 1462h1071v-202h-571V862h532V662h-532V203h571V0zM522 612h414v641H813z"/><glyph unicode="Ç" horiz-adv-x="1298" d="M121 0zm694 1278q-206 0-324-146T373 729q0-269 113.5-407T815 184q93 0 180 18.5t181 47.5V45q-172-65-390-65-321 0-493 194.5T121 731q0 228 83.5 399T446 1392t371 91q224 0 414-94l-86-199q-74 35-156.5 61.5T815 1278zM952-270q0-222-305-222-66 0-121 15v137q54-14 123-14 54 0 85.5 16.5T766-276q0 85-179 110L671 0h152l-41-88q80-21 125-68.5T952-270z"/><glyph unicode="È" horiz-adv-x="1143" d="M193 0zm827 0H193v1462h827v-202H432V862h551V662H432V203h588V0zM617 1579q-69 52-174.5 150.5T289 1886v21h273q38-70 103.5-161T775 1604v-25H617z"/><glyph unicode="É" horiz-adv-x="1143" d="M193 0zm827 0H193v1462h827v-202H432V862h551V662H432V203h588V0zM440 1579v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T596 1579H440z"/><glyph unicode="Ê" horiz-adv-x="1143" d="M193 0zm827 0H193v1462h827v-202H432V862h551V662H432V203h588V0zM831 1579q-123 73-228 180-103-103-225-180H220v25q191 198 254 303h260q63-110 256-303v-25H831z"/><glyph unicode="Ë" horiz-adv-x="1143" d="M193 0zm827 0H193v1462h827v-202H432V862h551V662H432V203h588V0zM297 1737q0 62 33.5 89.5T412 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T805 1854q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ÃŒ" horiz-adv-x="625" d="M0 0zm193 0v1462h239V0H193zm129 1579q-69 52-174.5 150.5T-6 1886v21h273q38-70 103.5-161T480 1604v-25H322z"/><glyph unicode="Ã" horiz-adv-x="625" d="M179 0zm14 0v1462h239V0H193zm-14 1579v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T335 1579H179z"/><glyph unicode="ÃŽ" horiz-adv-x="625" d="M0 0zm193 0v1462h239V0H193zm343 1579q-123 73-228 180-103-103-225-180H-75v25q191 198 254 303h260q63-110 256-303v-25H536z"/><glyph unicode="Ã" horiz-adv-x="625" d="M1 0zm192 0v1462h239V0H193zM1 1737q0 62 33.5 89.5T116 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29T1 1737zm393 0q0 62 33.5 89.5T509 1854q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="Ã" horiz-adv-x="1497" d="M1374 745q0-360-201-552.5T594 0H193v623H47v200h146v639h446q347 0 541-188.5T1374 745zm-252-8q0 260-124.5 392.5T629 1262H432V823h307V623H432V201h160q530 0 530 536z"/><glyph unicode="Ñ" horiz-adv-x="1604" d="M193 0zm1218 0h-293L399 1165h-8l5-65q14-186 14-340V0H193v1462h290l717-1159h6q-2 23-8 167.5t-6 225.5v766h219V0zM954 1579q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H414q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T969 1749q79 0 106 115h125q-12-134-77-209.5T954 1579z"/><glyph unicode="Ã’" horiz-adv-x="1612" d="M121 0zm1370 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733zm434 846q-69 52-174.5 150.5T481 1886v21h273q38-70 103.5-161T967 1604v-25H809z"/><glyph unicode="Ó" horiz-adv-x="1612" d="M121 0zm1370 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733zm282 846v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T813 1579H657z"/><glyph unicode="Ô" horiz-adv-x="1612" d="M121 0zm1370 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733zm649 846q-123 73-228 180-103-103-225-180H413v25q191 198 254 303h260q63-110 256-303v-25h-159z"/><glyph unicode="Õ" horiz-adv-x="1612" d="M121 0zm1370 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733zm575 846q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H410q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T965 1749q79 0 106 115h125q-12-134-77-209.5T950 1579z"/><glyph unicode="Ö" horiz-adv-x="1612" d="M121 0zm1370 733q0-357-178.5-555T807-20q-331 0-508.5 196.5T121 735t178.5 556T809 1485q326 0 504-197t178-555zm-1116 0q0-270 109-409.5T807 184q213 0 321.5 138T1237 733q0 269-107.5 408T809 1280q-215 0-324.5-139T375 733zm121 1004q0 62 33.5 89.5T611 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5t81.5 27.5q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="×" d="M457 723l-326 326 125 127 328-326 329 326 125-123-329-330 325-328-123-125-329 326-324-326-125 125z"/><glyph unicode="Ø" horiz-adv-x="1612" d="M1491 733q0-357-178.5-555T807-20q-213 0-361 81L352-76 211 18l98 144Q121 358 121 735q0 362 178.5 556T809 1485q199 0 354-82l90 129 142-92-99-140q195-199 195-567zm-254 0q0 225-80 361L571 244q97-60 236-60 213 0 321.5 138T1237 733zm-862 0q0-231 78-362l587 850q-92 59-231 59-215 0-324.5-139T375 733z"/><glyph unicode="Ù" horiz-adv-x="1520" d="M180 0zm1159 1462V516q0-162-69.5-283.5t-201-187T754-20q-272 0-423 144T180 520v942h240V537q0-181 84-267t258-86q338 0 338 355v923h239zm-594 117q-69 52-174.5 150.5T417 1886v21h273q38-70 103.5-161T903 1604v-25H745z"/><glyph unicode="Ú" horiz-adv-x="1520" d="M180 0zm1159 1462V516q0-162-69.5-283.5t-201-187T754-20q-272 0-423 144T180 520v942h240V537q0-181 84-267t258-86q338 0 338 355v923h239zm-739 117v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T756 1579H600z"/><glyph unicode="Û" horiz-adv-x="1520" d="M180 0zm1159 1462V516q0-162-69.5-283.5t-201-187T754-20q-272 0-423 144T180 520v942h240V537q0-181 84-267t258-86q338 0 338 355v923h239zm-362 117q-123 73-228 180-103-103-225-180H366v25q191 198 254 303h260q63-110 256-303v-25H977z"/><glyph unicode="Ãœ" horiz-adv-x="1520" d="M180 0zm1159 1462V516q0-162-69.5-283.5t-201-187T754-20q-272 0-423 144T180 520v942h240V537q0-181 84-267t258-86q338 0 338 355v923h239zm-894 275q0 62 33.5 89.5T560 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T953 1854q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="Ã" horiz-adv-x="1212" d="M0 0zm606 795l346 667h260L725 567V0H485v559L0 1462h260zm-156 784v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T606 1579H450z"/><glyph unicode="Þ" horiz-adv-x="1268" d="M1169 776q0-227-146-349T600 305H432V0H193v1462h239v-243h197q268 0 404-112t136-331zM432 504h133q187 0 273 63t86 203q0 127-78 188.5T596 1020H432V504z"/><glyph unicode="ß" horiz-adv-x="1364" d="M1149 1253q0-74-38.5-140.5T1006 995q-90-69-117-98t-27-57q0-30 22.5-55.5T964 721l95-64q92-62 135.5-109.5T1260 444t22-127q0-165-107-251T864-20q-190 0-299 65v199q58-37 139-61.5T852 158q192 0 192 151 0 61-34.5 105T854 532q-119 73-171 135t-52 146q0 63 34 115.5T770 1034q75 55 107 97.5t32 93.5q0 72-67 112.5T664 1378q-127 0-194-54t-67-159V0H168v1169q0 193 128.5 295.5T664 1567q225 0 355-84t130-230z"/><glyph unicode="à " horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zm77 1081q-69 52-174.5 150.5T259 1548v21h273q38-70 103.5-161T745 1266v-25H587z"/><glyph unicode="á" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zm-72 1081v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T594 1241H438z"/><glyph unicode="â" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zm304 1081q-123 73-228 180-103-103-225-180H203v25q191 198 254 303h260q63-110 256-303v-25H814z"/><glyph unicode="ã" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zm238 1081q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H208q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T763 1411q79 0 106 115h125q-12-134-77-209.5T748 1241z"/><glyph unicode="ä" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zM282 1399q0 62 33.5 89.5T397 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T790 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="Ã¥" horiz-adv-x="1188" d="M90 0zm770 0l-47 154h-8Q725 53 644 16.5T436-20q-163 0-254.5 88T90 317q0 171 127 258t387 95l191 6v59q0 106-49.5 158.5T592 946q-85 0-163-25t-150-59l-76 168q90 47 197 71.5t202 24.5q211 0 318.5-92T1028 745V0H860zM510 160q128 0 205.5 71.5T793 432v96l-142-6q-166-6-241.5-55.5T334 315q0-74 44-114.5T510 160zm331 1308q0-102-65.5-165.5T602 1239t-172 62.5-64 164.5q0 101 63.5 163.5T602 1692q104 0 171.5-62t67.5-162zm-133-2q0 50-30 78.5t-76 28.5q-47 0-77-28.5t-30-78.5q0-106 107-106 46 0 76 27.5t30 78.5z"/><glyph unicode="æ" horiz-adv-x="1817" d="M90 317q0 172 121.5 258.5T582 670l188 6v76q0 194-201 194-141 0-307-82l-74 166q88 47 192.5 71.5T584 1126q241 0 340-155 120 155 346 155 206 0 328-134.5T1720 629V502h-712q10-336 301-336 184 0 356 80V55q-86-41-171.5-58T1298-20q-140 0-248.5 54.5T874 199Q780 74 683.5 27T442-20q-165 0-258.5 90T90 317zm244-2q0-155 166-155 124 0 196 72.5T768 432v96l-135-6q-155-6-227-54.5T334 315zm932 633q-112 0-177.5-69.5T1014 670h473q0 130-58.5 204T1266 948z"/><glyph unicode="ç" horiz-adv-x="1014" d="M102 0zm512-20q-251 0-381.5 146.5T102 547q0 279 136.5 429T633 1126q175 0 315-65l-71-189q-149 58-246 58-287 0-287-381 0-186 71.5-279.5T625 176q157 0 297 78V49Q859 12 787.5-4T614-20zm168-250q0-222-305-222-66 0-121 15v137q54-14 123-14 54 0 85.5 16.5T596-276q0 85-179 110L501 0h152l-41-88q80-21 125-68.5T782-270z"/><glyph unicode="è" horiz-adv-x="1180" d="M102 0zm549-20q-258 0-403.5 150.5T102 545q0 271 135 426t371 155q219 0 346-133t127-366V500H344q5-161 87-247.5T662 166q98 0 182.5 18.5T1026 246V55Q940 14 852-3T651-20zm-43 968q-112 0-179.5-71T348 670h502q-2 137-66 207.5T608 948zm1 293q-69 52-174.5 150.5T281 1548v21h273q38-70 103.5-161T767 1266v-25H609z"/><glyph unicode="é" horiz-adv-x="1180" d="M102 0zm549-20q-258 0-403.5 150.5T102 545q0 271 135 426t371 155q219 0 346-133t127-366V500H344q5-161 87-247.5T662 166q98 0 182.5 18.5T1026 246V55Q940 14 852-3T651-20zm-43 968q-112 0-179.5-71T348 670h502q-2 137-66 207.5T608 948zm-150 293v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T614 1241H458z"/><glyph unicode="ê" horiz-adv-x="1180" d="M102 0zm549-20q-258 0-403.5 150.5T102 545q0 271 135 426t371 155q219 0 346-133t127-366V500H344q5-161 87-247.5T662 166q98 0 182.5 18.5T1026 246V55Q940 14 852-3T651-20zm-43 968q-112 0-179.5-71T348 670h502q-2 137-66 207.5T608 948zm230 293q-123 73-228 180-103-103-225-180H227v25q191 198 254 303h260q63-110 256-303v-25H838z"/><glyph unicode="ë" horiz-adv-x="1180" d="M102 0zm549-20q-258 0-403.5 150.5T102 545q0 271 135 426t371 155q219 0 346-133t127-366V500H344q5-161 87-247.5T662 166q98 0 182.5 18.5T1026 246V55Q940 14 852-3T651-20zm-43 968q-112 0-179.5-71T348 670h502q-2 137-66 207.5T608 948zm-301 451q0 62 33.5 89.5T422 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T815 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ì" horiz-adv-x="571" d="M0 0zm403 0H168v1106h235V0zM259 1241q-69 52-174.5 150.5T-69 1548v21h273q38-70 103.5-161T417 1266v-25H259z"/><glyph unicode="Ã" horiz-adv-x="571" d="M156 0zm247 0H168v1106h235V0zM156 1241v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T312 1241H156z"/><glyph unicode="î" horiz-adv-x="571" d="M0 0zm403 0H168v1106h235V0zm108 1241q-123 73-228 180-103-103-225-180h-158v25q191 198 254 303h260q63-110 256-303v-25H511z"/><glyph unicode="ï" horiz-adv-x="571" d="M0 0zm403 0H168v1106h235V0zM-25 1399q0 62 33.5 89.5T90 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T483 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ð" horiz-adv-x="1243" d="M1149 567q0-279-137.5-433T623-20q-235 0-378 136T102 481q0 231 131 365.5T584 981q214 0 301-111l8 4q-62 189-227 345l-250-150-88 133 204 119q-86 59-167 102l84 146q140-63 258-144l231 138 88-129-188-113q152-140 231.5-330t79.5-424zm-240-45q0 127-75.5 202T627 799q-151 0-218-82t-67-240q0-153 74-234t211-81q148 0 215 91t67 269z"/><glyph unicode="ñ" horiz-adv-x="1300" d="M168 0zm973 0H905v680q0 128-51.5 191T690 934q-149 0-218-88t-69-295V0H168v1106h184l33-145h12q50 79 142 122t204 43q398 0 398-405V0zM809 1241q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H269q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T824 1411q79 0 106 115h125q-12-134-77-209.5T809 1241z"/><glyph unicode="ò" horiz-adv-x="1251" d="M102 0zm1047 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555zm277 686q-69 52-174.5 150.5T293 1548v21h273q38-70 103.5-161T779 1266v-25H621z"/><glyph unicode="ó" horiz-adv-x="1251" d="M102 0zm1047 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555zm129 686v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T629 1241H473z"/><glyph unicode="ô" horiz-adv-x="1251" d="M102 0zm1047 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555zm506 686q-123 73-228 180-103-103-225-180H239v25q191 198 254 303h260q63-110 256-303v-25H850z"/><glyph unicode="õ" horiz-adv-x="1251" d="M102 0zm1047 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555zm431 686q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H235q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T790 1411q79 0 106 115h125q-12-134-77-209.5T775 1241z"/><glyph unicode="ö" horiz-adv-x="1251" d="M102 0zm1047 555q0-271-139-423T623-20q-155 0-274 70T166 251t-64 304q0 269 138 420t389 151q240 0 380-154.5T1149 555zm-805 0q0-383 283-383 280 0 280 383 0 379-282 379-148 0-214.5-98T344 555zm-33 844q0 62 33.5 89.5T426 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T819 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="÷" d="M96 633v178h977V633H96zm361-260q0 64 31.5 99.5T584 508q61 0 93-36t32-99-34-100-91-37q-60 0-93.5 35.5T457 373zm0 698q0 64 31.5 99.5T584 1206q61 0 93-36t32-99-34-100-91-37q-60 0-93.5 35.5T457 1071z"/><glyph unicode="ø" horiz-adv-x="1251" d="M1149 555q0-271-139-423T623-20q-144 0-250 57L297-72 162 18l82 117Q102 290 102 555q0 269 138 420t389 151q144 0 258-63l69 100 136-92-78-108q135-152 135-408zm-805 0q0-135 37-219l391 559q-60 39-147 39-148 0-214.5-98T344 555zm563 0q0 121-33 203L487 205q54-33 140-33 280 0 280 383z"/><glyph unicode="ù" horiz-adv-x="1300" d="M158 0zm790 0l-33 145h-12Q854 68 763.5 24T557-20Q356-20 257 80t-99 303v723h237V424q0-127 52-190.5T610 170q148 0 217.5 88.5T897 555v551h236V0H948zM617 1241q-69 52-174.5 150.5T289 1548v21h273q38-70 103.5-161T775 1266v-25H617z"/><glyph unicode="ú" horiz-adv-x="1300" d="M158 0zm790 0l-33 145h-12Q854 68 763.5 24T557-20Q356-20 257 80t-99 303v723h237V424q0-127 52-190.5T610 170q148 0 217.5 88.5T897 555v551h236V0H948zM501 1241v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T657 1241H501z"/><glyph unicode="û" horiz-adv-x="1300" d="M158 0zm790 0l-33 145h-12Q854 68 763.5 24T557-20Q356-20 257 80t-99 303v723h237V424q0-127 52-190.5T610 170q148 0 217.5 88.5T897 555v551h236V0H948zm-77 1241q-123 73-228 180-103-103-225-180H260v25q191 198 254 303h260q63-110 256-303v-25H871z"/><glyph unicode="ü" horiz-adv-x="1300" d="M158 0zm790 0l-33 145h-12Q854 68 763.5 24T557-20Q356-20 257 80t-99 303v723h237V424q0-127 52-190.5T610 170q148 0 217.5 88.5T897 555v551h236V0H948zM332 1399q0 62 33.5 89.5T447 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T840 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ý" horiz-adv-x="1098" d="M0 0zm0 1106h256l225-627q51-134 68-252h8q9 55 33 133.5T844 1106h254L625-147Q496-492 195-492q-78 0-152 17v186q53-12 121-12 170 0 239 197L444 0zm401 135v25q57 70 117.5 156t95.5 147h273v-21q-52-61-155.5-157.5T557 1241H401z"/><glyph unicode="þ" horiz-adv-x="1276" d="M403 961q61 86 142.5 125.5T733 1126q206 0 322-151t116-420q0-272-116.5-423.5T733-20q-219 0-330 149h-14l8-72 6-92v-457H168v2048h235v-430l-7-138-3-27h10zm271-27q-142 0-206.5-82T403 592v-37q0-202 64-292.5T676 172q254 0 254 385 0 190-61.5 283.5T674 934z"/><glyph unicode="ÿ" horiz-adv-x="1098" d="M0 0zm0 1106h256l225-627q51-134 68-252h8q9 55 33 133.5T844 1106h254L625-147Q496-492 195-492q-78 0-152 17v186q53-12 121-12 170 0 239 197L444 0zm239 293q0 62 33.5 89.5T354 1516q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T747 1516q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ı" horiz-adv-x="571" d="M403 0H168v1106h235V0z"/><glyph unicode="Å’" horiz-adv-x="1942" d="M1819 0H999Q897-20 788-20q-320 0-493.5 196.5T121 735q0 360 172 555t491 195q115 0 209-23h826v-202h-576V862h539V662h-539V203h576V0zM793 1280q-208 0-315-139T371 733t106-409 314-140q129 0 213 35v1024q-80 37-211 37z"/><glyph unicode="Å“" horiz-adv-x="1966" d="M1438-20q-281 0-420 194Q886-20 618-20q-236 0-376 155T102 555q0 272 137 421.5T621 1126q121 0 223-49t168-145q131 194 379 194 221 0 349-133.5T1868 627V500h-738q11-164 85.5-249t228.5-85q102 0 187 18.5t181 61.5V55q-84-40-171.5-57.5T1438-20zM344 555q0-189 65.5-286T621 172q141 0 206.5 95.5T893 551q0 192-66 287.5T616 934q-143 0-207.5-95T344 555zm1049 393q-110 0-177.5-69.5T1137 670h497q0 134-63 206t-178 72z"/><glyph unicode="Ÿ" horiz-adv-x="1212" d="M0 0zm606 795l346 667h260L725 567V0H485v559L0 1462h260zm-313 942q0 62 33.5 89.5T408 1854q53 0 84.5-31t31.5-86q0-53-32-85t-84-32q-48 0-81.5 29t-33.5 88zm393 0q0 62 33.5 89.5T801 1854q53 0 85-31t32-86q0-54-33-85.5t-84-31.5q-48 0-81.5 29t-33.5 88z"/><glyph unicode="ˆ" horiz-adv-x="1227" d="M838 1241q-123 73-228 180-103-103-225-180H227v25q191 198 254 303h260q63-110 256-303v-25H838z"/><glyph unicode="Ëš" horiz-adv-x="1182" d="M827 1468q0-102-65.5-165.5T588 1239t-172 62.5-64 164.5q0 101 63.5 163.5T588 1692q104 0 171.5-62t67.5-162zm-133-2q0 50-30 78.5t-76 28.5q-47 0-77-28.5t-30-78.5q0-106 107-106 46 0 76 27.5t30 78.5z"/><glyph unicode="Ëœ" horiz-adv-x="1227" d="M776 1241q-42 0-82.5 17.5t-79.5 39-76 39-71 17.5q-81 0-109-115H236q12 139 77.5 212t167.5 73q43 0 84-17.5t80-39 75.5-39T791 1411q79 0 106 115h125q-12-134-77-209.5T776 1241z"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="953"/><glyph horiz-adv-x="1907"/><glyph horiz-adv-x="635"/><glyph horiz-adv-x="476"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="317"/><glyph horiz-adv-x="238"/><glyph horiz-adv-x="381"/><glyph horiz-adv-x="105"/><glyph unicode="â€" horiz-adv-x="659" d="M72 449v200h514V449H72z"/><glyph unicode="‑" horiz-adv-x="659" d="M72 449v200h514V449H72z"/><glyph unicode="‒" horiz-adv-x="659" d="M72 449v200h514V449H72z"/><glyph unicode="–" horiz-adv-x="1024" d="M82 455v190h860V455H82z"/><glyph unicode="—" horiz-adv-x="2048" d="M82 455v190h1884V455H82z"/><glyph unicode="‘" horiz-adv-x="395" d="M37 961l-12 22q20 83 71 224t105 255h170q-64-256-101-501H37z"/><glyph unicode="’" horiz-adv-x="395" d="M356 1462l15-22q-53-209-176-479H25q69 289 100 501h231z"/><glyph unicode="‚" horiz-adv-x="549" d="M412 215Q364 29 236-264H63Q132 6 166 238h231z"/><glyph unicode="“" horiz-adv-x="813" d="M440 983q53 203 178 479h170q-69-296-100-501H455zm-415 0q20 83 71 224t105 255h170q-64-256-101-501H37z"/><glyph unicode="â€" horiz-adv-x="813" d="M371 1440q-53-209-176-479H25q69 289 100 501h231zm417 0q-53-209-176-479H440q69 271 103 501h231z"/><glyph unicode="„" horiz-adv-x="944" d="M391 215Q336 1 215-264H43Q109-4 145 238h232zm418 0Q761 29 633-264H461Q527-4 563 238h232z"/><glyph unicode="•" horiz-adv-x="770" d="M131 748q0 138 66 210t188 72q121 0 187.5-72.5T639 748q0-135-67-209t-187-74-187 72.5T131 748z"/><glyph unicode="…" horiz-adv-x="1677" d="M133 125q0 73 38 112t110 39q73 0 111-40.5T430 125q0-71-38.5-112.5T281-29 171 12t-38 113zm557 0q0 73 38 112t110 39q73 0 111-40.5T987 125q0-71-38.5-112.5T838-29 728 12t-38 113zm557 0q0 73 38 112t110 39q73 0 111-40.5t38-110.5q0-71-38.5-112.5T1395-29t-110 41-38 113z"/><glyph horiz-adv-x="381"/><glyph unicode="‹" horiz-adv-x="688" d="M82 561l356 432 168-94-282-350 282-348-168-97L82 535v26z"/><glyph unicode="›" horiz-adv-x="688" d="M606 535L248 104 80 201l282 348L80 899l168 94 358-432v-26z"/><glyph unicode="â„" horiz-adv-x="266" d="M655 1462L-201 0h-192l858 1462h190z"/><glyph horiz-adv-x="476"/><glyph unicode="â´" horiz-adv-x="743" d="M725 762H600V586H408v176H16v127l396 579h188V905h125V762zM408 905v178q0 97 6 197-52-104-88-158L178 905h230z"/><glyph unicode="€" horiz-adv-x="1188" d="M799 1278q-141 0-230.5-84T449 940h456V786H434l-2-45v-55l2-39h408V494H451q64-312 364-312 143 0 293 62V41Q977-20 803-20q-241 0-391.5 132T215 494H63v153h136l-2 37v37l2 65H63v154h150q38 251 191 394t395 143q200 0 358-88l-84-187q-154 76-274 76z"/><glyph unicode="â„¢" horiz-adv-x="1561" d="M375 741H229v592H27v129h553v-129H375V741zm588 0l-185 543h-6l4-119V741H635v721h217l178-534 187 534h210V741h-147v414l4 129h-6l-193-543H963z"/><glyph unicode="" horiz-adv-x="1105" d="M0 1105h1105V0H0v1105z"/><glyph horiz-adv-x="1276" d="M0 0z"/><hkern u1="&quot;" u2="Ÿ" k="-20"/><hkern u1="&quot;" u2="Å“" k="123"/><hkern u1="&quot;" u2="ü" k="61"/><hkern u1="&quot;" u2="û" k="61"/><hkern u1="&quot;" u2="ú" k="61"/><hkern u1="&quot;" u2="ù" k="61"/><hkern u1="&quot;" u2="ø" k="123"/><hkern u1="&quot;" u2="ö" k="123"/><hkern u1="&quot;" u2="õ" k="123"/><hkern u1="&quot;" u2="ô" k="123"/><hkern u1="&quot;" u2="ó" k="123"/><hkern u1="&quot;" u2="ò" k="123"/><hkern u1="&quot;" u2="ë" k="123"/><hkern u1="&quot;" u2="ê" k="123"/><hkern u1="&quot;" u2="é" k="123"/><hkern u1="&quot;" u2="è" k="123"/><hkern u1="&quot;" u2="ç" k="123"/><hkern u1="&quot;" u2="æ" k="82"/><hkern u1="&quot;" u2="Ã¥" k="82"/><hkern u1="&quot;" u2="ä" k="82"/><hkern u1="&quot;" u2="ã" k="82"/><hkern u1="&quot;" u2="â" k="82"/><hkern u1="&quot;" u2="á" k="82"/><hkern u1="&quot;" u2="à " k="123"/><hkern u1="&quot;" u2="Ã" k="-20"/><hkern u1="&quot;" u2="Ã…" k="143"/><hkern u1="&quot;" u2="Ä" k="143"/><hkern u1="&quot;" u2="Ã" k="143"/><hkern u1="&quot;" u2="Â" k="143"/><hkern u1="&quot;" u2="Ã" k="143"/><hkern u1="&quot;" u2="À" k="143"/><hkern u1="&quot;" u2="u" k="61"/><hkern u1="&quot;" u2="s" k="61"/><hkern u1="&quot;" u2="r" k="61"/><hkern u1="&quot;" u2="q" k="123"/><hkern u1="&quot;" u2="p" k="61"/><hkern u1="&quot;" u2="o" k="123"/><hkern u1="&quot;" u2="n" k="61"/><hkern u1="&quot;" u2="m" k="61"/><hkern u1="&quot;" u2="g" k="61"/><hkern u1="&quot;" u2="e" k="123"/><hkern u1="&quot;" u2="d" k="123"/><hkern u1="&quot;" u2="c" k="123"/><hkern u1="&quot;" u2="a" k="82"/><hkern u1="&quot;" u2="Y" k="-20"/><hkern u1="&quot;" u2="W" k="-41"/><hkern u1="&quot;" u2="V" k="-41"/><hkern u1="&quot;" u2="T" k="-41"/><hkern u1="&quot;" u2="A" k="143"/><hkern u1="'" u2="Ÿ" k="-20"/><hkern u1="'" u2="Å“" k="123"/><hkern u1="'" u2="ü" k="61"/><hkern u1="'" u2="û" k="61"/><hkern u1="'" u2="ú" k="61"/><hkern u1="'" u2="ù" k="61"/><hkern u1="'" u2="ø" k="123"/><hkern u1="'" u2="ö" k="123"/><hkern u1="'" u2="õ" k="123"/><hkern u1="'" u2="ô" k="123"/><hkern u1="'" u2="ó" k="123"/><hkern u1="'" u2="ò" k="123"/><hkern u1="'" u2="ë" k="123"/><hkern u1="'" u2="ê" k="123"/><hkern u1="'" u2="é" k="123"/><hkern u1="'" u2="è" k="123"/><hkern u1="'" u2="ç" k="123"/><hkern u1="'" u2="æ" k="82"/><hkern u1="'" u2="Ã¥" k="82"/><hkern u1="'" u2="ä" k="82"/><hkern u1="'" u2="ã" k="82"/><hkern u1="'" u2="â" k="82"/><hkern u1="'" u2="á" k="82"/><hkern u1="'" u2="à " k="123"/><hkern u1="'" u2="Ã" k="-20"/><hkern u1="'" u2="Ã…" k="143"/><hkern u1="'" u2="Ä" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="Â" k="143"/><hkern u1="'" u2="Ã" k="143"/><hkern u1="'" u2="À" k="143"/><hkern u1="'" u2="u" k="61"/><hkern u1="'" u2="s" k="61"/><hkern u1="'" u2="r" k="61"/><hkern u1="'" u2="q" k="123"/><hkern u1="'" u2="p" k="61"/><hkern u1="'" u2="o" k="123"/><hkern u1="'" u2="n" k="61"/><hkern u1="'" u2="m" k="61"/><hkern u1="'" u2="g" k="61"/><hkern u1="'" u2="e" k="123"/><hkern u1="'" u2="d" k="123"/><hkern u1="'" u2="c" k="123"/><hkern u1="'" u2="a" k="82"/><hkern u1="'" u2="Y" k="-20"/><hkern u1="'" u2="W" k="-41"/><hkern u1="'" u2="V" k="-41"/><hkern u1="'" u2="T" k="-41"/><hkern u1="'" u2="A" k="143"/><hkern u1="(" u2="J" k="-184"/><hkern u1="," u2="Ÿ" k="123"/><hkern u1="," u2="Å’" k="102"/><hkern u1="," u2="Ã" k="123"/><hkern u1="," u2="Ãœ" k="41"/><hkern u1="," u2="Û" k="41"/><hkern u1="," u2="Ú" k="41"/><hkern u1="," u2="Ù" k="41"/><hkern u1="," u2="Ø" k="102"/><hkern u1="," u2="Ö" k="102"/><hkern u1="," u2="Õ" k="102"/><hkern u1="," u2="Ô" k="102"/><hkern u1="," u2="Ó" k="102"/><hkern u1="," u2="Ã’" k="102"/><hkern u1="," u2="Ç" k="102"/><hkern u1="," u2="Y" k="123"/><hkern u1="," u2="W" k="123"/><hkern u1="," u2="V" k="123"/><hkern u1="," u2="U" k="41"/><hkern u1="," u2="T" k="143"/><hkern u1="," u2="Q" k="102"/><hkern u1="," u2="O" k="102"/><hkern u1="," u2="G" k="102"/><hkern u1="," u2="C" k="102"/><hkern u1="-" u2="T" k="82"/><hkern u1="." u2="Ÿ" k="123"/><hkern u1="." u2="Å’" k="102"/><hkern u1="." u2="Ã" k="123"/><hkern u1="." u2="Ãœ" k="41"/><hkern u1="." u2="Û" k="41"/><hkern u1="." u2="Ú" k="41"/><hkern u1="." u2="Ù" k="41"/><hkern u1="." u2="Ø" k="102"/><hkern u1="." u2="Ö" k="102"/><hkern u1="." u2="Õ" k="102"/><hkern u1="." u2="Ô" k="102"/><hkern u1="." u2="Ó" k="102"/><hkern u1="." u2="Ã’" k="102"/><hkern u1="." u2="Ç" k="102"/><hkern u1="." u2="Y" k="123"/><hkern u1="." u2="W" k="123"/><hkern u1="." u2="V" k="123"/><hkern u1="." u2="U" k="41"/><hkern u1="." u2="T" k="143"/><hkern u1="." u2="Q" k="102"/><hkern u1="." u2="O" k="102"/><hkern u1="." u2="G" k="102"/><hkern u1="." u2="C" k="102"/><hkern u1="A" u2="â€" k="143"/><hkern u1="A" u2="’" k="143"/><hkern u1="A" u2="Ÿ" k="123"/><hkern u1="A" u2="Å’" k="41"/><hkern u1="A" u2="Ã" k="123"/><hkern u1="A" u2="Ø" k="41"/><hkern u1="A" u2="Ö" k="41"/><hkern u1="A" u2="Õ" k="41"/><hkern u1="A" u2="Ô" k="41"/><hkern u1="A" u2="Ó" k="41"/><hkern u1="A" u2="Ã’" k="41"/><hkern u1="A" u2="Ç" k="41"/><hkern u1="A" u2="Y" k="123"/><hkern u1="A" u2="W" k="82"/><hkern u1="A" u2="V" k="82"/><hkern u1="A" u2="T" k="143"/><hkern u1="A" u2="Q" k="41"/><hkern u1="A" u2="O" k="41"/><hkern u1="A" u2="J" k="-266"/><hkern u1="A" u2="G" k="41"/><hkern u1="A" u2="C" k="41"/><hkern u1="A" u2="'" k="143"/><hkern u1="A" u2="&quot;" k="143"/><hkern u1="B" u2="„" k="82"/><hkern u1="B" u2="‚" k="82"/><hkern u1="B" u2="Ÿ" k="20"/><hkern u1="B" u2="Ã" k="20"/><hkern u1="B" u2="Ã…" k="41"/><hkern u1="B" u2="Ä" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="Â" k="41"/><hkern u1="B" u2="Ã" k="41"/><hkern u1="B" u2="À" k="41"/><hkern u1="B" u2="Z" k="20"/><hkern u1="B" u2="Y" k="20"/><hkern u1="B" u2="X" k="41"/><hkern u1="B" u2="W" k="20"/><hkern u1="B" u2="V" k="20"/><hkern u1="B" u2="T" k="61"/><hkern u1="B" u2="A" k="41"/><hkern u1="B" u2="." k="82"/><hkern u1="B" u2="," k="82"/><hkern u1="C" u2="Å’" k="41"/><hkern u1="C" u2="Ø" k="41"/><hkern u1="C" u2="Ö" k="41"/><hkern u1="C" u2="Õ" k="41"/><hkern u1="C" u2="Ô" k="41"/><hkern u1="C" u2="Ó" k="41"/><hkern u1="C" u2="Ã’" k="41"/><hkern u1="C" u2="Ç" k="41"/><hkern u1="C" u2="Q" k="41"/><hkern u1="C" u2="O" k="41"/><hkern u1="C" u2="G" k="41"/><hkern u1="C" u2="C" k="41"/><hkern u1="D" u2="„" k="82"/><hkern u1="D" u2="‚" k="82"/><hkern u1="D" u2="Ÿ" k="20"/><hkern u1="D" u2="Ã" k="20"/><hkern u1="D" u2="Ã…" k="41"/><hkern u1="D" u2="Ä" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="Â" k="41"/><hkern u1="D" u2="Ã" k="41"/><hkern u1="D" u2="À" k="41"/><hkern u1="D" u2="Z" k="20"/><hkern u1="D" u2="Y" k="20"/><hkern u1="D" u2="X" k="41"/><hkern u1="D" u2="W" k="20"/><hkern u1="D" u2="V" k="20"/><hkern u1="D" u2="T" k="61"/><hkern u1="D" u2="A" k="41"/><hkern u1="D" u2="." k="82"/><hkern u1="D" u2="," k="82"/><hkern u1="E" u2="J" k="-123"/><hkern u1="F" u2="„" k="123"/><hkern u1="F" u2="‚" k="123"/><hkern u1="F" u2="Ã…" k="41"/><hkern u1="F" u2="Ä" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="Â" k="41"/><hkern u1="F" u2="Ã" k="41"/><hkern u1="F" u2="À" k="41"/><hkern u1="F" u2="A" k="41"/><hkern u1="F" u2="?" k="-41"/><hkern u1="F" u2="." k="123"/><hkern u1="F" u2="," k="123"/><hkern u1="K" u2="Å’" k="41"/><hkern u1="K" u2="Ø" k="41"/><hkern u1="K" u2="Ö" k="41"/><hkern u1="K" u2="Õ" k="41"/><hkern u1="K" u2="Ô" k="41"/><hkern u1="K" u2="Ó" k="41"/><hkern u1="K" u2="Ã’" k="41"/><hkern u1="K" u2="Ç" k="41"/><hkern u1="K" u2="Q" k="41"/><hkern u1="K" u2="O" k="41"/><hkern u1="K" u2="G" k="41"/><hkern u1="K" u2="C" k="41"/><hkern u1="L" u2="â€" k="164"/><hkern u1="L" u2="’" k="164"/><hkern u1="L" u2="Ÿ" k="61"/><hkern u1="L" u2="Å’" k="41"/><hkern u1="L" u2="Ã" k="61"/><hkern u1="L" u2="Ãœ" k="20"/><hkern u1="L" u2="Û" k="20"/><hkern u1="L" u2="Ú" k="20"/><hkern u1="L" u2="Ù" k="20"/><hkern u1="L" u2="Ø" k="41"/><hkern u1="L" u2="Ö" k="41"/><hkern u1="L" u2="Õ" k="41"/><hkern u1="L" u2="Ô" k="41"/><hkern u1="L" u2="Ó" k="41"/><hkern u1="L" u2="Ã’" k="41"/><hkern u1="L" u2="Ç" k="41"/><hkern u1="L" u2="Y" k="61"/><hkern u1="L" u2="W" k="41"/><hkern u1="L" u2="V" k="41"/><hkern u1="L" u2="U" k="20"/><hkern u1="L" u2="T" k="41"/><hkern u1="L" u2="Q" k="41"/><hkern u1="L" u2="O" k="41"/><hkern u1="L" u2="G" k="41"/><hkern u1="L" u2="C" k="41"/><hkern u1="L" u2="'" k="164"/><hkern u1="L" u2="&quot;" k="164"/><hkern u1="O" u2="„" k="82"/><hkern u1="O" u2="‚" k="82"/><hkern u1="O" u2="Ÿ" k="20"/><hkern u1="O" u2="Ã" k="20"/><hkern u1="O" u2="Ã…" k="41"/><hkern u1="O" u2="Ä" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="Â" k="41"/><hkern u1="O" u2="Ã" k="41"/><hkern u1="O" u2="À" k="41"/><hkern u1="O" u2="Z" k="20"/><hkern u1="O" u2="Y" k="20"/><hkern u1="O" u2="X" k="41"/><hkern u1="O" u2="W" k="20"/><hkern u1="O" u2="V" k="20"/><hkern u1="O" u2="T" k="61"/><hkern u1="O" u2="A" k="41"/><hkern u1="O" u2="." k="82"/><hkern u1="O" u2="," k="82"/><hkern u1="P" u2="„" k="266"/><hkern u1="P" u2="‚" k="266"/><hkern u1="P" u2="Ã…" k="102"/><hkern u1="P" u2="Ä" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="Â" k="102"/><hkern u1="P" u2="Ã" k="102"/><hkern u1="P" u2="À" k="102"/><hkern u1="P" u2="Z" k="20"/><hkern u1="P" u2="X" k="41"/><hkern u1="P" u2="A" k="102"/><hkern u1="P" u2="." k="266"/><hkern u1="P" u2="," k="266"/><hkern u1="Q" u2="„" k="82"/><hkern u1="Q" u2="‚" k="82"/><hkern u1="Q" u2="Ÿ" k="20"/><hkern u1="Q" u2="Ã" k="20"/><hkern u1="Q" u2="Ã…" k="41"/><hkern u1="Q" u2="Ä" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="Â" k="41"/><hkern u1="Q" u2="Ã" k="41"/><hkern u1="Q" u2="À" k="41"/><hkern u1="Q" u2="Z" k="20"/><hkern u1="Q" u2="Y" k="20"/><hkern u1="Q" u2="X" k="41"/><hkern u1="Q" u2="W" k="20"/><hkern u1="Q" u2="V" k="20"/><hkern u1="Q" u2="T" k="61"/><hkern u1="Q" u2="A" k="41"/><hkern u1="Q" u2="." k="82"/><hkern u1="Q" u2="," k="82"/><hkern u1="T" u2="„" k="123"/><hkern u1="T" u2="‚" k="123"/><hkern u1="T" u2="—" k="82"/><hkern u1="T" u2="–" k="82"/><hkern u1="T" u2="Å“" k="143"/><hkern u1="T" u2="Å’" k="41"/><hkern u1="T" u2="ý" k="41"/><hkern u1="T" u2="ü" k="102"/><hkern u1="T" u2="û" k="102"/><hkern u1="T" u2="ú" k="102"/><hkern u1="T" u2="ù" k="102"/><hkern u1="T" u2="ø" k="143"/><hkern u1="T" u2="ö" k="143"/><hkern u1="T" u2="õ" k="143"/><hkern u1="T" u2="ô" k="143"/><hkern u1="T" u2="ó" k="143"/><hkern u1="T" u2="ò" k="143"/><hkern u1="T" u2="ë" k="143"/><hkern u1="T" u2="ê" k="143"/><hkern u1="T" u2="é" k="143"/><hkern u1="T" u2="è" k="143"/><hkern u1="T" u2="ç" k="143"/><hkern u1="T" u2="æ" k="164"/><hkern u1="T" u2="Ã¥" k="164"/><hkern u1="T" u2="ä" k="164"/><hkern u1="T" u2="ã" k="164"/><hkern u1="T" u2="â" k="164"/><hkern u1="T" u2="á" k="164"/><hkern u1="T" u2="à " k="143"/><hkern u1="T" u2="Ø" k="41"/><hkern u1="T" u2="Ö" k="41"/><hkern u1="T" u2="Õ" k="41"/><hkern u1="T" u2="Ô" k="41"/><hkern u1="T" u2="Ó" k="41"/><hkern u1="T" u2="Ã’" k="41"/><hkern u1="T" u2="Ç" k="41"/><hkern u1="T" u2="Ã…" k="143"/><hkern u1="T" u2="Ä" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="Â" k="143"/><hkern u1="T" u2="Ã" k="143"/><hkern u1="T" u2="À" k="143"/><hkern u1="T" u2="z" k="82"/><hkern u1="T" u2="y" k="41"/><hkern u1="T" u2="x" k="41"/><hkern u1="T" u2="w" k="41"/><hkern u1="T" u2="v" k="41"/><hkern u1="T" u2="u" k="102"/><hkern u1="T" u2="s" k="123"/><hkern u1="T" u2="r" k="102"/><hkern u1="T" u2="q" k="143"/><hkern u1="T" u2="p" k="102"/><hkern u1="T" u2="o" k="143"/><hkern u1="T" u2="n" k="102"/><hkern u1="T" u2="m" k="102"/><hkern u1="T" u2="g" k="143"/><hkern u1="T" u2="e" k="143"/><hkern u1="T" u2="d" k="143"/><hkern u1="T" u2="c" k="143"/><hkern u1="T" u2="a" k="164"/><hkern u1="T" u2="T" k="-41"/><hkern u1="T" u2="Q" k="41"/><hkern u1="T" u2="O" k="41"/><hkern u1="T" u2="G" k="41"/><hkern u1="T" u2="C" k="41"/><hkern u1="T" u2="A" k="143"/><hkern u1="T" u2="?" k="-41"/><hkern u1="T" u2="." k="123"/><hkern u1="T" u2="-" k="82"/><hkern u1="T" u2="," k="123"/><hkern u1="U" u2="„" k="41"/><hkern u1="U" u2="‚" k="41"/><hkern u1="U" u2="Ã…" k="20"/><hkern u1="U" u2="Ä" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="Â" k="20"/><hkern u1="U" u2="Ã" k="20"/><hkern u1="U" u2="À" k="20"/><hkern u1="U" u2="A" k="20"/><hkern u1="U" u2="." k="41"/><hkern u1="U" u2="," k="41"/><hkern u1="V" u2="„" k="102"/><hkern u1="V" u2="‚" k="102"/><hkern u1="V" u2="Å“" k="41"/><hkern u1="V" u2="Å’" k="20"/><hkern u1="V" u2="ü" k="20"/><hkern u1="V" u2="û" k="20"/><hkern u1="V" u2="ú" k="20"/><hkern u1="V" u2="ù" k="20"/><hkern u1="V" u2="ø" k="41"/><hkern u1="V" u2="ö" k="41"/><hkern u1="V" u2="õ" k="41"/><hkern u1="V" u2="ô" k="41"/><hkern u1="V" u2="ó" k="41"/><hkern u1="V" u2="ò" k="41"/><hkern u1="V" u2="ë" k="41"/><hkern u1="V" u2="ê" k="41"/><hkern u1="V" u2="é" k="41"/><hkern u1="V" u2="è" k="41"/><hkern u1="V" u2="ç" k="41"/><hkern u1="V" u2="æ" k="41"/><hkern u1="V" u2="Ã¥" k="41"/><hkern u1="V" u2="ä" k="41"/><hkern u1="V" u2="ã" k="41"/><hkern u1="V" u2="â" k="41"/><hkern u1="V" u2="á" k="41"/><hkern u1="V" u2="à " k="41"/><hkern u1="V" u2="Ø" k="20"/><hkern u1="V" u2="Ö" k="20"/><hkern u1="V" u2="Õ" k="20"/><hkern u1="V" u2="Ô" k="20"/><hkern u1="V" u2="Ó" k="20"/><hkern u1="V" u2="Ã’" k="20"/><hkern u1="V" u2="Ç" k="20"/><hkern u1="V" u2="Ã…" k="82"/><hkern u1="V" u2="Ä" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="Â" k="82"/><hkern u1="V" u2="Ã" k="82"/><hkern u1="V" u2="À" k="82"/><hkern u1="V" u2="u" k="20"/><hkern u1="V" u2="s" k="20"/><hkern u1="V" u2="r" k="20"/><hkern u1="V" u2="q" k="41"/><hkern u1="V" u2="p" k="20"/><hkern u1="V" u2="o" k="41"/><hkern u1="V" u2="n" k="20"/><hkern u1="V" u2="m" k="20"/><hkern u1="V" u2="g" k="20"/><hkern u1="V" u2="e" k="41"/><hkern u1="V" u2="d" k="41"/><hkern u1="V" u2="c" k="41"/><hkern u1="V" u2="a" k="41"/><hkern u1="V" u2="Q" k="20"/><hkern u1="V" u2="O" k="20"/><hkern u1="V" u2="G" k="20"/><hkern u1="V" u2="C" k="20"/><hkern u1="V" u2="A" k="82"/><hkern u1="V" u2="?" k="-41"/><hkern u1="V" u2="." k="102"/><hkern u1="V" u2="," k="102"/><hkern u1="W" u2="„" k="102"/><hkern u1="W" u2="‚" k="102"/><hkern u1="W" u2="Å“" k="41"/><hkern u1="W" u2="Å’" k="20"/><hkern u1="W" u2="ü" k="20"/><hkern u1="W" u2="û" k="20"/><hkern u1="W" u2="ú" k="20"/><hkern u1="W" u2="ù" k="20"/><hkern u1="W" u2="ø" k="41"/><hkern u1="W" u2="ö" k="41"/><hkern u1="W" u2="õ" k="41"/><hkern u1="W" u2="ô" k="41"/><hkern u1="W" u2="ó" k="41"/><hkern u1="W" u2="ò" k="41"/><hkern u1="W" u2="ë" k="41"/><hkern u1="W" u2="ê" k="41"/><hkern u1="W" u2="é" k="41"/><hkern u1="W" u2="è" k="41"/><hkern u1="W" u2="ç" k="41"/><hkern u1="W" u2="æ" k="41"/><hkern u1="W" u2="Ã¥" k="41"/><hkern u1="W" u2="ä" k="41"/><hkern u1="W" u2="ã" k="41"/><hkern u1="W" u2="â" k="41"/><hkern u1="W" u2="á" k="41"/><hkern u1="W" u2="à " k="41"/><hkern u1="W" u2="Ø" k="20"/><hkern u1="W" u2="Ö" k="20"/><hkern u1="W" u2="Õ" k="20"/><hkern u1="W" u2="Ô" k="20"/><hkern u1="W" u2="Ó" k="20"/><hkern u1="W" u2="Ã’" k="20"/><hkern u1="W" u2="Ç" k="20"/><hkern u1="W" u2="Ã…" k="82"/><hkern u1="W" u2="Ä" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="Â" k="82"/><hkern u1="W" u2="Ã" k="82"/><hkern u1="W" u2="À" k="82"/><hkern u1="W" u2="u" k="20"/><hkern u1="W" u2="s" k="20"/><hkern u1="W" u2="r" k="20"/><hkern u1="W" u2="q" k="41"/><hkern u1="W" u2="p" k="20"/><hkern u1="W" u2="o" k="41"/><hkern u1="W" u2="n" k="20"/><hkern u1="W" u2="m" k="20"/><hkern u1="W" u2="g" k="20"/><hkern u1="W" u2="e" k="41"/><hkern u1="W" u2="d" k="41"/><hkern u1="W" u2="c" k="41"/><hkern u1="W" u2="a" k="41"/><hkern u1="W" u2="Q" k="20"/><hkern u1="W" u2="O" k="20"/><hkern u1="W" u2="G" k="20"/><hkern u1="W" u2="C" k="20"/><hkern u1="W" u2="A" k="82"/><hkern u1="W" u2="?" k="-41"/><hkern u1="W" u2="." k="102"/><hkern u1="W" u2="," k="102"/><hkern u1="X" u2="Å’" k="41"/><hkern u1="X" u2="Ø" k="41"/><hkern u1="X" u2="Ö" k="41"/><hkern u1="X" u2="Õ" k="41"/><hkern u1="X" u2="Ô" k="41"/><hkern u1="X" u2="Ó" k="41"/><hkern u1="X" u2="Ã’" k="41"/><hkern u1="X" u2="Ç" k="41"/><hkern u1="X" u2="Q" k="41"/><hkern u1="X" u2="O" k="41"/><hkern u1="X" u2="G" k="41"/><hkern u1="X" u2="C" k="41"/><hkern u1="Y" u2="„" k="123"/><hkern u1="Y" u2="‚" k="123"/><hkern u1="Y" u2="Å“" k="102"/><hkern u1="Y" u2="Å’" k="41"/><hkern u1="Y" u2="ü" k="61"/><hkern u1="Y" u2="û" k="61"/><hkern u1="Y" u2="ú" k="61"/><hkern u1="Y" u2="ù" k="61"/><hkern u1="Y" u2="ø" k="102"/><hkern u1="Y" u2="ö" k="102"/><hkern u1="Y" u2="õ" k="102"/><hkern u1="Y" u2="ô" k="102"/><hkern u1="Y" u2="ó" k="102"/><hkern u1="Y" u2="ò" k="102"/><hkern u1="Y" u2="ë" k="102"/><hkern u1="Y" u2="ê" k="102"/><hkern u1="Y" u2="é" k="102"/><hkern u1="Y" u2="è" k="102"/><hkern u1="Y" u2="ç" k="102"/><hkern u1="Y" u2="æ" k="102"/><hkern u1="Y" u2="Ã¥" k="102"/><hkern u1="Y" u2="ä" k="102"/><hkern u1="Y" u2="ã" k="102"/><hkern u1="Y" u2="â" k="102"/><hkern u1="Y" u2="á" k="102"/><hkern u1="Y" u2="à " k="102"/><hkern u1="Y" u2="Ø" k="41"/><hkern u1="Y" u2="Ö" k="41"/><hkern u1="Y" u2="Õ" k="41"/><hkern u1="Y" u2="Ô" k="41"/><hkern u1="Y" u2="Ó" k="41"/><hkern u1="Y" u2="Ã’" k="41"/><hkern u1="Y" u2="Ç" k="41"/><hkern u1="Y" u2="Ã…" k="123"/><hkern u1="Y" u2="Ä" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="Â" k="123"/><hkern u1="Y" u2="Ã" k="123"/><hkern u1="Y" u2="À" k="123"/><hkern u1="Y" u2="z" k="41"/><hkern u1="Y" u2="u" k="61"/><hkern u1="Y" u2="s" k="82"/><hkern u1="Y" u2="r" k="61"/><hkern u1="Y" u2="q" k="102"/><hkern u1="Y" u2="p" k="61"/><hkern u1="Y" u2="o" k="102"/><hkern u1="Y" u2="n" k="61"/><hkern u1="Y" u2="m" k="61"/><hkern u1="Y" u2="g" k="41"/><hkern u1="Y" u2="e" k="102"/><hkern u1="Y" u2="d" k="102"/><hkern u1="Y" u2="c" k="102"/><hkern u1="Y" u2="a" k="102"/><hkern u1="Y" u2="Q" k="41"/><hkern u1="Y" u2="O" k="41"/><hkern u1="Y" u2="G" k="41"/><hkern u1="Y" u2="C" k="41"/><hkern u1="Y" u2="A" k="123"/><hkern u1="Y" u2="?" k="-41"/><hkern u1="Y" u2="." k="123"/><hkern u1="Y" u2="," k="123"/><hkern u1="Z" u2="Å’" k="20"/><hkern u1="Z" u2="Ø" k="20"/><hkern u1="Z" u2="Ö" k="20"/><hkern u1="Z" u2="Õ" k="20"/><hkern u1="Z" u2="Ô" k="20"/><hkern u1="Z" u2="Ó" k="20"/><hkern u1="Z" u2="Ã’" k="20"/><hkern u1="Z" u2="Ç" k="20"/><hkern u1="Z" u2="Q" k="20"/><hkern u1="Z" u2="O" k="20"/><hkern u1="Z" u2="G" k="20"/><hkern u1="Z" u2="C" k="20"/><hkern u1="[" u2="J" k="-184"/><hkern u1="a" u2="â€" k="20"/><hkern u1="a" u2="’" k="20"/><hkern u1="a" u2="'" k="20"/><hkern u1="a" u2="&quot;" k="20"/><hkern u1="b" u2="â€" k="20"/><hkern u1="b" u2="’" k="20"/><hkern u1="b" u2="ý" k="41"/><hkern u1="b" u2="z" k="20"/><hkern u1="b" u2="y" k="41"/><hkern u1="b" u2="x" k="41"/><hkern u1="b" u2="w" k="41"/><hkern u1="b" u2="v" k="41"/><hkern u1="b" u2="'" k="20"/><hkern u1="b" u2="&quot;" k="20"/><hkern u1="c" u2="â€" k="-41"/><hkern u1="c" u2="’" k="-41"/><hkern u1="c" u2="'" k="-41"/><hkern u1="c" u2="&quot;" k="-41"/><hkern u1="e" u2="â€" k="20"/><hkern u1="e" u2="’" k="20"/><hkern u1="e" u2="ý" k="41"/><hkern u1="e" u2="z" k="20"/><hkern u1="e" u2="y" k="41"/><hkern u1="e" u2="x" k="41"/><hkern u1="e" u2="w" k="41"/><hkern u1="e" u2="v" k="41"/><hkern u1="e" u2="'" k="20"/><hkern u1="e" u2="&quot;" k="20"/><hkern u1="f" u2="â€" k="-123"/><hkern u1="f" u2="’" k="-123"/><hkern u1="f" u2="'" k="-123"/><hkern u1="f" u2="&quot;" k="-123"/><hkern u1="h" u2="â€" k="20"/><hkern u1="h" u2="’" k="20"/><hkern u1="h" u2="'" k="20"/><hkern u1="h" u2="&quot;" k="20"/><hkern u1="k" u2="Å“" k="41"/><hkern u1="k" u2="ø" k="41"/><hkern u1="k" u2="ö" k="41"/><hkern u1="k" u2="õ" k="41"/><hkern u1="k" u2="ô" k="41"/><hkern u1="k" u2="ó" k="41"/><hkern u1="k" u2="ò" k="41"/><hkern u1="k" u2="ë" k="41"/><hkern u1="k" u2="ê" k="41"/><hkern u1="k" u2="é" k="41"/><hkern u1="k" u2="è" k="41"/><hkern u1="k" u2="ç" k="41"/><hkern u1="k" u2="à " k="41"/><hkern u1="k" u2="q" k="41"/><hkern u1="k" u2="o" k="41"/><hkern u1="k" u2="e" k="41"/><hkern u1="k" u2="d" k="41"/><hkern u1="k" u2="c" k="41"/><hkern u1="m" u2="â€" k="20"/><hkern u1="m" u2="’" k="20"/><hkern u1="m" u2="'" k="20"/><hkern u1="m" u2="&quot;" k="20"/><hkern u1="n" u2="â€" k="20"/><hkern u1="n" u2="’" k="20"/><hkern u1="n" u2="'" k="20"/><hkern u1="n" u2="&quot;" k="20"/><hkern u1="o" u2="â€" k="20"/><hkern u1="o" u2="’" k="20"/><hkern u1="o" u2="ý" k="41"/><hkern u1="o" u2="z" k="20"/><hkern u1="o" u2="y" k="41"/><hkern u1="o" u2="x" k="41"/><hkern u1="o" u2="w" k="41"/><hkern u1="o" u2="v" k="41"/><hkern u1="o" u2="'" k="20"/><hkern u1="o" u2="&quot;" k="20"/><hkern u1="p" u2="â€" k="20"/><hkern u1="p" u2="’" k="20"/><hkern u1="p" u2="ý" k="41"/><hkern u1="p" u2="z" k="20"/><hkern u1="p" u2="y" k="41"/><hkern u1="p" u2="x" k="41"/><hkern u1="p" u2="w" k="41"/><hkern u1="p" u2="v" k="41"/><hkern u1="p" u2="'" k="20"/><hkern u1="p" u2="&quot;" k="20"/><hkern u1="r" u2="â€" k="-82"/><hkern u1="r" u2="’" k="-82"/><hkern u1="r" u2="Å“" k="41"/><hkern u1="r" u2="ø" k="41"/><hkern u1="r" u2="ö" k="41"/><hkern u1="r" u2="õ" k="41"/><hkern u1="r" u2="ô" k="41"/><hkern u1="r" u2="ó" k="41"/><hkern u1="r" u2="ò" k="41"/><hkern u1="r" u2="ë" k="41"/><hkern u1="r" u2="ê" k="41"/><hkern u1="r" u2="é" k="41"/><hkern u1="r" u2="è" k="41"/><hkern u1="r" u2="ç" k="41"/><hkern u1="r" u2="æ" k="41"/><hkern u1="r" u2="Ã¥" k="41"/><hkern u1="r" u2="ä" k="41"/><hkern u1="r" u2="ã" k="41"/><hkern u1="r" u2="â" k="41"/><hkern u1="r" u2="á" k="41"/><hkern u1="r" u2="à " k="41"/><hkern u1="r" u2="q" k="41"/><hkern u1="r" u2="o" k="41"/><hkern u1="r" u2="g" k="20"/><hkern u1="r" u2="e" k="41"/><hkern u1="r" u2="d" k="41"/><hkern u1="r" u2="c" k="41"/><hkern u1="r" u2="a" k="41"/><hkern u1="r" u2="'" k="-82"/><hkern u1="r" u2="&quot;" k="-82"/><hkern u1="t" u2="â€" k="-41"/><hkern u1="t" u2="’" k="-41"/><hkern u1="t" u2="'" k="-41"/><hkern u1="t" u2="&quot;" k="-41"/><hkern u1="v" u2="„" k="82"/><hkern u1="v" u2="â€" k="-82"/><hkern u1="v" u2="‚" k="82"/><hkern u1="v" u2="’" k="-82"/><hkern u1="v" u2="?" k="-41"/><hkern u1="v" u2="." k="82"/><hkern u1="v" u2="," k="82"/><hkern u1="v" u2="'" k="-82"/><hkern u1="v" u2="&quot;" k="-82"/><hkern u1="w" u2="„" k="82"/><hkern u1="w" u2="â€" k="-82"/><hkern u1="w" u2="‚" k="82"/><hkern u1="w" u2="’" k="-82"/><hkern u1="w" u2="?" k="-41"/><hkern u1="w" u2="." k="82"/><hkern u1="w" u2="," k="82"/><hkern u1="w" u2="'" k="-82"/><hkern u1="w" u2="&quot;" k="-82"/><hkern u1="x" u2="Å“" k="41"/><hkern u1="x" u2="ø" k="41"/><hkern u1="x" u2="ö" k="41"/><hkern u1="x" u2="õ" k="41"/><hkern u1="x" u2="ô" k="41"/><hkern u1="x" u2="ó" k="41"/><hkern u1="x" u2="ò" k="41"/><hkern u1="x" u2="ë" k="41"/><hkern u1="x" u2="ê" k="41"/><hkern u1="x" u2="é" k="41"/><hkern u1="x" u2="è" k="41"/><hkern u1="x" u2="ç" k="41"/><hkern u1="x" u2="à " k="41"/><hkern u1="x" u2="q" k="41"/><hkern u1="x" u2="o" k="41"/><hkern u1="x" u2="e" k="41"/><hkern u1="x" u2="d" k="41"/><hkern u1="x" u2="c" k="41"/><hkern u1="y" u2="„" k="82"/><hkern u1="y" u2="â€" k="-82"/><hkern u1="y" u2="‚" k="82"/><hkern u1="y" u2="’" k="-82"/><hkern u1="y" u2="?" k="-41"/><hkern u1="y" u2="." k="82"/><hkern u1="y" u2="," k="82"/><hkern u1="y" u2="'" k="-82"/><hkern u1="y" u2="&quot;" k="-82"/><hkern u1="{" u2="J" k="-184"/><hkern u1="À" u2="â€" k="143"/><hkern u1="À" u2="’" k="143"/><hkern u1="À" u2="Ÿ" k="123"/><hkern u1="À" u2="Å’" k="41"/><hkern u1="À" u2="Ã" k="123"/><hkern u1="À" u2="Ø" k="41"/><hkern u1="À" u2="Ö" k="41"/><hkern u1="À" u2="Õ" k="41"/><hkern u1="À" u2="Ô" k="41"/><hkern u1="À" u2="Ó" k="41"/><hkern u1="À" u2="Ã’" k="41"/><hkern u1="À" u2="Ç" k="41"/><hkern u1="À" u2="Y" k="123"/><hkern u1="À" u2="W" k="82"/><hkern u1="À" u2="V" k="82"/><hkern u1="À" u2="T" k="143"/><hkern u1="À" u2="Q" k="41"/><hkern u1="À" u2="O" k="41"/><hkern u1="À" u2="J" k="-266"/><hkern u1="À" u2="G" k="41"/><hkern u1="À" u2="C" k="41"/><hkern u1="À" u2="'" k="143"/><hkern u1="À" u2="&quot;" k="143"/><hkern u1="Ã" u2="â€" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&quot;" k="143"/><hkern u1="Â" u2="â€" k="143"/><hkern u1="Â" u2="’" k="143"/><hkern u1="Â" u2="Ÿ" k="123"/><hkern u1="Â" u2="Å’" k="41"/><hkern u1="Â" u2="Ã" k="123"/><hkern u1="Â" u2="Ø" k="41"/><hkern u1="Â" u2="Ö" k="41"/><hkern u1="Â" u2="Õ" k="41"/><hkern u1="Â" u2="Ô" k="41"/><hkern u1="Â" u2="Ó" k="41"/><hkern u1="Â" u2="Ã’" k="41"/><hkern u1="Â" u2="Ç" k="41"/><hkern u1="Â" u2="Y" k="123"/><hkern u1="Â" u2="W" k="82"/><hkern u1="Â" u2="V" k="82"/><hkern u1="Â" u2="T" k="143"/><hkern u1="Â" u2="Q" k="41"/><hkern u1="Â" u2="O" k="41"/><hkern u1="Â" u2="J" k="-266"/><hkern u1="Â" u2="G" k="41"/><hkern u1="Â" u2="C" k="41"/><hkern u1="Â" u2="'" k="143"/><hkern u1="Â" u2="&quot;" k="143"/><hkern u1="Ã" u2="â€" k="143"/><hkern u1="Ã" u2="’" k="143"/><hkern u1="Ã" u2="Ÿ" k="123"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Y" k="123"/><hkern u1="Ã" u2="W" k="82"/><hkern u1="Ã" u2="V" k="82"/><hkern u1="Ã" u2="T" k="143"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="J" k="-266"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="'" k="143"/><hkern u1="Ã" u2="&quot;" k="143"/><hkern u1="Ä" u2="â€" k="143"/><hkern u1="Ä" u2="’" k="143"/><hkern u1="Ä" u2="Ÿ" k="123"/><hkern u1="Ä" u2="Å’" k="41"/><hkern u1="Ä" u2="Ã" k="123"/><hkern u1="Ä" u2="Ø" k="41"/><hkern u1="Ä" u2="Ö" k="41"/><hkern u1="Ä" u2="Õ" k="41"/><hkern u1="Ä" u2="Ô" k="41"/><hkern u1="Ä" u2="Ó" k="41"/><hkern u1="Ä" u2="Ã’" k="41"/><hkern u1="Ä" u2="Ç" k="41"/><hkern u1="Ä" u2="Y" k="123"/><hkern u1="Ä" u2="W" k="82"/><hkern u1="Ä" u2="V" k="82"/><hkern u1="Ä" u2="T" k="143"/><hkern u1="Ä" u2="Q" k="41"/><hkern u1="Ä" u2="O" k="41"/><hkern u1="Ä" u2="J" k="-266"/><hkern u1="Ä" u2="G" k="41"/><hkern u1="Ä" u2="C" k="41"/><hkern u1="Ä" u2="'" k="143"/><hkern u1="Ä" u2="&quot;" k="143"/><hkern u1="Ã…" u2="â€" k="143"/><hkern u1="Ã…" u2="’" k="143"/><hkern u1="Ã…" u2="Ÿ" k="123"/><hkern u1="Ã…" u2="Å’" k="41"/><hkern u1="Ã…" u2="Ã" k="123"/><hkern u1="Ã…" u2="Ø" k="41"/><hkern u1="Ã…" u2="Ö" k="41"/><hkern u1="Ã…" u2="Õ" k="41"/><hkern u1="Ã…" u2="Ô" k="41"/><hkern u1="Ã…" u2="Ó" k="41"/><hkern u1="Ã…" u2="Ã’" k="41"/><hkern u1="Ã…" u2="Ç" k="41"/><hkern u1="Ã…" u2="Y" k="123"/><hkern u1="Ã…" u2="W" k="82"/><hkern u1="Ã…" u2="V" k="82"/><hkern u1="Ã…" u2="T" k="143"/><hkern u1="Ã…" u2="Q" k="41"/><hkern u1="Ã…" u2="O" k="41"/><hkern u1="Ã…" u2="J" k="-266"/><hkern u1="Ã…" u2="G" k="41"/><hkern u1="Ã…" u2="C" k="41"/><hkern u1="Ã…" u2="'" k="143"/><hkern u1="Ã…" u2="&quot;" k="143"/><hkern u1="Æ" u2="J" k="-123"/><hkern u1="Ç" u2="Å’" k="41"/><hkern u1="Ç" u2="Ø" k="41"/><hkern u1="Ç" u2="Ö" k="41"/><hkern u1="Ç" u2="Õ" k="41"/><hkern u1="Ç" u2="Ô" k="41"/><hkern u1="Ç" u2="Ó" k="41"/><hkern u1="Ç" u2="Ã’" k="41"/><hkern u1="Ç" u2="Ç" k="41"/><hkern u1="Ç" u2="Q" k="41"/><hkern u1="Ç" u2="O" k="41"/><hkern u1="Ç" u2="G" k="41"/><hkern u1="Ç" u2="C" k="41"/><hkern u1="È" u2="J" k="-123"/><hkern u1="É" u2="J" k="-123"/><hkern u1="Ê" u2="J" k="-123"/><hkern u1="Ë" u2="J" k="-123"/><hkern u1="Ã" u2="„" k="82"/><hkern u1="Ã" u2="‚" k="82"/><hkern u1="Ã" u2="Ÿ" k="20"/><hkern u1="Ã" u2="Ã" k="20"/><hkern u1="Ã" u2="Ã…" k="41"/><hkern u1="Ã" u2="Ä" k="41"/><hkern u1="Ã" u2="Ã" k="41"/><hkern u1="Ã" u2="Â" k="41"/><hkern u1="Ã" u2="Ã" k="41"/><hkern u1="Ã" u2="À" k="41"/><hkern u1="Ã" u2="Z" k="20"/><hkern u1="Ã" u2="Y" k="20"/><hkern u1="Ã" u2="X" k="41"/><hkern u1="Ã" u2="W" k="20"/><hkern u1="Ã" u2="V" k="20"/><hkern u1="Ã" u2="T" k="61"/><hkern u1="Ã" u2="A" k="41"/><hkern u1="Ã" u2="." k="82"/><hkern u1="Ã" u2="," k="82"/><hkern u1="Ã’" u2="„" k="82"/><hkern u1="Ã’" u2="‚" k="82"/><hkern u1="Ã’" u2="Ÿ" k="20"/><hkern u1="Ã’" u2="Ã" k="20"/><hkern u1="Ã’" u2="Ã…" k="41"/><hkern u1="Ã’" u2="Ä" k="41"/><hkern u1="Ã’" u2="Ã" k="41"/><hkern u1="Ã’" u2="Â" k="41"/><hkern u1="Ã’" u2="Ã" k="41"/><hkern u1="Ã’" u2="À" k="41"/><hkern u1="Ã’" u2="Z" k="20"/><hkern u1="Ã’" u2="Y" k="20"/><hkern u1="Ã’" u2="X" k="41"/><hkern u1="Ã’" u2="W" k="20"/><hkern u1="Ã’" u2="V" k="20"/><hkern u1="Ã’" u2="T" k="61"/><hkern u1="Ã’" u2="A" k="41"/><hkern u1="Ã’" u2="." k="82"/><hkern u1="Ã’" u2="," k="82"/><hkern u1="Ó" u2="„" k="82"/><hkern u1="Ó" u2="‚" k="82"/><hkern u1="Ó" u2="Ÿ" k="20"/><hkern u1="Ó" u2="Ã" k="20"/><hkern u1="Ó" u2="Ã…" k="41"/><hkern u1="Ó" u2="Ä" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="Â" k="41"/><hkern u1="Ó" u2="Ã" k="41"/><hkern u1="Ó" u2="À" k="41"/><hkern u1="Ó" u2="Z" k="20"/><hkern u1="Ó" u2="Y" k="20"/><hkern u1="Ó" u2="X" k="41"/><hkern u1="Ó" u2="W" k="20"/><hkern u1="Ó" u2="V" k="20"/><hkern u1="Ó" u2="T" k="61"/><hkern u1="Ó" u2="A" k="41"/><hkern u1="Ó" u2="." k="82"/><hkern u1="Ó" u2="," k="82"/><hkern u1="Ô" u2="„" k="82"/><hkern u1="Ô" u2="‚" k="82"/><hkern u1="Ô" u2="Ÿ" k="20"/><hkern u1="Ô" u2="Ã" k="20"/><hkern u1="Ô" u2="Ã…" k="41"/><hkern u1="Ô" u2="Ä" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="Â" k="41"/><hkern u1="Ô" u2="Ã" k="41"/><hkern u1="Ô" u2="À" k="41"/><hkern u1="Ô" u2="Z" k="20"/><hkern u1="Ô" u2="Y" k="20"/><hkern u1="Ô" u2="X" k="41"/><hkern u1="Ô" u2="W" k="20"/><hkern u1="Ô" u2="V" k="20"/><hkern u1="Ô" u2="T" k="61"/><hkern u1="Ô" u2="A" k="41"/><hkern u1="Ô" u2="." k="82"/><hkern u1="Ô" u2="," k="82"/><hkern u1="Õ" u2="„" k="82"/><hkern u1="Õ" u2="‚" k="82"/><hkern u1="Õ" u2="Ÿ" k="20"/><hkern u1="Õ" u2="Ã" k="20"/><hkern u1="Õ" u2="Ã…" k="41"/><hkern u1="Õ" u2="Ä" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="Â" k="41"/><hkern u1="Õ" u2="Ã" k="41"/><hkern u1="Õ" u2="À" k="41"/><hkern u1="Õ" u2="Z" k="20"/><hkern u1="Õ" u2="Y" k="20"/><hkern u1="Õ" u2="X" k="41"/><hkern u1="Õ" u2="W" k="20"/><hkern u1="Õ" u2="V" k="20"/><hkern u1="Õ" u2="T" k="61"/><hkern u1="Õ" u2="A" k="41"/><hkern u1="Õ" u2="." k="82"/><hkern u1="Õ" u2="," k="82"/><hkern u1="Ö" u2="„" k="82"/><hkern u1="Ö" u2="‚" k="82"/><hkern u1="Ö" u2="Ÿ" k="20"/><hkern u1="Ö" u2="Ã" k="20"/><hkern u1="Ö" u2="Ã…" k="41"/><hkern u1="Ö" u2="Ä" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="Â" k="41"/><hkern u1="Ö" u2="Ã" k="41"/><hkern u1="Ö" u2="À" k="41"/><hkern u1="Ö" u2="Z" k="20"/><hkern u1="Ö" u2="Y" k="20"/><hkern u1="Ö" u2="X" k="41"/><hkern u1="Ö" u2="W" k="20"/><hkern u1="Ö" u2="V" k="20"/><hkern u1="Ö" u2="T" k="61"/><hkern u1="Ö" u2="A" k="41"/><hkern u1="Ö" u2="." k="82"/><hkern u1="Ö" u2="," k="82"/><hkern u1="Ø" u2="„" k="82"/><hkern u1="Ø" u2="‚" k="82"/><hkern u1="Ø" u2="Ÿ" k="20"/><hkern u1="Ø" u2="Ã" k="20"/><hkern u1="Ø" u2="Ã…" k="41"/><hkern u1="Ø" u2="Ä" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="Â" k="41"/><hkern u1="Ø" u2="Ã" k="41"/><hkern u1="Ø" u2="À" k="41"/><hkern u1="Ø" u2="Z" k="20"/><hkern u1="Ø" u2="Y" k="20"/><hkern u1="Ø" u2="X" k="41"/><hkern u1="Ø" u2="W" k="20"/><hkern u1="Ø" u2="V" k="20"/><hkern u1="Ø" u2="T" k="61"/><hkern u1="Ø" u2="A" k="41"/><hkern u1="Ø" u2="." k="82"/><hkern u1="Ø" u2="," k="82"/><hkern u1="Ù" u2="„" k="41"/><hkern u1="Ù" u2="‚" k="41"/><hkern u1="Ù" u2="Ã…" k="20"/><hkern u1="Ù" u2="Ä" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="Â" k="20"/><hkern u1="Ù" u2="Ã" k="20"/><hkern u1="Ù" u2="À" k="20"/><hkern u1="Ù" u2="A" k="20"/><hkern u1="Ù" u2="." k="41"/><hkern u1="Ù" u2="," k="41"/><hkern u1="Ú" u2="„" k="41"/><hkern u1="Ú" u2="‚" k="41"/><hkern u1="Ú" u2="Ã…" k="20"/><hkern u1="Ú" u2="Ä" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="Â" k="20"/><hkern u1="Ú" u2="Ã" k="20"/><hkern u1="Ú" u2="À" k="20"/><hkern u1="Ú" u2="A" k="20"/><hkern u1="Ú" u2="." k="41"/><hkern u1="Ú" u2="," k="41"/><hkern u1="Û" u2="„" k="41"/><hkern u1="Û" u2="‚" k="41"/><hkern u1="Û" u2="Ã…" k="20"/><hkern u1="Û" u2="Ä" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="Â" k="20"/><hkern u1="Û" u2="Ã" k="20"/><hkern u1="Û" u2="À" k="20"/><hkern u1="Û" u2="A" k="20"/><hkern u1="Û" u2="." k="41"/><hkern u1="Û" u2="," k="41"/><hkern u1="Ãœ" u2="„" k="41"/><hkern u1="Ãœ" u2="‚" k="41"/><hkern u1="Ãœ" u2="Ã…" k="20"/><hkern u1="Ãœ" u2="Ä" k="20"/><hkern u1="Ãœ" u2="Ã" k="20"/><hkern u1="Ãœ" u2="Â" k="20"/><hkern u1="Ãœ" u2="Ã" k="20"/><hkern u1="Ãœ" u2="À" k="20"/><hkern u1="Ãœ" u2="A" k="20"/><hkern u1="Ãœ" u2="." k="41"/><hkern u1="Ãœ" u2="," k="41"/><hkern u1="Ã" u2="„" k="123"/><hkern u1="Ã" u2="‚" k="123"/><hkern u1="Ã" u2="Å“" k="102"/><hkern u1="Ã" u2="Å’" k="41"/><hkern u1="Ã" u2="ü" k="61"/><hkern u1="Ã" u2="û" k="61"/><hkern u1="Ã" u2="ú" k="61"/><hkern u1="Ã" u2="ù" k="61"/><hkern u1="Ã" u2="ø" k="102"/><hkern u1="Ã" u2="ö" k="102"/><hkern u1="Ã" u2="õ" k="102"/><hkern u1="Ã" u2="ô" k="102"/><hkern u1="Ã" u2="ó" k="102"/><hkern u1="Ã" u2="ò" k="102"/><hkern u1="Ã" u2="ë" k="102"/><hkern u1="Ã" u2="ê" k="102"/><hkern u1="Ã" u2="é" k="102"/><hkern u1="Ã" u2="è" k="102"/><hkern u1="Ã" u2="ç" k="102"/><hkern u1="Ã" u2="æ" k="102"/><hkern u1="Ã" u2="Ã¥" k="102"/><hkern u1="Ã" u2="ä" k="102"/><hkern u1="Ã" u2="ã" k="102"/><hkern u1="Ã" u2="â" k="102"/><hkern u1="Ã" u2="á" k="102"/><hkern u1="Ã" u2="à " k="102"/><hkern u1="Ã" u2="Ø" k="41"/><hkern u1="Ã" u2="Ö" k="41"/><hkern u1="Ã" u2="Õ" k="41"/><hkern u1="Ã" u2="Ô" k="41"/><hkern u1="Ã" u2="Ó" k="41"/><hkern u1="Ã" u2="Ã’" k="41"/><hkern u1="Ã" u2="Ç" k="41"/><hkern u1="Ã" u2="Ã…" k="123"/><hkern u1="Ã" u2="Ä" k="123"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="Â" k="123"/><hkern u1="Ã" u2="Ã" k="123"/><hkern u1="Ã" u2="À" k="123"/><hkern u1="Ã" u2="z" k="41"/><hkern u1="Ã" u2="u" k="61"/><hkern u1="Ã" u2="s" k="82"/><hkern u1="Ã" u2="r" k="61"/><hkern u1="Ã" u2="q" k="102"/><hkern u1="Ã" u2="p" k="61"/><hkern u1="Ã" u2="o" k="102"/><hkern u1="Ã" u2="n" k="61"/><hkern u1="Ã" u2="m" k="61"/><hkern u1="Ã" u2="g" k="41"/><hkern u1="Ã" u2="e" k="102"/><hkern u1="Ã" u2="d" k="102"/><hkern u1="Ã" u2="c" k="102"/><hkern u1="Ã" u2="a" k="102"/><hkern u1="Ã" u2="Q" k="41"/><hkern u1="Ã" u2="O" k="41"/><hkern u1="Ã" u2="G" k="41"/><hkern u1="Ã" u2="C" k="41"/><hkern u1="Ã" u2="A" k="123"/><hkern u1="Ã" u2="?" k="-41"/><hkern u1="Ã" u2="." k="123"/><hkern u1="Ã" u2="," k="123"/><hkern u1="Þ" u2="„" k="266"/><hkern u1="Þ" u2="‚" k="266"/><hkern u1="Þ" u2="Ã…" k="102"/><hkern u1="Þ" u2="Ä" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="Â" k="102"/><hkern u1="Þ" u2="Ã" k="102"/><hkern u1="Þ" u2="À" k="102"/><hkern u1="Þ" u2="Z" k="20"/><hkern u1="Þ" u2="X" k="41"/><hkern u1="Þ" u2="A" k="102"/><hkern u1="Þ" u2="." k="266"/><hkern u1="Þ" u2="," k="266"/><hkern u1="à " u2="â€" k="20"/><hkern u1="à " u2="’" k="20"/><hkern u1="à " u2="'" k="20"/><hkern u1="à " u2="&quot;" k="20"/><hkern u1="á" u2="â€" k="20"/><hkern u1="á" u2="’" k="20"/><hkern u1="á" u2="'" k="20"/><hkern u1="á" u2="&quot;" k="20"/><hkern u1="â" u2="â€" k="20"/><hkern u1="â" u2="’" k="20"/><hkern u1="â" u2="'" k="20"/><hkern u1="â" u2="&quot;" k="20"/><hkern u1="ã" u2="â€" k="20"/><hkern u1="ã" u2="’" k="20"/><hkern u1="ã" u2="'" k="20"/><hkern u1="ã" u2="&quot;" k="20"/><hkern u1="ä" u2="â€" k="20"/><hkern u1="ä" u2="’" k="20"/><hkern u1="ä" u2="'" k="20"/><hkern u1="ä" u2="&quot;" k="20"/><hkern u1="Ã¥" u2="â€" k="20"/><hkern u1="Ã¥" u2="’" k="20"/><hkern u1="Ã¥" u2="'" k="20"/><hkern u1="Ã¥" u2="&quot;" k="20"/><hkern u1="è" u2="â€" k="20"/><hkern u1="è" u2="’" k="20"/><hkern u1="è" u2="ý" k="41"/><hkern u1="è" u2="z" k="20"/><hkern u1="è" u2="y" k="41"/><hkern u1="è" u2="x" k="41"/><hkern u1="è" u2="w" k="41"/><hkern u1="è" u2="v" k="41"/><hkern u1="è" u2="'" k="20"/><hkern u1="è" u2="&quot;" k="20"/><hkern u1="é" u2="â€" k="20"/><hkern u1="é" u2="’" k="20"/><hkern u1="é" u2="ý" k="41"/><hkern u1="é" u2="z" k="20"/><hkern u1="é" u2="y" k="41"/><hkern u1="é" u2="x" k="41"/><hkern u1="é" u2="w" k="41"/><hkern u1="é" u2="v" k="41"/><hkern u1="é" u2="'" k="20"/><hkern u1="é" u2="&quot;" k="20"/><hkern u1="ê" u2="â€" k="20"/><hkern u1="ê" u2="’" k="20"/><hkern u1="ê" u2="ý" k="41"/><hkern u1="ê" u2="z" k="20"/><hkern u1="ê" u2="y" k="41"/><hkern u1="ê" u2="x" k="41"/><hkern u1="ê" u2="w" k="41"/><hkern u1="ê" u2="v" k="41"/><hkern u1="ê" u2="'" k="20"/><hkern u1="ê" u2="&quot;" k="20"/><hkern u1="ë" u2="â€" k="20"/><hkern u1="ë" u2="’" k="20"/><hkern u1="ë" u2="ý" k="41"/><hkern u1="ë" u2="z" k="20"/><hkern u1="ë" u2="y" k="41"/><hkern u1="ë" u2="x" k="41"/><hkern u1="ë" u2="w" k="41"/><hkern u1="ë" u2="v" k="41"/><hkern u1="ë" u2="'" k="20"/><hkern u1="ë" u2="&quot;" k="20"/><hkern u1="ð" u2="â€" k="20"/><hkern u1="ð" u2="’" k="20"/><hkern u1="ð" u2="ý" k="41"/><hkern u1="ð" u2="z" k="20"/><hkern u1="ð" u2="y" k="41"/><hkern u1="ð" u2="x" k="41"/><hkern u1="ð" u2="w" k="41"/><hkern u1="ð" u2="v" k="41"/><hkern u1="ð" u2="'" k="20"/><hkern u1="ð" u2="&quot;" k="20"/><hkern u1="ò" u2="â€" k="20"/><hkern u1="ò" u2="’" k="20"/><hkern u1="ò" u2="ý" k="41"/><hkern u1="ò" u2="z" k="20"/><hkern u1="ò" u2="y" k="41"/><hkern u1="ò" u2="x" k="41"/><hkern u1="ò" u2="w" k="41"/><hkern u1="ò" u2="v" k="41"/><hkern u1="ò" u2="'" k="20"/><hkern u1="ò" u2="&quot;" k="20"/><hkern u1="ó" u2="â€" k="20"/><hkern u1="ó" u2="’" k="20"/><hkern u1="ó" u2="ý" k="41"/><hkern u1="ó" u2="z" k="20"/><hkern u1="ó" u2="y" k="41"/><hkern u1="ó" u2="x" k="41"/><hkern u1="ó" u2="w" k="41"/><hkern u1="ó" u2="v" k="41"/><hkern u1="ó" u2="'" k="20"/><hkern u1="ó" u2="&quot;" k="20"/><hkern u1="ô" u2="â€" k="20"/><hkern u1="ô" u2="’" k="20"/><hkern u1="ô" u2="ý" k="41"/><hkern u1="ô" u2="z" k="20"/><hkern u1="ô" u2="y" k="41"/><hkern u1="ô" u2="x" k="41"/><hkern u1="ô" u2="w" k="41"/><hkern u1="ô" u2="v" k="41"/><hkern u1="ô" u2="'" k="20"/><hkern u1="ô" u2="&quot;" k="20"/><hkern u1="ö" u2="â€" k="41"/><hkern u1="ö" u2="’" k="41"/><hkern u1="ö" u2="'" k="41"/><hkern u1="ö" u2="&quot;" k="41"/><hkern u1="ø" u2="â€" k="20"/><hkern u1="ø" u2="’" k="20"/><hkern u1="ø" u2="ý" k="41"/><hkern u1="ø" u2="z" k="20"/><hkern u1="ø" u2="y" k="41"/><hkern u1="ø" u2="x" k="41"/><hkern u1="ø" u2="w" k="41"/><hkern u1="ø" u2="v" k="41"/><hkern u1="ø" u2="'" k="20"/><hkern u1="ø" u2="&quot;" k="20"/><hkern u1="ý" u2="„" k="82"/><hkern u1="ý" u2="â€" k="-82"/><hkern u1="ý" u2="‚" k="82"/><hkern u1="ý" u2="’" k="-82"/><hkern u1="ý" u2="?" k="-41"/><hkern u1="ý" u2="." k="82"/><hkern u1="ý" u2="," k="82"/><hkern u1="ý" u2="'" k="-82"/><hkern u1="ý" u2="&quot;" k="-82"/><hkern u1="þ" u2="â€" k="20"/><hkern u1="þ" u2="’" k="20"/><hkern u1="þ" u2="ý" k="41"/><hkern u1="þ" u2="z" k="20"/><hkern u1="þ" u2="y" k="41"/><hkern u1="þ" u2="x" k="41"/><hkern u1="þ" u2="w" k="41"/><hkern u1="þ" u2="v" k="41"/><hkern u1="þ" u2="'" k="20"/><hkern u1="þ" u2="&quot;" k="20"/><hkern u1="ÿ" u2="„" k="82"/><hkern u1="ÿ" u2="â€" k="-82"/><hkern u1="ÿ" u2="‚" k="82"/><hkern u1="ÿ" u2="’" k="-82"/><hkern u1="ÿ" u2="?" k="-41"/><hkern u1="ÿ" u2="." k="82"/><hkern u1="ÿ" u2="," k="82"/><hkern u1="ÿ" u2="'" k="-82"/><hkern u1="ÿ" u2="&quot;" k="-82"/><hkern u1="Å’" u2="J" k="-123"/><hkern u1="Ÿ" u2="„" k="123"/><hkern u1="Ÿ" u2="‚" k="123"/><hkern u1="Ÿ" u2="Å“" k="102"/><hkern u1="Ÿ" u2="Å’" k="41"/><hkern u1="Ÿ" u2="ü" k="61"/><hkern u1="Ÿ" u2="û" k="61"/><hkern u1="Ÿ" u2="ú" k="61"/><hkern u1="Ÿ" u2="ù" k="61"/><hkern u1="Ÿ" u2="ø" k="102"/><hkern u1="Ÿ" u2="ö" k="102"/><hkern u1="Ÿ" u2="õ" k="102"/><hkern u1="Ÿ" u2="ô" k="102"/><hkern u1="Ÿ" u2="ó" k="102"/><hkern u1="Ÿ" u2="ò" k="102"/><hkern u1="Ÿ" u2="ë" k="102"/><hkern u1="Ÿ" u2="ê" k="102"/><hkern u1="Ÿ" u2="é" k="102"/><hkern u1="Ÿ" u2="è" k="102"/><hkern u1="Ÿ" u2="ç" k="102"/><hkern u1="Ÿ" u2="æ" k="102"/><hkern u1="Ÿ" u2="Ã¥" k="102"/><hkern u1="Ÿ" u2="ä" k="102"/><hkern u1="Ÿ" u2="ã" k="102"/><hkern u1="Ÿ" u2="â" k="102"/><hkern u1="Ÿ" u2="á" k="102"/><hkern u1="Ÿ" u2="à " k="102"/><hkern u1="Ÿ" u2="Ø" k="41"/><hkern u1="Ÿ" u2="Ö" k="41"/><hkern u1="Ÿ" u2="Õ" k="41"/><hkern u1="Ÿ" u2="Ô" k="41"/><hkern u1="Ÿ" u2="Ó" k="41"/><hkern u1="Ÿ" u2="Ã’" k="41"/><hkern u1="Ÿ" u2="Ç" k="41"/><hkern u1="Ÿ" u2="Ã…" k="123"/><hkern u1="Ÿ" u2="Ä" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="Â" k="123"/><hkern u1="Ÿ" u2="Ã" k="123"/><hkern u1="Ÿ" u2="À" k="123"/><hkern u1="Ÿ" u2="z" k="41"/><hkern u1="Ÿ" u2="u" k="61"/><hkern u1="Ÿ" u2="s" k="82"/><hkern u1="Ÿ" u2="r" k="61"/><hkern u1="Ÿ" u2="q" k="102"/><hkern u1="Ÿ" u2="p" k="61"/><hkern u1="Ÿ" u2="o" k="102"/><hkern u1="Ÿ" u2="n" k="61"/><hkern u1="Ÿ" u2="m" k="61"/><hkern u1="Ÿ" u2="g" k="41"/><hkern u1="Ÿ" u2="e" k="102"/><hkern u1="Ÿ" u2="d" k="102"/><hkern u1="Ÿ" u2="c" k="102"/><hkern u1="Ÿ" u2="a" k="102"/><hkern u1="Ÿ" u2="Q" k="41"/><hkern u1="Ÿ" u2="O" k="41"/><hkern u1="Ÿ" u2="G" k="41"/><hkern u1="Ÿ" u2="C" k="41"/><hkern u1="Ÿ" u2="A" k="123"/><hkern u1="Ÿ" u2="?" k="-41"/><hkern u1="Ÿ" u2="." k="123"/><hkern u1="Ÿ" u2="," k="123"/><hkern u1="–" u2="T" k="82"/><hkern u1="—" u2="T" k="82"/><hkern u1="‘" u2="Ÿ" k="-20"/><hkern u1="‘" u2="Å“" k="123"/><hkern u1="‘" u2="ü" k="61"/><hkern u1="‘" u2="û" k="61"/><hkern u1="‘" u2="ú" k="61"/><hkern u1="‘" u2="ù" k="61"/><hkern u1="‘" u2="ø" k="123"/><hkern u1="‘" u2="ö" k="123"/><hkern u1="‘" u2="õ" k="123"/><hkern u1="‘" u2="ô" k="123"/><hkern u1="‘" u2="ó" k="123"/><hkern u1="‘" u2="ò" k="123"/><hkern u1="‘" u2="ë" k="123"/><hkern u1="‘" u2="ê" k="123"/><hkern u1="‘" u2="é" k="123"/><hkern u1="‘" u2="è" k="123"/><hkern u1="‘" u2="ç" k="123"/><hkern u1="‘" u2="æ" k="82"/><hkern u1="‘" u2="Ã¥" k="82"/><hkern u1="‘" u2="ä" k="82"/><hkern u1="‘" u2="ã" k="82"/><hkern u1="‘" u2="â" k="82"/><hkern u1="‘" u2="á" k="82"/><hkern u1="‘" u2="à " k="123"/><hkern u1="‘" u2="Ã" k="-20"/><hkern u1="‘" u2="Ã…" k="143"/><hkern u1="‘" u2="Ä" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="Â" k="143"/><hkern u1="‘" u2="Ã" k="143"/><hkern u1="‘" u2="À" k="143"/><hkern u1="‘" u2="u" k="61"/><hkern u1="‘" u2="s" k="61"/><hkern u1="‘" u2="r" k="61"/><hkern u1="‘" u2="q" k="123"/><hkern u1="‘" u2="p" k="61"/><hkern u1="‘" u2="o" k="123"/><hkern u1="‘" u2="n" k="61"/><hkern u1="‘" u2="m" k="61"/><hkern u1="‘" u2="g" k="61"/><hkern u1="‘" u2="e" k="123"/><hkern u1="‘" u2="d" k="123"/><hkern u1="‘" u2="c" k="123"/><hkern u1="‘" u2="a" k="82"/><hkern u1="‘" u2="Y" k="-20"/><hkern u1="‘" u2="W" k="-41"/><hkern u1="‘" u2="V" k="-41"/><hkern u1="‘" u2="T" k="-41"/><hkern u1="‘" u2="A" k="143"/><hkern u1="’" u2="Ÿ" k="-20"/><hkern u1="’" u2="Å“" k="123"/><hkern u1="’" u2="ü" k="61"/><hkern u1="’" u2="û" k="61"/><hkern u1="’" u2="ú" k="61"/><hkern u1="’" u2="ù" k="61"/><hkern u1="’" u2="ø" k="123"/><hkern u1="’" u2="ö" k="123"/><hkern u1="’" u2="õ" k="123"/><hkern u1="’" u2="ô" k="123"/><hkern u1="’" u2="ó" k="123"/><hkern u1="’" u2="ò" k="123"/><hkern u1="’" u2="ë" k="123"/><hkern u1="’" u2="ê" k="123"/><hkern u1="’" u2="é" k="123"/><hkern u1="’" u2="è" k="123"/><hkern u1="’" u2="ç" k="123"/><hkern u1="’" u2="æ" k="82"/><hkern u1="’" u2="Ã¥" k="82"/><hkern u1="’" u2="ä" k="82"/><hkern u1="’" u2="ã" k="82"/><hkern u1="’" u2="â" k="82"/><hkern u1="’" u2="á" k="82"/><hkern u1="’" u2="à " k="123"/><hkern u1="’" u2="Ã" k="-20"/><hkern u1="’" u2="Ã…" k="143"/><hkern u1="’" u2="Ä" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="Â" k="143"/><hkern u1="’" u2="Ã" k="143"/><hkern u1="’" u2="À" k="143"/><hkern u1="’" u2="u" k="61"/><hkern u1="’" u2="s" k="61"/><hkern u1="’" u2="r" k="61"/><hkern u1="’" u2="q" k="123"/><hkern u1="’" u2="p" k="61"/><hkern u1="’" u2="o" k="123"/><hkern u1="’" u2="n" k="61"/><hkern u1="’" u2="m" k="61"/><hkern u1="’" u2="g" k="61"/><hkern u1="’" u2="e" k="123"/><hkern u1="’" u2="d" k="123"/><hkern u1="’" u2="c" k="123"/><hkern u1="’" u2="a" k="82"/><hkern u1="’" u2="Y" k="-20"/><hkern u1="’" u2="W" k="-41"/><hkern u1="’" u2="V" k="-41"/><hkern u1="’" u2="T" k="-41"/><hkern u1="’" u2="A" k="143"/><hkern u1="‚" u2="Ÿ" k="123"/><hkern u1="‚" u2="Å’" k="102"/><hkern u1="‚" u2="Ã" k="123"/><hkern u1="‚" u2="Ãœ" k="41"/><hkern u1="‚" u2="Û" k="41"/><hkern u1="‚" u2="Ú" k="41"/><hkern u1="‚" u2="Ù" k="41"/><hkern u1="‚" u2="Ø" k="102"/><hkern u1="‚" u2="Ö" k="102"/><hkern u1="‚" u2="Õ" k="102"/><hkern u1="‚" u2="Ô" k="102"/><hkern u1="‚" u2="Ó" k="102"/><hkern u1="‚" u2="Ã’" k="102"/><hkern u1="‚" u2="Ç" k="102"/><hkern u1="‚" u2="Y" k="123"/><hkern u1="‚" u2="W" k="123"/><hkern u1="‚" u2="V" k="123"/><hkern u1="‚" u2="U" k="41"/><hkern u1="‚" u2="T" k="143"/><hkern u1="‚" u2="Q" k="102"/><hkern u1="‚" u2="O" k="102"/><hkern u1="‚" u2="G" k="102"/><hkern u1="‚" u2="C" k="102"/><hkern u1="“" u2="Ÿ" k="-20"/><hkern u1="“" u2="Å“" k="123"/><hkern u1="“" u2="ü" k="61"/><hkern u1="“" u2="û" k="61"/><hkern u1="“" u2="ú" k="61"/><hkern u1="“" u2="ù" k="61"/><hkern u1="“" u2="ø" k="123"/><hkern u1="“" u2="ö" k="123"/><hkern u1="“" u2="õ" k="123"/><hkern u1="“" u2="ô" k="123"/><hkern u1="“" u2="ó" k="123"/><hkern u1="“" u2="ò" k="123"/><hkern u1="“" u2="ë" k="123"/><hkern u1="“" u2="ê" k="123"/><hkern u1="“" u2="é" k="123"/><hkern u1="“" u2="è" k="123"/><hkern u1="“" u2="ç" k="123"/><hkern u1="“" u2="æ" k="82"/><hkern u1="“" u2="Ã¥" k="82"/><hkern u1="“" u2="ä" k="82"/><hkern u1="“" u2="ã" k="82"/><hkern u1="“" u2="â" k="82"/><hkern u1="“" u2="á" k="82"/><hkern u1="“" u2="à " k="123"/><hkern u1="“" u2="Ã" k="-20"/><hkern u1="“" u2="Ã…" k="143"/><hkern u1="“" u2="Ä" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="Â" k="143"/><hkern u1="“" u2="Ã" k="143"/><hkern u1="“" u2="À" k="143"/><hkern u1="“" u2="u" k="61"/><hkern u1="“" u2="s" k="61"/><hkern u1="“" u2="r" k="61"/><hkern u1="“" u2="q" k="123"/><hkern u1="“" u2="p" k="61"/><hkern u1="“" u2="o" k="123"/><hkern u1="“" u2="n" k="61"/><hkern u1="“" u2="m" k="61"/><hkern u1="“" u2="g" k="61"/><hkern u1="“" u2="e" k="123"/><hkern u1="“" u2="d" k="123"/><hkern u1="“" u2="c" k="123"/><hkern u1="“" u2="a" k="82"/><hkern u1="“" u2="Y" k="-20"/><hkern u1="“" u2="W" k="-41"/><hkern u1="“" u2="V" k="-41"/><hkern u1="“" u2="T" k="-41"/><hkern u1="“" u2="A" k="143"/><hkern u1="„" u2="Ÿ" k="123"/><hkern u1="„" u2="Å’" k="102"/><hkern u1="„" u2="Ã" k="123"/><hkern u1="„" u2="Ãœ" k="41"/><hkern u1="„" u2="Û" k="41"/><hkern u1="„" u2="Ú" k="41"/><hkern u1="„" u2="Ù" k="41"/><hkern u1="„" u2="Ø" k="102"/><hkern u1="„" u2="Ö" k="102"/><hkern u1="„" u2="Õ" k="102"/><hkern u1="„" u2="Ô" k="102"/><hkern u1="„" u2="Ó" k="102"/><hkern u1="„" u2="Ã’" k="102"/><hkern u1="„" u2="Ç" k="102"/><hkern u1="„" u2="Y" k="123"/><hkern u1="„" u2="W" k="123"/><hkern u1="„" u2="V" k="123"/><hkern u1="„" u2="U" k="41"/><hkern u1="„" u2="T" k="143"/><hkern u1="„" u2="Q" k="102"/><hkern u1="„" u2="O" k="102"/><hkern u1="„" u2="G" k="102"/><hkern u1="„" u2="C" k="102"/></font></defs></svg>
\ No newline at end of file
diff --git a/setup/pub/fonts/opensans/semibold/opensans-600.ttf b/setup/pub/fonts/opensans/semibold/opensans-600.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..b3290843a7a3e621867b169c8487de9a8c7a8054
Binary files /dev/null and b/setup/pub/fonts/opensans/semibold/opensans-600.ttf differ
diff --git a/setup/pub/fonts/opensans/semibold/opensans-600.woff b/setup/pub/fonts/opensans/semibold/opensans-600.woff
new file mode 100644
index 0000000000000000000000000000000000000000..28d6adee03b8d2301e06680fce413eb94887b57e
Binary files /dev/null and b/setup/pub/fonts/opensans/semibold/opensans-600.woff differ
diff --git a/setup/pub/fonts/opensans/semibold/opensans-600.woff2 b/setup/pub/fonts/opensans/semibold/opensans-600.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..8399be251bf44f9e323f3850ffa63bbde6e21177
Binary files /dev/null and b/setup/pub/fonts/opensans/semibold/opensans-600.woff2 differ
diff --git a/setup/pub/images/favicon/favicon-16x16.png b/setup/pub/images/favicon/favicon-16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..e870c2a2481381942fe10c7e6ce1f4e1d07f6506
Binary files /dev/null and b/setup/pub/images/favicon/favicon-16x16.png differ
diff --git a/setup/pub/images/favicon/favicon-32x32.png b/setup/pub/images/favicon/favicon-32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d6b018c30c4941f6ce5975a7216ad441d5e767b
Binary files /dev/null and b/setup/pub/images/favicon/favicon-32x32.png differ
diff --git a/setup/pub/images/favicon/favicon-96x96.png b/setup/pub/images/favicon/favicon-96x96.png
new file mode 100644
index 0000000000000000000000000000000000000000..0aff72cc87d38b3b9f1b79b5ebb0abeae9228def
Binary files /dev/null and b/setup/pub/images/favicon/favicon-96x96.png differ
diff --git a/setup/pub/images/favicon/favicon.ico b/setup/pub/images/favicon/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5901a2120ca02452869df7b716e0b8689f7f432b
Binary files /dev/null and b/setup/pub/images/favicon/favicon.ico differ
diff --git a/setup/pub/images/magento-icon.svg b/setup/pub/images/magento-icon.svg
new file mode 100644
index 0000000000000000000000000000000000000000..2ade240eac735cedb61693fbb4b5a274244387e0
--- /dev/null
+++ b/setup/pub/images/magento-icon.svg
@@ -0,0 +1 @@
+<svg baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="35" height="41" viewBox="-0.154 0 54 62"><g fill="#E85D22"><path d="M26.845 8.857"/><path d="M53.692 15.5v31l-7.67 4.43v-31L26.844 8.856 7.67 19.926V50.93L0 46.5v-31L26.845 0zM26.847 62L15.34 55.355V24.357l7.67-4.43V50.93l3.835 2.327 3.837-2.327v-31l7.67 4.427v30.998z"/></g></svg>
\ No newline at end of file
diff --git a/setup/pub/images/magento-logo.svg b/setup/pub/images/magento-logo.svg
new file mode 100644
index 0000000000000000000000000000000000000000..77e2604562ac410f0b8ec316cc7e5934c2cebfd3
--- /dev/null
+++ b/setup/pub/images/magento-logo.svg
@@ -0,0 +1 @@
+<svg baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" width="192" height="56" viewBox="0 0 214 62"><path fill="#131108" d="M93.166 44.96l-1.81-23.096-9.17 23.22H79.2l-9.17-23.22-1.77 23.096h-3.7l2.314-29.026h4.88l9.045 23.81 9.043-23.81h4.836l2.27 29.026h-3.785zm19.772 0l-.42-2.692c-1.598 1.64-3.786 3.112-7.067 3.112-3.617 0-5.887-2.188-5.887-5.596 0-5.006 4.29-6.98 12.663-7.867v-.84c0-2.524-1.515-3.408-3.83-3.408-2.44 0-4.754.755-6.94 1.723l-.505-3.238c2.4-.97 4.67-1.682 7.784-1.682 4.88 0 7.236 1.976 7.236 6.435v14.05h-3.032zm-.714-10.182c-7.406.715-8.963 2.735-8.963 4.796 0 1.642 1.097 2.693 2.99 2.693 2.188 0 4.29-1.095 5.975-2.82v-4.67zM137.462 24.6l.546 3.363-3.826.378c.546.928.8 1.98.8 3.115 0 4.292-3.62 6.9-7.7 6.9-.504 0-1.01-.043-1.514-.127-.59.38-1.01.844-1.01 1.22 0 .716.714.886 4.248 1.517l1.432.252c4.25.757 6.898 2.102 6.898 5.216 0 4.206-4.586 6.183-9.802 6.183s-9.38-1.64-9.38-5.173c0-2.062 1.43-3.66 4.247-5.174-.88-.63-1.26-1.35-1.26-2.105 0-.97.758-1.936 2.105-2.734-2.23-1.094-3.744-3.237-3.744-5.973 0-4.332 3.617-6.98 7.698-6.98 2.02 0 3.786.586 5.175 1.68l5.09-1.557zM121.73 47.145c0 1.6 2.06 2.775 5.972 2.775 3.913 0 6.1-1.344 6.1-3.026 0-1.222-.925-2.06-3.785-2.566l-2.397-.422c-1.095-.208-1.682-.336-2.48-.502-2.358 1.177-3.41 2.356-3.41 3.742zm5.467-19.94c-2.522 0-4.08 1.937-4.08 4.376 0 2.314 1.6 4.12 4.08 4.12 2.566 0 4.165-1.89 4.165-4.29 0-2.396-1.682-4.204-4.165-4.204zm28.103 8.12h-13.632c.125 4.67 2.354 6.856 5.847 6.856 2.904 0 5.007-1.133 7.193-2.86l.546 3.37c-2.144 1.68-4.71 2.69-8.03 2.69-5.22 0-9.3-3.155-9.3-10.52 0-6.434 3.787-10.387 8.835-10.387 5.844 0 8.54 4.5 8.54 10.052v.8zm-8.584-7.908c-2.313 0-4.29 1.64-4.88 5.09h9.676c-.463-3.24-1.893-5.09-4.796-5.09zm24.356 17.543V31.287c0-2.06-.883-3.45-3.07-3.45-1.977 0-3.996 1.306-5.807 3.24V44.96h-3.743V24.893h2.986l.463 2.903c1.895-1.724 4.253-3.323 7.11-3.323 3.786 0 5.808 2.27 5.808 5.888v14.6h-3.745zm14.806.338c-3.532 0-5.846-1.265-5.846-5.304V28.048h-3.03v-3.156h3.03v-6.688l3.66-.546v7.234h4.332l.505 3.156h-4.84V39.32c0 1.644.676 2.652 2.777 2.652.673 0 1.262-.04 1.724-.127l.507 3.196c-.633.13-1.513.26-2.82.26zm12.412.082c-5.343 0-9.214-3.827-9.214-10.434 0-6.605 3.87-10.473 9.213-10.473 5.38 0 9.337 3.868 9.337 10.473 0 6.607-3.956 10.434-9.34 10.434zm0-17.753c-3.618 0-5.427 3.113-5.427 7.32 0 4.124 1.892 7.32 5.426 7.32 3.7 0 5.55-3.114 5.55-7.32 0-4.123-1.934-7.32-5.552-7.32zm11.99.27c-1.505 0-2.55-1.045-2.55-2.606 0-1.55 1.066-2.616 2.55-2.616 1.505 0 2.55 1.056 2.55 2.618 0 1.55-1.066 2.607-2.55 2.607zm0-4.92c-1.214 0-2.18.83-2.18 2.314 0 1.474.966 2.305 2.18 2.305 1.225 0 2.19-.832 2.19-2.303.002-1.482-.977-2.313-2.19-2.313zm.75 3.708l-.862-1.237h-.28v1.19h-.496V23.75h.878c.606 0 1.01.305 1.01.845 0 .416-.225.686-.585.798l.833 1.18-.497.113zm-.76-2.484h-.383v.856h.36c.324 0 .53-.135.53-.427 0-.28-.182-.428-.507-.428z"/><g fill="#E85D22"><path d="M26.845 8.857"/><path d="M53.692 15.5v31l-7.67 4.43v-31L26.844 8.856 7.67 19.926V50.93L0 46.5v-31L26.845 0zM26.847 62L15.34 55.356v-31l7.67-4.428v31l3.835 2.33 3.837-2.33v-31l7.67 4.43v30.998z"/></g></svg>
\ No newline at end of file
diff --git a/setup/pub/magento/setup/create-admin-account.js b/setup/pub/magento/setup/create-admin-account.js
index 8024ed5a9ebc166754f46b1e6610500562fc21e5..c2cabdb63cffcf9c966bc6b657730f8331a9ff8d 100644
--- a/setup/pub/magento/setup/create-admin-account.js
+++ b/setup/pub/magento/setup/create-admin-account.js
@@ -29,7 +29,7 @@ angular.module('create-admin-account', ['ngStorage'])
$scope.admin.passwordStatus.label = 'Weak';
} else if (p.length > 6) {
$scope.admin.passwordStatus.class = 'to-short';
- $scope.admin.passwordStatus.label = 'To Short';
+ $scope.admin.passwordStatus.label = 'Too Short';
} else {
$scope.admin.passwordStatus.class = 'none';
$scope.admin.passwordStatus.label = 'None';
diff --git a/setup/pub/magento/setup/css/app.css b/setup/pub/magento/setup/css/app.css
deleted file mode 100644
index a4d175033469cfce183e78354203b382d446863d..0000000000000000000000000000000000000000
--- a/setup/pub/magento/setup/css/app.css
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-.step-controls {
- padding: 10px;
- margin: 20px;
- text-align: right;
-}
-
-.required {
- color: red;
-}
-.collapsed-options {
- margin-top:20px;
- margin-bottom:20px;
-}
-a.collapsed-options {
- padding-top: 7px;
- color: #000;
- font-weight: bold;
- white-space: nowrap;
-}
-
-.readiness-check-landing {
- text-align: center;
- width: 550px;
- margin-top: 50px;
-}
-.readiness-check-landing > * {
- padding: 20px;
- margin: 20px;
-}
-.rediness-check-items > div {
- padding: 20px;
-}
-.rediness-check-info {
- margin: 10px 0 10px 20px;
- width: 70%;
-}
-.rediness-check-info > ul {
- margin-top: 10px;
-}
-.rediness-check-block {
- padding: 20px;
-}
-.rediness-check-panel-right {
- float:right;
-}
-
-.bs-callout {
- -moz-border-bottom-colors: none;
- -moz-border-left-colors: none;
- -moz-border-right-colors: none;
- -moz-border-top-colors: none;
- border-color: #eee;
- border-image: none;
- border-radius: 3px;
- border-style: solid;
- border-width: 1px 1px 1px 5px;
- margin: 20px 0;
- padding: 20px;
-}
-.bs-callout h4 {
- margin-bottom: 5px;
- margin-top: 0;
-}
-.bs-callout-danger {
- border-left-color: #d9534f;
-}
-.bs-callout-danger h4 {
- color: #d9534f;
-}
-.bs-callout-warning {
- border-left-color: #f0ad4e;
-}
-.bs-callout-warning h4 {
- color: #f0ad4e;
-}
-.bs-callout-info {
- border-left-color: #5bc0de;
-}
-.bs-callout-info h4 {
- color: #5bc0de;
-}
-
-.tooltip-inner {
- padding: 9px 14px;
- color: #000;
- background-color: #eee;
- border: 1px solid #ccc;
-}
-.tooltip.right .tooltip-arrow {
- border-right-color: #ccc;
-}
-
-.password-strength > div {
- background-color: #ffffff;
- margin: 2px;
- min-height: 5px;
-}
-.password-strength-none > div {}
-.password-strength-to-short > div:first-child {
- background-color: #d9534f;
-}
-.password-strength-weak > div:first-child, .password-strength-weak > div:nth-child(2) {
- background-color: #ffcc33;
-}
-.password-strength-good > div:first-child, .password-strength-good > div:nth-child(2), .password-strength-good > div:nth-child(3) {
- background-color: #3c763d;
-}
-.password-strength-strong > div {
- background-color: #3c763d;
-}
-
-.highlight {
- background-color: #f7f7f9;
- border: 1px solid #e1e1e8;
- border-radius: 4px;
- margin-bottom: 14px;
- padding: 9px 14px;
-}
-.highlight pre {
- background-color: transparent;
- border: 0 none;
- margin-bottom: 0;
- margin-top: 0;
- padding: 0;
- white-space: nowrap;
- word-break: normal;
-}
-.error-container {
- display: block;
- padding: 6px 12px;
- margin-top: 2px;
- color: #a94442;
- background-color: #f2dede;
- border-color: #a94442;
- border-radius: 4px;
-}
-.bold {
- font-weight: bold;
-}
-.p-top-10 {
- padding: 10px;
-}
-.disabled {
- pointer-events: none;
- cursor: default;
-}
-
-.uncheckedClass {
- padding: 5px 5px 5px 5px;
- width:480px;
- font-weight: normal;
-}
-
-.checkedClass {
- padding: 5px 5px 5px 5px;
- background-color:#d9edf7;
- width:480px;
- font-weight: normal;
-}
-
-.disabledClass {
- padding: 5px 5px 5px 5px;
- color: #707070;
- width:480px;
- font-weight: normal;
-}
-
-.multiSelect{
- padding : 10px;
- border-radius: 4px;
- border: 1px solid #ccc;
- overflow-y: scroll;
- width:500px;
- height:300px;
-}
-
-::-webkit-scrollbar {
- -webkit-appearance: none;
- width: 8px;
-}
-
-::-webkit-scrollbar-thumb {
- border-radius: 4px;
- background-color: rgba(0,0,0,.5);
- -webkit-box-shadow: 0 0 1px rgba(255,255,255,.5);
-}
\ No newline at end of file
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index 054a8378905a1e62bbc68f63288fec1a46375d73..7afd93dcc3dfb8643716c44df623231d7f6517b1 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -17,10 +17,6 @@ main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navi
function ($scope, $state, navigationService) {
$scope.$on('$stateChangeSuccess', function (event, state) {
$scope.valid = true;
- $scope.class = 'col-lg-9';
- if (state.main) {
- $scope.class = 'col-lg-offset-3 col-lg-6';
- }
});
$scope.nextState = function () {
diff --git a/setup/src/Magento/Setup/Model/ObjectManagerProvider.php b/setup/src/Magento/Setup/Model/ObjectManagerProvider.php
index f184f2c30254f3469a5982e158198e36feb63f1a..395644232957f1a70506e5089a7e86ad39f33286 100644
--- a/setup/src/Magento/Setup/Model/ObjectManagerProvider.php
+++ b/setup/src/Magento/Setup/Model/ObjectManagerProvider.php
@@ -51,12 +51,12 @@ class ObjectManagerProvider
public function get()
{
if (null === $this->objectManager) {
- if (!$this->deploymentConfig->isAvailable()) {
- throw new \Magento\Setup\Exception(
- "Can't instantiate object manager due to absence of deployment configuration. "
- . "Please, install the deployment configuration first"
- );
- }
+// if (!$this->deploymentConfig->isAvailable()) {
+// throw new \Magento\Setup\Exception(
+// "Can't instantiate object manager due to absence of deployment configuration. "
+// . "Please, install the deployment configuration first"
+// );
+// }
$initParams = $this->serviceLocator->get(InitParamListener::BOOTSTRAP_PARAM);
$factory = Bootstrap::createObjectManagerFactory(BP, $initParams);
$this->objectManager = $factory->create($initParams);
diff --git a/setup/view/error/404.phtml b/setup/view/error/404.phtml
index 34ee77798ebb54ab0146bf8998f588e23e2d9624..ac1a2756fd169c8d088dcbbd68b0dfad73dee4f4 100644
--- a/setup/view/error/404.phtml
+++ b/setup/view/error/404.phtml
@@ -7,110 +7,118 @@
// @codingStandardsIgnoreFile
?>
-<h1>A 404 error occurred</h1>
-<h2><?php echo $this->message ?></h2>
+<header class="header">
+ <img class="logo" src="<?php echo $this->basePath() ?>/pub/images/magento-icon.svg" alt="Magento"/>
+ <h1 class="header-title">A 404 error occurred</h1>
+</header>
-<?php if (isset($this->reason) && $this->reason): ?>
+<h2>Page not found</h2>
-<?php
-$reasonMessage = '';
-switch ($this->reason) {
- case 'error-controller-cannot-dispatch':
- $reasonMessage = 'The requested controller was unable to dispatch the request.';
- break;
- case 'error-controller-not-found':
- $reasonMessage = 'The requested controller could not be mapped to an existing controller class.';
- break;
- case 'error-controller-invalid':
- $reasonMessage = 'The requested controller was not dispatchable.';
- break;
- case 'error-router-no-match':
- $reasonMessage = 'The requested URL could not be matched by routing.';
- break;
- default:
- $reasonMessage = 'We cannot determine at this time why a 404 was generated.';
- break;
-}
-?>
+<?php if ( isset( $this->reason ) && $this->reason ): ?>
+
+ <?php
+ $reasonMessage = '';
+ switch ( $this->reason ) {
+ case 'error-controller-cannot-dispatch':
+ $reasonMessage = 'The requested controller was unable to dispatch the request.';
+ break;
+ case 'error-controller-not-found':
+ $reasonMessage = 'The requested controller could not be mapped to an existing controller class.';
+ break;
+ case 'error-controller-invalid':
+ $reasonMessage = 'The requested controller was not dispatchable.';
+ break;
+ case 'error-router-no-match':
+ $reasonMessage = 'The requested URL could not be matched by routing.';
+ break;
+ default:
+ $reasonMessage = 'We cannot determine at this time why a 404 was generated.';
+ break;
+ }
+ ?>
-<p><?php echo $reasonMessage ?></p>
+ <p><?php echo $reasonMessage ?></p>
<?php endif ?>
-<?php if (isset($this->controller) && $this->controller): ?>
+<?php if ( isset( $this->controller ) && $this->controller ): ?>
-<dl>
- <dt>Controller:</dt>
- <dd><?php echo $this->escapeHtml($this->controller) ?>
-<?php
-if (isset($this->controller_class)
- && $this->controller_class
- && $this->controller_class != $this->controller
-) {
- echo '(' . sprintf('resolves to %s', $this->escapeHtml($this->controller_class)) . ')';
-}
-?>
-</dd>
-</dl>
+ <dl>
+ <dt>Controller:</dt>
+ <dd><?php echo $this->escapeHtml( $this->controller ) ?>
+ <?php
+ if ( isset( $this->controller_class )
+ && $this->controller_class
+ && $this->controller_class != $this->controller
+ ) {
+ echo '(' . sprintf( 'resolves to %s', $this->escapeHtml( $this->controller_class ) ) . ')';
+ }
+ ?>
+ </dd>
+ </dl>
<?php endif ?>
-<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
-
-<?php if (isset($this->exception) && $this->exception instanceof Exception): ?>
-<hr/>
-<h2>Additional information:</h2>
-<h3><?php echo get_class($this->exception); ?></h3>
-<dl>
- <dt>File:</dt>
- <dd>
- <pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
- </dd>
- <dt>Message:</dt>
- <dd>
- <pre class="prettyprint linenums"><?php echo $this->exception->getMessage() ?></pre>
- </dd>
- <dt>Stack trace:</dt>
- <dd>
- <pre class="prettyprint linenums"><?php echo $this->exception->getTraceAsString() ?></pre>
- </dd>
-</dl>
-<?php
- $e = $this->exception->getPrevious();
- if ($e) :
-?>
-<hr/>
-<h2>Previous exceptions:</h2>
-<ul class="unstyled">
- <?php while ($e) : ?>
- <li>
- <h3><?php echo get_class($e); ?></h3>
+<?php if ( isset( $this->display_exceptions ) && $this->display_exceptions ): ?>
+
+ <?php if ( isset( $this->exception ) && $this->exception instanceof Exception ): ?>
+ <hr/>
+ <h2>Additional information:</h2>
+ <h3><?php echo get_class( $this->exception ); ?></h3>
<dl>
<dt>File:</dt>
<dd>
- <pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
+ <pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
</dd>
+
<dt>Message:</dt>
<dd>
- <pre class="prettyprint linenums"><?php echo $e->getMessage() ?></pre>
+ <pre class="prettyprint linenums"><?php echo $this->exception->getMessage() ?></pre>
</dd>
+
<dt>Stack trace:</dt>
<dd>
- <pre class="prettyprint linenums"><?php echo $e->getTraceAsString() ?></pre>
+ <pre class="prettyprint linenums"><?php echo $this->exception->getTraceAsString() ?></pre>
</dd>
</dl>
- </li>
- <?php
- $e = $e->getPrevious();
- endwhile;
- ?>
-</ul>
-<?php endif; ?>
+ <?php
+ $e = $this->exception->getPrevious();
+ if ( $e ) :
+ ?>
+ <hr/>
+ <h2>Previous exceptions:</h2>
+ <ul class="unstyled">
+ <?php while ( $e ) : ?>
+ <li>
+ <h3><?php echo get_class( $e ); ?></h3>
+ <dl>
+ <dt>File:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
+ </dd>
-<?php else: ?>
+ <dt>Message:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $e->getMessage() ?></pre>
+ </dd>
-<h3>No Exception available</h3>
+ <dt>Stack trace:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $e->getTraceAsString() ?></pre>
+ </dd>
+ </dl>
+ </li>
+ <?php
+ $e = $e->getPrevious();
+ endwhile;
+ ?>
+ </ul>
+ <?php endif; ?>
-<?php endif ?>
+ <?php else: ?>
+
+ <p>No Exception available</p>
+
+ <?php endif ?>
<?php endif ?>
diff --git a/setup/view/error/index.phtml b/setup/view/error/index.phtml
index e13ed09b0afee0717e57903a478273be582c7b17..c3450edf3f306a8554e79732c7ebaca2cf2a3705 100644
--- a/setup/view/error/index.phtml
+++ b/setup/view/error/index.phtml
@@ -7,65 +7,73 @@
// @codingStandardsIgnoreFile
?>
-<h1>An error occurred</h1>
+<header class="header">
+ <img class="logo" src="<?php echo $this->basePath() ?>/pub/images/magento-icon.svg" alt="Magento"/>
+ <h1 class="header-title">An error occurred</h1>
+</header>
+
<h2><?php echo $this->message ?></h2>
-<?php if (isset($this->display_exceptions) && $this->display_exceptions): ?>
+<?php if ( isset( $this->display_exceptions ) && $this->display_exceptions ): ?>
-<?php if (isset($this->exception) && $this->exception instanceof Exception): ?>
-<hr/>
-<h2>Additional information:</h2>
-<h3><?php echo get_class($this->exception); ?></h3>
-<dl>
- <dt>File:</dt>
- <dd>
- <pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
- </dd>
- <dt>Message:</dt>
- <dd>
- <pre class="prettyprint linenums"><?php echo $this->escapeHtml($this->exception->getMessage()) ?></pre>
- </dd>
- <dt>Stack trace:</dt>
- <dd>
- <pre class="prettyprint linenums"><?php echo $this->escapeHtml($this->exception->getTraceAsString()) ?></pre>
- </dd>
-</dl>
-<?php
- $e = $this->exception->getPrevious();
- if ($e) :
-?>
-<hr/>
-<h2>Previous exceptions:</h2>
-<ul class="unstyled">
- <?php while ($e) : ?>
- <li>
- <h3><?php echo get_class($e); ?></h3>
+ <?php if ( isset( $this->exception ) && $this->exception instanceof Exception ): ?>
+ <hr/>
+ <h2>Additional information:</h2>
+ <h3><?php echo get_class( $this->exception ); ?></h3>
<dl>
<dt>File:</dt>
<dd>
- <pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
+ <pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
</dd>
+
<dt>Message:</dt>
<dd>
- <pre class="prettyprint linenums"><?php echo $this->escapeHtml($e->getMessage()) ?></pre>
+ <pre class="prettyprint linenums"><?php echo $this->escapeHtml( $this->exception->getMessage() ) ?></pre>
</dd>
+
<dt>Stack trace:</dt>
<dd>
- <pre class="prettyprint linenums"><?php echo $this->escapeHtml($e->getTraceAsString()) ?></pre>
+ <pre class="prettyprint linenums"><?php echo $this->escapeHtml( $this->exception->getTraceAsString() ) ?></pre>
</dd>
</dl>
- </li>
- <?php
- $e = $e->getPrevious();
- endwhile;
- ?>
-</ul>
-<?php endif; ?>
+ <?php
+ $e = $this->exception->getPrevious();
+ if ( $e ) :
+ ?>
+ <hr/>
+ <h2>Previous exceptions:</h2>
+ <ul class="unstyled">
+ <?php while ( $e ) : ?>
+ <li>
+ <h3><?php echo get_class( $e ); ?></h3>
+ <dl>
+ <dt>File:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
+ </dd>
-<?php else: ?>
+ <dt>Message:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $this->escapeHtml( $e->getMessage() ) ?></pre>
+ </dd>
-<h3>No Exception available</h3>
+ <dt>Stack trace:</dt>
+ <dd>
+ <pre class="prettyprint linenums"><?php echo $this->escapeHtml( $e->getTraceAsString() ) ?></pre>
+ </dd>
+ </dl>
+ </li>
+ <?php
+ $e = $e->getPrevious();
+ endwhile;
+ ?>
+ </ul>
+ <?php endif; ?>
-<?php endif ?>
+ <?php else: ?>
+
+ <h3>No Exception available</h3>
+
+ <?php endif ?>
<?php endif ?>
diff --git a/setup/view/layout/layout.phtml b/setup/view/layout/layout.phtml
index 1e986d6c8201c2377c532e6a1d4ee7b0d9aec810..5f66f0b223f0d273c1bc2c99d558f85153e0cb33 100644
--- a/setup/view/layout/layout.phtml
+++ b/setup/view/layout/layout.phtml
@@ -5,37 +5,43 @@
*/
?>
<?php echo $this->doctype(); ?>
+<!--[if IE 9]>
+<html class="ie9" lang="en" ng-app="magentoSetup"><![endif]-->
+<!--[if !IE]><!-->
<html lang="en" ng-app="magentoSetup">
- <head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>Magento Setup Tool</title>
- <?php echo $this->headLink()
- ->appendStylesheet('pub/bootstrap/css/bootstrap.min.css')
- ->appendStylesheet('pub/bootstrap/css/bootstrap-theme.min.css')
- ->appendStylesheet('pub/magento/setup/css/app.css');
- ?>
- <?php echo $this->headScript()
- ->appendFile('pub/angular/angular.min.js')
- ->appendFile('pub/angular-ng-storage/angular-ng-storage.min.js')
- ->appendFile('pub/angular-ui-router/angular-ui-router.min.js')
- ->appendFile('pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js')
- ->appendFile('pub/magento/setup/app.js')
- ->appendFile('pub/magento/setup/main.js')
- ->appendFile('pub/magento/setup/landing.js')
- ->appendFile('pub/magento/setup/readiness-check.js')
- ->appendFile('pub/magento/setup/add-database.js')
- ->appendFile('pub/magento/setup/web-configuration.js')
- ->appendFile('pub/magento/setup/customize-your-store.js')
- ->appendFile('pub/magento/setup/create-admin-account.js')
- ->appendFile('pub/magento/setup/install.js')
- ->appendFile('pub/magento/setup/success.js');
- ?>
- <?php echo $this->inlineScript() ?>
- </head>
- <body>
- <div class="container">
- <?php echo $this->content; ?>
- </div>
- </body>
+<!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title>Magento Setup Tool</title>
+ <?php echo $this->headLink()
+ ->appendStylesheet($this->basePath() . '/pub/magento/setup/css/setup.css');
+ ?>
+ <?php echo $this->headScript()
+ ->appendFile('pub/angular/angular.min.js')
+ ->appendFile('pub/angular-ng-storage/angular-ng-storage.min.js')
+ ->appendFile('pub/angular-ui-router/angular-ui-router.min.js')
+ ->appendFile('pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js')
+ ->appendFile('pub/magento/setup/app.js')
+ ->appendFile('pub/magento/setup/main.js')
+ ->appendFile('pub/magento/setup/landing.js')
+ ->appendFile('pub/magento/setup/readiness-check.js')
+ ->appendFile('pub/magento/setup/add-database.js')
+ ->appendFile('pub/magento/setup/web-configuration.js')
+ ->appendFile('pub/magento/setup/customize-your-store.js')
+ ->appendFile('pub/magento/setup/create-admin-account.js')
+ ->appendFile('pub/magento/setup/install.js')
+ ->appendFile('pub/magento/setup/success.js');
+ ?>
+ <link rel="icon" type="image/x-icon" href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon.ico" sizes="16x16">
+ <link rel="icon" type="image/png" href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-96x96.png" sizes="96x96">
+ <link rel="icon" type="image/png" href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-32x32.png" sizes="32x32">
+ <link rel="icon" type="image/png" href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-16x16.png" sizes="16x16">
+ <?php echo $this->inlineScript() ?>
+</head>
+<body>
+<main class="container">
+ <?php echo $this->content; ?>
+</main>
+</body>
</html>
diff --git a/setup/view/magento/setup/add-database.phtml b/setup/view/magento/setup/add-database.phtml
index 60021378646449a94a8835c34d2cf64a4d437fd6..7f6c7e68d8fa6f6b51134429ed79a92c93b1b40e 100644
--- a/setup/view/magento/setup/add-database.phtml
+++ b/setup/view/magento/setup/add-database.phtml
@@ -7,244 +7,477 @@
// @codingStandardsIgnoreFile
?>
-<div class="step-controls">
- <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
- <a href="" class="btn btn-primary" ng-click="testConnection()">Next</a>
+<div class="nav-bar-outer-actions">
+ <div class="outer-actions-inner-wrap">
+ <div class="btn-wrap btn-wrap-triangle-right btn-wrap-next">
+ <button
+ type="button"
+ class="btn btn-prime"
+ ng-click="testConnection()"
+ >Next</button>
+ </div>
+ <div class="btn-wrap btn-wrap-triangle-left btn-wrap-prev">
+ <button
+ type="button"
+ class="btn"
+ ng-click="previousState()"
+ >Back</button>
+ </div>
+ </div>
+</div>
+
+<h2 class="page-title">{{$state.current.header}}</h2>
+
+<div
+ class="alert alert-info"
+ ng-show="testConnection.result.success && testConnection.pressed"
+ >
+ <span class="alert-icon icon-success-round"></span>
+ <span class="alert-text">Test connection successful.</span>
+</div>
+<div
+ class="alert alert-info"
+ ng-show="testConnection.result.success === false && testConnection.result !== undefined"
+ >
+ <span class="alert-icon icon-failed-round"></span>
+ <span class="alert-text">{{testConnection.result.error}}</span>
+</div>
+<div
+ class="alert alert-info"
+ ng-show="testConnection.result.success === undefined && testConnection.result !== undefined"
+ >
+ <span class="alert-icon icon-failed-round"></span>
+ <span class="alert-text">Unknown Database Server Host.</span>
+</div>
+
+<form
+ novalidate
+ name="database"
+ role="form"
+ >
+
+<?php
+/* Hide "Create database" option
+
+<fieldset class="form-fieldset">
+
+ <legend class="form-legend-light">
+ Did you want to use an existing or create a new database?
+ </legend>
+
+ <div class="form-row">
+ <input
+ id="useExistingDb"
+ class="form-el-radio"
+ type="radio"
+ name="useExistingDb"
+ ng-model="db.useExistingDb"
+ value="1"
+ >
+ <label class="form-label" for="useExistingDb">
+ Use my existing database
+ </label>
+ </div>
+
+ <div class="form-row">
+ <input
+ id="useNotExistingDb"
+ class="form-el-radio"
+ type="radio"
+ name="useExistingDb"
+ ng-model="db.useExistingDb"
+ value="0"
+ >
+ <label class="form-label" for="useNotExistingDb">
+ Create a database for me
+ </label>
+ </div>
+
+</fieldset>
+
+*/
+?>
+
+<fieldset class="form-fieldset">
+
+<?php
+/* Hide "Create database" option
+
+<legend class="form-legend" ng-if="db.useExistingDb==1">
+ Use my existing database
+</legend>
+<legend class="form-legend" ng-if="db.useExistingDb==0">
+ Create a database for me
+</legend>
+
+*/
+?>
+
+<div
+ class="row form-row"
+ ng-class="{'has-error': database.dbHost.$invalid && database.submitted}"
+ >
+ <div class="col-m-3">
+ <label class="form-label required" for="dbHost">
+ Database Server Host
+ </label>
+ </div>
+ <div class="col-m-4">
+ <input
+ id="dbHost"
+ class="form-el-input"
+ tooltip-placement="right"
+ tooltip="Name and location of the server that hosts your store's database."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ type="text"
+ name="dbHost"
+ ng-model="db.host"
+ ng-class="{'invalid': database.dbHost.$invalid && database.submitted}"
+ required
+ >
+ <div class="error-container">
+ <span ng-show="database.dbHost.$error.required">
+ You must enter a valid host name. Please check the syntax and try again.
+ </span>
+ </div>
+ </div>
+</div>
+
+<div
+ class="row form-row"
+ ng-class="{'has-error': database.dbUser.$invalid && database.submitted}"
+ >
+ <div class="col-m-3">
+ <label class="form-label required" for="dbUser">
+ Database Server Username
+ </label>
+ </div>
+ <div class="col-m-4">
+ <?php
+ /* Hide "Create database" option
+
+ ng-switch="db.useExistingDb"
+
+ <input
+ id="dbUser"
+ ng-switch-when="1"
+ tooltip-placement="right"
+ tooltip="Sign-in credentials for your store's database on the database server (does not need to be admin-level credentials)."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ class="form-el-input"
+ type="text"
+ name="dbUser"
+ ng-model="db.user"
+ required
+ >
+ */
+ ?>
+ <input
+ id="dbUser"
+ tooltip-placement="right"
+ tooltip="Sign-in credentials for your store's database on the database server (does not need to be admin-level credentials)."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ class="form-el-input"
+ ng-class="{'invalid': database.dbUser.$invalid && database.submitted}"
+ type="text"
+ name="dbUser"
+ ng-model="db.user"
+ required
+ >
+ <div class="error-container">
+ <span ng-show="database.dbUser.$error.required">
+ Please enter a username to continue.
+ </span>
+ </div>
+ </div>
+</div>
+
+<div class="row form-row">
+ <div class="col-m-3">
+ <label class="form-label" for="dbPassword">
+ Database Server Password
+ </label>
+ </div>
+ <div class="col-m-4" ng-switch="db.useExistingDb">
+ <input
+ id="dbPassword"
+ class="form-el-input"
+ ng-switch-when="1"
+ tooltip-placement="right"
+ tooltip="Sign-in credentials for your store's database on the database server (does not need to be admin-level credentials)."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ type="password"
+ name="dbPassword"
+ ng-model="db.password"
+ placeholder="(not always necessary)"
+ >
+ <input
+ id="dbPassword"
+ class="form-el-input"
+ ng-switch-when="0"
+ tooltip-placement="right"
+ tooltip="Administrator credentials to sign in to the server that will host your store's database."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ type="password"
+ name="dbPassword"
+ ng-model="db.password"
+ placeholder="(not always necessary)"
+ >
+ </div>
+</div>
+
+<div class="row form-row" ng-if="db.useExistingDb">
+ <div class="col-m-3">
+ <label class="form-label required" for="dbname">
+ Database Name
+ </label>
+ </div>
+ <div class="col-m-4">
+ <input
+ id="dbname"
+ class="form-el-input"
+ tooltip-placement="right"
+ tooltip="Enter the name of your store's database."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ ng-class="{'invalid': database.dbname.$invalid && database.submitted}"
+ type="text"
+ name="dbname"
+ ng-model="db.name"
+ required
+ >
+ <div class="error-container">
+ <span ng-show="database.dbname.$error.required">
+ You must enter a valid database name. Please check the syntax and try again.
+ </span>
+ </div>
+ </div>
+</div>
+
+<?php
+/* Hide "Create database" option
+
+<div class="row form-row" ng-if="db.useExistingDb==0">
+ <div class="col-m-3">
+ <label class="form-label required" for="dbNewName">
+ New Database Name
+ </label>
+ </div>
+ <div class="col-m-4">
+ <input
+ id="dbNewName"
+ class="form-el-input"
+ tooltip-placement="right"
+ tooltip="Create sign-in credentials for your store's database."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ type="text"
+ name="dbNewName"
+ ng-model="db.newName"
+ required
+ >
+ </div>
+</div>
+
+*/
+?>
+
+<?php
+/* Hide "Create database" option
+<div class="row form-row">
+ <div class="col-m-offset-3 col-m-4">
+ <button
+ class="btn btn-secondary"
+ type="button"
+ ng-click="testConnection()"
+ >
+ Test Connection and Authentication
+ </button>
+ </div>
+ <div class="col-m-5">
+ <div
+ class="check-result-message"
+ ng-show="testConnection.result.success && testConnection.pressed"
+ >
+ <span class="icon-success-round"></span>
+ <span class="check-result-text">Test connection successful.</span>
+ </div>
+ <div
+ class="check-result-message"
+ ng-show="testConnection.result.success === false && testConnection.result !== undefined"
+ >
+ <span class="icon-failed-round"></span>
+ <span class="check-result-text">{{testConnection.result.error}}</span>
+ </div>
+ <div
+ class="check-result-message"
+ ng-show="testConnection.result.success === undefined && testConnection.result !== undefined"
+ >
+ <span class="icon-failed-round"></span>
+ <span class="check-result-text">Unknown Database Server Host.</span>
+ </div>
+ </div>
</div>
+*/
+?>
-<div class="page-header">
- <h1>{{$state.current.header}}</h1>
+<div class="row form-row">
+ <div class="col-m-3">
+ <label class="form-label" for="dbTablePrefix">
+ Table prefix
+ </label>
+ </div>
+ <div class="col-m-4">
+ <input
+ id="dbTablePrefix"
+ class="form-el-input"
+ tooltip-placement="right"
+ tooltip="Enter a tracking prefix to be used for database tables created for this Magento installation. (ex: 'mg1_' )."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ type="text"
+ name="dbTablePrefix"
+ ng-model="db.tablePrefix"
+ placeholder="(optional)"
+ >
+ </div>
</div>
-<form novalidate name="database" class="form-horizontal" role="form">
- <div class="bs-callout bs-callout-warning col-sm-12 hide">
- <h4>Did you want to use an existing or create a new database?</h4>
- <div class="radio col-sm-6">
- <label>
- <input type="radio" name="useExistingDb" ng-model="db.useExistingDb" value="1">
- Use my existing database
+<?php
+/* Hide "Create database" option
+
+<div ng-if="db.useExistingDb==0">
+
+ <p class="form-legend-light">
+ Data Access
+ </p>
+
+ <div class="form-row">
+ <input
+ id="dbUseAccess"
+ class="form-el-radio"
+ type="radio"
+ name="db.useAccess"
+ ng-model="db.useAccess"
+ value="0"
+ >
+ <label class="form-label" for="dbUseAccess">
+ Enter existing credentials to create the Magento database
+ </label>
+ </div>
+
+ <div class="row form-row" ng-if="db.useAccess==0">
+ <div class="col-m-3">
+ <label class="form-label required" for="dbGrandUsername">
+ Username
</label>
</div>
- <div class="radio col-sm-6">
- <label>
- <input type="radio" name="useExistingDb" ng-model="db.useExistingDb" value="0">
- Create a database for me
+ <div class="col-m-4">
+ <input
+ id="dbGrandUsername"
+ class="form-el-input"
+ type="text"
+ name="dbGrandUsername"
+ ng-model="dbGrandUsername"
+ required
+ >
+ </div>
+ </div>
+
+ <div class="row form-row" ng-if="db.useAccess==0">
+ <div class="col-m-3">
+ <label class="form-label" for="dbGrandPassword">
+ Password
</label>
</div>
+ <div class="col-m-4">
+ <input
+ id="dbGrandPassword"
+ class="form-el-input"
+ type="password"
+ name="dbGrandPassword"
+ ng-model="db.grandPassword"
+ placeholder="(optional)"
+ >
+ </div>
+ </div>
+
+ <div class="form-row">
+ <input
+ id="useAccess"
+ class="form-el-radio"
+ type="radio"
+ name="useAccess"
+ ng-model="db.useAccess"
+ value="1"
+ >
+ <label class="form-label" for="useAccess">
+ Enter new credentials to create the Magento database
+ </label>
</div>
- <div class="form-group" ng-class="{'has-error': database.dbHost.$invalid && database.submitted}">
- <label class="col-sm-4 control-label">Database Server Host <span class="required">*</span></label>
- <div class="col-sm-4">
- <input tooltip-placement="right"
- tooltip="Name and location of the server that hosts your store's database."
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="text"
- name="dbHost"
- ng-model="db.host"
- required />
- </div>
- <div class="col-sm-offset-4 col-sm-4" ng-show="database.dbHost.$invalid && database.submitted">
- <div class="error-container">
- <span ng-show="database.dbHost.$error.required">You must enter a valid host name. Please check the syntax and try again.</span>
- </div>
- </div>
- </div>
-
- <div class="form-group" ng-class="{'has-error': database.dbUser.$invalid && database.submitted}">
- <label class="col-sm-4 control-label">Database Server Username <span class="required">*</span></label>
- <div class="col-sm-4" ng-switch="db.useExistingDb">
- <input ng-switch-when="1"
- tooltip-placement="right"
- tooltip="Sign-in credentials for your store's database on the database server (does not need to be admin-level credentials)."
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="text"
- name="dbUser"
- ng-model="db.user"
- required />
- <input ng-switch-when="0"
- tooltip-placement="right"
- tooltip="Administrator credentials to sign in to the server that will host your store's database."
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="text"
- name="dbUser"
- ng-model="db.user"
- required />
- </div>
- <div class="col-sm-offset-4 col-sm-4" ng-show="database.dbUser.$invalid && database.submitted">
- <div class="error-container">
- <span ng-show="database.dbUser.$error.required">Please enter a username to continue.</span>
- </div>
- </div>
- </div>
-
- <div class="form-group">
- <label class="col-sm-4 control-label">Database Server Password</label>
- <div class="col-sm-4" ng-switch="db.useExistingDb">
- <input ng-switch-when="1"
- tooltip-placement="right"
- tooltip="Sign-in credentials for your store's database on the database server (does not need to be admin-level credentials)."
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="password"
- name="dbPassword"
- ng-model="db.password"
- placeholder="(not always necessary)" />
- <input ng-switch-when="0"
- tooltip-placement="right"
- tooltip="Administrator credentials to sign in to the server that will host your store's database."
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="password"
- name="dbPassword"
- ng-model="db.password"
- placeholder="(not always necessary)" />
- </div>
- </div>
-
- <div class="form-group" ng-if="db.useExistingDb">
- <label class="col-sm-4 control-label">Database Name<span class="required">*</span></label>
- <div class="col-sm-4">
- <input tooltip-placement="right"
- tooltip="Enter the name of your store's database."
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="text"
- name="dbname"
- ng-model="db.name"
- required />
- </div>
- <div class="col-sm-offset-4 col-sm-4" ng-show="database.dbname.$invalid && database.submitted">
- <div class="error-container">
- <span ng-show="database.dbname.$error.required">You must enter a valid database name. Please check the syntax and try again.</span>
- </div>
- </div>
- </div>
-
- <div class="form-group" ng-if="db.useExistingDb==0">
- <label class="col-sm-4 control-label">New Database Name <span class="required">*</span></label>
- <div class="col-sm-4">
- <input tooltip-placement="right"
- tooltip="Create sign-in credentials for your store's database."
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="text"
- name="dbNewName"
- ng-model="db.newName"
- required />
- </div>
- </div>
-
- <div class="form-group">
- <label class="col-sm-4 control-label">Table prefix</label>
- <div class="col-sm-4">
- <input tooltip-placement="right"
- tooltip="Enter a tracking prefix to be used for database tables created for this Magento installation. (ex: 'mg1_' )"
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="text"
- name="dbTablePrefix"
- ng-model="db.tablePrefix"
- placeholder="(optional)" />
- </div>
- </div>
-
- <div class="form-group">
- <div class="col-sm-offset-4 col-sm-4">
- <div ng-show="testConnection.result.success === false && testConnection.result !== undefined" class="error-container animate-show text-danger">
- <span class="glyphicon glyphicon-remove-sign"> {{testConnection.result.error}}</span>
- </div>
- <div ng-show="testConnection.result.success === undefined && testConnection.result !== undefined" class="error-container animate-show text-danger">
- <span class="glyphicon glyphicon-remove-sign"> Unknown Database Server Host.</span>
- </div>
- </div>
- </div>
-
- <div class="form-group" ng-if="db.useExistingDb==0">
- <label class="col-sm-3 control-label">Data Access<span class="required">*</span></label>
- <div class="col-sm-9">
- <div class="radio">
- <label>
- <input type="radio" name="db.useAccess" ng-model="db.useAccess" value="0">
- Enter existing credentials to create the Magento database
- </label>
- <div class="form-group" style="margin-top: 20px;" ng-if="db.useAccess==0">
- <label class="col-sm-3 control-label">Username<span class="required">*</span></label>
- <div class="col-sm-6">
- <input class="form-control"
- style="width: 80%;"
- type="text"
- name="dbGrandUsername"
- ng-model="dbGrandUsername"
- required>
- </div>
- </div>
- <div class="form-group" ng-if="db.useAccess==0">
- <label class="col-sm-3 control-label">Password</label>
- <div class="col-sm-6">
- <input class="form-control"
- style="width: 80%;"
- type="password"
- name="dbGrandPassword"
- ng-model="db.grandPassword"
- placeholder="(optional)">
- </div>
- </div>
- </div>
- <div class="radio">
- <label>
- <input type="radio" name="useAccess" ng-model="db.useAccess" value="1">
- Enter new credentials to create the Magento database
- </label>
- <div class="form-group" style="margin-top: 20px;" ng-if="db.useAccess">
- <label class="col-sm-3 control-label">New Username<span class="required">*</span></label>
- <div class="col-sm-6">
- <input class="form-control"
- style="width: 80%;"
- type="text"
- name="dbNewUsername"
- ng-model="db.newUsername"
- required>
- </div>
- </div>
- <div class="form-group" ng-if="db.useAccess">
- <label class="col-sm-3 control-label">New Password</label>
- <div class="col-sm-6">
- <input class="form-control"
- style="width: 80%;"
- type="password"
- name="dbNewPassword"
- ng-model="db.newPassword"
- placeholder="(optional)">
- </div>
- </div>
- <div class="form-group" ng-if="db.useAccess">
- <label class="col-sm-3 control-label">Confirm Password</label>
- <div class="col-sm-6">
- <input class="form-control"
- style="width: 80%;"
- type="password"
- name="dbConfirmPassword"
- ng-model="db.confirmPassword">
- </div>
- </div>
- </div>
+ <div class="row form-row" ng-if="db.useAccess">
+ <div class="col-m-3">
+ <label class="form-label required" for="dbNewUsername">
+ New Username
+ </label>
+ </div>
+ <div class="col-m-4">
+ <input
+ id="dbNewUsername"
+ class="form-el-input"
+ type="text"
+ name="dbNewUsername"
+ ng-model="db.newUsername"
+ required
+ >
+ </div>
+ </div>
+
+ <div class="row form-row" ng-if="db.useAccess">
+ <div class="col-m-3">
+ <label class="form-label" for="dbNewPassword">
+ New Password
+ </label>
+ </div>
+ <div class="col-m-4">
+ <input
+ id="dbNewPassword"
+ class="form-el-input"
+ type="password"
+ name="dbNewPassword"
+ ng-model="db.newPassword"
+ placeholder="(optional)"
+ >
+ </div>
+ </div>
+ <div class="row form-row" ng-if="db.useAccess">
+ <div class="col-m-3">
+ <label class="form-label" for="dbConfirmPassword">
+ Confirm Password
+ </label>
+ </div>
+ <div class="col-m-4">
+ <input
+ id="dbConfirmPassword"
+ class="form-el-input"
+ type="password"
+ name="dbConfirmPassword"
+ ng-model="db.confirmPassword"
+ >
</div>
</div>
-</form>
-<div class="step-controls">
- <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
- <a href="" class="btn btn-primary" ng-click="testConnection()">Next</a>
-</div>
\ No newline at end of file
+</div>
+
+*/
+?>
+
+</fieldset>
+
+</form>
diff --git a/setup/view/magento/setup/create-admin-account.phtml b/setup/view/magento/setup/create-admin-account.phtml
index 0e7f7fe166f1b94238549cb07b586c76766dcce7..14ffe9061f505af3662035080142413cc50f0483 100644
--- a/setup/view/magento/setup/create-admin-account.phtml
+++ b/setup/view/magento/setup/create-admin-account.phtml
@@ -10,116 +10,181 @@
<?php
$passwordWizard = sprintf(
'<p><b>%s</b> {{admin.passwordStatus.label}}</p>
- <div class=\'col-sm-12 password-strength password-strength-{{admin.passwordStatus.class}}\'>
- <div class=\'col-sm-2\'></div>
- <div class=\'col-sm-2\'></div>
- <div class=\'col-sm-2\'></div>
- <div class=\'col-sm-2\'></div>
+ <div class=\'password-strength password-strength-{{admin.passwordStatus.class}}\'>
+ <div class=\'password-strength-item\'></div>
+ <div class=\'password-strength-item\'></div>
+ <div class=\'password-strength-item\'></div>
+ <div class=\'password-strength-item\'></div>
</div>
<p>%s</p>',
'Password Strength:',
'Must be a mix of at least 7 alpha and numeric characters.(Ex.: BuyIt54).'
);
?>
-<div class="step-controls">
- <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
- <a href="" class="btn btn-primary" ng-click="nextState()">Next</a>
-</div>
-<div class="page-header">
- <h1>{{$state.current.header}}</h1>
+<div class="nav-bar-outer-actions">
+ <div class="outer-actions-inner-wrap">
+ <div class="btn-wrap btn-wrap-triangle-right btn-wrap-next">
+ <button
+ type="button"
+ class="btn btn-prime"
+ ng-click="nextState()"
+ ng-disabled="account.$invalid && account.submitted"
+ >Next</button>
+ </div>
+ <div class="btn-wrap btn-wrap-triangle-left btn-wrap-prev">
+ <button type="button" class="btn" ng-click="previousState()">Back</button>
+ </div>
+ </div>
</div>
-<p>Create a new Admin account to manage you store.</p>
+<h2 class="page-title">{{$state.current.header}}</h2>
+
+<p>
+ Create a new Admin account to manage you store.
+</p>
+
+<form
+ novalidate
+ name="account"
+ role="form"
+ >
-<form novalidate name="account" class="form-horizontal" role="form" style="padding-top: 20px;">
- <div class="form-group" ng-class="{'has-error': account.adminUsername.$invalid && account.submitted}">
- <label class="col-sm-3 control-label">New Username <span class="required">*</span></label>
- <div class="col-sm-4">
- <input tooltip-placement="right"
- tooltip="Must be 1 to 40 characters"
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="text"
- name="adminUsername"
- ng-model="admin.username"
- ng-maxlength="40"
- required />
+ <div
+ class="row form-row"
+ ng-class="{'has-error': account.adminUsername.$invalid && account.submitted}"
+ >
+ <div class="col-m-3">
+ <label class="form-label required" for="adminUsername">
+ New Username
+ </label>
</div>
- <div class="col-sm-offset-3 col-sm-4" ng-show="account.adminUsername.$invalid && account.submitted">
+ <div class="col-m-4">
+ <input
+ id="adminUsername"
+ class="form-el-input"
+ tooltip-placement="right"
+ tooltip="Must be 1 to 40 characters."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ type="text"
+ name="adminUsername"
+ ng-model="admin.username"
+ ng-class="{'invalid': account.adminUsername.$invalid && account.submitted}"
+ ng-maxlength="40"
+ required
+ >
<div class="error-container">
- <span ng-show="account.adminUsername.$error.required">Please enter your new username.</span>
- <span ng-show="account.adminUsername.$error.maxlength">Please enter a username between 1 and 40 characters.</span>
+ <span ng-show="account.adminUsername.$error.required">
+ Please enter your new username.
+ </span>
+ <span ng-show="account.adminUsername.$error.maxlength">
+ Please enter a username between 1 and 40 characters.
+ </span>
</div>
</div>
</div>
- <div class="form-group" ng-class="{'has-error': account.adminEmail.$invalid && account.submitted}">
- <label class="col-sm-3 control-label">New E-Mail <span class="required">*</span></label>
- <div class="col-sm-4">
- <input tooltip-placement="right"
- tooltip="Must be a correct e-mail"
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="email"
- name="adminEmail"
- ng-model="admin.email"
- required />
+
+ <div
+ class="row form-row"
+ ng-class="{'has-error': account.adminEmail.$invalid && account.submitted}"
+ >
+ <div class="col-m-3">
+ <label class="form-label required" for="adminEmail">New E-Mail</label>
</div>
- <div class="col-sm-offset-3 col-sm-4" ng-show="account.adminEmail.$invalid && account.submitted">
+ <div class="col-m-4">
+ <input
+ id="adminEmail"
+ class="form-el-input"
+ tooltip-placement="right"
+ tooltip="Must be a correct e-mail."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ type="email"
+ name="adminEmail"
+ ng-model="admin.email"
+ ng-class="{'invalid': account.adminEmail.$invalid && account.submitted}"
+ required
+ >
<div class="error-container">
- <span ng-show="account.adminEmail.$error.required">Please enter your new e-mail.</span>
- <span ng-show="account.adminEmail.$error.email">Please enter a correct e-mail.</span>
+ <span ng-show="account.adminEmail.$error.required">
+ Please enter your new e-mail.
+ </span>
+ <span ng-show="account.adminEmail.$error.email">
+ Please enter a correct e-mail.
+ </span>
</div>
</div>
</div>
- <div class="form-group" ng-class="{'has-error': account.adminPassword.$invalid && account.submitted}">
- <label class="col-sm-3 control-label">New Password <span class="required">*</span></label>
- <div class="col-sm-4">
- <input ng-change="passwordStatusChange()"
- tooltip-placement="right"
- tooltip-html-unsafe="<?php echo $passwordWizard; ?>"
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="password"
- name="adminPassword"
- ng-model="admin.password"
- required
- check-Password />
+
+ <div
+ class="row form-row"
+ ng-class="{'has-error': account.adminPassword.$invalid && account.submitted}"
+ >
+ <div class="col-m-3">
+ <label class="form-label required" for="adminPassword">
+ New Password
+ </label>
</div>
- <div class="col-sm-offset-3 col-sm-4" ng-show="account.adminPassword.$invalid && account.submitted">
+ <div class="col-m-4">
+ <input
+ id="adminPassword"
+ class="form-el-input"
+ ng-change="passwordStatusChange()"
+ tooltip-placement="right"
+ tooltip-html-unsafe="<?php echo $passwordWizard; ?>"
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ type="password"
+ name="adminPassword"
+ ng-model="admin.password"
+ ng-class="{'invalid': account.adminPassword.$invalid && account.submitted}"
+ required
+ check-Password
+ >
<div class="error-container">
- <span ng-show="account.adminPassword.$error.checkPassword">Please enter at least 7 alpha-numeric characters.</span>
- <span ng-show="account.adminPassword.$error.required">Please enter your new password.</span>
+ <span ng-show="account.adminPassword.$error.checkPassword">
+ Please enter at least 7 alpha-numeric characters.
+ </span>
+ <span ng-show="account.adminPassword.$error.required">
+ Please enter your new password.
+ </span>
</div>
</div>
</div>
- <div class="form-group" ng-class="{'has-error': account.adminConfirm.$invalid && account.submitted}">
- <label class="col-sm-3 control-label">Confirm Password <span class="required">*</span></label>
- <div class="col-sm-4">
- <input tooltip-placement="right"
- tooltip="Please re-enter your password"
- tooltip-trigger="focus"
- tooltip-append-to-body="true"
- class="form-control"
- type="password"
- name="adminConfirm"
- ng-model="admin.confirm"
- confirm-password="admin.password"
- required />
+
+ <div
+ class="row form-row"
+ ng-class="{'has-error': account.adminConfirm.$invalid && account.submitted}"
+ >
+ <div class="col-m-3">
+ <label class="form-label required" for="adminConfirm">
+ Confirm Password
+ </label>
</div>
- <div class="col-sm-offset-3 col-sm-4" ng-show="account.adminConfirm.$invalid && account.submitted">
+ <div class="col-m-4">
+ <input
+ id="adminConfirm"
+ class="form-el-input"
+ tooltip-placement="right"
+ tooltip="Please re-enter your password."
+ tooltip-trigger="focus"
+ tooltip-append-to-body="true"
+ type="password"
+ name="adminConfirm"
+ ng-model="admin.confirm"
+ ng-class="{'invalid': account.adminConfirm.$invalid && account.submitted}"
+ confirm-password="admin.password"
+ required/>
<div class="error-container">
- <span ng-show="account.adminConfirm.$error.required">Please re-enter your password.</span>
- <span ng-show="account.adminConfirm.$error.confirmPassword">Please make sure your passwords match.</span>
+ <span ng-show="account.adminConfirm.$error.required">
+ Please re-enter your password.
+ </span>
+ <span ng-show="account.adminConfirm.$error.confirmPassword">
+ Please make sure your passwords match.
+ </span>
</div>
</div>
</div>
-</form>
-<div class="step-controls">
- <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
- <a href="" class="btn btn-primary" ng-click="nextState()">Next</a>
-</div>
+</form>
diff --git a/setup/view/magento/setup/customize-your-store.phtml b/setup/view/magento/setup/customize-your-store.phtml
index 0c4adf90c69fd7fa4a2327c0a662465a767d3961..1cfc06581b58da23904eedb5492d67a9bd78245f 100644
--- a/setup/view/magento/setup/customize-your-store.phtml
+++ b/setup/view/magento/setup/customize-your-store.phtml
@@ -7,83 +7,121 @@
// @codingStandardsIgnoreFile
?>
-<div class="step-controls">
- <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
- <a href="" class="btn btn-primary" ng-click="checkModuleConstraints()">Next</a>
+<div class="nav-bar-outer-actions">
+ <div class="outer-actions-inner-wrap">
+ <div class="btn-wrap btn-wrap-triangle-right btn-wrap-next">
+ <button type="button" class="btn btn-prime" ng-click="checkModuleConstraints()">Next</button>
+ </div>
+ <div class="btn-wrap btn-wrap-triangle-left btn-wrap-prev">
+ <button type="button" class="btn" ng-click="previousState()">Back</button>
+ </div>
+ </div>
</div>
-<div class="page-header">
- <h1>{{$state.current.header}}</h1>
-</div>
+<h2 class="page-title">{{$state.current.header}}</h2>
-<form novalidate name="customizeStore" class="form-horizontal" role="form">
-<form class="form-horizontal" role="form">
- <div class="form-group">
- <label class="col-md-3 control-label">Sample Data</label>
- <div class="col-md-6">
- <p class="form-control-static text-muted">
- Select “Use Sample Data" to create a sample store with sample products, customers, and payment settings. Our <a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/install/sample-data.html">Guide to Using Sample Data</a> can help you get started.</p>
- </div>
- </div>
+<form role="form">
- <div class="form-group">
- <div class="checkbox col-md-4 col-md-offset-3">
- <label>
- <input type="checkbox" ng-model="store.useSampleData" <?php echo $this->isSampledataEnabled ? '' : 'disabled' ?>> <span class="text-muted">Use Sample Data</span>
+ <div class="row form-row">
+ <div class="col-m-3">
+ <label class="form-label">Sample Data</label>
+ </div>
+ <div class="col-m-6">
+ <p>
+ Select “Use Sample Data" to create a sample store with sample products, customers, and payment settings. Our <a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/install/sample-data.html">Guide to Using Sample Data</a> can help you get started.
+ </p>
+ <input
+ id="useSampleData"
+ class="form-el-checkbox"
+ type="checkbox"
+ ng-model="store.useSampleData"
+ <?php echo $this->isSampledataEnabled ? '' : 'disabled' ?>
+ >
+ <label class="form-label" for="useSampleData">
+ Use Sample Data
</label>
</div>
</div>
- <div class="form-group">
- <label class="col-md-3 control-label">Store Default Time Zone <span class="required">*</span></label>
- <div class="col-md-6">
- <select class="form-control"
+ <div class="row form-row">
+ <div class="col-m-3">
+ <label class="form-label required" for="storeTimezone">Store Default Time Zone</label>
+ </div>
+ <div class="col-m-4">
+ <label class="form-select-label" for="storeTimezone">
+ <select
+ id="storeTimezone"
+ class="form-el-select"
ng-model="store.timezone"
tooltip-placement="right"
tooltip-html-unsafe="The time zone in which your online store operates. You can change this later in Magento Admin."
tooltip-trigger="focus"
tooltip-append-to-body="true">
- <?php foreach ($this->timezone as $value => $label): ?>
- <?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
- <?php endforeach; ?>
- </select>
+ <?php foreach ( $this->timezone as $value => $label ): ?>
+ <?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
+ <?php endforeach; ?>
+ </select>
+ </label>
</div>
</div>
- <div class="form-group">
- <label class="col-md-3 control-label">Store Default Currency <span class="required">*</span></label>
- <div class="col-md-5">
- <select class="form-control"
+ <div class="row form-row">
+ <div class="col-m-3">
+ <label class="form-label required" for="storeCurrency">
+ Store Default Currency
+ </label>
+ </div>
+ <div class="col-m-4">
+ <label class="form-select-label" for="storeCurrency">
+ <select
+ id="storeCurrency"
+ class="form-el-select"
ng-model="store.currency"
tooltip-placement="right"
tooltip-html-unsafe="The currency your store uses for price labeling, checkout, returns, credit and gift cards. You can change this later in Magento Admin."
tooltip-trigger="focus"
tooltip-append-to-body="true">
- <?php foreach ($this->currency as $value => $label): ?>
- <?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
- <?php endforeach; ?>
- </select>
+ <?php foreach ( $this->currency as $value => $label ): ?>
+ <?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
+ <?php endforeach; ?>
+ </select>
+ </label>
+ </label>
</div>
</div>
- <div class="form-group">
- <label class="col-md-3 control-label">Store Default Language <span class="required">*</span></label>
- <div class="col-md-4">
- <select class="form-control"
+
+ <div class="row form-row">
+ <div class="col-m-3">
+ <label class="form-label required" for="storeLanguage">
+ Store Default Language
+ </label>
+ </div>
+ <div class="col-m-4">
+ <label class="form-select-label" for="storeLanguage">
+ <select
+ id="storeLanguage"
+ class="form-el-select"
ng-model="store.language"
tooltip-placement="right"
tooltip-html-unsafe="The language customers will see in your store. You can change this later in Magento Set Up Tool."
tooltip-trigger="focus"
tooltip-append-to-body="true">
- <?php foreach ($this->language as $value => $label): ?>
- <?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
- <?php endforeach; ?>
- </select>
+ <?php foreach ( $this->language as $value => $label ): ?>
+ <?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
+ <?php endforeach; ?>
+ </select>
+ </label>
</div>
</div>
- <div class="collapsed-options">
- <a href="#" class="collapsed-options" ng-click="updateOnExpand(store.advanced)">Advanced Modules Configurations</a>
- <span class="caret"></span>
- </div>
+
+ <legend
+ class="form-legend-expand"
+ ng-click="updateOnExpand(store.advanced)"
+ ng-class="{'expanded' : store.advanced.expanded}"
+ >
+ Advanced Modules Configurations
+ </legend>
+
<div ng-show="store.advanced.expanded" class="form-group">
<div ng-show="store.errorMessage !== '' && store.errorMessage !== false " class="col-sm-10 error-container">
<input type="checkbox" ng-model="store.force" ng-click="toggleForce()"> Skip dependency check for individual modules
@@ -108,8 +146,4 @@
{{store.selectedModules.length}} out of {{store.allModules.length}} selected.
</div>
</div>
-</form>
-<div class="step-controls">
- <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
- <a href="" class="btn btn-primary" ng-click="checkModuleConstraints()">Next</a>
-</div>
+</form>
\ No newline at end of file
diff --git a/setup/view/magento/setup/index.phtml b/setup/view/magento/setup/index.phtml
index 38e2750639edf99d17d0913441900e9b551f16ef..fc5066bebd7497b9c82c84d4343a947d632102d3 100644
--- a/setup/view/magento/setup/index.phtml
+++ b/setup/view/magento/setup/index.phtml
@@ -4,12 +4,13 @@
* See COPYING.txt for license details.
*/
?>
-<div class="row">
- <div ng-include="'index.php/navigation/menu'"></div>
-
- <div class="container {{class}}" ng-controller="mainController" id="main">
- <div ui-view="root">
- <div ui-view></div>
- </div>
+<div ng-include="'index.php/navigation/menu'"></div>
+<div
+ id="main"
+ class="main {{class}}"
+ ng-controller="mainController"
+ >
+ <div ui-view="root">
+ <div ui-view></div>
</div>
</div>
diff --git a/setup/view/magento/setup/install.phtml b/setup/view/magento/setup/install.phtml
index 7b0f933f0d2c35416476ebb71a4b909439fe9808..62ba627e9c2a578511a84229dcb6818fbcba1350 100644
--- a/setup/view/magento/setup/install.phtml
+++ b/setup/view/magento/setup/install.phtml
@@ -7,36 +7,71 @@
// @codingStandardsIgnoreFile
?>
-<div class="step-controls">
- <a href="" class="btn btn-primary" ng-disabled="isDisabled" ng-click="previousState()">Previous</a>
- <a href="" class="btn btn-primary" ng-disabled="isDisabled" ng-click="start()" ng-show="isStarted">Try Again</a>
+<div class="nav-bar-outer-actions">
+ <div class="outer-actions-inner-wrap">
+ <div class="btn-wrap btn-wrap-triangle-right btn-wrap-next">
+ <button
+ type="button"
+ class="btn btn-prime"
+ disabled
+ >Next</button>
+ </div>
+ <div class="btn-wrap btn-wrap-triangle-left btn-wrap-prev">
+ <button
+ type="button"
+ class="btn"
+ ng-disabled="isDisabled"
+ ng-click="previousState()"
+ >Back</button>
+ </div>
+ <div class="btn-wrap btn-wrap-try-again" ng-show="isStarted">
+ <button
+ type="button"
+ class="btn btn-secondary"
+ ng-disabled="isDisabled"
+ ng-click="start()"
+ >Try Again</button>
+ </div>
+ </div>
</div>
-<div class="page-header">
- <h1>{{$state.current.header}}</h1>
-</div>
+<h2 class="page-title">{{$state.current.header}}</h2>
-<div ng-show="!isStarted" class="text-center" style="padding-top: 50px; padding-bottom: 50px;">
+<div ng-show="!isStarted" class="accent-box">
<p>You're ready!</p>
- <button ng-click="start()" class="btn btn-primary">Install Now</button>
+ <button ng-click="start()" class="btn btn-large btn-prime">Install Now</button>
</div>
-<div ng-show="isStarted">
- <div class="progress"><div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{progress}}" aria-valuemin="0" aria-valuemax="100" ng-style="barStyle(progress)">{{progressText}}</div></div>
- <div ng-show="isFailed" class="error-container">
- <span class="glyphicon glyphicon-remove-sign "></span>
- <span>Installation is incomplete. Check the console log for errors before trying again.</span>
+<div ng-show="isStarted" class="content-install">
+ <p class="text-right">Installing... {{progressText}}</p>
+ <div class="progress">
+ <div
+ class="progress-bar"
+ role="progressbar"
+ aria-valuenow="{{progress}}"
+ aria-valuemin="0"
+ aria-valuemax="100"
+ ng-style="barStyle(progress)"
+ >
+ </div>
</div>
- <div class="collapsed-options">
- <a href="" class="collapsed-options" ng-click="toggleConsole()">Console Log</a>
- <span class="caret"></span>
+ <div ng-show="isFailed" class="alert alert-info">
+ <span class="alert-icon icon-failed-round"></span>
+ <p class="alert-text">
+ <strong>Installation is incomplete.</strong>
+ <br>
+ Check the console log for errors before trying again.
+ </p>
</div>
+ <button
+ type="button"
+ class="btn btn-expand"
+ ng-click="toggleConsole()"
+ ng-class="{'expanded': isConsole}"
+ >
+ Console Log
+ </button>
<div ng-show="isConsole" id="console">
- <div class="highlight" style="background-color: #000000;"><pre ng-bind-html="log"></pre></div>
+ <div class="console" ng-bind-html="log"></div>
</div>
</div>
-
-<div class="step-controls">
- <a href="" class="btn btn-primary" ng-disabled="isDisabled" ng-click="previousState()">Previous</a>
- <a href="" class="btn btn-primary" ng-disabled="isDisabled" ng-click="start()" ng-show="isStarted">Try Again</a>
-</div>
diff --git a/setup/view/magento/setup/landing.phtml b/setup/view/magento/setup/landing.phtml
index e8352900bf20f48cdc2aa4d5e5df7599bd70eae4..1c02d8970ddd0c38da458522f0d891b0fa87f864 100644
--- a/setup/view/magento/setup/landing.phtml
+++ b/setup/view/magento/setup/landing.phtml
@@ -7,34 +7,32 @@
// @codingStandardsIgnoreFile
?>
-<div class="text-center">
- <h1>Magento</h1>
- <br/>
- <p><?php echo 'Version' . ' ' . $this->version; ?></p>
- <br/>
- <br/>
- <br/>
- <p>Welcome to Magento Admin, your online store headquarters.
- Click 'Agree and Set Up Magento' or read <a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html">Getting Started</a> to learn more.</p>
- <br/>
-<?php
-/* not implemented yet
- <br/>
- <br/>
- <label><?php echo $this->translate('Choose a language:'); ?></label>
- <select ng-change="selectLanguage()" style="width: 250px; margin: 0 auto;" class="form-control" ng-model="modelLanguage" ng-init="modelLanguage='<?php echo $this->location ?>'">
- <?php foreach ($this->languages as $code => $title): ?>
- <option value="<?php echo $code; ?>"><?php echo $title; ?></option>
- <?php endforeach; ?>
- </select>
- <br/>
- <br/>
-*/
-?>
- <br/>
- <div>
+<section class="page-landing">
+ <img class="logo" src="<?php echo $this->basePath() ?>/pub/images/magento-logo.svg" alt="Magento"/>
+ <p class="text-version">
+ <?php echo 'Version' . ' ' . $this->version; ?>
+ </p>
+ <p class="text-welcome">
+ Welcome to Magento Admin, your online store headquarters.
+ <br>
+ Click 'Agree and Set Up Magento' or read <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html" target="_blank">Getting Started</a> to learn more.
+ </p>
+ <?php
+ /* not implemented yet
+ <label><?php echo $this->translate('Choose a language:'); ?></label>
+ <select ng-change="selectLanguage()" class="form-control" ng-model="modelLanguage" ng-init="modelLanguage='<?php echo $this->location ?>'">
+ <?php foreach ($this->languages as $code => $title): ?>
+ <option value="<?php echo $code; ?>"><?php echo $title; ?></option>
+ <?php endforeach; ?>
+ </select>
+ */
+ ?>
+ <p class="text-terms">
<a href="" ng-click="previousState()">Terms & Agreement</a>
- </div>
- <br/>
- <button type="button" class="btn-lg btn-primary" ng-click="nextState()">Agree and Set Up Magento</button>
-</div>
+ </p>
+ <button
+ type="button"
+ class="btn btn-large btn-prime btn-submit"
+ ng-click="nextState()"
+ >Agree and Setup Magento</button>
+</section>
diff --git a/setup/view/magento/setup/license.phtml b/setup/view/magento/setup/license.phtml
index 38c7c43e78d8680867f857682cd7d228e71667c3..9e6fb6317e92b93f539e072fbcc6fd22bc37b517 100644
--- a/setup/view/magento/setup/license.phtml
+++ b/setup/view/magento/setup/license.phtml
@@ -4,12 +4,19 @@
* See COPYING.txt for license details.
*/
?>
-<div class="col-xs-9">
- <br/>
- <a href="#" class="btn btn-primary" ng-click="nextState()"> Go Back</a>
- <br/><br/>
- <?php echo nl2br(htmlspecialchars($this->license, ENT_COMPAT, 'UTF-8')); ?>
- <br/><br/><br/>
- <a href="#" class="btn btn-primary" ng-click="nextState()"> Go Back</a>
- <br/><br/>
+<div class="row page-license">
+ <div class="col-m-offset-2 col-m-8 col-xs-12">
+ <div class="license-text">
+ <?php echo nl2br( htmlspecialchars( $this->license, ENT_COMPAT, 'UTF-8' ) ); ?>
+ </div>
+ <div class="page-license-footer">
+ <div class="btn-wrap-triangle-left">
+ <button
+ type="button"
+ class="btn"
+ ng-click="nextState()"
+ >Go Back</button>
+ </div>
+ </div>
+ </div>
</div>
diff --git a/setup/view/magento/setup/navigation/menu.phtml b/setup/view/magento/setup/navigation/menu.phtml
index 1acdd3576b29e7f4b721dac82ed10c3af3bd2015..62c816c07633ea4ee57bd9deb5763ce7ba6fb727 100644
--- a/setup/view/magento/setup/navigation/menu.phtml
+++ b/setup/view/magento/setup/navigation/menu.phtml
@@ -7,19 +7,39 @@
// @codingStandardsIgnoreFile
?>
-<?php $expressions = []; foreach ($this->main as $item): ?>
+<?php $expressions = []; foreach ( $this->main as $item ): ?>
<?php $expressions[] = '!$state.is(\'' . $item['id'] . '\')'; ?>
<?php endforeach; ?>
-<div ng-class="{show: <?php echo implode('&&', $expressions); ?>}" class="col-lg-3 hide" id="menu" style="margin-top: 40px;">
- <nav ng-controller="navigationController">
- <div>
- <ul class="nav nav-pills nav-stacked">
- <?php foreach ($this->menu as $item): ?>
- <li id="<?php echo $item['id']; ?>" ng-class="{ active: $state.includes('<?php echo $item['id'] ?>') }">
- <a ng-class="{disabled: itemStatus(<?php echo $item['order']; ?>)}" ui-sref="<?php echo $item['id']; ?>" href="#/<?php echo $item['url']; ?>"><?php echo $item['title']; ?></a>
- </li>
- <?php endforeach; ?>
- </ul>
- </div>
- </nav>
-</div>
+
+<header
+ class="header ng-cloak"
+ ng-class="{'show' : <?php echo implode( '&&', $expressions ); ?>}"
+ >
+ <img class="logo" src="<?php echo $this->basePath() ?>/pub/images/magento-icon.svg" alt="Magento"/>
+ <h1 class="header-title">Magento Installation</h1>
+</header>
+
+<nav
+ ng-controller="navigationController"
+ ng-class="{'show' : <?php echo implode( '&&', $expressions ); ?>}"
+ id="menu"
+ class="nav ng-cloak"
+ >
+
+ <ul class="nav-bar">
+ <?php foreach ($this->menu as $item): ?>
+ <li ng-class="{ active: $state.includes('<?php echo $item['id'] ?>'), disabled: itemStatus(<?php echo $item['order']; ?>)}"
+ id="<?php echo $item['id']; ?>"
+ >
+ <a
+ ng-class=""
+ ui-sref="<?php echo $item['id']; ?>"
+ href="#/<?php echo $item['url']; ?>"
+ >
+ <?php echo nl2br( $item['title'] ); ?>
+ </a>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+
+</nav>
diff --git a/setup/view/magento/setup/readiness-check.phtml b/setup/view/magento/setup/readiness-check.phtml
index f996820290c960a39dbc9354ec6ad7b974acd90f..2b30be21af0deab4faaf59e2c58e179bda1af969 100644
--- a/setup/view/magento/setup/readiness-check.phtml
+++ b/setup/view/magento/setup/readiness-check.phtml
@@ -4,25 +4,43 @@
* See COPYING.txt for license details.
*/
?>
-<div class="step-controls" ng-show="$state.is('root.readiness-check.progress')">
- <a href="" class="btn btn-primary" ng-click="$state.forceReload()" ng-disabled="checkingInProgress()">Try Again</a>
- <a href="" class="btn btn-primary" ng-click="nextState()" ng-disabled="checkingInProgress() || hasErrors">Next</a>
+<div class="nav-bar-outer-actions">
+ <div class="outer-actions-inner-wrap">
+ <div class="btn-wrap btn-wrap-triangle-right btn-wrap-next">
+ <button
+ type="button"
+ class="btn btn-prime"
+ ng-click="nextState()"
+ ng-disabled="checkingInProgress() || hasErrors"
+ >Next</button>
+ </div>
+ <div class="btn-wrap btn-wrap-triangle-left btn-wrap-prev">
+ <button
+ type="button"
+ class="btn"
+ disabled
+ >Back</button>
+ </div>
+ <div class="btn-wrap btn-wrap-try-again" ng-show="$state.is('root.readiness-check.progress')">
+ <button
+ type="button"
+ class="btn btn-secondary"
+ ng-click="$state.forceReload()"
+ ng-disabled="checkingInProgress()"
+ >Try Again</button>
+ </div>
+ </div>
</div>
-<div class="page-header">
- <h1>{{$state.current.header}}</h1>
-</div>
+<h2 class="page-title">{{$state.current.header}}</h2>
-<div ng-show="$state.is('root.readiness-check')" class="readiness-check-landing">
+<div ng-show="$state.is('root.readiness-check')" class="accent-box">
<p>Let's check your environment for the correct PHP version, PHP extensions, file permissions and compatibility.</p>
- <div>
- <a href="" ng-click="$state.go('.progress')" class="btn btn-primary">Start Readiness Check</a>
- </div>
+ <button
+ class="btn btn-large btn-prime"
+ ng-click="$state.go('.progress')"
+ type="button"
+ >Start Readiness Check</button>
</div>
<div ui-view></div>
-
-<div class="step-controls" ng-show="$state.is('root.readiness-check.progress')">
- <a href="" class="btn btn-primary" ng-click="$state.forceReload()" ng-disabled="checkingInProgress()">Try Again</a>
- <a href="" class="btn btn-primary" ng-click="nextState()" ng-disabled="checkingInProgress() || hasErrors">Next</a>
-</div>
diff --git a/setup/view/magento/setup/readiness-check/progress.phtml b/setup/view/magento/setup/readiness-check/progress.phtml
index 76b54843eeaaf091f2b1cb3c5d8bc73dd6d09de9..92578438d2679326c642645e45c69543e8b53a62 100644
--- a/setup/view/magento/setup/readiness-check/progress.phtml
+++ b/setup/view/magento/setup/readiness-check/progress.phtml
@@ -7,181 +7,248 @@
// @codingStandardsIgnoreFile
?>
-<div class="rediness-check-items">
- <div class="bg-info" ng-switch="isCompleted()">
- <div ng-switch-when="true" ng-switch="hasErrors">
- <span ng-switch-when="true">Completed! You need to resolve these issues to continue.</span>
- <span ng-switch-default>Completed!</span>
+<div ng-switch="isCompleted()">
+
+ <div ng-switch-when="true" ng-switch="hasErrors">
+
+ <div class="alert alert-info" ng-switch-when="true">
+ <span class="alert-icon icon-failed-round"></span>
+ <p class="alert-text">
+ <strong>Completed!</strong> You need to resolve these issues to continue.
+ </p>
</div>
- <div ng-switch-default>
- <img src="pub/images/ajax-loader.gif" />
- <span>We're making sure your server environment is ready for Magento to be installed.</span>
+
+ <div class="alert alert-info" ng-switch-default>
+ <span class="alert-icon icon-success-round"></span>
+ <p class="alert-text">
+ <strong>Completed!</strong> You can now move on to the next step.
+ </p>
</div>
+
</div>
- <div id="php-version" ng-show="version.visible">
- <div ng-hide="version.processed">
- <span>Checking PHP Version...</span>
- </div>
- <div ng-show="version.processed" ng-switch="version.responseType">
- <div ng-switch-when="success" ng-init="updateOnSuccess(version)">
- <span class="glyphicon glyphicon-ok-sign text-success"></span>
- <span>PHP Version Check</span>
- <div class="rediness-check-info">
+ <div class="alert alert-info" ng-switch-default>
+ <span class="spinner">
+ <span></span><span></span><span></span><span></span>
+ <span></span><span></span><span></span><span></span>
+ </span>
+ <p class="alert-text">We're making sure your server environment is ready for Magento to be installed.</p>
+ </div>
+
+</div>
+
+<div id="php-version" class="rediness-check-item" ng-show="version.visible">
+
+ <h3 class="readiness-check-title" ng-hide="version.processed">
+ Checking PHP Version...
+ </h3>
+
+ <div ng-show="version.processed" ng-switch="version.responseType">
+
+ <div ng-switch-when="success" ng-init="updateOnSuccess(version)">
+
+ <span class="readiness-check-icon icon-success-round"></span>
+
+ <div class="readiness-check-content">
+ <h3 class="readiness-check-title">PHP Version Check</h3>
+ <p>
Your PHP version is correct ({{version.data.current}}).
- </div>
+ </p>
</div>
- <div ng-switch-default ng-init="updateOnError(version)">
- <div ng-switch="version.data.error">
- <div ng-switch-when="phpVersionError" class="animate-show text-danger">
- <span class="glyphicon glyphicon-remove-sign"></span> {{version.data.message}} <br/> <br/>
- </div>
-
- <div ng-switch-default ng-init="updateOnError(version)">
- <div class="rediness-check-panel-right">
- <p>Need Help?</p>
- <p><a href="http://www.php.net/docs.php" target="_blank">PHP Documentation</a></p>
- </div>
- <span class="glyphicon glyphicon-remove text-danger"></span>
- <span>PHP Version Check</span>
- <div class="rediness-check-info">
- <p>
- Your PHP version is {{version.data.current}}. The required PHP version is {{version.data.required}}.
- <a href="#php-version" ng-click="updateOnExpand(version)">
- <span ng-hide="version.expanded">More detail</span>
- <span ng-show="version.expanded">Less detail</span>
- </a>
- </p>
- <div class="rediness-check-block" ng-show="version.expanded">
- <p>Download and install PHP version {{version.data.required}} from <a href="http://www.php.net" target="_blank">www.php.net</a> using this <a href="http://www.php.net/docs.php" target="_blank">PHP Documentation</a>.</p>
- <p>If you need more help please call your hosting provider.</p>
- </div>
- </div>
- </div>
- </div>
+
+ </div>
+
+ <div class="readiness-check-item" ng-switch-default ng-init="updateOnError(version)">
+
+ <div class="rediness-check-side">
+ <p class="side-title">Need Help?</p>
+ <a href="http://www.php.net/docs.php" target="_blank">PHP Documentation</a>
</div>
+
+ <span class="readiness-check-icon icon-failed-round"></span>
+
+ <div class="readiness-check-content">
+ <h3 class="readiness-check-title">PHP Version Check</h3>
+ <p>
+ Your PHP version is {{version.data.current}}. The required PHP version is {{version.data.required}}.
+ <a href="#php-version" ng-click="updateOnExpand(version)">
+ <span ng-hide="version.expanded">Show detail</span>
+ <span ng-show="version.expanded">Hide detail</span>
+ </a>
+ </p>
+ <p ng-show="version.expanded">
+ Donwload and install PHP version {{version.data.required}} from <a href="http://www.php.net" target="_blank">www.php.net</a> using this <a href="http://www.php.net/docs.php" target="_blank">PHP Documentation</a>.
+ </p>
+ <p ng-show="version.expanded">If you need more help please call your hosting provider.</p>
+ </div>
+
</div>
+
</div>
- <div id="php-extensions" ng-show="extensions.visible">
- <div ng-hide="extensions.processed">
- <span>Checking PHP Extensions...</span>
+</div>
+
+<div id="php-extensions" class="rediness-check-item" ng-show="extensions.visible">
+
+ <h3 ng-hide="extensions.processed" class="readiness-check-title">
+ Checking PHP Extensions...
+ </h3>
+
+ <div ng-show="extensions.processed" ng-switch="extensions.responseType">
+
+ <div ng-switch-when="success" ng-init="updateOnSuccess(extensions)">
+
+ <span class="readiness-check-icon icon-success-round"></span>
+
+ <div class="readiness-check-content">
+ <h3 class="readiness-check-title">PHP Extensions Check</h3>
+ <p>
+ You meet {{extensions.data.required.length}} out of {{extensions.data.required.length}} PHP extensions requirements.
+ <a href="#php-extensions" ng-click="updateOnExpand(extensions)">
+ <span ng-hide="extensions.expanded">Show detail</span>
+ <span ng-show="extensions.expanded">Hide detail</span>
+ </a>
+ </p>
+ <ul class="list" ng-show="extensions.expanded">
+ <li class="list-item-success"
+ ng-repeat="name in extensions.data.required"
+ >PHP Extension {{name}}.</li>
+ </ul>
+ </div>
+
</div>
- <div ng-show="extensions.processed" ng-switch="extensions.responseType">
- <div ng-switch-when="success" ng-init="updateOnSuccess(extensions)">
- <span class="glyphicon glyphicon-ok-sign text-success"></span>
- <span>PHP Extensions Check</span>
- <div class="rediness-check-info">
- <p>
- You meet {{extensions.data.required.length}} out of {{extensions.data.required.length}} PHP extensions requirements.
- <a href="#php-extensions" ng-click="updateOnExpand(extensions)">
- <span ng-hide="extensions.expanded">More detail</span>
- <span ng-show="extensions.expanded">Less detail</span>
- </a>
+
+ <div ng-switch-default ng-init="updateOnError(extensions)">
+
+ <div ng-switch="extensions.data.error">
+
+ <div ng-switch-when="phpExtensionError" class="alert alert-warning">
+ <span class="alert-icon icon-failed-round"></span>
+ <p class="alert-text">
+ {{extensions.data.message}}
</p>
- <div class="rediness-check-block" ng-show="extensions.expanded">
- <ul class="list-unstyled">
- <li ng-repeat="name in extensions.data.required">
- <span class="glyphicon glyphicon-ok text-success"></span>
- <span>PHP Extension {{name}}.</span>
- </li>
- </ul>
- </div>
</div>
- </div>
- <div ng-switch-default ng-init="updateOnError(extensions)">
- <div ng-switch="extensions.data.error">
- <div ng-switch-when="phpExtensionError" class="animate-show text-danger">
- <span class="glyphicon glyphicon-remove-sign"></span> {{extensions.data.message}}<br/>
- <br/>
- </div>
- <div ng-switch-default>
- <div class="rediness-check-panel-right">
- <p>Need Help?</p>
- <p><a href="#" target="_blank">PHP Extension Help</a></p>
+
+ <div class="rediness-check-side">
+ <p class="side-title">Need Help?</p>
+ <a href="#" target="_blank">PHP Extension Help</a> <?php // ToDo UI: missing url ?>
</div>
- <span class="glyphicon glyphicon-remove text-danger"></span>
- <span>PHP Extensions Check</span>
- <div class="rediness-check-info">
+
+ <span class="readiness-check-icon icon-failed-round"></span>
+
+ <div class="readiness-check-content">
+ <h3 class="readiness-check-title">PHP Extensions Check</h3>
<p>
{{extensions.data.missing.length}} missing PHP extensions.
<a href="#php-extensions" ng-click="updateOnExpand(extensions)">
- <span ng-hide="extensions.expanded">More detail</span>
- <span ng-show="extensions.expanded">Less detail</span>
+ <span ng-hide="extensions.expanded">Show detail</span>
+ <span ng-show="extensions.expanded">Hide detail</span>
</a>
</p>
- <p>The best way to resolve this is to install the correct missing extensions. The exact fix depends on your server, your host, and other system variables.</br>Our <a href="#">PHP Extension Help</a> can get you started.</p>
- <p>If you need more help, please call your hosting provider.</p>
- <div class="rediness-check-block" ng-show="extensions.expanded">
- <ul class="list-unstyled">
- <li ng-repeat="name in extensions.data.required" ng-switch="extensions.data.missing.indexOf(name) >= 0">
- <span ng-switch-when="true" class="glyphicon glyphicon-remove text-danger"></span>
- <span ng-switch-default class="glyphicon glyphicon-ok text-success"></span>
- <span>PHP Extension {{name}}.</span>
- </li>
- </ul>
- </div>
- </div>
+ <p>
+ The best way to resolve this is to install the correct missing extensions. The exact fix depends on our server, your host, and other system variables.
+ <br>
+ Our
+ <a href="#">PHP Extension Help</a> <?php // ToDo UI: missing url ?>
+ can get you started.
+ </p>
+ <p>
+ If you need more help, please call your hosting provider.
+ </p>
+ <ul class="list" ng-show="extensions.expanded">
+ <li
+ class="list-item-icon"
+ ng-repeat="name in extensions.data.required"
+ ng-switch="extensions.data.missing.indexOf(name) >= 0"
+ >
+ <span ng-switch-when="true" class="icon-failed"></span>
+ <span ng-switch-default class="icon-success"></span>
+ PHP Extension {{name}}.
+ </li>
+ </ul>
</div>
+
</div>
+
</div>
+
</div>
- </div>
- <div id="php-permissions" ng-show="permissions.visible">
- <div ng-hide="permissions.processed">
- <span>Checking File Permissions...</span>
+</div>
+
+<div class="rediness-check-item" id="php-permissions" ng-show="permissions.visible">
+
+ <h3 class="readiness-check-title" ng-hide="permissions.processed">
+ Checking File Permissions...
+ </h3>
+
+ <div ng-show="permissions.processed" ng-switch="permissions.responseType">
+
+ <div ng-switch-when="success" ng-init="updateOnSuccess(permissions)">
+
+ <span class="readiness-check-icon icon-success-round"></span>
+
+ <div class="readiness-check-content">
+ <h3 class="readiness-check-title">File Permission Check</h3>
+ <p>
+ You meet {{permissions.data.current.length}} out of {{permissions.data.required.length}} writable file permission requirements.
+ <a href="#php-permissions" ng-click="updateOnExpand(permissions)">
+ <span ng-hide="permissions.expanded">Show detail</span>
+ <span ng-show="permissions.expanded">Hide detail</span>
+ </a>
+ </p>
+ <ul class="list" ng-show="permissions.expanded">
+ <li class="list-item-success" ng-repeat="name in permissions.data.required">
+ "{{name}}" writable directory permission.
+ </li>
+ </ul>
+ </div>
+
</div>
- <div ng-show="permissions.processed" ng-switch="permissions.responseType">
- <div ng-switch-when="success" ng-init="updateOnSuccess(permissions)">
- <span class="glyphicon glyphicon-ok-sign text-success"></span>
- <span>File Permission Check</span>
- <div class="rediness-check-info">
- <p>
- You meet {{permissions.data.current.length}} out of {{permissions.data.required.length}} writable file permission requirements.
- <a href="#php-permissions" ng-click="updateOnExpand(permissions)">
- <span ng-hide="permissions.expanded">More detail</span>
- <span ng-show="permissions.expanded">Less detail</span>
- </a>
- </p>
- <div class="rediness-check-block" ng-show="permissions.expanded">
- <ul class="list-unstyled">
- <li ng-repeat="name in permissions.data.required">
- <span class="glyphicon glyphicon-ok text-success"></span>
- <span>"{{name}}" writable directory permission.</span>
- </li>
- </ul>
- </div>
- </div>
+
+ <div ng-switch-default ng-init="updateOnError(permissions)">
+
+ <div class="rediness-check-side">
+ <p class="side-title">Need Help?</p>
+ <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-access" target="_blank">File Permission Help</a>
</div>
- <div ng-switch-default ng-init="updateOnError(permissions)">
- <div class="rediness-check-panel-right">
- <p>Need Help?</p>
- <p><a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-access" target="_blank">File Permission Help</a></p>
- </div>
- <span class="glyphicon glyphicon-remove text-danger"></span>
- <span>File Permission Check</span>
- <div class="rediness-check-info">
- <p>
- {{permissions.data.required.length - permissions.data.current.length}} file permission not met.
- <a href="#php-permissions" ng-click="updateOnExpand(permissions)">
- <span ng-hide="permissions.expanded">More detail</span>
- <span ng-show="permissions.expanded">Less detail</span>
- </a>
- </p>
- <p>The best way to resolve this is to allow write permissions for the following Magento directories. The exact fix depends on your server, your host, and other system variables.</br>Our <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-access" target="_blank">File Permission Help</a> can get you started.</p>
- <p>If you need more help, please call your hosting provider.</p>
- <div class="rediness-check-block" ng-show="permissions.expanded">
- <ul class="list-unstyled">
- <li ng-repeat="name in permissions.data.required" ng-switch="hasItem(permissions.data.current, name)">
- <span ng-switch-when="true" class="glyphicon glyphicon-ok text-success"></span>
- <span ng-switch-default class="glyphicon glyphicon-remove text-danger"></span>
- <span>"{{name}}" writable directory permission.</span>
- </li>
- </ul>
- </div>
- </div>
+
+ <span class="readiness-check-icon icon-failed-round"></span>
+
+ <div class="readiness-check-content">
+
+ <h3 class="readiness-check-title">File Permission Check</h3>
+ <p>
+ {{permissions.data.required.length - permissions.data.current.length}} file permission not met.
+ <a href="#php-permissions" ng-click="updateOnExpand(permissions)">
+ <span ng-hide="permissions.expanded">Show detail</span>
+ <span ng-show="permissions.expanded">Hide detail</span>
+ </a>
+ </p>
+ <p>
+ The best way to resolve this is to allow write permissions for the following Magento directories. The exact fix depends on your server, your host, and other system variables.
+ <br>
+ Our <a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-access" target="_blank">File Permission Help</a> can get you started.
+ </p>
+ <p>
+ If you need more help, please call your hosting provider.
+ </p>
+
+ <ul class="list" ng-show="permissions.expanded">
+ <li
+ class="list-item-icon"
+ ng-repeat="name in permissions.data.required"
+ ng-switch="hasItem(permissions.data.current, name)">
+ <span ng-switch-when="true" class="icon-success"></span>
+ <span ng-switch-default class="icon-failed"></span>
+ <span>"{{name}}" writable directory permission.</span>
+ </li>
+ </ul>
+
</div>
+
</div>
+
</div>
+
</div>
diff --git a/setup/view/magento/setup/success.phtml b/setup/view/magento/setup/success.phtml
index 1b18613917e6f7fb456c907b7765a7a1401aa5c1..dd8e0b316094c5ff1f6a784ced86eddd098b8c04 100644
--- a/setup/view/magento/setup/success.phtml
+++ b/setup/view/magento/setup/success.phtml
@@ -7,51 +7,66 @@
// @codingStandardsIgnoreFile
?>
-<h1 class="text-center"><span class="glyphicon glyphicon-ok-sign text-success"></span> Success</h1>
-<p>Please keep this information for your records:</p>
-<div id="admin-info" class="col-lg-12 p-top-10">
- <div class="col-sm-12 bold p-top-10">Magento Admin Info:</div>
- <div class="row p-top-10">
- <div class="col-sm-6">Username:</div>
- <div class="col-sm-6">{{admin.username}}</div>
- </div>
- <div class="row p-top-10">
- <div class="col-sm-6">E-Mail:</div>
- <div class="col-sm-6">{{admin.email}}</div>
- </div>
- <div class="row p-top-10">
- <div class="col-sm-6">Password:</div>
- <div class="col-sm-6">******</div>
- </div>
- <div class="row p-top-10" ng-show="config.address.actual_base_url">
- <div class="col-sm-6">Your Store Address:</div>
- <div class="col-sm-6"><a href="{{config.address.actual_base_url}}">{{config.address.actual_base_url}}</a></div>
- </div>
- <div class="row p-top-10" ng-show="config.address.actual_base_url">
- <div class="col-sm-6">Magento Admin Address:</div>
- <div class="col-sm-6"><a href="{{config.address.actual_base_url}}{{config.address.admin}}/">{{config.address.actual_base_url}}{{config.address.admin}}/</a></div>
- </div>
- <div class="row p-top-10">
- <div class="col-sm-6">Encryption Key:</div>
- <div class="col-sm-6">{{config.encrypt.key}}</div>
- </div>
-</div>
-<div id="db-info" class="col-lg-12 p-top-10">
- <div class="col-sm-12 bold p-top-10">Database Info:</div>
- <div class="row p-top-10">
- <div class="col-sm-6">Database Name:</div>
- <div class="col-sm-6">{{db.name}}</div>
- </div>
- <div class="row p-top-10">
- <div class="col-sm-6">Username:</div>
- <div class="col-sm-6">{{db.user}}</div>
- </div>
- <div class="row p-top-10">
- <div class="col-sm-6">Password:</div>
- <div class="col-sm-6">******</div>
+<div class="content-success">
+
+ <h1 class="jumbo-title">
+ <span class="jumbo-icon icon-success-round"></span>
+ Success
+ </h1>
+
+ <p>Please keep this information for your records:</p>
+
+ <p><strong>Magento Admin Info:</strong></p>
+
+ <dl class="list-definition" id="admin-info">
+ <dt>Username:</dt>
+ <dd>{{admin.username}}</dd>
+
+ <dt>E-Mail:</dt>
+ <dd>{{admin.email}}</dd>
+
+ <dt>Password:</dt>
+ <dd>******</dd>
+
+ <dt>Your Store Address:</dt>
+ <dd>
+ <a href="{{config.address.actual_base_url}}" target="_blank">{{config.address.actual_base_url}}</a>
+ </dd>
+
+ <dt>Magento Admin Address:</dt>
+ <dd>
+ <a href="{{config.address.actual_base_url}}{{config.address.admin}}/" target="_blank">{{config.address.actual_base_url}}{{config.address.admin}}/</a>
+ </dd>
+
+ <dt>Encryption Key:</dt>
+ <dd>{{config.encrypt.key}}</dd>
+ </dl>
+
+ <p>
+ <strong>Database Info:</strong>
+ </p>
+
+ <dl id="db-info" class="list-definition">
+ <dt>Database Name:</dt>
+ <dd>{{db.name}}</dd>
+
+ <dt>Username:</dt>
+ <dd>{{db.user}}</dd>
+
+ <dt>Password:</dt>
+ <dd>******</dd>
+ </dl>
+
+ <p class="bold" ng-repeat="message in messages">{{message}}</p>
+
+ <div ng-show="config.address.actual_base_url">
+ <a
+ class="btn btn-large btn-prime"
+ href="{{config.address.actual_base_url}}{{config.address.admin}}/"
+ target="_blank"
+ >
+ Launch Magento Admin
+ </a>
</div>
-</div>
-<div class="text-center">
- <div class="bold" ng-repeat="message in messages">{{message}}</div>
- <div ng-show="config.address.actual_base_url"><a type="button" class="btn btn-primary" href="{{config.address.actual_base_url}}{{config.address.admin}}/">Launch Magento Admin</a></div>
+
</div>
diff --git a/var/.htaccess b/var/.htaccess
old mode 100644
new mode 100755