Skip to content

Commit

Permalink
2.0.0.0-dev63
Browse files Browse the repository at this point in the history
* Modularity improvements:
  * Consolidated all PayPal-related logic in a separate module
  * Resolved dependencies on the Magento_GroupedProduct module
  * Added the ability to enable/disable/remove the Magento_GroupedProduct module without impact on the system
* Implemented the Oyejorge Less.php adapter
* Implemented the Less files importing mechanism
* Added the ability to configure certain cache frontend, and associate it to multiple cache types, thus avoiding the duplication of cache configuration
* Implemented the more strict format of array definition in the DI configuration:
  * Covered array definitions with XSD, and made the whole DI configuration validated with XSD
  * Added the ability to define arrays with keys containing invalid XML characters, that was impossible when keys were represented by the node names
* Fixed bugs:
  * Fixed an issue with missed image for a cron job for the abandoned cart emails
  * Restored the ability to configure cache storage in `local.xml`
  * Fixed an issue with the css\js merging functionality
  * Fixed an issue with customer selection on the order creation page
* AppInterface renamed to LauncherInterface
* Removed the reinit logic from the Config object
* Framework part of the "URL" functionality removed from modules
* Framework part of the "Config" functionality removed from modules
* Removed the deprecated EAV structure creation method from the EAV setup model
* Updated various PHPDoc with parameter and return types
* Indexer implementation:
  * Implemented a new indexer structure
