Skip to content

Commit 6e24c0b

Browse files
magento-teammagento-team
committed
2.0.0.0-dev54
* Modularity improvements: * Breakdown of the Adminhtml module: * Moved Newsletter, Report logic to the respective modules * Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules * Removed application dependencies from the library * Move Magento\Core common blocks in the library * Application areas rework: * Areas are independent from Store * Removed deprecated annotation from the getArea methods * GitHub requests: * [#245](#245) -- Resolve design flaws in core URL helper * [#247](#247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage * [#259](#259) -- Turkish Lira (TRY) is supported for Turkish members. * [#262](#262) -- Update Rule.php * [#373](#373) -- [Magento/Sales] Fixed typos * [#382](#382) -- [Magento/Core] Fixed typos * [#304](#304) -- Removed Erroneous closing " * [#323](#323) -- InstanceController.php - made setBody protected * [#349](#349) -- Move Mage_Catalog menu declaration into Mage_Catalog module. * [#265](#265) -- Update Merge.php * [#271](#271) -- Check Data should validate gallery information * [#305](#305) -- Extra ", tidied up nested quotes * [#352](#352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration * [#224](#224) -- Tax formatting is locale aware and should not * [#338](#338) -- Correcting SQL for required_options column * [#327](#327) -- cart api bug fix & partial invoice credit memo divide by zero warning * Themes update: * Old frontend (magento_demo) and backend (magento_basic) themes are removed * Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules * Fixed bugs: * Fixed the error when Magento cannot be reinstalled to the same database with table prefix * Fixed report Products in Cart * Fixed error on attempt to insert image to CMS pages under version control * Fixed order status grid so that you can assign state, edit, and view custom order status * Fixed Related Products Rule page so that category can be selected on conditions tab * Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled * Fixed the bug with international DHL quotes
1 parent b3d6949 commit 6e24c0b

File tree

2,143 files changed

+27516
-61959
lines changed

Some content is hidden

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

2,143 files changed

+27516
-61959
lines changed

‎CHANGELOG.md

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
2.0.0.0-dev54
2+
=============
3+
* Modularity improvements:
4+
* Breakdown of the Adminhtml module:
5+
* Moved Newsletter, Report logic to the respective modules
6+
* Moved blocks, config, view, layout files of other components from Adminhtml folder to respective modules
7+
* Removed application dependencies from the library
8+
* Move Magento\Core common blocks in the library
9+
* Application areas rework:
10+
* Areas are independent from Store
11+
* Removed deprecated annotation from the getArea methods
12+
* GitHub requests:
13+
* [#245](https://github.com/magento/magento2/pull/245) -- Resolve design flaws in core URL helper
14+
* [#247](https://github.com/magento/magento2/pull/247) -- Bug in Mage_Page_Block_Html_Header->getIsHomePage
15+
* [#259](https://github.com/magento/magento2/pull/259) -- Turkish Lira (TRY) is supported for Turkish members.
16+
* [#262](https://github.com/magento/magento2/pull/262) -- Update Rule.php
17+
* [#373](https://github.com/magento/magento2/pull/373) -- [Magento/Sales] Fixed typos
18+
* [#382](https://github.com/magento/magento2/pull/382) -- [Magento/Core] Fixed typos
19+
* [#304](https://github.com/magento/magento2/pull/304) -- Removed Erroneous closing "
20+
* [#323](https://github.com/magento/magento2/pull/323) -- InstanceController.php - made setBody protected
21+
* [#349](https://github.com/magento/magento2/pull/349) -- Move Mage_Catalog menu declaration into Mage_Catalog module.
22+
* [#265](https://github.com/magento/magento2/pull/265) -- Update Merge.php
23+
* [#271](https://github.com/magento/magento2/pull/271) -- Check Data should validate gallery information
24+
* [#305](https://github.com/magento/magento2/pull/305) -- Extra ", tidied up nested quotes
25+
* [#352](https://github.com/magento/magento2/pull/352) -- Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration
26+
* [#224](https://github.com/magento/magento2/pull/224) -- Tax formatting is locale aware and should not
27+
* [#338](https://github.com/magento/magento2/pull/338) -- Correcting SQL for required_options column
28+
* [#327](https://github.com/magento/magento2/pull/327) -- cart api bug fix & partial invoice credit memo divide by zero warning
29+
* Themes update:
30+
* Old frontend (magento_demo) and backend (magento_basic) themes are removed
31+
* Updated templates and layout updates in the Bundle, Catalog, CatalogInventory, CatalogSearch, Downloadable, ProductAlert, Reports, Sendfriend modules
32+
* Fixed bugs:
33+
* Fixed the error when Magento cannot be reinstalled to the same database with table prefix
34+
* Fixed report Products in Cart
35+
* Fixed error on attempt to insert image to CMS pages under version control
36+
* Fixed order status grid so that you can assign state, edit, and view custom order status
37+
* Fixed Related Products Rule page so that category can be selected on conditions tab
38+
* Fixed Magento_Paypal_Controller_ExpressTest integration test so it is re-enabled
39+
* Fixed the bug with international DHL quotes
40+
141
2.0.0.0-dev53
242
=============
343
* Moved general action-related functionality to \Magento\App\Action\Action in the library. Removed Magento\Core\Controller\Varien\Action and related logic from the Magento_Core module
@@ -10,9 +50,9 @@
1050
* GitHub requests:
1151
* [#238](https://github.com/magento/magento2/pull/238) -- Improve escaping HTML entities in URL
1252
* [#199](https://github.com/magento/magento2/pull/199) -- Replaced function calls to array_push with adding the elements directly
13-
* [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods.
53+
* [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods
1454
* [#233](https://github.com/magento/magento2/pull/233) -- Google Rich Snippet Code
15-
* [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation.
55+
* [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation
1656
* [#232](https://github.com/magento/magento2/pull/232) -- Update app/code/core/Mage/Checkout/controllers/CartController.php (fix issue #27632)
1757
* Fixed bugs:
1858
* Fixed JavaScript error when printing orders from the frontend
@@ -29,11 +69,10 @@
2969
* Moved Magento\Core\Model\Theme to the Magento\View component
3070
* Moved Magento\Core\Model\Design to the Magento\View component
3171
* Consistent declaration of page-types
32-
* The Framework part of the Cache functionality moved out from modules
3372
* Themes update:
3473
* Updated templates and layout updates in the Captcha, Customer, Newsletter, Persistent, ProductAlert, Wishlist modules; old files moved to the "magento-backup" theme
3574
* Refactored and removed duplicate Persistent module templates
36-
* Plushe theme made responsive
75+
* Plushe theme is responsive now
3776
* Fixed bugs:
3877
* Fixed inability to print order, invoice, or creditmemo in the frontend
3978
* Fixed fatal error caused by the Mage_Backend_Block_System_Config_FormTest integration test

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ class Feed extends \Magento\Core\Model\AbstractModel
4949
protected $_feedUrl;
5050

5151
/**
52-
* @var \Magento\Core\Model\Store\Config
52+
* @var \Magento\Backend\App\ConfigInterface
5353
*/
54-
protected $_coreStoreConfig;
54+
protected $_backendConfig;
5555

5656
/**
5757
* @var \Magento\AdminNotification\Model\InboxFactory
@@ -61,7 +61,7 @@ class Feed extends \Magento\Core\Model\AbstractModel
6161
/**
6262
* @param \Magento\Core\Model\Context $context
6363
* @param \Magento\Core\Model\Registry $registry
64-
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
64+
* @param \Magento\Backend\App\ConfigInterface $backendConfig
6565
* @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
6666
* @param \Magento\Core\Model\Resource\AbstractResource $resource
6767
* @param \Magento\Data\Collection\Db $resourceCollection
@@ -70,14 +70,14 @@ class Feed extends \Magento\Core\Model\AbstractModel
7070
public function __construct(
7171
\Magento\Core\Model\Context $context,
7272
\Magento\Core\Model\Registry $registry,
73-
\Magento\Core\Model\Store\Config $coreStoreConfig,
73+
\Magento\Backend\App\ConfigInterface $backendConfig,
7474
\Magento\AdminNotification\Model\InboxFactory $inboxFactory,
7575
\Magento\Core\Model\Resource\AbstractResource $resource = null,
7676
\Magento\Data\Collection\Db $resourceCollection = null,
7777
array $data = array()
7878
) {
7979
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
80-
$this->_coreStoreConfig = $coreStoreConfig;
80+
$this->_backendConfig = $backendConfig;
8181
$this->_inboxFactory = $inboxFactory;
8282
}
8383

@@ -97,9 +97,9 @@ protected function _construct()
9797
*/
9898
public function getFeedUrl()
9999
{
100-
$httpPath = $this->_coreStoreConfig->getConfigFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
100+
$httpPath = $this->_backendConfig->getFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
101101
if (is_null($this->_feedUrl)) {
102-
$this->_feedUrl = $httpPath . $this->_coreStoreConfig->getConfig(self::XML_FEED_URL_PATH);
102+
$this->_feedUrl = $httpPath . $this->_backendConfig->getValue(self::XML_FEED_URL_PATH);
103103
}
104104
return $this->_feedUrl;
105105
}
@@ -158,7 +158,7 @@ public function getDate($rssDate)
158158
*/
159159
public function getFrequency()
160160
{
161-
return $this->_coreStoreConfig->getConfig(self::XML_FREQUENCY_PATH) * 3600;
161+
return $this->_backendConfig->getValue(self::XML_FREQUENCY_PATH) * 3600;
162162
}
163163

164164
/**

‎app/code/Magento/AdminNotification/Model/System/Message/Security.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ class Security
5050
protected $_cache;
5151

5252
/**
53-
* @var \Magento\Core\Model\Store\Config
53+
* @var \Magento\Backend\App\ConfigInterface
5454
*/
55-
protected $_storeConfig;
55+
protected $_backendConfig;
5656

5757
/**
5858
* @var \Magento\Core\Model\Config
@@ -66,18 +66,18 @@ class Security
6666

6767
/**
6868
* @param \Magento\App\CacheInterface $cache
69-
* @param \Magento\Core\Model\Store\Config $storeConfig
69+
* @param \Magento\Backend\App\ConfigInterface $backendConfig
7070
* @param \Magento\Core\Model\Config $config
7171
* @param \Magento\HTTP\Adapter\CurlFactory $curlFactory
7272
*/
7373
public function __construct(
7474
\Magento\App\CacheInterface $cache,
75-
\Magento\Core\Model\Store\Config $storeConfig,
75+
\Magento\Backend\App\ConfigInterface $backendConfig,
7676
\Magento\Core\Model\Config $config,
7777
\Magento\HTTP\Adapter\CurlFactory $curlFactory
7878
) {
7979
$this->_cache = $cache;
80-
$this->_storeConfig = $storeConfig;
80+
$this->_backendConfig = $backendConfig;
8181
$this->_config = $config;
8282
$this->_curlFactory = $curlFactory;
8383
}
@@ -97,7 +97,7 @@ private function _canShowNotification()
9797
return true;
9898
}
9999

100-
$adminSessionLifetime = (int) $this->_storeConfig->getConfig('admin/security/session_lifetime');
100+
$adminSessionLifetime = (int) $this->_backendConfig->getValue('admin/security/session_lifetime');
101101
$this->_cache->save(true, self::VERIFICATION_RESULT_CACHE_KEY, array(), $adminSessionLifetime);
102102
return false;
103103
}

‎app/code/Magento/Adminhtml/Block/Backup.php

Lines changed: 0 additions & 106 deletions
This file was deleted.

‎app/code/Magento/Adminhtml/Block/Html/Date.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎app/code/Magento/Adminhtml/Block/Html/Select.php

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎app/code/Magento/Adminhtml/Block/Messages.php

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)