Permalink
Browse files

2.0.0.0-dev49

* Various improvements:
  * Unified Area configuration
  * Moved EventManager to Magento\Event lib component
  * Moved FrontController, Routers, Base Actions to Magento\App
  * Created Magento\App component in library
  * Declared public interfaces for View component into library
  * Plushe theme is set as the default theme
  * Refactor the Blacklist Pattern in the Integrity Test Suite's ClassesTest to Replace Blacklist.php Files
  * Removed JavaScript unit test TreeSuggestTest.prototype.testBind as obsolete
  * Introduced ability to register a template engine to process template files having certain extension
  * Removed support of the Twig template engine along with the corresponding component from the library
  * Removed layout flag that forced template blocks to output rendered content directly to a browser bypassing the response object
  * Moved out responsibility of rendering template debugging hints from the template block to the plugin and decorator for a template engine
* Fixed bugs:
  * Fixed inability to create product if multiple attributes are assigned to attribute set
  * Fixed inability to create a new widget instance
  * Fixed error on Customers Segments Conditions tab while the 'Number of Orders' condition is chosen
  * Fixed blank page when placing order via Ogone
  * Fixed various UI issues in Admin Panel with layout, aligning, buttons and fields
  * Fixed static tests failing to verify themes files
  • Loading branch information...