* Refactored Web API Framework to support the Data Object based service interfaces
* Refactored controllers, blocks and templates of the Sales module to use Customer service
* GitHub requests:
  * [#275] (#275) -- XSS Vulnerability in app/code/core/Mage/CatalogSearch/Block/Result.php
* Removed the outdated Customer service
  • Loading branch information
magento-team committed Jan 31, 2014
1 parent 8f72656 commit 75b80bc
Show file tree
Hide file tree
Showing 1,674 changed files with 45,407 additions and 14,004 deletions.
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
2.0.0.0-dev63
=============
* Modularity improvements:
* Consolidated all PayPal-related logic in a separate module
* Resolved dependencies on the Magento_GroupedProduct module
* Added the ability to enable/disable/remove the Magento_GroupedProduct module without impact on the system
* Implemented the Oyejorge Less.php adapter
* Implemented the Less files importing mechanism
* Added the ability to configure certain cache frontend, and associate it to multiple cache types, thus avoiding the duplication of cache configuration
* Implemented the more strict format of array definition in the DI configuration:
* Covered array definitions with XSD, and made the whole DI configuration validated with XSD
* Added the ability to define arrays with keys containing invalid XML characters, that was impossible when keys were represented by the node names
* Fixed bugs:
* Fixed an issue with missed image for a cron job for the abandoned cart emails
* Restored the ability to configure cache storage in `local.xml`
* Fixed an issue with the css\js merging functionality
* Fixed an issue with customer selection on the order creation page
* AppInterface renamed to LauncherInterface
* Removed the reinit logic from the Config object
* Framework part of the "URL" functionality removed from modules
* Framework part of the "Config" functionality removed from modules
* Removed the deprecated EAV structure creation method from the EAV setup model
* Updated various PHPDoc with parameter and return types
* Indexer implementation:
* Implemented a new indexer structure
* Refactored Web API Framework to support the Data Object based service interfaces
* Refactored controllers, blocks and templates of the Sales module to use Customer service
* GitHub requests:
* [#275] (https://github.com/magento/magento2/issues/275) -- XSS Vulnerability in app/code/core/Mage/CatalogSearch/Block/Result.php
* Removed the outdated Customer service

2.0.0.0-dev62
=============
* Modularity improvements:
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/Model/Feed.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ protected function _construct()
*/
public function getFeedUrl()
{
$httpPath = $this->_backendConfig->getFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
$httpPath = $this->_backendConfig->isSetFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
if (is_null($this->_feedUrl)) {
$this->_feedUrl = $httpPath . $this->_backendConfig->getValue(self::XML_FEED_URL_PATH);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Baseurl
protected $_urlBuilder;

/**
* @var \Magento\Core\Model\Config
* @var \Magento\App\ConfigInterface
*/
protected $_config;

Expand All @@ -47,13 +47,13 @@ class Baseurl
protected $_configValueFactory;

/**
* @param \Magento\Core\Model\Config $config
* @param \Magento\App\ConfigInterface $config
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\UrlInterface $urlBuilder
* @param \Magento\Core\Model\Config\ValueFactory $configValueFactory
*/
public function __construct(
\Magento\Core\Model\Config $config,
\Magento\App\ConfigInterface $config,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\UrlInterface $urlBuilder,
\Magento\Core\Model\Config\ValueFactory $configValueFactory
Expand Down Expand Up @@ -91,7 +91,7 @@ protected function _getConfigUrl()
$dataCollection = $this->_configValueFactory->create()->getCollection();
$dataCollection->addValueFilter(\Magento\Core\Model\Store::BASE_URL_PLACEHOLDER);

/** @var $data \Magento\Core\Model\Config\Value */
/** @var $data \Magento\App\Config\ValueInterface */
foreach ($dataCollection as $data) {
if ($data->getScope() == 'stores') {
$code = $this->_storeManager->getStore($data->getScopeId())->getCode();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Security
protected $_backendConfig;

/**
* @var \Magento\Core\Model\Config
* @var \Magento\App\ConfigInterface
*/
protected $_config;

Expand All @@ -67,13 +67,13 @@ class Security
/**
* @param \Magento\App\CacheInterface $cache
* @param \Magento\Backend\App\ConfigInterface $backendConfig
* @param \Magento\Core\Model\Config $config
* @param \Magento\App\ConfigInterface $config
* @param \Magento\HTTP\Adapter\CurlFactory $curlFactory
*/
public function __construct(
\Magento\App\CacheInterface $cache,
\Magento\Backend\App\ConfigInterface $backendConfig,
\Magento\Core\Model\Config $config,
\Magento\App\ConfigInterface $config,
\Magento\HTTP\Adapter\CurlFactory $curlFactory
) {
$this->_cache = $cache;
Expand Down
16 changes: 8 additions & 8 deletions app/code/Magento/AdminNotification/etc/adminhtml/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
<config>
<type name="Magento\AdminNotification\Model\System\MessageList">
<param name="messages">
<value>
<baseurl>Magento\AdminNotification\Model\System\Message\Baseurl</baseurl>
<security>Magento\AdminNotification\Model\System\Message\Security</security>
<cacheOutdated>Magento\AdminNotification\Model\System\Message\CacheOutdated</cacheOutdated>
<survey>Magento\AdminNotification\Model\System\Message\Survey</survey>
<media_synchronization_error>Magento\AdminNotification\Model\System\Message\Media\Synchronization\Error</media_synchronization_error>
<media_synchronization_success>Magento\AdminNotification\Model\System\Message\Media\Synchronization\Success</media_synchronization_success>
</value>
<array>
<item key="baseurl"><value>Magento\AdminNotification\Model\System\Message\Baseurl</value></item>
<item key="security"><value>Magento\AdminNotification\Model\System\Message\Security</value></item>
<item key="cacheOutdated"><value>Magento\AdminNotification\Model\System\Message\CacheOutdated</value></item>
<item key="survey"><value>Magento\AdminNotification\Model\System\Message\Survey</value></item>
<item key="media_synchronization_error"><value>Magento\AdminNotification\Model\System\Message\Media\Synchronization\Error</value></item>
<item key="media_synchronization_success"><value>Magento\AdminNotification\Model\System\Message\Media\Synchronization\Success</value></item>
</array>
</param>
</type>
</config>
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public function placeAction()
$requestToAuthorizenet->setOrderSendConfirmation($sendConfirmationFlag);
$requestToAuthorizenet->setStoreId($this->_getOrderCreateModel()->getQuote()->getStoreId());

$adminUrl = $this->_objectManager->get('Magento\Backend\Model\Url');
$adminUrl = $this->_objectManager->get('Magento\Backend\Model\UrlInterface');
if ($adminUrl->useSecretKey()) {
$requestToAuthorizenet->setKey(
$adminUrl->getSecretKey('adminhtml', 'authorizenet_directpost_payment', 'redirect')
Expand All @@ -161,7 +161,7 @@ public function placeAction()
$result['success'] = 0;
$result['error'] = 1;
$result['redirect'] = $this->_objectManager
->get('Magento\Backend\Model\Url')
->get('Magento\Backend\Model\UrlInterface')
->getUrl('sales/order_create/');
}

Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Authorizenet/Helper/Backend.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ class Backend extends Data
* @param \Magento\App\Helper\Context $context
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Sales\Model\OrderFactory $orderFactory
* @param \Magento\Backend\Model\Url $backendUrl
* @param \Magento\Backend\Model\UrlInterface $backendUrl
*/
public function __construct(
\Magento\App\Helper\Context $context,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Backend\Model\Url $backendUrl
\Magento\Backend\Model\UrlInterface $backendUrl
) {
parent::__construct($context, $storeManager, $orderFactory);
$this->_urlBuilder = $backendUrl;
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function __construct(
*/
protected function _getUrl($route, $params = array())
{
$params['_type'] = \Magento\Core\Model\Store::URL_TYPE_LINK;
$params['_type'] = \Magento\UrlInterface::URL_TYPE_LINK;
if (isset($params['is_secure'])) {
$params['_secure'] = (bool)$params['is_secure'];
} elseif ($this->_storeManager->getStore()->isCurrentlySecure()) {
Expand Down
16 changes: 8 additions & 8 deletions app/code/Magento/Authorizenet/Model/Directpost.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet
* @param \Magento\Authorizenet\Model\Directpost\Response $response
* @param \Magento\Authorizenet\Helper\HelperInterface $helper
* @param array $data
*
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
Expand Down Expand Up @@ -346,9 +346,9 @@ protected function _refund(\Magento\Object $payment, $amount)
}
$shouldCloseCaptureTransaction = $payment->getOrder()->canCreditmemo() ? 0 : 1;
$payment
->setIsTransactionClosed(1)
->setShouldCloseParentTransaction($shouldCloseCaptureTransaction)
->setTransactionAdditionalInfo($this->_realTransactionIdKey, $result->getTransactionId());
->setIsTransactionClosed(1)
->setShouldCloseParentTransaction($shouldCloseCaptureTransaction)
->setTransactionAdditionalInfo($this->_realTransactionIdKey, $result->getTransactionId());
return $this;
}
throw new \Magento\Core\Exception($this->_wrapGatewayError($result->getResponseReasonText()));
Expand Down Expand Up @@ -520,8 +520,8 @@ public function process(array $responseData)
if ($isError) {
throw new \Magento\Core\Exception(
($responseText && !$response->isApproved()) ?
$responseText :
__('This payment didn\'t work out because we can\'t find this order.')
$responseText :
__('This payment didn\'t work out because we can\'t find this order.')
);
}
}
Expand Down Expand Up @@ -588,7 +588,7 @@ public function checkTransId()
*/
protected function _matchAmount($amount)
{
return sprintf('%.2F', $amount) == sprintf('%.2F', $this->getResponse()->getXAmount());
return sprintf('%.2F', $amount) == sprintf('%.2F', $this->getResponse()->getXAmount());
}

/**
Expand Down Expand Up @@ -702,7 +702,7 @@ protected function _captureOrder(\Magento\Sales\Model\Order $order)
$orderStatus = $this->getConfigData('order_status');
if (!$orderStatus || $order->getIsVirtual()) {
$orderStatus = $order->getConfig()
->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING);
->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING);
}
if ($orderStatus) {
$order->setStatus($orderStatus);
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Authorizenet/etc/frontend/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
</type>
<type name="Magento\Core\Model\Url\SecurityInfo">
<param name="secureUrlList">
<value>
<authorizenet>/authorizenet/payment</authorizenet>
</value>
<array>
<item key="authorizenet"><value>/authorizenet/payment</value></item>
</array>
</param>
</type>
<type name="Magento\Authorizenet\Model\Authorizenet">
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Backend/App/AbstractAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ abstract class AbstractAction extends \Magento\App\Action\Action
protected $_auth;

/**
* @var \Magento\Backend\Model\Url
* @var \Magento\Backend\Model\UrlInterface
*/
protected $_backendUrl;

Expand Down Expand Up @@ -375,7 +375,7 @@ protected function _validateSecretKey()
return true;
}

$secretKey = $this->getRequest()->getParam(\Magento\Backend\Model\Url::SECRET_KEY_PARAM_NAME, null);
$secretKey = $this->getRequest()->getParam(\Magento\Backend\Model\UrlInterface::SECRET_KEY_PARAM_NAME, null);
if (!$secretKey || $secretKey != $this->_backendUrl->getSecretKey()) {
return false;
}
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Backend/App/Action/Context.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Context extends \Magento\App\Action\Context
protected $_helper;

/**
* @var \Magento\Backend\Model\Url
* @var \Magento\Backend\Model\UrlInterface
*/
protected $_backendUrl;

Expand Down Expand Up @@ -90,7 +90,7 @@ class Context extends \Magento\App\Action\Context
* @param \Magento\AuthorizationInterface $authorization
* @param \Magento\Backend\Model\Auth $auth
* @param \Magento\Backend\Helper\Data $helper
* @param \Magento\Backend\Model\Url $backendUrl
* @param \Magento\Backend\Model\UrlInterface $backendUrl
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
* @param \Magento\App\Action\Title $title
* @param \Magento\Core\Model\LocaleInterface $locale
Expand All @@ -110,7 +110,7 @@ public function __construct(
\Magento\AuthorizationInterface $authorization,
\Magento\Backend\Model\Auth $auth,
\Magento\Backend\Helper\Data $helper,
\Magento\Backend\Model\Url $backendUrl,
\Magento\Backend\Model\UrlInterface $backendUrl,
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
\Magento\App\Action\Title $title,
\Magento\Core\Model\LocaleInterface $locale,
Expand Down Expand Up @@ -156,7 +156,7 @@ public function getAuthorization()
}

/**
* @return \Magento\Backend\Model\Url
* @return \Magento\Backend\Model\UrlInterface
*/
public function getBackendUrl()
{
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/App/Action/Plugin/Authentication.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Authentication
);

/**
* @var \Magento\Backend\Model\Url
* @var \Magento\Backend\Model\UrlInterface
*/
protected $_url;

Expand All @@ -66,14 +66,14 @@ class Authentication

/**
* @param \Magento\Backend\Model\Auth $auth
* @param \Magento\Backend\Model\Url $url
* @param \Magento\Backend\Model\UrlInterface $url
* @param \Magento\App\ResponseInterface $response
* @param \Magento\App\ActionFlag $actionFlag
* @param \Magento\Message\ManagerInterface $messageManager
*/
public function __construct(
\Magento\Backend\Model\Auth $auth,
\Magento\Backend\Model\Url $url,
\Magento\Backend\Model\UrlInterface $url,
\Magento\App\ResponseInterface $response,
\Magento\App\ActionFlag $actionFlag,
\Magento\Message\ManagerInterface $messageManager
Expand Down
4 changes: 1 addition & 3 deletions app/code/Magento/Backend/App/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ public function setValue($path, $value)

/**
* Reinitialize configuration
*
* @return \Magento\Core\Model\Config
*/
public function reinit()
{
Expand All @@ -81,7 +79,7 @@ public function reinit()
* @param string $path
* @return bool
*/
public function getFlag($path)
public function isSetFlag($path)
{
return !!$this->_sectionPool->getSection('default', null)->getValue($path);
}
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/App/ConfigInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@ public function reinit();
* @param string $path
* @return bool
*/
public function getFlag($path);
public function isSetFlag($path);
}
6 changes: 3 additions & 3 deletions app/code/Magento/Backend/App/Response/Http/FileFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class FileFactory extends \Magento\App\Response\Http\FileFactory
protected $_auth;

/**
* @var \Magento\Backend\Model\Url
* @var \Magento\Backend\Model\UrlInterface
*/
protected $_backendUrl;

Expand Down Expand Up @@ -59,7 +59,7 @@ class FileFactory extends \Magento\App\Response\Http\FileFactory
* @param \Magento\App\ResponseInterface $response
* @param \Magento\App\Filesystem $filesystem
* @param \Magento\Backend\Model\Auth $auth
* @param \Magento\Backend\Model\Url $backendUrl
* @param \Magento\Backend\Model\UrlInterface $backendUrl
* @param \Magento\Backend\Model\Session $session
* @param \Magento\App\ActionFlag $flag
* @param \Magento\Backend\Helper\Data $helper
Expand All @@ -68,7 +68,7 @@ public function __construct(
\Magento\App\ResponseInterface $response,
\Magento\App\Filesystem $filesystem,
\Magento\Backend\Model\Auth $auth,
\Magento\Backend\Model\Url $backendUrl,
\Magento\Backend\Model\UrlInterface $backendUrl,
\Magento\Backend\Model\Session $session,
\Magento\App\ActionFlag $flag,
\Magento\Backend\Helper\Data $helper
Expand Down
Loading

0 comments on commit 75b80bc

Please sign in to comment.