Skip to content

Commit 271615a

Browse files
magento-teammagento-team
committed
2.0.0.0-dev64
* Modularity improvements: * Moved abstract shopping cart logic from the Paypal module to the Payments module * Caching improvements: * Added a new mechanism to uniquely identify page content (a hash-key for cache storage) * Replaced the "magentoZoom" plugin with two widgets: the "gallery" and "zoom" * Fixed bugs: * Fixed an issue with inserting an image in WYSIWYG editor where the selected folder was stored in session * Fixed an issue with CMS Page Links not being shown because of the empty text in the link * Fixed an issue where zooming functionality was not disabled for the responsive design * Fixed an issue with zooming on a configurable product page where the main product image was shown instead of the selected option images * Updated various PHPDoc with parameter and return types * Moved quote-related multishipping logic to the Multishipping module * Resolved dependencies between the Payment and Multishipping modules * Moved the framework part of the Translate functionality from modules to the library * Created the architecture for the email template library * Introduced a consistent approach for using the Config scope * Fixed an issue with the dependency static test
1 parent 75b80bc commit 271615a

File tree

674 files changed

+13658
-7688
lines changed

Some content is hidden

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

674 files changed

+13658
-7688
lines changed

‎CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
2.0.0.0-dev64
2+
=============
3+
* Modularity improvements:
4+
* Moved abstract shopping cart logic from the Paypal module to the Payments module
5+
* Caching improvements:
6+
* Added a new mechanism to uniquely identify page content (a hash-key for cache storage)
7+
* Replaced the "magentoZoom" plugin with two widgets: the "gallery" and "zoom"
8+
* Fixed bugs:
9+
* Fixed an issue with inserting an image in WYSIWYG editor where the selected folder was stored in session
10+
* Fixed an issue with CMS Page Links not being shown because of the empty text in the link
11+
* Fixed an issue where zooming functionality was not disabled for the responsive design
12+
* Fixed an issue with zooming on a configurable product page where the main product image was shown instead of the selected option images
13+
* Updated various PHPDoc with parameter and return types
14+
* Moved quote-related multishipping logic to the Multishipping module
15+
* Resolved dependencies between the Payment and Multishipping modules
16+
* Moved the framework part of the Translate functionality from modules to the library
17+
* Created the architecture for the email template library
18+
* Introduced a consistent approach for using the Config scope
19+
* Fixed an issue with the dependency static test
20+
121
2.0.0.0-dev63
222
=============
323
* Modularity improvements:

‎app/code/Magento/Authorizenet/Model/Authorizenet.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ class Authorizenet extends \Magento\Payment\Model\Method\Cc
105105
protected $_canVoid = true;
106106
protected $_canUseInternal = true;
107107
protected $_canUseCheckout = true;
108-
protected $_canUseForMultishipping = true;
109108
protected $_canSaveCc = false;
110109
protected $_canFetchTransactionInfo = true;
111110

‎app/code/Magento/Authorizenet/Model/Directpost.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet
4444
protected $_canVoid = true;
4545
protected $_canUseInternal = true;
4646
protected $_canUseCheckout = true;
47-
protected $_canUseForMultishipping = false;
4847
protected $_canSaveCc = false;
4948
protected $_isInitializeNeeded = true;
5049