1 parent b39c047 commit 8478eac7ed90660486fbe20a701b9ddabac6f2e8 @magento-team magento-team committed Oct 25, 2013
Showing with 2,289 additions and 5,115 deletions.
  1. +23 −0 CHANGELOG.md
  2. +2 −2 app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php
  3. +3 −3 app/code/Magento/AdminNotification/Model/Survey.php
  4. +3 −3 app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
  5. +3 −3 app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
  6. +3 −3 app/code/Magento/AdminNotification/Model/System/Message/Survey.php
  7. +2 −2 app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Image.php
  8. +2 −3 app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php
  9. +3 −3 app/code/Magento/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php
  10. +3 −3 app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
  11. +3 −3 app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php
  12. +3 −3 app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php
  13. +2 −2 app/code/Magento/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php
  14. +2 −2 app/code/Magento/Adminhtml/Block/Page/Head.php
  15. +1 −1 app/code/Magento/Adminhtml/Block/Sales/Items/AbstractItems.php
  16. +1 −1 app/code/Magento/Adminhtml/Controller/Customer.php
  17. +4 −4 app/code/Magento/Adminhtml/Controller/Sales/Order/Shipment.php
  18. +2 −2 app/code/Magento/Adminhtml/Controller/Sitemap.php
  19. +2 −2 app/code/Magento/Adminhtml/Controller/System/Backup.php
  20. +1 −1 app/code/Magento/Adminhtml/Controller/System/Store.php
  21. +15 −19 app/code/Magento/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
  22. +4 −4 app/code/Magento/Adminhtml/Helper/Dashboard/Data.php
  23. +4 −4 app/code/Magento/Adminhtml/Helper/Dashboard/Order.php
  24. +4 −4 app/code/Magento/Adminhtml/Model/Email/Template.php
  25. +3 −3 app/code/Magento/Adminhtml/Model/Sales/Order/Create.php
  26. +1 −6 app/code/Magento/Adminhtml/etc/di.xml
  27. +3 −7 app/code/Magento/Adminhtml/view/adminhtml/dashboard/index.phtml
  28. +3 −3 app/code/Magento/Adminhtml/view/adminhtml/system/cache/additional.phtml
  29. +4 −4 app/code/Magento/Authorizenet/Model/Directpost.php
  30. +66 −0 app/code/Magento/Backend/App/Area/FrontNameResolver.php
  31. +65 −0 app/code/Magento/Backend/App/Request/PathInfoProcessor.php
  32. +4 −4 app/code/Magento/Backend/{Model → App}/Router/NoRouteHandler.php
  33. +15 −15 app/code/Magento/Backend/Block/Context.php
  34. +0 −2 app/code/Magento/Backend/Block/System/Config/Form/Field/Regexceptions.php
  35. +3 −3 app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
  36. +21 −21 app/code/Magento/Backend/Block/Template/Context.php
  37. +5 −5 app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
  38. +1 −1 app/code/Magento/Backend/Block/Widget/Grid/Export.php
  39. +1 −1 app/code/Magento/Backend/Block/Widget/Grid/Extended.php
  40. +2 −2 app/code/Magento/Backend/Controller/AbstractAction.php
  41. +12 −12 app/code/Magento/Backend/Controller/Context.php
  42. +1 −1 app/code/Magento/Backend/Controller/Factory.php
  43. +8 −14 app/code/Magento/Backend/Controller/Router/DefaultRouter.php
  44. +12 −65 app/code/Magento/Backend/Helper/Data.php
  45. +5 −15 app/code/Magento/Backend/Model/Auth.php
  46. +3 −3 app/code/Magento/Backend/Model/Config.php
  47. +0 −32 app/code/Magento/Backend/Model/Config/Backend/Admin/Custompath.php
  48. +3 −3 app/code/Magento/Backend/Model/Config/Backend/Admin/Robots.php
  49. +0 −84 app/code/Magento/Backend/Model/Config/Backend/Admin/Usecustompath.php
  50. +4 −4 app/code/Magento/Backend/Model/Config/Backend/File.php
  51. +3 −3 app/code/Magento/Backend/Model/Config/ScopeDefiner.php
  52. +7 −7 app/code/Magento/Backend/Model/Locale.php
  53. +3 −3 app/code/Magento/Backend/Model/Menu/Config.php
  54. +4 −4 app/code/Magento/Backend/Model/Menu/Item.php
  55. +12 −5 app/code/Magento/Backend/Model/Observer.php
  56. +11 −5 app/code/Magento/Backend/Model/Url.php
  57. +1 −1 app/code/Magento/Backend/Model/Url/Proxy.php
  58. +1 −1 app/code/Magento/Backend/etc/adminhtml/di.xml
  59. +1 −1 app/code/Magento/Backend/etc/adminhtml/system.xml
  60. +18 −9 app/code/Magento/Backend/etc/di.xml
  61. +91 −125 app/code/Magento/Backend/view/adminhtml/system/config/form/field/array.phtml
  62. +1 −1 app/code/Magento/Backend/view/adminhtml/widget/grid/column_set.phtml
  63. +14 −14 app/code/Magento/Backup/Helper/Data.php
  64. +4 −4 app/code/Magento/Backup/Model/Fs/Collection.php
  65. +3 −3 app/code/Magento/Backup/Model/Observer.php
  66. +2 −2 app/code/Magento/Bundle/Model/Product/Price.php
  67. +2 −2 app/code/Magento/Bundle/Model/Product/Type.php
  68. +3 −3 app/code/Magento/Bundle/Model/Resource/Price/Index.php
  69. +2 −2 app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
  70. +2 −2 app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
  71. +2 −2 app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
  72. +2 −7 app/code/Magento/Bundle/etc/di.xml
  73. +6 −6 app/code/Magento/Captcha/Helper/Data.php
  74. +5 −5 app/code/Magento/Captcha/Model/Observer.php
  75. +4 −4 app/code/Magento/Catalog/Helper/Product.php
  76. +1 −1 app/code/Magento/Catalog/Helper/Product/Options.php
  77. +3 −3 app/code/Magento/Catalog/Helper/Product/View.php
  78. +5 −5 app/code/Magento/Catalog/Model/Category.php
  79. +4 −4 app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
  80. +3 −3 app/code/Magento/Catalog/Model/Design.php
  81. +3 −3 app/code/Magento/Catalog/Model/Layer/Filter/Item.php
  82. +3 −3 app/code/Magento/Catalog/Model/Product.php
  83. +3 −3 app/code/Magento/Catalog/Model/Product/Action.php
  84. +6 −6 app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php
  85. +3 −3 app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
  86. +5 −5 app/code/Magento/Catalog/Model/Product/Image.php
  87. +3 −3 app/code/Magento/Catalog/Model/Product/Image/View.php
  88. +5 −5 app/code/Magento/Catalog/Model/Product/Media/Config.php
  89. +7 −7 app/code/Magento/Catalog/Model/Product/Option/Type/File.php
  90. +3 −3 app/code/Magento/Catalog/Model/Product/Status.php
  91. +3 −3 app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
  92. +2 −2 app/code/Magento/Catalog/Model/Product/Type/Configurable.php
  93. +2 −2 app/code/Magento/Catalog/Model/Product/Type/Grouped.php
  94. +3 −3 app/code/Magento/Catalog/Model/Product/Type/Price.php
  95. +2 −2 app/code/Magento/Catalog/Model/Product/Url.php
  96. +3 −3 app/code/Magento/Catalog/Model/Resource/Category.php
  97. +2 −2 app/code/Magento/Catalog/Model/Resource/Category/Attribute/Collection.php
  98. +3 −3 app/code/Magento/Catalog/Model/Resource/Category/Flat.php
  99. +2 −2 app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
  100. +3 −3 app/code/Magento/Catalog/Model/Resource/Category/Tree.php
  101. +2 −2 app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
  102. +3 −3 app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php
  103. +4 −4 app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Image.php
  104. +2 −2 app/code/Magento/Catalog/Model/Resource/Product/Attribute/Collection.php
  105. +2 −2 app/code/Magento/Catalog/Model/Resource/Product/Collection.php
  106. +2 −2 app/code/Magento/Catalog/Model/Resource/Product/Collection/AssociatedProduct.php
  107. +2 −2 app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
  108. +3 −3 app/code/Magento/Catalog/Model/Resource/Product/Flat/Indexer.php
  109. +3 −3 app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/AbstractEav.php
  110. +2 −2 app/code/Magento/Catalog/Model/Resource/Product/Indexer/Eav/Source.php
  111. +3 −3 app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php
  112. +2 −2 app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
  113. +2 −2 app/code/Magento/Catalog/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
  114. +2 −2 app/code/Magento/Catalog/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
  115. +3 −86 app/code/Magento/Catalog/etc/di.xml
  116. +0 −2 app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
  117. +2 −2 app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/Collection.php
  118. +2 −2 app/code/Magento/CatalogInventory/etc/di.xml
  119. +3 −3 app/code/Magento/CatalogRule/Model/Resource/Rule.php
  120. +2 −2 app/code/Magento/CatalogRule/Model/Rule/Action/Collection.php
  121. +3 −3 app/code/Magento/CatalogRule/Model/Rule/Job.php
  122. +3 −8 app/code/Magento/CatalogRule/etc/di.xml
  123. +3 −3 app/code/Magento/CatalogSearch/Model/Fulltext.php
  124. +3 −3 app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
  125. +2 −2 app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
  126. +3 −3 app/code/Magento/CatalogSearch/Model/Resource/Fulltext.php
  127. +2 −2 app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
  128. +2 −2 app/code/Magento/CatalogSearch/Model/Resource/Query/Collection.php
  129. +2 −2 app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
  130. +0 −15 app/code/Magento/CatalogSearch/etc/di.xml
  131. +6 −4 app/code/Magento/Centinel/Helper/Data.php
  132. +6 −6 app/code/Magento/Centinel/Model/Service.php
  133. +0 −8 app/code/Magento/Centinel/etc/adminhtml/di.xml
  134. +3 −3 app/code/Magento/Checkout/Block/Cart.php
  135. +1 −1 app/code/Magento/Checkout/Block/Cart/AbstractCart.php
  136. +1 −1 app/code/Magento/Checkout/Block/Multishipping/Overview.php
  137. +1 −1 app/code/Magento/Checkout/Controller/Cart.php
  138. +1 −1 app/code/Magento/Checkout/Controller/Multishipping.php
  139. +3 −3 app/code/Magento/Checkout/Controller/Multishipping/Address.php
  140. +1 −1 app/code/Magento/Checkout/Controller/Onepage.php
  141. +3 −3 app/code/Magento/Checkout/Helper/Data.php
  142. +3 −3 app/code/Magento/Checkout/Model/Cart.php
  143. +1 −1 app/code/Magento/Checkout/Model/Session.php
  144. +3 −3 app/code/Magento/Checkout/Model/Type/Multishipping.php
  145. +6 −6 app/code/Magento/Checkout/Model/Type/Onepage.php
  146. +2 −27 app/code/Magento/Checkout/etc/di.xml
  147. +19 −19 app/code/Magento/Cms/Controller/Router.php
  148. +9 −11 app/code/Magento/Cms/Helper/Page.php
  149. +8 −8 app/code/Magento/Cms/Helper/Wysiwyg/Images.php
  150. +3 −3 app/code/Magento/Cms/Model/Page.php
  151. +2 −2 app/code/Magento/Cms/Model/Resource/Page/Collection.php
  152. +3 −3 app/code/Magento/Cms/Model/Wysiwyg/Config.php
  153. +4 −4 app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
  154. +3 −49 app/code/Magento/Cms/etc/di.xml
  155. +7 −7 app/code/Magento/Connect/Helper/Data.php
  156. +2 −2 app/code/Magento/Connect/Model/Extension/Collection.php
  157. +72 −0 app/code/Magento/Core/App/FrontController/Plugin/Install.php
  158. +184 −0 app/code/Magento/Core/App/FrontController/Plugin/RequestPreprocessor.php
  159. +67 −0 app/code/Magento/Core/App/Request/PathInfoProcessor.php
  160. +69 −0 app/code/Magento/Core/App/Request/RewriteService.php
  161. +4 −4 app/code/Magento/Core/{Model → App}/Router/NoRouteHandler.php
  162. +18 −17 app/code/Magento/Core/Block/AbstractBlock.php
  163. +28 −28 app/code/Magento/Core/Block/Context.php
  164. +18 −86 app/code/Magento/Core/Block/Template.php
  165. +28 −28 app/code/Magento/Core/Block/Template/Context.php
  166. +0 −104 app/code/Magento/Core/Controller/Front/Router.php
  167. +0 −1 app/code/Magento/Core/Controller/Index.php
  168. +0 −764 app/code/Magento/Core/Controller/Request/HttpProxy.php
  169. +0 −141 app/code/Magento/Core/Controller/Response/Http.php
  170. +12 −16 app/code/Magento/Core/Controller/Varien/Action.php
  171. +21 −21 app/code/Magento/Core/Controller/Varien/Action/Context.php
  172. +0 −48 app/code/Magento/Core/Controller/Varien/Action/Redirect.php
  173. +0 −47 app/code/Magento/Core/Controller/Varien/DispatchableInterface.php
  174. +0 −413 app/code/Magento/Core/Controller/Varien/Front.php
  175. +24 −34 app/code/Magento/Core/Controller/Varien/Router/Base.php
  176. +3 −3 app/code/Magento/Core/Helper/AbstractHelper.php
  177. +12 −12 app/code/Magento/Core/Helper/Context.php
  178. +4 −4 app/code/Magento/Core/Helper/Css.php
  179. +6 −6 app/code/Magento/Core/Helper/Data.php
  180. +3 −3 app/code/Magento/Core/Helper/File/Storage/Database.php
  181. +4 −4 app/code/Magento/Core/Helper/Http.php
  182. +22 −22 app/code/Magento/Core/Helper/Theme.php
  183. +7 −7 app/code/Magento/Core/Helper/Translate.php
  184. +2 −2 app/code/Magento/Core/Helper/Url.php
  185. +5 −5 app/code/Magento/Core/Model/AbstractEntryPoint.php
  186. +2 −2 app/code/Magento/Core/Model/AbstractModel.php
  187. +4 −4 app/code/Magento/Core/Model/AbstractShell.php
  188. +33 −118 app/code/Magento/Core/Model/App.php
  189. +8 −8 app/code/Magento/Core/Model/App/Area.php
  190. +2 −2 app/code/Magento/Core/Model/App/Emulation.php
  191. +0 −561 app/code/Magento/Core/Model/App/Proxy.php
  192. +8 −15 app/code/Magento/Core/Model/AppInterface.php
  193. +6 −6 app/code/Magento/Core/Model/Cache/Frontend/Factory.php
  194. +2 −2 app/code/Magento/Core/Model/Cache/State.php
  195. +4 −52 app/code/Magento/Core/Model/Config.php
  196. +4 −4 app/code/Magento/Core/Model/Config/FileResolver.php
  197. +4 −4 app/code/Magento/Core/Model/Config/FileResolver/Primary.php
  198. +6 −6 app/code/Magento/Core/Model/Config/Modules/Reader.php
  199. +10 −10 app/code/Magento/Core/Model/Config/Primary.php
  200. +7 −0 app/code/Magento/Core/Model/Config/Resource.php
  201. +3 −3 app/code/Magento/Core/Model/Config/Section/Processor/Placeholder.php
  202. +3 −3 app/code/Magento/Core/Model/Config/Section/Reader/DefaultReader.php
  203. +3 −3 app/code/Magento/Core/Model/Config/Section/Reader/Store.php
  204. +3 −3 app/code/Magento/Core/Model/Config/Section/Reader/Website.php
  205. +1 −1 app/code/Magento/Core/Model/Config/ValidationState.php
  206. +8 −8 app/code/Magento/Core/Model/Context.php
  207. +12 −12 app/code/Magento/Core/Model/Cookie.php
  208. +6 −6 app/code/Magento/Core/Model/DataService/Path/Request.php
  209. +2 −2 app/code/Magento/Core/Model/Design.php
  210. +3 −3 app/code/Magento/Core/Model/Design/Backend/Exceptions.php
  211. +3 −3 app/code/Magento/Core/Model/Design/Backend/Theme.php
  212. +9 −9 app/code/Magento/Core/Model/Design/Fallback/Factory.php
  213. +2 −2 app/code/Magento/Core/Model/Design/Fallback/Rule/Theme.php
  214. +6 −6 app/code/Magento/Core/Model/Design/FileResolution/Strategy/Fallback.php
  215. +21 −19 app/code/Magento/Core/Model/Design/FileResolution/Strategy/Fallback/CachingProxy.php
  216. +2 −2 app/code/Magento/Core/Model/Design/FileResolution/Strategy/FileInterface.php
  217. +2 −2 app/code/Magento/Core/Model/Design/FileResolution/Strategy/LocaleInterface.php
  218. +3 −3 app/code/Magento/Core/Model/Design/FileResolution/Strategy/View/NotifiableInterface.php
  219. +2 −2 app/code/Magento/Core/Model/Design/FileResolution/Strategy/ViewInterface.php
  220. +10 −10 app/code/Magento/Core/Model/Design/FileResolution/StrategyPool.php
  221. +4 −4 app/code/Magento/Core/Model/Email.php
  222. +5 −5 app/code/Magento/Core/Model/Email/Template.php
  223. +3 −3 app/code/Magento/Core/Model/Email/Template/Config/Reader.php
  224. +7 −8 app/code/Magento/Core/Model/Email/Template/Filter.php
  225. +4 −4 app/code/Magento/Core/Model/EntryPoint/Cron.php
  226. +11 −6 app/code/Magento/Core/Model/EntryPoint/Http.php
  227. +1 −1 app/code/Magento/Core/Model/EntryPoint/Media.php
  228. +0 −71 app/code/Magento/Core/Model/Event/Config/SchemaLocator.php
  229. +3 −3 app/code/Magento/Core/Model/File/Storage.php
  230. +40 −69 app/code/Magento/Core/Model/Layout.php
  231. +9 −9 app/code/Magento/Core/Model/Layout/Argument/AbstractHandler.php
  232. +3 −3 app/code/Magento/Core/Model/Layout/Argument/Handler/ArrayHandler.php
  233. +2 −2 app/code/Magento/Core/Model/Layout/Argument/Handler/Helper.php
  234. +2 −2 app/code/Magento/Core/Model/Layout/Argument/Handler/Object.php
  235. +2 −2 app/code/Magento/Core/Model/Layout/Argument/Handler/Options.php
  236. +2 −2 app/code/Magento/Core/Model/Layout/Argument/Handler/String.php
  237. +4 −4 app/code/Magento/Core/Model/Layout/Argument/Handler/Url.php
  238. +2 −2 app/code/Magento/Core/Model/Layout/Argument/HandlerInterface.php
  239. +4 −4 app/code/Magento/Core/Model/Layout/Argument/Processor.php
  240. +4 −4 app/code/Magento/Core/Model/Layout/File.php
  241. +2 −2 app/code/Magento/Core/Model/Layout/File/Factory.php
  242. +4 −4 app/code/Magento/Core/Model/Layout/File/Source/Aggregated.php
  243. +5 −5 app/code/Magento/Core/Model/Layout/File/Source/Base.php
  244. +4 −4 app/code/Magento/Core/Model/Layout/File/Source/Decorator/ModuleDependency.php
  245. +1 −1 app/code/Magento/Core/Model/Layout/File/Source/Decorator/ModuleOutput.php
  246. +5 −5 app/code/Magento/Core/Model/Layout/File/Source/Override/Base.php
  247. +5 −5 app/code/Magento/Core/Model/Layout/File/Source/Override/Theme.php
  248. +5 −5 app/code/Magento/Core/Model/Layout/File/Source/Theme.php
  249. +2 −2 app/code/Magento/Core/Model/Layout/File/SourceInterface.php
  250. +20 −20 app/code/Magento/Core/Model/Layout/Merge.php
  251. +6 −6 app/code/Magento/Core/Model/Locale.php
  252. +4 −4 app/code/Magento/Core/Model/Locale/Hierarchy/Config/FileResolver.php
  253. +4 −4 app/code/Magento/Core/Model/Logger.php
  254. +3 −3 app/code/Magento/Core/Model/ModuleManager.php
  255. +8 −7 app/code/Magento/Core/Model/ObjectManager.php
  256. +3 −3 app/code/Magento/Core/Model/ObjectManager/ConfigLoader/Primary.php
  257. +1 −1 app/code/Magento/Core/Model/ObjectManager/DefinitionFactory.php
  258. +2 −2 app/code/Magento/Core/Model/Observer.php
  259. +8 −8 app/code/Magento/Core/Model/Page/Asset/MergeService.php
  260. +3 −3 app/code/Magento/Core/Model/Page/Asset/MergeStrategy/Direct.php
  261. +5 −5 app/code/Magento/Core/Model/Page/Asset/Merged.php
  262. +8 −8 app/code/Magento/Core/Model/Page/Asset/MinifyService.php
  263. +2 −2 app/code/Magento/Core/Model/Resource/Config/Value/Collection/Scoped.php
  264. +3 −3 app/code/Magento/Core/Model/Resource/Db/Collection/AbstractCollection.php
  265. +2 −2 app/code/Magento/Core/Model/Resource/Layout/Update.php
  266. +3 −3 app/code/Magento/Core/Model/Resource/Session.php
  267. +3 −3 app/code/Magento/Core/Model/Resource/Setup.php
  268. +15 −15 app/code/Magento/Core/Model/Resource/Setup/Context.php
  269. +6 −6 app/code/Magento/Core/Model/Resource/Setup/Migration.php
  270. +3 −3 app/code/Magento/Core/Model/Resource/Theme/Collection.php
  271. +2 −2 app/code/Magento/Core/Model/Resource/Theme/File/Collection.php
  272. +3 −3 app/code/Magento/Core/Model/Resource/Translate.php
  273. +3 −3 app/code/Magento/Core/Model/Resource/Type/Db/Pdo/Mysql.php
  274. +2 −2 app/code/Magento/Core/Model/Resource/Url/Rewrite/Collection.php
  275. +4 −4 app/code/Magento/Core/Model/Session/AbstractSession.php
  276. +25 −25 app/code/Magento/Core/Model/Session/Context.php
  277. +17 −17 app/code/Magento/Core/Model/Store.php
  278. +3 −3 app/code/Magento/Core/Model/Store/Storage/Db.php
  279. +6 −6 app/code/Magento/Core/Model/Store/StorageFactory.php
  280. +4 −4 app/code/Magento/Core/Model/StoreManager.php
  281. +3 −3 app/code/Magento/Core/Model/Template.php
  282. +103 −0 app/code/Magento/Core/Model/TemplateEngine/Decorator/DebugHints.php
  283. +27 −17 app/code/Magento/Core/Model/TemplateEngine/Factory.php
  284. +87 −0 app/code/Magento/Core/Model/TemplateEngine/Plugin/DebugHints.php
  285. +61 −0 app/code/Magento/Core/Model/TemplateEngine/Pool.php
  286. +0 −106 app/code/Magento/Core/Model/TemplateEngine/Twig.php
  287. +0 −228 app/code/Magento/Core/Model/TemplateEngine/Twig/CommonFunctions.php
  288. +0 −112 app/code/Magento/Core/Model/TemplateEngine/Twig/EnvironmentFactory.php
  289. +0 −118 app/code/Magento/Core/Model/TemplateEngine/Twig/Extension.php
  290. +0 −121 app/code/Magento/Core/Model/TemplateEngine/Twig/FullFileName.php
  291. +0 −164 app/code/Magento/Core/Model/TemplateEngine/Twig/LayoutFunctions.php
  292. +14 −14 app/code/Magento/Core/Model/Theme.php
  293. +8 −8 app/code/Magento/Core/Model/Theme/Collection.php
  294. +22 −18 app/code/Magento/Core/Model/Theme/CopyService.php
  295. +2 −2 app/code/Magento/Core/Model/Theme/Customization.php
  296. +11 −11 app/code/Magento/Core/Model/Theme/Customization/Path.php
  297. +2 −2 app/code/Magento/Core/Model/Theme/Domain/Factory.php
  298. +5 −5 app/code/Magento/Core/Model/Theme/Domain/Physical.php
  299. +2 −2 app/code/Magento/Core/Model/Theme/Domain/Staging.php
  300. +3 −3 app/code/Magento/Core/Model/Theme/Domain/Virtual.php
