Skip to content

Commit 342b298

Browse files
magento-teammagento-team
committed
2.0.0.0-dev72
* Framework Improvements: * Fixed performance degradation caused by DI argument processors * Modularity improvements: * Introduced the Magento_UrlRewrite module, and moved corresponding classes from Magento_Core to Magento_UrlRewrite * Moved all Install logic to the Magento_Install module * Eliminated the Core\Helper\Js class * Moved the Email related logic from the Magento_Core module to the Magento_Email module * Moved the Cache related logic from the Magento_Core module to library * Indexer improvements: * Added execution time hints for console reindex * Customer Service usage: * Refactored the Magento_Newsletter module to use Customer service layer * Fixed bugs: * Fixed an issue with resetting customer password from the frontend * Fixed an issue where mistakenly the attribute of the Customer Address Edit form was cached * Fixed an issue where admin could not unsubscribe customer on the customer edit page in the backend * Fixed an issue where customers were always subscribed to the newsletter even if not selected during registration * GitHub requests: * [#325] (#325) -- ImportExport: Fix notice if _attribute_set column is missing
1 parent 1e3c166 commit 342b298

File tree

234 files changed

+3724
-3272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+3724
-3272
lines changed

‎CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2.0.0.0-dev72
2+
=============
3+
* Framework Improvements:
4+
* Fixed performance degradation caused by DI argument processors
5+
* Modularity improvements:
6+
* Introduced the Magento_UrlRewrite module, and moved corresponding classes from Magento_Core to Magento_UrlRewrite
7+
* Moved all Install logic to the Magento_Install module
8+
* Eliminated the Core\Helper\Js class
9+
* Moved the Email related logic from the Magento_Core module to the Magento_Email module
10+
* Moved the Cache related logic from the Magento_Core module to library
11+
* Indexer improvements:
12+
* Added execution time hints for console reindex
13+
* Customer Service usage:
14+
* Refactored the Magento_Newsletter module to use Customer service layer
15+
* Fixed bugs:
16+
* Fixed an issue with resetting customer password from the frontend
17+
* Fixed an issue where mistakenly the attribute of the Customer Address Edit form was cached
18+
* Fixed an issue where admin could not unsubscribe customer on the customer edit page in the backend
19+
* Fixed an issue where customers were always subscribed to the newsletter even if not selected during registration
20+
* GitHub requests:
21+
* [#325] (https://github.com/magento/magento2/pull/325) -- ImportExport: Fix notice if _attribute_set column is missing
22+
123
2.0.0.0-dev71
224
=============
325
* Fixed bugs:

‎app/code/Magento/Backend/Block/Page/Head.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class Head extends \Magento\Theme\Block\Html\Head
5353
* @param \Magento\View\Asset\MergeService $assetMergeService
5454
* @param \Magento\View\Asset\MinifyService $assetMinifyService
5555
* @param \Magento\Locale\ResolverInterface $localeResolver
56+
* @param \Magento\Translation\Block\Js $jsTranslation
5657
* @param \Magento\App\Action\Title $titles
5758
* @param \Magento\Data\Form\FormKey $formKey
5859
* @param array $data
@@ -65,6 +66,7 @@ public function __construct(
6566
\Magento\View\Asset\MergeService $assetMergeService,
6667
\Magento\View\Asset\MinifyService $assetMinifyService,
6768
\Magento\Locale\ResolverInterface $localeResolver,
69+
\Magento\Translation\Block\Js $jsTranslation,
6870
\Magento\App\Action\Title $titles,
6971
\Magento\Data\Form\FormKey $formKey,
7072
array $data = array()
@@ -79,6 +81,7 @@ public function __construct(
7981
$assetMergeService,
8082
$assetMinifyService,
8183
$localeResolver,
84+
$jsTranslation,
8285
$data
8386
);
8487
$this->formKey = $formKey;

‎app/code/Magento/Backend/Block/System/Config/Form/Fieldset.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@ class Fieldset extends \Magento\Backend\Block\AbstractBlock implements
3838
protected $_authSession;
3939

4040
/**
41-
* @var \Magento\Core\Helper\Js
41+
* @var \Magento\View\Helper\Js
4242
*/
4343
protected $_jsHelper;
4444

4545
/**
4646
* @param \Magento\Backend\Block\Context $context
4747
* @param \Magento\Backend\Model\Auth\Session $authSession
48-
* @param \Magento\Core\Helper\Js $jsHelper
48+
* @param \Magento\View\Helper\Js $jsHelper
4949
* @param array $data
5050
*/
5151
public function __construct(
5252
\Magento\Backend\Block\Context $context,
5353
\Magento\Backend\Model\Auth\Session $authSession,
54-
\Magento\Core\Helper\Js $jsHelper,
54+
\Magento\View\Helper\Js $jsHelper,
5555
array $data = array()
5656
) {
5757
$this->_jsHelper = $jsHelper;

‎app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ class DisableOutput extends \Magento\Backend\Block\System\Config\Form\Fieldset
5454
/**
5555
* @param \Magento\Backend\Block\Context $context
5656
* @param \Magento\Backend\Model\Auth\Session $authSession
57-
* @param \Magento\Core\Helper\Js $jsHelper
57+
* @param \Magento\View\Helper\Js $jsHelper
5858
* @param \Magento\Module\ModuleListInterface $moduleList
5959
* @param array $data
6060
*/
6161
public function __construct(
6262
\Magento\Backend\Block\Context $context,
6363
\Magento\Backend\Model\Auth\Session $authSession,
64-
\Magento\Core\Helper\Js $jsHelper,
64+
\Magento\View\Helper\Js $jsHelper,
6565
\Magento\Module\ModuleListInterface $moduleList,
6666
array $data = array()
6767
) {

‎app/code/Magento/Backend/Block/Urlrewrite/Catalog/Category/Edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ class Edit extends \Magento\Backend\Block\Urlrewrite\Edit
4545

4646
/**
4747
* @param \Magento\Backend\Block\Template\Context $context
48-
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
48+
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
4949
* @param \Magento\Backend\Helper\Data $adminhtmlData
5050
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
5151
* @param array $data
5252
*/
5353
public function __construct(
5454
\Magento\Backend\Block\Template\Context $context,
55-
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
55+
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
5656
\Magento\Backend\Helper\Data $adminhtmlData,
5757
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
5858
array $data = array()

‎app/code/Magento/Backend/Block/Urlrewrite/Catalog/Edit/Form.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ class Form extends \Magento\Backend\Block\Urlrewrite\Edit\Form
6464
* @param \Magento\Backend\Block\Template\Context $context
6565
* @param \Magento\Registry $registry
6666
* @param \Magento\Data\FormFactory $formFactory
67-
* @param \Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory
68-
* @param \Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory
69-
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
67+
* @param \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory
68+
* @param \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory
69+
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
7070
* @param \Magento\Core\Model\System\Store $systemStore
7171
* @param \Magento\Backend\Helper\Data $adminhtmlData
7272
* @param \Magento\Catalog\Model\ProductFactory $productFactory
@@ -80,9 +80,9 @@ public function __construct(
8080
\Magento\Backend\Block\Template\Context $context,
8181
\Magento\Registry $registry,
8282
\Magento\Data\FormFactory $formFactory,
83-
\Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory,
84-
\Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory,
85-
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
83+
\Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory,
84+
\Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory,
85+
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
8686
\Magento\Core\Model\System\Store $systemStore,
8787
\Magento\Backend\Helper\Data $adminhtmlData,
8888
\Magento\Catalog\Model\ProductFactory $productFactory,

‎app/code/Magento/Backend/Block/Urlrewrite/Catalog/Product/Edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ class Edit extends \Magento\Backend\Block\Urlrewrite\Edit
5353

5454
/**
5555
* @param \Magento\Backend\Block\Template\Context $context
56-
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
56+
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
5757
* @param \Magento\Backend\Helper\Data $adminhtmlData
5858
* @param \Magento\Catalog\Model\ProductFactory $productFactory
5959
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
6060
* @param array $data
6161
*/
6262
public function __construct(
6363
\Magento\Backend\Block\Template\Context $context,
64-
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
64+
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
6565
\Magento\Backend\Helper\Data $adminhtmlData,
6666
\Magento\Catalog\Model\ProductFactory $productFactory,
6767
\Magento\Catalog\Model\CategoryFactory $categoryFactory,

‎app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ class Edit extends \Magento\Backend\Block\Urlrewrite\Edit
4444

4545
/**
4646
* @param \Magento\Backend\Block\Template\Context $context
47-
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
47+
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
4848
* @param \Magento\Backend\Helper\Data $adminhtmlData
4949
* @param \Magento\Cms\Model\PageFactory $pageFactory
5050
* @param array $data
5151
*/
5252
public function __construct(
5353
\Magento\Backend\Block\Template\Context $context,
54-
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
54+
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
5555
\Magento\Backend\Helper\Data $adminhtmlData,
5656
\Magento\Cms\Model\PageFactory $pageFactory,
5757
array $data = array()

‎app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit/Form.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ class Form extends \Magento\Backend\Block\Urlrewrite\Edit\Form
5757
* @param \Magento\Backend\Block\Template\Context $context
5858
* @param \Magento\Registry $registry
5959
* @param \Magento\Data\FormFactory $formFactory
60-
* @param \Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory
61-
* @param \Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory
62-
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
60+
* @param \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory
61+
* @param \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory
62+
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
6363
* @param \Magento\Core\Model\System\Store $systemStore
6464
* @param \Magento\Backend\Helper\Data $adminhtmlData
6565
* @param \Magento\Cms\Model\Page\UrlrewriteFactory $urlRewriteFactory
@@ -72,9 +72,9 @@ public function __construct(
7272
\Magento\Backend\Block\Template\Context $context,
7373
\Magento\Registry $registry,
7474
\Magento\Data\FormFactory $formFactory,
75-
\Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory,
76-
\Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory,
77-
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
75+
\Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory,
76+
\Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory,
77+
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
7878
\Magento\Core\Model\System\Store $systemStore,
7979
\Magento\Backend\Helper\Data $adminhtmlData,
8080
\Magento\Cms\Model\Page\UrlrewriteFactory $urlRewriteFactory,

‎app/code/Magento/Backend/Block/Urlrewrite/Edit.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
/**
2929
* Block for URL rewrites edit page
3030
*
31-
* @method \Magento\Core\Model\Url\Rewrite getUrlRewrite()
32-
* @method \Magento\Backend\Block\Urlrewrite\Edit setUrlRewrite(\Magento\Core\Model\Url\Rewrite $urlRewrite)
31+
* @method \Magento\UrlRewrite\Model\UrlRewrite getUrlRewrite()
32+
* @method \Magento\Backend\Block\Urlrewrite\Edit setUrlRewrite(\Magento\UrlRewrite\Model\UrlRewrite $urlRewrite)
3333
*
3434
* @category Magento
3535
* @package Magento_Adminhtml
@@ -64,19 +64,19 @@ class Edit extends \Magento\Backend\Block\Widget\Container
6464
protected $_adminhtmlData = null;
6565

6666
/**
67-
* @var \Magento\Core\Model\Url\RewriteFactory
67+
* @var \Magento\UrlRewrite\Model\UrlRewriteFactory
6868
*/
6969
protected $_rewriteFactory;
7070

7171
/**
7272
* @param \Magento\Backend\Block\Template\Context $context
73-
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
73+
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
7474
* @param \Magento\Backend\Helper\Data $adminhtmlData
7575
* @param array $data
7676
*/
7777
public function __construct(
7878
\Magento\Backend\Block\Template\Context $context,
79-
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
79+
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
8080
\Magento\Backend\Helper\Data $adminhtmlData,
8181
array $data = array()
8282
) {
@@ -292,7 +292,7 @@ public function getButtonsHtml($area = null)
292292
/**
293293
* Get or create new instance of URL rewrite
294294
*
295-
* @return \Magento\Core\Model\Url\Rewrite
295+
* @return \Magento\UrlRewrite\Model\UrlRewrite
296296
*/
297297
protected function _getUrlRewrite()
298298
{

‎app/code/Magento/Backend/Block/Urlrewrite/Edit/Form.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
/**
2929
* URL rewrites edit form
3030
*
31-
* @method \Magento\Core\Model\Url\Rewrite getUrlRewrite()
32-
* @method \Magento\Backend\Block\Urlrewrite\Edit\Form setUrlRewrite(\Magento\Core\Model\Url\Rewrite $model)
31+
* @method \Magento\UrlRewrite\Model\UrlRewrite getUrlRewrite()
32+
* @method \Magento\Backend\Block\Urlrewrite\Edit\Form setUrlRewrite(\Magento\UrlRewrite\Model\UrlRewrite $model)
3333
*
3434
* @category Magento
3535
* @package Magento_Adminhtml
@@ -73,27 +73,27 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
7373
protected $_systemStore;
7474

7575
/**
76-
* @var \Magento\Core\Model\Url\RewriteFactory
76+
* @var \Magento\UrlRewrite\Model\UrlRewriteFactory
7777
*/
7878
protected $_rewriteFactory;
7979

8080
/**
81-
* @var \Magento\Core\Model\Source\Urlrewrite\OptionsFactory
81+
* @var \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory
8282
*/
8383
protected $_optionFactory;
8484

8585
/**
86-
* @var \Magento\Core\Model\Source\Urlrewrite\TypesFactory
86+
* @var \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory
8787
*/
8888
protected $_typesFactory;
8989

9090
/**
9191
* @param \Magento\Backend\Block\Template\Context $context
9292
* @param \Magento\Registry $registry
9393
* @param \Magento\Data\FormFactory $formFactory
94-
* @param \Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory
95-
* @param \Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory
96-
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
94+
* @param \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory
95+
* @param \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory
96+
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
9797
* @param \Magento\Core\Model\System\Store $systemStore
9898
* @param \Magento\Backend\Helper\Data $adminhtmlData
9999
* @param array $data
@@ -104,9 +104,9 @@ public function __construct(
104104
\Magento\Backend\Block\Template\Context $context,
105105
\Magento\Registry $registry,
106106
\Magento\Data\FormFactory $formFactory,
107-
\Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory,
108-
\Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory,
109-
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
107+
\Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory,
108+
\Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory,
109+
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
110110
\Magento\Core\Model\System\Store $systemStore,
111111
\Magento\Backend\Helper\Data $adminhtmlData,
112112
array $data = array()
@@ -179,7 +179,7 @@ protected function _prepareForm()
179179

180180
$fieldset = $form->addFieldset('base_fieldset', array('legend' => __('URL Rewrite Information')));
181181

182-
/** @var $typesModel \Magento\Core\Model\Source\Urlrewrite\Types */
182+
/** @var $typesModel \Magento\UrlRewrite\Model\UrlRewrite\TypeProvider */
183183
$typesModel = $this->_typesFactory->create();
184184
$fieldset->addField(
185185
'is_system',
@@ -233,7 +233,7 @@ protected function _prepareForm()
233233
)
234234
);
235235

236-
/** @var $optionsModel \Magento\Core\Model\Source\Urlrewrite\Options */
236+
/** @var $optionsModel \Magento\UrlRewrite\Model\UrlRewrite\OptionProvider */
237237
$optionsModel = $this->_optionFactory->create();
238238
$fieldset->addField(
239239
'options',
@@ -339,7 +339,7 @@ protected function _getSessionData()
339339
/**
340340
* Get URL rewrite model instance
341341
*
342-
* @return \Magento\Core\Model\Url\Rewrite
342+
* @return \Magento\UrlRewrite\Model\UrlRewrite
343343
*/
344344
protected function _getModel()
345345
{

0 commit comments

Comments
 (0)