‎dev/tests/unit/testsuite/Magento/Core/Model/Config/TestReaderClass.php renamed to ‎app/code/Magento/Authorizenet/etc/payment.xml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
<?php
1+
<?xml version="1.0"?>
2+
<!--
23
/**
34
* Magento
45
*
56
* NOTICE OF LICENSE
67
*
7-
* This source file is subject to the Open Software License (OSL 3.0)
8-
* that is bundled with this package in the file LICENSE.txt.
8+
* This source file is subject to the Academic Free License (AFL 3.0)
9+
* that is bundled with this package in the file LICENSE_AFL.txt.
910
* It is also available through the world-wide-web at this URL:
10-
* http://opensource.org/licenses/osl-3.0.php
11+
* http://opensource.org/licenses/afl-3.0.php
1112
* If you did not receive a copy of the license and are unable to
1213
* obtain it through the world-wide-web, please send an email
1314
* to [email protected] so we can send you a copy immediately.
@@ -19,14 +20,15 @@
1920
* needs please refer to http://www.magentocommerce.com for more information.
2021
*
2122
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
22-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
23+
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
2324
*/
24-
namespace Magento\Core\Model\Config;
25-
26-
class TestReaderClass
27-
{
28-
public function read($scope = 'primary')
29-
{
30-
return $scope;
31-
}
32-
}
25+
-->
26+
<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
27+
xsi:noNamespaceSchemaLocation="../../../Magento/Payment/etc/payment.xsd">
28+
<methods>
29+
<method name="authorizenet">
30+
<allow_multiple_address>1</allow_multiple_address>
31+
<allow_multiple_with_3dsecure>1</allow_multiple_with_3dsecure>
32+
</method>
33+
</methods>
34+
</payment>

‎app/code/Magento/Backend/App/Config.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
class Config implements ConfigInterface
3232
{
3333
/**
34-
* @var \Magento\Core\Model\Config\SectionPool
34+
* @var \Magento\App\Config\ScopePool
3535
*/
36-
protected $_sectionPool;
36+
protected $_scopePool;
3737

3838
/**
39-
* @param \Magento\Core\Model\Config\SectionPool $sectionPool
39+
* @param \Magento\App\Config\ScopePool $scopePool
4040
*/
41-
public function __construct(\Magento\Core\Model\Config\SectionPool $sectionPool)
41+
public function __construct(\Magento\App\Config\ScopePool $scopePool)
4242
{
43-
$this->_sectionPool = $sectionPool;
43+
$this->_scopePool = $scopePool;
4444
}
4545

4646
/**
@@ -51,7 +51,7 @@ public function __construct(\Magento\Core\Model\Config\SectionPool $sectionPool)
5151
*/
5252
public function getValue($path)
5353
{
54-
return $this->_sectionPool->getSection('default', null)->getValue($path);
54+
return $this->_scopePool->getScope('default', null)->getValue($path);
5555
}
5656

5757
/**
@@ -62,15 +62,15 @@ public function getValue($path)
6262
*/
6363
public function setValue($path, $value)
6464
{
65-
$this->_sectionPool->getSection('default', null)->setValue($path, $value);
65+
$this->_scopePool->getScope('default', null)->setValue($path, $value);
6666
}
6767

6868
/**
6969
* Reinitialize configuration
7070
*/
7171
public function reinit()
7272
{
73-
$this->_sectionPool->clean();
73+
$this->_scopePool->clean();
7474
}
7575

7676
/**
@@ -81,6 +81,6 @@ public function reinit()
8181
*/
8282
public function isSetFlag($path)
8383
{
84-
return !!$this->_sectionPool->getSection('default', null)->getValue($path);
84+
return !!$this->_scopePool->getScope('default', null)->getValue($path);
8585
}
8686
}