Sorry, we could not display the entire diff because too many files (1,974) changed.
View
23 CHANGELOG.md
@@ -1,3 +1,26 @@
+2.0.0.0-dev49
+=============
+* Various improvements:
+ * Unified Area configuration
+ * Moved EventManager to Magento\Event lib component
+ * Moved FrontController, Routers, Base Actions to Magento\App
+ * Created Magento\App component in library
+ * Declared public interfaces for View component into library
+ * Plushe theme is set as the default theme
+ * Refactor the Blacklist Pattern in the Integrity Test Suite's ClassesTest to Replace Blacklist.php Files
+ * Removed JavaScript unit test TreeSuggestTest.prototype.testBind as obsolete
+ * Introduced ability to register a template engine to process template files having certain extension
+ * Removed support of the Twig template engine along with the corresponding component from the library
+ * Removed layout flag that forced template blocks to output rendered content directly to a browser bypassing the response object
+ * Moved out responsibility of rendering template debugging hints from the template block to the plugin and decorator for a template engine
+* Fixed bugs:
+ * Fixed inability to create product if multiple attributes are assigned to attribute set
+ * Fixed inability to create a new widget instance
+ * Fixed error on Customers Segments Conditions tab while the 'Number of Orders' condition is chosen
+ * Fixed blank page when placing order via Ogone
+ * Fixed various UI issues in Admin Panel with layout, aligning, buttons and fields
+ * Fixed static tests failing to verify themes files
+
2.0.0.0-dev48
=============
* Various improvements:
View
4 app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php
@@ -42,15 +42,15 @@ class Collection
protected $_countBySeverity = array();
/**
- * @param \Magento\Core\Model\Event\Manager $eventManager
+ * @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Core\Model\Logger $logger
* @param \Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
* @param \Magento\Core\Model\EntityFactory $entityFactory
* @param \Magento\AdminNotification\Model\System\MessageList $messageList
* @param \Magento\Core\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
- \Magento\Core\Model\Event\Manager $eventManager,
+ \Magento\Event\ManagerInterface $eventManager,
\Magento\Core\Model\Logger $logger,
\Magento\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
\Magento\Core\Model\EntityFactory $entityFactory,
View
6 app/code/Magento/AdminNotification/Model/Survey.php
@@ -54,17 +54,17 @@ class Survey
protected $_flagFactory;
/**
- * @var \Magento\Core\Controller\Request\Http
+ * @var \Magento\App\RequestInterface
*/
protected $_request;
/**
* @param \Magento\Core\Model\FlagFactory $flagFactory
- * @param \Magento\Core\Controller\Request\Http $request
+ * @param \Magento\App\RequestInterface $request
*/
public function __construct(
\Magento\Core\Model\FlagFactory $flagFactory,
- \Magento\Core\Controller\Request\Http $request
+ \Magento\App\RequestInterface $request
) {
$this->_request = $request;
$this->_flagFactory = $flagFactory;
View
6 app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -27,7 +27,7 @@ class Baseurl
implements \Magento\AdminNotification\Model\System\MessageInterface
{
/**
- * @var \Magento\Core\Model\UrlInterface
+ * @var \Magento\UrlInterface
*/
protected $_urlBuilder;
@@ -49,13 +49,13 @@ class Baseurl
/**
* @param \Magento\Core\Model\Config $config
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
- * @param \Magento\Core\Model\UrlInterface $urlBuilder
+ * @param \Magento\UrlInterface $urlBuilder
* @param \Magento\Core\Model\Config\ValueFactory $configValueFactory
*/
public function __construct(
\Magento\Core\Model\Config $config,
\Magento\Core\Model\StoreManagerInterface $storeManager,
- \Magento\Core\Model\UrlInterface $urlBuilder,
+ \Magento\UrlInterface $urlBuilder,
\Magento\Core\Model\Config\ValueFactory $configValueFactory
) {
$this->_urlBuilder = $urlBuilder;
View
6 app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
@@ -27,7 +27,7 @@ class CacheOutdated
implements \Magento\AdminNotification\Model\System\MessageInterface
{
/**
- * @var \Magento\Core\Model\UrlInterface
+ * @var \Magento\UrlInterface
*/
protected $_urlBuilder;
@@ -43,12 +43,12 @@ class CacheOutdated
/**
* @param \Magento\AuthorizationInterface $authorization
- * @param \Magento\Core\Model\UrlInterface $urlBuilder
+ * @param \Magento\UrlInterface $urlBuilder
* @param \Magento\Core\Model\Cache\TypeListInterface $cacheTypeList
*/
public function __construct(
\Magento\AuthorizationInterface $authorization,
- \Magento\Core\Model\UrlInterface $urlBuilder,
+ \Magento\UrlInterface $urlBuilder,
\Magento\Core\Model\Cache\TypeListInterface $cacheTypeList
) {
$this->_authorization = $authorization;
View
6 app/code/Magento/AdminNotification/Model/System/Message/Survey.php
@@ -37,7 +37,7 @@ class Survey
protected $_authorization;
/**
- * @var \Magento\Core\Model\UrlInterface
+ * @var \Magento\UrlInterface
*/
protected $_urlBuilder;
@@ -49,13 +49,13 @@ class Survey
/**
* @param \Magento\Backend\Model\Auth\Session $authSession
* @param \Magento\AuthorizationInterface $authorization
- * @param \Magento\Core\Model\UrlInterface $urlBuilder
+ * @param \Magento\UrlInterface $urlBuilder
* @param \Magento\AdminNotification\Model\Survey $survey
*/
public function __construct(
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\AuthorizationInterface $authorization,
- \Magento\Core\Model\UrlInterface $urlBuilder,
+ \Magento\UrlInterface $urlBuilder,
\Magento\AdminNotification\Model\Survey $survey
) {
$this->_authorization = $authorization;
View
4 app/code/Magento/Adminhtml/Block/Catalog/Category/Helper/Image.php
@@ -45,15 +45,15 @@ class Image extends \Magento\Data\Form\Element\Image
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Data\Form\Element\Factory $factoryElement
* @param \Magento\Data\Form\Element\CollectionFactory $factoryCollection
- * @param \Magento\Core\Model\UrlInterface $urlBuilder
+ * @param \Magento\UrlInterface $urlBuilder
* @param array $attributes
*/
public function __construct(
\Magento\Core\Model\StoreManager $storeManager,
\Magento\Core\Helper\Data $coreData,
\Magento\Data\Form\Element\Factory $factoryElement,
\Magento\Data\Form\Element\CollectionFactory $factoryCollection,
- \Magento\Core\Model\UrlInterface $urlBuilder,
+ \Magento\UrlInterface $urlBuilder,
$attributes = array()
) {
$this->_storeManager = $storeManager;
View
5 app/code/Magento/Adminhtml/Block/Catalog/Form/Renderer/Config/YearRange.php
@@ -49,8 +49,7 @@ protected function _getElementHtml(\Magento\Data\Form\Element\AbstractElement $e
$from = $element->setValue(isset($values[0]) ? $values[0] : null)->getElementHtml();
$to = $element->setValue(isset($values[1]) ? $values[1] : null)->getElementHtml();
- return __('from') . ' ' . $from
- . ' '
- . __('to') . ' ' . $to;
+ return __('<label class="label"><span>from</span></label>') . $from
+ . __('<label class="label"><span>to</span></label>') . $to;
}
}
View
6 app/code/Magento/Adminhtml/Block/Catalog/Helper/Form/Wysiwyg.php
@@ -55,13 +55,13 @@ class Wysiwyg extends \Magento\Data\Form\Element\Textarea
protected $_wysiwygConfig;
/**
- * @var \Magento\Core\Model\Layout
+ * @var \Magento\View\LayoutInterface
*/
protected $_layout;
/**
* @param \Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig
- * @param \Magento\Core\Model\Layout $layout
+ * @param \Magento\View\LayoutInterface $layout
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Data\Form\Element\Factory $factoryElement
* @param \Magento\Data\Form\Element\CollectionFactory $factoryCollection
@@ -71,7 +71,7 @@ class Wysiwyg extends \Magento\Data\Form\Element\Textarea
*/
public function __construct(
\Magento\Cms\Model\Wysiwyg\Config $wysiwygConfig,
- \Magento\Core\Model\Layout $layout,
+ \Magento\View\LayoutInterface $layout,
\Magento\Core\Helper\Data $coreData,
\Magento\Data\Form\Element\Factory $factoryElement,
\Magento\Data\Form\Element\CollectionFactory $factoryCollection,
View
6 app/code/Magento/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
@@ -49,7 +49,7 @@ class Config
/**
* @var \Magento\Core\Model\App
*/
- protected $_app;
+ protected $_storeManager;
/**
* @var \Magento\Core\Model\LocaleInterface
@@ -91,7 +91,7 @@ public function __construct(
$this->_configurableType = $configurableType;
$this->_coreRegistry = $coreRegistry;
$this->_catalogData = $catalogData;
- $this->_app = $app;
+ $this->_storeManager = $app;
$this->_locale = $locale;
parent::__construct($coreData, $context, $data);
}
@@ -489,7 +489,7 @@ public function getParentTab()
*/
public function getApp()
{
- return $this->_app;
+ return $this->_storeManager;
}
/**
View
6 app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Category.php
@@ -36,7 +36,7 @@
class Category extends \Magento\Data\Form\Element\Multiselect
{
/**
- * @var \Magento\Core\Model\Layout
+ * @var \Magento\View\LayoutInterface
*/
protected $_layout;
@@ -58,7 +58,7 @@ class Category extends \Magento\Data\Form\Element\Multiselect
* @param \Magento\Data\Form\Element\Factory $factoryElement
* @param \Magento\Data\Form\Element\CollectionFactory $factoryCollection
* @param \Magento\Backend\Helper\Data $backendData
- * @param \Magento\Core\Model\Layout $layout
+ * @param \Magento\View\LayoutInterface $layout
* @param array $attributes
*/
public function __construct(
@@ -67,7 +67,7 @@ public function __construct(
\Magento\Data\Form\Element\Factory $factoryElement,
\Magento\Data\Form\Element\CollectionFactory $factoryCollection,
\Magento\Backend\Helper\Data $backendData,
- \Magento\Core\Model\Layout $layout,
+ \Magento\View\LayoutInterface $layout,
array $attributes = array()
) {
$this->_collectionFactory = $collectionFactory;
View
6 app/code/Magento/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php
@@ -42,20 +42,20 @@ class Gallery extends \Magento\Data\Form\Element\AbstractElement
protected $_storeManager;
/**
- * @var \Magento\Core\Model\Layout
+ * @var \Magento\View\LayoutInterface
*/
protected $_layout;
/**
- * @param \Magento\Core\Model\Layout $layout
+ * @param \Magento\View\LayoutInterface $layout
* @param \Magento\Core\Model\StoreManager $storeManager
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Data\Form\Element\Factory $factoryElement
* @param \Magento\Data\Form\Element\CollectionFactory $factoryCollection
* @param array $attributes
*/
public function __construct(
- \Magento\Core\Model\Layout $layout,
+ \Magento\View\LayoutInterface $layout,
\Magento\Core\Model\StoreManager $storeManager,
\Magento\Core\Helper\Data $coreData,
\Magento\Data\Form\Element\Factory $factoryElement,
View
4 app/code/Magento/Adminhtml/Block/Cms/Page/Edit/Tab/Content.php
@@ -43,7 +43,7 @@ class Content
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Data\Form\Factory $formFactory
* @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Event\Manager $eventManager
+ * @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Core\Model\Registry $coreRegistry
* @param array $data
*/
@@ -52,7 +52,7 @@ public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Data\Form\Factory $formFactory,
\Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Event\Manager $eventManager,
+ \Magento\Event\ManagerInterface $eventManager,
\Magento\Core\Model\Registry $coreRegistry,
array $data = array()
) {
View
4 app/code/Magento/Adminhtml/Block/Page/Head.php
@@ -48,7 +48,7 @@ class Head extends \Magento\Page\Block\Html\Head
/**
* @param \Magento\Core\Model\Session $session
* @param \Magento\Core\Model\LocaleInterface $locale
- * @param \Magento\Core\Model\Dir $dir
+ * @param \Magento\App\Dir $dir
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDatabase
* @param \Magento\Core\Helper\Data $coreData
@@ -62,7 +62,7 @@ class Head extends \Magento\Page\Block\Html\Head
public function __construct(
\Magento\Core\Model\Session $session,
\Magento\Core\Model\LocaleInterface $locale,
- \Magento\Core\Model\Dir $dir,
+ \Magento\App\Dir $dir,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Core\Helper\File\Storage\Database $fileStorageDatabase,
\Magento\Core\Helper\Data $coreData,
View
2 app/code/Magento/Adminhtml/Block/Sales/Items/AbstractItems.php
@@ -127,7 +127,7 @@ public function addColumnRender($column, $block, $template, $type = null)
public function getItemRenderer($type)
{
$renderer = $this->getChildBlock($type) ?: $this->getChildBlock(self::DEFAULT_TYPE);
- if (!$renderer instanceof \Magento\Core\Block) {
+ if (!$renderer instanceof \Magento\View\Element\BlockInterface) {
throw new \RuntimeException('Renderer for type "' . $type . '" does not exist.');
}
foreach ($this->_columnRenders as $columnType => $columnRenderer) {
View
2 app/code/Magento/Adminhtml/Controller/Customer.php
@@ -846,7 +846,7 @@ public function viewfileAction()
return $this->norouteAction();
}
- $path = $this->_objectManager->get('Magento\Core\Model\Dir')->getDir('media') . DS . 'customer';
+ $path = $this->_objectManager->get('Magento\App\Dir')->getDir('media') . DS . 'customer';
/** @var \Magento\Filesystem $filesystem */
$filesystem = $this->_objectManager->get('Magento\Filesystem');
View
8 app/code/Magento/Adminhtml/Controller/Sales/Order/Shipment.php
@@ -704,8 +704,8 @@ protected function _createPdfPageFromImageString($imageString)
{
/** @var \Magento\Filesystem $filesystem */
$filesystem = $this->_objectManager->get('Magento\Filesystem');
- /** @var $tmpDir \Magento\Core\Model\Dir */
- $tmpDir = $this->_objectManager->get('Magento\Core\Model\Dir', $filesystem->getWorkingDirectory());
+ /** @var $tmpDir \Magento\App\Dir */
+ $tmpDir = $this->_objectManager->get('Magento\App\Dir', $filesystem->getWorkingDirectory());
$image = imagecreatefromstring($imageString);
if (!$image) {
return false;
@@ -716,7 +716,7 @@ protected function _createPdfPageFromImageString($imageString)
$page = new \Zend_Pdf_Page($xSize, $ySize);
imageinterlace($image, 0);
- $tmpFileName = $tmpDir->getDir(\Magento\Core\Model\Dir::TMP) . 'shipping_labels_'
+ $tmpFileName = $tmpDir->getDir(\Magento\App\Dir::TMP) . 'shipping_labels_'
. uniqid(mt_rand()) . time() . '.png';
imagepng($image, $tmpFileName);
$pdfImage = \Zend_Pdf_Image::imageWithPath($tmpFileName);
@@ -728,7 +728,7 @@ protected function _createPdfPageFromImageString($imageString)
/**
* Return grid with shipping items for Ajax request
*
- * @return \Magento\Core\Controller\Response\Http
+ * @return \Magento\App\ResponseInterface
*/
public function getShippingItemsGridAction()
{
View
4 app/code/Magento/Adminhtml/Controller/Sitemap.php
@@ -175,9 +175,9 @@ public function saveAction()
$fileName = $model->getSitemapFilename();
$filesystem->setWorkingDirectory(
- $this->_objectManager->get('Magento\Core\Model\Dir')->getDir() . $model->getSitemapPath()
+ $this->_objectManager->get('Magento\App\Dir')->getDir() . $model->getSitemapPath()
);
- $filePath = $this->_objectManager->get('Magento\Core\Model\Dir')->getDir()
+ $filePath = $this->_objectManager->get('Magento\App\Dir')->getDir()
. $model->getSitemapPath() . DS . $fileName;
if ($fileName && $filesystem->isFile($filePath)) {
View
4 app/code/Magento/Adminhtml/Controller/System/Backup.php
@@ -143,7 +143,7 @@ public function createAction()
}
if ($type != \Magento\Backup\Helper\Data::TYPE_DB) {
- $backupManager->setRootDir($this->_objectManager->get('Magento\Core\Model\Dir')->getDir())
+ $backupManager->setRootDir($this->_objectManager->get('Magento\App\Dir')->getDir())
->addIgnorePaths($helper->getBackupIgnorePaths());
}
@@ -274,7 +274,7 @@ public function rollbackAction()
if ($type != \Magento\Backup\Helper\Data::TYPE_DB) {
- $backupManager->setRootDir($this->_objectManager->get('Magento\Core\Model\Dir')->getDir())
+ $backupManager->setRootDir($this->_objectManager->get('Magento\App\Dir')->getDir())
->addIgnorePaths($helper->getRollbackIgnorePaths());
if ($this->getRequest()->getParam('use_ftp', false)) {
View
2 app/code/Magento/Adminhtml/Controller/System/Store.php
@@ -471,7 +471,7 @@ protected function _backupDatabase($failPath, $arguments=array())
$backup = $this->_objectManager->create('Magento\Backup\Model\Backup')
->setTime(time())
->setType('db')
- ->setPath($this->_objectManager->get('Magento\Core\Model\Dir')->getDir('var') . DS . 'backups');
+ ->setPath($this->_objectManager->get('Magento\App\Dir')->getDir('var') . DS . 'backups');
$backupDb->createBackup($backup);
$this->_getSession()->addSuccess(__('The database was backed up.'));
View
34 app/code/Magento/Adminhtml/Helper/Catalog/Product/Edit/Action/Attribute.php
@@ -34,7 +34,7 @@ class Attribute extends \Magento\Backend\Helper\Data
/**
* Selected products for mass-update
*
- * @var \Magento\Catalog\Model\Entity\Product\Collection
+ * @var \Magento\Catalog\Model\Resource\Product\Collection
*/
protected $_products;
@@ -68,41 +68,37 @@ class Attribute extends \Magento\Backend\Helper\Data
protected $_eavConfig;
/**
- * @param \Magento\Eav\Model\Config $eavConfig
- * @param \Magento\Backend\Model\Session $session
- * @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory
* @param \Magento\Core\Helper\Context $context
* @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\ConfigInterface $applicationConfig
* @param \Magento\Core\Model\Config\Primary $primaryConfig
- * @param \Magento\Core\Model\RouterList $routerList
- * @param \Magento\Core\Model\AppInterface $app
+ * @param \Magento\App\RouterList $routerList
+ * @param \Magento\Core\Model\App\Proxy $app
* @param \Magento\Backend\Model\Url $backendUrl
* @param \Magento\Backend\Model\Auth $auth
- * @param string $defaultAreaFrontName
- * @param string $backendFrontName
+ * @param \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver
+ * @param \Magento\Eav\Model\Config $eavConfig
+ * @param \Magento\Backend\Model\Session $session
+ * @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory
*/
public function __construct(
- \Magento\Eav\Model\Config $eavConfig,
- \Magento\Backend\Model\Session $session,
- \Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory,
\Magento\Core\Helper\Context $context,
\Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\ConfigInterface $applicationConfig,
\Magento\Core\Model\Config\Primary $primaryConfig,
- \Magento\Core\Model\RouterList $routerList,
- \Magento\Core\Model\AppInterface $app,
+ \Magento\App\RouterList $routerList,
+ \Magento\Core\Model\App\Proxy $app,
\Magento\Backend\Model\Url $backendUrl,
\Magento\Backend\Model\Auth $auth,
- $defaultAreaFrontName,
- $backendFrontName
+ \Magento\Backend\App\Area\FrontNameResolver $frontNameResolver,
+ \Magento\Eav\Model\Config $eavConfig,
+ \Magento\Backend\Model\Session $session,
+ \Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory
) {
+
$this->_eavConfig = $eavConfig;
$this->_session = $session;
$this->_productsFactory = $productsFactory;
parent::__construct(
- $context, $coreData, $applicationConfig, $primaryConfig, $routerList, $app, $backendUrl, $auth,
- $defaultAreaFrontName, $backendFrontName
+ $context, $coreData, $primaryConfig, $routerList, $app, $backendUrl, $auth, $frontNameResolver
);
}
View
8 app/code/Magento/Adminhtml/Helper/Dashboard/Data.php
@@ -41,29 +41,29 @@ class Data extends \Magento\Core\Helper\Data
/**
* @param \Magento\Core\Helper\Context $context
- * @param \Magento\Core\Model\Event\Manager $eventManager
+ * @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Core\Helper\Http $coreHttp
* @param \Magento\Core\Model\Config $config
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Core\Model\StoreManager $storeManager
* @param \Magento\Core\Model\Locale $locale
* @param \Magento\Core\Model\Date $dateModel
- * @param \Magento\Core\Model\App\State $appState
+ * @param \Magento\App\State $appState
* @param \Magento\Core\Model\Encryption $encryptor
* @param \Magento\Core\Model\StoreManager $storeManager
* @param string $installDate
* @param bool $dbCompatibleMode
*/
public function __construct(
\Magento\Core\Helper\Context $context,
- \Magento\Core\Model\Event\Manager $eventManager,
+ \Magento\Event\ManagerInterface $eventManager,
\Magento\Core\Helper\Http $coreHttp,
\Magento\Core\Model\Config $config,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Core\Model\StoreManager $storeManager,
\Magento\Core\Model\Locale $locale,
\Magento\Core\Model\Date $dateModel,
- \Magento\Core\Model\App\State $appState,
+ \Magento\App\State $appState,
\Magento\Core\Model\Encryption $encryptor,
$installDate,
$dbCompatibleMode = true
View
8 app/code/Magento/Adminhtml/Helper/Dashboard/Order.php
@@ -38,28 +38,28 @@ class Order extends \Magento\Adminhtml\Helper\Dashboard\AbstractDashboard
/**
* @param \Magento\Core\Helper\Context $context
- * @param \Magento\Core\Model\Event\Manager $eventManager
+ * @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Core\Helper\Http $coreHttp
* @param \Magento\Core\Model\Config $config
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Core\Model\StoreManager $storeManager
* @param \Magento\Core\Model\Locale $locale
* @param \Magento\Core\Model\Date $dateModel
- * @param \Magento\Core\Model\App\State $appState
+ * @param \Magento\App\State $appState
* @param \Magento\Core\Model\Encryption $encryptor
* @param \Magento\Reports\Model\Resource\Order\Collection $orderCollection
* @param bool $dbCompatibleMode
*/
public function __construct(
\Magento\Core\Helper\Context $context,
- \Magento\Core\Model\Event\Manager $eventManager,
+ \Magento\Event\ManagerInterface $eventManager,
\Magento\Core\Helper\Http $coreHttp,
\Magento\Core\Model\Config $config,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Core\Model\StoreManager $storeManager,
\Magento\Core\Model\Locale $locale,
\Magento\Core\Model\Date $dateModel,
- \Magento\Core\Model\App\State $appState,
+ \Magento\App\State $appState,
\Magento\Core\Model\Encryption $encryptor,
\Magento\Reports\Model\Resource\Order\Collection $orderCollection,
$dbCompatibleMode = true
View
8 app/code/Magento/Adminhtml/Model/Email/Template.php
@@ -53,12 +53,12 @@ class Template extends \Magento\Core\Model\Email\Template
* @param \Magento\Filesystem $filesystem
* @param \Magento\Core\Model\View\Url $viewUrl
* @param \Magento\Core\Model\View\FileSystem $viewFileSystem
- * @param \Magento\Core\Model\View\DesignInterface $design
+ * @param \Magento\View\DesignInterface $design
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Core\Model\Config $coreConfig
* @param \Magento\Core\Model\Email\Template\FilterFactory $emailFilterFactory
* @param \Magento\Core\Model\StoreManager $storeManager
- * @param \Magento\Core\Model\Dir $dir
+ * @param \Magento\App\Dir $dir
* @param \Magento\Core\Model\Email\Template\Config $emailConfig
* @param \Magento\Backend\Model\Config\Structure $structure
* @param array $data
@@ -72,12 +72,12 @@ public function __construct(
\Magento\Filesystem $filesystem,
\Magento\Core\Model\View\Url $viewUrl,
\Magento\Core\Model\View\FileSystem $viewFileSystem,
- \Magento\Core\Model\View\DesignInterface $design,
+ \Magento\View\DesignInterface $design,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Core\Model\Config $coreConfig,
\Magento\Core\Model\Email\Template\FilterFactory $emailFilterFactory,
\Magento\Core\Model\StoreManager $storeManager,
- \Magento\Core\Model\Dir $dir,
+ \Magento\App\Dir $dir,
\Magento\Core\Model\Email\Template\Config $emailConfig,
\Magento\Backend\Model\Config\Structure $structure,
array $data = array()
View
6 app/code/Magento/Adminhtml/Model/Sales/Order/Create.php
@@ -142,7 +142,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
/**
* Core event manager proxy
*
- * @var \Magento\Core\Model\Event\Manager
+ * @var \Magento\Event\ManagerInterface
*/
protected $_eventManager = null;
@@ -158,7 +158,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
/**
* @param \Magento\ObjectManager $objectManager
- * @param \Magento\Core\Model\Event\Manager $eventManager
+ * @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Core\Model\Registry $coreRegistry
* @param \Magento\Sales\Model\Config $salesConfig
@@ -168,7 +168,7 @@ class Create extends \Magento\Object implements \Magento\Checkout\Model\Cart\Car
*/
public function __construct(
\Magento\ObjectManager $objectManager,
- \Magento\Core\Model\Event\Manager $eventManager,
+ \Magento\Event\ManagerInterface $eventManager,
\Magento\Core\Helper\Data $coreData,
\Magento\Core\Model\Registry $coreRegistry,
\Magento\Sales\Model\Config $salesConfig,
View
7 app/code/Magento/Adminhtml/etc/di.xml
@@ -29,14 +29,9 @@
<instance type="Magento\Core\Model\Cache\Type\Translate" />
</param>
</type>
- <type name="Magento\Adminhtml\Model\Sales\Order\Create">
- <param name="eventManager">
- <instance type="Magento\Core\Model\Event\Manager\Proxy" />
- </param>
- </type>
<type name="Magento\Adminhtml\Helper\Dashboard\Data">
<param name="installDate">
- <value type="argument">Magento\Core\Model\App\State::PARAM_INSTALL_DATE</value>
+ <value type="argument">Magento\App\State::PARAM_INSTALL_DATE</value>
</param>
</type>
<type name="Magento\Adminhtml\Block\Rating\Edit\Tab\Form">
View
10 app/code/Magento/Adminhtml/view/adminhtml/dashboard/index.phtml
@@ -98,13 +98,9 @@ function toggleCal(id) {
<?php if (is_array($this->getChildBlock('diagrams')->getTabsIds())) : ?>
<div id="diagram_tab_content"></div>
<?php endif; ?>
- <div style="margin:20px;">
- <?php echo $this->getChildHtml('totals') ?>
- </div>
- <div style="margin:20px;">
- <?php echo $this->getChildHtml('grids') ?>
- <div id="grid_tab_content"></div>
- </div>
+ <?php echo $this->getChildHtml('totals') ?>
+ <?php echo $this->getChildHtml('grids') ?>
+ <div id="grid_tab_content"></div>
</div>
</div>
<div class="side-col">
View
6 app/code/Magento/Adminhtml/view/adminhtml/system/cache/additional.phtml
@@ -24,21 +24,21 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
?>
-<div class="fieldset">
+<div class="fieldset additional-cache-management">
<div class="legend">
<span><?php echo __('Additional Cache Management') ?></span>
</div>
<div class="field">
<button onclick="setLocation('<?php echo $this->getCleanImagesUrl()?>')" type="button">
<?php echo __('Flush Catalog Images Cache') ?>
</button>
- <span class="label"><?php echo __('Pregenerated product images files')?></span>
+ <label class="label"><?php echo __('Pregenerated product images files')?></label>
</div>
<div class="field">
<button onclick="setLocation('<?php echo $this->getCleanMediaUrl()?>')" type="button">
<?php echo __('Flush JavaScript/CSS Cache') ?>
</button>
- <span class="label"><?php echo __('Themes JavaScript and CSS files combined to one file.')?></span>
+ <label class="label"><?php echo __('Themes JavaScript and CSS files combined to one file.')?></label>
</div>
<?php echo $this->getChildHtml(); ?>
</div>
View
8 app/code/Magento/Authorizenet/Model/Directpost.php
@@ -82,9 +82,9 @@ class Directpost extends \Magento\Paygate\Model\Authorizenet
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Core\Model\Session\AbstractSession $session
* @param \Magento\Core\Model\Logger $logger
- * @param \Magento\Core\Model\Event\Manager $eventManager
+ * @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\Paygate\Helper\Data $paygateData
- * @param \Magento\Core\Model\ModuleListInterface $moduleList
+ * @param \Magento\App\ModuleListInterface $moduleList
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Payment\Helper\Data $paymentData
* @param \Magento\Core\Model\Log\AdapterFactory $logAdapterFactory
@@ -104,9 +104,9 @@ public function __construct(
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Core\Model\Session\AbstractSession $session,
\Magento\Core\Model\Logger $logger,
- \Magento\Core\Model\Event\Manager $eventManager,
+ \Magento\Event\ManagerInterface $eventManager,
\Magento\Paygate\Helper\Data $paygateData,
- \Magento\Core\Model\ModuleListInterface $moduleList,
+ \Magento\App\ModuleListInterface $moduleList,
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Payment\Helper\Data $paymentData,
\Magento\Core\Model\Log\AdapterFactory $logAdapterFactory,
View
66 app/code/Magento/Backend/App/Area/FrontNameResolver.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @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)
+ */
+namespace Magento\Backend\App\Area;
+
+class FrontNameResolver implements \Magento\App\Area\FrontNameResolverInterface
+{
+ const XML_PATH_USE_CUSTOM_ADMIN_PATH = 'admin/url/use_custom_path';
+ const XML_PATH_CUSTOM_ADMIN_PATH = 'admin/url/custom_path';
+
+ const PARAM_BACKEND_FRONT_NAME = 'backend.frontName';
+
+ /**
+ * @var string
+ */
+ protected $_defaultFrontName;
+
+ /**
+ * @var \Magento\Core\Model\ConfigInterface
+ */
+ protected $_config;
+
+ /**
+ * @param \Magento\Core\Model\ConfigInterface $config
+ * @param string $defaultFrontName
+ */
+ public function __construct(\Magento\Core\Model\ConfigInterface $config, $defaultFrontName)
+ {
+ $this->_config = $config;
+ $this->_defaultFrontName = $defaultFrontName;
+ }
+
+ /**
+ * Retrieve area front name
+ *
+ * @return string
+ */
+ public function getFrontName()
+ {
+ $isCustomPathUsed = (bool)(string)$this->_config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_PATH, 'default');
+ if ($isCustomPathUsed) {
+ return (string)$this->_config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH, 'default');
+ }
+ return $this->_defaultFrontName;
+ }
+}
View
65 app/code/Magento/Backend/App/Request/PathInfoProcessor.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @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)
+ */
+namespace Magento\Backend\App\Request;
+
+class PathInfoProcessor implements \Magento\App\Request\PathInfoProcessorInterface
+{
+ /**
+ * @var \Magento\Backend\Helper\Data
+ */
+ private $_helper;
+ /**
+ * @var \Magento\Core\App\Request\PathInfoProcessor
+ */
+ private $_subject;
+
+ /**
+ * @param \Magento\Core\App\Request\PathInfoProcessor $subject
+ * @param \Magento\Backend\Helper\Data $helper
+ */
+ public function __construct(
+ \Magento\Core\App\Request\PathInfoProcessor $subject, \Magento\Backend\Helper\Data $helper
+ ) {
+ $this->_helper = $helper;
+ $this->_subject = $subject;
+ }
+
+ /**
+ * Process path info
+ *
+ * @param \Magento\App\RequestInterface $request
+ * @param string $pathInfo
+ * @return string
+ */
+ public function process(\Magento\App\RequestInterface $request, $pathInfo)
+ {
+ $pathParts = explode('/', ltrim($pathInfo, '/'), 2);
+ $storeCode = $pathParts[0];
+
+ if ($storeCode != $this->_helper->getAreaFrontName()) {
+ return $this->_subject->process($request, $pathInfo);
+ }
+ return $pathInfo;
+ }
+}
View
8 ...o/Backend/Model/Router/NoRouteHandler.php → ...nto/Backend/App/Router/NoRouteHandler.php
@@ -24,9 +24,9 @@
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-namespace Magento\Backend\Model\Router;
+namespace Magento\Backend\App\Router;
-class NoRouteHandler implements \Magento\Core\Model\Router\NoRouteHandlerInterface
+class NoRouteHandler implements \Magento\Appl\Router\NoRouteHandlerInterface
{
/**
* @var \Magento\Backend\Helper\Data
@@ -44,10 +44,10 @@ public function __construct(\Magento\Backend\Helper\Data $helper)
/**
* Check and process no route request
*
- * @param \Magento\Core\Controller\Request\Http $request
+ * @param \Magento\App\RequestInterface $request
* @return bool
*/
- public function process(\Magento\Core\Controller\Request\Http $request)
+ public function process(\Magento\App\RequestInterface $request)
{
$requestPathParams = explode('/', trim($request->getPathInfo(), '/'));
$areaFrontName = array_shift($requestPathParams);
View
30 app/code/Magento/Backend/Block/Context.php
@@ -36,41 +36,41 @@ class Context extends \Magento\Core\Block\Context
protected $_authorization;
/**
- * @param \Magento\Core\Controller\Request\Http $request
- * @param \Magento\Core\Model\Layout $layout
- * @param \Magento\Core\Model\Event\Manager $eventManager
- * @param \Magento\Core\Model\UrlInterface $urlBuilder
+ * @param \Magento\App\RequestInterface $request
+ * @param \Magento\View\LayoutInterface $layout
+ * @param \Magento\Event\ManagerInterface $eventManager
+ * @param \Magento\UrlInterface $urlBuilder
* @param \Magento\Core\Model\Translate $translator
* @param \Magento\Core\Model\CacheInterface $cache
- * @param \Magento\Core\Model\View\DesignInterface $design
+ * @param \Magento\View\DesignInterface $design
* @param \Magento\Core\Model\Session\AbstractSession $session
* @param \Magento\Core\Model\Store\Config $storeConfig
- * @param \Magento\Core\Controller\Varien\Front $frontController
+ * @param \Magento\App\FrontController $frontController
* @param \Magento\Core\Model\Factory\Helper $helperFactory
* @param \Magento\Core\Model\View\Url $viewUrl
- * @param \Magento\Core\Model\View\Config $viewConfig
+ * @param \Magento\View\ConfigInterface $viewConfig
* @param \Magento\Core\Model\Cache\StateInterface $cacheState
* @param \Magento\AuthorizationInterface $authorization
* @param \Magento\Core\Model\Logger $logger
* @param \Magento\Core\Model\App $app
* @param array $data
- *
+ *
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Controller\Request\Http $request,
- \Magento\Core\Model\Layout $layout,
- \Magento\Core\Model\Event\Manager $eventManager,
- \Magento\Core\Model\UrlInterface $urlBuilder,
+ \Magento\App\RequestInterface $request,
+ \Magento\View\LayoutInterface $layout,
+ \Magento\Event\ManagerInterface $eventManager,
+ \Magento\UrlInterface $urlBuilder,
\Magento\Core\Model\Translate $translator,
\Magento\Core\Model\CacheInterface $cache,
- \Magento\Core\Model\View\DesignInterface $design,
+ \Magento\View\DesignInterface $design,
\Magento\Core\Model\Session\AbstractSession $session,
\Magento\Core\Model\Store\Config $storeConfig,
- \Magento\Core\Controller\Varien\Front $frontController,
+ \Magento\App\FrontController $frontController,
\Magento\Core\Model\Factory\Helper $helperFactory,
\Magento\Core\Model\View\Url $viewUrl,
- \Magento\Core\Model\View\Config $viewConfig,
+ \Magento\View\ConfigInterface $viewConfig,
\Magento\Core\Model\Cache\StateInterface $cacheState,
\Magento\AuthorizationInterface $authorization,
\Magento\Core\Model\Logger $logger,
View
2 app/code/Magento/Backend/Block/System/Config/Form/Field/Regexceptions.php
@@ -70,11 +70,9 @@ protected function _construct()
{
$this->addColumn('search', array(
'label' => __('Search String'),
- 'style' => 'width:120px',
));
$this->addColumn('value', array(
'label' => __('Design Theme'),
- 'style' => 'width:120px',
));
$this->_addAfter = false;
$this->_addButtonLabel = __('Add \Exception');
View
6 app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
@@ -49,20 +49,20 @@ class DisableOutput
protected $_values;
/**
- * @var \Magento\Core\Model\ModuleListInterface
+ * @var \Magento\App\ModuleListInterface
*/
protected $_moduleList;
/**
* @param \Magento\Backend\Block\Context $context
* @param \Magento\Backend\Model\Auth\Session $authSession
- * @param \Magento\Core\Model\ModuleListInterface $moduleList
+ * @param \Magento\App\ModuleListInterface $moduleList
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Context $context,
\Magento\Backend\Model\Auth\Session $authSession,
- \Magento\Core\Model\ModuleListInterface $moduleList,
+ \Magento\App\ModuleListInterface $moduleList,
array $data = array()
) {
parent::__construct($context, $authSession, $data);
View
42 app/code/Magento/Backend/Block/Template/Context.php
@@ -47,53 +47,53 @@ class Context extends \Magento\Core\Block\Template\Context
/**
* @param \Magento\Core\Model\StoreManager $storeManager
- * @param \Magento\Core\Controller\Request\Http $request
- * @param \Magento\Core\Model\Layout $layout
- * @param \Magento\Core\Model\Event\Manager $eventManager
- * @param \Magento\Core\Model\UrlInterface $urlBuilder
+ * @param \Magento\App\RequestInterface $request
+ * @param \Magento\View\LayoutInterface $layout
+ * @param \Magento\Event\ManagerInterface $eventManager
+ * @param \Magento\UrlInterface $urlBuilder
* @param \Magento\Core\Model\Translate $translator
* @param \Magento\Core\Model\CacheInterface $cache
- * @param \Magento\Core\Model\View\DesignInterface $design
+ * @param \Magento\View\DesignInterface $design
* @param \Magento\Core\Model\Session $session
* @param \Magento\Core\Model\Store\Config $storeConfig
- * @param \Magento\Core\Controller\Varien\Front $frontController
+ * @param \Magento\App\FrontController $frontController
* @param \Magento\Core\Model\Factory\Helper $helperFactory
* @param \Magento\Core\Model\View\Url $viewUrl
- * @param \Magento\Core\Model\View\Config $viewConfig
+ * @param \Magento\View\ConfigInterface $viewConfig
* @param \Magento\Core\Model\Cache\StateInterface $cacheState
- * @param \Magento\Core\Model\Dir $dirs
+ * @param \Magento\App\Dir $dirs
* @param \Magento\Core\Model\Logger $logger
* @param \Magento\Filesystem $filesystem
* @param \Magento\Core\Model\View\FileSystem $viewFileSystem
- * @param \Magento\Core\Model\TemplateEngine\Factory $engineFactory
+ * @param \Magento\Core\Model\TemplateEngine\Pool $enginePool
* @param \Magento\AuthorizationInterface $authorization
* @param \Magento\Core\Model\App $app
* @param \Magento\Backend\Model\Session $backendSession
* @param \Magento\Core\Model\LocaleInterface $locale
- *
+ *
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Core\Model\StoreManager $storeManager,
- \Magento\Core\Controller\Request\Http $request,
- \Magento\Core\Model\Layout $layout,
- \Magento\Core\Model\Event\Manager $eventManager,
- \Magento\Core\Model\UrlInterface $urlBuilder,
+ \Magento\App\RequestInterface $request,
+ \Magento\View\LayoutInterface $layout,
+ \Magento\Event\ManagerInterface $eventManager,
+ \Magento\UrlInterface $urlBuilder,
\Magento\Core\Model\Translate $translator,
\Magento\Core\Model\CacheInterface $cache,
- \Magento\Core\Model\View\DesignInterface $design,
+ \Magento\View\DesignInterface $design,
\Magento\Core\Model\Session $session,
\Magento\Core\Model\Store\Config $storeConfig,
- \Magento\Core\Controller\Varien\Front $frontController,
+ \Magento\App\FrontController $frontController,
\Magento\Core\Model\Factory\Helper $helperFactory,
\Magento\Core\Model\View\Url $viewUrl,
- \Magento\Core\Model\View\Config $viewConfig,
+ \Magento\View\ConfigInterface $viewConfig,
\Magento\Core\Model\Cache\StateInterface $cacheState,
- \Magento\Core\Model\Dir $dirs,
+ \Magento\App\Dir $dirs,
\Magento\Core\Model\Logger $logger,
\Magento\Filesystem $filesystem,
\Magento\Core\Model\View\FileSystem $viewFileSystem,
- \Magento\Core\Model\TemplateEngine\Factory $engineFactory,
+ \Magento\Core\Model\TemplateEngine\Pool $enginePool,
\Magento\AuthorizationInterface $authorization,
\Magento\Core\Model\App $app,
\Magento\Backend\Model\Session $backendSession,
@@ -102,7 +102,7 @@ public function __construct(
parent::__construct(
$request, $layout, $eventManager, $urlBuilder, $translator, $cache, $design, $session, $storeConfig,
$frontController, $helperFactory, $viewUrl, $viewConfig, $cacheState,
- $dirs, $logger, $filesystem, $viewFileSystem, $engineFactory, $app
+ $dirs, $logger, $filesystem, $viewFileSystem, $enginePool, $app
);
$this->_storeManager = $storeManager;
$this->_authorization = $authorization;
@@ -123,7 +123,7 @@ public function getStoreManager()
/**
* Retrieve Authorization
*
- * @return \\Magento\AuthorizationInterface
+ * @return \Magento\AuthorizationInterface
*/
public function getAuthorization()
{
View
10 app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -49,7 +49,7 @@ class Currency
*
* @var \Magento\Core\Model\App
*/
- protected $_app;
+ protected $_storeManager;
/**
* Locale
@@ -65,20 +65,20 @@ class Currency
/**
* @param \Magento\Backend\Block\Context $context
- * @param \Magento\Core\Model\App $app
+ * @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Model\LocaleInterface $locale
* @param \Magento\Directory\Model\Currency\DefaultLocator $currencyLocator
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Context $context,
- \Magento\Core\Model\App $app,
+ \Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Core\Model\LocaleInterface $locale,
\Magento\Directory\Model\Currency\DefaultLocator $currencyLocator,
array $data = array()
) {
parent::__construct($context, $data);
- $this->_app = $app;
+ $this->_storeManager = $storeManager;
$this->_locale = $locale;
$this->_currencyLocator = $currencyLocator;
}
@@ -135,7 +135,7 @@ protected function _getRate($row)
if ($rate = $row->getData($this->getColumn()->getRateField())) {
return floatval($rate);
}
- return $this->_app->getStore()->getBaseCurrency()->getRate($this->_getCurrencyCode($row));
+ return $this->_storeManager->getStore()->getBaseCurrency()->getRate($this->_getCurrencyCode($row));
}
/**
View
2 app/code/Magento/Backend/Block/Widget/Grid/Export.php
@@ -91,7 +91,7 @@ protected function _construct()
$this->addExportType($type['urlPath'], $type['label']);
}
}
- $this->_exportPath = $this->_dirs->getDir(\Magento\Core\Model\Dir::VAR_DIR) . DS . 'export';
+ $this->_exportPath = $this->_dirs->getDir(\Magento\App\Dir::VAR_DIR) . DS . 'export';
}
/**
View
2 app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -184,7 +184,7 @@ protected function _construct()
{
parent::_construct();
$this->_emptyText = __('We couldn\'t find any records.');
- $this->_exportPath = $this->_dirs->getDir(\Magento\Core\Model\Dir::VAR_DIR) . DS . 'export';
+ $this->_exportPath = $this->_dirs->getDir(\Magento\App\Dir::VAR_DIR) . DS . 'export';
}
/**
View
4 app/code/Magento/Backend/Controller/AbstractAction.php
@@ -349,9 +349,9 @@ protected function _initAuthentication()
/**
* Process not logged in user data
*
- * @param \Magento\Core\Controller\Request\Http $request
+ * @param \Magento\App\RequestInterface $request
*/
- protected function _processNotLoggedInUser(\Magento\Core\Controller\Request\Http $request)
+ protected function _processNotLoggedInUser(\Magento\App\RequestInterface $request)
{
$isRedirectNeeded = false;
if ($request->getPost('login') && $this->_performLogin()) {
View
24 app/code/Magento/Backend/Controller/Context.php
@@ -70,31 +70,31 @@ class Context extends \Magento\Core\Controller\Varien\Action\Context
/**
* @param \Magento\Core\Model\Logger $logger
- * @param \Magento\Core\Controller\Request\Http $request
- * @param \Magento\Core\Controller\Response\Http $response
+ * @param \Magento\App\RequestInterface $request
+ * @param \Magento\App\ResponseInterface $response
* @param \Magento\ObjectManager $objectManager
- * @param \Magento\Core\Controller\Varien\Front $frontController
- * @param \Magento\Core\Model\Layout $layout
- * @param \Magento\Core\Model\Event\Manager $eventManager
- * @param bool $isRenderInherited
+ * @param \Magento\App\FrontController $frontController
+ * @param \Magento\View\LayoutInterface $layout
+ * @param \Magento\Event\ManagerInterface $eventManager
+ * @param $isRenderInherited
* @param \Magento\Backend\Model\Session $session
* @param \Magento\Backend\Helper\Data $helper
* @param \Magento\AuthorizationInterface $authorization
* @param \Magento\Core\Model\Translate $translator
* @param \Magento\Backend\Model\Auth $auth
* @param \Magento\Backend\Model\Url $backendUrl
* @param \Magento\Core\Model\LocaleInterface $locale
- *
+ *
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Core\Model\Logger $logger,
- \Magento\Core\Controller\Request\Http $request,
- \Magento\Core\Controller\Response\Http $response,
+ \Magento\App\RequestInterface $request,
+ \Magento\App\ResponseInterface $response,
\Magento\ObjectManager $objectManager,
- \Magento\Core\Controller\Varien\Front $frontController,
- \Magento\Core\Model\Layout $layout,