Skip to content

Commit 2defd65

Browse files
magento-teammagento-team
committed
2.0.0.0-dev69
* Themes update: * LESS styles library added in pub/lib/css/ * A new Blank theme set as default * GitHub requests: * [#491](#491) -- Fixed bug, incorrect auto-generation Category URL for some groups of symbols (idish, cirrilic, , , and other). * [#480](#480) -- Fixing a bug for loading config from local.xml * [#472](#472) -- Params passed in pub/index.php being overwritten * [#461](#461) -- Use translates for Quote\Address\Total\Shipping * [#235](#235) -- Translation escaping * [#463](#463) -- allow _resolveArguments to do sequential lookups * [#499](#499) Deleted unclosed comment in calendar.css * Fixed bugs: * Fixed a fatal error that occurred with a dependency in pub/errors/report.php * Fixed an issue where code coverage failed for Magento\SalesRule\Model\Rule\Action\Discount\CartFixedTest * Fixed an issue where PayPal Express Checkout redirected to the PayPal site even though the Allow Guest Checkout option was set to 'No' * Fixed an issue where invalid password reset link was sent when resetting customer password from the backend * Fixed an issue where it was not possible to download a previously created backup * Fixed a security issue with possibility of a XSS injection in the Integration re-authorization flow * Fixed an issue where Billing Agreement cancellation from the backend did not work * Fixed an issue with the debug section in the developer settings * Fixed the unreliable implementation of the fetching authorization header via SOAP * Fixed issues with WSDL generation error reporting * Fixed an issue with incorrect order of the Recurring Profile tab in Account Customer on the frontend * Fixed an issue when the information about a custom option of the 'File' type was not displayed correctly on the recurring profile page * Fixed an issue with editing Product template * Fixed an issue with duplicated shipping method options during checkout * Fixed an issue where flat indexers were re-indexed in shell when they were disabled * Fixed an issue where adding a wrong/nonexistent SKU using 'Order by SKU' from My Account caused a fatal error * Fixed an issue with the JS/CSS merging functionality * Fixed an issue with static view files publication tool used for the 'production' mode * Modularity improvements: * Removed the deprecated GoogleCheckout functionality * Removed all dependencies on the RecurringPayment module * Removed the Sales module dependencies on Customer models/blocks * Renamed the RecurringProfile module to RecurringPayment * Resolved dependencies between the Email Templates functionality and other modules * Moved Core module lib-only depended components to library * Moved CSS URL resolving logic from publisher to the separate CSS pre-processor * Re-factored the View publisher * Framework improvements: * Added restrictions on the data populated to the Service Data Object * Renamed Data Transfer Object to Service Data Object * Updated the view files population tool to support LESS * Customer Service usage: * Refactored the Tax module to use Customer service layer * Refactored Customer module Adminhtml internal controllers and helper to use Customer services * Added and updated the Customer service APIs * Exposed Customer services as REST APIs * Indexer implementation: * Implemented a new optimized Product Price Indexer * Updated various PHPDoc with the parameter and return types
1 parent c6856aa commit 2defd65

File tree

2,434 files changed

+107333
-58566
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,434 files changed

+107333
-58566
lines changed

‎CHANGELOG.md

+54
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,57 @@
1+
2.0.0.0-dev69
2+
=============
3+
* Themes update:
4+
* LESS styles library added in pub/lib/css/
5+
* A new Blank theme set as default
6+
* GitHub requests:
7+
* [#491](https://github.com/magento/magento2/pull/491) -- Fixed bug, incorrect auto-generation Category URL for some groups of symbols (idish, cirrilic, é, ä, and other).
8+
* [#480](https://github.com/magento/magento2/pull/480) -- Fixing a bug for loading config from local.xml
9+
* [#472](https://github.com/magento/magento2/issues/472) -- Params passed in pub/index.php being overwritten
10+
* [#461](https://github.com/magento/magento2/pull/461) -- Use translates for Quote\Address\Total\Shipping
11+
* [#235](https://github.com/magento/magento2/issues/235) -- Translation escaping
12+
* [#463](https://github.com/magento/magento2/pull/463) -- allow _resolveArguments to do sequential lookups
13+
* [#499](https://github.com/magento/magento2/issues/499) Deleted unclosed comment in calendar.css
14+
* Fixed bugs:
15+
* Fixed a fatal error that occurred with a dependency in pub/errors/report.php
16+
* Fixed an issue where code coverage failed for Magento\SalesRule\Model\Rule\Action\Discount\CartFixedTest
17+
* Fixed an issue where PayPal Express Checkout redirected to the PayPal site even though the Allow Guest Checkout option was set to 'No'
18+
* Fixed an issue where invalid password reset link was sent when resetting customer password from the backend
19+
* Fixed an issue where it was not possible to download a previously created backup
20+
* Fixed a security issue with possibility of a XSS injection in the Integration re-authorization flow
21+
* Fixed an issue where Billing Agreement cancellation from the backend did not work
22+
* Fixed an issue with the debug section in the developer settings
23+
* Fixed the unreliable implementation of the fetching authorization header via SOAP
24+
* Fixed issues with WSDL generation error reporting
25+
* Fixed an issue with incorrect order of the Recurring Profile tab in Account Customer on the frontend
26+
* Fixed an issue when the information about a custom option of the 'File' type was not displayed correctly on the recurring profile page
27+
* Fixed an issue with editing Product template
28+
* Fixed an issue with duplicated shipping method options during checkout
29+
* Fixed an issue where flat indexers were re-indexed in shell when they were disabled
30+
* Fixed an issue where adding a wrong/nonexistent SKU using 'Order by SKU' from My Account caused a fatal error
31+
* Fixed an issue with the JS/CSS merging functionality
32+
* Fixed an issue with static view files publication tool used for the 'production' mode
33+
* Modularity improvements:
34+
* Removed the deprecated GoogleCheckout functionality
35+
* Removed all dependencies on the RecurringPayment module
36+
* Removed the Sales module dependencies on Customer models/blocks
37+
* Renamed the RecurringProfile module to RecurringPayment
38+
* Resolved dependencies between the Email Templates functionality and other modules
39+
* Moved Core module lib-only depended components to library
40+
* Moved CSS URL resolving logic from publisher to the separate CSS pre-processor
41+
* Re-factored the View publisher
42+
* Framework improvements:
43+
* Added restrictions on the data populated to the Service Data Object
44+
* Renamed Data Transfer Object to Service Data Object
45+
* Updated the view files population tool to support LESS
46+
* Customer Service usage:
47+
* Refactored the Tax module to use Customer service layer
48+
* Refactored Customer module Adminhtml internal controllers and helper to use Customer services
49+
* Added and updated the Customer service APIs
50+
* Exposed Customer services as REST APIs
51+
* Indexer implementation:
52+
* Implemented a new optimized Product Price Indexer
53+
* Updated various PHPDoc with the parameter and return types
54+
155
2.0.0.0-dev68
256
=============
357
* Cache:

‎app/code/Magento/AdminNotification/Model/Resource/Inbox/Collection.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
26-
26+
namespace Magento\AdminNotification\Model\Resource\Inbox;
2727

2828
/**
2929
* AdminNotification Inbox model
@@ -32,13 +32,12 @@
3232
* @package Magento_AdminNotification
3333
* @author Magento Core Team <[email protected]>
3434
*/
35-
namespace Magento\AdminNotification\Model\Resource\Inbox;
36-
3735
class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractCollection
3836
{
3937
/**
4038
* Resource collection initialization
4139
*
40+
* @return void
4241
*/
4342
protected function _construct()
4443
{
@@ -48,7 +47,7 @@ protected function _construct()
4847
/**
4948
* Add remove filter
5049
*
51-
* @return \Magento\AdminNotification\Model\Resource\Inbox\Collection
50+
* @return $this
5251
*/
5352
public function addRemoveFilter()
5453
{

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2222
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2323
*/
24-
2524
namespace Magento\AdminNotification\Model\Resource\System;
2625

2726
class Message extends \Magento\Core\Model\Resource\Db\AbstractDb
@@ -35,6 +34,8 @@ class Message extends \Magento\Core\Model\Resource\Db\AbstractDb
3534

3635
/**
3736
* Resource initialization
37+
*
38+
* @return void
3839
*/
3940
protected function _construct()
4041
{

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@
2121
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2222
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2323
*/
24-
2524
namespace Magento\AdminNotification\Model\System;
2625

2726
class Message extends \Magento\Core\Model\AbstractModel
2827
implements \Magento\AdminNotification\Model\System\MessageInterface
2928
{
29+
/**
30+
* @return void
31+
*/
3032
protected function _construct()
3133
{
3234
$this->_init('Magento\AdminNotification\Model\Resource\System\Message');
@@ -45,7 +47,7 @@ public function isDisplayed()
4547
/**
4648
* Retrieve message text
4749
*
48-
* @return text
50+
* @return string
4951
*/
5052
public function getText()
5153
{

‎app/code/Magento/AdminNotification/etc/module.xml

100755100644
File mode changed.

‎app/code/Magento/Authorizenet/etc/module.xml

100755100644
File mode changed.

‎app/code/Magento/Authorizenet/view/frontend/form/cc.phtml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
});
5252
})(jQuery);
5353
</script>
54-
<span id="cancel-please-wait" class="please-wait" style="display:none">
55-
<img src="<?php echo $this->getViewFileUrl('images/opc-ajax-loader.gif') ?>" alt="" class="v-middle" /> <?php echo __('Processing...') ?>
54+
<span id="cancel-please-wait" class="please-wait load indicator" style="display: none" data-text="<?php echo __('Processing...') ?>">
55+
<span><?php echo __('Processing...') ?></span>
5656
</span>
5757
<?php endif;?>
5858
</div>

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

+3
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,14 @@ public function getValue($path);
4343
*
4444
* @param string $path
4545
* @param mixed $value
46+
* @return void
4647
*/
4748
public function setValue($path, $value);
4849

4950
/**
5051
* Reinitialize config object
52+
*
53+
* @return void
5154
*/
5255
public function reinit();
5356

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Options.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
26+
namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
2627

2728
/**
2829
* Grid column widget for rendering grid cells that contains mapped values
@@ -31,8 +32,6 @@
3132
* @package Magento_Backend
3233
* @author Magento Core Team <[email protected]>
3334
*/
34-
namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
35-
3635
class Options
3736
extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
3837
{
@@ -50,7 +49,7 @@ protected function _getOptions()
5049
* Render a grid cell as options
5150
*
5251
* @param \Magento\Object $row
53-
* @return string
52+
* @return string|void
5453
*/
5554
public function render(\Magento\Object $row)
5655
{

‎app/code/Magento/Backend/Controller/Adminhtml/System/Config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function indexAction()
7272
/**
7373
* Edit configuration section
7474
*
75-
* @return void
75+
* @return \Magento\App\ResponseInterface|void
7676
*/
7777
public function editAction()
7878
{

‎app/code/Magento/Backend/Controller/Adminhtml/System/Store.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,8 @@ public function deleteStoreAction()
394394
public function deleteWebsitePostAction()
395395
{
396396
$itemId = $this->getRequest()->getParam('item_id');
397-
$model = $this->_objectManager->create('Magento\Core\Model\Website')->load($itemId);
397+
$model = $this->_objectManager->create('Magento\Core\Model\Website');
398+
$model->load($itemId);
398399

399400
if (!$model) {
400401
$this->messageManager->addError(__('Unable to proceed. Please, try again'));

‎app/code/Magento/Backend/Model/Auth.php

+1
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ public function isLoggedIn()
220220
*
221221
* @param string $msg
222222
* @param string $code
223+
* @return void
223224
* @throws \Magento\Backend\Model\Auth\Exception
224225
* @static
225226
*/

‎app/code/Magento/Backend/Model/Auth/Credential/StorageInterface.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public function authenticate($username, $password);
4646
/**
4747
* Login action. Check if given username and password are valid
4848
*
49-
* @param $username
50-
* @param $password
49+
* @param string $username
50+
* @param string $password
5151
* @return $this
5252
* @abstract
5353
*/

‎app/code/Magento/GoogleCheckout/Controller/Api.php renamed to ‎app/code/Magento/Backend/Model/Config/Source/Website/AdminOptionHash.php

+18-15
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,31 @@
1919
* needs please refer to http://www.magentocommerce.com for more information.
2020
*
2121
* @category Magento
22-
* @package Magento_GoogleCheckout
22+
* @package Magento_Backend
2323
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
2626

27-
namespace Magento\GoogleCheckout\Controller;
27+
namespace Magento\Backend\Model\Config\Source\Website;
2828

29-
class Api extends \Magento\App\Action\Action
29+
use Magento\Core\Model\System\Store;
30+
31+
/**
32+
* Admin OptionHash will include the default store (Admin) with the OptionHash.
33+
*
34+
* This class is needed until the layout file supports supplying arguments to an option model.
35+
*/
36+
class AdminOptionHash extends OptionHash
3037
{
31-
public function indexAction()
32-
{
33-
$res = $this->_objectManager->create('Magento\GoogleCheckout\Model\Api')->processCallback();
34-
if ($res === false) {
35-
$this->_forward('noroute');
36-
} else {
37-
exit;
38-
}
39-
}
4038

41-
public function beaconAction()
39+
/**
40+
* @param Store $systemStore
41+
* @param bool $withDefaultWebsite
42+
*/
43+
public function __construct(Store $systemStore, $withDefaultWebsite = true)
4244
{
43-
$this->_objectManager->create('Magento\GoogleCheckout\Model\Api')
44-
->debugData(array('request' => $_SERVER['QUERY_STRING'], 'dir' => 'in'));
45+
parent::__construct($systemStore, $withDefaultWebsite);
4546
}
4647
}
48+
49+

‎app/code/Magento/Backend/Model/Config/Source/Website/OptionHash.php

+11-4
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
namespace Magento\Backend\Model\Config\Source\Website;
2828

2929
use Magento\Core\Model\System\Store;
30+
use Magento\Option\ArrayInterface;
3031

31-
class OptionHash
32-
implements \Magento\Option\ArrayInterface
32+
class OptionHash implements ArrayInterface
3333
{
3434
/**
3535
* System Store Model
@@ -38,12 +38,19 @@ class OptionHash
3838
*/
3939
protected $_systemStore;
4040

41+
/**
42+
* @var bool True if the default website (Admin) should be included
43+
*/
44+
protected $_withDefaultWebsite;
45+
4146
/**
4247
* @param Store $systemStore
48+
* @param bool $withDefaultWebsite
4349
*/
44-
public function __construct(Store $systemStore)
50+
public function __construct(Store $systemStore, $withDefaultWebsite = false)
4551
{
4652
$this->_systemStore = $systemStore;
53+
$this->_withDefaultWebsite = $withDefaultWebsite;
4754
}
4855

4956
/**
@@ -53,7 +60,7 @@ public function __construct(Store $systemStore)
5360
*/
5461
public function toOptionArray()
5562
{
56-
return $this->_systemStore->getWebsiteOptionHash();
63+
return $this->_systemStore->getWebsiteOptionHash($this->_withDefaultWebsite);
5764
}
5865
}
5966

‎app/code/Magento/Backend/Model/Locale/Resolver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Resolver extends \Magento\Locale\Resolver
5454
* @param \Magento\Locale\ScopeConfigInterface $scopeConfig
5555
* @param \Magento\AppInterface $app
5656
* @param \Magento\LocaleFactory $localeFactory
57-
* @param $defaultLocalePath
57+
* @param string $defaultLocalePath
5858
* @param \Magento\ObjectManager $objectManager
5959
* @param \Magento\Backend\Model\Session $session
6060
* @param Manager $localeManager

‎app/code/Magento/Backend/Model/Menu/Item/Validator.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ class Validator
5050
*/
5151
protected $_validators = array();
5252

53+
/**
54+
* Constructor
55+
*/
5356
public function __construct()
5457
{
5558
$idValidator = new \Zend_Validate();
@@ -83,7 +86,7 @@ public function __construct()
8386
/**
8487
* Validate menu item params
8588
*
86-
* @param $data
89+
* @param array $data
8790
* @return void
8891
* @throws \InvalidArgumentException
8992
* @throws \BadMethodCallException

‎app/code/Magento/Backend/Model/Widget/Grid/Row/GeneratorInterface.php

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727

2828
interface GeneratorInterface
2929
{
30+
/**
31+
* @param \Magento\Object $item
32+
* @return string
33+
*/
3034
public function getUrl($item);
3135

3236
}

‎app/code/Magento/Backend/etc/adminhtml/system.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@
181181
<comment>Leave empty for access from any location.</comment>
182182
</field>
183183
</group>
184-
<group id="debug" translate="label" type="text" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">
184+
<group id="debug" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
185185
<label>Debug</label>
186-
<field id="template_hints" translate="label" type="select" sortOrder="20" showInDefault="0" showInWebsite="1" showInStore="1">
186+
<field id="template_hints" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
187187
<label>Template Path Hints</label>
188188
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
189189
</field>
190-
<field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="0" showInWebsite="1" showInStore="1">
190+
<field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">
191191
<label>Add Block Names to Hints</label>
192192
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
193193
</field>

‎app/code/Magento/Backend/etc/module.xml

100755100644
File mode changed.

‎app/code/Magento/Backend/view/adminhtml/admin/login.phtml

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('css/admin.css') ?>" media="all" />
4141
<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('css/header.css') ?>" media="all" />
4242
<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('css/pages.css') ?>" media="all" />
43-
<?php /* <link rel="stylesheet" href="<?php echo $this->getViewFileUrl('css/styles.css') ?>" media="all" /> */?>
4443
<link rel="stylesheet" href="<?php echo $this->getViewFileUrl('mui/utils.css') ?>" media="all" />
4544

4645
<script src="<?php echo $this->getViewFileUrl('jquery/jquery.js') ?>"></script>

‎app/code/Magento/Backup/Helper/Data.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function getExtensions()
159159
public function generateBackupDownloadName(\Magento\Backup\Model\Backup $backup)
160160
{
161161
$additionalExtension = $backup->getType() == \Magento\Backup\Factory::TYPE_DB ? '.sql' : '';
162-
return $backup->getType() . '-' . date('YmdHis', $backup->getTime()) . $additionalExtension . '.'
162+
return $backup->getTime() . '_' . $backup->getType() . '_' . $backup->getName() . $additionalExtension . '.'
163163
. $this->getExtensionByType($backup->getType());
164164
}
165165

0 commit comments

Comments
 (0)