Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

2.0.0.0-dev30

* Framework changes
  * Added dependency injection of framework capability
    * Adopted Zend\Di component of Zend Framework 2 library
    * Implemented object manager in Magento application
    * Refactored multiple base classes to dependency injection principle (dependencies are declared in constructor)
  * Themes/View
    * Implemented storing themes registry in database, basic CRUD of themes, automatic registration of themes in database from file system out of the box
    * Renamed `Mage_Core_Model_Layout_Update` into `Mage_Core_Model_Layout_Merge`, the former becomes an entity domain model. Similar changes with `Mage_Core_Model_Resource_Layout` -> `Mage_Core_Model_Resource_Layout_Update`, `Mage_Core_Model_Layout_Data` -> `Mage_Core_Model_Layout_Update`
* Performance tests
  * Improved indexers running script `dev/shell/indexer.php` to return appropriate exit code upon success/failure
  * Implemented running the same performance scenario file with different parameters
  * Slightly refactored framework class `Magento_Performance_Testsuite_Optimizer` for better visibility of algorithm
* Visual design editor
  * Added ability to remove elements in editor UI
  * Revised history of changes VDE toolbar and algorithm of "compacting" operations (moving, removing elements) as a layout update XML
  * Added selection of themes to VDE launcher page
* Refactored JavaScript of some UI elements to jQuery:
  * "Simple" and "configurable" product view pages
  * "Create Account" page
  * "Shopping Cart" page
  * CAPTCHA
  * Newsletter subscription
* Tax management UX improvements
  * Split Basic and Advanced Settings for Tax Rule Management UI
  * Moved the Import/Export functionality to Tax Rate page
  * Moved Tax menu to System from Sales
