Permalink
Browse files

2.0.0.0-dev35

* Enhancements of System Configuration:
  * Introduced new items that can be configured in the similar to Magento 1.x way, using xml files: nested groups in System Configuration form, group dependencies, intersected dependencies
  * Enhanced handling of field dependencies, required fields functionality
  * Changed Configuration structure to be represented as an object model
  * Improved performance of configuration rendering
* Implemented new API in `Mage_Webapi` module
  * Removed `Mage_Api` and `Mage_Api2` modules as obsolete API implementation
  * Added support of REST and SOAP 1.2 [WS-I 2.0](http://ws-i.org/Profiles/BasicProfile-2.0-2010-11-09.html) APIs
  * Introduced versioning per API resource. The application will support old version(s) of API after upgrading to not make old API requests fail
  * Unified implementation for all API types
  * Significantly simplified coverage of new API resources
  * Added two-legged `OAuth` 1.0 for REST authentication
  * Added WS-Security for SOAP authentication
  * Added automatic generation of REST routes and SOAP WSDL on the basis of API class interface and annotations
  * Introduced generation of API reference from annotated WSDL (for SOAP API)
* Introduced service layer. Business logic should be implemented once on service layer and could be utilized from different types of controller (e.g., general or API)
  * Business logic is implemented on service layer to be utilized from different types of controller (e.g., general or API)
  * Implemented abstract service layer class - `Mage_Core_Service_ServiceAbstract`
  * Implemented concrete service layers for customers, orders and quotes. Appropriate duplicate logic has been eliminated from controllers and API
* Improved validation approach:
  * Added support of describing validation rules in a module's configuration file - `validation.xml` in the module's `etc` directory
  * Added `Mage_Core_Model_Validator_Factory`
  * Added new validators to Magento Validator library
  * Added `Magento_Translate_Adapter` as a translator for the validators
  * New approach is utilized in `Mage_Customer`, `Mage_Eav` and `Mage_Webapi` modules
* Added profiling of DB and cache requests
* Minor Improvements:
  * Added an ability to choose the image for logo and upload it from backend web-interface
  * Added notification in backend in case of product SKU change
* Bug fixes:
  * Fixed bug in `Mage_Adminhtml_Sales_Order_CreditmemoController` that changed item’s stock status after each comment
  * Removed `Debug` section in `System -> Configuration -> Advanced -> Developer` for default configuration scope
  * Fixed bug in `Mage_Tax_Model_Resource_Calculation` that prevented placing order with two tax rules having the same rate
  * Removed `Url Options` section in `System -> Configuration -> General -> Web` for website and store configuration scope
  * Changed backend template for UPS shipping provider to fix translation issue
* Fixed security issue - set `CURLOPT_SSL_VERIFYPEER` to `true` by default in cUrl calls
* Added `Zend/Escaper`, `Zend/I18`, `Zend/Validator` ZF2 libraries
* Updated `Zend/Server` and `Zend/Soap` libraries to ZF2 versions
  • Loading branch information...
magento-team committed Dec 15, 2012
1 parent 975952e commit 51f9633f196f46f586363099d366f98b24f6416e
Showing 1,207 changed files with 80,343 additions and 64,994 deletions.
View
@@ -29,7 +29,4 @@ atlassian*
/pub/media/customer/*
/pub/media/downloadable/*
/var/*
-dev/api-tests/config.php
-dev/api-tests/integration/tmp/*
-dev/api-tests/integration/framework/local-mysql.xml
View
@@ -1,3 +1,44 @@
+2.0.0.0-dev35
+=============
+* Enhancements of System Configuration:
+ * Introduced new items that can be configured in the similar to Magento 1.x way, using xml files: nested groups in System Configuration form, group dependencies, intersected dependencies
+ * Enhanced handling of field dependencies, required fields functionality
+ * Changed Configuration structure to be represented as an object model
+ * Improved performance of configuration rendering
+* Implemented new API in `Mage_Webapi` module
+ * Removed `Mage_Api` and `Mage_Api2` modules as obsolete API implementation
+ * Added support of REST and SOAP 1.2 [WS-I 2.0](http://ws-i.org/Profiles/BasicProfile-2.0-2010-11-09.html) APIs
+ * Introduced versioning per API resource. The application will support old version(s) of API after upgrading to not make old API requests fail
+ * Unified implementation for all API types
+ * Significantly simplified coverage of new API resources
+ * Added two-legged `OAuth` 1.0 for REST authentication
+ * Added WS-Security for SOAP authentication
+ * Added automatic generation of REST routes and SOAP WSDL on the basis of API class interface and annotations
+ * Introduced generation of API reference from annotated WSDL (for SOAP API)
+* Introduced service layer. Business logic should be implemented once on service layer and could be utilized from different types of controller (e.g., general or API)
+ * Business logic is implemented on service layer to be utilized from different types of controller (e.g., general or API)
+ * Implemented abstract service layer class - `Mage_Core_Service_ServiceAbstract`
+ * Implemented concrete service layers for customers, orders and quotes. Appropriate duplicate logic has been eliminated from controllers and API
+* Improved validation approach:
+ * Added support of describing validation rules in a module's configuration file - `validation.xml` in the module's `etc` directory
+ * Added `Mage_Core_Model_Validator_Factory`
+ * Added new validators to Magento Validator library
+ * Added `Magento_Translate_Adapter` as a translator for the validators
+ * New approach is utilized in `Mage_Customer`, `Mage_Eav` and `Mage_Webapi` modules
+* Added profiling of DB and cache requests
+* Minor Improvements:
+ * Added an ability to choose the image for logo and upload it from backend web-interface
+ * Added notification in backend in case of product SKU change
+* Bug fixes:
+ * Fixed bug in `Mage_Adminhtml_Sales_Order_CreditmemoController` that changed item’s stock status after each comment
+ * Removed `Debug` section in `System -> Configuration -> Advanced -> Developer` for default configuration scope
+ * Fixed bug in `Mage_Tax_Model_Resource_Calculation` that prevented placing order with two tax rules having the same rate
+ * Removed `Url Options` section in `System -> Configuration -> General -> Web` for website and store configuration scope
+ * Changed backend template for UPS shipping provider to fix translation issue
+* Fixed security issue - set `CURLOPT_SSL_VERIFYPEER` to `true` by default in cUrl calls
+* Added `Zend/Escaper`, `Zend/I18`, `Zend/Validator` ZF2 libraries
+* Updated `Zend/Server` and `Zend/Soap` libraries to ZF2 versions
+
2.0.0.0-dev34
=============
* Test Framework:
View

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -170,7 +170,7 @@ public static function getVersionInfo()
'revision' => '0',
'patch' => '0',
'stability' => 'dev',
- 'number' => '34',
+ 'number' => '35',
);
}
View
@@ -18,9 +18,8 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
/* PHP version validation */
@@ -97,15 +96,22 @@
Mage::initializeObjectManager($definitionsFile);
}
+$output = null;
if (isset($_SERVER['MAGE_PROFILER'])) {
switch ($_SERVER['MAGE_PROFILER']) {
case 'firebug':
- Magento_Profiler::registerOutput(new Magento_Profiler_Output_Firebug());
+ $output = new Magento_Profiler_Driver_Standard_Output_Firebug();
break;
case 'csv':
- Magento_Profiler::registerOutput(new Magento_Profiler_Output_Csvfile(__DIR__ . '/../var/log/profiler.csv'));
+ $output = new Magento_Profiler_Driver_Standard_Output_Csvfile(__DIR__ . '/../var/log/profiler.csv');
break;
default:
- Magento_Profiler::registerOutput(new Magento_Profiler_Output_Html());
+ $output = new Magento_Profiler_Driver_Standard_Output_Html();
}
}
+
+if ($output) {
+ $driver = new Magento_Profiler_Driver_Standard();
+ $driver->registerOutput($output);
+ Magento_Profiler::add($driver);
+}
@@ -1,88 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Mage
- * @package Mage_Adminhtml
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-class Mage_Adminhtml_Block_Api_Buttons extends Mage_Adminhtml_Block_Template
-{
-
- protected $_template = 'api/userinfo.phtml';
-
- protected function _prepareLayout()
- {
- $this->addChild('backButton', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Back'),
- 'onclick' => 'window.location.href=\''.$this->getUrl('*/*/').'\'',
- 'class' => 'back'
- ));
-
- $this->addChild('resetButton', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Reset'),
- 'onclick' => 'window.location.reload()'
- ));
-
- $this->addChild('saveButton', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Save Role'),
- 'class' => 'save',
- 'data_attr' => array(
- 'widget-button' => array('event' => 'save', 'related' => '#role-edit-form')
- )
- ));
-
- $this->addChild('deleteButton', 'Mage_Adminhtml_Block_Widget_Button', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Delete Role'),
- 'onclick' => 'deleteConfirm(\'' . Mage::helper('Mage_Adminhtml_Helper_Data')->__('Are you sure you want to do this?') . '\', \'' . $this->getUrl('*/*/delete', array('rid' => $this->getRequest()->getParam('rid'))) . '\')',
- 'class' => 'delete'
- ));
- return parent::_prepareLayout();
- }
-
- public function getBackButtonHtml()
- {
- return $this->getChildHtml('backButton');
- }
-
- public function getResetButtonHtml()
- {
- return $this->getChildHtml('resetButton');
- }
-
- public function getSaveButtonHtml()
- {
- return $this->getChildHtml('saveButton');
- }
-
- public function getDeleteButtonHtml()
- {
- if( intval($this->getRequest()->getParam('rid')) == 0 ) {
- return;
- }
- return $this->getChildHtml('deleteButton');
- }
-
- public function getUser()
- {
- return Mage::registry('user_data');
- }
-}
@@ -1,69 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Mage
- * @package Mage_Adminhtml
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-class Mage_Adminhtml_Block_Api_Editroles extends Mage_Adminhtml_Block_Widget_Tabs {
- protected function _construct()
- {
- parent::_construct();
- $this->setId('role_info_tabs');
- $this->setDestElementId('role-edit-form');
- $this->setTitle(Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Information'));
- }
-
- protected function _beforeToHtml()
- {
- $roleId = $this->getRequest()->getParam('rid', false);
- $role = Mage::getModel('Mage_Api_Model_Roles')
- ->load($roleId);
-
- $this->addTab('info', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Info'),
- 'title' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Info'),
- 'content' => $this->getLayout()->createBlock(
- 'Mage_Adminhtml_Block_Api_Tab_Roleinfo'
- )->setRole($role)->toHtml(),
- 'active' => true
- ));
-
- $this->addTab('account', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Resources'),
- 'title' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Resources'),
- 'content' => $this->getLayout()->createBlock('Mage_Adminhtml_Block_Api_Tab_Rolesedit')->toHtml(),
- ));
-
- if( intval($roleId) > 0 ) {
- $this->addTab('roles', array(
- 'label' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Users'),
- 'title' => Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Users'),
- 'content' => $this->getLayout()->createBlock(
- 'Mage_Adminhtml_Block_Api_Tab_Rolesusers',
- 'role.users.grid'
- )->toHtml(),
- ));
- }
- return parent::_beforeToHtml();
- }
-}
@@ -1,81 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Mage
- * @package Mage_Adminhtml
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * roles grid
- *
- * @category Mage
- * @package Mage_Adminhtml
- * @author Magento Core Team <core@magentocommerce.com>
- */
-class Mage_Adminhtml_Block_Api_Grid_Role extends Mage_Adminhtml_Block_Widget_Grid
-{
- protected function _construct()
- {
- parent::_construct();
- $this->setId('roleGrid');
- $this->setSaveParametersInSession(true);
- $this->setDefaultSort('role_id');
- $this->setDefaultDir('asc');
- $this->setUseAjax(true);
- }
-
- protected function _prepareCollection()
- {
- $collection = Mage::getModel('Mage_Api_Model_Roles')->getCollection();
- $this->setCollection($collection);
-
- return parent::_prepareCollection();
- }
-
- protected function _prepareColumns()
- {
-
- $this->addColumn('role_id', array(
- 'header' =>Mage::helper('Mage_Adminhtml_Helper_Data')->__('ID'),
- 'index' =>'role_id',
- 'align' => 'right',
- 'width' => '50px'
- ));
-
- $this->addColumn('role_name', array(
- 'header' =>Mage::helper('Mage_Adminhtml_Helper_Data')->__('Role Name'),
- 'index' =>'role_name'
- ));
-
- return parent::_prepareColumns();
- }
-
- public function getGridUrl()
- {
- return $this->getUrl('*/*/roleGrid', array('_current'=>true));
- }
-
- public function getRowUrl($row)
- {
- return $this->getUrl('*/*/editrole', array('rid' => $row->getRoleId()));
- }
-}
@@ -1,46 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @category Mage
- * @package Mage_Adminhtml
- * @copyright Copyright (c) 2012 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
- */
-
-/**
- * Adminhtml permissioms role block
- *
- * @category Mage
- * @package Mage_Adminhtml
- * @author Magento Core Team <core@magentocommerce.com>
- */
-
-class Mage_Adminhtml_Block_Api_Role extends Mage_Adminhtml_Block_Widget_Grid_Container
-{
-
- protected function _construct()
- {
- $this->_controller = 'api_role';
- $this->_headerText = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Roles');
- $this->_addButtonLabel = Mage::helper('Mage_Adminhtml_Helper_Data')->__('Add New Role');
- parent::_construct();
- }
-
-}
Oops, something went wrong.

0 comments on commit 51f9633

Please sign in to comment.