Merge branch 'develop' into MAGETWO-33528

Michael Logvin · Michael Logvin · commit 1e931d868547 · 2015-04-30T16:51:00.000+03:00
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
@@ -1037,7 +1037,7 @@ public function validate()
         $transport = new \Magento\Framework\Object(
             ['errors' => $errors]
         );
-        $this->_eventManager->dispatch('customer_validate' , ['customer' => $this, 'transport' => $transport]);
+        $this->_eventManager->dispatch('customer_validate', ['customer' => $this, 'transport' => $transport]);
         $errors = $transport->getErrors();
 
         if (empty($errors)) {
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
@@ -957,7 +957,10 @@ public function setState(
             ]
         );
 
-        $this->_eventManager->dispatch('sales_order_state_change_before', array('order' => $this, 'transport' => $transport));
+        $this->_eventManager->dispatch(
+            'sales_order_state_change_before',
+            ['order' => $this, 'transport' => $transport]
+        );
         $status = $transport->getStatus();
         $this->setData('state', $transport->getState());
 
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
@@ -84,7 +84,8 @@ public function send(Creditmemo $creditmemo, $notify = true, $comment = '')
         );
 
         $this->eventManager->dispatch(
-            'email_creditmemo_comment_set_template_vars_before', array('sender' => $this, 'transport' => $transport)
+            'email_creditmemo_comment_set_template_vars_before',
+            ['sender' => $this, 'transport' => $transport]
         );
 
         $this->templateContainer->setTemplateVars($transport->getTemplateVars());
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -128,16 +128,15 @@ public function send(Creditmemo $creditmemo, $forceSyncMode = false)
             );
 
             $this->eventManager->dispatch(
-                'email_creditmemo_set_template_vars_before', array('sender' => $this, 'transport' => $transport)
+                'email_creditmemo_set_template_vars_before',
+                ['sender' => $this, 'transport' => $transport]
             );
 
             $this->templateContainer->setTemplateVars($transport->getTemplateVars());
 
             if ($this->checkAndSend($order)) {
                 $creditmemo->setEmailSent(true);
-
                 $this->creditmemoResource->saveAttribute($creditmemo, ['send_email', 'email_sent']);
-
                 return true;
             }
         }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
@@ -84,7 +84,8 @@ public function send(Invoice $invoice, $notify = true, $comment = '')
         );
 
         $this->eventManager->dispatch(
-            'email_invoice_comment_set_template_vars_before', array('sender' => $this, 'transport' => $transport)
+            'email_invoice_comment_set_template_vars_before',
+            ['sender' => $this, 'transport' => $transport]
         );
 
         $this->templateContainer->setTemplateVars($transport->getTemplateVars());
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -127,16 +127,15 @@ public function send(Invoice $invoice, $forceSyncMode = false)
             );
 
             $this->eventManager->dispatch(
-                'email_invoice_set_template_vars_before', array('sender' => $this, 'transport' => $transport)
+                'email_invoice_set_template_vars_before',
+                ['sender' => $this, 'transport' => $transport]
             );
 
             $this->templateContainer->setTemplateVars($transport->getTemplateVars());
 
             if ($this->checkAndSend($order)) {
                 $invoice->setEmailSent(true);
-
                 $this->invoiceResource->saveAttribute($invoice, ['send_email', 'email_sent']);
-
                 return true;
             }
         }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