* Implemented the editable multiselect JavaScript component
* Added mentioning sitemap in `robots.txt` after generation
* Removed creation of DB backup in integration testing framework
* Fixed logic of order of loading ACL resources in backend
* Fixed JavaScript error during installation when one of files in `pub/media` is not writable
* Fixed structure of legacy test fixtures that allowed ambiguous keys in declaration
* Fixed inability to restore admin password when CAPTCHA is enabled
* Various minor UX fixes (labels, buttons, redirects, etc...)
* GitHub requests:
  * [#59](#59) -- implemented handling of unexpected situations in admin/dashboard/tunnel action
  * [#66](#66)
    * refactored ImageMagick adapter unit test to avoid system operation
    * simplified unit testing framework -- removed unused classes, simplified handling logic of directory `dev/tests/unit/tmp` and removed it from VCS
  * [#73](#73), [#74](#74) -- fixes in docblock tags
  * [#75](#75), [#96](#96) -- fixed translation module contexts in a few places
  * [#80](#80) -- fixed some runtime errors in import/export module
  * [#81](#81) -- removed usage of "remove" directive in places where it is overridden by setting root template anyway
  * [#87](#87) -- changed paths of files to include from relative into absolute in `dev/shell/indexer.php` and `log.php`
  * [#88](#88) -- provided comments for values that can be configured in `app/etc/local.xml` file
  * [#90](#90) -- slightly optimized logic of implementation of loading configurable product attributes
  • Loading branch information...
commit 0f2900aaabf25bd79fff08e1b41378fed83a0909 1 parent 21af2d4
@mage2-team mage2-team authored
Showing with 952 additions and 1,003 deletions.
  1. +56 −6 CHANGELOG.markdown
  2. +153 −39 app/Mage.php
  3. +6 −0 app/bootstrap.php
  4. +1 −8 app/code/community/Phoenix/Moneybookers/Block/Form.php
  5. +1 −8 app/code/community/Phoenix/Moneybookers/Block/Info.php
  6. +2 −2 app/code/community/Phoenix/Moneybookers/Block/Jsinit.php
  7. +6 −6 app/code/core/Mage/Admin/Model/Config.php
  8. +3 −1 app/code/core/Mage/AdminNotification/Model/Survey.php
  9. +1 −5 app/code/core/Mage/Adminhtml/Block/Api/Buttons.php
  10. +2 −2 app/code/core/Mage/Adminhtml/Block/Api/Editroles.php
  11. +2 −2 app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php
  12. +2 −2 app/code/core/Mage/Adminhtml/Block/Api/Role.php
  13. +2 −2 app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php
  14. +2 −5 app/code/core/Mage/Adminhtml/Block/Api/Roles.php
  15. +0 −5 app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php
  16. +6 −3 app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php
  17. +2 −2 app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php
  18. +2 −2 app/code/core/Mage/Adminhtml/Block/Api/User.php
  19. +2 −2 app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php
  20. +2 −2 app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php
  21. +2 −2 app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php
  22. +2 −2 app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php
  23. +2 −2 app/code/core/Mage/Adminhtml/Block/Cache.php
  24. +2 −2 app/code/core/Mage/Adminhtml/Block/Cache/Grid.php
  25. +0 −6 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php
  26. +7 −4 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php
  27. +4 −5 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
  28. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
  29. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php
  30. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php
  31. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php
  32. +5 −3 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php
  33. +5 −3 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
  34. +6 −3 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php
  35. +2 −4 app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php
  36. +1 −8 app/code/core/Mage/Adminhtml/Block/Catalog/Product.php
  37. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php
  38. +3 −5 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
  39. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php
  40. +2 −8 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
  41. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php
  42. +1 −8 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
  43. +0 −5 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
  44. +0 −4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
  45. +0 −4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php
  46. +1 −4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php
  47. +1 −4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php
  48. +2 −4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
  49. +4 −5 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
  50. +0 −4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php
  51. +1 −7 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php
  52. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php
  53. +4 −6 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
  54. +4 −3 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
  55. +1 −5 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
  56. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Price.php
  57. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts/Stock.php
  58. +19 −7 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Attributes.php
  59. +1 −8 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Categories.php
  60. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Crosssell.php
  61. +1 −5 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Inventory.php
  62. +1 −6 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options.php
  63. +5 −3 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Option.php
  64. +1 −6 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Date.php
  65. +1 −5 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/File.php
  66. +5 −3 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Select.php
  67. +1 −6 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Options/Type/Text.php
  68. +1 −7 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Group.php
  69. +1 −7 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Price/Tier.php
  70. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Related.php
  71. +6 −3 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config.php
  72. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php
  73. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Group.php
  74. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Upsell.php
  75. +1 −8 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php
  76. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tabs.php
  77. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Grid.php
  78. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Boolean.php
  79. +4 −9 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery/Content.php
  80. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
  81. +2 −4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Weight.php
  82. +2 −4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser.php
  83. +1 −10 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Widget/Chooser/Container.php
  84. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Search.php
  85. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit.php
  86. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Search/Edit/Form.php
  87. +2 −2 app/code/core/Mage/Adminhtml/Block/Catalog/Search/Grid.php
  88. +2 −2 app/code/core/Mage/Adminhtml/Block/Checkout/Agreement.php
  89. +2 −2 app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit.php
  90. +2 −2 app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Edit/Form.php
  91. +2 −2 app/code/core/Mage/Adminhtml/Block/Checkout/Agreement/Grid.php
  92. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Block.php
  93. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit.php
  94. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Block/Edit/Form.php
  95. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Block/Grid.php
  96. +2 −4 app/code/core/Mage/Adminhtml/Block/Cms/Block/Widget/Chooser.php
  97. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Page.php
  98. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit.php
  99. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Design.php
  100. +0 −4 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tab/Meta.php
  101. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Page/Edit/Tabs.php
  102. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Page/Grid.php
  103. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Page/Widget/Chooser.php
  104. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content.php
  105. +2 −2 app/code/core/Mage/Adminhtml/Block/Cms/Wysiwyg/Images/Content/Uploader.php
  106. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer.php
  107. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Edit.php
  108. +1 −8 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Renderer/Attribute/Group.php
  109. +0 −8 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
  110. +1 −5 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
  111. +5 −3 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php
  112. +1 −6 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter.php
  113. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid.php
  114. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Filter/Status.php
  115. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Newsletter/Grid/Renderer/Status.php
  116. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Orders.php
  117. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Cart.php
  118. +1 −11 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Grid/Renderer/Item.php
  119. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Orders.php
  120. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Sales.php
  121. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View/Wishlist.php
  122. +2 −3 app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
  123. +2 −4 app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/Boolean.php
  124. +2 −3 app/code/core/Mage/Adminhtml/Block/Customer/Form/Element/File.php
  125. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Grid.php
  126. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Group.php
  127. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
  128. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Group/Grid.php
  129. +1 −5 app/code/core/Mage/Adminhtml/Block/Customer/Online.php
  130. +0 −4 app/code/core/Mage/Adminhtml/Block/Customer/Online/Filter.php
  131. +2 −2 app/code/core/Mage/Adminhtml/Block/Customer/Online/Grid.php
  132. +1 −7 app/code/core/Mage/Adminhtml/Block/Customer/Sales/Order/Address/Form/Renderer/Vat.php
  133. +1 −6 app/code/core/Mage/Adminhtml/Block/Dashboard.php
  134. +0 −5 app/code/core/Mage/Adminhtml/Block/Dashboard/Abstract.php
  135. +5 −3 app/code/core/Mage/Adminhtml/Block/Dashboard/Diagrams.php
  136. +16 −24 app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
  137. +7 −9 app/code/core/Mage/Adminhtml/Block/Dashboard/Grid.php
  138. +5 −3 app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php
  139. +5 −6 app/code/core/Mage/Adminhtml/Block/Dashboard/Orders/Grid.php
  140. +1 −6 app/code/core/Mage/Adminhtml/Block/Dashboard/Sales.php
  141. +2 −2 app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Last.php
  142. +2 −2 app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Top.php
  143. +2 −2 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php
  144. +2 −2 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Most.php
  145. +2 −2 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Customers/Newest.php
  146. +2 −2 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php
  147. +2 −2 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php
  148. +2 −2 app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php
  149. +1 −5 app/code/core/Mage/Adminhtml/Block/Dashboard/Totals.php
  150. +5 −3 app/code/core/Mage/Adminhtml/Block/Media/Uploader.php
  151. +6 −3 app/code/core/Mage/Adminhtml/Block/Newsletter/Problem.php
  152. +2 −2 app/code/core/Mage/Adminhtml/Block/Newsletter/Problem/Grid.php
  153. +2 −4 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue.php
  154. +3 −5 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
  155. +2 −2 app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Grid.php
  156. +1 −9 app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber.php
  157. +3 −9 app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php
  158. +1 −6 app/code/core/Mage/Adminhtml/Block/Newsletter/Template.php
  159. +0 −8 app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit/Form.php
  160. +2 −2 app/code/core/Mage/Adminhtml/Block/Notification/Inbox.php
  161. +0 −6 app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php
  162. +5 −3 app/code/core/Mage/Adminhtml/Block/Page.php
  163. +2 −1  app/code/core/Mage/Adminhtml/Block/Page/Footer.php
  164. +2 −8 app/code/core/Mage/Adminhtml/Block/Page/Head.php
  165. +1 −5 app/code/core/Mage/Adminhtml/Block/Page/Header.php
  166. +2 −2 app/code/core/Mage/Adminhtml/Block/Poll/Answer/Edit.php
  167. +2 −2 app/code/core/Mage/Adminhtml/Block/Poll/Edit.php
  168. +2 −2 app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/Grid.php
  169. +1 −4 app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tab/Answers/List.php
  170. +2 −2 app/code/core/Mage/Adminhtml/Block/Poll/Edit/Tabs.php
  171. +2 −2 app/code/core/Mage/Adminhtml/Block/Poll/Grid.php
  172. +2 −2 app/code/core/Mage/Adminhtml/Block/Poll/Poll.php
  173. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Catalog.php
  174. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit.php
  175. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Form.php
  176. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Edit/Tabs.php
  177. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Catalog/Grid.php
  178. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Quote.php
  179. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit.php
  180. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Form.php
  181. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Coupons/Grid.php
  182. +27 −10 app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tab/Labels.php
  183. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Quote/Edit/Tabs.php
  184. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Quote/Grid.php
  185. +2 −4 app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser.php
  186. +2 −2 app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php
  187. +2 −2 app/code/core/Mage/Adminhtml/Block/Rating/Edit.php
  188. +27 −10 app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tab/Form.php
  189. +2 −2 app/code/core/Mage/Adminhtml/Block/Rating/Edit/Tabs.php
  190. +2 −2 app/code/core/Mage/Adminhtml/Block/Rating/Grid.php
  191. +2 −2 app/code/core/Mage/Adminhtml/Block/Rating/Rating.php
  192. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php
  193. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts/Grid.php
  194. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php
  195. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders/Grid.php
  196. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php
  197. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals/Grid.php
  198. +19 −8 app/code/core/Mage/Adminhtml/Block/Report/Grid.php
  199. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Grid/Abstract.php
  200. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Product.php
  201. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php
  202. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads/Grid.php
  203. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Product/Grid.php
  204. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php
  205. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock/Grid.php
  206. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php
  207. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Product/Sold/Grid.php
  208. +5 −3 app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php
  209. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed/Grid.php
  210. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php
  211. +3 −3 app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php
  212. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php
  213. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Review/Customer/Grid.php
  214. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php
  215. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Review/Detail/Grid.php
  216. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php
  217. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Review/Product/Grid.php
  218. +4 −3 app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php
  219. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers/Grid.php
  220. +5 −3 app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons.php
  221. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Sales/Coupons/Grid.php
  222. +5 −3 app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced.php
  223. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Sales/Invoiced/Grid.php
  224. +5 −3 app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded.php
  225. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Sales/Refunded/Grid.php
  226. +4 −3 app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales.php
  227. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Sales/Sales/Grid.php
  228. +6 −3 app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping.php
  229. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Sales/Shipping/Grid.php
  230. +6 −3 app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax.php
  231. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Sales/Tax/Grid.php
  232. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Search.php
  233. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Search/Grid.php
  234. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned.php
  235. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
  236. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer.php
  237. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Customer/Grid.php
  238. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product.php
  239. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Product/Grid.php
  240. +1 −5 app/code/core/Mage/Adminhtml/Block/Report/Wishlist.php
  241. +2 −2 app/code/core/Mage/Adminhtml/Block/Report/Wishlist/Grid.php
  242. +2 −2 app/code/core/Mage/Adminhtml/Block/Review/Add.php
  243. +2 −2 app/code/core/Mage/Adminhtml/Block/Review/Edit.php
  244. +2 −2 app/code/core/Mage/Adminhtml/Block/Review/Grid.php
  245. +2 −2 app/code/core/Mage/Adminhtml/Block/Review/Main.php
  246. +2 −2 app/code/core/Mage/Adminhtml/Block/Review/Product/Grid.php
  247. +6 −3 app/code/core/Mage/Adminhtml/Block/Review/Rating/Detailed.php
  248. +3 −2 app/code/core/Mage/Adminhtml/Block/Review/Rating/Summary.php
  249. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo.php
  250. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Creditmemo/Grid.php
  251. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Invoice.php
  252. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Invoice/Grid.php
  253. +2 −7 app/code/core/Mage/Adminhtml/Block/Sales/Order.php
  254. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Address.php
  255. +1 −5 app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php
  256. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php
  257. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Billing/Method.php
  258. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons.php
  259. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Coupons/Form.php
  260. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer.php
  261. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Customer/Grid.php
  262. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Form.php
  263. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items.php
  264. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
  265. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php
  266. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter/Form.php
  267. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search.php
  268. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php
  269. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method.php
  270. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Method/Form.php
  271. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store.php
  272. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Store/Select.php
  273. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals.php
  274. +0 −5 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Default.php
  275. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Table.php
  276. +3 −3 app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php
  277. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/View.php
  278. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/Create.php
  279. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Invoice/View.php
  280. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create.php
  281. +2 −8 app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php
  282. +2 −5 app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Tracking/Info.php
  283. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View.php
  284. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Status.php
  285. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign.php
  286. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Assign/Form.php
  287. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit.php
  288. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Edit/Form.php
  289. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php
  290. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New.php
  291. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/New/Form.php
  292. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/View.php
  293. +2 −5 app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Form.php
  294. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Creditmemos.php
  295. +2 −5 app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/History.php
  296. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Invoices.php
  297. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tab/Shipments.php
  298. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Tabs.php
  299. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Shipment.php
  300. +2 −2 app/code/core/Mage/Adminhtml/Block/Sales/Shipment/Grid.php
Sorry, we could not display the entire diff because too many files (1,997) changed.
View
62 CHANGELOG.markdown
@@ -1,9 +1,59 @@
+2.0.0.0-dev30
+=============
+* Framework changes
+ * Added dependency injection of framework capability
+ * Adopted Zend\Di component of Zend Framework 2 library
+ * Implemented object manager in Magento application
+ * Refactored multiple base classes to dependency injection principle (dependencies are declared in constructor)
+ * Themes/View
+ * Implemented storing themes registry in database, basic CRUD of themes, automatic registration of themes in database from file system out of the box
+ * Renamed `Mage_Core_Model_Layout_Update` into `Mage_Core_Model_Layout_Merge`, the former becomes an entity domain model. Similar changes with `Mage_Core_Model_Resource_Layout` -> `Mage_Core_Model_Resource_Layout_Update`, `Mage_Core_Model_Layout_Data` -> `Mage_Core_Model_Layout_Update`
+* Performance tests
+ * Improved indexers running script `dev/shell/indexer.php` to return appropriate exit code upon success/failure
+ * Implemented running the same performance scenario file with different parameters
+ * Slightly refactored framework class `Magento_Performance_Testsuite_Optimizer` for better visibility of algorithm
+* Visual design editor
+ * Added ability to remove elements in editor UI
+ * Revised history of changes VDE toolbar and algorithm of "compacting" operations (moving, removing elements) as a layout update XML
+ * Added selection of themes to VDE launcher page
+* Refactored JavaScript of some UI elements to jQuery:
+ * "Simple" and "configurable" product view pages
+ * "Create Account" page
+ * "Shopping Cart" page
+ * CAPTCHA
+ * Newsletter subscription
+* Tax management UX improvements
+ * Split Basic and Advanced Settings for Tax Rule Management UI
+ * Moved the Import/Export functionality to Tax Rate page
+ * Moved Tax menu to System from Sales
+* Implemented the editable multiselect JavaScript component
+* Added mentioning sitemap in `robots.txt` after generation
+* Removed creation of DB backup in integration testing framework
+* Fixed logic of order of loading ACL resources in backend
+* Fixed JavaScript error during installation when one of files in `pub/media` is not writable
+* Fixed structure of legacy test fixtures that allowed ambiguous keys in declaration
+* Fixed inability to restore admin password when CAPTCHA is enabled
+* Various minor UX fixes (labels, buttons, redirects, etc...)
+* GitHub requests:
+ * [#59](https://github.com/magento/magento2/issues/59) -- implemented handling of unexpected situations in admin/dashboard/tunnel action
+ * [#66](https://github.com/magento/magento2/issues/66)
+ * refactored ImageMagick adapter unit test to avoid system operation
+ * simplified unit testing framework -- removed unused classes, simplified handling logic of directory `dev/tests/unit/tmp` and removed it from VCS
+ * [#73](https://github.com/magento/magento2/pull/73), [#74](https://github.com/magento/magento2/pull/74) -- fixes in docblock tags
+ * [#75](https://github.com/magento/magento2/pull/75), [#96](https://github.com/magento/magento2/pull/96) -- fixed translation module contexts in a few places
+ * [#80](https://github.com/magento/magento2/issues/80) -- fixed some runtime errors in import/export module
+ * [#81](https://github.com/magento/magento2/issues/81) -- removed usage of "remove" directive in places where it is overridden by setting root template anyway
+ * [#87](https://github.com/magento/magento2/issues/87) -- changed paths of files to include from relative into absolute in `dev/shell/indexer.php` and `log.php`
+ * [#88](https://github.com/magento/magento2/issues/88) -- provided comments for values that can be configured in `app/etc/local.xml` file
+ * [#90](https://github.com/magento/magento2/issues/90) -- slightly optimized logic of implementation of loading configurable product attributes
+
2.0.0.0-dev29
=============
-* Implemented and verified ability to upgrade DB from CE 1.7 (EE 1.12) to 2.x
+* Added scripts that allow upgrading database from CE 1.7 (EE 1.12) to 2.x
* Replaced calendar UI component with jQuery calendar
+* Removed store scope selector from backend customers management
+* Renamed `pub/js` (was known as `js` in Magento 1.x) into `pub/lib`
* Restored back the public access to `pub/cron.php` entry point (in the previous patch it was denied by mistake)
-* Fixed typo in label of "Catalog Search" index in UI
2.0.0.0-dev28
=============
@@ -525,10 +575,10 @@
2.0.0.0-dev02
=============
Deprecated code & minor fixes update:
-* Eliminated remnants of `htmlescape` implementation
-* Eliminated usage of `pub/js/index.php` entry point (used to be `js/index.php`)
-* Disbanded the shell root directory: moved scripts into `dev/shell` and classes into app
-* Minor refactoring of data fixtures rollback capability in integration testing framework
+* eliminated remnants of `htmlescape` implementation
+* eliminated usage of `pub/js/index.php` entry point (used to be `js/index.php`)
+* disbanded the shell root directory: moved scripts into `dev/shell` and classes into app
+* minor refactoring of data fixtures rollback capability in integration testing framework
2.0.0.0-dev01
=============
View
192 app/Mage.php
@@ -65,6 +65,13 @@
static private $_events;
/**
+ * Object manager interface
+ *
+ * @var Magento_ObjectManager
+ */
+ static private $_objectManager;
+
+ /**
* Object cache instance
*
* @var Varien_Object_Cache
@@ -107,6 +114,13 @@
static private $_loggers = array();
/**
+ * Design object
+ *
+ * @var Mage_Core_Model_Design_Package
+ */
+ protected static $_design;
+
+ /**
* Magento edition constants
*/
const EDITION_COMMUNITY = 'Community';
@@ -123,6 +137,13 @@
static private $_currentEdition = self::EDITION_COMMUNITY;
/**
+ * Check if we need to use __sleep and __wakeup serialization methods in models
+ *
+ * @var bool
+ */
+ static private $_isSerializable = true;
+
+ /**
* Gets the current Magento version string
* @link http://www.magentocommerce.com/blog/new-community-edition-release-process/
*
@@ -149,7 +170,7 @@ public static function getVersionInfo()
'revision' => '0',
'patch' => '0',
'stability' => 'dev',
- 'number' => '29',
+ 'number' => '30',
);
}
@@ -161,7 +182,7 @@ public static function getVersionInfo()
*/
public static function getEdition()
{
- return self::$_currentEdition;
+ return self::$_currentEdition;
}
/**
@@ -170,7 +191,8 @@ public static function getEdition()
*/
public static function reset()
{
- self::$_registry = array();
+ self::resetRegistry();
+
self::$_appRoot = null;
self::$_app = null;
self::$_config = null;
@@ -180,10 +202,24 @@ public static function reset()
self::$_isDeveloperMode = false;
self::$_isInstalled = null;
self::$_loggers = array();
+ self::$_design = null;
// do not reset $headersSentThrowsException
}
/**
+ * Reset registry
+ */
+ public static function resetRegistry()
+ {
+ /** @var $value */
+ foreach (self::$_registry as $key => $value) {
+ self::unregister($key);
+ }
+
+ self::$_registry = array();
+ }
+
+ /**
* Register a new variable
*
* @param string $key
@@ -250,7 +286,7 @@ public static function setRoot($appRoot = '')
$appRoot = realpath($appRoot);
- if (is_dir($appRoot) and is_readable($appRoot)) {
+ if (is_dir($appRoot) && is_readable($appRoot)) {
self::$_appRoot = $appRoot;
} else {
self::throwException($appRoot . ' is not a directory or not readable by this user');
@@ -368,7 +404,8 @@ public static function getBaseUrl($type = Mage_Core_Model_Store::URL_TYPE_LINK,
*/
public static function getUrl($route = '', $params = array())
{
- return self::getModel('Mage_Core_Model_Url')->getUrl($route, $params);
+ return self::getObjectManager()->create('Mage_Core_Model_Url', array('data' => array()))
+ ->getUrl($route, $params);
}
/**
@@ -378,7 +415,10 @@ public static function getUrl($route = '', $params = array())
*/
public static function getDesign()
{
- return self::getSingleton('Mage_Core_Model_Design_Package');
+ if (!self::$_design) {
+ self::$_design = self::getObjectManager()->get('Mage_Core_Model_Design_Package');
+ }
+ return self::$_design;
}
/**
@@ -388,6 +428,9 @@ public static function getDesign()
*/
public static function getConfig()
{
+ if (!self::$_config) {
+ self::$_config = self::getObjectManager()->get('Mage_Core_Model_Config');
+ }
return self::$_config;
}
@@ -396,15 +439,17 @@ public static function getConfig()
*
* @param string $eventName
* @param callback $callback
- * @param array $arguments
+ * @param array $data
* @param string $observerName
+ * @param string $observerClass
+ * @return Varien_Event_Collection
*/
public static function addObserver($eventName, $callback, $data = array(), $observerName = '', $observerClass = '')
{
if ($observerClass == '') {
$observerClass = 'Varien_Event_Observer';
}
- $observer = new $observerClass();
+ $observer = self::getObjectManager()->create($observerClass);
$observer->setName($observerName)->addData($data)->setEventName($eventName)->setCallback($callback);
return self::getEvents()->addObserver($observer);
}
@@ -437,7 +482,10 @@ public static function dispatchEvent($name, array $data = array())
*/
public static function getModel($modelClass = '', $arguments = array())
{
- return self::getConfig()->getModelInstance($modelClass, $arguments);
+ if (!is_array($arguments)) {
+ $arguments = array($arguments);
+ }
+ return self::getObjectManager()->create($modelClass, $arguments, false);
}
/**
@@ -447,39 +495,56 @@ public static function getModel($modelClass = '', $arguments = array())
* @param array $arguments
* @return Mage_Core_Model_Abstract
*/
- public static function getSingleton($modelClass='', array $arguments=array())
+ public static function getSingleton($modelClass = '', array $arguments=array())
{
$registryKey = '_singleton/'.$modelClass;
if (!self::registry($registryKey)) {
- self::register($registryKey, self::getModel($modelClass, $arguments));
+ self::register($registryKey, self::getObjectManager()->get($modelClass, $arguments));
}
return self::registry($registryKey);
}
/**
- * Retrieve object of resource model
+ * Initialize object manager with definitions file
*
- * @param string $modelClass
- * @param array $arguments
- * @return Object
+ * @static
+ * @param string $definitionsFile
+ * @param Magento_ObjectManager $objectManager
*/
- public static function getResourceModel($modelClass, $arguments = array())
+ public static function initializeObjectManager(
+ $definitionsFile = null,
+ Magento_ObjectManager $objectManager = null
+ ) {
+ self::$_objectManager = $objectManager ?: new Magento_ObjectManager_Zend($definitionsFile);
+ }
+
+ /**
+ * Retrieve object manager
+ *
+ * @static
+ * @return Magento_ObjectManager
+ */
+ public static function getObjectManager()
{
- return self::getConfig()->getResourceModelInstance($modelClass, $arguments);
+ if (!self::$_objectManager) {
+ self::initializeObjectManager();
+ }
+ return self::$_objectManager;
}
/**
- * Retrieve Controller instance by ClassName
+ * Retrieve object of resource model
*
- * @param string $class
- * @param Mage_Core_Controller_Request_Http $request
- * @param Mage_Core_Controller_Response_Http $response
- * @param array $invokeArgs
- * @return Mage_Core_Controller_Front_Action
+ * @param string $modelClass
+ * @param array $arguments
+ * @return Object
*/
- public static function getControllerInstance($class, $request, $response, array $invokeArgs = array())
+ public static function getResourceModel($modelClass, $arguments = array())
{
- return new $class($request, $response, $invokeArgs);
+ if (!is_array($arguments)) {
+ $arguments = array($arguments);
+ }
+ return self::getObjectManager()->create($modelClass, $arguments);
}
/**
@@ -493,12 +558,30 @@ public static function getResourceSingleton($modelClass = '', array $arguments =
{
$registryKey = '_resource_singleton/'.$modelClass;
if (!self::registry($registryKey)) {
- self::register($registryKey, self::getResourceModel($modelClass, $arguments));
+ self::register($registryKey, self::getObjectManager()->get($modelClass, $arguments));
}
return self::registry($registryKey);
}
/**
+ * Retrieve Controller instance by ClassName
+ *
+ * @param string $class
+ * @param Mage_Core_Controller_Request_Http $request
+ * @param Mage_Core_Controller_Response_Http $response
+ * @param array $invokeArgs
+ * @return Mage_Core_Controller_Front_Action
+ */
+ public static function getControllerInstance($class, $request, $response, array $invokeArgs = array())
+ {
+ return self::getObjectManager()->create($class, array(
+ 'request' => $request,
+ 'response' => $response,
+ 'invokeArgs' => $invokeArgs
+ ));
+ }
+
+ /**
* Returns block singleton instance, if current action exists. Otherwise returns FALSE.
*
* @param string $className
@@ -526,7 +609,7 @@ public static function helper($name)
$registryKey = '_helper/' . $name;
if (!self::registry($registryKey)) {
$helperClass = self::getConfig()->getHelperClassName($name);
- self::register($registryKey, new $helperClass);
+ self::register($registryKey, self::getObjectManager()->get($helperClass));
}
return self::registry($registryKey);
}
@@ -539,13 +622,14 @@ public static function helper($name)
*/
public static function getResourceHelper($moduleName)
{
- $registryKey = '_resource_helper/' . $moduleName;
- if (!self::registry($registryKey)) {
- $helperClass = self::getConfig()->getResourceHelper($moduleName);
- self::register($registryKey, $helperClass);
- }
+ $connectionModel = self::getConfig()->getResourceConnectionModel('core');
- return self::registry($registryKey);
+ $helperClassName = $moduleName . '_Model_Resource_Helper_' . ucfirst($connectionModel);
+ $connection = strtolower($moduleName);
+ if (substr($moduleName, 0, 5) == 'Mage_') {
+ $connection = substr($connection, 5);
+ }
+ return self::getObjectManager()->get($helperClassName, array('modulePrefix' => $connection));
}
/**
@@ -588,8 +672,8 @@ public static function throwException($message, $messageStorage = null)
public static function app($code = '', $type = 'store', $options = array())
{
if (null === self::$_app) {
- self::$_app = new Mage_Core_Model_App();
self::setRoot();
+ self::$_app = self::getObjectManager()->get('Mage_Core_Model_App');
self::$_events = new Varien_Event_Collection();
self::_setIsInstalled($options);
self::_setConfigModel($options);
@@ -604,6 +688,15 @@ public static function app($code = '', $type = 'store', $options = array())
/**
* @static
+ * @param string $areaCode
+ */
+ public static function setCurrentArea($areaCode)
+ {
+ self::getObjectManager()->loadAreaConfiguration($areaCode);
+ }
+
+ /**
+ * @static
* @param string $code
* @param string $type
* @param array $options
@@ -613,7 +706,7 @@ public static function init($code = '', $type = 'store', $options = array(), $mo
{
try {
self::setRoot();
- self::$_app = new Mage_Core_Model_App();
+ self::$_app = self::getObjectManager()->create('Mage_Core_Model_App');
self::_setIsInstalled($options);
self::_setConfigModel($options);
@@ -649,7 +742,7 @@ public static function run($code = '', $type = 'store', $options = array())
if (isset($options['edition'])) {
self::$_currentEdition = $options['edition'];
}
- self::$_app = new Mage_Core_Model_App();
+ self::$_app = self::getObjectManager()->get('Mage_Core_Model_App');
if (isset($options['request'])) {
self::$_app->setRequest($options['request']);
}
@@ -658,7 +751,6 @@ public static function run($code = '', $type = 'store', $options = array())
}
self::$_events = new Varien_Event_Collection();
self::_setIsInstalled($options);
- self::_setConfigModel($options);
self::$_app->run(array(
'scope_code' => $code,
'scope_type' => $type,
@@ -704,7 +796,7 @@ protected static function _setConfigModel($options = array())
if (!is_null($alternativeConfigModel) && ($alternativeConfigModel instanceof Mage_Core_Model_Config)) {
self::$_config = $alternativeConfigModel;
} else {
- self::$_config = new Mage_Core_Model_Config($options);
+ self::$_config = self::getObjectManager()->get('Mage_Core_Model_Config');
}
}
@@ -901,8 +993,8 @@ public static function printException(Exception $e, $extra = '')
try {
$storeCode = self::app()->getStore()->getCode();
$reportData['skin'] = $storeCode;
+ } catch (Exception $e) {
}
- catch (Exception $e) {}
require_once(self::getBaseDir() . DS . 'pub' . DS . 'errors' . DS . 'report.php');
}
@@ -969,4 +1061,26 @@ public static function setIsDownloader($flag = true)
{
self::$_isDownloader = $flag;
}
+
+ /**
+ * Set is serializable flag
+ *
+ * @static
+ * @param bool $value
+ */
+ public static function setIsSerializable($value = true)
+ {
+ self::$_isSerializable = !empty($value);
+ }
+
+ /**
+ * Get is serializable flag
+ *
+ * @static
+ * @return bool
+ */
+ public static function getIsSerializable()
+ {
+ return self::$_isSerializable;
+ }
}
View
6 app/bootstrap.php
@@ -89,6 +89,12 @@
Magento_Autoload::getInstance()->addFilesMap($classMapPath);
}
+$definitionsFile = BP . DS . 'var/di/definitions.php';
+if (file_exists($definitionsFile)) {
+ Mage::setRoot();
+ Mage::initializeObjectManager($definitionsFile);
+}
+
if (isset($_SERVER['MAGE_PROFILER'])) {
switch ($_SERVER['MAGE_PROFILER']) {
case 'firebug':
View
9 app/code/community/Phoenix/Moneybookers/Block/Form.php
@@ -39,14 +39,7 @@ class Phoenix_Moneybookers_Block_Form extends Mage_Payment_Block_Form
*/
protected $_defaultInfoLocale = 'en';
- /**
- * Constructor. Set template.
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('form.phtml');
- }
+ protected $_template = 'form.phtml';
/**
* Return payment logo image src
View
9 app/code/community/Phoenix/Moneybookers/Block/Info.php
@@ -25,14 +25,7 @@
*/
class Phoenix_Moneybookers_Block_Info extends Mage_Payment_Block_Info
{
- /**
- * Constructor. Set template.
- */
- protected function _construct()
- {
- parent::_construct();
- $this->setTemplate('info.phtml');
- }
+ protected $_template = 'info.phtml';
/**
* Returns code of payment method
View
4 app/code/community/Phoenix/Moneybookers/Block/Jsinit.php
@@ -30,7 +30,7 @@ class Phoenix_Moneybookers_Block_Jsinit extends Mage_Adminhtml_Block_Template
*/
protected function _prepareLayout()
{
- $section = $this->getAction()->getRequest()->getParam('section', false);
+ $section = $this->getRequest()->getParam('section', false);
if ($section == 'moneybookers') {
$this->getLayout()
->getBlock('head')
@@ -45,7 +45,7 @@ protected function _prepareLayout()
*/
protected function _toHtml()
{
- $section = $this->getAction()->getRequest()->getParam('section', false);
+ $section = $this->getRequest()->getParam('section', false);
if ($section == 'moneybookers') {
return parent::_toHtml();
} else {
View
12 app/code/core/Mage/Admin/Model/Config.php
@@ -64,14 +64,14 @@ class Mage_Admin_Model_Config extends Varien_Simplexml_Config
/**
* Load config from merged adminhtml.xml files
- * @param array $arguments
+ * @param array $data
*/
- public function __construct(array $arguments = array())
+ public function __construct(array $data = array())
{
- $this->_app = isset($arguments['app']) ? $arguments['app'] : Mage::app();
- $this->_appConfig = isset($arguments['appConfig']) ? $arguments['appConfig'] : Mage::getConfig();
- if (isset($arguments['helpers'])) {
- $this->_helpers = $arguments['helpers'];
+ $this->_app = isset($data['app']) ? $data['app'] : Mage::app();
+ $this->_appConfig = isset($data['appConfig']) ? $data['appConfig'] : Mage::getConfig();
+ if (isset($data['helpers'])) {
+ $this->_helpers = $data['helpers'];
}
View
4 app/code/core/Mage/AdminNotification/Model/Survey.php
@@ -77,7 +77,9 @@ public static function getSurveyUrl()
protected static function _getFlagModel()
{
if (self::$_flagModel === null) {
- self::$_flagModel = Mage::getModel('Mage_Core_Model_Flag', array('flag_code' => self::$_flagCode))->loadSelf();
+ self::$_flagModel = Mage::getModel('Mage_Core_Model_Flag',
+ array('data' => array('flag_code' => self::$_flagCode)))
+ ->loadSelf();
}
return self::$_flagModel;
}
View
6 app/code/core/Mage/Adminhtml/Block/Api/Buttons.php
@@ -27,11 +27,7 @@
class Mage_Adminhtml_Block_Api_Buttons extends Mage_Adminhtml_Block_Template
{
- public function __construct()
- {
- parent::__construct();
- $this->setTemplate('api/userinfo.phtml');
- }
+ protected $_template = 'api/userinfo.phtml';
protected function _prepareLayout()
{
View
4 app/code/core/Mage/Adminhtml/Block/Api/Editroles.php
@@ -25,9 +25,9 @@
*/
class Mage_Adminhtml_Block_Api_Editroles extends Mage_Adminhtml_Block_Widget_Tabs {
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setId('role_info_tabs');
$this->setDestElementId('role_edit_form');
$this->setTitle(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Information'));
View
4 app/code/core/Mage/Adminhtml/Block/Api/Grid/Role.php
@@ -33,9 +33,9 @@
*/
class Mage_Adminhtml_Block_Api_Grid_Role extends Mage_Adminhtml_Block_Widget_Grid
{
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setId('roleGrid');
$this->setSaveParametersInSession(true);
$this->setDefaultSort('role_id');
View
4 app/code/core/Mage/Adminhtml/Block/Api/Role.php
@@ -35,12 +35,12 @@
class Mage_Adminhtml_Block_Api_Role extends Mage_Adminhtml_Block_Widget_Grid_Container
{
- public function __construct()
+ protected function _construct()
{
$this->_controller = 'api_role';
$this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Roles');
$this->_addButtonLabel = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Add New Role');
- parent::__construct();
+ parent::_construct();
}
}
View
4 app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php
@@ -34,9 +34,9 @@
class Mage_Adminhtml_Block_Api_Role_Grid_User extends Mage_Adminhtml_Block_Widget_Grid
{
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setDefaultSort('role_user_id');
$this->setDefaultDir('asc');
$this->setId('roleUserGrid');
View
7 app/code/core/Mage/Adminhtml/Block/Api/Roles.php
@@ -33,11 +33,8 @@
*/
class Mage_Adminhtml_Block_Api_Roles extends Mage_Adminhtml_Block_Template
{
- public function __construct()
- {
- parent::__construct();
- $this->setTemplate('api/roles.phtml');
- }
+
+ protected $_template = 'api/roles.phtml';
public function getAddNewUrl()
{
View
5 app/code/core/Mage/Adminhtml/Block/Api/Tab/Roleinfo.php
@@ -30,11 +30,6 @@
*/
class Mage_Adminhtml_Block_Api_Tab_Roleinfo extends Mage_Adminhtml_Block_Widget_Form
{
- public function __construct()
- {
- parent::__construct();
- }
-
public function _beforeToHtml() {
$this->_initForm();
View
9 app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesedit.php
@@ -26,8 +26,11 @@
class Mage_Adminhtml_Block_Api_Tab_Rolesedit extends Mage_Adminhtml_Block_Widget_Form {
- public function __construct() {
- parent::__construct();
+ protected $_template = 'api/rolesedit.phtml';
+
+
+ protected function _construct() {
+ parent::_construct();
$rid = Mage::app()->getRequest()->getParam('rid', false);
@@ -48,7 +51,7 @@ public function __construct() {
$this->setSelectedResources($selrids);
- $this->setTemplate('api/rolesedit.phtml');
+
//->assign('resources', $resources);
//->assign('checkedResources', join(',', $selrids));
}
View
4 app/code/core/Mage/Adminhtml/Block/Api/Tab/Rolesusers.php
@@ -26,9 +26,9 @@
class Mage_Adminhtml_Block_Api_Tab_Rolesusers extends Mage_Adminhtml_Block_Widget_Tabs {
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$roleId = $this->getRequest()->getParam('rid', false);
View
4 app/code/core/Mage/Adminhtml/Block/Api/User.php
@@ -34,12 +34,12 @@
class Mage_Adminhtml_Block_Api_User extends Mage_Adminhtml_Block_Widget_Grid_Container
{
- public function __construct()
+ protected function _construct()
{
$this->_controller = 'api_user';
$this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Users');
$this->_addButtonLabel = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Add New User');
- parent::__construct();
+ parent::_construct();
}
/**
View
4 app/code/core/Mage/Adminhtml/Block/Api/User/Edit.php
@@ -34,12 +34,12 @@
class Mage_Adminhtml_Block_Api_User_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
{
- public function __construct()
+ protected function _construct()
{
$this->_objectId = 'user_id';
$this->_controller = 'api_user';
- parent::__construct();
+ parent::_construct();
$this->_updateButton('save', 'label', Mage::helper('Mage_Adminhtml_Helper_Data')->__('Save User'));
$this->_updateButton('delete', 'label', Mage::helper('Mage_Adminhtml_Helper_Data')->__('Delete User'));
View
4 app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php
@@ -27,9 +27,9 @@
class Mage_Adminhtml_Block_Api_User_Edit_Tab_Roles extends Mage_Adminhtml_Block_Widget_Grid
{
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setId('permissionsUserRolesGrid');
$this->setDefaultSort('sort_order');
$this->setDefaultDir('asc');
View
4 app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tabs.php
@@ -34,9 +34,9 @@
class Mage_Adminhtml_Block_Api_User_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
{
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setId('page_tabs');
$this->setDestElementId('edit_form');
$this->setTitle(Mage::helper('Mage_Adminhtml_Helper_Data')->__('User Information'));
View
4 app/code/core/Mage/Adminhtml/Block/Api/User/Grid.php
@@ -34,9 +34,9 @@
class Mage_Adminhtml_Block_Api_User_Grid extends Mage_Adminhtml_Block_Widget_Grid
{
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setId('permissionsUserGrid');
$this->setDefaultSort('username');
$this->setDefaultDir('asc');
View
4 app/code/core/Mage/Adminhtml/Block/Cache.php
@@ -29,11 +29,11 @@ class Mage_Adminhtml_Block_Cache extends Mage_Adminhtml_Block_Widget_Grid_Contai
/**
* Class constructor
*/
- public function __construct()
+ protected function _construct()
{
$this->_controller = 'cache';
$this->_headerText = Mage::helper('Mage_Core_Helper_Data')->__('Cache Storage Management');
- parent::__construct();
+ parent::_construct();
$this->_removeButton('add');
$this->_addButton('flush_magento', array(
'label' => Mage::helper('Mage_Core_Helper_Data')->__('Flush Magento Cache'),
View
4 app/code/core/Mage/Adminhtml/Block/Cache/Grid.php
@@ -30,9 +30,9 @@ class Mage_Adminhtml_Block_Cache_Grid extends Mage_Adminhtml_Block_Widget_Grid
/**
* Class constructor
*/
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setId('cache_grid');
$this->_filterVisibility = false;
$this->_pagerVisibility = false;
View
6 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Abstract.php
@@ -33,12 +33,6 @@
*/
class Mage_Adminhtml_Block_Catalog_Category_Abstract extends Mage_Adminhtml_Block_Template
{
-
- public function __construct()
- {
- parent::__construct();
- }
-
/**
* Retrieve current category instance
*
View
11 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit.php
@@ -33,13 +33,16 @@
*/
class Mage_Adminhtml_Block_Catalog_Category_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
{
- public function __construct()
+ /**
+ * @var string
+ */
+ protected $_template = 'catalog/category/edit.phtml';
+
+ protected function _construct()
{
$this->_objectId = 'entity_id';
$this->_controller = 'catalog_category';
$this->_mode = 'edit';
-
- parent::__construct();
- $this->setTemplate('catalog/category/edit.phtml');
+ parent::_construct();
}
}
View
9 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
@@ -40,11 +40,10 @@ class Mage_Adminhtml_Block_Catalog_Category_Edit_Form extends Mage_Adminhtml_Blo
*/
protected $_additionalButtons = array();
- public function __construct()
- {
- parent::__construct();
- $this->setTemplate('catalog/category/edit/form.phtml');
- }
+ /**
+ * @var string
+ */
+ protected $_template = 'catalog/category/edit/form.phtml';
protected function _prepareLayout()
{
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Attributes.php
@@ -48,8 +48,8 @@ public function getCategory()
* Initialize tab
*
*/
- public function __construct() {
- parent::__construct();
+ protected function _construct() {
+ parent::_construct();
$this->setShowGlobalIcon(true);
}
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Design.php
@@ -25,9 +25,9 @@
*/
class Mage_Adminhtml_Block_Catalog_Category_Tab_Design extends Mage_Adminhtml_Block_Catalog_Form
{
- public function __construct()
+ public function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setShowGlobalIcon(true);
}
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/General.php
@@ -36,9 +36,9 @@ class Mage_Adminhtml_Block_Catalog_Category_Tab_General extends Mage_Adminhtml_B
protected $_category;
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setShowGlobalIcon(true);
}
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php
@@ -34,9 +34,9 @@
class Mage_Adminhtml_Block_Catalog_Category_Tab_Product extends Mage_Adminhtml_Block_Widget_Grid
{
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setId('catalog_category_products');
$this->setDefaultSort('entity_id');
$this->setUseAjax(true);
View
8 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tabs.php
@@ -40,17 +40,19 @@ class Mage_Adminhtml_Block_Catalog_Category_Tabs extends Mage_Adminhtml_Block_Wi
*/
protected $_attributeTabBlock = 'Mage_Adminhtml_Block_Catalog_Category_Tab_Attributes';
+ protected $_template = 'widget/tabshoriz.phtml';
+
/**
* Initialize Tabs
*
*/
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setId('category_info_tabs');
$this->setDestElementId('category_tab_content');
$this->setTitle(Mage::helper('Mage_Catalog_Helper_Data')->__('Category Data'));
- $this->setTemplate('widget/tabshoriz.phtml');
+
}
/**
View
8 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tree.php
@@ -37,10 +37,12 @@ class Mage_Adminhtml_Block_Catalog_Category_Tree extends Mage_Adminhtml_Block_Ca
protected $_withProductCount;
- public function __construct()
+ protected $_template = 'catalog/category/tree.phtml';
+
+
+ protected function _construct()
{
- parent::__construct();
- $this->setTemplate('catalog/category/tree.phtml');
+ parent::_construct();
$this->setUseAjax(true);
$this->_withProductCount = true;
}
View
9 app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php
@@ -39,10 +39,13 @@ class Mage_Adminhtml_Block_Catalog_Category_Widget_Chooser extends Mage_Adminhtm
* Block construction
* Defines tree template and init tree params
*/
- public function __construct()
+
+ protected $_template = 'catalog/category/widget/tree.phtml';
+
+ protected function _construct()
{
- parent::__construct();
- $this->setTemplate('catalog/category/widget/tree.phtml');
+ parent::_construct();
+
$this->_withProductCount = false;
}
View
6 app/code/core/Mage/Adminhtml/Block/Catalog/Form/Renderer/Fieldset/Element.php
@@ -37,10 +37,8 @@ class Mage_Adminhtml_Block_Catalog_Form_Renderer_Fieldset_Element
/**
* Initialize block template
*/
- protected function _construct()
- {
- $this->setTemplate('Mage_Adminhtml::catalog/form/renderer/fieldset/element.phtml');
- }
+
+ protected $_template = 'Mage_Adminhtml::catalog/form/renderer/fieldset/element.phtml';
/**
* Retrieve data object related with form
View
9 app/code/core/Mage/Adminhtml/Block/Catalog/Product.php
@@ -33,14 +33,7 @@
*/
class Mage_Adminhtml_Block_Catalog_Product extends Mage_Adminhtml_Block_Widget_Container
{
- /**
- * Set template
- */
- public function __construct()
- {
- parent::__construct();
- $this->setTemplate('catalog/product.phtml');
- }
+ protected $_template = 'catalog/product.phtml';
/**
* Prepare button and grid
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute.php
@@ -35,12 +35,12 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute extends Mage_Adminhtml_Block_Widget_Grid_Container
{
- public function __construct()
+ protected function _construct()
{
$this->_controller = 'catalog_product_attribute';
$this->_headerText = Mage::helper('Mage_Catalog_Helper_Data')->__('Manage Attributes');
$this->_addButtonLabel = Mage::helper('Mage_Catalog_Helper_Data')->__('Add New Attribute');
- parent::__construct();
+ parent::_construct();
}
}
View
8 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit.php
@@ -34,15 +34,13 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit extends Mage_Adminhtml_Block_Widget_Form_Container
{
- /**
- * Update block controls
- */
- public function __construct()
+
+ protected function _construct()
{
$this->_objectId = 'attribute_id';
$this->_controller = 'catalog_product_attribute';
- parent::__construct();
+ parent::_construct();
if($this->getRequest()->getParam('popup')) {
$this->_removeButton('back');
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Edit/Tabs.php
@@ -34,9 +34,9 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Edit_Tabs extends Mage_Adminhtml_Block_Widget_Tabs
{
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setId('product_attribute_tabs');
$this->setDestElementId('edit_form');
$this->setTitle(Mage::helper('Mage_Catalog_Helper_Data')->__('Attribute Information'));
View
10 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
@@ -33,14 +33,8 @@
*/
class Mage_Adminhtml_Block_Catalog_Product_Attribute_New_Product_Created extends Mage_Adminhtml_Block_Widget
{
- /**
- * Set block template
- */
- public function __construct()
- {
- parent::__construct();
- $this->setTemplate('catalog/product/attribute/new/created.phtml');
- }
+
+ protected $_template = 'catalog/product/attribute/new/created.phtml';
/**
* Add additional blocks to layout
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php
@@ -34,9 +34,9 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Grid extends Mage_Adminhtml_Block_Widget_Grid
{
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->setId('setGrid');
$this->setDefaultSort('set_name');
$this->setDefaultDir('ASC');
View
9 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main.php
@@ -33,14 +33,7 @@
*/
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main extends Mage_Adminhtml_Block_Template
{
- /**
- * Initialize template
- *
- */
- protected function _construct()
- {
- $this->setTemplate('catalog/product/attribute/set/main.phtml');
- }
+ protected $_template = 'catalog/product/attribute/set/main.phtml';
/**
* Prepare Global Layout
View
5 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formattribute.php
@@ -32,11 +32,6 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formattribute extends Mage_Adminhtml_Block_Widget_Form
{
- public function __construct()
- {
- parent::__construct();
- }
-
protected function _prepareForm()
{
$form = new Varien_Data_Form();
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formgroup.php
@@ -32,10 +32,6 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formgroup extends Mage_Adminhtml_Block_Widget_Form
{
- public function __construct()
- {
- parent::__construct();
- }
protected function _prepareForm()
{
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Formset.php
@@ -32,10 +32,6 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Formset extends Mage_Adminhtml_Block_Widget_Form
{
- public function __construct()
- {
- parent::__construct();
- }
/**
* Prepares attribute set form
View
5 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Attribute.php
@@ -32,8 +32,5 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Tree_Attribute extends Mage_Adminhtml_Block_Template
{
- protected function _construct()
- {
- $this->setTemplate('catalog/product/attribute/set/main/tree/attribute.phtml');
- }
+ protected $_template = 'catalog/product/attribute/set/main/tree/attribute.phtml';
}
View
5 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Main/Tree/Group.php
@@ -32,8 +32,5 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Main_Tree_Group extends Mage_Adminhtml_Block_Template
{
- protected function _construct()
- {
- $this->setTemplate('catalog/product/attribute/set/main/tree/group.phtml');
- }
+ protected $_template = 'catalog/product/attribute/set/main/tree/group.phtml';
}
View
6 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Add.php
@@ -33,10 +33,8 @@
*/
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Add extends Mage_Adminhtml_Block_Template
{
- protected function _construct()
- {
- $this->setTemplate('catalog/product/attribute/set/toolbar/add.phtml');
- }
+
+ protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml';
protected function _prepareLayout()
{
View
9 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main.php
@@ -34,11 +34,10 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main extends Mage_Adminhtml_Block_Template
{
- public function __construct()
- {
- parent::__construct();
- $this->setTemplate('catalog/product/attribute/set/toolbar/main.phtml');
- }
+ /**
+ * @var string
+ */
+ protected $_template = 'catalog/product/attribute/set/toolbar/main.phtml';
protected function _prepareLayout()
{
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Toolbar/Main/Filter.php
@@ -32,10 +32,6 @@
class Mage_Adminhtml_Block_Catalog_Product_Attribute_Set_Toolbar_Main_Filter extends Mage_Adminhtml_Block_Widget_Form
{
- public function __construct()
- {
- parent::__construct();
- }
protected function _prepareForm()
{
View
8 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Configure.php
@@ -35,13 +35,7 @@ class Mage_Adminhtml_Block_Catalog_Product_Composite_Configure extends Mage_Admi
{
protected $_product;
- /**
- * Set template
- */
- protected function _construct()
- {
- $this->setTemplate('catalog/product/composite/configure.phtml');
- }
+ protected $_template = 'catalog/product/composite/configure.phtml';
/**
* Retrieve product object
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php
@@ -38,9 +38,9 @@ class Mage_Adminhtml_Block_Catalog_Product_Composite_Fieldset_Options extends Ma
*
* @return void
*/
- public function __construct()
+ protected function _construct()
{
- parent::__construct();
+ parent::_construct();
$this->addOptionRenderer(
'default',
'Mage_Catalog_Block_Product_View_Options_Type_Default',
View
10 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Created.php
@@ -36,12 +36,10 @@ class Mage_Adminhtml_Block_Catalog_Product_Created extends Mage_Adminhtml_Block_
protected $_configurableProduct;
protected $_product;
- public function __construct()
- {
- parent::__construct();
- $this->setTemplate('catalog/product/created.phtml');
- }
-
+ /**
+ * @var string
+ */
+ protected $_template = 'catalog/product/created.phtml';
protected function _prepareLayout()
{
View
7 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
@@ -33,10 +33,11 @@
*/
class Mage_Adminhtml_Block_Catalog_Product_Edit extends Mage_Adminhtml_Block_Widget
{
- public function __construct()
+ protected $_template = 'catalog/product/edit.phtml';
+
+ protected function _construct()
{
- parent::__construct();
- $this->setTemplate('catalog/product/edit.phtml');
+ parent::_construct();
$this->setId('product_edit');
}
View
6 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts.php
@@ -35,11 +35,7 @@
class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Alerts extends Mage_Adminhtml_Block_Template
{
- public function __construct()
- {
- parent::__construct();
- $this->setTemplate('catalog/product/tab/alert.phtml');
- }
+ protected $_template = 'catalog/product/tab/alert.phtml';
protected function _prepareLayout()
{
View
4 app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Alerts