Permalink
Browse files

2.0.0.0-dev48

* Various improvements:
  * Added static integrity test for compilation of DI definitions
  * Lightweight replacement for PhpUnit data providers is implemented and involved in static and integrity tests with big data providers (primarily file lists)
* Fixed bugs:
  * Fixed broken styles on front-end due to usage of nonexistent stylesheet
  * Fixed plugins configuration inheritance for proxy classes
  * Fixed OAuth consumer credentials expiry not being correctly calculated and added credentials HTTP post to the consumer endpoint
  * Fixed Namespace class references
  * Fixed error on creating shipment with bundle products
  * Fixed uninstallation via console installer
  * Fixed JavaScript error in bootstrap in IE8/9
  * Fixed placing order within PayPal Payments Advanced and Payflow link
  * Fixed fatal error on placing order with Billing Agreement
  • Loading branch information...
1 parent 58aa446 commit 3c0ab0523495cfdedc701e897f92bec1fec82836 @magento-team magento-team committed Oct 18, 2013
Showing with 2,130 additions and 2,122 deletions.
  1. +16 −0 CHANGELOG.md
  2. +1 −1 app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php
  3. +1 −1 app/code/Magento/Adminhtml/Block/Sales/Items/AbstractItems.php
  4. +1 −1 app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php
  5. +1 −1 app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php
  6. +1 −1 app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create.php
  7. +1 −1 app/code/Magento/Adminhtml/Block/Sales/Order/View/Items/Renderer/DefaultRenderer.php
  8. +2 −2 app/code/Magento/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
  9. +1 −1 app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/giftmessage.js
  10. +3 −3 app/code/Magento/Backend/Helper/Data.php
  11. +7 −7 app/code/Magento/Backend/Model/Url.php
  12. +5 −0 app/code/Magento/Backend/etc/di.xml
  13. +1 −1 app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
  14. +1 −1 app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
  15. +4 −4 app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
  16. +1 −1 app/code/Magento/Captcha/Model/DefaultModel.php
  17. +1 −1 app/code/Magento/Catalog/Model/Layer.php
  18. +1 −1 app/code/Magento/CatalogSearch/Block/Result.php
  19. +2 −2 app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
  20. +4 −4 app/code/Magento/CatalogSearch/Model/Layer.php
  21. +1 −1 app/code/Magento/Centinel/view/frontend/layout/checkout_onepage_index.xml
  22. +1 −1 app/code/Magento/Checkout/Block/Multishipping/Overview.php
  23. +2 −2 app/code/Magento/Cms/view/frontend/layout/print.xml
  24. +2 −2 app/code/Magento/Core/Model/Config/Initial/Reader.php
  25. +2 −2 app/code/Magento/Core/Model/EntityFactory.php
  26. +0 −2 app/code/Magento/Core/Model/Resource/HelperPool.php
  27. +3 −3 app/code/Magento/Core/Model/Url.php
  28. +1 −1 app/code/Magento/Cron/Model/Observer.php
  29. +1 −1 app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php
  30. +1 −1 app/code/Magento/Customer/Helper/Data.php
  31. +2 −2 app/code/Magento/DesignEditor/Model/Url/NavigationMode.php
  32. +1 −1 app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
  33. +1 −1 app/code/Magento/GiftMessage/Model/Message.php
  34. +1 −1 app/code/Magento/GiftMessage/Model/TypeFactory.php
  35. +4 −4 app/code/Magento/GoogleCheckout/Model/Api/Xml/AbstractXml.php
  36. +5 −5 app/code/Magento/GoogleCheckout/Model/Api/Xml/Callback.php
  37. +1 −1 app/code/Magento/GoogleCheckout/Model/Api/Xml/Order.php
  38. +1 −1 app/code/Magento/GoogleShopping/Model/MassOperations.php
  39. +2 −2 app/code/Magento/ImportExport/Model/Resource/Import/Data.php
  40. +23 −8 app/code/Magento/Install/Model/Installer/Db/AbstractDb.php
  41. +1 −1 app/code/Magento/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php
  42. +0 −21 app/code/Magento/Oauth/Helper/Service.php
  43. +72 −29 app/code/Magento/Oauth/Service/OauthV1.php
  44. +0 −1 app/code/Magento/Oauth/Service/OauthV1Interface.php
  45. +8 −0 app/code/Magento/Oauth/etc/adminhtml/system.xml
  46. +2 −0 app/code/Magento/Oauth/etc/config.xml
  47. +1 −1 app/code/Magento/Paygate/Model/Authorizenet/Cards.php
  48. +10 −10 app/code/Magento/Payment/Model/Method/AbstractMethod.php
  49. +2 −2 app/code/Magento/Payment/Model/Method/Cc.php
  50. +3 −4 app/code/Magento/Paypal/Block/Iframe.php
  51. +1 −1 app/code/Magento/Paypal/Model/Hostedpro.php
  52. +1 −1 app/code/Magento/Paypal/Model/Standard.php
  53. +1 −1 app/code/Magento/Persistent/Model/Observer.php
  54. +1 −1 app/code/Magento/Reports/view/frontend/layout/print.xml
  55. +3 −3 app/code/Magento/Sales/Model/Billing/Agreement.php
  56. +1 −1 app/code/Magento/Sales/Model/Billing/Agreement/OrdersUpdater.php
  57. +1 −1 app/code/Magento/Sales/Model/Order/Payment.php
  58. +1 −1 app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
  59. +1 −1 app/code/Magento/SalesRule/Model/Resource/Rule/Quote/Collection.php
  60. +4 −4 app/code/Magento/Usa/Model/Shipping/Carrier/Fedex.php
  61. +1 −1 app/code/Magento/Webapi/Model/Soap/Server/Factory.php
  62. +1 −1 app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
  63. +2 −2 app/code/Magento/Widget/view/frontend/layout/default.xml
  64. +1 −1 app/code/Magento/Wishlist/Controller/Index.php
  65. +2 −2 app/code/Magento/Wishlist/Helper/Data.php
  66. +3 −0 app/code/Magento/Wishlist/etc/di.xml
  67. +5 −0 app/etc/di.xml
  68. +1 −0 dev/tests/integration/framework/bootstrap.php
  69. +1 −1 dev/tests/integration/testsuite/Magento/Cache/Backend/MongoDbTest.php
  70. +1 −3 dev/tests/integration/testsuite/Magento/Core/Model/Fieldset/Config/_files/partialFieldsetFirst.xml
  71. +1 −3 dev/tests/integration/testsuite/Magento/Core/Model/Fieldset/Config/_files/partialFieldsetSecond.xml
  72. +2 −2 dev/tests/integration/testsuite/Magento/Core/Model/LayoutArgumentObjectUpdater.php
  73. +1 −1 dev/tests/integration/testsuite/Magento/Install/Model/ConfigTest.php
  74. +139 −112 dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
  75. +24 −19 dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php
  76. +0 −61 dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LoggingConfigFilesTest.php
  77. +26 −21 dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
  78. +41 −29 dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/ViewFilesTest.php
  79. +47 −43 dev/tests/integration/testsuite/Magento/Test/Integrity/Theme/ViewFilesTest.php
  80. +0 −108 dev/tests/static/framework/Magento/TestFramework/Dependency/_files/tables_ee.php
  81. +13 −26 dev/tests/static/framework/Magento/TestFramework/Integrity/AbstractConfig.php
  82. +133 −0 dev/tests/static/framework/Magento/TestFramework/Utility/AggregateInvoker.php
  83. +61 −17 dev/tests/static/framework/Magento/TestFramework/Utility/Files.php
  84. +309 −134 dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
  85. +86 −0 dev/tests/static/testsuite/Magento/Test/Integrity/Compiler/CompilerTest.php
  86. +21 −14 dev/tests/static/testsuite/Magento/Test/Integrity/ConfigTest.php
  87. +39 −35 dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
  88. +31 −26 dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlocksTest.php
  89. +11 −18 dev/tests/static/testsuite/Magento/Test/Integrity/Layout/FilesTest.php
  90. +85 −74 dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php
  91. +16 −11 dev/tests/static/testsuite/Magento/Test/Integrity/Layout/ThemeHandlesTest.php
  92. +18 −21 dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/SystemConfigTest.php
  93. +30 −30 ...tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/DataService/LayoutConfigTest.php
  94. +22 −24 ...tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/DataService/SystemConfigTest.php
  95. +19 −23 dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/Fieldset/FieldsetConfigTest.php
  96. +0 −61 dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Reward/LayoutTest.php
  97. +15 −22 dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Widget/WidgetConfigTest.php
  98. +1 −1 dev/tests/static/testsuite/Magento/Test/Integrity/{Blacklist.php → NamespaceBlacklist.php}
  99. +65 −0 dev/tests/static/testsuite/Magento/Test/Integrity/ReferenceBlacklist.php
  100. +20 −14 dev/tests/static/testsuite/Magento/Test/Js/LiveCodeTest.php
  101. +52 −59 dev/tests/static/testsuite/Magento/Test/Legacy/ClassesTest.php
  102. +22 −25 dev/tests/static/testsuite/Magento/Test/Legacy/ConfigTest.php
  103. +14 −14 dev/tests/static/testsuite/Magento/Test/Legacy/EmailTemplateTest.php
  104. +66 −60 dev/tests/static/testsuite/Magento/Test/Legacy/LayoutTest.php
  105. +20 −17 dev/tests/static/testsuite/Magento/Test/Legacy/LicenseTest.php
  106. +0 −42 dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Bundle/Model/Product/TypeTest.php
  107. +0 −70 dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Catalog/Model/Product/AbstractTypeTest.php
  108. +0 −47 dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Catalog/Model/Product/TypeTest.php
  109. +27 −27 dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Core/Block/AbstractBlockTest.php
  110. +0 −42 dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Downloadable/Model/Product/TypeTest.php
  111. +15 −18 dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Install/ConfigTest.php
  112. +33 −31 dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Widget/XmlTest.php
  113. +15 −18 dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteAclTest.php
  114. +77 −82 dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
  115. +18 −13 dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteLayoutLocationTest.php
  116. +15 −18 dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteMenuTest.php
  117. +22 −25 dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php
  118. +22 −24 dev/tests/static/testsuite/Magento/Test/Legacy/TableTest.php
  119. +14 −17 dev/tests/static/testsuite/Magento/Test/Legacy/WordsTest.php
  120. +0 −4 dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
  121. +0 −1 dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
  122. +4 −15 dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
  123. +23 −23 dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest.php
  124. +33 −26 dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeStyleTest.php
  125. +8 −7 dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
  126. +0 −4 dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
  127. +14 −11 dev/tests/static/testsuite/Magento/Test/Twig/TwigExtensionTest.php
  128. +2 −2 dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php
  129. +1 −1 dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/AbstractCompositeTest.php
  130. +1 −1 dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/valid_menu.xml
  131. +3 −3 dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
  132. +2 −2 dev/tests/unit/testsuite/Magento/Checkout/Block/Cart/LinkTest.php
  133. +1 −1 dev/tests/unit/testsuite/Magento/Checkout/Block/LinkTest.php
  134. +1 −1 dev/tests/unit/testsuite/Magento/Core/Model/Layout/Argument/Handler/ArrayTest.php
  135. +1 −1 dev/tests/unit/testsuite/Magento/Core/Model/Layout/Argument/Handler/_files/arguments.xml
  136. +1 −1 dev/tests/unit/testsuite/Magento/Core/Model/UrlTest.php
  137. +1 −1 dev/tests/unit/testsuite/Magento/Data/Form/Element/EditablemultiselectTest.php
  138. +1 −1 dev/tests/unit/testsuite/Magento/DesignEditor/Model/Url/NavigationModeTest.php
  139. +8 −2 dev/tests/unit/testsuite/Magento/Install/Model/Installer/Db/Mysql4Test.php
  140. +0 −17 dev/tests/unit/testsuite/Magento/Oauth/Helper/ServiceTest.php
  141. +29 −24 dev/tests/unit/testsuite/Magento/Oauth/Service/OauthV1Test.php
  142. +15 −2 dev/tools/Magento/Tools/Di/Compiler/Log/Log.php
  143. +5 −1 dev/tools/Magento/Tools/Di/compiler.php
  144. +0 −135 dev/tools/xml/logging.xslt
  145. +0 −40 dev/tools/xml/transform_logging.php
  146. +2 −2 downloader/lib/Magento/Archive.php
  147. +2 −2 downloader/lib/Magento/Backup/AbstractBackup.php
  148. +1 −1 downloader/lib/Magento/Backup/Filesystem/Rollback/Fs.php
  149. +1 −1 downloader/lib/Magento/Backup/Filesystem/Rollback/Ftp.php
  150. +1 −1 downloader/lib/Magento/Connect/Command.php
  151. +2 −2 lib/Magento/Archive.php
  152. +4 −4 lib/Magento/Cache/Backend/MongoDb.php
  153. +1 −1 lib/Magento/Connect/Command.php
  154. +1 −1 lib/Magento/DB/Adapter/Pdo/Mysql.php
  155. +2 −2 lib/Magento/DB/Tree.php
  156. +3 −3 lib/Magento/Data/Collection/Filesystem.php
  157. +1 −1 lib/Magento/Interception/Config/Config.php
  158. +2 −2 pub/lib/mage/backend/bootstrap.js
  159. +3 −2 pub/lib/mage/loader.js