@@ -81,7 +81,8 @@ public function send(Order $order, $notify = true, $comment = '')
         );
 
         $this->eventManager->dispatch(
-            'email_order_comment_set_template_vars_before', array('sender' => $this, 'transport' => $transport)
+            'email_order_comment_set_template_vars_before',
+            ['sender' => $this, 'transport' => $transport]
         );
 
         $this->templateContainer->setTemplateVars($transport->getTemplateVars());
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
@@ -16,6 +16,7 @@
 
 /**
  * Class OrderSender
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class OrderSender extends Sender
 {
@@ -100,9 +101,7 @@ public function send(Order $order, $forceSyncMode = false)
         if (!$this->globalConfig->getValue('sales_email/general/async_sending') || $forceSyncMode) {
             if ($this->checkAndSend($order)) {
                 $order->setEmailSent(true);
-
                 $this->orderResource->saveAttribute($order, ['send_email', 'email_sent']);
-
                 return true;
             }
         }
@@ -134,7 +133,8 @@ protected function prepareTemplate(Order $order)
         );
 
         $this->eventManager->dispatch(
-            'email_order_set_template_vars_before', array('sender' => $this, 'transport' => $transport)
+            'email_order_set_template_vars_before',
+            ['sender' => $this, 'transport' => $transport]
         );
 
         $this->templateContainer->setTemplateVars($transport->getTemplateVars());
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
@@ -84,7 +84,8 @@ public function send(Shipment $shipment, $notify = true, $comment = '')
         );
 
         $this->eventManager->dispatch(
-            'email_shipment_comment_set_template_vars_before', array('sender' => $this, 'transport' => $transport)
+            'email_shipment_comment_set_template_vars_before',
+            ['sender' => $this, 'transport' => $transport]
         );
 
         $this->templateContainer->setTemplateVars($transport->getTemplateVars());
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -17,7 +17,7 @@
 
 /**
  * Class ShipmentSender
- * 
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ShipmentSender extends Sender
@@ -128,16 +128,15 @@ public function send(Shipment $shipment, $forceSyncMode = false)
             );
 
             $this->eventManager->dispatch(
-                'email_shipment_set_template_vars_before', array('sender' => $this, 'transport' => $transport)
+                'email_shipment_set_template_vars_before',
+                ['sender' => $this, 'transport' => $transport]
             );
 
             $this->templateContainer->setTemplateVars($transport->getTemplateVars());
 
             if ($this->checkAndSend($order)) {
                 $shipment->setEmailSent(true);
-
                 $this->shipmentResource->saveAttribute($shipment, ['send_email', 'email_sent']);
-
                 return true;
             }
         }
diff --git a/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml b/dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <!--
 /**
  * Copyright © 2015 Magento. All rights reserved.
diff --git a/dev/tests/integration/testsuite/Magento/ToolkitFramework/_files/small.xml b/dev/tests/integration/testsuite/Magento/ToolkitFramework/_files/small.xml
@@ -61,7 +61,7 @@
                 <value>0</value>
             </config>
             <config>
-                <path>system/full_page_cache/varnish/access_lis</path>
+                <path>system/full_page_cache/varnish/access_list</path>
                 <scope>default</scope>
                 <scopeId>0</scopeId>
                 <value>localhost</value>
diff --git a/dev/tools/performance-toolkit/fixtures/cart_price_rules.php b/dev/tools/performance-toolkit/fixtures/cart_price_rules.php
@@ -20,7 +20,10 @@ class CartPriceRulesFixture extends \Magento\ToolkitFramework\Fixture
     public function execute()
     {
         $this->application->resetObjectManager();
-        $cartPriceRulesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('cart_price_rules', 9);
+        $cartPriceRulesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('cart_price_rules', 0);
+        if (!$cartPriceRulesCount) {
+            return;
+        }
         $cartPriceRulesProductsFloor = \Magento\ToolkitFramework\Config::getInstance()->getValue(
             'cart_price_rules_floor',
             3
diff --git a/dev/tools/performance-toolkit/fixtures/catalog_price_rules.php b/dev/tools/performance-toolkit/fixtures/catalog_price_rules.php
@@ -19,7 +19,10 @@ class CatalogPriceRulesFixture extends \Magento\ToolkitFramework\Fixture
      */
     public function execute()
     {
-        $catalogPriceRulesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('catalog_price_rules', 3);
+        $catalogPriceRulesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('catalog_price_rules', 0);
+        if (!$catalogPriceRulesCount) {
+            return;
+        }
         $this->application->resetObjectManager();
 
         /** @var \Magento\Store\Model\StoreManager $storeManager */
diff --git a/dev/tools/performance-toolkit/fixtures/categories.php b/dev/tools/performance-toolkit/fixtures/categories.php
@@ -19,7 +19,10 @@ class CategoriesFixture extends \Magento\ToolkitFramework\Fixture
      */
     public function execute()
     {
-        $categoriesNumber = \Magento\ToolkitFramework\Config::getInstance()->getValue('categories', 18);
+        $categoriesNumber = \Magento\ToolkitFramework\Config::getInstance()->getValue('categories', 0);
+        if (!$categoriesNumber) {
+            return;
+        }
         $maxNestingLevel = \Magento\ToolkitFramework\Config::getInstance()->getValue('categories_nesting_level', 3);
         $this->application->resetObjectManager();
 
diff --git a/dev/tools/performance-toolkit/fixtures/configs_apply.php b/dev/tools/performance-toolkit/fixtures/configs_apply.php
@@ -20,6 +20,9 @@ class ConfigsApplyFixture extends \Magento\ToolkitFramework\Fixture
     public function execute()
     {
         $configs = \Magento\ToolkitFramework\Config::getInstance()->getValue('configs', array());
+        if (empty($configs)) {
+            return;
+        }
         $this->application->resetObjectManager();
 
         foreach ($configs['config'] as $config) {
diff --git a/dev/tools/performance-toolkit/fixtures/configurable_products.php b/dev/tools/performance-toolkit/fixtures/configurable_products.php
@@ -820,7 +820,10 @@ protected function getRows($productCategory, $productRootCategory, $productWebsi
      */
     public function execute()
     {
-        $configurablesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('configurable_products', 90);
+        $configurablesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('configurable_products', 0);
+        if (!$configurablesCount) {
+            return;
+        }
         $this->application->resetObjectManager();
 
         /** @var \Magento\Store\Model\StoreManager $storeManager */
diff --git a/dev/tools/performance-toolkit/fixtures/customers.php b/dev/tools/performance-toolkit/fixtures/customers.php
@@ -19,7 +19,10 @@ class CustomersFixture extends \Magento\ToolkitFramework\Fixture
      */
     public function execute()
     {
-        $customersNumber = \Magento\ToolkitFramework\Config::getInstance()->getValue('customers', 10);
+        $customersNumber = \Magento\ToolkitFramework\Config::getInstance()->getValue('customers', 0);
+        if (!$customersNumber) {
+            return;
+        }
         $this->application->resetObjectManager();
 
         /** @var \Magento\Store\Model\StoreManager $storeManager */
diff --git a/dev/tools/performance-toolkit/fixtures/eav_variations.php b/dev/tools/performance-toolkit/fixtures/eav_variations.php
@@ -21,6 +21,10 @@ class EavVariationsFixture extends \Magento\ToolkitFramework\Fixture
      */
     public function execute()
     {
+        $configurablesCount = \Magento\ToolkitFramework\Config::getInstance()->getValue('configurable_products', 0);
+        if (!$configurablesCount) {
+            return;
+        }
         $this->application->resetObjectManager();
 
         /* @var $model \Magento\Catalog\Model\Resource\Eav\Attribute */
diff --git a/dev/tools/performance-toolkit/fixtures/orders.php b/dev/tools/performance-toolkit/fixtures/orders.php
diff --git a/dev/tools/performance-toolkit/fixtures/simple_products.php b/dev/tools/performance-toolkit/fixtures/simple_products.php
diff --git a/dev/tools/performance-toolkit/fixtures/stores.php b/dev/tools/performance-toolkit/fixtures/stores.php
diff --git a/dev/tools/performance-toolkit/fixtures/tax_rates.php b/dev/tools/performance-toolkit/fixtures/tax_rates.php
diff --git a/dev/tools/performance-toolkit/profiles/ce/extra_large.xml b/dev/tools/performance-toolkit/profiles/ce/extra_large.xml
diff --git a/dev/tools/performance-toolkit/profiles/ce/large.xml b/dev/tools/performance-toolkit/profiles/ce/large.xml
diff --git a/dev/tools/performance-toolkit/profiles/ce/medium.xml b/dev/tools/performance-toolkit/profiles/ce/medium.xml
diff --git a/dev/tools/performance-toolkit/profiles/ce/small.xml b/dev/tools/performance-toolkit/profiles/ce/small.xml