‎app/code/Magento/Backend/Block/Template/Context.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class Context extends \Magento\View\Element\Template\Context
5555
* @param \Magento\View\LayoutInterface $layout
5656
* @param \Magento\Event\ManagerInterface $eventManager
5757
* @param \Magento\UrlInterface $urlBuilder
58-
* @param \Magento\Core\Model\Translate $translator
58+
* @param \Magento\TranslateInterface $translator
5959
* @param \Magento\App\CacheInterface $cache
6060
* @param \Magento\View\DesignInterface $design
6161
* @param \Magento\Core\Model\Session $session
@@ -88,7 +88,7 @@ public function __construct(
8888
\Magento\View\LayoutInterface $layout,
8989
\Magento\Event\ManagerInterface $eventManager,
9090
\Magento\UrlInterface $urlBuilder,
91-
\Magento\Core\Model\Translate $translator,
91+
\Magento\TranslateInterface $translator,
9292
\Magento\App\CacheInterface $cache,
9393
\Magento\View\DesignInterface $design,
9494
\Magento\Core\Model\Session $session,

‎app/code/Magento/Backend/Block/Widget/Button/SplitButton.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @method string getClass()
3333
* @method string getLabel()
3434
* @method string getTitle()
35-
* @method string getDisabled()
35+
* @method bool getDisabled()
3636
* @method string getStyle()
3737
* @method array getDataAttribute()
3838
*/

‎app/code/Magento/Backend/Model/Config/Backend/Admin/Custom.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class Custom extends \Magento\Core\Model\Config\Value
4747
/**
4848
* Writer of configuration storage
4949
*
50-
* @var \Magento\Core\Model\Config\Storage\WriterInterface
50+
* @var \Magento\App\Config\Storage\WriterInterface
5151
*/
5252
protected $_configWriter;
5353

@@ -56,7 +56,7 @@ class Custom extends \Magento\Core\Model\Config\Value
5656
* @param \Magento\Core\Model\Registry $registry
5757
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
5858
* @param \Magento\App\ConfigInterface $config
59-
* @param \Magento\Core\Model\Config\Storage\WriterInterface $configWriter
59+
* @param \Magento\App\Config\Storage\WriterInterface $configWriter
6060
* @param \Magento\Core\Model\Resource\AbstractResource $resource
6161
* @param \Magento\Data\Collection\Db $resourceCollection
6262
* @param array $data
@@ -66,7 +66,7 @@ public function __construct(
6666
\Magento\Core\Model\Registry $registry,
6767
\Magento\Core\Model\StoreManagerInterface $storeManager,
6868
\Magento\App\ConfigInterface $config,
69-
\Magento\Core\Model\Config\Storage\WriterInterface $configWriter,
69+
\Magento\App\Config\Storage\WriterInterface $configWriter,
7070
\Magento\Core\Model\Resource\AbstractResource $resource = null,
7171
\Magento\Data\Collection\Db $resourceCollection = null,
7272
array $data = array()

‎app/code/Magento/Backend/Model/Config/Backend/Admin/Usecustom.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Usecustom extends \Magento\Core\Model\Config\Value
3535
/**
3636
* Writer of configuration storage
3737
*
38-
* @var \Magento\Core\Model\Config\Storage\WriterInterface
38+
* @var \Magento\App\Config\Storage\WriterInterface
3939
*/
4040
protected $_configWriter;
4141

@@ -44,7 +44,7 @@ class Usecustom extends \Magento\Core\Model\Config\Value
4444
* @param \Magento\Core\Model\Registry $registry
4545
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
4646
* @param \Magento\App\ConfigInterface $config
47-
* @param \Magento\Core\Model\Config\Storage\WriterInterface $configWriter
47+
* @param \Magento\App\Config\Storage\WriterInterface $configWriter
4848
* @param \Magento\Core\Model\Resource\AbstractResource $resource
4949
* @param \Magento\Data\Collection\Db $resourceCollection
5050
* @param array $data
@@ -54,7 +54,7 @@ public function __construct(
5454
\Magento\Core\Model\Registry $registry,
5555
\Magento\Core\Model\StoreManagerInterface $storeManager,
5656
\Magento\App\ConfigInterface $config,
57-
\Magento\Core\Model\Config\Storage\WriterInterface $configWriter,
57+
\Magento\App\Config\Storage\WriterInterface $configWriter,
5858
\Magento\Core\Model\Resource\AbstractResource $resource = null,
5959
\Magento\Data\Collection\Db $resourceCollection = null,
6060
array $data = array()

‎app/code/Magento/Backend/Model/Config/Backend/Encrypted.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
class Encrypted
3131
extends \Magento\Core\Model\Config\Value
32-
implements \Magento\Core\Model\Config\Data\BackendModelInterface
32+
implements \Magento\App\Config\Data\ProcessorInterface
3333
{
3434
/**
3535
* @var \Magento\Encryption\EncryptorInterface

0 commit comments

Comments
 (0)