Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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...
commit 3c0ab0523495cfdedc701e897f92bec1fec82836 1 parent 58aa446
@mage2-team mage2-team authored
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 dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/DataService/LayoutConfigTest.php
  94. +22 −24 dev/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
16 CHANGELOG.md
@@ -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:
View
2  app/code/Magento/Adminhtml/Block/Report/Grid/Shopcart.php
@@ -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)
{
View
2  app/code/Magento/Adminhtml/Block/Sales/Items/AbstractItems.php
@@ -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()
{
View
2  app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php
@@ -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()
{
View
2  app/code/Magento/Adminhtml/Block/Sales/Order/Creditmemo/Create/Items.php
@@ -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()
{
View
2  app/code/Magento/Adminhtml/Block/Sales/Order/Invoice/Create.php
@@ -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()
{
View
2  app/code/Magento/Adminhtml/Block/Sales/Order/View/Items/Renderer/DefaultRenderer.php
@@ -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()
{
View
4 app/code/Magento/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
@@ -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,
View
2  app/code/Magento/Adminhtml/view/adminhtml/sales/order/create/giftmessage.js
@@ -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();
View
6 app/code/Magento/Backend/Helper/Data.php
@@ -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,
View
14 app/code/Magento/Backend/Model/Url.php
@@ -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;
View
5 app/code/Magento/Backend/etc/di.xml
@@ -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>
View
2  app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php
@@ -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()
{
View
2  app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -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();
View
8 app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -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)
View
2  app/code/Magento/Captcha/Model/DefaultModel.php
@@ -497,7 +497,7 @@ protected function _setWord($word)
/**
* Set captcha word
*
- * @return \Magento\Captcha\Model\Zend
+ * @return \Magento\Captcha\Model\DefaultModel
*/
protected function _clearWord()
{
View
2  app/code/Magento/Catalog/Model/Layer.php
@@ -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()
{
View
2  app/code/Magento/CatalogSearch/Block/Result.php
@@ -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()
{
View
4 app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
@@ -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)
{
View
8 app/code/Magento/CatalogSearch/Model/Layer.php
@@ -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)
{
View
2  app/code/Magento/Centinel/view/frontend/layout/checkout_onepage_index.xml
@@ -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>
View
2  app/code/Magento/Checkout/Block/Multishipping/Overview.php
@@ -313,7 +313,7 @@ public function getVirtualItems()
/**
* Retrieve quote
*
- * @return \Magento\Sales\Model\Qoute
+ * @return \Magento\Sales\Model\Quote
*/
public function getQuote()
{
View
4 app/code/Magento/Cms/view/frontend/layout/print.xml
@@ -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>
View
4 app/code/Magento/Core/Model/Config/Initial/Reader.php
@@ -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());
}
}
View
4 app/code/Magento/Core/Model/EntityFactory.php
@@ -48,7 +48,7 @@ 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())
@@ -56,7 +56,7 @@ 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;
}
View
2  app/code/Magento/Core/Model/Resource/HelperPool.php
@@ -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)
*/
View
6 app/code/Magento/Core/Model/Url.php
@@ -149,7 +149,7 @@ class Url extends \Magento\Object implements \Magento\Core\Model\UrlInterface
protected $_storeManager;
/**
- * @var \Magento\Core\Model\SessionProxy
+ * @var \Magento\Core\Model\Session
*/
protected $_session;
@@ -164,7 +164,7 @@ class Url extends \Magento\Object implements \Magento\Core\Model\UrlInterface
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Core\Model\App $app
* @param \Magento\Core\Model\StoreManager $storeManager
- * @param \Magento\Core\Model\SessionProxy $session
+ * @param \Magento\Core\Model\Session $session
* @param array $data
*/
public function __construct(
@@ -173,7 +173,7 @@ public function __construct(
\Magento\Core\Helper\Data $coreData,
\Magento\Core\Model\App $app,
\Magento\Core\Model\StoreManager $storeManager,
- \Magento\Core\Model\SessionProxy $session,
+ \Magento\Core\Model\Session $session,
array $data = array()
) {
$this->_urlSecurityInfo = $urlSecurityInfo;
View
2  app/code/Magento/Cron/Model/Observer.php
@@ -134,7 +134,7 @@ public function dispatch($observer)
* @param $jobConfig
* @param \Magento\Cron\Model\Schedule $schedule
*
- * @throws Exception
+ * @throws \Exception
*/
protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule)
{
View
2  app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php
@@ -88,7 +88,7 @@ public function getType()
* Retrive format type object
*
* @param \Magento\Object $type
- * @return \Magento\Customer\Model\Address\Renderer\DefaultRenderer
+ * @return \Magento\Customer\Block\Address\Renderer\DefaultRenderer
*/
public function setType(\Magento\Object $type)
{
View
2  app/code/Magento/Customer/Helper/Data.php
@@ -694,7 +694,7 @@ public function getVatValidationUserMessage($customerAddress, $customerGroupAuto
* Create SOAP client based on VAT validation service WSDL
*
* @param boolean $trace
- * @return SoapClient
+ * @return \SoapClient
*/
protected function _createVatNumberValidationSoapClient($trace = false)
{
View
4 app/code/Magento/DesignEditor/Model/Url/NavigationMode.php
@@ -61,7 +61,7 @@ class NavigationMode extends \Magento\Core\Model\Url
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Core\Model\App $app
* @param \Magento\Core\Model\StoreManager $storeManager
- * @param \Magento\Core\Model\SessionProxy $session
+ * @param \Magento\Core\Model\Session $session
* @param array $data
*/
public function __construct(
@@ -71,7 +71,7 @@ public function __construct(
\Magento\Core\Helper\Data $coreData,
\Magento\Core\Model\App $app,
\Magento\Core\Model\StoreManager $storeManager,
- \Magento\Core\Model\SessionProxy $session,
+ \Magento\Core\Model\Session $session,
array $data = array()
) {
$this->_helper = $helper;
View
2  app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
@@ -133,7 +133,7 @@ public function getFieldIdPrefix()
/**
* Initialize gift message for entity
*
- * @return \Magento\Adminhtml\Block\Sales\Order_Edit_Items_Grid_Renderer_Name_Giftmessage
+ * @return \Magento\GiftMessage\Block\Adminhtml\Sales\Order\View\Items
*/
protected function _initMessage()
{
View
2  app/code/Magento/GiftMessage/Model/Message.php
@@ -82,7 +82,7 @@ protected function _construct()
*
* @param string $type
*
- * @return \Magento\Eav\Model\Entity\AbstractModel
+ * @return mixed
*/
public function getEntityModelByType($type)
{
View
2  app/code/Magento/GiftMessage/Model/TypeFactory.php
@@ -66,7 +66,7 @@ public function __construct(\Magento\ObjectManager $objectManager)
*
* @param $eavType
*
- * @return \Magento\Eav\Model\Entity\Abstract
+ * @return mixed
* @throws \Magento\Core\Exception
*/
public function createType($eavType)
View
8 app/code/Magento/GoogleCheckout/Model/Api/Xml/AbstractXml.php
@@ -123,12 +123,12 @@ public function getCurrency()
/**
* Google Checkout Request instance
*
- * @return GoogleRequest
+ * @return \GoogleRequest
*/
public function getGRequest()
{
if (!$this->hasData('g_request')) {
- $this->setData('g_request', new GoogleRequest(
+ $this->setData('g_request', new \GoogleRequest(
$this->getMerchantId(),
$this->getMerchantKey(),
$this->getServerType(),
@@ -150,7 +150,7 @@ public function getGRequest()
* Google Checkout Response instance
*
* @throws \Magento\Core\Exception
- * @return GoogleResponse
+ * @return \GoogleResponse
*/
public function getGResponse()
{
@@ -160,7 +160,7 @@ public function getGResponse()
throw new \Magento\Core\Exception(__('GoogleCheckout is not configured'));
}
if (!$this->hasData('g_response')) {
- $this->setData('g_response', new GoogleResponse(
+ $this->setData('g_response', new \GoogleResponse(
$this->getMerchantId(),
$this->getMerchantKey()
));
View
10 app/code/Magento/GoogleCheckout/Model/Api/Xml/Callback.php
@@ -212,7 +212,7 @@ protected function _responseCheckoutRedirect()
*/
protected function _responseMerchantCalculationCallback()
{
- $merchantCalculations = new GoogleMerchantCalculations($this->getCurrency());
+ $merchantCalculations = new \GoogleMerchantCalculations($this->getCurrency());
$quote = $this->_loadQuote();
@@ -282,7 +282,7 @@ protected function _responseMerchantCalculationCallback()
}
foreach ($gRequestMethods as $method) {
- $result = new GoogleResult($addressId);
+ $result = new \GoogleResult($addressId);
$methodName = $method['name'];
if (isset($rates[$methodName])) {
@@ -345,7 +345,7 @@ protected function _responseMerchantCalculationCallback()
$taxAmount = $address->getBaseTaxAmount();
$taxAmount += $billingAddress->getBaseTaxAmount();
- $result = new GoogleResult($addressId);
+ $result = new \GoogleResult($addressId);
$result->setTaxDetails($taxAmount);
$merchantCalculations->addResult($result);
}
@@ -527,7 +527,7 @@ protected function _responseNewOrderNotification()
* apply Google tax and recollect quote
*
* @param \Magento\Object $qAddress
- * @return string | false
+ * @return string | boolean false
*/
protected function _applyCustomTax($qAddress)
{
@@ -679,7 +679,7 @@ protected function _getShippingInfos($storeId = null)
*
* @param string $name
* @param int|string|\Magento\Core\Model\Store $storeId
- * @return string|false
+ * @return string| boolean false
*/
protected function _getShippingMethodByName($name, $storeId = null)
{
View
2  app/code/Magento/GoogleCheckout/Model/Api/Xml/Order.php
@@ -114,7 +114,7 @@ public function shipItems($items, $sendMail = true)
{
$googleShipItems = array();
foreach ($items as $item) {
- $googleShipItems[] = new GoogleShipItem($item);
+ $googleShipItems[] = new \GoogleShipItem($item);
}
$response = $this->getGRequest()
View
2  app/code/Magento/GoogleShopping/Model/MassOperations.php
@@ -374,7 +374,7 @@ protected function _getItemsCollection($items)
/**
* Retrieve admin notifier
*
- * @return \Magento\Adminhtml\Model\Inbox
+ * @return \Magento\AdminNotification\Model\Inbox
*/
protected function _getNotifier()
{
View
4 app/code/Magento/ImportExport/Model/Resource/Import/Data.php
@@ -38,7 +38,7 @@ class Data
implements \IteratorAggregate
{
/**
- * @var IteratorIterator
+ * @var \Iterator
*/
protected $_iterator = null;
@@ -75,7 +75,7 @@ protected function _construct()
/**
* Retrieve an external iterator
*
- * @return IteratorIterator
+ * @return \Iterator
*/
public function getIterator()
{
View
31 app/code/Magento/Install/Model/Installer/Db/AbstractDb.php
@@ -73,13 +73,17 @@
/**
* @param \Magento\Core\Model\Resource\Type\Db\Pdo\MysqlFactory $adapterFactory
+ * @param \Magento\Core\Model\Config\Local $localConfig
* @param array $dbExtensions
*/
public function __construct(
- \Magento\Core\Model\Resource\Type\Db\Pdo\MysqlFactory $adapterFactory, array $dbExtensions = array()
+ \Magento\Core\Model\Resource\Type\Db\Pdo\MysqlFactory $adapterFactory,
+ \Magento\Core\Model\Config\Local $localConfig,
+ array $dbExtensions = array()
) {
$this->_adapterFactory = $adapterFactory;
$this->_dbExtensions = $dbExtensions;
+ $this->_localConfig = $localConfig;
}
/**
@@ -121,13 +125,24 @@ public function setConfig($config)
public function getConnectionData()
{
if (!$this->_connectionData) {
- $connectionData = array(
- 'host' => $this->_configData['db_host'],
- 'username' => $this->_configData['db_user'],
- 'password' => $this->_configData['db_pass'],
- 'dbName' => $this->_configData['db_name'],
- 'pdoType' => $this->getPdoType()
- );
+ if ($this->_configData) {
+ $connectionData = array(
+ 'host' => $this->_configData['db_host'],
+ 'username' => $this->_configData['db_user'],
+ 'password' => $this->_configData['db_pass'],
+ 'dbName' => $this->_configData['db_name'],
+ 'pdoType' => $this->getPdoType()
+ );
+ } else {
+ $default = $this->_localConfig->getConnection('default');
+ $connectionData = array(
+ 'host' => $default['host'],
+ 'username' => $default['username'],
+ 'password' => $default['password'],
+ 'dbName' => $default['dbName'],
+ 'pdoType' => $this->getPdoType()
+ );
+ }
$this->_connectionData = $connectionData;
}
return $this->_connectionData;
View
2  app/code/Magento/Oauth/Block/Adminhtml/Oauth/Consumer/Grid.php
@@ -71,7 +71,7 @@ public function _construct()
parent::_construct();
$this->setId('consumerGrid');
$this->setSaveParametersInSession(true);
- $this->setDefaultSort('entity_id')->setDefaultDir(\Magento\Db\Select::SQL_DESC);
+ $this->setDefaultSort('entity_id')->setDefaultDir(\Magento\DB\Select::SQL_DESC);
$this->_editAllow = $this->_authorization->isAllowed('Magento_Oauth::consumer_edit');
}
View
21 app/code/Magento/Oauth/Helper/Service.php
@@ -37,21 +37,11 @@ class Service extends \Magento\Core\Helper\AbstractHelper
/**#@-*/
/**
- * Consumer xpath settings
- */
- const XML_PATH_CONSUMER_EXPIRATION_PERIOD = 'oauth/consumer/expiration_period';
-
- /**
* Cleanup expiration period in minutes
*/
const CLEANUP_EXPIRATION_PERIOD_DEFAULT = 120;
/**
- * Consumer expiration period in seconds
- */
- const CONSUMER_EXPIRATION_PERIOD_DEFAULT = 300;
-
- /**
* Query parameter as a sign that user rejects
*/
const QUERY_PARAM_REJECTED = 'rejected';
@@ -184,15 +174,4 @@ public function getCleanupExpirationPeriod()
$minutes = (int) $this->_storeConfig->getConfig(self::XML_PATH_CLEANUP_EXPIRATION_PERIOD);
return $minutes > 0 ? $minutes : self::CLEANUP_EXPIRATION_PERIOD_DEFAULT;
}
-
- /**
- * Get consumer expiration period value from system configuration in seconds
- *
- * @return int
- */
- public function getConsumerExpirationPeriod()
- {
- $seconds = (int)$this->_storeConfig->getConfig(self::XML_PATH_CONSUMER_EXPIRATION_PERIOD);
- return $seconds > 0 ? $seconds : self::CONSUMER_EXPIRATION_PERIOD_DEFAULT;
- }
}
View
101 app/code/Magento/Oauth/Service/OauthV1.php
@@ -35,6 +35,36 @@ class OauthV1 implements \Magento\Oauth\Service\OauthV1Interface
*/
const TIME_DEVIATION = 600;
+ /**
+ * Consumer xpath settings
+ */
+ const XML_PATH_CONSUMER_EXPIRATION_PERIOD = 'oauth/consumer/expiration_period';
+
+ /**
+ * Consumer expiration period in seconds
+ */
+ const CONSUMER_EXPIRATION_PERIOD_DEFAULT = 300;
+
+ /**
+ * Consumer HTTP POST maxredirects xpath
+ */
+ const XML_PATH_CONSUMER_POST_MAXREDIRECTS = 'oauth/consumer/post_maxredirects';
+
+ /**
+ * Consumer HTTPS POST maxredirects default
+ */
+ const CONSUMER_POST_MAXREDIRECTS = 0;
+
+ /**
+ * Consumer HTTP TIMEOUT xpath
+ */
+ const XML_PATH_CONSUMER_POST_TIMEOUT = 'oauth/consumer/post_timeout';
+
+ /**
+ * Consumer HTTP TIMEOUT default
+ */
+ const CONSUMER_POST_TIMEOUT = 5;
+
/** @var \Magento\Oauth\Model\Consumer\Factory */
private $_consumerFactory;
@@ -44,9 +74,6 @@ class OauthV1 implements \Magento\Oauth\Service\OauthV1Interface
/** @var \Magento\Oauth\Model\Token\Factory */
private $_tokenFactory;
- /** @var \Magento\Oauth\Helper\Service */
- protected $_serviceHelper;
-
/** @var \Magento\Core\Model\StoreManagerInterface */
protected $_storeManager;
@@ -56,31 +83,34 @@ class OauthV1 implements \Magento\Oauth\Service\OauthV1Interface
/** @var \Zend_Oauth_Http_Utility */
protected $_httpUtility;
+ /** @var \Magento\Core\Model\Date */
+ protected $_date;
+
/**
* @param \Magento\Oauth\Model\Consumer\Factory $consumerFactory
* @param \Magento\Oauth\Model\Nonce\Factory $nonceFactory
* @param \Magento\Oauth\Model\Token\Factory $tokenFactory
- * @param \Magento\Oauth\Helper\Service $serviceHelper
* @param \Magento\Core\Model\StoreManagerInterface
* @param \Magento\HTTP\ZendClient
* @param \Zend_Oauth_Http_Utility $httpUtility
+ * @param \Magento\Core\Model\Date $date
*/
public function __construct(
\Magento\Oauth\Model\Consumer\Factory $consumerFactory,
\Magento\Oauth\Model\Nonce\Factory $nonceFactory,
\Magento\Oauth\Model\Token\Factory $tokenFactory,
- \Magento\Oauth\Helper\Service $serviceHelper,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\HTTP\ZendClient $httpClient,
- \Zend_Oauth_Http_Utility $httpUtility
+ \Zend_Oauth_Http_Utility $httpUtility,
+ \Magento\Core\Model\Date $date
) {
$this->_consumerFactory = $consumerFactory;
$this->_nonceFactory = $nonceFactory;
$this->_tokenFactory = $tokenFactory;
$this->_storeManager = $storeManager;
- $this->_serviceHelper = $serviceHelper;
$this->_httpClient = $httpClient;
$this->_httpUtility = $httpUtility;
+ $this->_date = $date;
}
/**
@@ -117,17 +147,26 @@ public function postToConsumer($request)
try {
$consumerData = $this->_getConsumer($request['consumer_id'])->getData();
$storeBaseUrl = $this->_storeManager->getStore()->getBaseUrl();
-
- $this->_httpClient->setUri($consumerData['http_post_url']);
- $this->_httpClient->setParameterPost(array(
- 'oauth_consumer_key' => $consumerData['key'],
- 'oauth_consumer_secret' => $consumerData['secret'],
- 'store_base_url' => $storeBaseUrl
- ));
- // TODO: Uncomment this when there is a live http_post_url that we can actually post to.
- //$this->_httpClient->request(\Magento\HTTP\ZendClient::POST);
-
$verifier = $this->_tokenFactory->create()->createVerifierToken($request['consumer_id']);
+ $this->_httpClient->setUri($consumerData['http_post_url']);
+ $this->_httpClient->setParameterPost(
+ array(
+ 'oauth_consumer_key' => $consumerData['key'],
+ 'oauth_consumer_secret' => $consumerData['secret'],
+ 'store_base_url' => $storeBaseUrl,
+ 'oauth_verifier' => $verifier->getVerifier()
+ )
+ );
+ $maxredirects = $this->_getConfigValue(
+ self::XML_PATH_CONSUMER_POST_MAXREDIRECTS,
+ self::CONSUMER_POST_MAXREDIRECTS
+ );
+ $timeout = $this->_getConfigValue(
+ self::XML_PATH_CONSUMER_POST_TIMEOUT,
+ self::CONSUMER_POST_TIMEOUT
+ );
+ $this->_httpClient->setConfig(array('maxredirects' => $maxredirects, 'timeout' => $timeout));
+ $this->_httpClient->request(\Magento\HTTP\ZendClient::POST);
return array('oauth_verifier' => $verifier->getVerifier());
} catch (\Magento\Core\Exception $exception) {
throw $exception;
@@ -142,34 +181,27 @@ public function postToConsumer($request)
public function getRequestToken($signedRequest)
{
$this->_validateVersionParam($signedRequest['oauth_version']);
-
$consumer = $this->_getConsumerByKey($signedRequest['oauth_consumer_key']);
-
// must use consumer within expiration period
-
$consumerTS = strtotime($consumer->getCreatedAt());
- if (time() - $consumerTS > $this->_serviceHelper->getConsumerExpirationPeriod()) {
+ $expiry = $this->_getConfigValue(
+ self::XML_PATH_CONSUMER_EXPIRATION_PERIOD,
+ self::CONSUMER_EXPIRATION_PERIOD_DEFAULT
+ );
+ if ($this->_date->timestamp() - $consumerTS > $expiry) {
throw new \Magento\Oauth\Exception('', self::ERR_CONSUMER_KEY_INVALID);
}
-
$this->_validateNonce($signedRequest['oauth_nonce'], $consumer->getId(), $signedRequest['oauth_timestamp']);
-
$token = $this->_getTokenByConsumer($consumer->getId());
-
if ($token->getType() != \Magento\Oauth\Model\Token::TYPE_VERIFIER) {
throw new \Magento\Oauth\Exception('', self::ERR_TOKEN_REJECTED);
}
-
- //OAuth clients are not sending the verifier param for requestToken requests
- //$this->_validateVerifierParam($signedRequest['oauth_verifier'], $token->getVerifier());
-
$this->_validateSignature(
$signedRequest,
$consumer->getSecret(),
$signedRequest['http_method'],
$signedRequest['request_url']
);
-
$requestToken = $token->createRequestToken($token->getId(), $consumer->getCallBackUrl());
return array('oauth_token' => $requestToken->getToken(), 'oauth_token_secret' => $requestToken->getSecret());
}
@@ -580,4 +612,15 @@ protected function _checkRequiredParams($protocolParams, $requiredParams)
}
}
}
+
+ /**
+ * Get value from store configuration
+ *
+ * @return int
+ */
+ protected function _getConfigValue($xpath, $default)
+ {
+ $value = (int)$this->_storeManager->getStore()->getConfig($xpath);
+ return $value > 0 ? $value : $default;
+ }
}
View
1  app/code/Magento/Oauth/Service/OauthV1Interface.php
@@ -58,7 +58,6 @@
const SIGNATURE_SHA256 = 'HMAC-SHA256';
/**#@-*/
-
/**
* Create a new consumer account when an Add-On is installed.
*
View
8 app/code/Magento/Oauth/etc/adminhtml/system.xml
@@ -46,6 +46,14 @@
<label>Expiration Period</label>
<comment>Disable consumer key/secret credentials if not used within X seconds.</comment>
</field>
+ <field id="post_maxredirects" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
+ <label>OAuth consumer credentials HTTP Post maxredirects</label>
+ <comment>Number of maximum redirects for OAuth consumer credentials Post request.</comment>
+ </field>
+ <field id="post_timeout" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
+ <label>OAuth consumer credentials HTTP Post timeout</label>
+ <comment>Timeout for OAuth consumer credentials Post request within X seconds.</comment>
+ </field>
</group>
</section>
</system>
View
2  app/code/Magento/Oauth/etc/config.xml
@@ -36,6 +36,8 @@
</cleanup>
<consumer>
<expiration_period>300</expiration_period>
+ <post_maxredirects>0</post_maxredirects>
+ <post_timeout>5</post_timeout>
</consumer>
</oauth>
</default>
View
2  app/code/Magento/Paygate/Model/Authorizenet/Cards.php
@@ -171,7 +171,7 @@ public function getRefundedAmount()
/**
* Remove all cards from payment instance
*
- * @return \Magento\Paygate\Model\Authorizenet_Cart
+ * @return \Magento\Paygate\Model\Authorizenet\Cards
*/
public function flushCards()
{
View
20 app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -425,7 +425,7 @@ public function getInfoInstance()
/**
* Validate payment method information object
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\AbstractMethod
* @throws \Magento\Core\Exception
*/
public function validate()
@@ -453,7 +453,7 @@ public function validate()
* @param \Magento\Object $payment
* @param float $amount
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\AbstractMethod
* @throws \Magento\Core\Exception
*/
public function order(\Magento\Object $payment, $amount)
@@ -470,7 +470,7 @@ public function order(\Magento\Object $payment, $amount)
* @param \Magento\Object $payment
* @param float $amount
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\AbstractMethod
* @throws \Magento\Core\Exception
*/
public function authorize(\Magento\Object $payment, $amount)
@@ -487,13 +487,13 @@ public function authorize(\Magento\Object $payment, $amount)
* @param \Magento\Object $payment
* @param float $amount
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\AbstractMethod
* @throws \Magento\Core\Exception
*/
public function capture(\Magento\Object $payment, $amount)
{
if (!$this->canCapture()) {
- throw new \Magento\Core\Exception(__('Th capture action is not available.'));
+ throw new \Magento\Core\Exception(__('The capture action is not available.'));
}
return $this;
@@ -535,7 +535,7 @@ public function processBeforeRefund($invoice, $payment)
* @param \Magento\Object $payment
* @param float $amount
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\AbstractMethod
* @throws \Magento\Core\Exception
*/
public function refund(\Magento\Object $payment, $amount)
@@ -563,7 +563,7 @@ public function processCreditmemo($creditmemo, $payment)
*
* @param \Magento\Object $payment
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\AbstractMethod
*/
public function cancel(\Magento\Object $payment)
{
@@ -575,7 +575,7 @@ public function cancel(\Magento\Object $payment)
*
* @param \Magento\Object $payment
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\AbstractMethod
* @throws \Magento\Core\Exception
*/
public function void(\Magento\Object $payment)
@@ -675,7 +675,7 @@ public function assignData($data)
/**
* Prepare info instance for save
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\AbstractMethod
*/
public function prepareSave()
{
@@ -774,7 +774,7 @@ public function isApplicableToQuote($quote, $checksBitMask)
* @param string $paymentAction
* @param object $stateObject
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\AbstractMethod
*/
public function initialize($paymentAction, $stateObject)
{
View
4 app/code/Magento/Payment/Model/Method/Cc.php
@@ -118,7 +118,7 @@ public function assignData($data)
/**
* Prepare info instance for save
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\Cc
*/
public function prepareSave()
{
@@ -135,7 +135,7 @@ public function prepareSave()
/**
* Validate payment method information object
*
- * @return \Magento\Payment\Model\AbstractModel
+ * @return \Magento\Payment\Model\Method\Cc
* @throws \Magento\Core\Exception
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
View
7 app/code/Magento/Paypal/Block/Iframe.php
@@ -107,7 +107,7 @@ protected function _construct()
$this->_paymentMethodCode = $paymentCode;
$templatePath = str_replace('_', '', $paymentCode);
$templateFile = "{$templatePath}/iframe.phtml";
- if (file_exists($this->_viewFileSystem->getFilename($templateFile))) {
+ if (file_exists($this->_viewFileSystem->getFilename($templateFile, array('module' => 'Magento_Paypal')))) {
$this->setTemplate($templateFile);
} else {
$this->setTemplate('hss/iframe.phtml');
@@ -127,9 +127,8 @@ protected function _getBlock()
$this->_block = $this->getLayout()
->createBlock('Magento\\Paypal\\Block\\'
. str_replace(' ', \Magento\Autoload\IncludePath::NS_SEPARATOR,
- ucwords(str_replace(\Magento\Autoload\IncludePath::NS_SEPARATOR, ' ', $this
- ->_paymentMethodCode)))
- . '_Iframe');
+ ucwords(str_replace('_', ' ', $this->_paymentMethodCode)))
+ . '\\Iframe');
if (!$this->_block instanceof \Magento\Paypal\Block\Iframe) {
throw new \Magento\Core\Exception('Invalid block type');
}
View
2  app/code/Magento/Paypal/Model/Hostedpro.php
@@ -169,7 +169,7 @@ public function validate()
*
* @param string $paymentAction
* @param \Magento\Object $stateObject
- * @return \Magento\Payment\Model\AbstractModel|null
+ * @return \Magento\Payment\Model\Method\AbstractMethod|void
*/
public function initialize($paymentAction, $stateObject)
{
View
2  app/code/Magento/Paypal/Model/Standard.php
@@ -248,7 +248,7 @@ public function getStandardCheckoutFormFields()
*
* @param string $paymentAction
* @param object $stateObject
- * @return \Magento\Payment\Model\AbstractModel|null
+ * @return \Magento\Payment\Model\Method\AbstractMethod|void
*/
public function initialize($paymentAction, $stateObject)
{
View
2  app/code/Magento/Persistent/Model/Observer.php
@@ -637,7 +637,7 @@ protected function _expirePersistentSession()
* Clear expired persistent sessions
*
* @param \Magento\Cron\Model\Schedule $schedule
- * @return \Magento\Persistent\Model\Observer\Cron
+ * @return \Magento\Persistent\Model\Observer
*/
public function clearExpiredCronJob(\Magento\Cron\Model\Schedule $schedule)
{
View
2  app/code/Magento/Reports/view/frontend/layout/print.xml
@@ -25,7 +25,7 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="head">
- <block class="Magento\Page\Block\Html\Head\Css" name="magento-banner-widgets-css">
+ <block class="Magento\Page\Block\Html\Head\Css" name="magento-reports-widgets-css">
<arguments>
<argument name="file" xsi:type="string">Magento_Reports::widgets.css</argument>
</arguments>
View
6 app/code/Magento/Sales/Model/Billing/Agreement.php
@@ -66,7 +66,7 @@ class Agreement extends \Magento\Payment\Model\Billing\AbstractAgreement
protected $_billingAgreementFactory;
/**
- * @var \Magento\Core\Model\Date
+ * @var \Magento\Core\Model\DateFactory
*/
protected $_dateFactory;
@@ -75,7 +75,7 @@ class Agreement extends \Magento\Payment\Model\Billing\AbstractAgreement
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Sales\Model\Resource\Billing\Agreement\CollectionFactory $billingAgreementFactory
- * @param \Magento\Core\Model\Date $dateFactory
+ * @param \Magento\Core\Model\DateFactory $dateFactory
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
* @param array $data
@@ -85,7 +85,7 @@ public function __construct(
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Sales\Model\Resource\Billing\Agreement\CollectionFactory $billingAgreementFactory,
- \Magento\Core\Model\Date $dateFactory,
+ \Magento\Core\Model\DateFactory $dateFactory,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
View
2  app/code/Magento/Sales/Model/Billing/Agreement/OrdersUpdater.php
@@ -56,7 +56,7 @@ public function __construct(\Magento\Core\Model\Registry $coreRegistry, array $d
* @param mixed $argument
* @throws \DomainException
* @return mixed
- * @throws DomainException
+ * @throws \DomainException
*/
public function update($argument)
{
View
2  app/code/Magento/Sales/Model/Order/Payment.php
@@ -673,7 +673,7 @@ public function void(\Magento\Object $document)
*
* @see self::_void()
* @param float $amount
- * @return \Magento\Sales\Model\Payment
+ * @return \Magento\Sales\Model\Order\Payment
*/
public function registerVoidNotification($amount = null)
{
View
2  app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -629,7 +629,7 @@ protected function _sortTotalsList($a, $b)
/**
* Return total list
*
- * @return \Magento\Sales\Model\Order\Pdf\Total\Default[]
+ * @return \Magento\Sales\Model\Order\Pdf\Total\DefaultTotal
*/
protected function _getTotalsList()
{
View
2  app/code/Magento/SalesRule/Model/Resource/Rule/Quote/Collection.php
@@ -30,7 +30,7 @@ class Collection extends \Magento\SalesRule\Model\Resource\Rule\Collection
/**
* Add websites for load
*
- * @return \Magento\SalesRule\Model\Resource\Rule_Quote_GridCollection
+ * @return \Magento\SalesRule\Model\Resource\Rule\Quote\Collection
*/
public function _initSelect()
View
8 app/code/Magento/Usa/Model/Shipping/Carrier/Fedex.php
@@ -190,7 +190,7 @@ public function __construct(
*
* @param string $wsdl
* @param bool|int $trace
- * @return SoapClient
+ * @return \SoapClient
*/
protected function _createSoapClient($wsdl, $trace = false)
{
@@ -206,7 +206,7 @@ protected function _createSoapClient($wsdl, $trace = false)
/**
* Create rate soap client
*
- * @return SoapClient
+ * @return \SoapClient
*/
protected function _createRateSoapClient()
{
@@ -216,7 +216,7 @@ protected function _createRateSoapClient()
/**
* Create ship soap client
*
- * @return SoapClient
+ * @return \SoapClient
*/
protected function _createShipSoapClient()
{
@@ -226,7 +226,7 @@ protected function _createShipSoapClient()
/**
* Create track soap client
*
- * @return SoapClient
+ * @return \SoapClient
*/
protected function _createTrackSoapClient()
{
View
2  app/code/Magento/Webapi/Model/Soap/Server/Factory.php
@@ -56,7 +56,7 @@ public function __construct(
*
* @param string $url URL of a WSDL file
* @param array $options Options including encoding, soap_version etc
- * @return SoapServer
+ * @return \SoapServer
*/
public function create($url, $options)
{
View
2  app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
@@ -133,7 +133,7 @@ public function isHidden()
/**
* Getter
*
- * @return Widget_Model_Widget_Instance
+ * @return \Magento\Widget\Model\Widget\Instance
*/
public function getWidgetInstance()
{
View
4 app/code/Magento/Widget/view/frontend/layout/default.xml
@@ -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-cms-widgets-css">
+ <block class="Magento\Page\Block\Html\Head\Css" name="magento-widget-widgets-css">
<arguments>
- <argument name="file" xsi:type="string">Magento_VersionsCms::widgets.css</argument>
+ <argument name="file" xsi:type="string">Magento_Widget::widgets.css</argument>
</arguments>
</block>
</referenceBlock>
View
2  app/code/Magento/Wishlist/Controller/Index.php
@@ -146,7 +146,7 @@ protected function _getWishlist($wishlistId = null)
if (!$wishlist->getId() || $wishlist->getCustomerId() != $customerId) {
$wishlist = null;
throw new \Magento\Core\Exception(
- __("The requested wish list doesn\'t exist.")
+ __("The requested wish list doesn't exist.")
);
}
View
4 app/code/Magento/Wishlist/Helper/Data.php
@@ -123,7 +123,7 @@ class Data extends \Magento\Core\Helper\AbstractHelper
* @param \Magento\Core\Helper\Context $context
* @param \Magento\Core\Model\Registry $coreRegistry
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
- * @param \Magento\Customer\Model\SessionProxy $customerSession
+ * @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
*/
@@ -133,7 +133,7 @@ public function __construct(
\Magento\Core\Helper\Context $context,
\Magento\Core\Model\Registry $coreRegistry,
\Magento\Core\Model\Store\Config $coreStoreConfig,
- \Magento\Customer\Model\SessionProxy $customerSession,
+ \Magento\Customer\Model\Session $customerSession,
\Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
\Magento\Core\Model\StoreManagerInterface $storeManager
) {
View
3  app/code/Magento/Wishlist/etc/di.xml
@@ -33,6 +33,9 @@
<param name="eventManager">
<instance type="Magento\Core\Model\Event\Manager\Proxy" />
</param>
+ <param name="customerSession">
+ <instance type="Magento\Customer\Model\Session\Proxy" />
+ </param>
</type>
<type name="Magento\Wishlist\Model\Wishlist">
<param name="eventManager">
View
5 app/etc/di.xml
@@ -241,4 +241,9 @@
<value type="argument">Magento\Core\Model\Resource::PARAM_TABLE_PREFIX</value>
</param>
</type>
+ <type name="Magento\Core\Model\Url">
+ <param name="session">
+ <instance type="Magento\Core\Model\Session\Proxy" />
+ </param>
+ </type>
</config>
View
1  dev/tests/integration/framework/bootstrap.php
@@ -27,6 +27,7 @@
require_once __DIR__ . '/../../../../app/bootstrap.php';
require_once __DIR__ . '/../../static/framework/Magento/TestFramework/Utility/Classes.php';
+require_once __DIR__ . '/../../static/framework/Magento/TestFramework/Utility/AggregateInvoker.php';
$testsBaseDir = dirname(__DIR__);
$testsTmpDir = "$testsBaseDir/tmp";
View
2  dev/tests/integration/testsuite/Magento/Cache/Backend/MongoDbTest.php
@@ -56,7 +56,7 @@ protected function tearDown()
{
if (!empty($this->_connectionString) && extension_loaded('mongo')) {
$this->_model = null;
- $connection = new Mongo($this->_connectionString);
+ $connection = new \Mongo($this->_connectionString);
$connection->dropDB($this->_dbName);
}
}
View
4 .../integration/testsuite/Magento/Core/Model/Fieldset/Config/_files/partialFieldsetFirst.xml
@@ -19,8 +19,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_CatalogEvent
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -38,4 +36,4 @@
</field>
</fieldset>
</scope>
-</config>
+</config>
View
4 ...integration/testsuite/Magento/Core/Model/Fieldset/Config/_files/partialFieldsetSecond.xml
@@ -19,8 +19,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_CatalogEvent
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
@@ -39,4 +37,4 @@
</field>
</fieldset>
</scope>
-</config>
+</config>
View
4 dev/tests/integration/testsuite/Magento/Core/Model/LayoutArgumentObjectUpdater.php
@@ -35,8 +35,8 @@ class LayoutArgumentObjectUpdater implements \Magento\Core\Model\Layout\Argument
/**
* Update specified argument
*
- * @param Magento\Data\Collection $argument
- * @return Magento\Data\Collection
+ * @param \Magento\Data\Collection $argument
+ * @return \Magento\Data\Collection
*/
public function update($argument)
{
View
2  dev/tests/integration/testsuite/Magento/Install/Model/ConfigTest.php
@@ -101,7 +101,7 @@ public function setUp()
)
);
- /** @var \Magento\Logging\Model\Config\Reader $configReader */
+ /** @var \Magento\Install\Model\Config\Reader $configReader */
$configReader = $this->_objectManager->create(
'Magento\Install\Model\Config\Reader', array(
'fileResolver' => $fileResolver,
View
251 dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
@@ -31,8 +31,6 @@
class LayoutTest extends \PHPUnit_Framework_TestCase
{
- const NO_OVERRIDDEN_THEMES_MARKER = 'no-overriden-themes';
-
/**
* Cached lists of files
*
@@ -45,39 +43,44 @@ public static function tearDownAfterClass()
self::$_cachedFiles = array(); // Free memory
}
- /**
- * @param \Magento\Core\Model\Theme $theme
- * @dataProvider areasAndThemesDataProvider
- */
- public function testHandlesHierarchy(\Magento\Core\Model\Theme $theme)
+ public function testHandlesHierarchy()
{
- $xml = $this->_composeXml($theme);
+ $invoker = new \Magento\TestFramework\Utility\AggregateInvoker($this);
+ $invoker(
+ /**
+ * @param \Magento\Core\Model\Theme $theme
+ */
+ function (\Magento\Core\Model\Theme $theme) {
+ $xml = $this->_composeXml($theme);
- /**
- * There could be used an xpath "/layouts/*[@type or @owner or @parent]", but it randomly produced bugs, by
- * selecting all nodes in depth. Thus it was refactored into manual nodes extraction.
- */
- $handles = array();
- foreach ($xml->children() as $handleNode) {
- if ($handleNode->getAttribute('type')
- || $handleNode->getAttribute('owner')
- || $handleNode->getAttribute('parent')
- ) {
- $handles[] = $handleNode;
- }
- }
+ /**
+ * There could be used an xpath "/layouts/*[@type or @owner or @parent]", but it randomly produced bugs,
+ * by selecting all nodes in depth. Thus it was refactored into manual nodes extraction.
+ */
+ $handles = array();
+ foreach ($xml->children() as $handleNode) {