View
@@ -1,3 +1,19 @@
+2.0.0.0-dev48
+=============
+* Various improvements:
+ * Added static integrity test for compilation of DI definitions
+ * Lightweight replacement for PhpUnit data providers is implemented and involved in static and integrity tests with big data providers (primarily file lists)
+* Fixed bugs:
+ * Fixed broken styles on front-end due to usage of nonexistent stylesheet
+ * Fixed plugins configuration inheritance for proxy classes
+ * Fixed OAuth consumer credentials expiry not being correctly calculated and added credentials HTTP post to the consumer endpoint
+ * Fixed Namespace class references
+ * Fixed error on creating shipment with bundle products
+ * Fixed uninstallation via console installer
+ * Fixed JavaScript error in bootstrap in IE8/9
+ * Fixed placing order within PayPal Payments Advanced and Payflow link
+ * Fixed fatal error on placing order with Billing Agreement
+
2.0.0.0-dev47
=============
* Fixed bugs:
@@ -49,7 +49,7 @@ class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
* storeIds setter
*
* @param array $storeIds
- * @return \Magento\Adminhtml\Block\Report\Grid\Shopcart\AbstractShopcart
+ * @return \Magento\Adminhtml\Block\Report\Grid\Shopcart
*/
public function setStoreIds($storeIds)
{
@@ -522,7 +522,7 @@ public function getSource()
/**
* Retrieve invoice model instance
*
- * @return \Magento\Sales\Model\Invoice
+ * @return \Magento\Sales\Model\Order\Invoice
*/
public function getInvoice()
{
@@ -55,7 +55,7 @@ public function getSource()
/**
* Retrieve creditmemo model instance
*
- * @return \Magento\Sales\Model\Creditmemo
+ * @return \Magento\Sales\Model\Order\Creditmemo
*/
public function getCreditmemo()
{
@@ -150,7 +150,7 @@ public function getOrderTotalbarData()
/**
* Retrieve creditmemo model instance
*
- * @return \Magento\Sales\Model\Creditmemo
+ * @return \Magento\Sales\Model\Order\Creditmemo
*/
public function getCreditmemo()
{
@@ -70,7 +70,7 @@ protected function _construct()
/**
* Retrieve invoice model instance
*
- * @return \Magento\Sales\Model\Invoice
+ * @return \Magento\Sales\Model\Order\Invoice
*/
public function getInvoice()
{
@@ -138,7 +138,7 @@ public function getFieldName($name)
/**
* Initialize gift message for entity
*
- * @return \Magento\Adminhtml\Block\Sales\Order_Edit_Items_Grid_Renderer_Name_Giftmessage
+ * @return \Magento\Adminhtml\Block\Sales\Order\View\Giftmessage
*/
protected function _initMessage()
{
@@ -76,7 +76,7 @@ class Attribute extends \Magento\Backend\Helper\Data
* @param \Magento\Core\Model\ConfigInterface $applicationConfig
* @param \Magento\Core\Model\Config\Primary $primaryConfig
* @param \Magento\Core\Model\RouterList $routerList
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\AppInterface $app
* @param \Magento\Backend\Model\Url $backendUrl
* @param \Magento\Backend\Model\Auth $auth
* @param string $defaultAreaFrontName
@@ -91,7 +91,7 @@ public function __construct(
\Magento\Core\Model\ConfigInterface $applicationConfig,
\Magento\Core\Model\Config\Primary $primaryConfig,
\Magento\Core\Model\RouterList $routerList,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\AppInterface $app,
\Magento\Backend\Model\Url $backendUrl,
\Magento\Backend\Model\Auth $auth,
$defaultAreaFrontName,
@@ -146,7 +146,7 @@ GiftOptionsPopup.prototype = {
Event.observe(el, 'click', this.showItemGiftOptions.bind(this));
}, this);
- // Move giftcard popup to start of body, because soon it will contain FORM tag that can break DOM layout if within other FORM
+ // Move gift options popup to start of body, because soon it will contain FORM tag that can break DOM layout if within other FORM
var oldPopupContainer = $('gift_options_configure');
if (oldPopupContainer) {
oldPopupContainer.remove();
@@ -75,7 +75,7 @@ class Data extends \Magento\Core\Helper\AbstractHelper
protected $_coreData = null;
/**
- * @var \Magento\Core\Model\App
+ * @var \Magento\Core\Model\AppInterface
*/
protected $_app;
@@ -102,7 +102,7 @@ class Data extends \Magento\Core\Helper\AbstractHelper
* @param \Magento\Core\Model\ConfigInterface $applicationConfig
* @param \Magento\Core\Model\Config\Primary $primaryConfig
* @param \Magento\Core\Model\RouterList $routerList
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\AppInterface $app
* @param \Magento\Backend\Model\Url $backendUrl
* @param \Magento\Backend\Model\Auth $auth
* @param string $defaultAreaFrontName
@@ -116,7 +116,7 @@ public function __construct(
\Magento\Core\Model\ConfigInterface $applicationConfig,
\Magento\Core\Model\Config\Primary $primaryConfig,
\Magento\Core\Model\RouterList $routerList,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\AppInterface $app,
\Magento\Backend\Model\Url $backendUrl,
\Magento\Backend\Model\Auth $auth,
$defaultAreaFrontName,
@@ -46,7 +46,7 @@ class Url extends \Magento\Core\Model\Url
/**
* Authentication session
*
- * @var \Magento\Backend\Model\Auth\SessionProxy
+ * @var \Magento\Backend\Model\Auth\Session
*/
protected $_session;
@@ -92,13 +92,13 @@ class Url extends \Magento\Core\Model\Url
* @param \Magento\Core\Model\Url\SecurityInfoInterface $securityInfo
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Backend\Helper\Data $backendHelper
- * @param \Magento\Core\Model\SessionProxy $coreSession
+ * @param \Magento\Core\Model\Session $session
* @param \Magento\Backend\Model\Menu\Config $menuConfig
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Core\Model\App $app
* @param \Magento\Core\Model\StoreManager $storeManager
* @param \Magento\Core\Model\CacheInterface $cache
- * @param \Magento\Backend\Model\Auth\SessionProxy $authSession
+ * @param \Magento\Backend\Model\Auth\Session $authSession
* @param array $data
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -107,19 +107,19 @@ public function __construct(
\Magento\Core\Model\Url\SecurityInfoInterface $securityInfo,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Backend\Helper\Data $backendHelper,
- \Magento\Core\Model\SessionProxy $coreSession,
+ \Magento\Core\Model\Session $session,
\Magento\Backend\Model\Menu\Config $menuConfig,
\Magento\Core\Helper\Data $coreData,
\Magento\Core\Model\App $app,
\Magento\Core\Model\StoreManager $storeManager,
\Magento\Core\Model\CacheInterface $cache,
- \Magento\Backend\Model\Auth\SessionProxy $authSession,
+ \Magento\Backend\Model\Auth\Session $authSession,
array $data = array()
) {
- parent::__construct($securityInfo, $coreStoreConfig, $coreData, $app, $storeManager, $coreSession, $data);
+ parent::__construct($securityInfo, $coreStoreConfig, $coreData, $app, $storeManager, $session, $data);
$this->_startupMenuItemId = $coreStoreConfig->getConfig(self::XML_PATH_STARTUP_MENU_ITEM);
$this->_backendHelper = $backendHelper;
- $this->_coreSession = $coreSession;
+ $this->_coreSession = $session;
$this->_menuConfig = $menuConfig;
$this->_cache = $cache;
$this->_session = $authSession;
@@ -98,4 +98,9 @@
<instance type="Magento\Backend\Model\Url\Proxy" />
</param>
</type>
+ <type name="Magento\Backend\Model\Url">
+ <param name="authSession">
+ <instance type="Magento\Backend\Model\Auth\Session\Proxy" />
+ </param>
+ </type>
</config>
@@ -120,7 +120,7 @@ public function getFieldName()
/**
* Prepare block layout
*
- * @return \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle_Option_Selection
+ * @return \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection
*/
protected function _prepareLayout()
{
@@ -181,7 +181,7 @@ public function getOrderOptions($item = null)
public function getOrderItem()
{
- if ($this->getItem() instanceof \Magento\Sales\Order\Item) {
+ if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) {
return $this->getItem();
} else {
return $this->getItem()->getOrderItem();
@@ -231,11 +231,11 @@ public function getOrderOptions($item = null)
/**
* Retrieve Order Item
*
- * @return \Magento\Sales\Order\Item
+ * @return \Magento\Sales\Model\Order\Item
*/
public function getOrderItem()
{
- if ($this->getItem() instanceof \Magento\Sales\Order\Item) {
+ if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) {
return $this->getItem();
} else {
return $this->getItem()->getOrderItem();
@@ -245,7 +245,7 @@ public function getOrderItem()
/**
* Retrieve Value HTML
*
- * @param \Magento\Sales\Order\Item $item
+ * @param \Magento\Sales\Model\Order\Item $item
* @return string
*/
public function getValueHtml($item)
@@ -269,7 +269,7 @@ public function getValueHtml($item)
/**
* Can show price info for item
*
- * @param \Magento\Sales\Order\Item $item
+ * @param \Magento\Sales\Model\Order\Item $item
* @return bool
*/
public function canShowPriceInfo($item)
@@ -497,7 +497,7 @@ protected function _setWord($word)
/**
* Set captcha word
*
- * @return \Magento\Captcha\Model\Zend
+ * @return \Magento\Captcha\Model\DefaultModel
*/
protected function _clearWord()
{
@@ -301,7 +301,7 @@ public function getCurrentStore()
/**
* Get collection of all filterable attributes for layer products set
*
- * @return \Magento\Catalog\Model\Resource\Attribute\Collection
+ * @return \Magento\Catalog\Model\Resource\Product\Attribute\Collection
*/
public function getFilterableAttributes()
{
@@ -140,7 +140,7 @@ public function getAdditionalHtml()
/**
* Retrieve search list toolbar block
*
- * @return \Magento\Catalog\Block\Product\ProductList
+ * @return \Magento\Catalog\Block\Product\ListProduct
*/
public function getListBlock()
{
@@ -290,7 +290,7 @@ protected function _registerEvent(\Magento\Index\Model\Event $event)
* Get data required for category'es products reindex
*
* @param \Magento\Index\Model\Event $event
- * @return \Magento\CatalogSearch\Model\Indexer\Search
+ * @return \Magento\CatalogSearch\Model\Indexer\Fulltext
*/
protected function _registerCatalogCategoryEvent(\Magento\Index\Model\Event $event)
{
@@ -321,7 +321,7 @@ protected function _registerCatalogCategoryEvent(\Magento\Index\Model\Event $eve
* Register data required by catatalog product process in event object
*
* @param \Magento\Index\Model\Event $event
- * @return \Magento\CatalogSearch\Model\Indexer\Search
+ * @return \Magento\CatalogSearch\Model\Indexer\Fulltext
*/
protected function _registerCatalogProductEvent(\Magento\Index\Model\Event $event)
{
@@ -107,7 +107,7 @@ public function __construct(
/**
* Get current layer product collection
*
- * @return \Magento\Catalog\Model\Resource\Eav\Resource\Product\Collection
+ * @return \Magento\Catalog\Model\Resource\Product\Attribute\Collection
*/
public function getProductCollection()
{
@@ -124,7 +124,7 @@ public function getProductCollection()
/**
* Prepare product collection
*
- * @param \Magento\Catalog\Model\Resource\Eav\Resource\Product\Collection $collection
+ * @param \Magento\Catalog\Model\Resource\Product\Attribute\Collection $collection
* @return \Magento\Catalog\Model\Layer
*/
public function prepareProductCollection($collection)
@@ -173,8 +173,8 @@ public function getStateTags(array $additionalTags = array())
/**
* Add filters to attribute collection
*
- * @param \Magento\Catalog\Model\Resource\Eav\Resource\Product\Attribute\Collection $collection
- * @return \Magento\Catalog\Model\Resource\Eav\Resource\Product\Attribute\Collection
+ * @param \Magento\Catalog\Model\Resource\Product\Attribute\Collection $collection
+ * @return \Magento\Catalog\Model\Resource\Product\Attribute\Collection
*/
protected function _prepareAttributeCollection($collection)
{
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Script" name="magento-pbridge-js-pbridge-js">
+ <block class="Magento\Page\Block\Html\Head\Script" name="magento-centinel-centinel-authenticate-js">
<arguments>
<argument name="file" xsi:type="string">Magento_Centinel::centinel-authenticate.js</argument>
</arguments>
@@ -313,7 +313,7 @@ public function getVirtualItems()
/**
* Retrieve quote
*
- * @return \Magento\Sales\Model\Qoute
+ * @return \Magento\Sales\Model\Quote
*/
public function getQuote()
{
@@ -25,9 +25,9 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-catalogevent-widgets-css">
+ <block class="Magento\Page\Block\Html\Head\Css" name="magento-cms-widgets-css">
<arguments>
- <argument name="file" xsi:type="string">Magento_CatalogEvent::widgets.css</argument>
+ <argument name="file" xsi:type="string">Magento_Cms::widgets.css</argument>
</arguments>
</block>
</referenceBlock>
@@ -85,7 +85,7 @@ public function __construct(
*
* @return array
*
- * @throws \Magento\MagentoException
+ * @throws \Magento\Exception
*/
public function read()
{
@@ -109,7 +109,7 @@ public function read()
$domDocument->merge(file_get_contents($file));
}
} catch (\Magento\Config\Dom\ValidationException $e) {
- throw new \Magento\MagentoException("Invalid XML in file " . $file . ":\n" . $e->getMessage());
+ throw new \Magento\Exception("Invalid XML in file " . $file . ":\n" . $e->getMessage());
}
}
@@ -48,15 +48,15 @@ public function __construct(\Magento\ObjectManager $objectManager)
*
* @param $className
* @param array $data
- * @throws LogicException
+ * @throws \LogicException
* @return \Magento\Object
*/
public function create($className, array $data = array())
{
$model = $this->_objectManager->create($className, $data);
//TODO: fix that when this factory used only for \Magento\Core\Model\Abstract
//if (!$model instanceof \Magento\Core\Model\Abstract) {
- // throw new LogicException($className . ' doesn\'t implement \Magento\Core\Model\Abstract');
+ // throw new \LogicException($className . ' doesn\'t implement \Magento\Core\Model\Abstract');
//}
return $model;
}
@@ -18,8 +18,6 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_TargetRule
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
Oops, something went wrong.

0 comments on commit 3c0ab05

Please sign in to comment.