Permalink
Browse files

2.0.0.0-dev65

* Fixed bugs:
  * Fixed inability to execute System Backup, Database Backup, and Media Backup
* Indexer implementation:
  * Implemented a new optimized Catalog Category Flat Indexer
* Cron improvements:
  * Added the ability to divide cron tasks into groups
  * Added the ability to run cron groups in separate processes
* Caching improvements:
  * Added a new mechanism to identify uniquely page content (hash-key for cache storage)
  * Added a tab for Page Cache mechanism in System Configuration
  * Implemented the ability to configure the Varnish caching server settings and download it as a .vcl file
* LESS pre-processing to CSS
  * LESS files in library, theme, module are automatically compiled to CSS during materialization
  * LESS files compilation caching mechanism added in Developer mode
* Modularity improvements:
  * Moved the Shortcut Buttons abstraction from PayPal to Catalog
  * Moved the Recurring Profile functionality to a separate module
  * Moved the Billing Agreements functionality to the PayPal module
* Improvements in code coverage calculation:
  * Added code coverage calculation in the clover xml format for unit tests
* GitHub requests:
 * [#377] (#377) Remove and avoid javascript eval() calls
 * [#319] (#319) No message was displayed when product added to shopping cart.
 * [#367] (#367) Improve the error message from the contact form
 * [#469] (#469) Can't change prices on different websites for custom options
* Updated the Customer service exception handling, and added tests
* Added usage of the Customer service to the Customer module, replacing some direct usage of the Customer model
* Updated various PHPDoc with the parameter and return types
  • Loading branch information...
1 parent 271615a commit 4ca7da2e169f13ec9a66cc60b37e2e16da3a2be3 @magento-team magento-team committed Feb 14, 2014
Showing 2,040 changed files with 36,077 additions and 15,390 deletions.
View
@@ -180,4 +180,4 @@
## If running in cluster environment, uncomment this
## http://developer.yahoo.com/performance/rules.html#etags
- #FileETag none
+ #FileETag none
View
@@ -1,10 +1,40 @@
+2.0.0.0-dev65
+=============
+* Fixed bugs:
+ * Fixed inability to execute System Backup, Database Backup, and Media Backup
+* Indexer implementation:
+ * Implemented a new optimized Catalog Category Flat Indexer
+* Cron improvements:
+ * Added the ability to divide cron tasks into groups
+ * Added the ability to run cron groups in separate processes
+* Caching improvements:
+ * Added a new mechanism to identify uniquely page content (hash-key for cache storage)
+ * Added a tab for Page Cache mechanism in System Configuration
+ * Implemented the ability to configure the Varnish caching server settings and download it as a .vcl file
+* LESS pre-processing to CSS
+ * LESS files in library, theme, module are automatically compiled to CSS during materialization
+ * LESS files compilation caching mechanism added in Developer mode
+* Modularity improvements:
+ * Moved the Shortcut Buttons abstraction from PayPal to Catalog
+ * Moved the Recurring Profile functionality to a separate module
+ * Moved the Billing Agreements functionality to the PayPal module
+* Improvements in code coverage calculation:
+ * Added code coverage calculation in the clover xml format for unit tests
+* GitHub requests:
+ * [#377] (https://github.com/magento/magento2/issues/377) Remove and avoid javascript eval() calls
+ * [#319] (https://github.com/magento/magento2/issues/319) No message was displayed when product added to shopping cart.
+ * [#367] (https://github.com/magento/magento2/issues/367) Improve the error message from the contact form
+ * [#469] (https://github.com/magento/magento2/issues/469) Can't change prices on different websites for custom options
+* Updated the Customer service exception handling, and added tests
+* Added usage of the Customer service to the Customer module, replacing some direct usage of the Customer model
+* Updated various PHPDoc with the parameter and return types
+
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
@@ -17,6 +47,7 @@
* 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
+* Replaced the "magentoZoom" plugin with two widgets: the "gallery" and "zoom"
2.0.0.0-dev63
=============
@@ -27,7 +27,7 @@ class Security
implements \Magento\AdminNotification\Model\System\MessageInterface
{
/**
- * Cache kay for saving verification result
+ * Cache key for saving verification result
*/
const VERIFICATION_RESULT_CACHE_KEY = 'configuration_files_access_level_verification';
@@ -43,7 +43,7 @@
<span class="warning"><a href="#" title="<?php echo $this->escapeHtml(__('Major System Messages'));?>"><?php echo $this->getMajorCount();?></a></span>
<?php endif;?>
</div>
- <div id="message-system-all" title="<?php echo $this->escapeHtml(__('System messages'));?>" data-mage-init="<?php echo $this->escapeHtml($this->getSystemMessageDialogJson());?>"></div>
+ <div id="message-system-all" title="<?php echo $this->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $this->escapeHtml($this->getSystemMessageDialogJson());?>'></div>
</div>
</div>
@@ -21,7 +21,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
*/
/*jshint jquery:true*/
-(function ($) {
+jQuery(function ($) {
$.template(
'systemMessageDialog',
'<li class="{{if severity == 1}}error{{else}}warning{{/if}}">{{html text}}</li>'
@@ -69,5 +69,5 @@
$('#message-system-all').systemMessageDialog('open', 2);
});
});
-})(jQuery);
+});
@@ -104,7 +104,7 @@ public function getRedirectIframeUrl($params)
*/
public function getRelyUrl($storeId = null)
{
- return $this->_storeManager->getDefaultStoreView()->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_LINK)
+ return $this->_storeManager->getDefaultStoreView()->getBaseUrl(\Magento\UrlInterface::URL_TYPE_LINK)
. 'authorizenet/directpost_payment/backendResponse';
}
}
@@ -331,7 +331,7 @@ public function getPaymentMethodsHtml(\Magento\App\ViewInterface $view)
*/
public function getRelyUrl($storeId = null)
{
- return $this->_storeManager->getStore($storeId)->getBaseUrl(\Magento\Core\Model\Store::URL_TYPE_LINK)
+ return $this->_storeManager->getStore($storeId)->getBaseUrl(\Magento\UrlInterface::URL_TYPE_LINK)
. 'authorizenet/directpost_payment/response';
}
}
@@ -25,9 +25,9 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="head">
- <block class="Magento\Theme\Block\Html\Head\Script" name="magento-directpost-js">
+ <block class="Magento\Theme\Block\Html\Head\Script" name="magento-authorizenet-js-direct-post-js">
<arguments>
- <argument name="file" xsi:type="string">mage/directpost.js</argument>
+ <argument name="file" xsi:type="string">Magento_Authorizenet::js/direct-post.js</argument>
</arguments>
</block>
</referenceBlock>
@@ -38,7 +38,7 @@ $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Data')->getPlaceOrderFro
<!-- IFRAME for request to Authorize.net -->
<iframe id="directpost-iframe" data-container="authorize-net-iframe" allowtransparency="true" frameborder="0" name="iframeDirectPost" style="display:none;width:100%;background-color:transparent" src="<?php echo $this->getViewFileUrl('blank.html') ?>"></iframe>
-<form class="form" id="co-directpost-form" action="#" method="post" data-mage-init="{directpost: {methodCode:'<?php echo $_code ?>', controller:'<?php echo $_controller ?>', orderSaveUrl:'<?php echo $_orderUrl ?>', cgiUrl:'<?php echo $_method->getCgiUrl() ?>', nativeAction:'<?php echo $this->getUrl('checkout/onepage/saveOrder', array('_secure' => $this->getRequest()->isSecure())) ?>'}, validation: []}">
+<form class="form" id="co-directpost-form" action="#" method="post" data-mage-init='{"directpost":{"methodCode":"<?php echo $_code ?>", "controller":"<?php echo $_controller ?>", "orderSaveUrl":"<?php echo $_orderUrl ?>", "cgiUrl":"<?php echo $_method->getCgiUrl() ?>", "nativeAction":"<?php echo $this->getUrl('checkout/onepage/saveOrder', array('_secure' => $this->getRequest()->isSecure())) ?>"}, "validation":[]}'>
<fieldset class="fieldset ccard <?php echo $_code ?>" id="payment_form_<?php echo $_code ?>">
<legend class="legend"><span><?php echo __('Credit Card Information') ?></span></legend><br />
<div class="field required type">
@@ -92,10 +92,10 @@ $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Data')->getPlaceOrderFro
<div class="control">
<input type="number" title="<?php echo __('Card Verification Number') ?>" data-container="cc-cvv" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{required:true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' autocomplete="off"/>
<div class="note">
- <a href="#" id="directpost-cvv-what-is-this" class="action cvv" data-mage-init='{toggleAdvanced: {toggleContainers:"#directpost-tool-tip"}}'><span><?php echo __('What is this?') ?></span></a>
+ <a href="#" id="directpost-cvv-what-is-this" class="action cvv" data-mage-init='{"toggleAdvanced": {"toggleContainers":"#directpost-tool-tip"}}'><span><?php echo __('What is this?') ?></span></a>
</div>
<div class="tooltip hidden" id="directpost-tool-tip">
- <a href="#" id="directpost-tool-tip-close" title="<?php echo __('Close') ?>" data-mage-init='{toggleAdvanced: {toggleContainers:"#directpost-tool-tip"}}' class="action close">
+ <a href="#" id="directpost-tool-tip-close" title="<?php echo __('Close') ?>" data-mage-init='{"toggleAdvanced": {"toggleContainers":"#directpost-tool-tip"}}' class="action close">
<span><?php echo __('Close') ?></span>
</a>
<div class="content"><img src="<?php echo $this->getViewFileUrl('Magento_Checkout::cvv.gif') ?>" alt="<?php echo __('Card Verification Number Visual Reference') ?>" title="<?php echo __('Card Verification Number Visual Reference') ?>" /></div>
@@ -25,30 +25,33 @@
*/
?>
+<dl class="payment method">
<?php if (!$this->getHideTitle()): ?>
- <p><strong><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></strong></p>
+ <dt class="title"><?php echo $this->escapeHtml($this->getMethod()->getTitle()) ?></dt>
<?php endif; ?>
<?php
$cards = $this->getCards();
$showCount = count($cards) > 1;
?>
-<dl class="cards items">
+ <dl class="cards items">
<?php foreach ($cards as $key => $card): ?>
<?php if ($showCount): ?>
<dt><?php echo sprintf(__('Credit Card %s'), $key + 1); ?></dt>
<?php endif; ?>
-
- <dd>
- <dl class="card item">
- <?php foreach ($card as $_label => $_value): ?>
- <dt><?php echo $this->escapeHtml($_label); ?>:</dt>
- <dd><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n")); ?></dd>
- <?php endforeach; ?>
- </dl>
+ <dd class="content">
+ <table class="data table">
+ <?php foreach ($card as $_label => $_value): ?>
+ <tr>
+ <th><?php echo $this->escapeHtml($_label) ?></th>
+ <td><?php echo nl2br(implode($this->getValueAsArray($_value, true), "\n")) ?></td>
+ </tr>
+ <?php endforeach; ?>
+ </table>
</dd>
<?php endforeach; ?>
+ </dl>
</dl>
@@ -25,9 +25,9 @@
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<referenceBlock name="head">
- <block class="Magento\Theme\Block\Html\Head\Script" name="mage-centinel-centinel-authenticate-js">
+ <block class="Magento\Theme\Block\Html\Head\Script" name="magento-authorizenet-js-direct-post-js">
<arguments>
- <argument name="file" xsi:type="string">Magento_Authorizenet::js/directpost.js</argument>
+ <argument name="file" xsi:type="string">Magento_Authorizenet::js/direct-post.js</argument>
</arguments>
</block>
</referenceBlock>
@@ -119,6 +119,9 @@ public function __construct(Action\Context $context)
$this->_session = $context->getSession();
}
+ /**
+ * @return bool
+ */
protected function _isAllowed()
{
return true;
@@ -144,8 +147,9 @@ protected function getMessageManager()
/**
* Define active menu item in menu block
+ *
* @param string $itemId current active menu item
- * @return \Magento\Backend\App\AbstractAction
+ * @return $this
*/
protected function _setActiveMenu($itemId)
{
@@ -162,10 +166,10 @@ protected function _setActiveMenu($itemId)
}
/**
- * @param $label
- * @param $title
- * @param null $link
- * @return \Magento\Backend\App\AbstractAction
+ * @param string $label
+ * @param string $title
+ * @param string|null $link
+ * @return $this
*/
protected function _addBreadcrumb($label, $title, $link=null)
{
@@ -175,7 +179,7 @@ protected function _addBreadcrumb($label, $title, $link=null)
/**
* @param \Magento\View\Element\AbstractBlock $block
- * @return \Magento\Backend\App\AbstractAction
+ * @return $this
*/
protected function _addContent(\Magento\View\Element\AbstractBlock $block)
{
@@ -184,7 +188,7 @@ protected function _addContent(\Magento\View\Element\AbstractBlock $block)
/**
* @param \Magento\View\Element\AbstractBlock $block
- * @return \Magento\Backend\App\AbstractAction
+ * @return $this
*/
protected function _addLeft(\Magento\View\Element\AbstractBlock $block)
{
@@ -193,7 +197,7 @@ protected function _addLeft(\Magento\View\Element\AbstractBlock $block)
/**
* @param \Magento\View\Element\AbstractBlock $block
- * @return \Magento\Backend\App\AbstractAction
+ * @return $this
*/
protected function _addJs(\Magento\View\Element\AbstractBlock $block)
{
@@ -207,7 +211,7 @@ protected function _addJs(\Magento\View\Element\AbstractBlock $block)
*
* @param \Magento\View\Element\AbstractBlock $block
* @param string $containerName
- * @return \Magento\Backend\App\AbstractAction
+ * @return $this
*/
private function _moveBlockToContainer(\Magento\View\Element\AbstractBlock $block, $containerName)
{
@@ -291,7 +295,7 @@ public function _processUrlKeys()
* Set session locale,
* process force locale set through url params
*
- * @return \Magento\Backend\App\AbstractAction
+ * @return $this
*/
protected function _processLocaleSettings()
{
@@ -307,6 +311,9 @@ protected function _processLocaleSettings()
return $this;
}
+ /**
+ * @return void
+ */
public function deniedAction()
{
$this->getResponse()->setHeader('HTTP/1.1', '403 Forbidden');
@@ -322,6 +329,7 @@ public function deniedAction()
* No route action
*
* @param null $coreRoute
+ * @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function norouteAction($coreRoute = null)
@@ -337,7 +345,7 @@ public function norouteAction($coreRoute = null)
*
* @param string $path
* @param array $arguments
- * @return \Magento\Backend\App\AbstractAction
+ * @return \Magento\App\ResponseInterface
*/
protected function _redirect($path, $arguments=array())
{
@@ -346,6 +354,13 @@ protected function _redirect($path, $arguments=array())
return $this->getResponse();
}
+ /**
+ * @param string $action
+ * @param string|null $controller
+ * @param string|null $module
+ * @param array|null $params
+ * @return void
+ */
protected function _forward($action, $controller = null, $module = null, array $params = null)
{
$this->_getSession()->setIsUrlNotice($this->_actionFlag->get('', self::FLAG_IS_URLS_CHECKED));
@@ -34,7 +34,7 @@ class Authentication
protected $_auth;
/**
- * @var array
+ * @var string[]
*/
protected $_openActions = array(
'forgotpassword',
@@ -112,6 +112,7 @@ public function aroundDispatch(array $arguments, \Magento\Code\Plugin\Invocation
* Process not logged in user data
*
* @param \Magento\App\RequestInterface $request
+ * @return void
*/
protected function _processNotLoggedInUser(\Magento\App\RequestInterface $request)
{
@@ -59,6 +59,7 @@ public function getValue($path)
*
* @param string $path
* @param mixed $value
+ * @return void
*/
public function setValue($path, $value)
{
@@ -67,6 +68,8 @@ public function setValue($path, $value)
/**
* Reinitialize configuration
+ *
+ * @return void
*/
public function reinit()
{
@@ -44,6 +44,19 @@ class DefaultRouter extends \Magento\Core\App\Router\Base
protected $_coreConfig;
/**
+ * List of required request parameters
+ * Order sensitive
+ *
+ * @var string[]
+ */
+ protected $_requiredParams = array(
+ 'areaFrontName',
+ 'moduleFrontName',
+ 'controllerName',
+ 'actionName',
+ );
+
+ /**
* @param \Magento\App\ActionFactory $actionFactory
* @param \Magento\App\DefaultPathInterface $defaultPath
* @param \Magento\App\ResponseFactory $responseFactory
@@ -91,18 +104,6 @@ public function __construct(
}
/**
- * List of required request parameters
- * Order sensitive
- * @var array
- */
- protected $_requiredParams = array(
- 'areaFrontName',
- 'moduleFrontName',
- 'controllerName',
- 'actionName',
- );
-
- /**
* Get router default request path
* @return string
*/
Oops, something went wrong.

0 comments on commit 4ca7da2

Please sign in to comment.