diff --git a/CHANGELOG.md b/CHANGELOG.md index e56f878e477d8..7d4916a0f3610 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,39 @@ +0.74.0-beta11 +============= +* Framework improvements: + * Improved component Bookmarks component in scope of Enhanced Data Grids on CMS + * Improved component Advanced Filtering component in scope of Enhanced Data Grids on CMS +* Fixed bugs: + * Fixed an issue where incorrect keys in REST request body allowed the request to go through successfully + * Fixed an issue where interceptors were Generated with Invalid __wakeup() + * Fixed an issue where redirect on the current page was not working in certain conditions + * Fixed an issue where first store could not be selected on frontend + * Fixed an issue with performance toolkit category creation + * Fixed an issue when columns 'Interval', 'Price Rule' had incorrect values in Coupon Usage report + * Fixed an issue where fatal error occured on Abandoned Carts report grid + * Fixed an issue where it was not possible to add product to shopping cart if Use Secure URLs in Frontend = Yes + * Fixed an issue where email was not required during Guest Checkout + * Fixed broken ability to skip reindex in `bin/magento setup:performance:generate-fixtures` command + * Fixed an issue where `bin/magento indexer:reindex` command failed after `bin/magento setup:di:compile` was run + * Fixed bug with broken JS i18n + * Fixed an issue with wrong value at created_at updated_at fields after quote* save + * Fixed an issue where customer could not be created in backend after adding Image type attribute + * Fixed Sales InvoiceItem and Order data interfaces implementation + * Fixed an issue with performance toolkit medium profile + * Fixed an issue where Excel Formula Injection via CSV/XML export + * Fixed an issue where it was not possible to open the Customers page in backend + * Fixed an issue with internal server error after clicking Continue on Billing information + * Fixed an issue where it was not possible to place order with Fedex shipping method +* Various changes: + * Magento Centinel Removal + * Removed ability to have multi-statement queries +* Test coverage: + * Unit tests coverage + * Covered php code by unit tests after new checkout implementation +* Github issues: + * [#424](https://github.com/magento/magento2/issues/424) -- Combine tier pricing messages into block sentences + * [#1300](https://github.com/magento/magento2/issues/1300), [#1311](https://github.com/magento/magento2/issues/1311), [#1313](https://github.com/magento/magento2/issues/1313) -- Creating product error with startdate + 0.74.0-beta10 ============= * Framework improvements: diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json index 8ba6ef2ea6411..ce97ab237f9cd 100644 --- a/app/code/Magento/AdminNotification/composer.json +++ b/app/code/Magento/AdminNotification/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json index 7b094570b8e66..1477b5edab926 100644 --- a/app/code/Magento/Authorization/composer.json +++ b/app/code/Magento/Authorization/composer.json @@ -3,12 +3,12 @@ "description": "Authorization module provides access to Magento ACL functionality.", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-backend": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-backend": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json index 12aea32b4e9ad..2f0f0eb54f449 100644 --- a/app/code/Magento/Backend/composer.json +++ b/app/code/Magento/Backend/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-developer": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-cron": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/module-reports": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-user": "0.74.0-beta10", - "magento/module-backup": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-translation": "0.74.0-beta10", - "magento/module-require-js": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-developer": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-cron": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/module-reports": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-user": "0.74.0-beta11", + "magento/module-backup": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-translation": "0.74.0-beta11", + "magento/module-require-js": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml index f52bbb4f8021f..5bcb35156a1c0 100644 --- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml +++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml @@ -8,6 +8,7 @@ Magento Admin + diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json index 54cde5ff34c83..3995de5df3800 100644 --- a/app/code/Magento/Backup/composer.json +++ b/app/code/Magento/Backup/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-cron": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-cron": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json index f2ae57503d4c2..59ec8e5a6d1bc 100644 --- a/app/code/Magento/Bundle/composer.json +++ b/app/code/Magento/Bundle/composer.json @@ -3,28 +3,28 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-catalog-rule": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/module-gift-message": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-catalog-rule": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/module-gift-message": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-webapi": "0.74.0-beta10" + "magento/module-webapi": "0.74.0-beta11" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json index 14dfe1991c3cc..4017ddfff7c48 100644 --- a/app/code/Magento/CacheInvalidate/composer.json +++ b/app/code/Magento/CacheInvalidate/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-page-cache": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-page-cache": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json index 0d403af211c65..1f43b469b862f 100644 --- a/app/code/Magento/Captcha/composer.json +++ b/app/code/Magento/Captcha/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php index b5c69b661f085..54a51a1a55148 100644 --- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php +++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php @@ -132,7 +132,7 @@ public function getAfterElementHtml() 'id' => 'add_category_button', 'label' => $newCategoryCaption, 'title' => $newCategoryCaption, - 'onclick' => 'jQuery("#new-category").dialog("open")', + 'onclick' => 'jQuery("#new-category").trigger("openModal")', 'disabled' => $this->getDisabled(), ] ); diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php index 0f2a86a8b1dc7..fafde250a738b 100644 --- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php +++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php @@ -6,26 +6,44 @@ */ namespace Magento\Catalog\Controller\Adminhtml\Product; +use Magento\Catalog\Helper\Product\Composite; +use Magento\Backend\Model\Session; +use Magento\Backend\App\Action\Context; + class ShowUpdateResult extends \Magento\Catalog\Controller\Adminhtml\Product { + /** @var Composite */ + protected $productCompositeHelper; + + /** + * @param Context $context + * @param Builder $productBuilder + * @param Composite $productCompositeHelper + */ + public function __construct( + Context $context, + Builder $productBuilder, + Composite $productCompositeHelper + ) { + $this->productCompositeHelper = $productCompositeHelper; + parent::__construct($context, $productBuilder); + } + /** * Show item update result from updateAction * in Wishlist and Cart controllers. * - * @return bool + * @return \Magento\Framework\View\Result\Layout */ public function execute() { - $session = $this->_objectManager->get('Magento\Backend\Model\Session'); - if ($session->hasCompositeProductResult() - && $session->getCompositeProductResult() instanceof \Magento\Framework\Object + $layout = false; + if ($this->_session->hasCompositeProductResult() + && $this->_session->getCompositeProductResult() instanceof \Magento\Framework\Object ) { - $this->_objectManager->get('Magento\Catalog\Helper\Product\Composite') - ->renderUpdateResult($session->getCompositeProductResult()); - $session->unsCompositeProductResult(); - } else { - $session->unsCompositeProductResult(); - return false; + $layout = $this->productCompositeHelper->renderUpdateResult($this->_session->getCompositeProductResult()); } + $this->_session->unsCompositeProductResult(); + return $layout; } } diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php new file mode 100644 index 0000000000000..67c4c96989db2 --- /dev/null +++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php @@ -0,0 +1,151 @@ +getMock( + 'Magento\Backend\Model\Session', + ['hasCompositeProductResult', 'getCompositeProductResult', 'unsCompositeProductResult'], + [], + '', + false + ); + $session->expects($this->once()) + ->method('hasCompositeProductResult') + ->willReturn(true); + $session->expects($this->once()) + ->method('unsCompositeProductResult'); + $session->expects($this->atLeastOnce()) + ->method('getCompositeProductResult') + ->willReturn(new \Magento\Framework\Object()); + + return $session; + } + + /** + * Init context object + * + * @return \PHPUnit_Framework_MockObject_MockObject + */ + protected function getContext() + { + $productActionMock = $this->getMock('Magento\Catalog\Model\Product\Action', [], [], '', false); + $objectManagerMock = $this->getMockForAbstractClass('Magento\Framework\ObjectManagerInterface'); + $objectManagerMock->expects($this->any()) + ->method('get') + ->willreturn($productActionMock); + + $eventManager = $this->getMockForAbstractClass('Magento\Framework\Event\Manager', ['dispatch'], '', false); + + $eventManager->expects($this->any()) + ->method('dispatch') + ->willReturnSelf(); + + $this->request = $this->getMock( + 'Magento\Framework\App\Request\Http', + ['getParam', 'getPost', 'getFullActionName', 'getPostValue'], + [], + '', + false + ); + + $responseInterfaceMock = $this->getMock( + 'Magento\Framework\App\ResponseInterface', + ['setRedirect', 'sendResponse'], + [], + '', + false + ); + + $managerInterfaceMock = $this->getMock('Magento\Framework\Message\ManagerInterface'); + $this->session = $this->getSession(); + $actionFlagMock = $this->getMock('Magento\Framework\App\ActionFlag', [], [], '', false); + $helperDataMock = $this->getMock('Magento\Backend\Helper\Data', [], [], '', false); + $this->context = $this->getMock( + 'Magento\Backend\App\Action\Context', + [ + 'getRequest', + 'getResponse', + 'getObjectManager', + 'getEventManager', + 'getMessageManager', + 'getSession', + 'getActionFlag', + 'getHelper', + 'getTitle', + 'getView', + 'getResultRedirectFactory' + ], + [], + '', + false + ); + + $this->context->expects($this->any()) + ->method('getEventManager') + ->willReturn($eventManager); + $this->context->expects($this->any()) + ->method('getRequest') + ->willReturn($this->request); + $this->context->expects($this->any()) + ->method('getResponse') + ->willReturn($responseInterfaceMock); + $this->context->expects($this->any()) + ->method('getObjectManager') + ->willReturn($objectManagerMock); + + $this->context->expects($this->any()) + ->method('getMessageManager') + ->willReturn($managerInterfaceMock); + $this->context->expects($this->any()) + ->method('getSession') + ->willReturn($this->session); + $this->context->expects($this->any()) + ->method('getActionFlag') + ->willReturn($actionFlagMock); + $this->context->expects($this->any()) + ->method('getHelper') + ->willReturn($helperDataMock); + + return $this->context; + } + + public function testExecute() + { + $productCompositeHelper = $this->getMock('Magento\Catalog\Helper\Product\Composite', [], [], '', false); + $productCompositeHelper->expects($this->once()) + ->method('renderUpdateResult'); + + $productBuilder = $this->getMock('Magento\Catalog\Controller\Adminhtml\Product\Builder', [], [], '', false); + $context = $this->getContext(); + + /** @var \Magento\Catalog\Controller\Adminhtml\Product\ShowUpdateResult $controller */ + $controller = new ShowUpdateResult($context, $productBuilder, $productCompositeHelper); + $controller->execute(); + } +} diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json index 723b86045cdfc..5374ab46e08e2 100644 --- a/app/code/Magento/Catalog/composer.json +++ b/app/code/Magento/Catalog/composer.json @@ -3,37 +3,37 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-cms": "0.74.0-beta10", - "magento/module-indexer": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-log": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-widget": "0.74.0-beta10", - "magento/module-wishlist": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/module-msrp": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-catalog-rule": "0.74.0-beta10", - "magento/module-product-alert": "0.74.0-beta10", - "magento/module-url-rewrite": "0.74.0-beta10", - "magento/module-catalog-url-rewrite": "0.74.0-beta10", - "magento/module-page-cache": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-cms": "0.74.0-beta11", + "magento/module-indexer": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-log": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-widget": "0.74.0-beta11", + "magento/module-wishlist": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/module-msrp": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-catalog-rule": "0.74.0-beta11", + "magento/module-product-alert": "0.74.0-beta11", + "magento/module-url-rewrite": "0.74.0-beta11", + "magento/module-catalog-url-rewrite": "0.74.0-beta11", + "magento/module-page-cache": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.74.0-beta10" + "magento/module-cookie": "0.74.0-beta11" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js index d2e22b3fb93e7..648632e2aacbe 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js @@ -392,14 +392,13 @@ ProductConfigure.prototype = { if (Object.isFunction(this.onLoadIFrameCallback[this.current.listType])) { this.onLoadIFrameCallback[this.current.listType](response); } - document.fire(this.current.listType + ':afterIFrameLoaded'); } - // Hide loader jQuery(this.blockForm).trigger('processStop'); this.clean('current'); + this.initialize(); }, /** diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/new-category-dialog.js b/app/code/Magento/Catalog/view/adminhtml/web/js/new-category-dialog.js index 46ad787624620..552e6a3a70ee7 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/new-category-dialog.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/new-category-dialog.js @@ -7,6 +7,7 @@ define([ 'jquery', 'jquery/ui', + 'Magento_Ui/js/modal/modal', 'mage/translate', 'mage/backend/tree-suggest', 'mage/backend/validation' @@ -51,53 +52,37 @@ define([ options.errorClass, options.validClass || ''); } }); - - this.element.dialog({ + this.element.modal({ + type: 'slide', + modalClass: 'mage-new-category-dialog form-inline', title: $.mage.__('Create Category'), - autoOpen: false, - width: '75%', - dialogClass: 'mage-new-category-dialog form-inline', - modal: true, - multiselect: true, - resizable: false, - position: { - my: 'left top', - at: 'center top', - of: 'body' - }, - open: function () { - // fix for suggest field - overlapping dialog z-index - $('#new_category_parent-suggest').css('z-index', $.ui.dialog.maxZ + 1); + opened: function () { var enteredName = $('#category_ids-suggest').val(); + $('#new_category_name').val(enteredName); if (enteredName === '') { $('#new_category_name').focus(); } $('#new_category_messages').html(''); - $(this).closest('.ui-dialog').addClass('ui-dialog-active'); - - var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 15; - $(this).closest('.ui-dialog').css('margin-top', topMargin); }, - close: function () { - $('#new_category_name, #new_category_parent-suggest').val(''); + closed: function () { var validationOptions = newCategoryForm.validation('option'); + + $('#new_category_name, #new_category_parent-suggest').val(''); validationOptions.unhighlight($('#new_category_parent-suggest').get(0), validationOptions.errorClass, validationOptions.validClass || ''); newCategoryForm.validation('clearError'); $('#category_ids-suggest').focus(); - $(this).closest('.ui-dialog').removeClass('ui-dialog-active'); }, buttons: [{ text: $.mage.__('Create Category'), - 'class': 'action-primary', - 'data-action': 'save', - click: function (event) { + class: 'action-primary', + click: function (e) { if (!newCategoryForm.valid()) { return; } + var thisButton = $(e.currentTarget); - var thisButton = $(event.target).closest('[data-action=save]'); thisButton.prop('disabled', true); $.ajax({ type: 'POST', @@ -115,27 +100,25 @@ define([ }, dataType: 'json', context: $('body') - }) - .success( - function (data) { - if (!data.error) { - $('#category_ids-suggest').trigger('selectItem', { - id: data.category.entity_id, - label: data.category.name - }); - $('#new_category_name, #new_category_parent-suggest').val(''); - $('#category_ids-suggest').val(''); - clearParentCategory(); - widget.element.dialog('close'); - } else { - $('#new_category_messages').html(data.messages); - } - } - ) - .complete( - function () { - thisButton.prop('disabled', false); - } + }).success(function (data) { + if (!data.error) { + var $suggest = $('#category_ids-suggest'); + + $suggest.trigger('selectItem', { + id: data.category.entity_id, + label: data.category.name + }); + $('#new_category_name, #new_category_parent-suggest').val(''); + $suggest.val(''); + clearParentCategory(); + widget.element.trigger('closeModal'); + } else { + $('#new_category_messages').html(data.messages); + } + }).complete( + function () { + thisButton.prop('disabled', false); + } ); } }] diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json index 1ab9375dad08c..11fd42942bf68 100644 --- a/app/code/Magento/CatalogImportExport/composer.json +++ b/app/code/Magento/CatalogImportExport/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-import-export": "0.74.0-beta10", - "magento/module-indexer": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-import-export": "0.74.0-beta11", + "magento/module-indexer": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json index 53a6c49f0c71d..3979f2b2fd217 100644 --- a/app/code/Magento/CatalogInventory/composer.json +++ b/app/code/Magento/CatalogInventory/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-indexer": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-indexer": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json index 9d501b9895278..7a1d7d902f805 100644 --- a/app/code/Magento/CatalogRule/composer.json +++ b/app/code/Magento/CatalogRule/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-rule": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-indexer": "0.74.0-beta10", - "magento/module-import-export": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-rule": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-indexer": "0.74.0-beta11", + "magento/module-import-export": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json index e1b1f2abc447f..8e44d35fe165c 100644 --- a/app/code/Magento/CatalogSearch/composer.json +++ b/app/code/Magento/CatalogSearch/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-search": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-indexer": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-search": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-indexer": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json index 86627ada189f9..78fa946bb5859 100644 --- a/app/code/Magento/CatalogUrlRewrite/composer.json +++ b/app/code/Magento/CatalogUrlRewrite/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-backend": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-catalog-import-export": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-import-export": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-url-rewrite": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-backend": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-catalog-import-export": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-import-export": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-url-rewrite": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json index 5a4e7e3c6cfc3..cb51c8bad8528 100644 --- a/app/code/Magento/CatalogWidget/composer.json +++ b/app/code/Magento/CatalogWidget/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-widget": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-rule": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-wishlist": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-widget": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-rule": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-wishlist": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json index ba0fac8c01e9a..67fb91166e7a5 100644 --- a/app/code/Magento/Checkout/composer.json +++ b/app/code/Magento/Checkout/composer.json @@ -3,32 +3,32 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-payment": "0.74.0-beta10", - "magento/module-shipping": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-gift-message": "0.74.0-beta10", - "magento/module-wishlist": "0.74.0-beta10", - "magento/module-page-cache": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/module-msrp": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", - "magento/module-ui": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-payment": "0.74.0-beta11", + "magento/module-shipping": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-gift-message": "0.74.0-beta11", + "magento/module-wishlist": "0.74.0-beta11", + "magento/module-page-cache": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/module-msrp": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", + "magento/module-ui": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.74.0-beta10" + "magento/module-cookie": "0.74.0-beta11" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address.js index 17b75243a4ee6..aaa5529851d79 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address.js @@ -58,18 +58,22 @@ define( return !quote.isVirtual(); }, selectShippingAddress: function() { - var additionalData = {}; - var billingAddress = quote.getBillingAddress()(); + var additionalFields, + addressData, + additionalData = {}, + billingAddress = quote.getBillingAddress()(); + if (!billingAddress.customerAddressId || !this.visible()) { /** * All the the input fields that are not a part of the address but need to be submitted * in the same request must have data-scope attribute set */ - var additionalFields = $('input[data-scope="additionalAddressData"]').serializeArray(); + additionalFields = $('input[data-scope="additionalAddressData"]').serializeArray(); additionalFields.forEach(function (field) { additionalData[field.name] = field.value; }); } + if (!newAddressSelected()) { selectShippingAddress( addressList.getAddressById(this.selectedAddressId()), @@ -80,23 +84,32 @@ define( if (this.visible()) { this.validate(); } + if (!this.source.get('params.invalid')) { - var addressData = this.source.get('shippingAddress'); + addressData = this.source.get('shippingAddress'); selectShippingAddress(addressData, this.sameAsBilling(), additionalData); } } }, sameAsBillingClick: function() { + var billingAddress, + shippingAddress, + property; + addressList.isBillingSameAsShipping = !addressList.isBillingSameAsShipping; + if (this.sameAsBilling()) { - var billingAddress = quote.getBillingAddress()(); + billingAddress = quote.getBillingAddress()(); + if (billingAddress.customerAddressId) { this.selectedAddressId(billingAddress.customerAddressId); newAddressSelected(false); + } else { // copy billing address data to shipping address form if customer uses new address for billing - var shippingAddress = this.source.get('shippingAddress'); - for (var property in billingAddress) { + shippingAddress = this.source.get('shippingAddress'); + + for (property in billingAddress) { if (billingAddress.hasOwnProperty(property) && shippingAddress.hasOwnProperty(property)) { if (typeof billingAddress[property] === 'string') { this.source.set('shippingAddress.' + property, billingAddress[property]); @@ -105,6 +118,7 @@ define( } } } + this.selectedAddressId(null); newAddressSelected(true); } @@ -113,9 +127,11 @@ define( }, onAddressChange: function() { var billingAddress = quote.getBillingAddress(); + if (this.selectedAddressId() !== billingAddress().customerAddressId) { this.sameAsBilling(false); } + if (this.selectedAddressId() === null) { newAddressSelected(true); } else { diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json index c175a84cfc0e7..23d8730eca731 100644 --- a/app/code/Magento/CheckoutAgreements/composer.json +++ b/app/code/Magento/CheckoutAgreements/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-ui": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-ui": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php index 02b45d199fe59..730fb978b5447 100644 --- a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php +++ b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php @@ -16,8 +16,8 @@ interface BlockRepositoryInterface /** * Save block. * - * @param Data\BlockInterface $block - * @return Data\BlockInterface + * @param \Magento\Cms\Api\Data\BlockInterface $block + * @return \Magento\Cms\Api\Data\BlockInterface * @throws \Magento\Framework\Exception\LocalizedException */ public function save(Data\BlockInterface $block); @@ -26,7 +26,7 @@ public function save(Data\BlockInterface $block); * Retrieve block. * * @param int $blockId - * @return Data\BlockInterface + * @return \Magento\Cms\Api\Data\BlockInterface * @throws \Magento\Framework\Exception\LocalizedException */ public function getById($blockId); @@ -34,16 +34,16 @@ public function getById($blockId); /** * Retrieve blocks matching the specified criteria. * - * @param SearchCriteriaInterface $searchCriteria - * @return \Magento\Framework\Api\SearchResultsInterface + * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria + * @return \Magento\Cms\Api\Data\BlockSearchResultsInterface * @throws \Magento\Framework\Exception\LocalizedException */ - public function getList(SearchCriteriaInterface $searchCriteria); + public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria); /** * Delete block. * - * @param Data\BlockInterface $block + * @param \Magento\Cms\Api\Data\BlockInterface $block * @return bool true on success * @throws \Magento\Framework\Exception\LocalizedException */ diff --git a/app/code/Magento/Cms/Api/Data/BlockInterface.php b/app/code/Magento/Cms/Api/Data/BlockInterface.php index a6602de2fd2c1..c399ae2467e5e 100644 --- a/app/code/Magento/Cms/Api/Data/BlockInterface.php +++ b/app/code/Magento/Cms/Api/Data/BlockInterface.php @@ -26,7 +26,7 @@ interface BlockInterface /** * Get ID * - * @return int + * @return int|null */ public function getId(); @@ -40,35 +40,35 @@ public function getIdentifier(); /** * Get title * - * @return string + * @return string|null */ public function getTitle(); /** * Get content * - * @return string + * @return string|null */ public function getContent(); /** * Get creation time * - * @return string + * @return string|null */ public function getCreationTime(); /** * Get update time * - * @return string + * @return string|null */ public function getUpdateTime(); /** * Is active * - * @return bool + * @return bool|null */ public function isActive(); diff --git a/app/code/Magento/Cms/Api/Data/PageInterface.php b/app/code/Magento/Cms/Api/Data/PageInterface.php index 03e292c4c258a..d59c99b087982 100644 --- a/app/code/Magento/Cms/Api/Data/PageInterface.php +++ b/app/code/Magento/Cms/Api/Data/PageInterface.php @@ -37,7 +37,7 @@ interface PageInterface /** * Get ID * - * @return int + * @return int|null */ public function getId(); @@ -51,112 +51,112 @@ public function getIdentifier(); /** * Get title * - * @return string + * @return string|null */ public function getTitle(); /** * Get page layout * - * @return string + * @return string|null */ public function getPageLayout(); /** * Get meta keywords * - * @return string + * @return string|null */ public function getMetaKeywords(); /** * Get meta description * - * @return string + * @return string|null */ public function getMetaDescription(); /** * Get content heading * - * @return string + * @return string|null */ public function getContentHeading(); /** * Get content * - * @return string + * @return string|null */ public function getContent(); /** * Get creation time * - * @return string + * @return string|null */ public function getCreationTime(); /** * Get update time * - * @return string + * @return string|null */ public function getUpdateTime(); /** * Get sort order * - * @return string + * @return string|null */ public function getSortOrder(); /** * Get layout update xml * - * @return string + * @return string|null */ public function getLayoutUpdateXml(); /** * Get custom theme * - * @return string + * @return string|null */ public function getCustomTheme(); /** * Get custom root template * - * @return string + * @return string|null */ public function getCustomRootTemplate(); /** * Get custom layout update xml * - * @return string + * @return string|null */ public function getCustomLayoutUpdateXml(); /** * Get custom theme from * - * @return string + * @return string|null */ public function getCustomThemeFrom(); /** * Get custom theme to * - * @return string + * @return string|null */ public function getCustomThemeTo(); /** * Is active * - * @return bool + * @return bool|null */ public function isActive(); diff --git a/app/code/Magento/Cms/Api/PageRepositoryInterface.php b/app/code/Magento/Cms/Api/PageRepositoryInterface.php index b65ce6a83f925..04a8517d8a2eb 100644 --- a/app/code/Magento/Cms/Api/PageRepositoryInterface.php +++ b/app/code/Magento/Cms/Api/PageRepositoryInterface.php @@ -16,17 +16,17 @@ interface PageRepositoryInterface /** * Save page. * - * @param Data\PageInterface $page - * @return Data\PageInterface + * @param \Magento\Cms\Api\Data\PageInterface $page + * @return \Magento\Cms\Api\Data\PageInterface * @throws \Magento\Framework\Exception\LocalizedException */ - public function save(Data\PageInterface $page); + public function save(\Magento\Cms\Api\Data\PageInterface $page); /** * Retrieve page. * * @param int $pageId - * @return Data\PageInterface + * @return \Magento\Cms\Api\Data\PageInterface * @throws \Magento\Framework\Exception\LocalizedException */ public function getById($pageId); @@ -34,20 +34,20 @@ public function getById($pageId); /** * Retrieve pages matching the specified criteria. * - * @param SearchCriteriaInterface $searchCriteria - * @return \Magento\Framework\Api\SearchResultsInterface + * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria + * @return \Magento\Cms\Api\Data\PageSearchResultsInterface * @throws \Magento\Framework\Exception\LocalizedException */ - public function getList(SearchCriteriaInterface $searchCriteria); + public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria); /** * Delete page. * - * @param Data\PageInterface $page + * @param \Magento\Cms\Api\Data\PageInterface $page * @return bool true on success * @throws \Magento\Framework\Exception\LocalizedException */ - public function delete(Data\PageInterface $page); + public function delete(\Magento\Cms\Api\Data\PageInterface $page); /** * Delete page by ID. diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php index be1498fc86675..32c12f0d8dba6 100644 --- a/app/code/Magento/Cms/Model/BlockRepository.php +++ b/app/code/Magento/Cms/Model/BlockRepository.php @@ -12,6 +12,7 @@ use Magento\Framework\Exception\CouldNotDeleteException; use Magento\Framework\Exception\CouldNotSaveException; use Magento\Framework\Exception\NoSuchEntityException; +use Magento\Framework\Reflection\DataObjectProcessor; /** * Class BlockRepository @@ -45,7 +46,12 @@ class BlockRepository implements BlockRepositoryInterface protected $dataObjectHelper; /** - * @var Data\BlockInterfaceFactory + * @var DataObjectProcessor + */ + protected $dataObjectProcessor; + + /** + * @var \Magento\Cms\Api\Data\BlockInterfaceFactory */ protected $dataBlockFactory; @@ -56,14 +62,16 @@ class BlockRepository implements BlockRepositoryInterface * @param Resource\Block\CollectionFactory $blockCollectionFactory * @param Data\BlockSearchResultsInterfaceFactory $searchResultsFactory * @param DataObjectHelper $dataObjectHelper + * @param DataObjectProcessor $dataObjectProcessor */ public function __construct( Resource\Block $resource, BlockFactory $blockFactory, - Data\BlockInterfaceFactory $dataBlockFactory, + \Magento\Cms\Api\Data\BlockInterfaceFactory $dataBlockFactory, Resource\Block\CollectionFactory $blockCollectionFactory, Data\BlockSearchResultsInterfaceFactory $searchResultsFactory, - DataObjectHelper $dataObjectHelper + DataObjectHelper $dataObjectHelper, + DataObjectProcessor $dataObjectProcessor ) { $this->resource = $resource; $this->blockFactory = $blockFactory; @@ -71,12 +79,13 @@ public function __construct( $this->searchResultsFactory = $searchResultsFactory; $this->dataObjectHelper = $dataObjectHelper; $this->dataBlockFactory = $dataBlockFactory; + $this->dataObjectProcessor = $dataObjectProcessor; } /** * Save Block data * - * @param Data\BlockInterface $block + * @param \Magento\Cms\Api\Data\BlockInterface $block * @return Block * @throws CouldNotSaveException */ @@ -112,28 +121,23 @@ public function getById($blockId) * * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) - * @param SearchCriteriaInterface $criteria + * @param \Magento\Framework\Api\SearchCriteriaInterface $criteria * @return Resource\Block\Collection */ - public function getList(SearchCriteriaInterface $criteria) + public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria) { $searchResults = $this->searchResultsFactory->create(); $searchResults->setSearchCriteria($criteria); $collection = $this->blockCollectionFactory->create(); foreach ($criteria->getFilterGroups() as $filterGroup) { - $fields = []; - $conditions = []; foreach ($filterGroup->getFilters() as $filter) { if ($filter->getField() === 'store_id') { $collection->addStoreFilter($filter->getValue(), false); continue; } $condition = $filter->getConditionType() ?: 'eq'; - $fields[] = ['attribute' => $filter->getField(), $condition => $filter->getValue()]; - } - if ($fields) { - $collection->addFieldToFilter($fields, $conditions); + $collection->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]); } } $searchResults->setTotalCount($collection->getSize()); @@ -151,11 +155,16 @@ public function getList(SearchCriteriaInterface $criteria) $blocks = []; /** @var Block $blockModel */ foreach ($collection as $blockModel) { - $blocks[] = $this->dataObjectHelper->populateWithArray( - $this->dataBlockFactory->create(), + $blockData = $this->dataBlockFactory->create(); + $this->dataObjectHelper->populateWithArray( + $blockData, $blockModel->getData(), 'Magento\Cms\Api\Data\BlockInterface' ); + $blocks[] = $this->dataObjectProcessor->buildOutputDataArray( + $blockData, + 'Magento\Cms\Api\Data\BlockInterface' + ); } $searchResults->setItems($blocks); return $searchResults; @@ -164,7 +173,7 @@ public function getList(SearchCriteriaInterface $criteria) /** * Delete Block * - * @param Data\BlockInterface $block + * @param \Magento\Cms\Api\Data\BlockInterface $block * @return bool * @throws CouldNotDeleteException */ diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php index 82fbba3748d12..b8499344a92e2 100644 --- a/app/code/Magento/Cms/Model/PageRepository.php +++ b/app/code/Magento/Cms/Model/PageRepository.php @@ -12,6 +12,7 @@ use Magento\Framework\Exception\CouldNotDeleteException; use Magento\Framework\Exception\CouldNotSaveException; use Magento\Framework\Exception\NoSuchEntityException; +use Magento\Framework\Reflection\DataObjectProcessor; /** * Class PageRepository @@ -45,7 +46,12 @@ class PageRepository implements PageRepositoryInterface protected $dataObjectHelper; /** - * @var Data\PageInterfaceFactory + * @var DataObjectProcessor + */ + protected $dataObjectProcessor; + + /** + * @var \Magento\Cms\Api\Data\PageInterfaceFactory */ protected $dataPageFactory; @@ -56,6 +62,7 @@ class PageRepository implements PageRepositoryInterface * @param Resource\Page\CollectionFactory $pageCollectionFactory * @param Data\PageSearchResultsInterfaceFactory $searchResultsFactory * @param DataObjectHelper $dataObjectHelper + * @param DataObjectProcessor $dataObjectProcessor */ public function __construct( Resource\Page $resource, @@ -63,7 +70,8 @@ public function __construct( Data\PageInterfaceFactory $dataPageFactory, Resource\Page\CollectionFactory $pageCollectionFactory, Data\PageSearchResultsInterfaceFactory $searchResultsFactory, - DataObjectHelper $dataObjectHelper + DataObjectHelper $dataObjectHelper, + DataObjectProcessor $dataObjectProcessor ) { $this->resource = $resource; $this->pageFactory = $pageFactory; @@ -71,16 +79,17 @@ public function __construct( $this->searchResultsFactory = $searchResultsFactory; $this->dataObjectHelper = $dataObjectHelper; $this->dataPageFactory = $dataPageFactory; + $this->dataObjectProcessor = $dataObjectProcessor; } /** * Save Page data * - * @param Data\PageInterface $page + * @param \Magento\Cms\Api\Data\PageInterface $page * @return Page * @throws CouldNotSaveException */ - public function save(Data\PageInterface $page) + public function save(\Magento\Cms\Api\Data\PageInterface $page) { try { $this->resource->save($page); @@ -112,28 +121,23 @@ public function getById($pageId) * * @SuppressWarnings(PHPMD.CyclomaticComplexity) * @SuppressWarnings(PHPMD.NPathComplexity) - * @param SearchCriteriaInterface $criteria + * @param \Magento\Framework\Api\SearchCriteriaInterface $criteria * @return Resource\Page\Collection */ - public function getList(SearchCriteriaInterface $criteria) + public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria) { $searchResults = $this->searchResultsFactory->create(); $searchResults->setSearchCriteria($criteria); $collection = $this->pageCollectionFactory->create(); foreach ($criteria->getFilterGroups() as $filterGroup) { - $fields = []; - $conditions = []; foreach ($filterGroup->getFilters() as $filter) { if ($filter->getField() === 'store_id') { $collection->addStoreFilter($filter->getValue(), false); continue; } $condition = $filter->getConditionType() ?: 'eq'; - $fields[] = ['attribute' => $filter->getField(), $condition => $filter->getValue()]; - } - if ($fields) { - $collection->addFieldToFilter($fields, $conditions); + $collection->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]); } } $searchResults->setTotalCount($collection->getSize()); @@ -151,11 +155,16 @@ public function getList(SearchCriteriaInterface $criteria) $pages = []; /** @var Page $pageModel */ foreach ($collection as $pageModel) { - $pages[] = $this->dataObjectHelper->populateWithArray( - $this->dataPageFactory->create(), + $pageData = $this->dataPageFactory->create(); + $this->dataObjectHelper->populateWithArray( + $pageData, $pageModel->getData(), 'Magento\Cms\Api\Data\PageInterface' ); + $pages[] = $this->dataObjectProcessor->buildOutputDataArray( + $pageData, + 'Magento\Cms\Api\Data\PageInterface' + ); } $searchResults->setItems($pages); return $searchResults; @@ -164,11 +173,11 @@ public function getList(SearchCriteriaInterface $criteria) /** * Delete Page * - * @param Data\PageInterface $page + * @param \Magento\Cms\Api\Data\PageInterface $page * @return bool * @throws CouldNotDeleteException */ - public function delete(Data\PageInterface $page) + public function delete(\Magento\Cms\Api\Data\PageInterface $page) { try { $this->resource->delete($page); diff --git a/app/code/Magento/Cms/Test/Unit/Model/BlockRepositoryTest.php b/app/code/Magento/Cms/Test/Unit/Model/BlockRepositoryTest.php index e5c3c9dd15543..923efe26c3c1e 100644 --- a/app/code/Magento/Cms/Test/Unit/Model/BlockRepositoryTest.php +++ b/app/code/Magento/Cms/Test/Unit/Model/BlockRepositoryTest.php @@ -43,6 +43,11 @@ class BlockRepositoryTest extends \PHPUnit_Framework_TestCase */ protected $dataHelper; + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Reflection\DataObjectProcessor + */ + protected $dataObjectProcessor; + /** * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Cms\Model\Resource\Block\Collection */ @@ -56,6 +61,9 @@ public function setUp() $this->blockResource = $this->getMockBuilder('Magento\Cms\Model\Resource\Block') ->disableOriginalConstructor() ->getMock(); + $this->dataObjectProcessor = $this->getMockBuilder('Magento\Framework\Reflection\DataObjectProcessor') + ->disableOriginalConstructor() + ->getMock(); $blockFactory = $this->getMockBuilder('Magento\Cms\Model\BlockFactory') ->disableOriginalConstructor() ->setMethods(['create']) @@ -112,7 +120,8 @@ public function setUp() $blockDataFactory, $collectionFactory, $blockSearchResultFactory, - $this->dataHelper + $this->dataHelper, + $this->dataObjectProcessor ); } @@ -216,42 +225,18 @@ public function testGetList() $storeFilter = $this->getMockBuilder('Magento\Framework\Api\Filter')->getMock(); $sortOrder = $this->getMockBuilder('Magento\Framework\Api\SortOrder')->getMock(); - $criteria->expects($this->once()) - ->method('getFilterGroups') - ->willReturn([$filterGroup]); - $criteria->expects($this->once()) - ->method('getSortOrders') - ->willReturn([$sortOrder]); - $criteria->expects($this->once()) - ->method('getCurrentPage') - ->willReturn($currentPage); - $criteria->expects($this->once()) - ->method('getPageSize') - ->willReturn($pageSize); - $filterGroup->expects($this->once()) - ->method('getFilters') - ->willReturn([$storeFilter, $filter]); - $filter->expects($this->once()) - ->method('getConditionType') - ->willReturn($condition); - $filter->expects($this->any()) - ->method('getField') - ->willReturn($field); - $filter->expects($this->once()) - ->method('getValue') - ->willReturn($value); - $storeFilter->expects($this->any()) - ->method('getField') - ->willReturn('store_id'); - $storeFilter->expects($this->once()) - ->method('getValue') - ->willReturn(1); - $sortOrder->expects($this->once()) - ->method('getField') - ->willReturn($sortField); - $sortOrder->expects($this->once()) - ->method('getDirection') - ->willReturn(SearchCriteriaInterface::SORT_DESC); + $criteria->expects($this->once())->method('getFilterGroups')->willReturn([$filterGroup]); + $criteria->expects($this->once())->method('getSortOrders')->willReturn([$sortOrder]); + $criteria->expects($this->once())->method('getCurrentPage')->willReturn($currentPage); + $criteria->expects($this->once())->method('getPageSize')->willReturn($pageSize); + $filterGroup->expects($this->once())->method('getFilters')->willReturn([$storeFilter, $filter]); + $filter->expects($this->once())->method('getConditionType')->willReturn($condition); + $filter->expects($this->any())->method('getField')->willReturn($field); + $filter->expects($this->once())->method('getValue')->willReturn($value); + $storeFilter->expects($this->any())->method('getField')->willReturn('store_id'); + $storeFilter->expects($this->once())->method('getValue')->willReturn(1); + $sortOrder->expects($this->once())->method('getField')->willReturn($sortField); + $sortOrder->expects($this->once())->method('getDirection')->willReturn(SearchCriteriaInterface::SORT_DESC); /** @var \Magento\Framework\Api\SearchCriteriaInterface $criteria */ @@ -262,37 +247,21 @@ public function testGetList() ->willReturnSelf(); $this->collection->expects($this->once()) ->method('addFieldToFilter') - ->with([['attribute' => $field, $condition => $value]], []) - ->willReturnSelf(); - $this->blockSearchResult->expects($this->once()) - ->method('setTotalCount') - ->with($total) - ->willReturnSelf(); - $this->collection->expects($this->once()) - ->method('getSize') - ->willReturn($total); - $this->collection->expects($this->once()) - ->method('setCurPage') - ->with($currentPage) - ->willReturnSelf(); - $this->collection->expects($this->once()) - ->method('setPageSize') - ->with($pageSize) - ->willReturnSelf(); - $this->collection->expects($this->once()) - ->method('addOrder') - ->with($sortField, 'DESC') - ->willReturnSelf(); - $this->block->expects($this->once()) - ->method('getData') - ->willReturn(['data']); - $this->blockSearchResult->expects($this->once()) - ->method('setItems') - ->with(['someData']) + ->with($field, [$condition => $value]) ->willReturnSelf(); + $this->blockSearchResult->expects($this->once())->method('setTotalCount')->with($total)->willReturnSelf(); + $this->collection->expects($this->once())->method('getSize')->willReturn($total); + $this->collection->expects($this->once())->method('setCurPage')->with($currentPage)->willReturnSelf(); + $this->collection->expects($this->once())->method('setPageSize')->with($pageSize)->willReturnSelf(); + $this->collection->expects($this->once())->method('addOrder')->with($sortField, 'DESC')->willReturnSelf(); + $this->block->expects($this->once())->method('getData')->willReturn(['data']); + $this->blockSearchResult->expects($this->once())->method('setItems')->with(['someData'])->willReturnSelf(); $this->dataHelper->expects($this->once()) ->method('populateWithArray') - ->with($this->blockData, ['data'], 'Magento\Cms\Api\Data\BlockInterface') + ->with($this->blockData, ['data'], 'Magento\Cms\Api\Data\BlockInterface'); + $this->dataObjectProcessor->expects($this->once()) + ->method('buildOutputDataArray') + ->with($this->blockData, 'Magento\Cms\Api\Data\BlockInterface') ->willReturn('someData'); $this->assertEquals($this->blockSearchResult, $this->repository->getList($criteria)); diff --git a/app/code/Magento/Cms/Test/Unit/Model/PageRepositoryTest.php b/app/code/Magento/Cms/Test/Unit/Model/PageRepositoryTest.php index a5127dc518239..79b7b46e4a136 100644 --- a/app/code/Magento/Cms/Test/Unit/Model/PageRepositoryTest.php +++ b/app/code/Magento/Cms/Test/Unit/Model/PageRepositoryTest.php @@ -43,6 +43,11 @@ class PageRepositoryTest extends \PHPUnit_Framework_TestCase */ protected $dataHelper; + /** + * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Reflection\DataObjectProcessor + */ + protected $dataObjectProcessor; + /** * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Cms\Model\Resource\Page\Collection */ @@ -56,6 +61,9 @@ public function setUp() $this->pageResource = $this->getMockBuilder('Magento\Cms\Model\Resource\Page') ->disableOriginalConstructor() ->getMock(); + $this->dataObjectProcessor = $this->getMockBuilder('Magento\Framework\Reflection\DataObjectProcessor') + ->disableOriginalConstructor() + ->getMock(); $pageFactory = $this->getMockBuilder('Magento\Cms\Model\PageFactory') ->disableOriginalConstructor() ->setMethods(['create']) @@ -112,7 +120,8 @@ public function setUp() $pageDataFactory, $collectionFactory, $pageSearchResultFactory, - $this->dataHelper + $this->dataHelper, + $this->dataObjectProcessor ); } @@ -216,83 +225,40 @@ public function testGetList() $storeFilter = $this->getMockBuilder('Magento\Framework\Api\Filter')->getMock(); $sortOrder = $this->getMockBuilder('Magento\Framework\Api\SortOrder')->getMock(); - $criteria->expects($this->once()) - ->method('getFilterGroups') - ->willReturn([$filterGroup]); - $criteria->expects($this->once()) - ->method('getSortOrders') - ->willReturn([$sortOrder]); - $criteria->expects($this->once()) - ->method('getCurrentPage') - ->willReturn($currentPage); - $criteria->expects($this->once()) - ->method('getPageSize') - ->willReturn($pageSize); - $filterGroup->expects($this->once()) - ->method('getFilters') - ->willReturn([$storeFilter, $filter]); - $filter->expects($this->once()) - ->method('getConditionType') - ->willReturn($condition); - $filter->expects($this->any()) - ->method('getField') - ->willReturn($field); - $filter->expects($this->once()) - ->method('getValue') - ->willReturn($value); - $storeFilter->expects($this->any()) - ->method('getField') - ->willReturn('store_id'); - $storeFilter->expects($this->once()) - ->method('getValue') - ->willReturn(1); - $sortOrder->expects($this->once()) - ->method('getField') - ->willReturn($sortField); - $sortOrder->expects($this->once()) - ->method('getDirection') - ->willReturn(SearchCriteriaInterface::SORT_DESC); + $criteria->expects($this->once())->method('getFilterGroups')->willReturn([$filterGroup]); + $criteria->expects($this->once())->method('getSortOrders')->willReturn([$sortOrder]); + $criteria->expects($this->once())->method('getCurrentPage')->willReturn($currentPage); + $criteria->expects($this->once())->method('getPageSize')->willReturn($pageSize); + $filterGroup->expects($this->once())->method('getFilters')->willReturn([$storeFilter, $filter]); + $filter->expects($this->once())->method('getConditionType')->willReturn($condition); + $filter->expects($this->any())->method('getField')->willReturn($field); + $filter->expects($this->once())->method('getValue')->willReturn($value); + $storeFilter->expects($this->any())->method('getField')->willReturn('store_id'); + $storeFilter->expects($this->once())->method('getValue')->willReturn(1); + $sortOrder->expects($this->once())->method('getField')->willReturn($sortField); + $sortOrder->expects($this->once())->method('getDirection')->willReturn(SearchCriteriaInterface::SORT_DESC); /** @var \Magento\Framework\Api\SearchCriteriaInterface $criteria */ $this->collection->addItem($this->page); - $this->pageSearchResult->expects($this->once()) - ->method('setSearchCriteria') - ->with($criteria) - ->willReturnSelf(); + $this->pageSearchResult->expects($this->once())->method('setSearchCriteria')->with($criteria)->willReturnSelf(); $this->collection->expects($this->once()) ->method('addFieldToFilter') - ->with([['attribute' => $field, $condition => $value]], []) - ->willReturnSelf(); - $this->pageSearchResult->expects($this->once()) - ->method('setTotalCount') - ->with($total) - ->willReturnSelf(); - $this->collection->expects($this->once()) - ->method('getSize') - ->willReturn($total); - $this->collection->expects($this->once()) - ->method('setCurPage') - ->with($currentPage) - ->willReturnSelf(); - $this->collection->expects($this->once()) - ->method('setPageSize') - ->with($pageSize) - ->willReturnSelf(); - $this->collection->expects($this->once()) - ->method('addOrder') - ->with($sortField, 'DESC') - ->willReturnSelf(); - $this->page->expects($this->once()) - ->method('getData') - ->willReturn(['data']); - $this->pageSearchResult->expects($this->once()) - ->method('setItems') - ->with(['someData']) + ->with($field, [$condition => $value]) ->willReturnSelf(); + $this->pageSearchResult->expects($this->once())->method('setTotalCount')->with($total)->willReturnSelf(); + $this->collection->expects($this->once())->method('getSize')->willReturn($total); + $this->collection->expects($this->once())->method('setCurPage')->with($currentPage)->willReturnSelf(); + $this->collection->expects($this->once())->method('setPageSize')->with($pageSize)->willReturnSelf(); + $this->collection->expects($this->once())->method('addOrder')->with($sortField, 'DESC')->willReturnSelf(); + $this->page->expects($this->once())->method('getData')->willReturn(['data']); + $this->pageSearchResult->expects($this->once())->method('setItems')->with(['someData'])->willReturnSelf(); $this->dataHelper->expects($this->once()) ->method('populateWithArray') - ->with($this->pageData, ['data'], 'Magento\Cms\Api\Data\PageInterface') + ->with($this->pageData, ['data'], 'Magento\Cms\Api\Data\PageInterface'); + $this->dataObjectProcessor->expects($this->once()) + ->method('buildOutputDataArray') + ->with($this->pageData, 'Magento\Cms\Api\Data\PageInterface') ->willReturn('someData'); $this->assertEquals($this->pageSearchResult, $this->repository->getList($criteria)); diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json index 6dfb05b5a766c..262a606f618f6 100644 --- a/app/code/Magento/Cms/composer.json +++ b/app/code/Magento/Cms/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/module-widget": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-email": "0.74.0-beta10", - "magento/module-ui": "0.74.0-beta10", - "magento/module-variable": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/module-widget": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-email": "0.74.0-beta11", + "magento/module-ui": "0.74.0-beta11", + "magento/module-variable": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Cms/etc/webapi.xml b/app/code/Magento/Cms/etc/webapi.xml new file mode 100644 index 0000000000000..10b3d1a119d6b --- /dev/null +++ b/app/code/Magento/Cms/etc/webapi.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml deleted file mode 100644 index 22788b865327b..0000000000000 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_listing.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - cms_block_listing - Magento\Cms\Model\Resource\Block\Collection - 1 - - - - Add New Block - - - - - - true - true - true - - block_id - edit - - - ID - left - text - filter_range - - - Title - left - text - filter_input - - - Identifier - left - text - filter_input - - - Store View - left - store - false - filter_store - Magento\Store\Ui\DataProvider\Options - - - Status - left - text - filter_select - - - 0 - Disabled - - - 1 - Enabled - - - - - Created - left - date - filter_date - - - Modified - left - date - filter_date - - - Action - left - actions - false - false - false - - - - - - - - - block_id - - - - - - - - - store - Magento_Store/js/listing/filter/store - - - - - - - - - - - Delete - cms/block/massDelete - - - - - - - diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml deleted file mode 100644 index 55a8f04288348..0000000000000 --- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_listing.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - cms_page_listing - Magento\Cms\Model\Resource\Page\Collection - 1 - - - - Add New Page - - - - - - true - true - true - - page_id - edit - - - ID - left - text - filter_range - - - Title - left - text - filter_input - - - URL Key - left - text - filter_input - - - Layout - left - text - filter_select - Magento\Cms\Ui\DataProvider\Page\Options\PageLayout - - - Store View - left - false - store - filter_store - Magento\Store\Ui\DataProvider\Options - - - Status - left - text - filter_select - Magento\Cms\Ui\DataProvider\Page\Options\IsActive - - - Created - left - date - filter_date - - - Modified - left - date - filter_date - - - Action - left - actions - false - false - - - - - - - - - - - Delete - cms/page/massDelete - - - - - - - - - - - store - Magento_Store/js/listing/filter/store - - - - - - - - - page_id - - - - - diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml index b8f4b086bbf15..7d154b524cdac 100644 --- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml +++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml @@ -376,6 +376,7 @@ Magento_Ui/js/grid/columns/sortable + ui/grid/cells/html false text left diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json index b455b7aa09e2b..2796f0badc61a 100644 --- a/app/code/Magento/CmsUrlRewrite/composer.json +++ b/app/code/Magento/CmsUrlRewrite/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-cms": "0.74.0-beta10", - "magento/module-url-rewrite": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-cms": "0.74.0-beta11", + "magento/module-url-rewrite": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json index b09b7ab2e271c..c7deb8913204c 100644 --- a/app/code/Magento/Config/composer.json +++ b/app/code/Magento/Config/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-cron": "0.74.0-beta10", - "magento/module-email": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", + "magento/framework": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-cron": "0.74.0-beta11", + "magento/module-email": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json index 62ab074be9666..0e26c67930ce0 100644 --- a/app/code/Magento/ConfigurableImportExport/composer.json +++ b/app/code/Magento/ConfigurableImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-catalog-import-export": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-import-export": "0.74.0-beta10", - "magento/module-configurable-product": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-catalog-import-export": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-import-export": "0.74.0-beta11", + "magento/module-configurable-product": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index ef09882fbef5a..68679f3c1943f 100644 --- a/app/code/Magento/ConfigurableProduct/composer.json +++ b/app/code/Magento/ConfigurableProduct/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-msrp": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-catalog-rule": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-msrp": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-catalog-rule": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-webapi": "0.74.0-beta10" + "magento/module-webapi": "0.74.0-beta11" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json index 87e4a2b25ad98..d91e84ade98de 100644 --- a/app/code/Magento/Contact/composer.json +++ b/app/code/Magento/Contact/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-cms": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-cms": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json index eba14c7530fbf..91e406224ed81 100644 --- a/app/code/Magento/Cookie/composer.json +++ b/app/code/Magento/Cookie/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-backend": "0.74.0-beta10" + "magento/module-backend": "0.74.0-beta11" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json index 9e3e1e7a39296..95babbef256e0 100644 --- a/app/code/Magento/Cron/composer.json +++ b/app/code/Magento/Cron/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json index 1fc6c1ea5b3eb..159a89a2dc847 100644 --- a/app/code/Magento/CurrencySymbol/composer.json +++ b/app/code/Magento/CurrencySymbol/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-page-cache": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-page-cache": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php index 86f7dd3c2e12a..044dfb7524fc3 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php @@ -8,9 +8,22 @@ namespace Magento\Customer\Controller\Adminhtml\Customer; use Magento\Integration\Api\CustomerTokenServiceInterface; +use Magento\Customer\Api\AccountManagementInterface; +use Magento\Customer\Api\AddressRepositoryInterface; +use Magento\Customer\Api\CustomerRepositoryInterface; +use Magento\Customer\Api\Data\AddressInterfaceFactory; +use Magento\Customer\Api\Data\CustomerInterfaceFactory; +use Magento\Customer\Model\Address\Mapper; +use Magento\Framework\ObjectFactory; +use Magento\Framework\Api\DataObjectHelper; /** - * Class to invalidate tokens for customers + * Class to invalidate tokens for customers + * + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + * @SuppressWarnings(PHPMD.TooManyFields) + * @SuppressWarnings(PHPMD.NumberOfChildren) */ class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index { @@ -20,13 +33,91 @@ class InvalidateToken extends \Magento\Customer\Controller\Adminhtml\Index protected $tokenService; /** - * Inject dependencies. - * * @param CustomerTokenServiceInterface $tokenService + * @param \Magento\Backend\App\Action\Context $context + * @param \Magento\Framework\Registry $coreRegistry + * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory + * @param \Magento\Customer\Model\CustomerFactory $customerFactory + * @param \Magento\Customer\Model\AddressFactory $addressFactory + * @param \Magento\Customer\Model\Metadata\FormFactory $formFactory + * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory + * @param \Magento\Customer\Helper\View $viewHelper + * @param \Magento\Framework\Math\Random $random + * @param CustomerRepositoryInterface $customerRepository + * @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter + * @param Mapper $addressMapper + * @param AccountManagementInterface $customerAccountManagement + * @param AddressRepositoryInterface $addressRepository + * @param CustomerInterfaceFactory $customerDataFactory + * @param AddressInterfaceFactory $addressDataFactory + * @param \Magento\Customer\Model\Customer\Mapper $customerMapper + * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor + * @param DataObjectHelper $dataObjectHelper + * @param ObjectFactory $objectFactory + * @param \Magento\Framework\View\LayoutFactory $layoutFactory + * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory + * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory + * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory + * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory + * + * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ - public function __construct(CustomerTokenServiceInterface $tokenService) - { + public function __construct( + \Magento\Backend\App\Action\Context $context, + \Magento\Framework\Registry $coreRegistry, + \Magento\Framework\App\Response\Http\FileFactory $fileFactory, + \Magento\Customer\Model\CustomerFactory $customerFactory, + \Magento\Customer\Model\AddressFactory $addressFactory, + \Magento\Customer\Model\Metadata\FormFactory $formFactory, + \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory, + \Magento\Customer\Helper\View $viewHelper, + \Magento\Framework\Math\Random $random, + CustomerRepositoryInterface $customerRepository, + \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter, + Mapper $addressMapper, + AccountManagementInterface $customerAccountManagement, + AddressRepositoryInterface $addressRepository, + CustomerInterfaceFactory $customerDataFactory, + AddressInterfaceFactory $addressDataFactory, + \Magento\Customer\Model\Customer\Mapper $customerMapper, + \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor, + DataObjectHelper $dataObjectHelper, + ObjectFactory $objectFactory, + \Magento\Framework\View\LayoutFactory $layoutFactory, + \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory, + \Magento\Framework\View\Result\PageFactory $resultPageFactory, + \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory, + \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory, + CustomerTokenServiceInterface $tokenService + ) { $this->tokenService = $tokenService; + parent::__construct( + $context, + $coreRegistry, + $fileFactory, + $customerFactory, + $addressFactory, + $formFactory, + $subscriberFactory, + $viewHelper, + $random, + $customerRepository, + $extensibleDataObjectConverter, + $addressMapper, + $customerAccountManagement, + $addressRepository, + $customerDataFactory, + $addressDataFactory, + $customerMapper, + $dataObjectProcessor, + $dataObjectHelper, + $objectFactory, + $layoutFactory, + $resultLayoutFactory, + $resultPageFactory, + $resultForwardFactory, + $resultJsonFactory + ); } /** diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php index b701d653dc030..35439a7e3cf9e 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php @@ -19,7 +19,7 @@ class Validate extends \Magento\Customer\Controller\Adminhtml\Index protected function _validateCustomer($response) { $customer = null; - $errors = null; + $errors = []; try { /** @var CustomerInterface $customer */ @@ -48,7 +48,7 @@ protected function _validateCustomer($response) $data, '\Magento\Customer\Api\Data\CustomerInterface' ); - $errors = $this->customerAccountManagement->validate($customer); + $errors = $this->customerAccountManagement->validate($customer)->getMessages(); } catch (\Magento\Framework\Validator\Exception $exception) { /* @var $error Error */ foreach ($exception->getMessages(\Magento\Framework\Message\MessageInterface::TYPE_ERROR) as $error) { @@ -56,10 +56,12 @@ protected function _validateCustomer($response) } } - if (!$errors->isValid()) { - foreach ($errors->getMessages() as $error) { - $this->messageManager->addError($error); + if ($errors) { + $messages = $response->hasMessages() ? $response->getMessages() : []; + foreach ($errors as $error) { + $messages[] = $error; } + $response->setMessages($messages); $response->setError(1); } @@ -90,9 +92,11 @@ protected function _validateCustomerAddress($response) $errors = $addressForm->validateData($formData); if ($errors !== true) { + $messages = $response->hasMessages() ? $response->getMessages() : []; foreach ($errors as $error) { - $this->messageManager->addError($error); + $messages[] = $error; } + $response->setMessages($messages); $response->setError(1); } } @@ -114,9 +118,8 @@ public function execute() } $resultJson = $this->resultJsonFactory->create(); if ($response->getError()) { - $layout = $this->layoutFactory->create(); - $layout->initMessages(); - $response->setHtmlMessage($layout->getMessagesBlock()->getGroupedHtml()); + $response->setError(true); + $response->setMessages($response->getMessages()); } $resultJson->setData($response); diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php new file mode 100644 index 0000000000000..f4065cc205e81 --- /dev/null +++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php @@ -0,0 +1,276 @@ +customer = $this->getMockForAbstractClass( + 'Magento\Customer\Api\Data\CustomerInterface', + [], + '', + false, + true, + true + ); + $this->customer->expects($this->once())->method('getWebsiteId')->willReturn(2); + $this->customerDataFactory = $this->getMock( + 'Magento\Customer\Api\Data\CustomerInterfaceFactory', + ['create'], + [], + '', + false + ); + $this->customerDataFactory->expects($this->once())->method('create')->willReturn($this->customer); + $this->form = $this->getMock( + 'Magento\Customer\Model\Metadata\Form', + [], + [], + '', + false + ); + $this->request = $this->getMockForAbstractClass( + 'Magento\Framework\App\RequestInterface', + [], + '', + false, + true, + true, + ['getPost'] + ); + $this->response = $this->getMockForAbstractClass( + 'Magento\Framework\App\ResponseInterface', + [], + '', + false + ); + $this->formFactory = $this->getMock('Magento\Customer\Model\Metadata\FormFactory', ['create'], [], '', false); + $this->formFactory->expects($this->atLeastOnce())->method('create')->willReturn($this->form); + $this->extensibleDataObjectConverter = $this->getMock( + 'Magento\Framework\Api\ExtensibleDataObjectConverter', + [], + [], + '', + false + ); + $this->dataObjectHelper = $this->getMock('Magento\Framework\Api\DataObjectHelper', [], [], '', false); + $this->dataObjectHelper->expects($this->once())->method('populateWithArray'); + $this->customerAccountManagement = $this->getMockForAbstractClass( + 'Magento\Customer\Api\AccountManagementInterface', + [], + '', + false, + true, + true + ); + $this->resultJson = $this->getMock('Magento\Framework\Controller\Result\Json', [], [], '', false); + $this->resultJson->expects($this->once())->method('setData'); + $this->resultJsonFactory = $this->getMock( + 'Magento\Framework\Controller\Result\JsonFactory', + ['create'], + [], + '', + false + ); + $this->resultJsonFactory->expects($this->once())->method('create')->willReturn($this->resultJson); + + $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); + $this->controller = $objectHelper->getObject( + 'Magento\Customer\Controller\Adminhtml\Index\Validate', + [ + 'request' => $this->request, + 'response' => $this->response, + 'customerDataFactory' => $this->customerDataFactory, + 'formFactory' => $this->formFactory, + 'extensibleDataObjectConverter' => $this->extensibleDataObjectConverter, + 'customerAccountManagement' => $this->customerAccountManagement, + 'resultJsonFactory' => $this->resultJsonFactory, + 'dataObjectHelper' => $this->dataObjectHelper, + ] + ); + } + + public function testExecute() + { + $this->request->expects($this->once()) + ->method('getPost') + ->willReturn([ + '_template_' => null, + 'address_index' => null + ]); + + $this->form->expects($this->once())->method('setInvisibleIgnored'); + $this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]); + + $error = $this->getMock('Magento\Framework\Message\Error', [], [], '', false); + $this->form->expects($this->once()) + ->method('validateData') + ->willReturn([$error]); + + $this->extensibleDataObjectConverter->expects($this->once()) + ->method('toFlatArray') + ->willReturn([]); + + $validationResult = $this->getMockForAbstractClass( + 'Magento\Customer\Api\Data\ValidationResultsInterface', + [], + '', + false, + true, + true + ); + $validationResult->expects($this->once()) + ->method('getMessages') + ->willReturn(['Error message']); + + $this->customerAccountManagement->expects($this->once()) + ->method('validate') + ->willReturn($validationResult); + + $this->controller->execute(); + } + + public function testExecuteWithoutAddresses() + { + $this->request->expects($this->once()) + ->method('getPost') + ->willReturn(null); + $this->form->expects($this->once()) + ->method('setInvisibleIgnored'); + $this->form->expects($this->atLeastOnce()) + ->method('extractData') + ->willReturn([]); + + $error = $this->getMock('Magento\Framework\Message\Error', [], [], '', false); + $this->form->expects($this->never()) + ->method('validateData') + ->willReturn([$error]); + + $this->extensibleDataObjectConverter->expects($this->once()) + ->method('toFlatArray') + ->willReturn([]); + + $validationResult = $this->getMockForAbstractClass( + 'Magento\Customer\Api\Data\ValidationResultsInterface', + [], + '', + false, + true, + true + ); + $validationResult->expects($this->once()) + ->method('getMessages') + ->willReturn(['Error message']); + + $this->customerAccountManagement->expects($this->once()) + ->method('validate') + ->willReturn($validationResult); + + $this->controller->execute(); + } + + public function testExecuteWithException() + { + $this->request->expects($this->once()) + ->method('getPost') + ->willReturn(null); + $this->form->expects($this->once()) + ->method('setInvisibleIgnored'); + $this->form->expects($this->atLeastOnce()) + ->method('extractData') + ->willReturn([]); + + $this->form->expects($this->never()) + ->method('validateData'); + + $this->extensibleDataObjectConverter->expects($this->once()) + ->method('toFlatArray') + ->willReturn([]); + + $validationResult = $this->getMockForAbstractClass( + 'Magento\Customer\Api\Data\ValidationResultsInterface', + [], + '', + false, + true, + true + ); + $error = $this->getMock('Magento\Framework\Message\Error', [], [], '', false); + $error->expects($this->once()) + ->method('getText') + ->willReturn('Error text'); + + $exception = $this->getMock('Magento\Framework\Validator\Exception', [], [], '', false); + $exception->expects($this->once()) + ->method('getMessages') + ->willReturn([$error]); + $validationResult->expects($this->once()) + ->method('getMessages') + ->willThrowException($exception); + + $this->customerAccountManagement->expects($this->once()) + ->method('validate') + ->willReturn($validationResult); + + $this->controller->execute(); + } +} diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json index 204791f628792..3d4bcaff41c7a 100644 --- a/app/code/Magento/Customer/composer.json +++ b/app/code/Magento/Customer/composer.json @@ -3,33 +3,33 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-newsletter": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-wishlist": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-review": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/module-page-cache": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", - "magento/module-authorization": "0.74.0-beta10", - "magento/module-integration": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/module-ui": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-newsletter": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-wishlist": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-review": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/module-page-cache": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", + "magento/module-authorization": "0.74.0-beta11", + "magento/module-integration": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/module-ui": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.74.0-beta10" + "magento/module-cookie": "0.74.0-beta11" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json index 2f897331fc7b6..450c7f38eb42a 100644 --- a/app/code/Magento/CustomerImportExport/composer.json +++ b/app/code/Magento/CustomerImportExport/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-import-export": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-import-export": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json index 1a8de8c3cdee2..f71feb4dc42d7 100644 --- a/app/code/Magento/DesignEditor/composer.json +++ b/app/code/Magento/DesignEditor/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-translation": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-translation": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json index 9046c5e1965f0..cfb7ec9bb5bc3 100644 --- a/app/code/Magento/Developer/composer.json +++ b/app/code/Magento/Developer/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json index 0a23310309470..669e3bb00acf3 100644 --- a/app/code/Magento/Dhl/composer.json +++ b/app/code/Magento/Dhl/composer.json @@ -3,22 +3,22 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-shipping": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-shipping": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json index c53d2d669e8b4..67ecd0f8ad703 100644 --- a/app/code/Magento/Directory/composer.json +++ b/app/code/Magento/Directory/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json index 16adcb3869b6b..885adac58def9 100644 --- a/app/code/Magento/Downloadable/composer.json +++ b/app/code/Magento/Downloadable/composer.json @@ -3,28 +3,28 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-wishlist": "0.74.0-beta10", - "magento/module-gift-message": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-msrp": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-wishlist": "0.74.0-beta11", + "magento/module-gift-message": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-msrp": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json index 429f9dbfb31e0..beb25eea2be2f 100644 --- a/app/code/Magento/Eav/composer.json +++ b/app/code/Magento/Eav/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json index feb023fbf3630..09372575b5c83 100644 --- a/app/code/Magento/Email/composer.json +++ b/app/code/Magento/Email/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-cms": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-variable": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-cms": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-variable": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json index eab709fc7018f..e74e13897d205 100644 --- a/app/code/Magento/Fedex/composer.json +++ b/app/code/Magento/Fedex/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-shipping": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-shipping": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json index da5aef1129cbc..77f37ba0ff15a 100644 --- a/app/code/Magento/GiftMessage/composer.json +++ b/app/code/Magento/GiftMessage/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-multishipping": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-multishipping": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json index 96d5d7fc9e756..1b9604a1c7ee1 100644 --- a/app/code/Magento/GoogleAdwords/composer.json +++ b/app/code/Magento/GoogleAdwords/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json index 5e10a5dfec28e..885f3f2fba0a2 100644 --- a/app/code/Magento/GoogleAnalytics/composer.json +++ b/app/code/Magento/GoogleAnalytics/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", - "magento/module-cookie": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", + "magento/module-cookie": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json index fd1e99507fd5f..a65d295e1332d 100644 --- a/app/code/Magento/GoogleOptimizer/composer.json +++ b/app/code/Magento/GoogleOptimizer/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-google-analytics": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-cms": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-google-analytics": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-cms": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json index 281e361b1d92a..523d9bcc471f3 100644 --- a/app/code/Magento/GoogleShopping/composer.json +++ b/app/code/Magento/GoogleShopping/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json index 87c869bbc8215..7367f56837d49 100644 --- a/app/code/Magento/GroupedImportExport/composer.json +++ b/app/code/Magento/GroupedImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-import-export": "0.74.0-beta10", - "magento/module-catalog-import-export": "0.74.0-beta10", - "magento/module-grouped-product": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-import-export": "0.74.0-beta11", + "magento/module-catalog-import-export": "0.74.0-beta11", + "magento/module-grouped-product": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json index 897075edb8c31..9d68c4d1b92b5 100644 --- a/app/code/Magento/GroupedProduct/composer.json +++ b/app/code/Magento/GroupedProduct/composer.json @@ -3,22 +3,22 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/module-msrp": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/module-msrp": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index 794c392453794..950bf8059675c 100644 --- a/app/code/Magento/ImportExport/composer.json +++ b/app/code/Magento/ImportExport/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-indexer": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-indexer": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index 55cd74ff041cf..7cd1080c31432 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-page-cache": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-page-cache": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index 8d6d9ba3d6454..603652fc0c2bc 100644 --- a/app/code/Magento/Integration/composer.json +++ b/app/code/Magento/Integration/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-user": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", - "magento/module-authorization": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-user": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", + "magento/module-authorization": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index f61ca72c1657c..99f2a20e4e5af 100644 --- a/app/code/Magento/LayeredNavigation/composer.json +++ b/app/code/Magento/LayeredNavigation/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json index 5e8b4ac8119e0..dd443c93d7a80 100644 --- a/app/code/Magento/Log/composer.json +++ b/app/code/Magento/Log/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json index 4a4ffe77dcaa7..e334eb6bad070 100644 --- a/app/code/Magento/MediaStorage/composer.json +++ b/app/code/Magento/MediaStorage/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index 88350cabe0722..eef207ca98943 100644 --- a/app/code/Magento/Msrp/composer.json +++ b/app/code/Magento/Msrp/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-bundle": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-downloadable": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-grouped-product": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-bundle": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-downloadable": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-grouped-product": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index a2580b07eccef..bab62579a6cfa 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-payment": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-payment": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json index e4284220e9e68..10ca035af0854 100644 --- a/app/code/Magento/Newsletter/composer.json +++ b/app/code/Magento/Newsletter/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-widget": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-cms": "0.74.0-beta10", - "magento/module-email": "0.74.0-beta10", - "magento/module-cron": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-require-js": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-widget": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-cms": "0.74.0-beta11", + "magento/module-email": "0.74.0-beta11", + "magento/module-cron": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-require-js": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json index 63562f6f49931..65f21b44ee3f7 100644 --- a/app/code/Magento/OfflinePayments/composer.json +++ b/app/code/Magento/OfflinePayments/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-payment": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-payment": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json index 0d80d78d0d461..0807e7204dec8 100644 --- a/app/code/Magento/OfflineShipping/composer.json +++ b/app/code/Magento/OfflineShipping/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-shipping": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-sales-rule": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-shipping": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-sales-rule": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json index 17e81a593a01b..e87ef00a74a50 100644 --- a/app/code/Magento/PageCache/composer.json +++ b/app/code/Magento/PageCache/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json index e935e442304bd..027fd65073de7 100644 --- a/app/code/Magento/Payment/composer.json +++ b/app/code/Magento/Payment/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json index 3a01e0892a206..e2d1886a9380f 100644 --- a/app/code/Magento/Persistent/composer.json +++ b/app/code/Magento/Persistent/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-cron": "0.74.0-beta10", - "magento/module-page-cache": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-cron": "0.74.0-beta11", + "magento/module-page-cache": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json index 0dc14f2fe1071..76b833314ba37 100644 --- a/app/code/Magento/ProductAlert/composer.json +++ b/app/code/Magento/ProductAlert/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json index a37e6d0f991c8..0bc179a189f8d 100644 --- a/app/code/Magento/Quote/composer.json +++ b/app/code/Magento/Quote/composer.json @@ -3,26 +3,26 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-catalog-rule": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-authorization": "0.74.0-beta10", - "magento/module-payment": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-shipping": "0.74.0-beta10", - "magento/module-sales-sequence": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-catalog-rule": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-authorization": "0.74.0-beta11", + "magento/module-payment": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-shipping": "0.74.0-beta11", + "magento/module-sales-sequence": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json index 4b4db815f19c2..eb7f5031f65c0 100644 --- a/app/code/Magento/Reports/composer.json +++ b/app/code/Magento/Reports/composer.json @@ -3,28 +3,28 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta10", - "magento/module-store": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-sales": "0.74.0-beta10", - "magento/module-cms": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-widget": "0.74.0-beta10", - "magento/module-log": "0.74.0-beta10", - "magento/module-wishlist": "0.74.0-beta10", - "magento/module-review": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/module-downloadable": "0.74.0-beta10", - "magento/module-sales-rule": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-config": "0.74.0-beta11", + "magento/module-store": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-sales": "0.74.0-beta11", + "magento/module-cms": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-widget": "0.74.0-beta11", + "magento/module-log": "0.74.0-beta11", + "magento/module-wishlist": "0.74.0-beta11", + "magento/module-review": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/module-downloadable": "0.74.0-beta11", + "magento/module-sales-rule": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json index 74929a83bfdd0..631f931f08154 100644 --- a/app/code/Magento/RequireJs/composer.json +++ b/app/code/Magento/RequireJs/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta10", + "magento/framework": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json index 74196584566fc..6cf24184b523b 100644 --- a/app/code/Magento/Review/composer.json +++ b/app/code/Magento/Review/composer.json @@ -3,22 +3,22 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-newsletter": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", - "magento/module-ui": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-newsletter": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", + "magento/module-ui": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.74.0-beta10" + "magento/module-cookie": "0.74.0-beta11" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json index a5f8afae24a0c..56a8badd30416 100644 --- a/app/code/Magento/Rss/composer.json +++ b/app/code/Magento/Rss/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json index 9b391372d65b2..209f3f3fec531 100644 --- a/app/code/Magento/Rule/composer.json +++ b/app/code/Magento/Rule/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json index 5595f059c8477..9e16e143a504d 100644 --- a/app/code/Magento/Sales/composer.json +++ b/app/code/Magento/Sales/composer.json @@ -3,35 +3,35 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta10", - "magento/module-catalog": "0.74.0-beta10", - "magento/module-customer": "0.74.0-beta10", - "magento/module-authorization": "0.74.0-beta10", - "magento/module-payment": "0.74.0-beta10", - "magento/module-checkout": "0.74.0-beta10", - "magento/module-theme": "0.74.0-beta10", - "magento/module-sales-rule": "0.74.0-beta10", - "magento/module-sales-sequence": "0.74.0-beta10", - "magento/module-backend": "0.74.0-beta10", - "magento/module-widget": "0.74.0-beta10", - "magento/module-directory": "0.74.0-beta10", - "magento/module-eav": "0.74.0-beta10", - "magento/module-tax": "0.74.0-beta10", - "magento/module-gift-message": "0.74.0-beta10", - "magento/module-reports": "0.74.0-beta10", - "magento/module-catalog-inventory": "0.74.0-beta10", - "magento/module-wishlist": "0.74.0-beta10", - "magento/module-email": "0.74.0-beta10", - "magento/module-shipping": "0.74.0-beta10", - "magento/module-config": "0.74.0-beta10", - "magento/module-media-storage": "0.74.0-beta10", - "magento/framework": "0.74.0-beta10", - "magento/module-ui": "0.74.0-beta10", - "magento/module-quote": "0.74.0-beta10", + "magento/module-store": "0.74.0-beta11", + "magento/module-catalog": "0.74.0-beta11", + "magento/module-customer": "0.74.0-beta11", + "magento/module-authorization": "0.74.0-beta11", + "magento/module-payment": "0.74.0-beta11", + "magento/module-checkout": "0.74.0-beta11", + "magento/module-theme": "0.74.0-beta11", + "magento/module-sales-rule": "0.74.0-beta11", + "magento/module-sales-sequence": "0.74.0-beta11", + "magento/module-backend": "0.74.0-beta11", + "magento/module-widget": "0.74.0-beta11", + "magento/module-directory": "0.74.0-beta11", + "magento/module-eav": "0.74.0-beta11", + "magento/module-tax": "0.74.0-beta11", + "magento/module-gift-message": "0.74.0-beta11", + "magento/module-reports": "0.74.0-beta11", + "magento/module-catalog-inventory": "0.74.0-beta11", + "magento/module-wishlist": "0.74.0-beta11", + "magento/module-email": "0.74.0-beta11", + "magento/module-shipping": "0.74.0-beta11", + "magento/module-config": "0.74.0-beta11", + "magento/module-media-storage": "0.74.0-beta11", + "magento/framework": "0.74.0-beta11", + "magento/module-ui": "0.74.0-beta11", + "magento/module-quote": "0.74.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta10", + "version": "0.74.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml index fff76e569226d..0253050d8f3b0 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml @@ -132,7 +132,7 @@