Skip to content

Commit

Permalink
2.0.0.0-dev72
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
magento-team committed Apr 7, 2014
1 parent 1e3c166 commit 342b298
Show file tree
Hide file tree
Showing 234 changed files with 3,724 additions and 3,272 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
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] (https://github.com/magento/magento2/pull/325) -- ImportExport: Fix notice if _attribute_set column is missing

2.0.0.0-dev71
=============
* Fixed bugs:
Expand Down
3 changes: 3 additions & 0 deletions app/code/Magento/Backend/Block/Page/Head.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class Head extends \Magento\Theme\Block\Html\Head
* @param \Magento\View\Asset\MergeService $assetMergeService
* @param \Magento\View\Asset\MinifyService $assetMinifyService
* @param \Magento\Locale\ResolverInterface $localeResolver
* @param \Magento\Translation\Block\Js $jsTranslation
* @param \Magento\App\Action\Title $titles
* @param \Magento\Data\Form\FormKey $formKey
* @param array $data
Expand All @@ -65,6 +66,7 @@ public function __construct(
\Magento\View\Asset\MergeService $assetMergeService,
\Magento\View\Asset\MinifyService $assetMinifyService,
\Magento\Locale\ResolverInterface $localeResolver,
\Magento\Translation\Block\Js $jsTranslation,
\Magento\App\Action\Title $titles,
\Magento\Data\Form\FormKey $formKey,
array $data = array()
Expand All @@ -79,6 +81,7 @@ public function __construct(
$assetMergeService,
$assetMinifyService,
$localeResolver,
$jsTranslation,
$data
);
$this->formKey = $formKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ class Fieldset extends \Magento\Backend\Block\AbstractBlock implements
protected $_authSession;

/**
* @var \Magento\Core\Helper\Js
* @var \Magento\View\Helper\Js
*/
protected $_jsHelper;

/**
* @param \Magento\Backend\Block\Context $context
* @param \Magento\Backend\Model\Auth\Session $authSession
* @param \Magento\Core\Helper\Js $jsHelper
* @param \Magento\View\Helper\Js $jsHelper
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Context $context,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Core\Helper\Js $jsHelper,
\Magento\View\Helper\Js $jsHelper,
array $data = array()
) {
$this->_jsHelper = $jsHelper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ class DisableOutput extends \Magento\Backend\Block\System\Config\Form\Fieldset
/**
* @param \Magento\Backend\Block\Context $context
* @param \Magento\Backend\Model\Auth\Session $authSession
* @param \Magento\Core\Helper\Js $jsHelper
* @param \Magento\View\Helper\Js $jsHelper
* @param \Magento\Module\ModuleListInterface $moduleList
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Context $context,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Core\Helper\Js $jsHelper,
\Magento\View\Helper\Js $jsHelper,
\Magento\Module\ModuleListInterface $moduleList,
array $data = array()
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ class Edit extends \Magento\Backend\Block\Urlrewrite\Edit

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
* @param \Magento\Backend\Helper\Data $adminhtmlData
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
\Magento\Backend\Helper\Data $adminhtmlData,
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
array $data = array()
Expand Down
12 changes: 6 additions & 6 deletions app/code/Magento/Backend/Block/Urlrewrite/Catalog/Edit/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ class Form extends \Magento\Backend\Block\Urlrewrite\Edit\Form
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Registry $registry
* @param \Magento\Data\FormFactory $formFactory
* @param \Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory
* @param \Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
* @param \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory
* @param \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
* @param \Magento\Core\Model\System\Store $systemStore
* @param \Magento\Backend\Helper\Data $adminhtmlData
* @param \Magento\Catalog\Model\ProductFactory $productFactory
Expand All @@ -80,9 +80,9 @@ public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Registry $registry,
\Magento\Data\FormFactory $formFactory,
\Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory,
\Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory,
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
\Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory,
\Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory,
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
\Magento\Core\Model\System\Store $systemStore,
\Magento\Backend\Helper\Data $adminhtmlData,
\Magento\Catalog\Model\ProductFactory $productFactory,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ class Edit extends \Magento\Backend\Block\Urlrewrite\Edit

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
* @param \Magento\Backend\Helper\Data $adminhtmlData
* @param \Magento\Catalog\Model\ProductFactory $productFactory
* @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
\Magento\Backend\Helper\Data $adminhtmlData,
\Magento\Catalog\Model\ProductFactory $productFactory,
\Magento\Catalog\Model\CategoryFactory $categoryFactory,
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ class Edit extends \Magento\Backend\Block\Urlrewrite\Edit

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
* @param \Magento\Backend\Helper\Data $adminhtmlData
* @param \Magento\Cms\Model\PageFactory $pageFactory
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
\Magento\Backend\Helper\Data $adminhtmlData,
\Magento\Cms\Model\PageFactory $pageFactory,
array $data = array()
Expand Down
12 changes: 6 additions & 6 deletions app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ class Form extends \Magento\Backend\Block\Urlrewrite\Edit\Form
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Registry $registry
* @param \Magento\Data\FormFactory $formFactory
* @param \Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory
* @param \Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
* @param \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory
* @param \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
* @param \Magento\Core\Model\System\Store $systemStore
* @param \Magento\Backend\Helper\Data $adminhtmlData
* @param \Magento\Cms\Model\Page\UrlrewriteFactory $urlRewriteFactory
Expand All @@ -72,9 +72,9 @@ public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Registry $registry,
\Magento\Data\FormFactory $formFactory,
\Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory,
\Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory,
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
\Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory,
\Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory,
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
\Magento\Core\Model\System\Store $systemStore,
\Magento\Backend\Helper\Data $adminhtmlData,
\Magento\Cms\Model\Page\UrlrewriteFactory $urlRewriteFactory,
Expand Down
12 changes: 6 additions & 6 deletions app/code/Magento/Backend/Block/Urlrewrite/Edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
/**
* Block for URL rewrites edit page
*
* @method \Magento\Core\Model\Url\Rewrite getUrlRewrite()
* @method \Magento\Backend\Block\Urlrewrite\Edit setUrlRewrite(\Magento\Core\Model\Url\Rewrite $urlRewrite)
* @method \Magento\UrlRewrite\Model\UrlRewrite getUrlRewrite()
* @method \Magento\Backend\Block\Urlrewrite\Edit setUrlRewrite(\Magento\UrlRewrite\Model\UrlRewrite $urlRewrite)
*
* @category Magento
* @package Magento_Adminhtml
Expand Down Expand Up @@ -64,19 +64,19 @@ class Edit extends \Magento\Backend\Block\Widget\Container
protected $_adminhtmlData = null;

/**
* @var \Magento\Core\Model\Url\RewriteFactory
* @var \Magento\UrlRewrite\Model\UrlRewriteFactory
*/
protected $_rewriteFactory;

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
* @param \Magento\Backend\Helper\Data $adminhtmlData
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
\Magento\Backend\Helper\Data $adminhtmlData,
array $data = array()
) {
Expand Down Expand Up @@ -292,7 +292,7 @@ public function getButtonsHtml($area = null)
/**
* Get or create new instance of URL rewrite
*
* @return \Magento\Core\Model\Url\Rewrite
* @return \Magento\UrlRewrite\Model\UrlRewrite
*/
protected function _getUrlRewrite()
{
Expand Down
28 changes: 14 additions & 14 deletions app/code/Magento/Backend/Block/Urlrewrite/Edit/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
/**
* URL rewrites edit form
*
* @method \Magento\Core\Model\Url\Rewrite getUrlRewrite()
* @method \Magento\Backend\Block\Urlrewrite\Edit\Form setUrlRewrite(\Magento\Core\Model\Url\Rewrite $model)
* @method \Magento\UrlRewrite\Model\UrlRewrite getUrlRewrite()
* @method \Magento\Backend\Block\Urlrewrite\Edit\Form setUrlRewrite(\Magento\UrlRewrite\Model\UrlRewrite $model)
*
* @category Magento
* @package Magento_Adminhtml
Expand Down Expand Up @@ -73,27 +73,27 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
protected $_systemStore;

/**
* @var \Magento\Core\Model\Url\RewriteFactory
* @var \Magento\UrlRewrite\Model\UrlRewriteFactory
*/
protected $_rewriteFactory;

/**
* @var \Magento\Core\Model\Source\Urlrewrite\OptionsFactory
* @var \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory
*/
protected $_optionFactory;

/**
* @var \Magento\Core\Model\Source\Urlrewrite\TypesFactory
* @var \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory
*/
protected $_typesFactory;

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Registry $registry
* @param \Magento\Data\FormFactory $formFactory
* @param \Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory
* @param \Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory
* @param \Magento\Core\Model\Url\RewriteFactory $rewriteFactory
* @param \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory
* @param \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory
* @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory
* @param \Magento\Core\Model\System\Store $systemStore
* @param \Magento\Backend\Helper\Data $adminhtmlData
* @param array $data
Expand All @@ -104,9 +104,9 @@ public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Registry $registry,
\Magento\Data\FormFactory $formFactory,
\Magento\Core\Model\Source\Urlrewrite\TypesFactory $typesFactory,
\Magento\Core\Model\Source\Urlrewrite\OptionsFactory $optionFactory,
\Magento\Core\Model\Url\RewriteFactory $rewriteFactory,
\Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory,
\Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory,
\Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory,
\Magento\Core\Model\System\Store $systemStore,
\Magento\Backend\Helper\Data $adminhtmlData,
array $data = array()
Expand Down Expand Up @@ -179,7 +179,7 @@ protected function _prepareForm()

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

/** @var $typesModel \Magento\Core\Model\Source\Urlrewrite\Types */
/** @var $typesModel \Magento\UrlRewrite\Model\UrlRewrite\TypeProvider */
$typesModel = $this->_typesFactory->create();
$fieldset->addField(
'is_system',
Expand Down Expand Up @@ -233,7 +233,7 @@ protected function _prepareForm()
)
);

/** @var $optionsModel \Magento\Core\Model\Source\Urlrewrite\Options */
/** @var $optionsModel \Magento\UrlRewrite\Model\UrlRewrite\OptionProvider */
$optionsModel = $this->_optionFactory->create();
$fieldset->addField(
'options',
Expand Down Expand Up @@ -339,7 +339,7 @@ protected function _getSessionData()
/**
* Get URL rewrite model instance
*
* @return \Magento\Core\Model\Url\Rewrite
* @return \Magento\UrlRewrite\Model\UrlRewrite
*/
protected function _getModel()
{
Expand Down
Loading

0 comments on commit 342b298

Please sign in to comment.