From 685a0aa83c4559aebc0d33aefd55d614c9fa5e96 Mon Sep 17 00:00:00 2001
From: Paul Lewis <plewis@ebay.com>
Date: Tue, 11 Nov 2014 17:01:41 -0600
Subject: [PATCH 001/474] MAGETWO-29546: DbStatusValidator does not provide
 enough information to perform successful update of the system

 - Updated error message per content writer
 - Updated tests to look for new message
---
 .../Framework/Module/Plugin/DbStatusValidatorTest.php        | 5 ++++-
 .../Framework/Module/Plugin/DbStatusValidatorTest.php        | 3 ++-
 .../Magento/Framework/Module/Plugin/DbStatusValidator.php    | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index d1fa16bc05607..844ac196370b3 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -35,7 +35,10 @@ public function testValidationOutdatedDb()
                 /* This triggers plugin to be executed */
                 $this->dispatch('index/index');
             } catch (\Magento\Framework\Module\Exception $e) {
-                if ($e->getMessage() != 'Looks like database is outdated. Please, use setup tool to perform update') {
+                if ($e->getMessage() != 'Please update your database: first run "composer install" from the Magento ' .
+                    'root/ and root/setup directories. Then run "php –f index.php update" from the Magento ' .
+                    'root/setup directory.'
+                ) {
                     $failureMessage = "DB status validation doesn't work properly. Caught exception message is '"
                         . $e->getMessage() ."'";
                 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index 026f2a1d8991c..e672738884ea5 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -122,7 +122,8 @@ public function testAroundDispatchCached()
      *
      * @dataProvider aroundDispatchExceptionDataProvider
      * @expectedException \Magento\Framework\Module\Exception
-     * @expectedExceptionMessage Looks like database is outdated. Please, use setup tool to perform update
+     * @expectedExceptionMessage Please update your database: first run "composer install" from the Magento
+     * root/ and root/setup directories. Then run "php –f index.php update" from the Magento root/setup directory.
      */
     public function testAroundDispatchException(array $schemaValueMap, array $dataValueMap)
     {
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index 07b5ea4003599..a13026e64d6b3 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -68,7 +68,8 @@ public function aroundDispatch(
         if (!$this->cache->load('db_is_up_to_date')) {
             if (!$this->isDbUpToDate()) {
                 throw new \Magento\Framework\Module\Exception(
-                    'Looks like database is outdated. Please, use setup tool to perform update'
+                    'Please update your database: first run "composer install" from the Magento root/ and root/setup '.
+                    'directories. Then run "php –f index.php update" from the Magento root/setup directory.'
                 );
             } else {
                 $this->cache->save('true', 'db_is_up_to_date');

From 983c7c4771882b997b02a130cab8ba5a1b975726 Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Wed, 19 Nov 2014 14:03:02 -0600
Subject: [PATCH 002/474] MAGETWO-30738: UI installer "detect IP address"
 doesn't work

- adding pre-popoulated value to store address
---
 .../Setup/src/Controller/WebConfigurationController.php  | 2 +-
 .../Setup/view/magento/setup/web-configuration.phtml     | 9 ++++-----
 setup/pub/magento/setup/web-configuration.js             | 1 -
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php b/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
index cbe1f30b3cea5..11923ffccc388 100644
--- a/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
+++ b/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
@@ -31,7 +31,7 @@ public function __construct(ViewModel $view)
     public function indexAction()
     {
         $this->view->setTerminal(true);
-
+        $this->view->setVariable('baseUrl', str_replace("setup/","", $_SERVER['HTTP_REFERER']));
         return $this->view;
     }
 }
diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index a343baaed8be6..4f82e6f65b091 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -9,10 +9,9 @@
 <?php
 $hints = [
     'address_web' => sprintf(
-        '<div><p>%s</p><p>%s</p><p><a href=\'#\'>%s</a></p></div>',
+        '<div><p>%s</p><p>%s</p></div>',
         'Enter the base URL that brings shoppers to your store (Ex. http://example.com/).',
-        'We recommend not using your actual IP address when your store goes live, otherwise all your shoppers will see it.',
-        'Detect IP Address'
+        'We recommend not using your actual IP address when your store goes live, otherwise all your shoppers will see it.'
     ),
     'encrypt_key' => sprintf(
         '<p>%s</p>',
@@ -20,7 +19,6 @@ $hints = [
     ),
 ];
 ?>
-
 <div class="step-controls">
     <a href="#" class="btn btn-primary" ng-click="previousState()">Previous</a>
     <a href="#" class="btn btn-primary" ng-click="nextState()">Next</a>
@@ -38,11 +36,12 @@ $hints = [
                    name="web"
                    ng-model="config.address.web"
                    class="form-control"
-                   ng-focus=""
+                   ng-init="config.address.web = '<?php echo $this->baseUrl?>'"
                    tooltip-placement="right"
                    tooltip-html-unsafe="<?php echo $hints['address_web']; ?>"
                    tooltip-trigger="focus"
                    tooltip-append-to-body="true"
+
                    required />
         </div>
         <div class="col-md-offset-3 col-md-4" ng-show="webconfig.web.$invalid && webconfig.submitted">
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index 5b75611ed0974..08e0043d5a73f 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -10,7 +10,6 @@ angular.module('web-configuration', ['ngStorage'])
     .controller('webConfigurationController', ['$scope', '$state', '$localStorage', function ($scope, $state, $localStorage) {
         $scope.config = {
             address: {
-                web: 'http://www.example.com/',
                 admin: 'admin'
             },
             https: {

From f4ba68223a8590777032c06fc236f1f8995dab18 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 19 Nov 2014 16:08:51 -0600
Subject: [PATCH 003/474] MAGETWO-30208: Fatal Error When Missed "composer
 install"

- Fixed the issue to show proper message.
---
 app/autoload.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/autoload.php b/app/autoload.php
index fcaf1d0f3a9e2..b14d0a6e7d6b4 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -15,9 +15,23 @@
 
 $vendorDir = require BP . '/app/etc/vendor_path.php';
 $vendorAutoload = BP . "/{$vendorDir}/autoload.php";
+
+/* 'composer install' validation */
 if (file_exists($vendorAutoload)) {
     require_once $vendorAutoload;
+} else {
+    echo <<<HTML
+<div style="font:12px/1.35em arial, helvetica, sans-serif;">
+    <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
+        <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
+        Whoops, it looks like Magento application dependencies are not installed.</h3>
+    </div>
+    <p>Please run 'composer install' under application root directory.</p>
+</div>
+HTML;
+    exit(1);
 }
+
 require_once BP . '/lib/internal/Magento/Framework/Autoload/IncludePath.php';
 $includePath = new \Magento\Framework\Autoload\IncludePath();
 $includePath->addIncludePath([BP . '/app/code', BP . '/lib/internal']);

From 458b12b111127bfa6e1876f0f8fc4edc84792b9c Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Wed, 19 Nov 2014 17:06:23 -0600
Subject: [PATCH 004/474] MAGETWO-30738: UI installer "detect IP address"
 doesn't work

- removed hardcoding and extra line.
---
 .../Setup/src/Controller/WebConfigurationController.php    | 7 ++++++-
 .../Setup/view/magento/setup/web-configuration.phtml       | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php b/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
index 11923ffccc388..0e465ae337f00 100644
--- a/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
+++ b/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
@@ -31,7 +31,12 @@ public function __construct(ViewModel $view)
     public function indexAction()
     {
         $this->view->setTerminal(true);
-        $this->view->setVariable('baseUrl', str_replace("setup/","", $_SERVER['HTTP_REFERER']));
+        $urlComponents = explode("/", $_SERVER['HTTP_REFERER']);
+        $baseUrl ='';
+        for ($i=0; $i<count($urlComponents) - 2; $i++) {
+            $baseUrl .= $urlComponents[$i] . '/';
+        }
+        $this->view->setVariable('baseUrl', $baseUrl);
         return $this->view;
     }
 }
diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 4f82e6f65b091..0dd95c58cad6d 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -41,7 +41,6 @@ $hints = [
                    tooltip-html-unsafe="<?php echo $hints['address_web']; ?>"
                    tooltip-trigger="focus"
                    tooltip-append-to-body="true"
-
                    required />
         </div>
         <div class="col-md-offset-3 col-md-4" ng-show="webconfig.web.$invalid && webconfig.submitted">

From 838249e455808d8fb4439ee3b46332bf326b85de Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 19 Nov 2014 17:16:04 -0600
Subject: [PATCH 005/474] MAGETWO-30208: Fatal Error When Missed "composer
 install"

- Fixed build failure issue.
---
 app/autoload.php | 13 -------------
 index.php        | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/autoload.php b/app/autoload.php
index b14d0a6e7d6b4..fbbe9ecedc8d4 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -15,21 +15,8 @@
 
 $vendorDir = require BP . '/app/etc/vendor_path.php';
 $vendorAutoload = BP . "/{$vendorDir}/autoload.php";
-
-/* 'composer install' validation */
 if (file_exists($vendorAutoload)) {
     require_once $vendorAutoload;
-} else {
-    echo <<<HTML
-<div style="font:12px/1.35em arial, helvetica, sans-serif;">
-    <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
-        <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
-        Whoops, it looks like Magento application dependencies are not installed.</h3>
-    </div>
-    <p>Please run 'composer install' under application root directory.</p>
-</div>
-HTML;
-    exit(1);
 }
 
 require_once BP . '/lib/internal/Magento/Framework/Autoload/IncludePath.php';
diff --git a/index.php b/index.php
index 25f17d20b1b8c..17170a448ffb0 100644
--- a/index.php
+++ b/index.php
@@ -20,6 +20,24 @@
  */
 
 require __DIR__ . '/app/bootstrap.php';
+
+$vendorDir = require __DIR__ . '/app/etc/vendor_path.php';
+$vendorAutoload = __DIR__ . "/{$vendorDir}/autoload.php";
+
+/* 'composer install' validation */
+if (!file_exists($vendorAutoload)) {
+    echo <<<HTML
+<div style="font:12px/1.35em arial, helvetica, sans-serif;">
+    <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
+        <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
+        Whoops, it looks like Magento application dependencies are not installed.</h3>
+    </div>
+    <p>Please run 'composer install' under application root directory.</p>
+</div>
+HTML;
+    exit(1);
+}
+
 $bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $_SERVER);
 /** @var \Magento\Framework\App\Http $app */
 $app = $bootstrap->createApplication('Magento\Framework\App\Http');

From 3da2b4e60f6a5782ff4262a7738e530eee00ef37 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 19 Nov 2014 17:35:22 -0600
Subject: [PATCH 006/474] MAGETWO-30208: Fatal Error When Missed "composer
 install"

- Format stuff.
---
 index.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 17170a448ffb0..e4516ad58d9fd 100644
--- a/index.php
+++ b/index.php
@@ -21,10 +21,9 @@
 
 require __DIR__ . '/app/bootstrap.php';
 
+/* 'composer install' validation */
 $vendorDir = require __DIR__ . '/app/etc/vendor_path.php';
 $vendorAutoload = __DIR__ . "/{$vendorDir}/autoload.php";
-
-/* 'composer install' validation */
 if (!file_exists($vendorAutoload)) {
     echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">

From bf9a961a65b5a78c72ce4edf3eb10fd60d18de0d Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Thu, 20 Nov 2014 10:59:50 -0600
Subject: [PATCH 007/474] MAGETWO-30499:
 \Magento\TestFramework\Workaround\Cleanup\StaticProperties::clearStaticVariables
 resets default value of static properties to "null"

- changed 'null' to default values
---
 .../Workaround/Cleanup/StaticProperties.php              | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index 0ef3238f8c9ed..58760e208eea9 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -82,14 +82,15 @@ public static function clearStaticVariables()
         $classes = get_declared_classes();
 
         foreach ($classes as $class) {
-            $reflectionCLass = new \ReflectionClass($class);
-            if (self::_isClassCleanable($reflectionCLass)) {
-                $staticProperties = $reflectionCLass->getProperties(\ReflectionProperty::IS_STATIC);
+            $reflectionClass = new \ReflectionClass($class);
+            if (self::_isClassCleanable($reflectionClass)) {
+                $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
+                $defaultProperties = $reflectionClass->getDefaultProperties();
                 foreach ($staticProperties as $staticProperty) {
                     $staticProperty->setAccessible(true);
                     $value = $staticProperty->getValue();
                     if (is_object($value) || is_array($value) && is_object(current($value))) {
-                        $staticProperty->setValue(null);
+                        $staticProperty->setValue($defaultProperties[$staticProperty->getName()]);
                     }
                     unset($value);
                 }

From be8de8599bbb3e6cdd41b5cd37a3ef8717396981 Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Thu, 20 Nov 2014 14:56:55 -0600
Subject: [PATCH 008/474] MAGETWO-30738: UI installer "detect IP address"
 doesn't work

- adding docblock and phpcs fixes.
---
 .../Setup/src/Controller/WebConfigurationController.php   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php b/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
index 0e465ae337f00..0bc604895a51d 100644
--- a/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
+++ b/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
@@ -13,11 +13,15 @@
 class WebConfigurationController extends AbstractActionController
 {
     /**
+     * View model
+     *
      * @var \Zend\View\Model\ViewModel
      */
     protected $view;
 
     /**
+     * Constructor
+     *
      * @param ViewModel $view
      */
     public function __construct(ViewModel $view)
@@ -26,6 +30,8 @@ public function __construct(ViewModel $view)
     }
 
     /**
+     * Displays web configuration with default values.
+     * 
      * @return array|ViewModel
      */
     public function indexAction()
@@ -33,7 +39,7 @@ public function indexAction()
         $this->view->setTerminal(true);
         $urlComponents = explode("/", $_SERVER['HTTP_REFERER']);
         $baseUrl ='';
-        for ($i=0; $i<count($urlComponents) - 2; $i++) {
+        for ($i = 0; $i < count($urlComponents) - 2; $i++) {
             $baseUrl .= $urlComponents[$i] . '/';
         }
         $this->view->setVariable('baseUrl', $baseUrl);

From 21a24e66b0e3e16cbf5dc510062d8b46f6fc1e74 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 20 Nov 2014 15:26:20 -0600
Subject: [PATCH 009/474] MAGETWO-30208: Fatal Error When Missed "composer
 install"

- Fixing builds. And adding the validation in autoload.php
---
 app/autoload.php            | 13 +++++++++++++
 dev/build/core_dev/util.xml |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/autoload.php b/app/autoload.php
index fbbe9ecedc8d4..b14d0a6e7d6b4 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -15,8 +15,21 @@
 
 $vendorDir = require BP . '/app/etc/vendor_path.php';
 $vendorAutoload = BP . "/{$vendorDir}/autoload.php";
+
+/* 'composer install' validation */
 if (file_exists($vendorAutoload)) {
     require_once $vendorAutoload;
+} else {
+    echo <<<HTML
+<div style="font:12px/1.35em arial, helvetica, sans-serif;">
+    <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
+        <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
+        Whoops, it looks like Magento application dependencies are not installed.</h3>
+    </div>
+    <p>Please run 'composer install' under application root directory.</p>
+</div>
+HTML;
+    exit(1);
 }
 
 require_once BP . '/lib/internal/Magento/Framework/Autoload/IncludePath.php';
diff --git a/dev/build/core_dev/util.xml b/dev/build/core_dev/util.xml
index c653b4306a385..6f2d5e1aea13c 100644
--- a/dev/build/core_dev/util.xml
+++ b/dev/build/core_dev/util.xml
@@ -75,7 +75,7 @@
                 "/>
         </exec>
     </target>
-    <target name="_product_edition" description="Product edition source code preparation">
+    <target name="_product_edition" depends="_composer_install" description="Product edition source code preparation">
         <antcall>
             <target name="_product_edition_files"/>
             <target name="_license_replacement"/>

From e749d0ef0286ed2672fb8e8dcb7d9b578bf1fe12 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 20 Nov 2014 15:37:07 -0600
Subject: [PATCH 010/474] MAGETWO-30208: Fatal Error When Missed "composer
 install"

- Fixing builds.
---
 dev/build/core_dev/util.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/build/core_dev/util.xml b/dev/build/core_dev/util.xml
index 6f2d5e1aea13c..d9e0fa82e6b67 100644
--- a/dev/build/core_dev/util.xml
+++ b/dev/build/core_dev/util.xml
@@ -53,7 +53,7 @@
         </exec>
     </target>
 
-    <target name="_product_edition_files_no_internal" depends="_product_location"
+    <target name="_product_edition_files_no_internal" depends="_product_location,_composer_install"
             description="Removal of files, which do not belong to a product edition, including internal files">
         <fail unless="product_edition_code" message="Property 'product_edition_code' must be defined"/>
         <exec executable="php" failonerror="true">

From e04e3674f9c3cfc841205cb193a2e4b8dbd555af Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 20 Nov 2014 18:14:11 -0600
Subject: [PATCH 011/474] MAGETWO-30208: Fatal Error When Missed "composer
 install"

- Code style error fix.
---
 app/autoload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/autoload.php b/app/autoload.php
index f202d97da37cf..1965804ad83e2 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -20,7 +20,7 @@
 
 /* 'composer install' validation */
 if (file_exists($vendorAutoload)) {
-    $composerAutoloader = include $vendorAutoload;    
+    $composerAutoloader = include $vendorAutoload;
 } else {
     echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">

From ed6e9379fe2a5da583bc1a6c93507e154d15e9f5 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Fri, 21 Nov 2014 10:59:22 -0600
Subject: [PATCH 012/474] MAGETWO-30208: Fatal Error When Missed "composer
 install"

- Changes based on code review feedback.
---
 app/autoload.php | 13 +++----------
 index.php        |  9 +++------
 pub/index.php    | 16 +++++++++++++++-
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/app/autoload.php b/app/autoload.php
index 1965804ad83e2..d8f606fe521df 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -22,16 +22,9 @@
 if (file_exists($vendorAutoload)) {
     $composerAutoloader = include $vendorAutoload;
 } else {
-    echo <<<HTML
-<div style="font:12px/1.35em arial, helvetica, sans-serif;">
-    <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
-        <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
-        Whoops, it looks like Magento application dependencies are not installed.</h3>
-    </div>
-    <p>Please run 'composer install' under application root directory.</p>
-</div>
-HTML;
-    exit(1);
+    throw new \Exception(
+        'Vendor autoload is not found. Please run \'composer install\' under application root directory.'
+    );
 }
 
 AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
diff --git a/index.php b/index.php
index e4516ad58d9fd..05ffb98356302 100644
--- a/index.php
+++ b/index.php
@@ -19,12 +19,9 @@
  * @license    {license_link}
  */
 
-require __DIR__ . '/app/bootstrap.php';
-
-/* 'composer install' validation */
-$vendorDir = require __DIR__ . '/app/etc/vendor_path.php';
-$vendorAutoload = __DIR__ . "/{$vendorDir}/autoload.php";
-if (!file_exists($vendorAutoload)) {
+try{
+    require __DIR__ . '/app/bootstrap.php';
+} catch(\Exception $e) {
     echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
     <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
diff --git a/pub/index.php b/pub/index.php
index c2f3fc761a8f2..f0c6517d026ad 100644
--- a/pub/index.php
+++ b/pub/index.php
@@ -11,7 +11,21 @@
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-require __DIR__ . '/../app/bootstrap.php';
+try{
+    require __DIR__ . '/../app/bootstrap.php';
+} catch(\Exception $e) {
+    echo <<<HTML
+<div style="font:12px/1.35em arial, helvetica, sans-serif;">
+    <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
+        <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
+        Whoops, it looks like Magento application dependencies are not installed.</h3>
+    </div>
+    <p>Please run 'composer install' under application root directory.</p>
+</div>
+HTML;
+    exit(1);
+}
+
 $params = $_SERVER;
 $params[Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS] = [
     DirectoryList::PUB => [DirectoryList::URL_PATH => ''],

From 08ed0e7004a5424dc29d8415b1c42e67b84ef37d Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Fri, 21 Nov 2014 12:06:04 -0600
Subject: [PATCH 013/474] MAGETWO-30952: Deactivated Legacy/FilesystemTest.php

- re-enabled and fixed the test
- fixed discovered issues with obsolete files
---
 .../checkout/review/button.continue.phtml     |   0
 .../checkout/review/cancel.phtml              |   0
 .../checkout/review/onepage.success.phtml     |   0
 .../frontend/Magento/plushe/composer.json     |  20 --------
 .../frontend/Magento/plushe/media/preview.jpg | Bin 12683 -> 0 bytes
 app/design/frontend/Magento/plushe/theme.xml  |  16 -------
 composer.json                                 |   1 -
 dev/build/publication/edition/no-edition.txt  |   2 -
 .../Magento/Test/Legacy/FilesystemTest.php    |  45 +++++++++---------
 9 files changed, 23 insertions(+), 61 deletions(-)
 rename app/code/Magento/Pbridge/view/frontend/{ => templates}/checkout/review/button.continue.phtml (100%)
 rename app/code/Magento/Pbridge/view/frontend/{ => templates}/checkout/review/cancel.phtml (100%)
 rename app/code/Magento/Pbridge/view/frontend/{ => templates}/checkout/review/onepage.success.phtml (100%)
 delete mode 100644 app/design/frontend/Magento/plushe/composer.json
 delete mode 100644 app/design/frontend/Magento/plushe/media/preview.jpg
 delete mode 100644 app/design/frontend/Magento/plushe/theme.xml

diff --git a/app/code/Magento/Pbridge/view/frontend/checkout/review/button.continue.phtml b/app/code/Magento/Pbridge/view/frontend/templates/checkout/review/button.continue.phtml
similarity index 100%
rename from app/code/Magento/Pbridge/view/frontend/checkout/review/button.continue.phtml
rename to app/code/Magento/Pbridge/view/frontend/templates/checkout/review/button.continue.phtml
diff --git a/app/code/Magento/Pbridge/view/frontend/checkout/review/cancel.phtml b/app/code/Magento/Pbridge/view/frontend/templates/checkout/review/cancel.phtml
similarity index 100%
rename from app/code/Magento/Pbridge/view/frontend/checkout/review/cancel.phtml
rename to app/code/Magento/Pbridge/view/frontend/templates/checkout/review/cancel.phtml
diff --git a/app/code/Magento/Pbridge/view/frontend/checkout/review/onepage.success.phtml b/app/code/Magento/Pbridge/view/frontend/templates/checkout/review/onepage.success.phtml
similarity index 100%
rename from app/code/Magento/Pbridge/view/frontend/checkout/review/onepage.success.phtml
rename to app/code/Magento/Pbridge/view/frontend/templates/checkout/review/onepage.success.phtml
diff --git a/app/design/frontend/Magento/plushe/composer.json b/app/design/frontend/Magento/plushe/composer.json
deleted file mode 100644
index 0d2af0efb65bc..0000000000000
--- a/app/design/frontend/Magento/plushe/composer.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "name": "magento/theme-frontend-plushe",
-    "description": "N/A",
-    "require": {
-        "php": "~5.4.11|~5.5.0",
-        "magento/theme-frontend-blank": "0.1.0-alpha104",
-        "magento/framework": "0.1.0-alpha104",
-        "magento/magento-composer-installer": "*"
-    },
-    "type": "magento2-theme",
-    "version": "0.1.0-alpha104",
-    "extra": {
-        "map": [
-            [
-                "*",
-                "frontend/Magento/plushe"
-            ]
-        ]
-    }
-}
diff --git a/app/design/frontend/Magento/plushe/media/preview.jpg b/app/design/frontend/Magento/plushe/media/preview.jpg
deleted file mode 100644
index 9352afc4f89f9809871da30012d82deff873a126..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12683
zcmeHLc~n!^x<6rbKoJ>4LCJ-R1(`xf!jOQJ0JSSfkwieDmV^WmNH7VIpe3l+CxSw8
zU@XCfeL;hUqCyBmK}E#^a%q}E2%sQ?AcKG+2$FXKYPHwrQ`<k@U5k&!$v%63!*Bo2
z_wBRKmbc2g0DX5>7zF^fZZ!v%0Dp*l2++btlfu~m1W*CH(EuRtQl{-;GNT-=t*H#F
z;1C*-Y(=6)TC;+qtYKC*)&Sat6%|YhCo`c$a%dP8V?0_>Z43<y!5I4?yllLp+{k;v
zzKo-jedD&_NpayMhY({IXDFKG$cl`LBr}7dtjGu|!;ytCo_FpDwiVsh#?W~cW;n*!
zRS^~H@AWm*jYcO!5mq*qBpaj+6bZ9}!R=5elm*n*24-VzV`~kwwS=J@;kJ%8Hqe)1
z3`V1eP#m{oJzmBF?=Z$MClwnTYZVK(qR~UGVGa%s3Lmz%mY{|ugH2@yvn;6$lUE+F
zWCn>I7R3ysQK1Tt!9-d#6Jrb_U6?{-l$Y0Q$M0k-GEy<Gd2I%BJNXY7@6=}C*->Qc
z?PLZmnoc5v>L#y@LGIokNTCR#arCB#fe$4(0!t%BN0O<`tyqjPIARqN7UF0FvvqKD
z{ld-N-3{puhrt|dQ1)0GTL&Z@;fk`i_ju*wUAFEB511X&73Ss&!@^+ha93L_{0kV|
z1_5_PIoNnOyt3U&WiW%OB=W1cVPM>swl?pzb#$YXgPAlso<@s!l>uMxp)qNUJ+vsO
zn=cajxnCGHgci#%Q#_u9*<#7`uo!ZP2b~rPo#)pv>>cs32nP_Tn>`Ff|L%D&*oJ%x
zXVxGXYejOrku0yezzkG0U#C8J^SXG*RIp;`U}?xlfR*zJ4}{c!B?ytrfPVsNDk>_f
zDr%~#YD?9?|K&^6)RrvQShj5WvSk{pH0EWM#!AgqnkzN5wRLo~wG9mn3=EB43q)OA
zeTBvf{Z*^<*Xe5Mu6sT3p$&NrptVF93jRT~03|JmvKB;M3xMmyOL@J9sHv(bLzI@x
zcfambG$2aKs~`YG8KMkMK~*un(5a%P<*ND**uG+0`eki|&%tY}8FtOaUtEU=Zzr0#
z9r8V_qovS%OXO{UhB5@ip{xbC0CU;&h_{9pZx$I?WMGkj|7->zr)m)!^ekr6<-om|
zP3hU8<F~!G4AykF2K*)mcvTsww!)L=pV6Kv|MWM_Q(cdvcjH>Yi;`hcxddI}-8HIm
zTkFAeR?ePd;}PDo1Kfbr@!b0jT9es)-g$mj_TCi#%%05esgH+!;yUZuX{bGY6C~k!
z=VpAS)PEY;-J6_7KX%WcoD_xG@^?UF_4JY+?8?a)aWBVQsm@0oVk8bGx5UV9q?)JD
zZ1*#ohtzZl1cEQY7ePQ@f!Eub+y?;7z=(^-!_(+D?+62FCtkoRb$)Qd2Z%0rhOh|}
z>|!Z5@7qgldwF~!pJL8q6G`c&kSBi`toko}UJ`}RGvhf>F65>G*Sa0^8>>nmKWHq<
zY2-FAJsxih=?w{K&&ha{bLQ@JN3+2{*$Y93YPzMF2oA5R^jTYBde$@QGo^D!_syak
zPZONIrsY7c?;ZFYymCk8U&UD8jpk@-M(Q->#=E$~?`Y3$UwV9Qb5^e3Orew(&1ajX
z#>fFyip{Gy>)KI16yi|+=*-Zq!GZ}-_uYy70~<CT&GBp`R+V_}Z67DBw^@1imHMar
zLh5sCA3r`nUDR^<!jLRwXF)#1x;9#mvZKwClix6x9Xf&I>^yiH`iF0q9V3ClKtJk*
z{Bkyt9~x4Fnu@s~$W5O(*H@5pm*>EFYVhLv`HLX|)l{nhft3$h;_Kx4@DKZsZJ|ed
z0*a~BZv>XjhEMTJ?{4IW7e-coK5f>QBk{B@M=7iI{xaf+Xy=Cu1Ofceh`Q7|MF?ft
z8tqNy{TamemK`sCXcjvi^t|z;6jL@mv8hqO>BlwrZkS{1*4JLGlI^DkduMr~+X_q8
zYgg(cnuBz`5Mn!t;VIm$I|q&C@os3%64_^<>(`hj32zMyoVd^HYRlU&SI_p*qsjr!
z!@Qauzu|D$+Tmk;nd<-g*eNdPL&hn_rj!^gy`c_fpHgu9N@?e3?vJYPJvSLs`TZN}
zwxA~47k31gn$gW*>ar3PM$XOd(GndWoP-dVhVzhqPm3D1jH$|iht{9tTKcwev)av5
zjn>`5lnIH6LM$~k5wk^o184b-#sc!7i_3t>d!vtHy%A4m=7i^?A89=wNbye{Par4G
zBXTO^tZlrOnH+s!QV13Xrt=!X&?zODGQ=|<ALWb}=E(tg<vQrR?#Eu>WvPbOugh>v
zS^MR{8T43ZZcRqFVJOOxVnrC=*|C@V)pv8vh6}zC_Az-4_0phyJ*{~yczOfp__Fgg
zT`U%U=!$3m3qSK-{&)8uDFCbu^z;ty9Tv2+*YrR2HA)YC{_D~MBWtscd{h4<K47Rl
zWoKxo$?18heQHfBe-ru7SoTC#hsrQz&qkjm@oqHLHV7wLMY^15w8Rsqe0E;-qb};s
zlz7wi)!Y|#1vCmb4lE~FZM4-64;gDFA|Q86#?9&&QL|4__*5=ZKGH{#Ty8Wv>EvhL
z!^7M!=qlf@sZEYGX{t8jpYJ&~cRES35M8~m{Byyv{Bk1SyeFH2tUaurI1nB^EIQ({
zF>sC$l=U#T=7;K3&W0XY6;>udeVIDHhNzE79+gtv>j{mz;zk1eva8#T5^qH1Lpd<X
zL*sAP5L63G1+wIHe$vCjY_N2cCl{i9_*Em<wRYSlV%Ip*J(fc1=LY3qzF%q}6m*JE
zRxOAYKMY};RBLM9UmWSd?mCg)P%~<CZu6L`(aK+ce<)=j<KslL{QWSo(@mO>yN)lI
z%)VY|Fq!KT;uBusVD$z+AnzI<l_d>y2)T}%qD;$DGV89C_I=j)h$F?6&AJ|i*)`PO
zx|6c?SpTYdD`xPRMy2E2{xzn#RebgUH&gXzHLn2sm?DXmm!FvoW+-!KzH<Mezg&qN
zxOt+pkPoqif;O60#R!})4%aY_^|VJ$#bj3RCpU<4kaA%9HkAXxmzA+vOJ^(ex|3pu
z`ng%1n%}+=$Pn#zxGU5{c6wGA8&q(zh;w!Itmi>WS7c#m4$<Y&wvi`PwWtJzf#^Q>
z%!&4?q>(qQKcor46v}~QgDO9~QpgqnP)l8TKR{HmS=#HL_nct(qP5ff+|kF!E%ar3
z^Rh=~O6Zc2N#(M)9jm#l7PGRPsQyyolNpn7Zyfk$B%zM>cD0P}7TOIDwHRJ)!Y1~E
zMygFJPcBmXYyG0$_V9n+EgjxH>)$b0epcHU09JHZ9!ZX`Xrb*&KC^Q={>#F26KY3i
z7h%i18~ceV!G;wsBSn!Mo?@$15nE}LqFGzmtw-(TC+3@p?8G?wc*L>ZJeE@p0EG1K
z8;mMDDhHb4PLxtI3;PR7w4GvUYAMd!oW06K#4-_fG&S|74QCb3HE+sx2%3>2V%=sx
z48o&T#YO*i$%)#cfD$9ia*DIROh{=X#y&}W0De<5u3<JCh{kl=6^0)nO8foffF3GN
za9*V@0Z=;SIY}?y1HLM2Kp*Pq9y^>7B2j#q5KGHDdR6;?Cq772+Nr~4GQ6b2-dHNQ
z&5{K95*UhY7Jj^;F6q+7$u;p8r^0l>ho<C)fBxflj&VI}Go@^Oq2fK&v0I!SM`9&y
zGvHeUNolsmlDjlpCvEYNZiN?Kf+OH+#pq&K{c6p#V0fiXU&r0@^m1OJ$T_9{LvcG$
zjPA{U$_7yH{h~5iG-pA58uazjG%zDfQ-^w)%`-=Q5&&SDfEVK=_?vdOEx>9~UVdzE
zGO|>5Be8;!)4;7|?sr9<%1Ap!r|uS^HqTWm-fwJRS=GBHsNW3?b<OTVsTDo-EA5;i
z(8VrC%XAH$QiCZG`Jum5yG-!e{j;I0ONs>$JE-YjH&Ad5xC<@{fsehvx;1jZJ@);R
z`1jGb%l^ma7e5HHU84A40PUUS!*wEJI{`)w%gRQM<A(16xnL;5fb~xmPeX5fd8q~f
zR<A3Nm<)(pptr%1odb`AR#An7K*c7;r}To%$(XGg2F5)0+lJyavG*a!5757><RM$n
z%{T<v#dqPq1%QoDW7|p3HeJ+L0{(Yqf#sHn0pyHi>c<`D0boh4>!Y>n?WUk>uLHnx
z?$QDOj;2JxeGu%&h<01`RB?qQdW$I*0CciluAC8jj_7)TIk(&IyIU^wxN8Ye04V%*
zcW~@r(|@JyN&tY*5Z-)Gae=@!1su67{^k^|YIl<RUT|cQrA3w&a|w9AELPn6`B@lU
zWNDG5zv~^hHjs1VUQ;pcPUiG5uBjfKhrBnqbouYr{vzb4kDZ_46N!OJ{NMZbbBtn9
zDUlq@BxG$&A@?g1&o%Pk3H#QVi(b3!WCbA-!$ajC@_gUafpldYNzS0v*9moR4cuG5
zdMVe0M~{dUCBx%eCg;i&r=EI5BE=MmW7H&=*>OTQ^HST*j{|_p&w`ob@jXuu16u%y
z-;Y0EAC=^-FcyNozucRLPc85cJZuP#ka<<6_u{H`6yLNE?eiFt2`^7Y+1_*HW^&7j
zdxf1>bQ8kv*1vqfGYl^$t5EMo^qd#`jvTl!tNQgWA+<xxy_}e2){_)=A`N))Ch!kz
z-|t4RS&lU24@_HAE4)9Od2u$q8?B96M&VzWuo$WEM*WOZ_FLGL*PH_(S{MHOz(|Do
zw&uM%x`42vt-{Wto5m$uzzyfvRMrCrEv-^YnAB)0f%$kCeu_hGxR9e)EqvMpez54Y
zX8M<<&sOf=ho$9Ch@sCu5c}I|2QrVHI0bIqH6jcH!!tG)V|V3LII~hBi-p-J#^JMn
zdLl(NQyuzRgq*7feh)9~%N`iU4kh;8Gd#o}8;=Otm7Kmg`SiA_sl&ek`})Ul=yk}>
zqKPI-2l#<irZwxGNXR>b>PyT=y4#5jE7OM43=;sr;%du}vQfY8w4Goqhle#c3rs7|
z3$^3>8cUiiZq-Te4E3pR0X|vY+8Ki9c<@cD`?H8W&EPqnSZr|3>qdz)VlW<8m2OoV
zQ;nTd64|F;;9n~JiPT$=O(PgqPoL;~?A;O+4IV(?B|(8#@OPzYietRDGVqhpDIC3-
z8ZRBGre{CN`EGD_`)2%KaSeV7s_S&=&wi0P-M6O#8<AhuA(R<hGpn_CrfLj}yc@%#
z+t^{xW>ogQj?&uIMzh{Tt_Kg8@*?8d4^MQC5$rS5_gVN78*o0}NU6*zl<PY5TL04;
znrD1<u{V86H=QK14<4;$-b|KJiMRk!Q*RTI19<fY_jI>|Cp6jS9m4FmO{`R~Xh2zC
z>2kQQf18XsTPo}*Jee1JRTu4aFgQ2@Jm!dZd9-6>h^m|aX@K6e(zG}pzE-cVW6-!)
zyWG{GmRa%(vi*7<m&-2k+v~WAWfPuXZl1lF7bf6t<&i>aQWF3GQyeu;7qDY28>4B`
z#`W+rok}MhNh)Pn5uY{<rPRh7mv$RxCMHU??r0g-JbyFXr?!<(IUVWh6JLI6#C1ZM
z_3$zGGrD)~higa1JZLI5;%D|I&Rsoh;o0`NpgcdxEW5Dqq*<cOcE#NK{}%XN?u(c`
zJu!`+Ea1g1J6D`a+R(o13U*gMY76F5;r!W-JhsB+aE4!#R!>J(uOP99o2kA{Q{%?<
zbL1o!yGen!rSGV^|DTN(?-v<ZWMGkjMFtibSY%+4fkg%u8CYask%9l047kXp{{xHD
B9I*fZ

diff --git a/app/design/frontend/Magento/plushe/theme.xml b/app/design/frontend/Magento/plushe/theme.xml
deleted file mode 100644
index 2498f3712e2a0..0000000000000
--- a/app/design/frontend/Magento/plushe/theme.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
--->
-<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
-    <title>Magento Plushe</title>
-    <version>0.1.0-alpha104</version>
-    <parent>Magento/blank</parent>
-    <media>
-        <preview_image>media/preview.jpg</preview_image>
-    </media>
-</theme>
diff --git a/composer.json b/composer.json
index 1ef93665b3673..4e49bde977b9f 100644
--- a/composer.json
+++ b/composer.json
@@ -135,7 +135,6 @@
         "magento/theme-adminhtml-backend": "self.version",
         "magento/theme-frontend-blank": "self.version",
         "magento/theme-frontend-luma": "self.version",
-        "magento/theme-frontend-plushe": "self.version",
         "magento/language-de_de": "self.version",
         "magento/language-en_us": "self.version",
         "magento/language-es_es": "self.version",
diff --git a/dev/build/publication/edition/no-edition.txt b/dev/build/publication/edition/no-edition.txt
index 5d81d21c9f1dd..a5231b0972258 100644
--- a/dev/build/publication/edition/no-edition.txt
+++ b/dev/build/publication/edition/no-edition.txt
@@ -5,8 +5,6 @@ dev/build/core_dev/performance/benchmark
 
 dev/tests/api-functional
 
-dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
-
 dev/tests/performance/testsuite/benchmark
 dev/tests/performance/testsuite/fixtures/benchmark
 dev/tests/performance/apply_fixture.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
index 0eb23eb4aee21..599a0cf5bbebd 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
@@ -84,33 +84,33 @@ public function testObsoleteDirectories()
 
     public function testObsoleteViewPaths()
     {
+        $allowedFiles = ['requirejs-config.js', 'layouts.xml'];
+        $allowedThemeFiles = array_merge($allowedFiles, ['composer.json', 'theme.xml']);
+        $areas = '{frontend,adminhtml,base}';
+        $ns = '*';
+        $mod = '*';
         $pathsToCheck = [
-            'app/code/*/*/view/frontend/*'  => [
-                'allowed_files' => ['requirejs-config.js'],
-                'allowed_dirs'  => ['layout', 'templates', 'web'],
+            "app/code/{$ns}/{$mod}/view/{$areas}/*" => [
+                'allowed_files' => $allowedFiles,
+                'allowed_dirs'  => ['layout', 'page_layout', 'templates', 'web'],
             ],
-            'app/code/*/*/view/adminhtml/*' => [
-                'allowed_files' => ['requirejs-config.js'],
-                'allowed_dirs'  => ['layout', 'templates', 'web'],
+            "app/design/{$areas}/{$ns}/{$mod}/*" => [
+                'allowed_files' => $allowedThemeFiles,
+                'allowed_dirs'  => ['layout', 'page_layout', 'templates', 'web', 'etc', 'i18n', 'media', '\w+_\w+'],
             ],
-            'app/code/*/*/view/base/*'      => [
-                'allowed_files' => ['requirejs-config.js'],
-                'allowed_dirs'  => ['layout', 'templates', 'web'],
-            ],
-            'app/design/*/*/*/*'            => [
-                'allowed_files' => ['requirejs-config.js', 'theme.xml'],
-                'allowed_dirs'  => ['layout', 'templates', 'web', 'etc', 'i18n', 'media', '\w+_\w+'],
-            ],
-            'app/design/*/*/*/*_*/*'        => [
-                'allowed_files' => ['requirejs-config.js'],
-                'allowed_dirs'  => ['layout', 'templates', 'web'],
+            "app/design/{$areas}/{$ns}/{$mod}/{$ns}_{$mod}/*" => [
+                'allowed_files' => $allowedThemeFiles,
+                'allowed_dirs'  => ['layout', 'page_layout', 'templates', 'web'],
             ],
         ];
         $errors = [];
         foreach ($pathsToCheck as $path => $allowed) {
             $allowedFiles = $allowed['allowed_files'];
             $allowedDirs = $allowed['allowed_dirs'];
-            $foundFiles = glob(BP . '/' . $path);
+            $foundFiles = glob(BP . '/' . $path, GLOB_BRACE);
+            if (!$foundFiles) {
+                $this->fail("Glob pattern returned empty result: {$path}");
+            }
             foreach ($foundFiles as $file) {
                 $baseName = basename($file);
                 if (is_dir($file)) {
@@ -123,13 +123,14 @@ public function testObsoleteViewPaths()
                 if (in_array($baseName, $allowedFiles)) {
                     continue;
                 }
-                $errors[] = "Wrong location of view file/dir: '$file'. "
-                    . "Please, put template files inside 'templates' sub-dir, "
-                    . "static view files inside 'web' sub-dir and layout updates inside 'layout' sub-dir";
+                $errors[] = $file;
             }
         }
         if (!empty($errors)) {
-            $this->fail(implode(PHP_EOL, $errors));
+            $this->fail(
+                'Unexpected files or directories found. Make sure they are not at obsolete locations:'
+                . PHP_EOL . implode(PHP_EOL, $errors)
+            );
         }
     }
 }

From f03ca3756c66a53a8e5fde67f70ffbd5218bff13 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Fri, 21 Nov 2014 18:21:28 -0600
Subject: [PATCH 014/474] MAGETWO-30852: Old encryption key did not saved after
 update

- persisting old encryption keys if exists
---
 .../Magento/Setup/src/Model/Installer.php      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 50ad1ce6db1a2..9823c6f6c5529 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -25,6 +25,7 @@
 use Magento\Framework\Filesystem\FilesystemException;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
+use Magento\Framework\App\DeploymentConfig as Config;
 use Magento\Framework\App\DeploymentConfig\BackendConfig;
 use Magento\Framework\App\DeploymentConfig\DbConfig;
 use Magento\Framework\App\DeploymentConfig\EncryptConfig;
@@ -329,8 +330,19 @@ private function createBackendConfig($data)
      */
     private function createEncryptConfig($data)
     {
+        $key = $data[ConfigMapper::KEY_ENCRYPTION_KEY];
+        // retrieve old encryption keys
+        $reader = new \Magento\Framework\App\DeploymentConfig\Reader($this->directoryList);
+        $deploymentConfig = new Config($reader);
+        if ($deploymentConfig->isAvailable()) {
+            $encryptInfo = $deploymentConfig->getSegment(EncryptConfig::CONFIG_KEY);
+            $oldKeys = $encryptInfo[EncryptConfig::KEY_ENCRYPTION_KEY];
+            $key = empty($key) ? $oldKeys : $oldKeys . "\n" . $key;
+        } else if (empty($key)) {
+            $key = md5($this->random->getRandomString(10));
+        }
         $cryptConfigData =
-            array(ConfigMapper::$paramMap[ConfigMapper::KEY_ENCRYPTION_KEY] => $data[ConfigMapper::KEY_ENCRYPTION_KEY]);
+            array(ConfigMapper::$paramMap[ConfigMapper::KEY_ENCRYPTION_KEY] => $key);
         return new EncryptConfig($cryptConfigData);
     }
 
@@ -477,9 +489,7 @@ public function checkApplicationFilePermissions()
     public function installDeploymentConfig($data)
     {
         $data[InstallConfig::KEY_DATE] = date('r');
-        if (empty($data[EncryptConfig::KEY_ENCRYPTION_KEY])) {
-            $data[EncryptConfig::KEY_ENCRYPTION_KEY] = md5($this->random->getRandomString(10));
-        }
+
         $this->installInfo[EncryptConfig::KEY_ENCRYPTION_KEY] = $data[EncryptConfig::KEY_ENCRYPTION_KEY];
 
         $configs = [

From 1ca61c5aeab66ad4ebe64874e62a60d2f400c4b0 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Sat, 22 Nov 2014 21:49:50 -0600
Subject: [PATCH 015/474] MAGETWO-30499:
 \Magento\TestFramework\Workaround\Cleanup\StaticProperties::clearStaticVariables
 resets default value of static properties to "null"

- implemented backup and restore static attributes
- fixed ExtededTestdox
---
 .../TestFramework/Listener/ExtededTestdox.php | 48 ++++++++---
 .../Workaround/Cleanup/StaticProperties.php   | 85 +++++++++++++++++--
 2 files changed, 114 insertions(+), 19 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Listener/ExtededTestdox.php b/dev/tests/integration/framework/Magento/TestFramework/Listener/ExtededTestdox.php
index 0da7d4791d499..b2cd7b2069d0d 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Listener/ExtededTestdox.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Listener/ExtededTestdox.php
@@ -49,6 +49,11 @@ class ExtededTestdox extends \PHPUnit_Util_Printer implements \PHPUnit_Framework
      */
     protected $incomplete = 0;
 
+    /**
+     * @var integer
+     */
+    protected $risky = 0;
+
     /**
      * @var string
      */
@@ -92,8 +97,8 @@ public function flush()
     /**
      * An error occurred.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception $e
+     * @param  \PHPUnit_Framework_Test $test
+     * @param  \Exception $e
      * @param  float $time
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -108,12 +113,12 @@ public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time)
     /**
      * A failure occurred.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  PHPUnit_Framework_AssertionFailedError $e
+     * @param  \PHPUnit_Framework_Test $test
+     * @param  \PHPUnit_Framework_AssertionFailedError $e
      * @param  float $time
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function addFailure(\PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
+    public function addFailure(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_AssertionFailedError $e, $time)
     {
         if ($test instanceof $this->testTypeOfInterest) {
             $this->testStatus = \PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE;
@@ -124,8 +129,8 @@ public function addFailure(\PHPUnit_Framework_Test $test, PHPUnit_Framework_Asse
     /**
      * Incomplete test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception $e
+     * @param  \PHPUnit_Framework_Test $test
+     * @param  \Exception $e
      * @param  float $time
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -140,8 +145,8 @@ public function addIncompleteTest(\PHPUnit_Framework_Test $test, \Exception $e,
     /**
      * Skipped test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception $e
+     * @param  \PHPUnit_Framework_Test $test
+     * @param  \Exception $e
      * @param  float $time
      * @since  Method available since Release 3.0.0
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -154,10 +159,27 @@ public function addSkippedTest(\PHPUnit_Framework_Test $test, \Exception $e, $ti
         }
     }
 
+    /**
+     * Risky test.
+     *
+     * @param  \PHPUnit_Framework_Test $test
+     * @param  \Exception $e
+     * @param  float $time
+     * @since  Method available since Release 4.0.0
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    {
+        if ($test instanceof $this->testTypeOfInterest) {
+            $this->testStatus = \PHPUnit_Runner_BaseTestRunner::STATUS_RISKY;
+            $this->risky++;
+        }
+    }
+
     /**
      * A testsuite started.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param  \PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -168,7 +190,7 @@ public function startTestSuite(\PHPUnit_Framework_TestSuite $suite)
     /**
      * A testsuite ended.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param  \PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -179,7 +201,7 @@ public function endTestSuite(\PHPUnit_Framework_TestSuite $suite)
     /**
      * A test started.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param  \PHPUnit_Framework_Test $test
      */
     public function startTest(\PHPUnit_Framework_Test $test)
     {
@@ -207,7 +229,7 @@ public function startTest(\PHPUnit_Framework_Test $test)
     /**
      * A test ended.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param  \PHPUnit_Framework_Test $test
      * @param  float $time
      */
     public function endTest(\PHPUnit_Framework_Test $test, $time)
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index 58760e208eea9..a3bebc02c6310 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -18,7 +18,9 @@ class StaticProperties
      *
      * @var array
      */
-    protected static $_cleanableFolders = array('/app/code/', '/dev/tests/', '/lib/internal/');
+    protected static $_cleanableFolders = array('/app/code/', '/dev/tests/integration/framework', '/lib/internal/');
+
+    protected static $backupStaticVariables = array();
 
     /**
      * Classes to exclude from static variables cleaning
@@ -32,6 +34,7 @@ class StaticProperties
         'Magento\TestFramework\Event\Magento',
         'Magento\TestFramework\Event\PhpUnit',
         'Magento\TestFramework\Annotation\AppIsolation',
+        'Magento\TestFramework\Workaround\Cleanup\StaticProperties',
         'Magento\Framework\Phrase'
     );
 
@@ -74,10 +77,29 @@ protected static function _isClassCleanable(\ReflectionClass $reflectionClass)
     }
 
     /**
-     * Clear static variables (after running controller test case)
+     * Check if class has to be backed up
+     *
+     * @param string $classFile
+     * @return bool
+     */
+    protected static function _isClassBackupable($classFile)
+    {
+        $classFile = str_replace('\\', '/', $classFile);
+        foreach (self::$_cleanableFolders as $directory) {
+            if (stripos($classFile, $directory) !== false) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+
+    /**
+     * Restore static variables (after running controller test case)
      * @TODO: refactor all code where objects are stored to static variables to use object manager instead
      */
-    public static function clearStaticVariables()
+    public static function restoreStaticVariables()
     {
         $classes = get_declared_classes();
 
@@ -85,12 +107,11 @@ public static function clearStaticVariables()
             $reflectionClass = new \ReflectionClass($class);
             if (self::_isClassCleanable($reflectionClass)) {
                 $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
-                $defaultProperties = $reflectionClass->getDefaultProperties();
                 foreach ($staticProperties as $staticProperty) {
                     $staticProperty->setAccessible(true);
                     $value = $staticProperty->getValue();
                     if (is_object($value) || is_array($value) && is_object(current($value))) {
-                        $staticProperty->setValue($defaultProperties[$staticProperty->getName()]);
+                        $staticProperty->setValue(self::$backupStaticVariables[$class][$staticProperty->getName()]);
                     }
                     unset($value);
                 }
@@ -98,6 +119,58 @@ public static function clearStaticVariables()
         }
     }
 
+    /**
+     * Backup static variables
+     *
+     */
+    public static function backupStaticVariables()
+    {
+        $classFiles = \Magento\Framework\Test\Utility\Files::init()->getClassFiles(true, true, false, true, false);
+        $namespacePattern = '/namespace [a-zA-Z0-9\\\\]+;/';
+        $classPattern = '/\nclass [a-zA-Z0-9_]+/';
+        foreach ($classFiles as $classFile) {
+            if (self::_isClassBackupable($classFile) !== true) {
+                continue;
+            }
+            $file = @fopen($classFile, 'r');
+            $code = fread($file, '4096');
+            preg_match($namespacePattern, $code, $namespace);
+            preg_match($classPattern, $code, $class);
+            if (!isset($namespace[0]) || !isset($class[0])) {
+                fclose($file);
+                continue;
+            }
+            $namespace = substr($namespace[0], 10, strlen($namespace[0]) - 11);
+            $class = substr($class[0], 7, strlen($class[0]) - 7);
+            $className = $namespace . '\\' . $class;
+            try {
+                $reflectionClass = new \ReflectionClass($className);
+            } catch (\Exception $e) {
+                continue;
+            }
+            if (self::_isClassCleanable($reflectionClass)) {
+                $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
+                foreach ($staticProperties as $staticProperty) {
+                    $staticProperty->setAccessible(true);
+                    $value = $staticProperty->getValue();
+                    self::$backupStaticVariables[$className][$staticProperty->getName()] = $value;
+                }
+            }
+            fclose($file);
+        }
+    }
+
+    /**
+     * Handler for 'startTestSuite' event
+     *
+     */
+    public function startTestSuite()
+    {
+        if (empty(self::$backupStaticVariables)) {
+            self::backupStaticVariables();
+        }
+    }
+
     /**
      * Handler for 'endTestSuite' event
      *
@@ -113,7 +186,7 @@ public function endTestSuite(\PHPUnit_Framework_TestSuite $suite)
             }
         }
         if ($clearStatics) {
-            self::clearStaticVariables();
+            self::restoreStaticVariables();
         }
     }
 }

From e704780f9ef45d9ce7578fe493a884fa543da3e4 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Sun, 23 Nov 2014 00:44:34 -0600
Subject: [PATCH 016/474] MAGETWO-30499:
 \Magento\TestFramework\Workaround\Cleanup\StaticProperties::clearStaticVariables
 resets default value of static properties to "null"

- corrected backupStaticProperties
---
 .../Workaround/Cleanup/StaticProperties.php       | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index a3bebc02c6310..2f2e7adfa4598 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -133,13 +133,14 @@ public static function backupStaticVariables()
                 continue;
             }
             $file = @fopen($classFile, 'r');
-            $code = fread($file, '4096');
+            $code = fread($file, 4096);
             preg_match($namespacePattern, $code, $namespace);
             preg_match($classPattern, $code, $class);
             if (!isset($namespace[0]) || !isset($class[0])) {
                 fclose($file);
                 continue;
             }
+            // trim namespace and class name
             $namespace = substr($namespace[0], 10, strlen($namespace[0]) - 11);
             $class = substr($class[0], 7, strlen($class[0]) - 7);
             $className = $namespace . '\\' . $class;
@@ -148,13 +149,11 @@ public static function backupStaticVariables()
             } catch (\Exception $e) {
                 continue;
             }
-            if (self::_isClassCleanable($reflectionClass)) {
-                $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
-                foreach ($staticProperties as $staticProperty) {
-                    $staticProperty->setAccessible(true);
-                    $value = $staticProperty->getValue();
-                    self::$backupStaticVariables[$className][$staticProperty->getName()] = $value;
-                }
+            $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
+            foreach ($staticProperties as $staticProperty) {
+                $staticProperty->setAccessible(true);
+                $value = $staticProperty->getValue();
+                self::$backupStaticVariables[$className][$staticProperty->getName()] = $value;
             }
             fclose($file);
         }

From 891c2a9e29fb9871fa958381fa5e697819ae5312 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@ebay.com>
Date: Mon, 24 Nov 2014 17:58:56 +0200
Subject: [PATCH 017/474] MTA-773: Stabilize Catalog module. Products

---
 .../Block/Product/Compare/ListCompare.php     | 33 +++++++++++++
 .../Test/Block/Product/Compare/Sidebar.php    | 46 ++++++++++++-------
 .../Test/Fixture/CatalogProductSimple.php     |  1 +
 .../Test/Fixture/CatalogProductSimple.xml     |  1 +
 .../Product/AbstractCompareProductsTest.php   | 36 +++++++--------
 .../Product/AddCompareProductsTest/test.csv   | 10 ++--
 .../ClearAllCompareProductsTest/test.csv      |  4 +-
 .../DeleteCompareProductsTest/test.csv        |  8 ++--
 8 files changed, 91 insertions(+), 48 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
index 7a7186793dc54..7782667468e07 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
@@ -149,6 +149,39 @@ function () use ($rootElement, $element) {
         return $data;
     }
 
+    /**
+     * Get item compare product attribute.
+     *
+     * @param string $key
+     * @return Element
+     */
+    public function getCompareProductAttribute($key)
+    {
+        $rootElement = $this->_rootElement;
+        $element = $this->nameSelector;
+        $this->_rootElement->waitUntil(
+            function () use ($rootElement, $element) {
+                return $rootElement->find($element, Locator::SELECTOR_XPATH)->isVisible() ? true : null;
+            }
+        );
+        return $this->_rootElement->find(sprintf($this->productAttribute, $key), Locator::SELECTOR_XPATH);
+    }
+
+    /**
+     * Get item attribute.
+     *
+     * @param int $indexProduct
+     * @param string $attributeKey
+     * @return string
+     */
+    public function getProductAttribute($indexProduct, $attributeKey)
+    {
+        return trim(
+            $this->getCompareProductAttribute($attributeKey)
+                ->find(sprintf($this->attributeSelector, $indexProduct), Locator::SELECTOR_XPATH)->getText()
+        );
+    }
+
     /**
      * Remove product from compare product list.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
index a4389009043e5..f2f1da979c7e5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
@@ -11,53 +11,65 @@
 use Mtf\Client\Element;
 
 /**
- * Class Sidebar
- * Compare product block on cms page
+ * Compare product block on cms page.
  */
 class Sidebar extends ListCompare
 {
     /**
-     * Selector for empty message
+     * Selector for empty message.
      *
      * @var string
      */
     protected $isEmpty = 'p.empty';
 
     /**
-     * Product name selector
+     * Product name selector.
      *
      * @var string
      */
-    protected $productName = 'li.item.odd.last strong.name a';
+    protected $productName = 'li.product-item.odd.last strong.product-item-name a';
 
     /**
-     * Selector for "Clear All" button
+     * Selector for "Clear All" button.
      *
      * @var string
      */
     protected $clearAll = '#compare-clear-all';
 
     /**
-     * Get compare products block content
+     * Get compare products block content.
      *
+     * @throws \Exception
      * @return array|string
      */
     public function getProducts()
     {
-        $result = [];
-        $isEmpty = $this->_rootElement->find($this->isEmpty);
-        if ($isEmpty->isVisible()) {
-            return $isEmpty->getText();
+        try {
+            $result = [];
+            $rootElement = $this->_rootElement;
+            $selector = $this->productName;
+            $this->_rootElement->waitUntil(
+                function () use ($rootElement, $selector) {
+                    return $rootElement->find($selector)->isVisible() ? true : null;
+                }
+            );
+            $elements = $this->_rootElement->find($this->productName)->getElements();
+            foreach ($elements as $element) {
+                $result[] = $element->getText();
+            }
+            return $result;
+        } catch (\Exception $e) {
+            $isEmpty = $this->_rootElement->find($this->isEmpty);
+            if ($isEmpty->isVisible()) {
+                return $isEmpty->getText();
+            } else {
+                throw $e;
+            }
         }
-        $elements = $this->_rootElement->find($this->productName)->getElements();
-        foreach ($elements as $element) {
-            $result[] = $element->getText();
-        }
-        return $result;
     }
 
     /**
-     * Click "Clear All" on "My Account" page
+     * Click "Clear All" on "My Account" page.
      *
      * @return void
      */
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
index a89962b520c6c..4b59186449c95 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
@@ -618,6 +618,7 @@ public function __construct(
     protected $is_virtual = [
         'attribute_code' => 'is_virtual',
         'backend_type' => 'virtual',
+        'group' => 'product-details',
     ];
 
     protected $attributes = [
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
index bd49da79e7c10..1800272c00b8e 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
@@ -473,6 +473,7 @@
         <is_virtual>
             <attribute_code>is_virtual</attribute_code>
             <backend_type>virtual</backend_type>
+            <group>product-details</group>
         </is_virtual>
         <attributes>
             <attribute_code>attributes</attribute_code>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
index 5b95cc01b73f5..5fe71a489287a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
@@ -20,69 +20,68 @@
 use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
 
 /**
- * Class AbstractCompareProductsTest
- * Abstract class for compare products class
+ * Abstract class for compare products class.
  */
 abstract class AbstractCompareProductsTest extends Injectable
 {
     /**
-     * Array products
+     * Array products.
      *
      * @var array
      */
     protected $products;
 
     /**
-     * Cms index page
+     * Cms index page.
      *
      * @var CmsIndex
      */
     protected $cmsIndex;
 
     /**
-     * Browser
+     * Browser.
      *
      * @var Browser
      */
     protected $browser;
 
     /**
-     * Catalog product compare page
+     * Catalog product compare page.
      *
      * @var CatalogProductCompare
      */
     protected $catalogProductCompare;
 
     /**
-     * Catalog product page
+     * Catalog product page.
      *
      * @var CatalogProductView
      */
     protected $catalogProductView;
 
     /**
-     * Customer login page
+     * Customer login page.
      *
      * @var CustomerAccountLogin
      */
     protected $customerAccountLogin;
 
     /**
-     * Fixture factory
+     * Fixture factory.
      *
      * @var FixtureFactory
      */
     protected $fixtureFactory;
 
     /**
-     * Fixture customer
+     * Fixture customer.
      *
      * @var CustomerInjectable
      */
     protected $customer;
 
     /**
-     * Prepare data
+     * Prepare data.
      *
      * @param FixtureFactory $fixtureFactory
      * @param CustomerInjectable $customer
@@ -96,7 +95,7 @@ public function __prepare(FixtureFactory $fixtureFactory, CustomerInjectable $cu
     }
 
     /**
-     * Injection data
+     * Injection data.
      *
      * @param CmsIndex $cmsIndex
      * @param CatalogProductView $catalogProductView
@@ -117,7 +116,7 @@ public function __inject(
     }
 
     /**
-     * Login customer
+     * Login customer.
      *
      * @return void
      */
@@ -130,7 +129,7 @@ protected function loginCustomer()
     }
 
     /**
-     * Create products
+     * Create products.
      *
      * @param string $products
      * @return array
@@ -148,7 +147,7 @@ protected function createProducts($products)
     }
 
     /**
-     * Add products to compare list
+     * Add products to compare list.
      *
      * @param array $products
      * @param AbstractConstraint $assert
@@ -166,7 +165,7 @@ protected function addProducts(array $products, AbstractConstraint $assert = nul
     }
 
     /**
-     * Perform assert
+     * Perform assert.
      *
      * @param AbstractConstraint $assert
      * @param InjectableFixture $product
@@ -174,10 +173,7 @@ protected function addProducts(array $products, AbstractConstraint $assert = nul
      */
     protected function productCompareAssert(AbstractConstraint $assert, InjectableFixture $product)
     {
-        $assert->configure(
-            $this,
-            ['catalogProductView' => $this->catalogProductView, 'product' => $product]
-        );
+        $assert->configure(['catalogProductView' => $this->catalogProductView, 'product' => $product]);
         \PHPUnit_Framework_Assert::assertThat($this->getName(), $assert);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest/test.csv
index e10a6ff408f5d..b632986c64951 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AddCompareProductsTest/test.csv
@@ -1,5 +1,5 @@
-"products";"constraint";"isCustomerLoggedIn"
-"catalogProductSimple::simple_for_composite_products";"assertProductCompareItemsLink, assertProductComparePage, assertProductCompareBlockOnCmsPage";"No"
-"catalogProductSimple::simple_for_composite_products,bundleProduct::bundle_dynamic_product";"assertProductCompareItemsLink, assertProductComparePage";"No"
-"configurableProductInjectable::default";"assertProductCompareItemsLink, assertProductComparePage, assertProductCompareBlockOnCmsPage";"Yes"
-"catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,giftCardProduct::giftcard_product_with_price,downloadableProductInjectable::default,groupedProductInjectable::grouped_product_with_price,configurableProductInjectable::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product";"assertProductCompareItemsLink, assertProductComparePage";"Yes"
+"products";"constraint";"isCustomerLoggedIn";"issue"
+"catalogProductSimple::simple_for_composite_products";"assertProductCompareItemsLink, assertProductComparePage, assertProductCompareBlockOnCmsPage";"No";""
+"catalogProductSimple::simple_for_composite_products,bundleProduct::bundle_dynamic_product";"assertProductCompareItemsLink, assertProductComparePage";"No";""
+"configurableProductInjectable::default";"assertProductCompareItemsLink, assertProductComparePage, assertProductCompareBlockOnCmsPage";"Yes";""
+"catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,giftCardProduct::giftcard_product_with_price,downloadableProductInjectable::default,groupedProductInjectable::grouped_product_with_price,configurableProductInjectable::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product";"assertProductCompareItemsLink, assertProductComparePage";"Yes";"Bug: MAGETWO-8719"
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest/test.csv
index 1cc2b68ae5755..34053da035dcc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ClearAllCompareProductsTest/test.csv
@@ -1,2 +1,2 @@
-"config/dataSet";"products";"constraint"
-"compare_products";"catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,giftCardProduct::giftcard_product_with_price,downloadableProductInjectable::default,groupedProductInjectable::grouped_product_with_price,configurableProductInjectable::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product";"assertProductCompareSuccessRemoveAllProductsMessage, assertProductCompareItemsLinkIsAbsent, assertProductCompareRemoveLastProductMessage, assertProductIsNotVisibleInCompareBlock"
+"config/dataSet";"products";"constraint";"issue"
+"compare_products";"catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,giftCardProduct::giftcard_product_with_price,downloadableProductInjectable::default,groupedProductInjectable::grouped_product_with_price,configurableProductInjectable::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product";"assertProductCompareSuccessRemoveAllProductsMessage, assertProductCompareItemsLinkIsAbsent, assertProductCompareRemoveLastProductMessage, assertProductIsNotVisibleInCompareBlock";"Bug: MAGETWO-8719"
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest/test.csv
index c9f78b2423272..42e759da8f799 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DeleteCompareProductsTest/test.csv
@@ -1,4 +1,4 @@
-"products";"removeProductIndex";"isCustomerLoggedIn";"constraint"
-"catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,giftCardProduct::giftcard_product_with_price,downloadableProductInjectable::default,groupedProductInjectable::grouped_product_with_price,configurableProductInjectable::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product";"1";"No";"assertProductCompareSuccessRemoveMessage, assertProductIsNotVisibleInComparePage, assertProductIsNotVisibleInCompareBlock"
-"catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,giftCardProduct::giftcard_product_with_price,downloadableProductInjectable::default,groupedProductInjectable::grouped_product_with_price,configurableProductInjectable::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product";"6";"Yes";"assertProductCompareSuccessRemoveMessage, assertProductIsNotVisibleInComparePage, assertProductIsNotVisibleInCompareBlock"
-"bundleProduct::bundle_dynamic_product";"1";"Yes";"assertProductCompareSuccessRemoveMessage, assertProductCompareRemoveLastProductMessage, assertProductIsNotVisibleInCompareBlock, assertProductCompareItemsLinkIsAbsent"
+"products";"removeProductIndex";"isCustomerLoggedIn";"constraint";"issue"
+"catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,giftCardProduct::giftcard_product_with_price,downloadableProductInjectable::default,groupedProductInjectable::grouped_product_with_price,configurableProductInjectable::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product";"1";"No";"assertProductCompareSuccessRemoveMessage, assertProductIsNotVisibleInComparePage, assertProductIsNotVisibleInCompareBlock";"Bug: MAGETWO-8719"
+"catalogProductSimple::simple_for_composite_products,catalogProductVirtual::default,giftCardProduct::giftcard_product_with_price,downloadableProductInjectable::default,groupedProductInjectable::grouped_product_with_price,configurableProductInjectable::default,bundleProduct::bundle_dynamic_product,bundleProduct::bundle_fixed_product";"6";"Yes";"assertProductCompareSuccessRemoveMessage, assertProductIsNotVisibleInComparePage, assertProductIsNotVisibleInCompareBlock";"Bug: MAGETWO-8719"
+"bundleProduct::bundle_dynamic_product";"1";"Yes";"assertProductCompareSuccessRemoveMessage, assertProductCompareRemoveLastProductMessage, assertProductIsNotVisibleInCompareBlock, assertProductCompareItemsLinkIsAbsent";""

From c1dd9b30b3b8201b68fb61315a25e2f0a3cb768d Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Mon, 24 Nov 2014 10:17:56 -0600
Subject: [PATCH 018/474] MAGETWO-30208: Fatal Error When Missed "composer
 install"

- Fixing code style error.
---
 index.php     | 4 ++--
 pub/index.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index 05ffb98356302..97946ee681aa4 100644
--- a/index.php
+++ b/index.php
@@ -19,9 +19,9 @@
  * @license    {license_link}
  */
 
-try{
+try {
     require __DIR__ . '/app/bootstrap.php';
-} catch(\Exception $e) {
+} catch (\Exception $e) {
     echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
     <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
diff --git a/pub/index.php b/pub/index.php
index f0c6517d026ad..8211b7e672bd1 100644
--- a/pub/index.php
+++ b/pub/index.php
@@ -11,9 +11,9 @@
 use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-try{
+try {
     require __DIR__ . '/../app/bootstrap.php';
-} catch(\Exception $e) {
+} catch (\Exception $e) {
     echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
     <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">

From ef927d2a4382f8e306b97311d65f38fc7d780955 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Mon, 24 Nov 2014 10:36:00 -0600
Subject: [PATCH 019/474] MAGETWO-30499:
 \Magento\TestFramework\Workaround\Cleanup\StaticProperties::clearStaticVariables
 resets default value of static properties to "null"

- made changes according to CR feedback
---
 .../Workaround/Cleanup/StaticProperties.php   | 98 ++++++++-----------
 1 file changed, 40 insertions(+), 58 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index 2f2e7adfa4598..884667d95fd8e 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -20,7 +20,7 @@ class StaticProperties
      */
     protected static $_cleanableFolders = array('/app/code/', '/dev/tests/integration/framework', '/lib/internal/');
 
-    protected static $backupStaticVariables = array();
+    protected static $backupStaticVariables = [];
 
     /**
      * Classes to exclude from static variables cleaning
@@ -46,12 +46,7 @@ class StaticProperties
      */
     protected static function _isClassCleanable(\ReflectionClass $reflectionClass)
     {
-        // 1. do not process php internal classes
-        if ($reflectionClass->isInternal()) {
-            return false;
-        }
-
-        // 2. do not process blacklisted classes from integration framework
+        // do not process blacklisted classes from integration framework
         foreach (self::$_classesToSkip as $notCleanableClass) {
             if ($reflectionClass->getName() == $notCleanableClass || is_subclass_of(
                 $reflectionClass->getName(),
@@ -61,19 +56,7 @@ protected static function _isClassCleanable(\ReflectionClass $reflectionClass)
                 return false;
             }
         }
-
-        // 3. process only files from specific folders
-        $fileName = $reflectionClass->getFileName();
-
-        if ($fileName) {
-            $fileName = str_replace('\\', '/', $fileName);
-            foreach (self::$_cleanableFolders as $directory) {
-                if (stripos($fileName, $directory) !== false) {
-                    return true;
-                }
-            }
-        }
-        return false;
+        return true;
     }
 
     /**
@@ -82,7 +65,7 @@ protected static function _isClassCleanable(\ReflectionClass $reflectionClass)
      * @param string $classFile
      * @return bool
      */
-    protected static function _isClassBackupable($classFile)
+    protected static function _isClassInCleanableFolders($classFile)
     {
         $classFile = str_replace('\\', '/', $classFile);
         foreach (self::$_cleanableFolders as $directory) {
@@ -101,20 +84,16 @@ protected static function _isClassBackupable($classFile)
      */
     public static function restoreStaticVariables()
     {
-        $classes = get_declared_classes();
-
-        foreach ($classes as $class) {
+        foreach (array_keys(self::$backupStaticVariables) as $class) {
             $reflectionClass = new \ReflectionClass($class);
-            if (self::_isClassCleanable($reflectionClass)) {
-                $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
-                foreach ($staticProperties as $staticProperty) {
-                    $staticProperty->setAccessible(true);
-                    $value = $staticProperty->getValue();
-                    if (is_object($value) || is_array($value) && is_object(current($value))) {
-                        $staticProperty->setValue(self::$backupStaticVariables[$class][$staticProperty->getName()]);
-                    }
-                    unset($value);
+            $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
+            foreach ($staticProperties as $staticProperty) {
+                $staticProperty->setAccessible(true);
+                $value = $staticProperty->getValue();
+                if (is_object($value) || is_array($value) && is_object(current($value))) {
+                    $staticProperty->setValue(self::$backupStaticVariables[$class][$staticProperty->getName()]);
                 }
+                unset($value);
             }
         }
     }
@@ -129,33 +108,36 @@ public static function backupStaticVariables()
         $namespacePattern = '/namespace [a-zA-Z0-9\\\\]+;/';
         $classPattern = '/\nclass [a-zA-Z0-9_]+/';
         foreach ($classFiles as $classFile) {
-            if (self::_isClassBackupable($classFile) !== true) {
-                continue;
-            }
-            $file = @fopen($classFile, 'r');
-            $code = fread($file, 4096);
-            preg_match($namespacePattern, $code, $namespace);
-            preg_match($classPattern, $code, $class);
-            if (!isset($namespace[0]) || !isset($class[0])) {
+            if (self::_isClassInCleanableFolders($classFile)) {
+                $file = @fopen($classFile, 'r');
+                $code = fread($file, 4096);
+                preg_match($namespacePattern, $code, $namespace);
+                preg_match($classPattern, $code, $class);
+                if (!isset($namespace[0]) || !isset($class[0])) {
+                    fclose($file);
+                    continue;
+                }
+                // trim namespace and class name
+                $namespace = substr($namespace[0], 10, strlen($namespace[0]) - 11);
+                $class = substr($class[0], 7, strlen($class[0]) - 7);
+                $className = $namespace . '\\' . $class;
+
+                try {
+                    $reflectionClass = new \ReflectionClass($className);
+                } catch (\Exception $e) {
+                    fclose($file);
+                    continue;
+                }
+                if (self::_isClassCleanable($reflectionClass)) {
+                    $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
+                    foreach ($staticProperties as $staticProperty) {
+                        $staticProperty->setAccessible(true);
+                        $value = $staticProperty->getValue();
+                        self::$backupStaticVariables[$className][$staticProperty->getName()] = $value;
+                    }
+                }
                 fclose($file);
-                continue;
-            }
-            // trim namespace and class name
-            $namespace = substr($namespace[0], 10, strlen($namespace[0]) - 11);
-            $class = substr($class[0], 7, strlen($class[0]) - 7);
-            $className = $namespace . '\\' . $class;
-            try {
-                $reflectionClass = new \ReflectionClass($className);
-            } catch (\Exception $e) {
-                continue;
-            }
-            $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
-            foreach ($staticProperties as $staticProperty) {
-                $staticProperty->setAccessible(true);
-                $value = $staticProperty->getValue();
-                self::$backupStaticVariables[$className][$staticProperty->getName()] = $value;
             }
-            fclose($file);
         }
     }
 

From d2f4d73f409b54686911f79ecfb50709fbf48e1b Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Mon, 24 Nov 2014 10:22:44 -0600
Subject: [PATCH 020/474] MAGETWO-21308: [GITHUB] DDL cache should be tagged

- changed cache type enabled/disabled info to be stored in deployment configuration
- refactored DB DDL caching to be under control of a cache type
---
 app/code/Magento/Core/etc/cache.xml           |   4 +
 .../Core/sql/core_setup/install-1.6.0.0.php   |  22 ----
 .../core_setup/upgrade-1.6.0.15-1.6.0.16.php  |  11 ++
 app/etc/di.xml                                |   2 -
 .../Framework/App/Cache/State/OptionsTest.php |  75 -----------
 .../Test/Legacy/_files/obsolete_classes.php   |   2 +
 .../Magento/Framework/App/Cache/StateTest.php | 117 ++++--------------
 .../App/Cache/Type/ConfigSegmentTest.php      |  63 ++++++++++
 .../Magento/PageCache/Model/ConfigTest.php    |  25 ++--
 .../Magento/Framework/App/Cache/State.php     |  91 +++++++-------
 .../Framework/App/Cache/State/Options.php     |  79 ------------
 .../App/Cache/State/OptionsInterface.php      |  26 ----
 .../App/Cache/Type/ConfigSegment.php          |  47 +++++++
 .../App/Resource/ConnectionFactory.php        |   8 +-
 .../Magento/Framework/DB/Adapter/DdlCache.php |  38 ++++++
 15 files changed, 250 insertions(+), 360 deletions(-)
 create mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Framework/App/Cache/State/OptionsTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Framework/App/Cache/Type/ConfigSegmentTest.php
 delete mode 100644 lib/internal/Magento/Framework/App/Cache/State/Options.php
 delete mode 100644 lib/internal/Magento/Framework/App/Cache/State/OptionsInterface.php
 create mode 100644 lib/internal/Magento/Framework/App/Cache/Type/ConfigSegment.php
 create mode 100644 lib/internal/Magento/Framework/DB/Adapter/DdlCache.php

diff --git a/app/code/Magento/Core/etc/cache.xml b/app/code/Magento/Core/etc/cache.xml
index 4d4c22bd44f2d..c547a8f0c1a1a 100644
--- a/app/code/Magento/Core/etc/cache.xml
+++ b/app/code/Magento/Core/etc/cache.xml
@@ -32,4 +32,8 @@
         <label>Collections Data</label>
         <description>Collection data files.</description>
     </type>
+    <type name="db_ddl" translate="label,description" instance="Magento\Framework\DB\Adapter\DdlCache">
+        <label>Database DDL operations</label>
+        <description>Results of DDL queries, such as describing tables or indexes.</description>
+    </type>
 </config>
diff --git a/app/code/Magento/Core/sql/core_setup/install-1.6.0.0.php b/app/code/Magento/Core/sql/core_setup/install-1.6.0.0.php
index d4ca002c17c4a..6d97217921cc4 100644
--- a/app/code/Magento/Core/sql/core_setup/install-1.6.0.0.php
+++ b/app/code/Magento/Core/sql/core_setup/install-1.6.0.0.php
@@ -500,28 +500,6 @@
 );
 $installer->getConnection()->createTable($table);
 
-/**
- * Create table 'core_cache_option'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_cache_option')
-)->addColumn(
-    'code',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    32,
-    array('nullable' => false, 'primary' => true),
-    'Code'
-)->addColumn(
-    'value',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    array(),
-    'Value'
-)->setComment(
-    'Cache Options'
-);
-$installer->getConnection()->createTable($table);
-
 /**
  * Create table 'core_flag'
  */
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php
new file mode 100644
index 0000000000000..917110595ee3c
--- /dev/null
+++ b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+/* @var $this \Magento\Setup\Module\SetupModule */
+$connection = $this->getConnection();
+$connection->dropTable('core_cache_option');
diff --git a/app/etc/di.xml b/app/etc/di.xml
index b30a677106966..5a5338659a9a6 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -49,7 +49,6 @@
     <preference for="Magento\Framework\View\Url\ConfigInterface" type="Magento\Core\Model\View\Url\Config" />
     <preference for="Magento\Framework\App\Route\ConfigInterface" type="Magento\Framework\App\Route\Config" />
     <preference for="Magento\Framework\App\Resource\ConfigInterface" type="Magento\Framework\App\Resource\Config\Proxy" />
-    <preference for="Magento\Framework\App\Cache\State\OptionsInterface" type="Magento\Framework\App\Cache\State\Options" />
     <preference for="Magento\Framework\Oauth\OauthInterface" type="Magento\Framework\Oauth\Oauth"/>
     <preference for="Magento\Framework\View\Design\Theme\Domain\PhysicalInterface" type="Magento\Core\Model\Theme\Domain\Physical" />
     <preference for="Magento\Framework\View\Design\Theme\Domain\VirtualInterface" type="Magento\Core\Model\Theme\Domain\Virtual" />
@@ -84,7 +83,6 @@
     <preference for="Magento\Framework\DB\LoggerInterface" type="Magento\Framework\DB\Logger\Null"/>
     <preference for="Magento\Framework\App\Resource\ConnectionAdapterInterface" type="Magento\Framework\Model\Resource\Type\Db\Pdo\Mysql"/>
     <preference for="Magento\Framework\DB\QueryInterface" type="Magento\Framework\DB\Query"/>
-    
     <type name="Magento\Framework\Model\Context">
         <arguments>
             <argument name="actionValidator" xsi:type="object">Magento\Framework\Model\ActionValidator\RemoveAction\Proxy</argument>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Cache/State/OptionsTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Cache/State/OptionsTest.php
deleted file mode 100644
index daa45883f4447..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Cache/State/OptionsTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Framework\App\Cache\State;
-
-class OptionsTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var \Magento\Framework\App\Cache\State\Options
-     */
-    protected $_model;  
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_resourceMock;
-
-    protected function setUp()
-    {
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\State\Options'
-        );
-    }
-
-    public function testGetTable()
-    {
-        $this->_resourceMock = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Resource',
-            array('tablePrefix' => 'prefix_')
-        );
-
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\State\Options',
-            array('resource' => $this->_resourceMock)
-        );
-        $this->assertEquals('prefix_core_cache_option', $this->_model->getTable('core_cache_option'));
-        $this->assertEquals('prefix_core_cache_option', $this->_model->getTable(array('core_cache', 'option')));
-    }
-
-    public function testUniqueFields()
-    {
-        $fields = array('field' => 'text');
-        $this->_model->addUniqueField($fields);
-        $this->assertEquals(array($fields), $this->_model->getUniqueFields());
-        $this->_model->resetUniqueField();
-        $this->assertEquals(array(), $this->_model->getUniqueFields());
-    }
-
-    public function testHasDataChanged()
-    {
-        $object = new \Magento\Framework\Object(array('code' => 'value1', 'value' => 'value2'));
-        $this->assertTrue($this->_model->hasDataChanged($object));
-
-        $object->setOrigData();
-        $this->assertFalse($this->_model->hasDataChanged($object));
-        $object->setData('code', 'v1');
-        $this->assertTrue($this->_model->hasDataChanged($object));
-    }
-
-    /**
-     * @magentoDbIsolation enabled
-     */
-    public function testGetSaveAllOptions()
-    {
-        $options = $this->_model->getAllOptions();
-        $this->assertArrayNotHasKey('test_option', $options);
-        $options['test_option'] = 1;
-        $this->_model->saveAllOptions($options);
-        $this->assertEquals($options, $this->_model->getAllOptions());
-    }
-}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 493014fc5caa8..09b6173e1bdba 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -2856,4 +2856,6 @@
     ['Magento\Framework\Module\DependencyManagerInterface'],
     ['Magento\Framework\App\Arguments\Loader'],
     ['Magento\Framework\App\Arguments', 'Magento\Framework\App\DeploymentConfig'],
+    ['Magento\Framework\App\Cache\State\Options', 'Magento\Framework\App\Cache\State'],
+    ['Magento\Framework\App\Cache\State\OptionsInterface', 'Magento\Framework\App\Cache\State'],
 );
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/StateTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/StateTest.php
index 6d09b003f80d8..639622f664d2d 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/StateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/StateTest.php
@@ -10,30 +10,37 @@
 class StateTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\App\Cache\StateInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_model;
+    private $config;
 
     /**
-     * @var \Magento\Framework\App\Cache\State\Options|\PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_resource;
+    private $writer;
 
-    /**
-     * @var \Magento\Framework\Cache\FrontendInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_cacheFrontend;
+    protected function setUp()
+    {
+        $this->config = $this->getMock('Magento\Framework\App\DeploymentConfig', [], [], '', false);
+        $this->writer = $this->getMock('Magento\Framework\App\DeploymentConfig\Writer', [], [], '', false);
+    }
 
     /**
      * @param string $cacheType
-     * @param array $typeOptions
+     * @param array $config
      * @param bool $banAll
      * @param bool $expectedIsEnabled
      * @dataProvider isEnabledDataProvider
      */
-    public function testIsEnabled($cacheType, $typeOptions, $banAll, $expectedIsEnabled)
+    public function testIsEnabled($cacheType, $config, $banAll, $expectedIsEnabled)
     {
-        $model = $this->_buildModel($typeOptions, array(), $banAll);
+        $model = new State($this->config, $this->writer, $banAll);
+        if ($banAll) {
+            $this->config->expects($this->never())->method('getSegment');
+        } else {
+            $this->config->expects($this->once())->method('getSegment')->willReturn($config);
+        }
+        $this->writer->expects($this->never())->method('update');
         $actualIsEnabled = $model->isEnabled($cacheType);
         $this->assertEquals($expectedIsEnabled, $actualIsEnabled);
     }
@@ -46,116 +53,46 @@ public static function isEnabledDataProvider()
         return array(
             'enabled' => array(
                 'cacheType' => 'cache_type',
-                'typeOptions' => array('some_type' => false, 'cache_type' => true),
+                'config' => array('some_type' => false, 'cache_type' => true),
                 'banAll' => false,
                 'expectedIsEnabled' => true
             ),
             'disabled' => array(
                 'cacheType' => 'cache_type',
-                'typeOptions' => array('some_type' => true, 'cache_type' => false),
+                'config' => array('some_type' => true, 'cache_type' => false),
                 'banAll' => false,
                 'expectedIsEnabled' => false
             ),
             'unknown is disabled' => array(
                 'cacheType' => 'unknown_cache_type',
-                'typeOptions' => array('some_type' => true),
+                'config' => array('some_type' => true),
                 'banAll' => false,
                 'expectedIsEnabled' => false
             ),
             'disabled, when all caches are banned' => array(
                 'cacheType' => 'cache_type',
-                'typeOptions' => array('cache_type' => true),
+                'config' => array('cache_type' => true),
                 'banAll' => true,
                 'expectedIsEnabled' => false
             )
         );
     }
 
-    /**
-     * Builds model to be tested
-     *
-     * @param array|false $cacheTypeOptions
-     * @param array|false $resourceTypeOptions
-     * @param bool $banAll
-     * @return \Magento\Framework\App\Cache\StateInterface
-     */
-    protected function _buildModel(
-        $cacheTypeOptions,
-        $resourceTypeOptions = false,
-        $banAll = false
-    ) {
-        $this->_cacheFrontend = $this->getMock('Magento\Framework\Cache\FrontendInterface');
-        $this->_cacheFrontend->expects(
-            $this->any()
-        )->method(
-            'load'
-        )->with(
-            \Magento\Framework\App\Cache\State::CACHE_ID
-        )->will(
-            $this->returnValue($cacheTypeOptions === false ? false : serialize($cacheTypeOptions))
-        );
-        $cacheFrontendPool = $this->getMock('Magento\Framework\App\Cache\Frontend\Pool', array(), array(), '', false);
-        $cacheFrontendPool->expects(
-            $this->any()
-        )->method(
-            'get'
-        )->with(
-            \Magento\Framework\App\Cache\Frontend\Pool::DEFAULT_FRONTEND_ID
-        )->will(
-            $this->returnValue($this->_cacheFrontend)
-        );
-
-        $this->_resource = $this->getMock('Magento\Framework\App\Cache\State\Options', array(), array(), '', false);
-        $this->_resource->expects(
-            $this->any()
-        )->method(
-            'getAllOptions'
-        )->will(
-            $this->returnValue($resourceTypeOptions)
-        );
-
-        $this->_model = new \Magento\Framework\App\Cache\State(
-            $this->_resource,
-            $cacheFrontendPool,
-            $banAll
-        );
-
-        return $this->_model;
-    }
-
-    /**
-     * The model must fetch data via its resource, if the cache type list is not cached
-     * (e.g. cache load result is FALSE)
-     */
-    public function testIsEnabledFallbackToResource()
+    public function testSetEnabled()
     {
-        $model = $this->_buildModel(array(), array('cache_type' => true));
+        $model = new State($this->config, $this->writer);
         $this->assertFalse($model->isEnabled('cache_type'));
-
-        $model = $this->_buildModel(false, array('cache_type' => true));
-        $this->assertTrue($model->isEnabled('cache_type'));
-    }
-
-    public function testSetEnabledIsEnabled()
-    {
-        $model = $this->_buildModel(array('cache_type' => false));
         $model->setEnabled('cache_type', true);
         $this->assertTrue($model->isEnabled('cache_type'));
-
         $model->setEnabled('cache_type', false);
         $this->assertFalse($model->isEnabled('cache_type'));
     }
 
     public function testPersist()
     {
-        $cacheTypes = array('cache_type' => false);
-        $model = $this->_buildModel($cacheTypes);
-
-        $this->_resource->expects($this->once())->method('saveAllOptions')->with($cacheTypes);
-        $this->_cacheFrontend->expects($this->once())
-            ->method('remove')
-            ->with(\Magento\Framework\App\Cache\State::CACHE_ID);
-
+        $model = new State($this->config, $this->writer);
+        $constraint = new \PHPUnit_Framework_Constraint_IsInstanceOf('Magento\Framework\App\Cache\Type\ConfigSegment');
+        $this->writer->expects($this->once())->method('update')->with($constraint);
         $model->persist();
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/Type/ConfigSegmentTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/Type/ConfigSegmentTest.php
new file mode 100644
index 0000000000000..2b06dfa4be0f9
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/Type/ConfigSegmentTest.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+namespace Magento\Framework\App\Cache\Type;
+
+
+class ConfigSegmentTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @param array $data
+     * @param array $expected
+     * @dataProvider getDataDataProvider
+     */
+    public function testGetData($data, $expected)
+    {
+        $object = new ConfigSegment($data);
+        $this->assertSame($expected, $object->getData());
+    }
+
+    /**
+     * @return array
+     */
+    public function getDataDataProvider()
+    {
+        return [
+            [[], []],
+            [['FoO' => '1'], ['FoO' => 1]],
+            [['foo' => false, 'bar' => true], ['foo' => 0, 'bar' => 1]],
+            [['foo' => 'bar', 'baz' => '0'], ['foo' => 0, 'baz' => 0]],
+            [['foo' => []], ['foo' => 0]],
+            [['foo' => [0]], ['foo' => 1]],
+            [['foo' => [1, 2]], ['foo' => 1]],
+        ];
+    }
+
+    /**
+     * @param array $data
+     * @dataProvider getDataInvalidKeysDataProvider
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Invalid cache type key:
+     */
+    public function testGetDataInvalidKeys($data)
+    {
+        new ConfigSegment($data);
+    }
+
+    /**
+     * @return array
+     */
+    public function getDataInvalidKeysDataProvider()
+    {
+        return [
+            [[1]],
+            [['0' => 1]],
+            [['in/valid' => 1]],
+        ];
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
index 0dfe35fcf6f45..69274398dc847 100644
--- a/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
@@ -34,8 +34,7 @@ public function setUp()
         $filesystemMock =
             $this->getMock('Magento\Framework\Filesystem', array('getDirectoryRead'), array(), '', false);
         $this->_coreConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->_cacheState =
-            $this->getMock('\Magento\Framework\App\Cache\State', array('isEnabled'), array(), '', false);
+        $this->_cacheState = $this->getMockForAbstractClass('Magento\Framework\App\Cache\StateInterface');
 
         $modulesDirectoryMock = $this->getMock(
             'Magento\Framework\Filesystem\Directory\Write',
@@ -122,17 +121,15 @@ public function testGetTll()
      */
     public function testIsEnabled()
     {
-        $this->_cacheState->setEnabled(\Magento\PageCache\Model\Cache\Type::TYPE_IDENTIFIER, true);
-
-        $this->_cacheState->expects(
-            $this->once()
-        )->method(
-            'isEnabled'
-        )->with(
-            \Magento\PageCache\Model\Cache\Type::TYPE_IDENTIFIER
-        )->will(
-            $this->returnValue(true)
-        );
-        $this->_model->isEnabled();
+        $this->_cacheState->expects($this->at(0))
+            ->method('isEnabled')
+            ->with(\Magento\PageCache\Model\Cache\Type::TYPE_IDENTIFIER)
+            ->will($this->returnValue(true));
+        $this->_cacheState->expects($this->at(1))
+            ->method('isEnabled')
+            ->with(\Magento\PageCache\Model\Cache\Type::TYPE_IDENTIFIER)
+            ->will($this->returnValue(false));
+        $this->assertTrue($this->_model->isEnabled());
+        $this->assertFalse($this->_model->isEnabled());
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Cache/State.php b/lib/internal/Magento/Framework/App/Cache/State.php
index d247e69d37c2f..182ee55d657bf 100644
--- a/lib/internal/Magento/Framework/App/Cache/State.php
+++ b/lib/internal/Magento/Framework/App/Cache/State.php
@@ -9,77 +9,53 @@
  */
 namespace Magento\Framework\App\Cache;
 
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\Cache\Type\ConfigSegment;
+use Magento\Framework\App\DeploymentConfig\Writer;
+
 class State implements StateInterface
 {
-    /**
-     * Cache identifier used to store cache type statuses
-     */
-    const CACHE_ID  = 'core_cache_options';
-    
     /**
      * Disallow cache
      */
     const PARAM_BAN_CACHE = 'global_ban_use_cache';
 
     /**
-     * Persistent storage of cache type statuses
+     * Deployment configuration
      *
-     * @var State\OptionsInterface
+     * @var DeploymentConfig
      */
-    private $_options;
+    private $config;
 
     /**
-     * Cache frontend to delegate actual cache operations to
+     * Deployment configuration storage writer
      *
-     * @var \Magento\Framework\Cache\FrontendInterface
+     * @var Writer
      */
-    private $_cacheFrontend;
+    private $writer;
 
     /**
      * Associative array of cache type codes and their statuses (enabled/disabled)
      *
      * @var array
      */
-    private $_typeStatuses = array();
+    private $statuses;
 
     /**
-     * @param State\OptionsInterface $options
-     * @param \Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool
-     * @param bool $banAll Whether all cache types are forced to be disabled
+     * @var bool
      */
-    public function __construct(
-        State\OptionsInterface $options,
-        \Magento\Framework\App\Cache\Frontend\Pool $cacheFrontendPool,
-        $banAll = false
-    ) {
-        $this->_options = $options;
-        $this->_cacheFrontend =
-            $cacheFrontendPool->get(\Magento\Framework\App\Cache\Frontend\Pool::DEFAULT_FRONTEND_ID);
-        $this->_loadTypeStatuses($banAll);
-    }
+    private $banAll;
 
     /**
-     * Load statuses (enabled/disabled) of cache types
-     *
-     * @param bool $forceDisableAll
-     * @return void
+     * @param DeploymentConfig $config
+     * @param Writer $writer
+     * @param bool $banAll Whether all cache types are forced to be disabled
      */
-    private function _loadTypeStatuses($forceDisableAll = false)
+    public function __construct(DeploymentConfig $config, Writer $writer, $banAll = false)
     {
-        $typeOptions = $this->_cacheFrontend->load(self::CACHE_ID);
-        if ($typeOptions !== false) {
-            $typeOptions = unserialize($typeOptions);
-        } else {
-            $typeOptions = $this->_options->getAllOptions();
-            if ($typeOptions !== false) {
-                $this->_cacheFrontend->save(serialize($typeOptions), self::CACHE_ID);
-            }
-        }
-        if ($typeOptions) {
-            foreach ($typeOptions as $cacheType => $isTypeEnabled) {
-                $this->setEnabled($cacheType, $isTypeEnabled && !$forceDisableAll);
-            }
-        }
+        $this->config = $config;
+        $this->writer = $writer;
+        $this->banAll = $banAll;
     }
 
     /**
@@ -90,7 +66,8 @@ private function _loadTypeStatuses($forceDisableAll = false)
      */
     public function isEnabled($cacheType)
     {
-        return isset($this->_typeStatuses[$cacheType]) ? (bool)$this->_typeStatuses[$cacheType] : false;
+        $this->load();
+        return isset($this->statuses[$cacheType]) ? (bool)$this->statuses[$cacheType] : false;
     }
 
     /**
@@ -102,7 +79,8 @@ public function isEnabled($cacheType)
      */
     public function setEnabled($cacheType, $isEnabled)
     {
-        $this->_typeStatuses[$cacheType] = (int)$isEnabled;
+        $this->load();
+        $this->statuses[$cacheType] = (int)$isEnabled;
     }
 
     /**
@@ -112,7 +90,24 @@ public function setEnabled($cacheType, $isEnabled)
      */
     public function persist()
     {
-        $this->_options->saveAllOptions($this->_typeStatuses);
-        $this->_cacheFrontend->remove(self::CACHE_ID);
+        $this->load();
+        $segment = new ConfigSegment($this->statuses);
+        $this->writer->update($segment);
+    }
+
+    /**
+     * Load statuses (enabled/disabled) of cache types
+     *
+     * @return void
+     */
+    private function load()
+    {
+        if (null === $this->statuses) {
+            $this->statuses = [];
+            if ($this->banAll) {
+                return;
+            }
+            $this->statuses = $this->config->getSegment(ConfigSegment::SEGMENT_KEY) ?: [];
+        }
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Cache/State/Options.php b/lib/internal/Magento/Framework/App/Cache/State/Options.php
deleted file mode 100644
index 8954f6b673ba3..0000000000000
--- a/lib/internal/Magento/Framework/App/Cache/State/Options.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Cache state options provider
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Framework\App\Cache\State;
-
-use Magento\Framework\Model\Resource\Db\AbstractDb;
-
-class Options extends AbstractDb implements OptionsInterface
-{
-    /**
-     * Define main table
-     *
-     * @return void
-     */
-    protected function _construct()
-    {
-        $this->_init('core_cache_option', 'code');
-    }
-
-    /**
-     * Get all cache options
-     *
-     * @return array|false
-     */
-    public function getAllOptions()
-    {
-        $adapter = $this->_getReadAdapter();
-        if ($adapter) {
-            /**
-             * Check if table exist (it protect upgrades. cache settings checked before upgrades)
-             */
-            if ($adapter->isTableExists($this->getMainTable())) {
-                $select = $adapter->select()->from($this->getMainTable(), array('code', 'value'));
-                return $adapter->fetchPairs($select);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Save all options to option table
-     *
-     * @param array $options
-     * @return $this
-     * @throws \Exception
-     */
-    public function saveAllOptions($options)
-    {
-        $adapter = $this->_getWriteAdapter();
-        if (!$adapter) {
-            return $this;
-        }
-
-        $data = array();
-        foreach ($options as $code => $value) {
-            $data[] = array($code, $value);
-        }
-
-        $adapter->beginTransaction();
-        try {
-            $this->_getWriteAdapter()->delete($this->getMainTable());
-            if ($data) {
-                $this->_getWriteAdapter()->insertArray($this->getMainTable(), array('code', 'value'), $data);
-            }
-        } catch (\Exception $e) {
-            $adapter->rollback();
-            throw $e;
-        }
-        $adapter->commit();
-
-        return $this;
-    }
-}
diff --git a/lib/internal/Magento/Framework/App/Cache/State/OptionsInterface.php b/lib/internal/Magento/Framework/App/Cache/State/OptionsInterface.php
deleted file mode 100644
index d6c63275e19b1..0000000000000
--- a/lib/internal/Magento/Framework/App/Cache/State/OptionsInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Framework\App\Cache\State;
-
-interface OptionsInterface
-{
-    /**
-     * Get all cache options
-     *
-     * @return array|bool
-     */
-    public function getAllOptions();
-
-    /**
-     * Save all options to option table
-     *
-     * @param  array $options
-     * @return $this
-     */
-    public function saveAllOptions($options);
-}
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/ConfigSegment.php b/lib/internal/Magento/Framework/App/Cache/Type/ConfigSegment.php
new file mode 100644
index 0000000000000..0de501f898325
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Cache/Type/ConfigSegment.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+namespace Magento\Framework\App\Cache\Type;
+
+use Magento\Framework\App\DeploymentConfig\AbstractSegment;
+
+/**
+ * Deployment configuration segment for enabled cache types
+ */
+class ConfigSegment extends AbstractSegment
+{
+    /**
+     * Deployment config segment key
+     */
+    const SEGMENT_KEY = 'cache_types';
+
+    /**
+     * Constructor
+     *
+     * @param array $data
+     * @throws \InvalidArgumentException
+     */
+    public function __construct(array $data)
+    {
+        foreach ($data as $key => $value) {
+            if (!preg_match('/^[a-z_]+$/i', $key)) {
+                throw new \InvalidArgumentException("Invalid cache type key: {$key}");
+            }
+            $data[$key] = (int)$value;
+        }
+        parent::__construct($data);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getKey()
+    {
+        return self::SEGMENT_KEY;
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Resource/ConnectionFactory.php b/lib/internal/Magento/Framework/App/Resource/ConnectionFactory.php
index e426c6cf298a0..c87edd2c67dfd 100644
--- a/lib/internal/Magento/Framework/App/Resource/ConnectionFactory.php
+++ b/lib/internal/Magento/Framework/App/Resource/ConnectionFactory.php
@@ -10,6 +10,7 @@
 namespace Magento\Framework\App\Resource;
 
 use Magento\Framework\Model\Resource\Type\Db\ConnectionFactory as ModelConnectionFactory;
+use Magento\Framework\DB\Adapter\DdlCache;
 
 class ConnectionFactory extends ModelConnectionFactory
 {
@@ -23,10 +24,9 @@ class ConnectionFactory extends ModelConnectionFactory
     public function create(array $connectionConfig)
     {
         $connection = parent::create($connectionConfig);
-        /** @var \Magento\Framework\App\CacheInterface $cache */
-        $cache = $this->objectManager->get('Magento\Framework\App\CacheInterface');
-        $connection->setCacheAdapter($cache->getFrontend());
-
+        /** @var \Magento\Framework\App\Cache\Type\FrontendPool $pool */
+        $pool = $this->objectManager->get('Magento\Framework\App\Cache\Type\FrontendPool');
+        $connection->setCacheAdapter($pool->get(DdlCache::TYPE_IDENTIFIER));
         return $connection;
     }
 }
diff --git a/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php b/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
new file mode 100644
index 0000000000000..58fdf497e9b04
--- /dev/null
+++ b/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+namespace Magento\Framework\DB\Adapter;
+
+use Magento\Framework\Cache\Frontend\Decorator\TagScope;
+use Magento\Framework\App\Cache\Type\FrontendPool;
+
+/**
+ * Cache segment for DDL operations in database adapter
+ */
+class DdlCache extends TagScope
+{
+    /**
+     * Cache type code unique among all cache types
+     */
+    const TYPE_IDENTIFIER = 'db_ddl';
+
+    /**
+     * Cache tag used to distinguish the cache type from all other cache
+     */
+    const CACHE_TAG = 'DB_DDL';
+
+    /**
+     * Constructor
+     *
+     * @param FrontendPool $cacheFrontendPool
+     */
+    public function __construct(FrontendPool $cacheFrontendPool)
+    {
+        parent::__construct($cacheFrontendPool->get(self::TYPE_IDENTIFIER), self::CACHE_TAG);
+    }
+}

From da2129f80abe1bd7461f6dcd200da0ede1290e99 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Mon, 24 Nov 2014 15:27:28 -0600
Subject: [PATCH 021/474] MAGETWO-30859: No input validation for HTTPS
 configuration data during installation

- Implented expected results.
---
 .../Controller/Install/StartController.php    |  2 +-
 .../src/Model/UserConfigurationDataMapper.php |  8 +++++++
 .../magento/setup/web-configuration.phtml     | 24 +++++++++++++++++--
 setup/pub/magento/setup/web-configuration.js  | 17 +++++++++++--
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/Install/StartController.php b/setup/module/Magento/Setup/src/Controller/Install/StartController.php
index 1b624e7f09688..b8a0d9f27eebc 100644
--- a/setup/module/Magento/Setup/src/Controller/Install/StartController.php
+++ b/setup/module/Magento/Setup/src/Controller/Install/StartController.php
@@ -131,7 +131,7 @@ private function importUserConfigForm()
             ? $source['config']['https']['admin'] : '';
         $result[UserConfig::KEY_BASE_URL_SECURE] = (isset($source['config']['https']['front'])
             || isset($source['config']['https']['admin']))
-            ? str_replace('http:', 'https:', $source['config']['address']['web']) : '';
+            ? $source['config']['https']['text'] : '';
         $result[UserConfig::KEY_LANGUAGE] = isset($source['store']['language'])
             ? $source['store']['language'] : '';
         $result[UserConfig::KEY_TIMEZONE] = isset($source['store']['timezone'])
diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index 21d2edfed01c8..3ce4e38db3633 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -43,6 +43,9 @@ class UserConfigurationDataMapper
     private static $pathDataMap = [
         Store::XML_PATH_USE_REWRITES => self::KEY_USE_SEF_URL,
         Store::XML_PATH_UNSECURE_BASE_URL => self::KEY_BASE_URL,
+        Store::XML_PATH_SECURE_IN_FRONTEND => self::KEY_IS_SECURE,
+        Store::XML_PATH_SECURE_BASE_URL => self::KEY_BASE_URL_SECURE,
+        Store::XML_PATH_SECURE_IN_ADMINHTML => self::KEY_IS_SECURE_ADMIN,
         Data::XML_PATH_DEFAULT_LOCALE => self::KEY_LANGUAGE,
         Data::XML_PATH_DEFAULT_TIMEZONE => self::KEY_TIMEZONE,
         Currency::XML_PATH_CURRENCY_BASE => self::KEY_CURRENCY,
@@ -62,9 +65,14 @@ public function getConfigData($data)
         $configData = [];
         foreach (self::$pathDataMap as $path => $key) {
             if (isset($data[$key])) {
+                if ((($key === self::KEY_IS_SECURE) || ($key === self::KEY_IS_SECURE_ADMIN))
+                    && (!isset($data[self::KEY_BASE_URL_SECURE]))) {
+                    continue;
+                }
                 $configData[$path] = $data[$key];
             }
         }
+
         return $configData;
     }
 }
diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 99975e1a4e45e..114fcad168d82 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -80,17 +80,37 @@ $hints = [
             <div class="col-md-5">
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" ng-model="config.https.front">&nbsp;Use HTTPS for Magento Storefront
+                        <input type="checkbox" ng-checked="" ng-model="config.https.front">&nbsp;Use HTTPS for Magento Storefront
                     </label>
                 </div>
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" ng-model="config.https.admin">&nbsp;Use HTTPS for Magento Admin
+                        <input type="checkbox" ng-checked="" ng-model="config.https.admin">&nbsp;Use HTTPS for Magento Admin
                     </label>
                 </div>
             </div>
         </div>
 
+        <div class="form-group" ng-if="showHttpsField()">
+            <div class="col-md-4 col-md-offset-3">
+                <input type="text"
+                       name="https"
+                       ng-model="config.https.text"
+                       ng-show="config.https.front || config.https.admin"
+                       class="form-control"
+                       ng-focus=""
+                       tooltip-placement="right"
+                       tooltip-trigger="focus"
+                       tooltip-append-to-body="true"
+                       required />
+            </div>
+            <div class="col-md-offset-3 col-md-4" ng-show="webconfig.submitted">
+                <div class="error-container">
+                    <span>You must enter HTTPS URL.</span>
+                </div>
+            </div>
+        </div>
+
         <div class="form-group">
             <label class="col-md-3 control-label">Apache Rewrites</label>
             <div class="col-md-5">
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index 5b75611ed0974..f1ceb6438e100 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -14,8 +14,9 @@ angular.module('web-configuration', ['ngStorage'])
                 admin: 'admin'
             },
             https: {
-                front: true,
-                admin: true
+                front: false,
+                admin: false,
+                text: 'https://www.example.com/'
             },
             rewrites: {
                 allowed: true
@@ -51,6 +52,18 @@ angular.module('web-configuration', ['ngStorage'])
             return angular.equals($scope.config.encrypt.type, 'user');
         }
 
+        $scope.$watch('config.https.front', function() {
+            $scope.config.https.text = 'https://www.example.com/';
+        });
+
+        $scope.$watch('config.https.admin', function() {
+            $scope.config.https.text = 'https://www.example.com/';
+        });
+
+        $scope.showHttpsField = function() {
+            return ($scope.config.https.front || $scope.config.https.admin);
+        }
+
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();

From 6b165218f8407a06bfdc3b70bfddeb0e300a2f7d Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Mon, 24 Nov 2014 18:46:16 -0600
Subject: [PATCH 022/474] MAGETWO-30834: WEb Installation: Admin user password
 validation doesn't work for characters number

- Fixed the problem.
---
 .../magento/setup/create-admin-account.phtml  |  4 ++-
 .../pub/magento/setup/create-admin-account.js | 27 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml b/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml
index 04ba36d0b2911..e773bb4ac0beb 100644
--- a/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml
@@ -85,10 +85,12 @@ $passwordWizard = sprintf(
                    type="password"
                    name="adminPassword"
                    ng-model="admin.password"
-                   required />
+                   required
+                   check-Password />
         </div>
         <div class="col-sm-offset-3 col-sm-4" ng-show="account.adminPassword.$invalid && account.submitted">
             <div class="error-container">
+                <span ng-show="account.adminPassword.$error.checkPassword">You must enter a valid password.</span>
                 <span ng-show="account.adminPassword.$error.required">Please enter your new password.</span>
             </div>
         </div>
diff --git a/setup/pub/magento/setup/create-admin-account.js b/setup/pub/magento/setup/create-admin-account.js
index 440e6cb3a1167..949c490a8d7da 100644
--- a/setup/pub/magento/setup/create-admin-account.js
+++ b/setup/pub/magento/setup/create-admin-account.js
@@ -46,6 +46,14 @@ angular.module('create-admin-account', ['ngStorage'])
             $localStorage.admin = $scope.admin;
         });
 
+        $scope.checkPasswordValidity = function() {
+            if (($scope.admin.passwordStatus.class === 'to-short') || ($scope.admin.passwordStatus.class === 'none')) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();
@@ -68,6 +76,25 @@ angular.module('create-admin-account', ['ngStorage'])
             }
         });
     }])
+    .directive('checkPassword', function() {
+        return{
+            require: "ngModel",
+            link: function(scope, elm, attrs, ctrl){
+                var validator = function(value){
+                    var validated;
+                    if (!((value.length > 6) && (value.match(/[\d]+/) && value.match(/[a-zA-Z]+/)))) {
+                        validated = false;
+                    } else {
+                        validated = true;
+                    }
+                    ctrl.$setValidity('checkPassword', validated);
+                    return value;
+                };
+                ctrl.$parsers.unshift(validator);
+                ctrl.$formatters.unshift(validator);
+            }
+        };
+    })
     .directive('confirmPassword', function() {
         return {
             require: 'ngModel',

From b13bb9408ba0bc9ddef156008906c73a2ee5013c Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Mon, 24 Nov 2014 18:54:10 -0600
Subject: [PATCH 023/474] MAGETWO-30852: Old encryption key did not saved after
 update

- consolidated and refactored encryption model
- fixed test
---
 app/code/Magento/Pbridge/Model/Encryption.php |  21 +-
 .../Magento/Pci/Model/Backend/Observer.php    |   6 +-
 app/code/Magento/Pci/Model/Encryption.php     | 302 ------------------
 app/code/Magento/Pci/Model/Observer.php       |   6 +-
 app/code/Magento/Pci/etc/di.xml               |  12 -
 .../Encryption/EncryptorTest.php}             |   8 +-
 .../Framework/Encryption/EncryptorTest.php    | 160 +++-------
 .../Magento/Pci/Model/EncryptionTest.php      |  51 ---
 .../Framework/Encryption/CryptFactory.php     |  42 ---
 .../Framework/Encryption/Encryptor.php        | 251 ++++++++++++---
 10 files changed, 274 insertions(+), 585 deletions(-)
 delete mode 100644 app/code/Magento/Pci/Model/Encryption.php
 delete mode 100644 app/code/Magento/Pci/etc/di.xml
 rename dev/tests/integration/testsuite/Magento/{Pci/Model/EncryptionTest.php => Framework/Encryption/EncryptorTest.php} (72%)
 delete mode 100644 dev/tests/unit/testsuite/Magento/Pci/Model/EncryptionTest.php
 delete mode 100644 lib/internal/Magento/Framework/Encryption/CryptFactory.php

diff --git a/app/code/Magento/Pbridge/Model/Encryption.php b/app/code/Magento/Pbridge/Model/Encryption.php
index 5ac08f1618d2c..c4ee3f245e292 100644
--- a/app/code/Magento/Pbridge/Model/Encryption.php
+++ b/app/code/Magento/Pbridge/Model/Encryption.php
@@ -8,29 +8,26 @@
 namespace Magento\Pbridge\Model;
 
 use Magento\Framework\Math\Random;
-use Magento\Framework\Encryption\CryptFactory;
 use Magento\Framework\Encryption\Crypt;
 use Magento\Framework\App\DeploymentConfig;
 
-class Encryption extends \Magento\Pci\Model\Encryption
+class Encryption extends \Magento\Framework\Encryption\Encryptor
 {
     /**
      * Constructor
      *
      * @param Random $randomGenerator
-     * @param CryptFactory $cryptFactory
      * @param DeploymentConfig $deploymentConfig
      * @param string $key
      */
     public function __construct(
         Random $randomGenerator,
-        CryptFactory $cryptFactory,
         DeploymentConfig $deploymentConfig,
         $key
     ) {
-        parent::__construct($randomGenerator, $cryptFactory, $deploymentConfig);
-        $this->_keys = array($key);
-        $this->_keyVersion = 0;
+        parent::__construct($randomGenerator, $deploymentConfig);
+        $this->keys = array($key);
+        $this->keyVersion = 0;
     }
 
     /**
@@ -43,17 +40,17 @@ public function __construct(
      * @param bool $initVector
      * @return Crypt
      */
-    protected function _getCrypt($key = null, $cipherVersion = null, $initVector = true)
+    protected function getCrypt($key = null, $cipherVersion = null, $initVector = true)
     {
         if (null === $key && null == $cipherVersion) {
             $cipherVersion = self::CIPHER_RIJNDAEL_256;
         }
 
         if (null === $key) {
-            $key = $this->_keys[$this->_keyVersion];
+            $key = $this->keys[$this->keyVersion];
         }
         if (null === $cipherVersion) {
-            $cipherVersion = $this->_cipher;
+            $cipherVersion = $this->cipher;
         }
         $cipherVersion = $this->validateCipher($cipherVersion);
 
@@ -79,7 +76,7 @@ protected function _getCrypt($key = null, $cipherVersion = null, $initVector = t
      */
     public function decrypt($data)
     {
-        return parent::decrypt($this->_keyVersion . ':' . self::CIPHER_LATEST . ':' . $data);
+        return parent::decrypt($this->keyVersion . ':' . self::CIPHER_LATEST . ':' . $data);
     }
 
     /**
@@ -90,7 +87,7 @@ public function decrypt($data)
      */
     public function encrypt($data)
     {
-        $crypt = $this->_getCrypt();
+        $crypt = $this->getCrypt();
         return $crypt->getInitVector() . ':' . base64_encode($crypt->encrypt((string)$data));
     }
 }
diff --git a/app/code/Magento/Pci/Model/Backend/Observer.php b/app/code/Magento/Pci/Model/Backend/Observer.php
index 95e2447d0f283..0efd759a56556 100644
--- a/app/code/Magento/Pci/Model/Backend/Observer.php
+++ b/app/code/Magento/Pci/Model/Backend/Observer.php
@@ -70,7 +70,7 @@ class Observer
     /**
      * Pci encryption model
      *
-     * @var \Magento\Pci\Model\Encryption
+     * @var \Magento\Framework\Encryption\EncryptorInterface
      */
     protected $_encryptor;
 
@@ -96,7 +96,7 @@ class Observer
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\User\Model\UserFactory $userFactory
-     * @param \Magento\Pci\Model\Encryption $encryptor
+     * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
      * @param \Magento\Framework\App\ActionFlag $actionFlag
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      */
@@ -108,7 +108,7 @@ public function __construct(
         \Magento\Backend\Model\Session $session,
         \Magento\Backend\Model\Auth\Session $authSession,
         \Magento\User\Model\UserFactory $userFactory,
-        \Magento\Pci\Model\Encryption $encryptor,
+        \Magento\Framework\Encryption\EncryptorInterface $encryptor,
         \Magento\Framework\App\ActionFlag $actionFlag,
         \Magento\Framework\Message\ManagerInterface $messageManager
     ) {
diff --git a/app/code/Magento/Pci/Model/Encryption.php b/app/code/Magento/Pci/Model/Encryption.php
deleted file mode 100644
index 8754865420b63..0000000000000
--- a/app/code/Magento/Pci/Model/Encryption.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Pci\Model;
-
-use Magento\Framework\Model\Exception;
-use Magento\Framework\Encryption\Crypt;
-use Magento\Framework\App\DeploymentConfig;
-
-/**
- * More sophisticated encryption model, that can:
- * - generate/check hashes of different versions
- * - use different encryption ciphers
- */
-class Encryption extends \Magento\Framework\Encryption\Encryptor
-{
-    const HASH_VERSION_MD5 = 0;
-
-    const HASH_VERSION_SHA256 = 1;
-
-    const HASH_VERSION_LATEST = 1;
-
-    const CIPHER_BLOWFISH = 0;
-
-    const CIPHER_RIJNDAEL_128 = 1;
-
-    const CIPHER_RIJNDAEL_256 = 2;
-
-    const CIPHER_LATEST = 2;
-
-    /**
-     * Indicate cipher
-     *
-     * @var int
-     */
-    protected $_cipher = self::CIPHER_LATEST;
-
-    /**
-     * Version of encryption key
-     *
-     * @var int
-     */
-    protected $_keyVersion;
-
-    /**
-     * Array of encryption keys
-     *
-     * @var string[]
-     */
-    protected $_keys = array();
-
-    /**
-     * @param \Magento\Framework\Math\Random $randomGenerator
-     * @param \Magento\Framework\Encryption\CryptFactory $cryptFactory
-     * @param DeploymentConfig $deploymentConfig
-     */
-    public function __construct(
-        \Magento\Framework\Math\Random $randomGenerator,
-        \Magento\Framework\Encryption\CryptFactory $cryptFactory,
-        DeploymentConfig $deploymentConfig
-    ) {
-        parent::__construct($randomGenerator, $cryptFactory, $deploymentConfig);
-        // load all possible keys
-        $this->_keys = preg_split('/\s+/s', trim($this->_cryptKey));
-        $this->_keyVersion = count($this->_keys) - 1;
-    }
-
-    /**
-     * Check whether specified cipher version is supported
-     *
-     * Returns matched supported version or throws exception
-     *
-     * @param int $version
-     * @return int
-     * @throws Exception
-     */
-    public function validateCipher($version)
-    {
-        $types = array(self::CIPHER_BLOWFISH, self::CIPHER_RIJNDAEL_128, self::CIPHER_RIJNDAEL_256);
-
-        $version = (int)$version;
-        if (!in_array($version, $types, true)) {
-            throw new Exception(__('Not supported cipher version'));
-        }
-        return $version;
-    }
-
-    /**
-     * Validate hash against all supported versions.
-     *
-     * Priority is by newer version.
-     *
-     * @param string $password
-     * @param string $hash
-     * @return bool
-     */
-    public function validateHash($password, $hash)
-    {
-        return $this->validateHashByVersion(
-            $password,
-            $hash,
-            self::HASH_VERSION_SHA256
-        ) || $this->validateHashByVersion(
-            $password,
-            $hash,
-            self::HASH_VERSION_MD5
-        );
-    }
-
-    /**
-     * Hash a string
-     *
-     * @param string $data
-     * @param int $version
-     * @return string
-     */
-    public function hash($data, $version = self::HASH_VERSION_LATEST)
-    {
-        if (self::HASH_VERSION_MD5 === $version) {
-            return md5($data);
-        }
-        return hash('sha256', $data);
-    }
-
-    /**
-     * Validate hash by specified version
-     *
-     * @param string $password
-     * @param string $hash
-     * @param int $version
-     * @return bool
-     */
-    public function validateHashByVersion($password, $hash, $version = self::HASH_VERSION_LATEST)
-    {
-        // look for salt
-        $hashArr = explode(':', $hash, 2);
-        if (1 === count($hashArr)) {
-            return $this->hash($password, $version) === $hash;
-        }
-        list($hash, $salt) = $hashArr;
-        return $this->hash($salt . $password, $version) === $hash;
-    }
-
-    /**
-     * Set cipher to be used for encryption/decryption
-     *
-     * @param int $version
-     * @return $this
-     */
-    //    public function setCipher($version = self::CIPHER_LATEST)
-    //    {
-    //        $this->_cipher = $this->validateCipher($version);
-    //        return $this;
-    //    }
-
-    /**
-     * Attempt to append new key & version
-     *
-     * @param string $key
-     * @return $this
-     */
-    public function setNewKey($key)
-    {
-        parent::validateKey($key);
-        $this->_keys[] = $key;
-        $this->_keyVersion += 1;
-        return $this;
-    }
-
-    /**
-     * Export current keys as string
-     *
-     * @return string
-     */
-    public function exportKeys()
-    {
-        return implode("\n", $this->_keys);
-    }
-
-    /**
-     * Initialize crypt module if needed
-     *
-     * By default initializes with latest key and crypt versions
-     *
-     * @param string $key
-     * @param int $cipherVersion
-     * @param bool $initVector
-     * @return Crypt
-     */
-    protected function _getCrypt($key = null, $cipherVersion = null, $initVector = true)
-    {
-        if (null === $key && null == $cipherVersion) {
-            $cipherVersion = self::CIPHER_RIJNDAEL_256;
-        }
-
-        if (null === $key) {
-            $key = $this->_keys[$this->_keyVersion];
-        }
-        if (null === $cipherVersion) {
-            $cipherVersion = $this->_cipher;
-        }
-        $cipherVersion = $this->validateCipher($cipherVersion);
-
-        if ($cipherVersion === self::CIPHER_RIJNDAEL_128) {
-            $cipher = MCRYPT_RIJNDAEL_128;
-            $mode = MCRYPT_MODE_ECB;
-        } elseif ($cipherVersion === self::CIPHER_RIJNDAEL_256) {
-            $cipher = MCRYPT_RIJNDAEL_256;
-            $mode = MCRYPT_MODE_CBC;
-        } else {
-            $cipher = MCRYPT_BLOWFISH;
-            $mode = MCRYPT_MODE_ECB;
-        }
-
-        return new Crypt($key, $cipher, $mode, $initVector);
-    }
-
-    /**
-     * Look for key and crypt versions in encrypted data before decrypting
-     *
-     * Unsupported/unspecified key version silently fallback to the oldest we have
-     * Unsupported cipher versions eventually throw exception
-     * Unspecified cipher version fallback to the oldest we support
-     *
-     * @param string $data
-     * @return string
-     */
-    public function decrypt($data)
-    {
-        if ($data) {
-            $parts = explode(':', $data, 4);
-            $partsCount = count($parts);
-
-            $initVector = false;
-            // specified key, specified crypt, specified iv
-            if (4 === $partsCount) {
-                list($keyVersion, $cryptVersion, $iv, $data) = $parts;
-                $initVector = $iv ? $iv : false;
-                $keyVersion = (int)$keyVersion;
-                $cryptVersion = self::CIPHER_RIJNDAEL_256;
-                // specified key, specified crypt
-            } elseif (3 === $partsCount) {
-                list($keyVersion, $cryptVersion, $data) = $parts;
-                $keyVersion = (int)$keyVersion;
-                $cryptVersion = (int)$cryptVersion;
-                // no key version = oldest key, specified crypt
-            } elseif (2 === $partsCount) {
-                list($cryptVersion, $data) = $parts;
-                $keyVersion = 0;
-                $cryptVersion = (int)$cryptVersion;
-                // no key version = oldest key, no crypt version = oldest crypt
-            } elseif (1 === $partsCount) {
-                $keyVersion = 0;
-                $cryptVersion = self::CIPHER_BLOWFISH;
-                // not supported format
-            } else {
-                return '';
-            }
-            // no key for decryption
-            if (!isset($this->_keys[$keyVersion])) {
-                return '';
-            }
-            $crypt = $this->_getCrypt($this->_keys[$keyVersion], $cryptVersion, $initVector);
-            return trim($crypt->decrypt(base64_decode((string)$data)));
-        }
-        return '';
-    }
-
-    /**
-     * Prepend key and cipher versions to encrypted data after encrypting
-     *
-     * @param string $data
-     * @return string
-     */
-    public function encrypt($data)
-    {
-        $crypt = $this->_getCrypt();
-        return $this->_keyVersion . ':' . $this->_cipher . ':' . (MCRYPT_MODE_CBC ===
-            $crypt->getMode() ? $crypt->getInitVector() . ':' : '') . base64_encode(
-                $crypt->encrypt((string)$data)
-            );
-    }
-
-    /**
-     * Validate an encryption key
-     *
-     * @param string $key
-     * @return Crypt
-     * @throws \Exception
-     */
-    public function validateKey($key)
-    {
-        if (false !== strpos($key, '<![CDATA[') || false !== strpos($key, ']]>') || preg_match('/\s/s', $key)) {
-            throw new \Exception(__('The encryption key format is invalid.'));
-        }
-        return parent::validateKey($key);
-    }
-}
diff --git a/app/code/Magento/Pci/Model/Observer.php b/app/code/Magento/Pci/Model/Observer.php
index d8f128c9d9c59..15d819c1e5e28 100644
--- a/app/code/Magento/Pci/Model/Observer.php
+++ b/app/code/Magento/Pci/Model/Observer.php
@@ -19,14 +19,14 @@ class Observer
     /**
      * Pci encryption model
      *
-     * @var \Magento\Pci\Model\Encryption
+     * @var \Magento\Framework\Encryption\EncryptorInterface
      */
     protected $_encryptor;
 
     /**
-     * @param \Magento\Pci\Model\Encryption $encryptor
+     * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
      */
-    public function __construct(\Magento\Pci\Model\Encryption $encryptor)
+    public function __construct(\Magento\Framework\Encryption\EncryptorInterface $encryptor)
     {
         $this->_encryptor = $encryptor;
     }
diff --git a/app/code/Magento/Pci/etc/di.xml b/app/code/Magento/Pci/etc/di.xml
deleted file mode 100644
index c98d706443e8f..0000000000000
--- a/app/code/Magento/Pci/etc/di.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Pci\Model\Encryption" />
-</config>
diff --git a/dev/tests/integration/testsuite/Magento/Pci/Model/EncryptionTest.php b/dev/tests/integration/testsuite/Magento/Framework/Encryption/EncryptorTest.php
similarity index 72%
rename from dev/tests/integration/testsuite/Magento/Pci/Model/EncryptionTest.php
rename to dev/tests/integration/testsuite/Magento/Framework/Encryption/EncryptorTest.php
index 561071ba4b719..0e4b121777776 100644
--- a/dev/tests/integration/testsuite/Magento/Pci/Model/EncryptionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Encryption/EncryptorTest.php
@@ -5,19 +5,19 @@
  * @copyright   {copyright}
  * @license     {license_link}
  */
-namespace Magento\Pci\Model;
+namespace Magento\Framework\Encryption;
 
-class EncryptionTest extends \PHPUnit_Framework_TestCase
+class EncryptorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Pci\Model\Encryption
+     * @var \Magento\Framework\Encryption\Encryptor
      */
     protected $_model;
 
     protected function setUp()
     {
         $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Pci\Model\Encryption'
+            'Magento\Framework\Encryption\Encryptor'
         );
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
index 6a864db593f50..d2ffce367d75d 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
@@ -21,27 +21,21 @@ class EncryptorTest extends \PHPUnit_Framework_TestCase
      */
     protected $_randomGenerator;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_cryptFactory;
-
     protected function setUp()
     {
         $this->_randomGenerator = $this->getMock('Magento\Framework\Math\Random', array(), array(), '', false);
-        $this->_cryptFactory = $this->getMock('Magento\Framework\Encryption\CryptFactory', array(), array(), '', false);
         $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', array(), array(), '', false);
         $deploymentConfigMock->expects($this->any())
             ->method('get')
             ->with(Encryptor::PARAM_CRYPT_KEY)
             ->will($this->returnValue('cryptKey'));
-        $this->_model = new Encryptor($this->_randomGenerator, $this->_cryptFactory, $deploymentConfigMock);
+        $this->_model = new \Magento\Framework\Encryption\Encryptor($this->_randomGenerator, $deploymentConfigMock);
     }
 
     public function testGetHashNoSalt()
     {
         $this->_randomGenerator->expects($this->never())->method('getRandomString');
-        $expected = '5f4dcc3b5aa765d61d8327deb882cf99';
+        $expected = '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8';
         $actual = $this->_model->getHash('password');
         $this->assertEquals($expected, $actual);
     }
@@ -49,39 +43,31 @@ public function testGetHashNoSalt()
     public function testGetHashSpecifiedSalt()
     {
         $this->_randomGenerator->expects($this->never())->method('getRandomString');
-        $expected = '67a1e09bb1f83f5007dc119c14d663aa:salt';
+        $expected = '13601bda4ea78e55a07b98866d2be6be0744e3866f13c00c811cab608a28f322:salt';
         $actual = $this->_model->getHash('password', 'salt');
         $this->assertEquals($expected, $actual);
     }
 
     public function testGetHashRandomSaltDefaultLength()
     {
-        $this->_randomGenerator->expects(
-            $this->once()
-        )->method(
-            'getRandomString'
-        )->with(
-            32
-        )->will(
-            $this->returnValue('-----------random_salt----------')
-        );
-        $expected = '7a22dd7ba57a7653cc0f6e58e9ba1aac:-----------random_salt----------';
+        $this->_randomGenerator
+            ->expects($this->once())
+            ->method('getRandomString')
+            ->with(32)
+            ->will($this->returnValue('-----------random_salt----------'));
+        $expected = 'a1c7fc88037b70c9be84d3ad12522c7888f647915db78f42eb572008422ba2fa:-----------random_salt----------';
         $actual = $this->_model->getHash('password', true);
         $this->assertEquals($expected, $actual);
     }
 
     public function testGetHashRandomSaltSpecifiedLength()
     {
-        $this->_randomGenerator->expects(
-            $this->once()
-        )->method(
-            'getRandomString'
-        )->with(
-            11
-        )->will(
-            $this->returnValue('random_salt')
-        );
-        $expected = 'e6730b5a977c225a86cd76025a86a6fc:random_salt';
+        $this->_randomGenerator
+            ->expects($this->once())
+            ->method('getRandomString')
+            ->with(11)
+            ->will($this->returnValue('random_salt'));
+        $expected = '4c5cab8dd00137d11258f8f87b93fd17bd94c5026fc52d3c5af911dd177a2611:random_salt';
         $actual = $this->_model->getHash('password', 11);
         $this->assertEquals($expected, $actual);
     }
@@ -104,29 +90,11 @@ public function validateHashDataProvider()
         return array(
             array('password', 'hash', false),
             array('password', 'hash:salt', false),
-            array('password', '5f4dcc3b5aa765d61d8327deb882cf99', true),
+            array('password', '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8', true),
             array('password', '67a1e09bb1f83f5007dc119c14d663aa:salt', true)
         );
     }
 
-    /**
-     * @param string $password
-     * @param string $hash
-     *
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Invalid hash.
-     * @dataProvider validateHashExceptionDataProvider
-     */
-    public function testValidateHashException($password, $hash)
-    {
-        $this->_model->validateHash($password, $hash);
-    }
-
-    public function validateHashExceptionDataProvider()
-    {
-        return array(array('password', 'hash1:hash2:hash3'), array('password', 'hash1:hash2:hash3:hash4'));
-    }
-
     /**
      * @param mixed $key
      *
@@ -139,7 +107,7 @@ public function testEncryptWithEmptyKey($key)
             ->method('get')
             ->with(Encryptor::PARAM_CRYPT_KEY)
             ->will($this->returnValue($key));
-        $model = new Encryptor($this->_randomGenerator, $this->_cryptFactory, $deploymentConfigMock);
+        $model = new Encryptor($this->_randomGenerator, $deploymentConfigMock);
         $value = 'arbitrary_string';
         $this->assertEquals($value, $model->encrypt($value));
     }
@@ -149,75 +117,49 @@ public function encryptWithEmptyKeyDataProvider()
         return array(array(null), array(0), array(''), array('0'));
     }
 
-    /**
-     * @param string $value
-     * @param string $expected
-     *
-     * @dataProvider encryptDataProvider
-     */
-    public function testEncrypt($value, $expected)
+    public function testEncrypt()
     {
-        $crypt = $this->getMock('Magento\Framework\Encryption\Crypt', array(), array(), '', false);
-        $this->_cryptFactory->expects($this->once())->method('create')->will($this->returnValue($crypt));
-        $crypt->expects($this->once())->method('encrypt')->with($value)->will($this->returnArgument(0));
-        $actual = $this->_model->encrypt($value);
-        $this->assertEquals($expected, $actual);
-    }
+        // sample data to encrypt
+        $data = 'Mares eat oats and does eat oats, but little lambs eat ivy.';
 
-    public function encryptDataProvider()
-    {
-        return array(array('value1', 'dmFsdWUx'), array(true, 'MQ=='));
-    }
+        $actual = $this->_model->encrypt($data);
 
-    /**
-     * @param string $value
-     * @param string $expected
-     *
-     * @dataProvider decryptDataProvider
-     */
-    public function testDecrypt($value, $expected)
-    {
-        $crypt = $this->getMock('Magento\Framework\Encryption\Crypt', array(), array(), '', false);
-        $this->_cryptFactory->expects($this->once())->method('create')->will($this->returnValue($crypt));
-        $crypt->expects($this->once())->method('decrypt')->with($expected)->will($this->returnValue($expected));
-        $actual = $this->_model->decrypt($value);
-        $this->assertEquals($expected, $actual);
-    }
+        // Extract the initialization vector and encrypted data
+        $parts = explode(':', $actual, 4);
+        list(, , $iv, $encryptedData) = $parts;
+        echo $actual;
 
-    public function decryptDataProvider()
-    {
-        return array(array('dmFsdWUx', 'value1'));
+        // Decrypt returned data with RIJNDAEL_256 cipher, cbc mode
+        $crypt = new Crypt('cryptKey', MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC, $iv);
+        // Verify decrypted matches original data
+        $this->assertEquals($data, $crypt->decrypt(base64_decode((string)$encryptedData)));
     }
 
-    public function testValidateKey()
+    public function testDecrypt()
     {
-        $crypt = $this->getMock('Magento\Framework\Encryption\Crypt', array(), array(), '', false);
-        $this->_cryptFactory->expects(
-            $this->once()
-        )->method(
-            'create'
-        )->with(
-            array('key' => 'some_key')
-        )->will(
-            $this->returnValue($crypt)
-        );
-        $this->assertSame($crypt, $this->_model->validateKey('some_key'));
+        // sample data to encrypt
+        $data = '0:2:z3a4ACpkU35W6pV692U4ueCVQP0m0v0p:' .
+            '7ZPIIRZzQrgQH+csfF3fyxYNwbzPTwegncnoTxvI3OZyqKGYlOCTSx5i1KRqNemCC8kuCiOAttLpAymXhzjhNQ==';
+
+        $actual = $this->_model->decrypt($data);
+
+        // Extract the initialization vector and encrypted data
+        $parts = explode(':', $data, 4);
+        list(, , $iv, $encrypted) = $parts;
+
+        // Decrypt returned data with RIJNDAEL_256 cipher, cbc mode
+        $crypt = new Crypt('cryptKey', MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC, $iv);
+        // Verify decrypted matches original data
+        $this->assertEquals($encrypted, base64_encode($crypt->encrypt($actual)));
     }
 
-    public function testValidateKeyDefault()
+    public function testValidateKey()
     {
-        $crypt = $this->getMock('Magento\Framework\Encryption\Crypt', array(), array(), '', false);
-        $this->_cryptFactory->expects(
-            $this->once()
-        )->method(
-            'create'
-        )->with(
-            array('key' => 'cryptKey')
-        )->will(
-            $this->returnValue($crypt)
-        );
-        $this->assertSame($crypt, $this->_model->validateKey(null));
-        // Ensure crypt factory is invoked only once
-        $this->assertSame($crypt, $this->_model->validateKey(null));
+        $actual = $this->_model->validateKey('some_key');
+        $crypt = new Crypt('some_key', MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC, $actual->getInitVector());
+        $expectedEncryptedData = base64_encode($crypt->encrypt('data'));
+        $actualEncryptedData = base64_encode($actual->encrypt('data'));
+        $this->assertEquals($expectedEncryptedData, $actualEncryptedData);
+        $this->assertEquals($crypt->decrypt($expectedEncryptedData), $actual->decrypt($actualEncryptedData));
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Pci/Model/EncryptionTest.php b/dev/tests/unit/testsuite/Magento/Pci/Model/EncryptionTest.php
deleted file mode 100644
index f6e59fb38eba7..0000000000000
--- a/dev/tests/unit/testsuite/Magento/Pci/Model/EncryptionTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Pci\Model;
-
-use Magento\Framework\Encryption\Crypt;
-use Magento\TestFramework\Helper\ObjectManager;
-use Magento\Framework\App\DeploymentConfig;
-
-/**
- * Class EncryptionTest tests Magento\Pci\Model\Encryption
- */
-class EncryptionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testEncrypt()
-    {
-        // sample data to encrypt
-        $data = 'Mares eat oats and does eat oats, but little lambs eat ivy.';
-        $key = 'testKey';
-
-        $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', [], [], '', false);
-        $deploymentConfigMock->expects($this->any())
-            ->method('get')
-            ->with(Encryption::PARAM_CRYPT_KEY)
-            ->will($this->returnValue($key));
-
-        // Encrypt data with known key
-        $objectManager = new ObjectManager($this);
-        /**
-         * @var \Magento\Pci\Model\Encryption
-         */
-        $encryption  = $objectManager->getObject(
-            'Magento\Pci\Model\Encryption',
-            ['deploymentConfig' => $deploymentConfigMock]
-        );
-        $actual = $encryption->encrypt($data);
-
-        // Extract the initialization vector and encrypted data
-        $parts = explode(':', $actual, 4);
-        list(, , $iv, $encryptedData) = $parts;
-
-        // Decrypt returned data with RIJNDAEL_256 cipher, cbc mode
-        $crypt = new Crypt($key, MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC, $iv);
-        // Verify decrypted matches original data
-        $this->assertEquals($data, $crypt->decrypt(base64_decode((string)$encryptedData)));
-    }
-}
diff --git a/lib/internal/Magento/Framework/Encryption/CryptFactory.php b/lib/internal/Magento/Framework/Encryption/CryptFactory.php
deleted file mode 100644
index 229d78ab1dd3a..0000000000000
--- a/lib/internal/Magento/Framework/Encryption/CryptFactory.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Crypt object factory.
- *
- * {license_notice}
- *
- * @copyright {copyright}
- * @license   {license_link}
- */
-namespace Magento\Framework\Encryption;
-
-/**
- * Crypt factory
- */
-class CryptFactory
-{
-    /**
-     * Object manager
-     *
-     * @var \Magento\Framework\ObjectManagerInterface
-     */
-    private $_objectManager;
-
-    /**
-     * @param \Magento\Framework\ObjectManagerInterface $objectManager
-     */
-    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
-    {
-        $this->_objectManager = $objectManager;
-    }
-
-    /**
-     * Create new magento crypt instance
-     *
-     * @param array $data
-     * @return \Magento\Framework\Encryption\Crypt
-     */
-    public function create($data = array())
-    {
-        return $this->_objectManager->create('Magento\Framework\Encryption\Crypt', $data);
-    }
-}
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
index 8da1dc979e0ea..72ecca0881ef7 100644
--- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -15,50 +15,92 @@
 class Encryptor implements EncryptorInterface
 {
     /**
-     * Crypt key
+     * Array key of encryption key in deployment config
      */
     const PARAM_CRYPT_KEY = 'crypt/key';
 
+    /**#@+
+     * Hash and Cipher versions
+     */
+    const HASH_VERSION_MD5 = 0;
+
+    const HASH_VERSION_SHA256 = 1;
+
+    const HASH_VERSION_LATEST = 1;
+
+    const CIPHER_BLOWFISH = 0;
+
+    const CIPHER_RIJNDAEL_128 = 1;
+
+    const CIPHER_RIJNDAEL_256 = 2;
+
+    const CIPHER_LATEST = 2;
+    /**#@-*/
+
     /**
      * Default length of salt in bytes
      */
     const DEFAULT_SALT_LENGTH = 32;
 
     /**
-     * @var \Magento\Framework\Math\Random
+     * Indicate cipher
+     *
+     * @var int
      */
-    protected $_randomGenerator;
+    protected $cipher = self::CIPHER_LATEST;
 
     /**
-     * Cryptographic key
+     * Version of encryption key
      *
-     * @var string
+     * @var int
      */
-    protected $_cryptKey;
+    protected $keyVersion;
 
     /**
-     * @var \Magento\Framework\Encryption\CryptFactory
+     * Array of encryption keys
+     *
+     * @var string[]
      */
-    protected $_cryptFactory;
+    protected $keys = [];
 
     /**
-     * @var \Magento\Framework\Encryption\Crypt
+     * @var \Magento\Framework\Math\Random
      */
-    protected $_crypt;
+    protected $randomGenerator;
 
     /**
      * @param \Magento\Framework\Math\Random $randomGenerator
-     * @param \Magento\Framework\Encryption\CryptFactory $cryptFactory
      * @param DeploymentConfig $deploymentConfig
      */
     public function __construct(
         \Magento\Framework\Math\Random $randomGenerator,
-        \Magento\Framework\Encryption\CryptFactory $cryptFactory,
         DeploymentConfig $deploymentConfig
-    ) {
-        $this->_randomGenerator = $randomGenerator;
-        $this->_cryptFactory = $cryptFactory;
-        $this->_cryptKey = $deploymentConfig->get(self::PARAM_CRYPT_KEY);
+    )
+    {
+        $this->randomGenerator = $randomGenerator;
+        // load all possible keys
+        $this->keys = preg_split('/\s+/s', trim($deploymentConfig->get(self::PARAM_CRYPT_KEY)));
+        $this->keyVersion = count($this->keys) - 1;
+    }
+
+    /**
+     * Check whether specified cipher version is supported
+     *
+     * Returns matched supported version or throws exception
+     *
+     * @param int $version
+     * @return int
+     * @throws \Exception
+     */
+    public function validateCipher($version)
+    {
+        $types = array(self::CIPHER_BLOWFISH, self::CIPHER_RIJNDAEL_128, self::CIPHER_RIJNDAEL_256);
+
+        $version = (int)$version;
+        if (!in_array($version, $types, true)) {
+            throw new \Exception(__('Not supported cipher version'));
+        }
+        return $version;
     }
 
     /**
@@ -83,7 +125,7 @@ public function getHash($password, $salt = false)
             $salt = self::DEFAULT_SALT_LENGTH;
         }
         if (is_integer($salt)) {
-            $salt = $this->_randomGenerator->getRandomString($salt);
+            $salt = $this->randomGenerator->getRandomString($salt);
         }
         return $this->hash($salt . $password) . ':' . $salt;
     }
@@ -92,11 +134,15 @@ public function getHash($password, $salt = false)
      * Hash a string
      *
      * @param string $data
+     * @param int $version
      * @return string
      */
-    public function hash($data)
+    public function hash($data, $version = self::HASH_VERSION_LATEST)
     {
-        return md5($data);
+        if (self::HASH_VERSION_MD5 === $version) {
+            return md5($data);
+        }
+        return hash('sha256', $data);
     }
 
     /**
@@ -104,50 +150,110 @@ public function hash($data)
      *
      * @param string $password
      * @param string $hash
-     * @throws \InvalidArgumentException
      * @return bool
      */
     public function validateHash($password, $hash)
     {
-        $hashArr = explode(':', $hash);
-        switch (count($hashArr)) {
-            case 1:
-                return $this->hash($password) === $hash;
-            case 2:
-                return $this->hash($hashArr[1] . $password) === $hashArr[0];
-            default:
-                break;
+        return $this->validateHashByVersion(
+            $password,
+            $hash,
+            self::HASH_VERSION_SHA256
+        ) || $this->validateHashByVersion(
+            $password,
+            $hash,
+            self::HASH_VERSION_MD5
+        );
+    }
+
+    /**
+     * Validate hash by specified version
+     *
+     * @param string $password
+     * @param string $hash
+     * @param int $version
+     * @return bool
+     */
+    public function validateHashByVersion($password, $hash, $version = self::HASH_VERSION_LATEST)
+    {
+        // look for salt
+        $hashArr = explode(':', $hash, 2);
+        if (1 === count($hashArr)) {
+            return $this->hash($password, $version) === $hash;
         }
-        throw new \InvalidArgumentException('Invalid hash.');
+        list($hash, $salt) = $hashArr;
+        return $this->hash($salt . $password, $version) === $hash;
     }
 
     /**
-     * Encrypt a string
+     * Prepend key and cipher versions to encrypted data after encrypting
      *
      * @param string $data
      * @return string
      */
     public function encrypt($data)
     {
-        if (empty($this->_cryptKey)) {
+        $crypt = $this->getCrypt();
+        if (null === $crypt) {
             return $data;
         }
-        return base64_encode($this->_getCrypt()->encrypt((string)$data));
+        return $this->keyVersion . ':' . $this->cipher . ':' . (MCRYPT_MODE_CBC ===
+        $crypt->getMode() ? $crypt->getInitVector() . ':' : '') . base64_encode(
+            $crypt->encrypt((string)$data)
+        );
     }
 
     /**
-     * Decrypt a string
+     * Look for key and crypt versions in encrypted data before decrypting
+     *
+     * Unsupported/unspecified key version silently fallback to the oldest we have
+     * Unsupported cipher versions eventually throw exception
+     * Unspecified cipher version fallback to the oldest we support
      *
      * @param string $data
      * @return string
      */
     public function decrypt($data)
     {
-        if (empty($this->_cryptKey)) {
-            return $data;
-        }
+        if ($data) {
+            $parts = explode(':', $data, 4);
+            $partsCount = count($parts);
 
-        return trim($this->_getCrypt()->decrypt(base64_decode((string)$data)));
+            $initVector = false;
+            // specified key, specified crypt, specified iv
+            if (4 === $partsCount) {
+                list($keyVersion, $cryptVersion, $iv, $data) = $parts;
+                $initVector = $iv ? $iv : false;
+                $keyVersion = (int)$keyVersion;
+                $cryptVersion = self::CIPHER_RIJNDAEL_256;
+                // specified key, specified crypt
+            } elseif (3 === $partsCount) {
+                list($keyVersion, $cryptVersion, $data) = $parts;
+                $keyVersion = (int)$keyVersion;
+                $cryptVersion = (int)$cryptVersion;
+                // no key version = oldest key, specified crypt
+            } elseif (2 === $partsCount) {
+                list($cryptVersion, $data) = $parts;
+                $keyVersion = 0;
+                $cryptVersion = (int)$cryptVersion;
+                // no key version = oldest key, no crypt version = oldest crypt
+            } elseif (1 === $partsCount) {
+                $keyVersion = 0;
+                $cryptVersion = self::CIPHER_BLOWFISH;
+                // not supported format
+            } else {
+                return '';
+            }
+            // no key for decryption
+            if (!isset($this->keys[$keyVersion])) {
+                return '';
+            }
+            $crypt = $this->getCrypt($this->keys[$keyVersion], $cryptVersion, $initVector);
+            if (null === $crypt) {
+                return $data;
+            }
+            return trim($crypt->decrypt(base64_decode((string)$data)));
+        }
+        return '';
     }
 
     /**
@@ -155,27 +261,78 @@ public function decrypt($data)
      *
      * @param string|null $key NULL value means usage of the default key specified on constructor
      * @return \Magento\Framework\Encryption\Crypt
+     * @throws \Exception
      */
     public function validateKey($key)
     {
-        return $this->_getCrypt($key);
+        if (preg_match('/\s/s', $key)) {
+            throw new \Exception(__('The encryption key format is invalid.'));
+        }
+        return $this->getCrypt($key);
     }
 
     /**
-     * Instantiate crypt model
+     * Attempt to append new key & version
      *
-     * @param string|null $key NULL value means usage of the default key specified on constructor
-     * @return \Magento\Framework\Encryption\Crypt
+     * @param string $key
+     * @return $this
      */
-    protected function _getCrypt($key = null)
+    public function setNewKey($key)
     {
-        if ($key === null) {
-            if (!$this->_crypt) {
-                $this->_crypt = $this->_cryptFactory->create(array('key' => $this->_cryptKey));
+        $this->validateKey($key);
+        $this->keys[] = $key;
+        $this->keyVersion += 1;
+        return $this;
+    }
+
+    /**
+     * Export current keys as string
+     *
+     * @return string
+     */
+    public function exportKeys()
+    {
+        return implode("\n", $this->keys);
+    }
+
+    /**
+     * Initialize crypt module if needed
+     *
+     * By default initializes with latest key and crypt versions
+     *
+     * @param string $key
+     * @param int $cipherVersion
+     * @param bool $initVector
+     * @return Crypt|null
+     */
+    protected function getCrypt($key = null, $cipherVersion = null, $initVector = true)
+    {
+        if (null === $key && null == $cipherVersion) {
+            $cipherVersion = self::CIPHER_RIJNDAEL_256;
+        }
+
+        if (null === $key) {
+            $key = $this->keys[$this->keyVersion];
+            if (!$key) {
+                return null;
             }
-            return $this->_crypt;
+        }
+        if (null === $cipherVersion) {
+            $cipherVersion = $this->cipher;
+        }
+        $cipherVersion = $this->validateCipher($cipherVersion);
+
+        if ($cipherVersion === self::CIPHER_RIJNDAEL_128) {
+            $cipher = MCRYPT_RIJNDAEL_128;
+            $mode = MCRYPT_MODE_ECB;
+        } elseif ($cipherVersion === self::CIPHER_RIJNDAEL_256) {
+            $cipher = MCRYPT_RIJNDAEL_256;
+            $mode = MCRYPT_MODE_CBC;
         } else {
-            return $this->_cryptFactory->create(array('key' => $key));
+            $cipher = MCRYPT_BLOWFISH;
+            $mode = MCRYPT_MODE_ECB;
         }
+
+        return new Crypt($key, $cipher, $mode, $initVector);
     }
 }

From 383be9ffbac1173bf66351911aeac2bf19ed2728 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Mon, 24 Nov 2014 19:16:37 -0600
Subject: [PATCH 024/474] MAGETWO-30852: Old encryption key did not saved after
 update

- fixing L1, L3 tests
---
 app/code/Magento/Pbridge/composer.json                        | 1 -
 app/code/Magento/Pbridge/etc/module.xml                       | 1 -
 app/code/Magento/Pci/Controller/Adminhtml/Crypt/Key/Save.php  | 2 +-
 .../Pbridge/Block/Checkout/Payment/Review/IframeTest.php      | 2 +-
 .../Magento/Pbridge/Block/Payment/Form/AbstractFormTest.php   | 2 +-
 dev/tests/unit/testsuite/Magento/Pci/Model/ObserverTest.php   | 4 ++--
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Pbridge/composer.json b/app/code/Magento/Pbridge/composer.json
index fabe9049b6eeb..b814a62750849 100644
--- a/app/code/Magento/Pbridge/composer.json
+++ b/app/code/Magento/Pbridge/composer.json
@@ -10,7 +10,6 @@
         "magento/module-checkout": "0.1.0-alpha104",
         "magento/module-directory": "0.1.0-alpha104",
         "magento/module-payment": "0.1.0-alpha104",
-        "magento/module-pci": "0.1.0-alpha104",
         "magento/module-sales": "0.1.0-alpha104",
         "magento/module-centinel": "0.1.0-alpha104",
         "magento/framework": "0.1.0-alpha104",
diff --git a/app/code/Magento/Pbridge/etc/module.xml b/app/code/Magento/Pbridge/etc/module.xml
index fbaba936b357f..b6b4e466faf80 100644
--- a/app/code/Magento/Pbridge/etc/module.xml
+++ b/app/code/Magento/Pbridge/etc/module.xml
@@ -20,7 +20,6 @@
             <module name="Magento_Checkout"/>
             <module name="Magento_Directory"/>
             <module name="Magento_Payment"/>
-            <module name="Magento_Pci"/>
             <module name="Magento_Sales"/>
             <module name="Magento_Centinel"/>
         </depends>
diff --git a/app/code/Magento/Pci/Controller/Adminhtml/Crypt/Key/Save.php b/app/code/Magento/Pci/Controller/Adminhtml/Crypt/Key/Save.php
index 6ee75ef5b2fde..d94ce12ec31ee 100644
--- a/app/code/Magento/Pci/Controller/Adminhtml/Crypt/Key/Save.php
+++ b/app/code/Magento/Pci/Controller/Adminhtml/Crypt/Key/Save.php
@@ -25,7 +25,7 @@ public function execute()
                 if (empty($key)) {
                     throw new \Exception(__('Please enter an encryption key.'));
                 }
-                $this->_objectManager->get('Magento\Pci\Model\Encryption')->validateKey($key);
+                $this->_objectManager->get('Magento\Framework\Encryption\EncryptorInterface')->validateKey($key);
             }
 
             $newKey = $this->_objectManager->get('Magento\Pci\Model\Resource\Key\Change')->changeEncryptionKey($key);
diff --git a/dev/tests/integration/testsuite/Magento/Pbridge/Block/Checkout/Payment/Review/IframeTest.php b/dev/tests/integration/testsuite/Magento/Pbridge/Block/Checkout/Payment/Review/IframeTest.php
index 8fcb76ee28ef0..7164336242559 100644
--- a/dev/tests/integration/testsuite/Magento/Pbridge/Block/Checkout/Payment/Review/IframeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Pbridge/Block/Checkout/Payment/Review/IframeTest.php
@@ -14,7 +14,7 @@ public function testGetSourceUrl()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-        $encryption = $this->getMock('Magento\Pci\Model\Encryption', [], [], '', false);
+        $encryption = $this->getMock('Magento\Framework\Encryption\Encryptor', [], [], '', false);
         $encryption->expects($this->any())
             ->method('encrypt')
             ->will($this->returnArgument(0));
diff --git a/dev/tests/integration/testsuite/Magento/Pbridge/Block/Payment/Form/AbstractFormTest.php b/dev/tests/integration/testsuite/Magento/Pbridge/Block/Payment/Form/AbstractFormTest.php
index f0668aaaad5f8..9457106f7380f 100644
--- a/dev/tests/integration/testsuite/Magento/Pbridge/Block/Payment/Form/AbstractFormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Pbridge/Block/Payment/Form/AbstractFormTest.php
@@ -14,7 +14,7 @@ public function testGetSourceUrl()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-        $encryption = $this->getMock('Magento\Pci\Model\Encryption', [], [], '', false);
+        $encryption = $this->getMock('Magento\Framework\Encryption\Encryptor', [], [], '', false);
         $encryption->expects($this->any())
             ->method('encrypt')
             ->will($this->returnArgument(0));
diff --git a/dev/tests/unit/testsuite/Magento/Pci/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Pci/Model/ObserverTest.php
index 4836d6d296362..a5de5790dde78 100644
--- a/dev/tests/unit/testsuite/Magento/Pci/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Pci/Model/ObserverTest.php
@@ -10,7 +10,7 @@
 class ObserverTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Pci\Model\Encryption|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Encryption\Encryptor|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $encryptorMock;
 
@@ -27,7 +27,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->encryptorMock = $this->getMockBuilder(
-            '\Magento\Pci\Model\Encryption'
+            '\Magento\Framework\Encryption\Encryptor'
         )->disableOriginalConstructor()->getMock();
         $this->encryptorMock->expects($this->any())->method('validateHashByVersion')->will(
             $this->returnCallback(

From c0740cfd8948aee6201f90c3e1255316ac01f1f7 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Tue, 18 Nov 2014 17:55:13 -0600
Subject: [PATCH 025/474] MAGETWO-29704: composer.json Files Optimized

- declared only necessary dependencies on ZF2 components
- declared 'setup' dependencies also in root composer.json in order to run  'composer install' once
---
 composer.json                                 |   25 +-
 composer.lock                                 | 1277 ++++++++++++++++-
 dev/build/core_dev/util.xml                   |    3 -
 dev/build/publication/sanity/ce.xml           |    3 -
 .../Test/Php/_files/blacklist/common.txt      |    1 -
 .../Php/_files/phpcpd/blacklist/common.txt    |    1 -
 .../Php/_files/phpcs/blacklist/common.txt     |    1 -
 setup/composer.json                           |   35 +-
 setup/index.php                               |   24 +-
 9 files changed, 1319 insertions(+), 51 deletions(-)

diff --git a/composer.json b/composer.json
index 7aa19b68c950c..7db1cf905d945 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,23 @@
     "require-dev": {
         "phpunit/phpunit": "4.1.0",
         "squizlabs/php_codesniffer": "1.5.3",
-        "phpmd/phpmd" : "@stable"
+        "phpmd/phpmd" : "@stable",
+        "zendframework/zend-console": "2.3.1",
+        "zendframework/zend-modulemanager": "2.3.1",
+        "zendframework/zend-mvc": "2.3.1",
+        "zendframework/zend-eventmanager": "2.3.1",
+        "zendframework/zend-view": "2.3.1",
+        "zendframework/zend-text": "2.3.1",
+        "zendframework/zend-servicemanager": "2.3.1",
+        "zendframework/zend-json": "2.3.1",
+        "zendframework/zend-db": "2.3.1",
+        "zendframework/zend-config": "2.3.1",
+        "zendframework/zend-form": "2.3.1",
+        "zendframework/zend-di": "2.3.1",
+        "zendframework/zend-serializer": "2.3.1",
+        "zendframework/zend-log": "2.3.1",
+        "zendframework/zend-http": "2.3.1",
+        "composer/composer": "1.0.0-alpha8"
     },
     "replace": {
         "magento/module-admin-gws": "self.version",
@@ -218,7 +234,12 @@
             "Magento\\Tools\\Sanity\\": "dev/build/publication/sanity/Magento/Tools/Sanity/",
             "Magento\\TestFramework\\Inspection\\": "dev/tests/static/framework/Magento/TestFramework/Inspection/",
             "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/",
-            "Magento\\ToolkitFramework\\": "dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/"
+            "Magento\\ToolkitFramework\\": "dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/",
+            "Magento\\Composer\\": "setup/module/Magento/Composer/src/",
+            "Magento\\Filesystem\\": "setup/module/Magento/Filesystem/src/",
+            "Magento\\Locale\\": "setup/module/Magento/Locale/src/",
+            "Magento\\Setup\\": "setup/module/Magento/Setup/src/",
+            "Magento\\Config\\": "setup/module/Magento/Config/src/"
         }
     }
 }
diff --git a/composer.lock b/composer.lock
index 23e4f62de1413..6c2c3270f301e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7d4aedd5933d1f5a16cae6f4a037222e",
+    "hash": "8ed5f5a5feae32600e19de7192382066",
     "packages": [
         {
             "name": "magento/zendframework1",
@@ -431,6 +431,76 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "composer/composer",
+            "version": "1.0.0-alpha8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/composer.git",
+                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/composer/zipball/1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
+                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
+                "shasum": ""
+            },
+            "require": {
+                "justinrainbow/json-schema": "1.1.*",
+                "php": ">=5.3.2",
+                "seld/jsonlint": "1.*",
+                "symfony/console": "~2.3",
+                "symfony/finder": "~2.2",
+                "symfony/process": "~2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7.10"
+            },
+            "suggest": {
+                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+                "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic"
+            },
+            "bin": [
+                "bin/composer"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Composer": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Dependency Manager",
+            "homepage": "http://getcomposer.org/",
+            "keywords": [
+                "autoload",
+                "dependency",
+                "package"
+            ],
+            "time": "2014-01-06 18:39:59"
+        },
         {
             "name": "doctrine/instantiator",
             "version": "1.0.4",
@@ -485,6 +555,61 @@
             ],
             "time": "2014-10-13 12:58:55"
         },
+        {
+            "name": "justinrainbow/json-schema",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/justinrainbow/json-schema.git",
+                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
+                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "JsonSchema": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "NewBSD"
+            ],
+            "authors": [
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch",
+                    "homepage": "http://wiedler.ch/igor/"
+                },
+                {
+                    "name": "Bruno Prieto Reis",
+                    "email": "bruno.p.reis@gmail.com"
+                },
+                {
+                    "name": "Justin Rainbow",
+                    "email": "justin.rainbow@gmail.com"
+                },
+                {
+                    "name": "Robert Schönthal",
+                    "email": "robert.schoenthal@gmail.com",
+                    "homepage": "http://digitalkaoz.net"
+                }
+            ],
+            "description": "A library to validate a json schema.",
+            "homepage": "https://github.com/justinrainbow/json-schema",
+            "keywords": [
+                "json",
+                "schema"
+            ],
+            "time": "2012-01-03 00:33:17"
+        },
         {
             "name": "pdepend/pdepend",
             "version": "2.0.3",
@@ -1203,6 +1328,52 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "time": "2014-03-07 15:35:33"
         },
+        {
+            "name": "seld/jsonlint",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/jsonlint.git",
+                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/a7bc2ec9520ad15382292591b617c43bdb1fec35",
+                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "bin": [
+                "bin/jsonlint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "JSON Linter",
+            "keywords": [
+                "json",
+                "linter",
+                "parser",
+                "validator"
+            ],
+            "time": "2014-09-05 15:36:20"
+        },
         {
             "name": "squizlabs/php_codesniffer",
             "version": "1.5.3",
@@ -1326,6 +1497,61 @@
             "homepage": "http://symfony.com",
             "time": "2014-11-20 13:22:25"
         },
+        {
+            "name": "symfony/console",
+            "version": "v2.5.7",
+            "target-dir": "Symfony/Component/Console",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Console.git",
+                "reference": "61b13c27c9258e97009249d4ef193c964bf346b7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/61b13c27c9258e97009249d4ef193c964bf346b7",
+                "reference": "61b13c27c9258e97009249d4ef193c964bf346b7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Console\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-11-20 13:22:25"
+        },
         {
             "name": "symfony/dependency-injection",
             "version": "v2.5.7",
@@ -1429,12 +1655,1059 @@
             "description": "Symfony Filesystem Component",
             "homepage": "http://symfony.com",
             "time": "2014-11-16 17:28:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v2.5.7",
+            "target-dir": "Symfony/Component/Finder",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Finder.git",
+                "reference": "743aabbf4958663ef626e10ae3a6c7b17a0fa3bd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Finder/zipball/743aabbf4958663ef626e10ae3a6c7b17a0fa3bd",
+                "reference": "743aabbf4958663ef626e10ae3a6c7b17a0fa3bd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Finder\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-10-26 07:41:27"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v2.5.7",
+            "target-dir": "Symfony/Component/Process",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Process.git",
+                "reference": "ffe6e27a57e31262c3204a0955076c27c54c8e7e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Process/zipball/ffe6e27a57e31262c3204a0955076c27c54c8e7e",
+                "reference": "ffe6e27a57e31262c3204a0955076c27c54c8e7e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Process\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-11-03 19:48:45"
+        },
+        {
+            "name": "zendframework/zend-config",
+            "version": "2.3.1",
+            "target-dir": "Zend/Config",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendConfig.git",
+                "reference": "61b81c6ea60c1947e13b4effbfffcd9bb59c2180"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendConfig/zipball/61b81c6ea60c1947e13b4effbfffcd9bb59c2180",
+                "reference": "61b81c6ea60c1947e13b4effbfffcd9bb59c2180",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-i18n": "self.version",
+                "zendframework/zend-json": "self.version",
+                "zendframework/zend-servicemanager": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Config\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
+            "keywords": [
+                "config",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:04"
+        },
+        {
+            "name": "zendframework/zend-console",
+            "version": "2.3.1",
+            "target-dir": "Zend/Console",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendConsole.git",
+                "reference": "6720a94d30272eefe10bef4801cc41a027530b1c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendConsole/zipball/6720a94d30272eefe10bef4801cc41a027530b1c",
+                "reference": "6720a94d30272eefe10bef4801cc41a027530b1c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Console\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "console",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:14"
+        },
+        {
+            "name": "zendframework/zend-db",
+            "version": "2.3.1",
+            "target-dir": "Zend/Db",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendDb.git",
+                "reference": "29bb7f1ceacb32fa3e1c122bc3d14da6490aba2c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendDb/zipball/29bb7f1ceacb32fa3e1c122bc3d14da6490aba2c",
+                "reference": "29bb7f1ceacb32fa3e1c122bc3d14da6490aba2c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23"
+            },
+            "require-dev": {
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-eventmanager": "Zend\\EventManager component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-stdlib": "Zend\\Stdlib component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Db\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "db",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:07"
+        },
+        {
+            "name": "zendframework/zend-di",
+            "version": "2.3.1",
+            "target-dir": "Zend/Di",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendDi.git",
+                "reference": "45450000c83937a73a261a32480637b4198f4cea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendDi/zipball/45450000c83937a73a261a32480637b4198f4cea",
+                "reference": "45450000c83937a73a261a32480637b4198f4cea",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-code": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-servicemanager": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Di\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "di",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:10"
+        },
+        {
+            "name": "zendframework/zend-filter",
+            "version": "2.3.1",
+            "target-dir": "Zend/Filter",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendFilter.git",
+                "reference": "1889b7aa499beccadac770780a73e1a40e0f8a53"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendFilter/zipball/1889b7aa499beccadac770780a73e1a40e0f8a53",
+                "reference": "1889b7aa499beccadac770780a73e1a40e0f8a53",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-crypt": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-uri": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-crypt": "Zend\\Crypt component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Filter\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a set of commonly needed data filters",
+            "keywords": [
+                "filter",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:28:47"
+        },
+        {
+            "name": "zendframework/zend-form",
+            "version": "2.3.1",
+            "target-dir": "Zend/Form",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendForm.git",
+                "reference": "2e91090e63f865c1c0b8c21157d4eaffad341f59"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendForm/zipball/2e91090e63f865c1c0b8c21157d4eaffad341f59",
+                "reference": "2e91090e63f865c1c0b8c21157d4eaffad341f59",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-inputfilter": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-captcha": "self.version",
+                "zendframework/zend-code": "self.version",
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-i18n": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-validator": "self.version",
+                "zendframework/zend-view": "self.version",
+                "zendframework/zendservice-recaptcha": "*"
+            },
+            "suggest": {
+                "zendframework/zend-captcha": "Zend\\Captcha component",
+                "zendframework/zend-code": "Zend\\Code component",
+                "zendframework/zend-eventmanager": "Zend\\EventManager component",
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-validator": "Zend\\Validator component",
+                "zendframework/zend-view": "Zend\\View component",
+                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Form\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "form",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:02"
+        },
+        {
+            "name": "zendframework/zend-http",
+            "version": "2.3.1",
+            "target-dir": "Zend/Http",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendHttp.git",
+                "reference": "b13fc4c30c39364409ef68a9f9b5975765a3ff5a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendHttp/zipball/b13fc4c30c39364409ef68a9f9b5975765a3ff5a",
+                "reference": "b13fc4c30c39364409ef68a9f9b5975765a3ff5a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-loader": "self.version",
+                "zendframework/zend-stdlib": "self.version",
+                "zendframework/zend-uri": "self.version",
+                "zendframework/zend-validator": "self.version"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Http\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
+            "keywords": [
+                "http",
+                "zf2"
+            ],
+            "time": "2014-04-15 14:47:18"
+        },
+        {
+            "name": "zendframework/zend-inputfilter",
+            "version": "2.3.1",
+            "target-dir": "Zend/InputFilter",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendInputFilter.git",
+                "reference": "a45d2180c819f9ff9e74be1bf4c5c8dd1d9649e9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendInputFilter/zipball/a45d2180c819f9ff9e74be1bf4c5c8dd1d9649e9",
+                "reference": "a45d2180c819f9ff9e74be1bf4c5c8dd1d9649e9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-stdlib": "self.version",
+                "zendframework/zend-validator": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-servicemanager": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-servicemanager": "To support plugin manager support"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\InputFilter\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "inputfilter",
+                "zf2"
+            ],
+            "time": "2014-04-15 14:47:18"
+        },
+        {
+            "name": "zendframework/zend-json",
+            "version": "2.3.1",
+            "target-dir": "Zend/Json",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendJson.git",
+                "reference": "eb281da42d3f5bba5acb664359029b6fa7c62e28"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendJson/zipball/eb281da42d3f5bba5acb664359029b6fa7c62e28",
+                "reference": "eb281da42d3f5bba5acb664359029b6fa7c62e28",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-http": "self.version",
+                "zendframework/zend-server": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-http": "Zend\\Http component",
+                "zendframework/zend-server": "Zend\\Server component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Json\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
+            "keywords": [
+                "json",
+                "zf2"
+            ],
+            "time": "2014-04-15 14:47:18"
+        },
+        {
+            "name": "zendframework/zend-loader",
+            "version": "2.3.1",
+            "target-dir": "Zend/Loader",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendLoader.git",
+                "reference": "37abb23b0b2608584673f8388d1563a1fd604f09"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendLoader/zipball/37abb23b0b2608584673f8388d1563a1fd604f09",
+                "reference": "37abb23b0b2608584673f8388d1563a1fd604f09",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Loader\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "loader",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:28:53"
+        },
+        {
+            "name": "zendframework/zend-log",
+            "version": "2.3.1",
+            "target-dir": "Zend/Log",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendLog.git",
+                "reference": "606ef20717a935afec1400f54bd1b03faf859c47"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendLog/zipball/606ef20717a935afec1400f54bd1b03faf859c47",
+                "reference": "606ef20717a935afec1400f54bd1b03faf859c47",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-console": "self.version",
+                "zendframework/zend-db": "self.version",
+                "zendframework/zend-escaper": "self.version",
+                "zendframework/zend-mail": "self.version",
+                "zendframework/zend-validator": "self.version"
+            },
+            "suggest": {
+                "ext-mongo": "*",
+                "zendframework/zend-console": "Zend\\Console component",
+                "zendframework/zend-db": "Zend\\Db component",
+                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML formatter",
+                "zendframework/zend-mail": "Zend\\Mail component",
+                "zendframework/zend-validator": "Zend\\Validator component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Log\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "component for general purpose logging",
+            "keywords": [
+                "log",
+                "logging",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:28:45"
+        },
+        {
+            "name": "zendframework/zend-math",
+            "version": "2.3.1",
+            "target-dir": "Zend/Math",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendMath.git",
+                "reference": "be6de5ba3d47e3f9a6732badea8bc724c49d0552"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendMath/zipball/be6de5ba3d47e3f9a6732badea8bc724c49d0552",
+                "reference": "be6de5ba3d47e3f9a6732badea8bc724c49d0552",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23"
+            },
+            "suggest": {
+                "ext-bcmath": "If using the bcmath functionality",
+                "ext-gmp": "If using the gmp functionality",
+                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
+                "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Math\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "math",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:09"
+        },
+        {
+            "name": "zendframework/zend-modulemanager",
+            "version": "2.3.1",
+            "target-dir": "Zend/ModuleManager",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendModuleManager.git",
+                "reference": "bfff608492fdfea1f2b815285e0ed8b467a99c9f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendModuleManager/zipball/bfff608492fdfea1f2b815285e0ed8b467a99c9f",
+                "reference": "bfff608492fdfea1f2b815285e0ed8b467a99c9f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-config": "self.version",
+                "zendframework/zend-console": "self.version",
+                "zendframework/zend-loader": "self.version",
+                "zendframework/zend-mvc": "self.version",
+                "zendframework/zend-servicemanager": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-config": "Zend\\Config component",
+                "zendframework/zend-console": "Zend\\Console component",
+                "zendframework/zend-loader": "Zend\\Loader component",
+                "zendframework/zend-mvc": "Zend\\Mvc component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\ModuleManager\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "modulemanager",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:28:50"
+        },
+        {
+            "name": "zendframework/zend-mvc",
+            "version": "2.3.1",
+            "target-dir": "Zend/Mvc",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendMvc.git",
+                "reference": "d7708af7028aa6c42255fe2d9ece53f0e5d76e2c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendMvc/zipball/d7708af7028aa6c42255fe2d9ece53f0e5d76e2c",
+                "reference": "d7708af7028aa6c42255fe2d9ece53f0e5d76e2c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-authentication": "self.version",
+                "zendframework/zend-console": "self.version",
+                "zendframework/zend-di": "self.version",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-form": "self.version",
+                "zendframework/zend-http": "self.version",
+                "zendframework/zend-i18n": "self.version",
+                "zendframework/zend-inputfilter": "self.version",
+                "zendframework/zend-json": "self.version",
+                "zendframework/zend-log": "self.version",
+                "zendframework/zend-modulemanager": "self.version",
+                "zendframework/zend-serializer": "self.version",
+                "zendframework/zend-session": "self.version",
+                "zendframework/zend-text": "self.version",
+                "zendframework/zend-uri": "self.version",
+                "zendframework/zend-validator": "self.version",
+                "zendframework/zend-version": "self.version",
+                "zendframework/zend-view": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
+                "zendframework/zend-config": "Zend\\Config component",
+                "zendframework/zend-console": "Zend\\Console component",
+                "zendframework/zend-di": "Zend\\Di component",
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-form": "Zend\\Form component",
+                "zendframework/zend-http": "Zend\\Http component",
+                "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
+                "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
+                "zendframework/zend-json": "Zend\\Json component",
+                "zendframework/zend-log": "Zend\\Log component",
+                "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
+                "zendframework/zend-stdlib": "Zend\\Stdlib component",
+                "zendframework/zend-text": "Zend\\Text component",
+                "zendframework/zend-uri": "Zend\\Uri component",
+                "zendframework/zend-validator": "Zend\\Validator component",
+                "zendframework/zend-version": "Zend\\Version component",
+                "zendframework/zend-view": "Zend\\View component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Mvc\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "mvc",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:05"
+        },
+        {
+            "name": "zendframework/zend-serializer",
+            "version": "2.3.1",
+            "target-dir": "Zend/Serializer",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendSerializer.git",
+                "reference": "3187aa2a9c9713932f84006700f922ee1253328d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendSerializer/zipball/3187aa2a9c9713932f84006700f922ee1253328d",
+                "reference": "3187aa2a9c9713932f84006700f922ee1253328d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-json": "self.version",
+                "zendframework/zend-math": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-servicemanager": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-servicemanager": "To support plugin manager support"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Serializer\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
+            "keywords": [
+                "serializer",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:03"
+        },
+        {
+            "name": "zendframework/zend-servicemanager",
+            "version": "2.3.1",
+            "target-dir": "Zend/ServiceManager",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendServiceManager.git",
+                "reference": "652ab6e142b7afd1eede8f0f33b47d2599786c84"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendServiceManager/zipball/652ab6e142b7afd1eede8f0f33b47d2599786c84",
+                "reference": "652ab6e142b7afd1eede8f0f33b47d2599786c84",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23"
+            },
+            "require-dev": {
+                "zendframework/zend-di": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-di": "Zend\\Di component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\ServiceManager\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "servicemanager",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:28:43"
+        },
+        {
+            "name": "zendframework/zend-text",
+            "version": "2.3.1",
+            "target-dir": "Zend/Text",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendText.git",
+                "reference": "74215098b67b89e61ed8d1bf82c4fe79fa311885"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendText/zipball/74215098b67b89e61ed8d1bf82c4fe79fa311885",
+                "reference": "74215098b67b89e61ed8d1bf82c4fe79fa311885",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Text\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "text",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:13"
+        },
+        {
+            "name": "zendframework/zend-view",
+            "version": "2.3.1",
+            "target-dir": "Zend/View",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendView.git",
+                "reference": "71b6c73d4ba2f5908fe64b2a554064b22443e327"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendView/zipball/71b6c73d4ba2f5908fe64b2a554064b22443e327",
+                "reference": "71b6c73d4ba2f5908fe64b2a554064b22443e327",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-loader": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-authentication": "self.version",
+                "zendframework/zend-escaper": "self.version",
+                "zendframework/zend-feed": "self.version",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-http": "self.version",
+                "zendframework/zend-i18n": "self.version",
+                "zendframework/zend-json": "self.version",
+                "zendframework/zend-mvc": "self.version",
+                "zendframework/zend-navigation": "self.version",
+                "zendframework/zend-paginator": "self.version",
+                "zendframework/zend-permissions-acl": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-uri": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-authentication": "Zend\\Authentication component",
+                "zendframework/zend-escaper": "Zend\\Escaper component",
+                "zendframework/zend-feed": "Zend\\Feed component",
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-http": "Zend\\Http component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-json": "Zend\\Json component",
+                "zendframework/zend-mvc": "Zend\\Mvc component",
+                "zendframework/zend-navigation": "Zend\\Navigation component",
+                "zendframework/zend-paginator": "Zend\\Paginator component",
+                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-uri": "Zend\\Uri component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\View\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a system of helpers, output filters, and variable escaping",
+            "keywords": [
+                "view",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:28:55"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "phpmd/phpmd": 0
+        "phpmd/phpmd": 0,
+        "composer/composer": 15
     },
     "prefer-stable": false,
     "platform": {
diff --git a/dev/build/core_dev/util.xml b/dev/build/core_dev/util.xml
index ad4565a6b5308..0b5ebe1e07072 100644
--- a/dev/build/core_dev/util.xml
+++ b/dev/build/core_dev/util.xml
@@ -144,9 +144,6 @@
         <antcall target="_composer_install_dir">
             <param name="target_composer_dir" value="${product_root_dir}"/>
         </antcall>
-        <antcall target="_composer_install_dir">
-            <param name="target_composer_dir" value="${product_root_dir}/setup"/>
-        </antcall>
     </target>
 
     <target name="_code_coverage_configuration" depends="_product_location" description="Code Coverage configuration">
diff --git a/dev/build/publication/sanity/ce.xml b/dev/build/publication/sanity/ce.xml
index 3ae50d69dc2cd..1535d6ca00842 100644
--- a/dev/build/publication/sanity/ce.xml
+++ b/dev/build/publication/sanity/ce.xml
@@ -84,9 +84,6 @@
         <item>
             <path>vendor</path>
         </item>
-        <item>
-            <path>setup/vendor</path>
-        </item>
         <item>
             <path>CHANGELOG.md</path>
         </item>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt
index e3f96f5631302..5e0a7b508a111 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/common.txt
@@ -119,4 +119,3 @@ lib/internal/Magento/Framework/System
 lib/internal/Magento/Framework/Util.php
 lib/internal/Magento/Framework/Xml
 vendor
-setup/vendor
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 35eb41a500d66..e327d52f55650 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -128,7 +128,6 @@ setup
 Magento/Sales/Service/V1
 Magento/Shipping/Controller/Adminhtml/Order/Shipment
 vendor
-setup/vendor
 Magento/CatalogSearch/Model/Resource/Fulltext
 lib/internal/Magento/Framework/Data
 lib/internal/Magento/Framework/Service
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
index 7e026c8f79932..b08055eedb4f7 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/blacklist/common.txt
@@ -39,4 +39,3 @@ dev/tests/unit/testsuite/Magento
 # Newer version of phpcs does not complain about spacing issue.  This appears to be a bug in the phpcs version that is currently run in bamboo.
 app/code/Magento/Sales/Model/Order/Payment/Transaction.php
 vendor
-setup/vendor
diff --git a/setup/composer.json b/setup/composer.json
index 840d53e649008..6b74d926e23b9 100644
--- a/setup/composer.json
+++ b/setup/composer.json
@@ -1,10 +1,26 @@
 {
     "name": "magento/project-setup",
-    "version": "0.1.0",
+    "version": "0.1.0-alpha104",
     "require": {
-        "zendframework/zendframework": "2.3.1",
-        "composer/composer": "1.0.0-alpha8",
-        "magento/zendframework1": "1.12.9"
+        "zendframework/zend-console": "2.3.1",
+        "zendframework/zend-modulemanager": "2.3.1",
+        "zendframework/zend-mvc": "2.3.1",
+        "zendframework/zend-eventmanager": "2.3.1",
+        "zendframework/zend-view": "2.3.1",
+        "zendframework/zend-text": "2.3.1",
+        "zendframework/zend-servicemanager": "2.3.1",
+        "zendframework/zend-stdlib": "2.3.1",
+        "zendframework/zend-json": "2.3.1",
+        "zendframework/zend-db": "2.3.1",
+        "zendframework/zend-uri": "2.3.1",
+        "zendframework/zend-config": "2.3.1",
+        "zendframework/zend-form": "2.3.1",
+        "zendframework/zend-di": "2.3.1",
+        "zendframework/zend-serializer": "2.3.1",
+        "zendframework/zend-log": "2.3.1",
+        "zendframework/zend-http": "2.3.1",
+        "magento/zendframework1": "1.12.9",
+        "composer/composer": "1.0.0-alpha8"
     },
     "repositories": [
         {
@@ -12,11 +28,6 @@
             "url":"git@github.corp.ebay.com:magento2/zf1"
         }
     ],
-    "require-dev": {
-        "phpunit/phpunit": "4.1.*",
-        "squizlabs/php_codesniffer": "1.*",
-        "phpmd/phpmd" : "1.4.*"
-    },
     "autoload": {
         "psr-4": {
             "Magento\\Composer\\": "module/Magento/Composer/src/",
@@ -26,11 +37,5 @@
             "Magento\\Config\\": "module/Magento/Config/src/",
             "Magento\\": ["../app/code/Magento/", "../lib/internal/Magento/"]
         }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Magento\\Setup\\Tests\\": "module/Magento/Setup/tests/",
-            "Magento\\Config\\Tests\\": "module/Magento/Config/tests/"
-        }
     }
 }
diff --git a/setup/index.php b/setup/index.php
index 0f9e5e9e88863..28094f85094d8 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -6,27 +6,5 @@
  * @license   {license_link}
  */
 
-$autoload = __DIR__ . '/vendor/autoload.php';
-
-define('BP', dirname(__DIR__));
-
-if (!file_exists($autoload)) {
-    if (PHP_SAPI == 'cli') {
-        echo "Dependencies not installed. Please run 'composer install' under /setup directory.\n";
-    } else {
-        echo <<<HTML
-<div style="font:12px/1.35em arial, helvetica, sans-serif;">
-    <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
-        <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
-        Whoops, it looks like setup tool dependencies are not installed.</h3>
-    </div>
-    <p>Please run 'composer install' under /setup directory.</p>
-</div>
-HTML;
-    }
-    exit(1);
-}
-
-require $autoload;
-
+require __DIR__ . '/../app/autoload.php';
 \Zend\Mvc\Application::init(require __DIR__ . '/config/application.config.php')->run();

From e17cd49c36275112547dd8cd8736de24232b856d Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@ebay.com>
Date: Tue, 25 Nov 2014 18:00:03 +0200
Subject: [PATCH 026/474] MTA-773: Stabilize Catalog module. Products

- fixed product switching tests
---
 ...ignRelatedPromotionsToBannerEntityTest.php | 37 ++++++++++++-------
 .../Edit/Tab/Options/Type/DropDown.php        | 15 ++++++--
 .../Constraint/AssertProductDuplicateForm.php | 29 +++++++++++----
 .../CatalogProductSimple/CustomOptions.php    |  4 +-
 .../Product/DuplicateProductEntityTest.php    | 20 +++++-----
 .../Test/Block/Adminhtml/Promo/Catalog.php    | 24 +++++++-----
 ...AssertConfigurableProductDuplicateForm.php | 35 +++++++++++++++---
 .../AssertGiftCardDuplicateForm.php           |  9 +++--
 .../GiftCard/Test/Fixture/GiftCardProduct.php | 10 +++++
 .../GiftCard/Test/Fixture/GiftCardProduct.xml |  4 ++
 10 files changed, 132 insertions(+), 55 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/AssignRelatedPromotionsToBannerEntityTest.php b/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/AssignRelatedPromotionsToBannerEntityTest.php
index 9f747fdbc04e5..a03fd9341993e 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/AssignRelatedPromotionsToBannerEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/AssignRelatedPromotionsToBannerEntityTest.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Banner\Test\TestCase;
 
+use Mtf\ObjectManager;
 use Mtf\TestCase\Injectable;
 use Mtf\Fixture\FixtureFactory;
 use Magento\Cms\Test\Fixture\CmsPage;
@@ -22,9 +23,8 @@
 use Magento\CustomerSegment\Test\Fixture\CustomerSegment;
 
 /**
- * Test Creation for assign Related Cart and Catalog Rules to BannerEntity
- *
  * Test Flow:
+ *
  * Preconditions:
  * 1. Create customer
  * 2. Create CustomerSegment
@@ -47,28 +47,28 @@
 class AssignRelatedPromotionsToBannerEntityTest extends Injectable
 {
     /**
-     * BannerIndex page
+     * BannerIndex page.
      *
      * @var BannerIndex
      */
     protected $bannerIndex;
 
     /**
-     * BannerNew page
+     * BannerNew page.
      *
      * @var BannerNew
      */
     protected $bannerNew;
 
     /**
-     * Fixture Factory
+     * Fixture Factory.
      *
      * @var FixtureFactory
      */
     protected $fixtureFactory;
 
     /**
-     * Inject pages
+     * Inject pages.
      *
      * @param BannerIndex $bannerIndex
      * @param BannerNew $bannerNew
@@ -86,7 +86,7 @@ public function __inject(
     }
 
     /**
-     * Creation for assign Related Cart and Catalog Rules to BannerEntity test
+     * Creation for assign Related Cart and Catalog Rules to BannerEntity test.
      *
      * @param BannerInjectable $banner
      * @param CustomerInjectable|string $customer
@@ -140,7 +140,7 @@ public function test(
     }
 
     /**
-     * Create Cart and Catalog Rules
+     * Create Cart and Catalog Rules.
      *
      * @param string $cartPriceRule
      * @param string $catalogPriceRule
@@ -164,7 +164,7 @@ protected function createRules($catalogPriceRule, $cartPriceRule)
     }
 
     /**
-     * Create Customer
+     * Create Customer.
      *
      * @param string $customer
      * @return CustomerInjectable|null
@@ -182,7 +182,7 @@ protected function createCustomer($customer)
     }
 
     /**
-     * Create Customer Segment
+     * Create Customer Segment.
      *
      * @param string $customerSegment
      * @return CustomerSegment|null
@@ -200,7 +200,7 @@ protected function createCustomerSegment($customerSegment)
     }
 
     /**
-     * Create Product
+     * Create Product.
      *
      * @return CatalogProductSimple
      */
@@ -213,7 +213,7 @@ protected function createProduct()
     }
 
     /**
-     * Create banner
+     * Create banner.
      *
      * @param BannerInjectable $banner
      * @param CustomerSegment|string $customerSegment
@@ -238,7 +238,7 @@ protected function createBanner($customerSegment, BannerInjectable $banner)
     }
 
     /**
-     * Create Widget
+     * Create Widget.
      *
      * @param string $widget
      * @param BannerInjectable $banner
@@ -262,4 +262,15 @@ protected function createWidget($widget, BannerInjectable $banner)
 
         return $widget;
     }
+
+    /**
+     * Deleted shopping cart price rules and catalog price rules.
+     *
+     * @return void
+     */
+    public static function tearDownAfterClass()
+    {
+        ObjectManager::getInstance()->create('Magento\CatalogRule\Test\TestStep\DeleteAllCatalogRulesStep')->run();
+        ObjectManager::getInstance()->create('Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep')->run();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php
index 6ad8306ebba8e..8589b6a7df959 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/Options/Type/DropDown.php
@@ -12,20 +12,26 @@
 use Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Tab\Options\AbstractOptions;
 
 /**
- * Class DropDown
- * Form "Option dropdown" on tab product "Custom options"
+ * Form "Option dropdown" on tab product "Custom options".
  */
 class DropDown extends AbstractOptions
 {
     /**
-     * Add button css selector
+     * Add button css selector.
      *
      * @var string
      */
     protected $buttonAddLocator = '[id$="_add_select_row"]';
 
     /**
-     * Fill the form
+     * Name for title column.
+     *
+     * @var string
+     */
+    protected $optionTitle = '.data-table th.col-name';
+
+    /**
+     * Fill the form.
      *
      * @param array $fields
      * @param Element $element
@@ -33,6 +39,7 @@ class DropDown extends AbstractOptions
      */
     public function fillOptions(array $fields, Element $element = null)
     {
+        $this->_rootElement->find($this->optionTitle)->click();
         $this->_rootElement->find($this->buttonAddLocator)->click();
         return parent::fillOptions($fields, $element);
     }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
index f5c3d6cddc627..714c311265ebb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
@@ -13,12 +13,12 @@
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 
 /**
- * Class AssertProductDuplicateForm
+ * Assert form data equals fixture data.
  */
 class AssertProductDuplicateForm extends AssertProductForm
 {
     /**
-     * Formatting options for numeric values
+     * Formatting options for numeric values.
      *
      * @var array
      */
@@ -41,14 +41,14 @@ class AssertProductDuplicateForm extends AssertProductForm
     ];
 
     /**
-     * Constraint severeness
+     * Constraint severeness.
      *
      * @var string
      */
     protected $severeness = 'low';
 
     /**
-     * Assert form data equals fixture data
+     * Assert form data equals fixture data.
      *
      * @param FixtureInterface $product
      * @param CatalogProductIndex $productGrid
@@ -71,7 +71,7 @@ public function processAssert(
     }
 
     /**
-     * Prepares fixture data for comparison
+     * Prepares fixture data for comparison.
      *
      * @param array $data
      * @param array $sortFields [optional]
@@ -100,18 +100,33 @@ function (&$item, $key, $formattingOptions) {
             $compareData['status'] = 'Product offline';
         }
         if (isset($compareData['quantity_and_stock_status']['qty'])) {
-            $compareData['quantity_and_stock_status']['qty'] = 0;
+            $compareData['quantity_and_stock_status']['qty'] = '';
+            $compareData['quantity_and_stock_status']['is_in_stock'] = 'Out of Stock';
         }
         if (isset($compareData['special_price'])) {
             $compareData['special_price'] = ['special_price' => $compareData['special_price']];
         }
         $compareData['sku'] .= '-1';
+        $compareData['url_key'] = $this->prepareUrlKey($compareData['url_key']);
 
         return parent::prepareFixtureData($compareData, $sortFields);
     }
 
     /**
-     * Returns a string representation of the object
+     * Prepare url key.
+     *
+     * @param string $urlKey
+     * @return string
+     */
+    protected function prepareUrlKey($urlKey)
+    {
+        preg_match("~\d+$~", $urlKey, $matches);
+        $key = intval($matches[0]) + 1;
+        return str_replace($matches[0], $key, $urlKey);
+    }
+
+    /**
+     * Returns a string representation of the object.
      *
      * @return string
      */
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomOptions.php
index 94d3cedb4e5d0..6c89f4898bb11 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple/CustomOptions.php
@@ -211,13 +211,13 @@ protected function getPreset($name)
                     'type' => 'Drop-down',
                     'options' => [
                         [
-                            'title' => 'Test1 %isolation%',
+                            'title' => 'Test3-1 %isolation%',
                             'price' => 110.01,
                             'price_type' => 'Percent',
                             'sku' => 'sku2_%isolation%'
                         ],
                         [
-                            'title' => 'Test2 %isolation%',
+                            'title' => 'Test3-2 %isolation%',
                             'price' => 210.02,
                             'price_type' => 'Fixed',
                             'sku' => 'sku3_%isolation%'
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
index 8eb41d4f7e9ad..838deef887307 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/DuplicateProductEntityTest.php
@@ -15,8 +15,6 @@
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 
 /**
- * Test Creation for DuplicateProductEntity
- *
  * Test Flow:
  *
  * Precondition:
@@ -35,35 +33,35 @@
 class DuplicateProductEntityTest extends Injectable
 {
     /**
-     * Category fixture
+     * Category fixture.
      *
      * @var CatalogCategory
      */
     protected $category;
 
     /**
-     * Product page with a grid
+     * Product page with a grid.
      *
      * @var CatalogProductIndex
      */
     protected $productGrid;
 
     /**
-     * Page to update a product
+     * Page to update a product.
      *
      * @var CatalogProductEdit
      */
     protected $editProductPage;
 
     /**
-     * Fixture factory
+     * Fixture factory.
      *
      * @var FixtureFactory
      */
     protected $fixtureFactory;
 
     /**
-     * Prepare data
+     * Prepare data.
      *
      * @param CatalogCategory $category
      * @param CatalogProductIndex $productGrid
@@ -85,27 +83,27 @@ public function __prepare(
     }
 
     /**
-     * Run test duplicate product entity
+     * Run test duplicate product entity.
      *
      * @param string $productType
      * @return array
      */
     public function test($productType)
     {
-        $this->markTestIncomplete("MAGETWO-28138");
         // Precondition
         $product = $this->createProduct($productType);
 
         // Steps
         $filter = ['sku' => $product->getSku()];
-        $this->productGrid->open()->getProductGrid()->searchAndOpen($filter);
+        $this->productGrid->open();
+        $this->productGrid->getProductGrid()->searchAndOpen($filter);
         $this->editProductPage->getFormPageActions()->saveAndDuplicate();
 
         return ['product' => $product];
     }
 
     /**
-     * Creating a product according to the type of
+     * Creating a product according to the type of.
      *
      * @param string $productType
      * @return array
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php
index a0d442adbc15f..3920974f154b5 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/Promo/Catalog.php
@@ -13,20 +13,26 @@
 use Mtf\Client\Element\Locator;
 
 /**
- * Class Catalog
- * Backend catalog price rule grid
+ * Backend catalog price rule grid.
  */
 class Catalog extends Grid
 {
     /**
-     * An element locator which allows to select first entity in grid
+     * An element locator which allows to select first entity in grid.
      *
      * @var string
      */
     protected $editLink = '#promo_catalog_grid_table tbody tr:first-child td';
 
     /**
-     * Filters array mapping
+     * First row selector.
+     *
+     * @var string
+     */
+    protected $firstRowSelector = '//tr[@data-role="row"]/td[@data-column="rule_id"]';
+
+    /**
+     * Filters array mapping.
      *
      * @var array
      */
@@ -54,18 +60,18 @@ class Catalog extends Grid
     ];
 
     /**
-     * Return row with given catalog price rule name
+     * Return row with given catalog price rule name.
      *
      * @param string $ruleName
      * @return Element
      */
     public function getGridRow($ruleName)
     {
-        return $this->getRow(array('name' => $ruleName));
+        return $this->getRow(['name' => $ruleName]);
     }
 
     /**
-     * Return id of catalog price rule with given name
+     * Return id of catalog price rule with given name.
      *
      * @param string $ruleName
      * @return string
@@ -76,7 +82,7 @@ public function getCatalogPriceId($ruleName)
     }
 
     /**
-     * Check if specific row exists in grid
+     * Check if specific row exists in grid.
      *
      * @param array $filter
      * @param bool $isSearchable
@@ -85,7 +91,7 @@ public function getCatalogPriceId($ruleName)
      */
     public function isRowVisible(array $filter, $isSearchable = true, $isStrict = true)
     {
-        $this->search(array('name' => $filter['name']));
+        $this->search(['name' => $filter['name']]);
         return parent::isRowVisible($filter, $isSearchable, $isStrict);
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
index 66137039a8cf9..63e26773c81db 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
@@ -13,20 +13,19 @@
 use Mtf\Fixture\FixtureInterface;
 
 /**
- * Class AssertConfigurableProductDuplicateForm
- * Assert form data equals duplicate product configurable data
+ * Assert form data equals duplicate product configurable data.
  */
 class AssertConfigurableProductDuplicateForm extends AssertConfigurableProductForm
 {
     /**
-     * Constraint severeness
+     * Constraint severeness.
      *
      * @var string
      */
     protected $severeness = 'low';
 
     /**
-     * Assert form data equals duplicate product configurable data
+     * Assert form data equals duplicate product configurable data.
      *
      * @param FixtureInterface $product
      * @param CatalogProductIndex $productGrid
@@ -53,7 +52,33 @@ public function processAssert(
     }
 
     /**
-     * Returns a string representation of the object
+     * Prepares fixture data for comparison.
+     *
+     * @param array $data
+     * @param array $sortFields [optional]
+     * @return array
+     */
+    protected function prepareFixtureData(array $data, array $sortFields = [])
+    {
+        $data['url_key'] = $this->prepareUrlKey($data['url_key']);
+        return parent::prepareFixtureData($data, $sortFields);
+    }
+
+    /**
+     * Prepare url key.
+     *
+     * @param string $urlKey
+     * @return string
+     */
+    protected function prepareUrlKey($urlKey)
+    {
+        preg_match("~\d+$~", $urlKey, $matches);
+        $key = intval($matches[0]) + 1;
+        return str_replace($matches[0], $key, $urlKey);
+    }
+
+    /**
+     * Returns a string representation of the object.
      *
      * @return string
      */
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicateForm.php b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicateForm.php
index 159b1a780ed3a..036d87736b984 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicateForm.php
@@ -14,19 +14,19 @@
 use Magento\Catalog\Test\Constraint\AssertProductDuplicateForm;
 
 /**
- * Class AssertGiftCardDuplicateForm
+ * Assert form data equals fixture data.
  */
 class AssertGiftCardDuplicateForm extends AssertProductDuplicateForm
 {
     /**
-     * Constraint severeness
+     * Constraint severeness.
      *
      * @var string
      */
     protected $severeness = 'low';
 
     /**
-     * Assert form data equals duplicate gift card data
+     * Assert form data equals duplicate gift card data.
      *
      * @param FixtureInterface $product
      * @param CatalogProductIndex $productGrid
@@ -39,7 +39,8 @@ public function processAssert(
         CatalogProductEdit $productPage
     ) {
         $filter = ['sku' => $product->getSku() . '-1'];
-        $productGrid->open()->getProductGrid()->searchAndOpen($filter);
+        $productGrid->open();
+        $productGrid->getProductGrid()->searchAndOpen($filter);
 
         $formData = $productPage->getProductForm()->getData($product);
         $fixtureData = $this->prepareFixtureData($product->getData());
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Fixture/GiftCardProduct.php b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Fixture/GiftCardProduct.php
index 30bbaa470718f..7f2ae27ea81a7 100755
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Fixture/GiftCardProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Fixture/GiftCardProduct.php
@@ -341,6 +341,11 @@ class GiftCardProduct extends InjectableFixture
         'group' => 'websites',
     ];
 
+    protected $id = [
+        'attribute_code' => 'id',
+        'backend_type' => 'virtual',
+    ];
+
     public function getWebsiteIds()
     {
         return $this->getData('website_ids');
@@ -500,4 +505,9 @@ public function getStatus()
     {
         return $this->getData('status');
     }
+
+    public function getId()
+    {
+        return $this->getData('id');
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Fixture/GiftCardProduct.xml b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Fixture/GiftCardProduct.xml
index 9bb81c1d5ccad..9f3d69acf4717 100755
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Fixture/GiftCardProduct.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Fixture/GiftCardProduct.xml
@@ -260,6 +260,10 @@
             <default_value>Main Website</default_value>
             <group>websites</group>
         </website_ids>
+        <id>
+            <attribute_code>id</attribute_code>
+            <backend_type>virtual</backend_type>
+        </id>
     </fields>
     <data_set>
         <sku></sku>

From 215fd81e847762da1855bfaea1be1c1a7fc48670 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Tue, 25 Nov 2014 10:09:11 -0600
Subject: [PATCH 027/474] MAGETWO-30852: Old encryption key did not saved after
 update

- fixed code style error
---
 lib/internal/Magento/Framework/Encryption/Encryptor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
index 72ecca0881ef7..e8c0dd6bbc5b0 100644
--- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -75,8 +75,7 @@ class Encryptor implements EncryptorInterface
     public function __construct(
         \Magento\Framework\Math\Random $randomGenerator,
         DeploymentConfig $deploymentConfig
-    )
-    {
+    ) {
         $this->randomGenerator = $randomGenerator;
         // load all possible keys
         $this->keys = preg_split('/\s+/s', trim($deploymentConfig->get(self::PARAM_CRYPT_KEY)));

From 8acd61361056b85d2e9ab98c4b178f5dfc1f53d1 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Tue, 25 Nov 2014 10:24:50 -0600
Subject: [PATCH 028/474] MAGETWO-29704: composer.json Files Optimized

- removed 'composer install' from Travis configuration
---
 dev/build/publication/extra_files/ce/.travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/build/publication/extra_files/ce/.travis.yml b/dev/build/publication/extra_files/ce/.travis.yml
index 96feeb1024811..f95db1ab3fbb3 100644
--- a/dev/build/publication/extra_files/ce/.travis.yml
+++ b/dev/build/publication/extra_files/ce/.travis.yml
@@ -33,8 +33,6 @@ before_script:
   - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - phpenv rehash;
   - composer install --no-interaction --prefer-source --dev
-  - cd setup
-  - composer install --no-interaction --prefer-source --dev
   - cd ..
 script:
   # Unit tests

From cbe494780e06834d14eb72686681a59c3a68a06c Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Tue, 25 Nov 2014 10:26:38 -0600
Subject: [PATCH 029/474] MAGETWO-30852: Old encryption key did not saved after
 update

- fix web UI installer not showing encryption key in success page
---
 setup/module/Magento/Setup/src/Model/Installer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 9823c6f6c5529..6d85300d56690 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -343,6 +343,8 @@ private function createEncryptConfig($data)
         }
         $cryptConfigData =
             array(ConfigMapper::$paramMap[ConfigMapper::KEY_ENCRYPTION_KEY] => $key);
+
+        $this->installInfo[EncryptConfig::KEY_ENCRYPTION_KEY] = array_pop(explode("\n", $key));
         return new EncryptConfig($cryptConfigData);
     }
 
@@ -490,8 +492,6 @@ public function installDeploymentConfig($data)
     {
         $data[InstallConfig::KEY_DATE] = date('r');
 
-        $this->installInfo[EncryptConfig::KEY_ENCRYPTION_KEY] = $data[EncryptConfig::KEY_ENCRYPTION_KEY];
-
         $configs = [
             $this->createBackendConfig($data),
             $this->createDbConfig($data),

From af8f7e6f97c3eca57d1ef4b302130846de94bbdd Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Thu, 20 Nov 2014 15:24:15 -0600
Subject: [PATCH 030/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- simplified routing of setup application - replaced custom router with standard routers of Zend Framework
- revisited controller actions and their mapping from view layer
- made setup application independent on mod_rewrite
- removed all hard-coded paths to "setup" sub-directory that assumed its location relative to web-server

Conflicts:
	setup/module/Magento/Setup/src/Controller/CustomizeYourStore.php
	setup/module/Magento/Setup/src/Controller/DatabaseCheck.php
	setup/module/Magento/Setup/src/Controller/Install.php
	setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
---
 setup/.htaccess                               |  18 +---
 .../module/Magento/Setup/config/di.config.php |  41 +++----
 .../Magento/Setup/config/router.config.php    |  32 +++---
 .../Magento/Setup/config/states.config.php    |  22 ++--
 .../Setup/src/Controller/AddDatabase.php      |  24 +++++
 .../src/Controller/AddDatabaseController.php  |  37 -------
 .../Controller/Controls/MenuController.php    |  52 ---------
 .../src/Controller/CreateAdminAccount.php     |  24 +++++
 .../CreateAdminAccountController.php          |  37 -------
 ...eController.php => CustomizeYourStore.php} |  26 ++---
 .../Data/FilePermissionsController.php        |  58 ----------
 .../Data/PhpExtensionsController.php          |  61 -----------
 .../Controller/Data/PhpVersionController.php  |  53 ---------
 .../src/Controller/Data/StatesController.php  |  43 --------
 ...tabaseController.php => DatabaseCheck.php} |  20 +---
 .../Setup/src/Controller/Environment.php      | 101 ++++++++++++++++++
 .../{IndexController.php => Index.php}        |  17 +--
 .../StartController.php => Install.php}       |  75 ++++++++-----
 .../Controller/Install/ProgressController.php |  74 -------------
 .../src/Controller/InstallController.php      |  37 -------
 .../{LandingController.php => Landing.php}    |  21 ++--
 .../{LicenseController.php => License.php}    |  28 ++---
 .../Setup/src/Controller/Navigation.php       |  51 +++++++++
 .../Setup/src/Controller/ReadinessCheck.php   |  35 ++++++
 .../ReadinessCheck/ProgressController.php     |  36 -------
 .../Controller/ReadinessCheckController.php   |  36 -------
 .../{Data => }/ResponseTypeInterface.php      |   2 +-
 .../Magento/Setup/src/Controller/Success.php  |  24 +++++
 .../src/Controller/SuccessController.php      |  37 -------
 .../Setup/src/Controller/WebConfiguration.php |  24 +++++
 .../Controller/WebConfigurationController.php |  48 ---------
 .../Setup/src/Mvc/Router/Http/Setup.php       |  96 -----------------
 .../Magento/Setup/view/layout/layout.phtml    |  34 +++---
 .../Setup/view/magento/setup/index.phtml      |   2 +-
 .../setup/{controls => navigation}/menu.phtml |   0
 setup/pub/magento/setup/add-database.js       |   2 +-
 setup/pub/magento/setup/install.js            |   4 +-
 setup/pub/magento/setup/landing.js            |   2 +-
 setup/pub/magento/setup/main.js               |   2 +-
 setup/pub/magento/setup/readiness-check.js    |   6 +-
 40 files changed, 433 insertions(+), 909 deletions(-)
 create mode 100644 setup/module/Magento/Setup/src/Controller/AddDatabase.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/AddDatabaseController.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/Controls/MenuController.php
 create mode 100644 setup/module/Magento/Setup/src/Controller/CreateAdminAccount.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/CreateAdminAccountController.php
 rename setup/module/Magento/Setup/src/Controller/{CustomizeYourStoreController.php => CustomizeYourStore.php} (55%)
 delete mode 100644 setup/module/Magento/Setup/src/Controller/Data/FilePermissionsController.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/Data/PhpExtensionsController.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/Data/PhpVersionController.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/Data/StatesController.php
 rename setup/module/Magento/Setup/src/Controller/{Data/DatabaseController.php => DatabaseCheck.php} (67%)
 create mode 100644 setup/module/Magento/Setup/src/Controller/Environment.php
 rename setup/module/Magento/Setup/src/Controller/{IndexController.php => Index.php} (51%)
 rename setup/module/Magento/Setup/src/Controller/{Install/StartController.php => Install.php} (77%)
 delete mode 100644 setup/module/Magento/Setup/src/Controller/Install/ProgressController.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/InstallController.php
 rename setup/module/Magento/Setup/src/Controller/{LandingController.php => Landing.php} (65%)
 rename setup/module/Magento/Setup/src/Controller/{LicenseController.php => License.php} (53%)
 create mode 100644 setup/module/Magento/Setup/src/Controller/Navigation.php
 create mode 100644 setup/module/Magento/Setup/src/Controller/ReadinessCheck.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/ReadinessCheck/ProgressController.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/ReadinessCheckController.php
 rename setup/module/Magento/Setup/src/Controller/{Data => }/ResponseTypeInterface.php (87%)
 create mode 100644 setup/module/Magento/Setup/src/Controller/Success.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/SuccessController.php
 create mode 100644 setup/module/Magento/Setup/src/Controller/WebConfiguration.php
 delete mode 100644 setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
 delete mode 100644 setup/module/Magento/Setup/src/Mvc/Router/Http/Setup.php
 rename setup/module/Magento/Setup/view/magento/setup/{controls => navigation}/menu.phtml (100%)

diff --git a/setup/.htaccess b/setup/.htaccess
index a02263cb14af7..f3c9a4b7e82cd 100644
--- a/setup/.htaccess
+++ b/setup/.htaccess
@@ -1,16 +1,2 @@
-RewriteEngine On
-# The following rule tells Apache that if the requested filename
-# exists, simply serve it.
-RewriteCond %{REQUEST_FILENAME} -s [OR]
-RewriteCond %{REQUEST_FILENAME} -l [OR]
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule ^.*$ - [NC,L]
-# The following rewrites all other queries to index.php. The
-# condition ensures that if you are using Apache aliases to do
-# mass virtual hosting, the base path will be prepended to
-# allow proper resolution of the index.php file; it will work
-# in non-aliased environments as well, providing a safe, one-size
-# fits all solution.
-RewriteCond %{REQUEST_URI}::$1 ^(/.+)(.+)::\2$
-RewriteRule ^(.*) - [E=BASE:%1]
-RewriteRule ^(.*)$ %{ENV:BASE}index.php [NC,L]
\ No newline at end of file
+RewriteEngine Off
+Options -Indexes
diff --git a/setup/module/Magento/Setup/config/di.config.php b/setup/module/Magento/Setup/config/di.config.php
index fd80b2da62d61..b381d5b6af013 100644
--- a/setup/module/Magento/Setup/config/di.config.php
+++ b/setup/module/Magento/Setup/config/di.config.php
@@ -9,35 +9,20 @@
 return [
     'di' => [
         'allowed_controllers' => [
-            'Magento\Setup\Controller\ReadinessCheckController',
-            'Magento\Setup\Controller\ReadinessCheck\ProgressController',
-            'Magento\Setup\Controller\AddDatabaseController',
-            'Magento\Setup\Controller\WebConfigurationController',
-            'Magento\Setup\Controller\CustomizeYourStoreController',
-            'Magento\Setup\Controller\CreateAdminAccountController',
-            'Magento\Setup\Controller\SuccessController',
-            'Magento\Setup\Controller\Success\EncryptionController',
-            'Magento\Setup\Controller\InstallController',
-            'Magento\Setup\Controller\Install\ProgressController',
-            'Magento\Setup\Controller\Install\ClearProgressController',
-            'Magento\Setup\Controller\Install\StartController',
-            'Magento\Setup\Controller\IndexController',
-            'Magento\Setup\Controller\LandingController',
-            'Magento\Setup\Controller\LicenseController',
-            'Magento\Setup\Controller\EnvironmentController',
-            'Magento\Setup\Controller\UserController',
+            'Magento\Setup\Controller\Index',
+            'Magento\Setup\Controller\Landing',
+            'Magento\Setup\Controller\Navigation',
+            'Magento\Setup\Controller\License',
+            'Magento\Setup\Controller\ReadinessCheck',
+            'Magento\Setup\Controller\Environment',
+            'Magento\Setup\Controller\DatabaseCheck',
+            'Magento\Setup\Controller\AddDatabase',
+            'Magento\Setup\Controller\WebConfiguration',
+            'Magento\Setup\Controller\CustomizeYourStore',
+            'Magento\Setup\Controller\CreateAdminAccount',
+            'Magento\Setup\Controller\Install',
+            'Magento\Setup\Controller\Success',
             'Magento\Setup\Controller\ConsoleController',
-
-            'Magento\Setup\Controller\Controls\HeaderController',
-            'Magento\Setup\Controller\Controls\MenuController',
-            'Magento\Setup\Controller\Controls\NavbarController',
-
-            'Magento\Setup\Controller\Data\FilePermissionsController',
-            'Magento\Setup\Controller\Data\PhpExtensionsController',
-            'Magento\Setup\Controller\Data\PhpVersionController',
-            'Magento\Setup\Controller\Data\StatesController',
-            'Magento\Setup\Controller\Data\DatabaseController',
-            'Magento\Setup\Controller\Data\LanguagesController',
         ],
         'instance' => [
             'preference' => [
diff --git a/setup/module/Magento/Setup/config/router.config.php b/setup/module/Magento/Setup/config/router.config.php
index 7503ee0638b88..af3de7633285a 100644
--- a/setup/module/Magento/Setup/config/router.config.php
+++ b/setup/module/Magento/Setup/config/router.config.php
@@ -9,35 +9,31 @@
 use Magento\Setup\Controller\ConsoleController;
 
 return [
-    'route_manager' => [
-        'invokables' => [
-            'setup' => 'Magento\Setup\Mvc\Router\Http\Setup',
-        ],
-    ],
     'router' => [
         'routes' => [
-            'setup' => [
-                'type' => 'setup',
+            'literal' => [
+                'type'    => 'Literal',
                 'options' => [
-                    'regex'    => '\b.*\/(?<controller>[\w-\/]+)$',
+                    'route'    => '/',
                     'defaults' => [
-                        '__NAMESPACE__' => 'Magento\Setup\Controller',
-                        'action' => 'index',
+                        'controller' => 'Magento\Setup\Controller\Index',
+                        'action'     => 'index',
                     ],
-                    'spec' => '%controller%',
                 ],
             ],
-            'home' => [
-                'type' => 'literal',
+            'setup' => [
+                'type'    => 'Segment',
                 'options' => [
-                    'route'    => '/',
+                    'route'    => '[/:controller[/:action]]',
+                    'defaults' => [
+                        '__NAMESPACE__' => 'Magento\Setup\Controller',
+                        'controller'    => 'Index',
+                        'action'        => 'index',
+                    ],
                     'constraints' => [
                         'controller' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                        'action'     => '[a-zA-Z][a-zA-Z0-9_-]*',
                     ],
-                    'defaults' => [
-                        'controller' => 'Magento\Setup\Controller\IndexController',
-                        'action'     => 'index',
-                    ]
                 ],
             ],
         ],
diff --git a/setup/module/Magento/Setup/config/states.config.php b/setup/module/Magento/Setup/config/states.config.php
index c2ead1e6965cd..302a69f144bd7 100644
--- a/setup/module/Magento/Setup/config/states.config.php
+++ b/setup/module/Magento/Setup/config/states.config.php
@@ -6,6 +6,8 @@
  * @license     {license_link}
  */
 
+$base = basename($_SERVER['SCRIPT_FILENAME']);
+
 return [
     'nav' => [
         [
@@ -16,7 +18,7 @@
         [
             'id'          => 'root.license',
             'url'         => 'license',
-            'templateUrl' => 'license',
+            'templateUrl' => "$base/license",
             'title'       => 'License',
             'main'        => true,
             'nav-bar'     => false,
@@ -25,7 +27,7 @@
         [
             'id'          => 'root.landing',
             'url'         => 'landing',
-            'templateUrl' => 'landing',
+            'templateUrl' => "$base/landing",
             'title'       => 'Landing',
             'controller'  => 'landingController',
             'main'        => true,
@@ -35,7 +37,7 @@
         [
             'id'          => 'root.readiness-check',
             'url'         => 'readiness-check',
-            'templateUrl' => 'readiness-check',
+            'templateUrl' => "{$base}/readiness-check",
             'title'       => 'Readiness Check',
             'header'      => 'Step 1: Readiness Check',
             'nav-bar'     => true,
@@ -44,7 +46,7 @@
         [
             'id'          => 'root.readiness-check.progress',
             'url'         => 'readiness-check/progress',
-            'templateUrl' => 'readiness-check/progress',
+            'templateUrl' => "{$base}/readiness-check/progress",
             'title'       => 'Readiness Check',
             'header'      => 'Step 1: Readiness Check',
             'controller'  => 'readinessCheckController',
@@ -54,7 +56,7 @@
         [
             'id'          => 'root.add-database',
             'url'         => 'add-database',
-            'templateUrl' => 'add-database',
+            'templateUrl' => "{$base}/add-database",
             'title'       => 'Add a Database',
             'header'      => 'Step 2: Add a Database',
             'controller'  => 'addDatabaseController',
@@ -65,7 +67,7 @@
         [
             'id'          => 'root.web-configuration',
             'url'         => 'web-configuration',
-            'templateUrl' => 'web-configuration',
+            'templateUrl' => "{$base}/web-configuration",
             'title'       => 'Web Configuration',
             'header'      => 'Step 3: Web Configuration',
             'controller'  => 'webConfigurationController',
@@ -76,7 +78,7 @@
         [
             'id'          => 'root.customize-your-store',
             'url'         => 'customize-your-store',
-            'templateUrl' => 'customize-your-store',
+            'templateUrl' => "{$base}/customize-your-store",
             'title'       => 'Customize Your Store',
             'header'      => 'Step 4: Customize Your Store',
             'controller'  => 'customizeYourStoreController',
@@ -86,7 +88,7 @@
         [
             'id'          => 'root.create-admin-account',
             'url'         => 'create-admin-account',
-            'templateUrl' => 'create-admin-account',
+            'templateUrl' => "{$base}/create-admin-account",
             'title'       => 'Create Admin Account',
             'header'      => 'Step 5: Create Admin Account',
             'controller'  => 'createAdminAccountController',
@@ -97,7 +99,7 @@
         [
             'id'          => 'root.install',
             'url'         => 'install',
-            'templateUrl' => 'install',
+            'templateUrl' => "{$base}/install",
             'title'       => 'Install',
             'header'      => 'Step 6: Install',
             'controller'  => 'installController',
@@ -107,7 +109,7 @@
         [
             'id'          => 'root.success',
             'url'         => 'success',
-            'templateUrl' => 'success',
+            'templateUrl' => "{$base}/success",
             'controller'  => 'successController',
             'main'        => true,
             'order'       => 8,
diff --git a/setup/module/Magento/Setup/src/Controller/AddDatabase.php b/setup/module/Magento/Setup/src/Controller/AddDatabase.php
new file mode 100644
index 0000000000000..a5e2a25c0a2f5
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Controller/AddDatabase.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Setup\Controller;
+
+use Zend\Mvc\Controller\AbstractActionController;
+use Zend\View\Model\ViewModel;
+
+class AddDatabase extends AbstractActionController
+{
+    /**
+     * @return array|ViewModel
+     */
+    public function indexAction()
+    {
+        $view = new ViewModel();
+        $view->setTerminal(true);
+        return $view;
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Controller/AddDatabaseController.php b/setup/module/Magento/Setup/src/Controller/AddDatabaseController.php
deleted file mode 100644
index 212fdcaaa4c22..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/AddDatabaseController.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
-
-class AddDatabaseController extends AbstractActionController
-{
-    /**
-     * @var \Zend\View\Model\ViewModel
-     */
-    protected $view;
-
-    /**
-     * @param ViewModel $view
-     */
-    public function __construct(ViewModel $view)
-    {
-        $this->view = $view;
-    }
-
-    /**
-     * @return array|ViewModel
-     */
-    public function indexAction()
-    {
-        $this->view->setTerminal(true);
-
-        return $this->view;
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Controller/Controls/MenuController.php b/setup/module/Magento/Setup/src/Controller/Controls/MenuController.php
deleted file mode 100644
index 55bda15f0fdba..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/Controls/MenuController.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license   {license_link}
- */
-
-namespace Magento\Setup\Controller\Controls;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
-use Magento\Setup\Model\Navigation;
-
-class MenuController extends AbstractActionController
-{
-    /**
-     * @var \Zend\View\Model\ViewModel
-     */
-    protected $view;
-
-    /**
-     * @var Navigation
-     */
-    protected $navigation;
-
-    /**
-     * @param ViewModel $view
-     * @param Navigation $navigation
-     */
-    public function __construct(
-        ViewModel $view,
-        Navigation $navigation
-    ) {
-        $this->view = $view;
-        $this->view->setTemplate('/magento/setup/controls/menu.phtml');
-
-        $this->navigation = $navigation;
-    }
-
-    /**
-     * @return array|ViewModel
-     */
-    public function indexAction()
-    {
-        $this->view->setVariable('menu', $this->navigation->getMenuItems());
-        $this->view->setVariable('main', $this->navigation->getMainItems());
-        $this->view->setTerminal(true);
-
-        return $this->view;
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Controller/CreateAdminAccount.php b/setup/module/Magento/Setup/src/Controller/CreateAdminAccount.php
new file mode 100644
index 0000000000000..a7daab6aea748
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Controller/CreateAdminAccount.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Setup\Controller;
+
+use Zend\Mvc\Controller\AbstractActionController;
+use Zend\View\Model\ViewModel;
+
+class CreateAdminAccount extends AbstractActionController
+{
+    /**
+     * @return ViewModel
+     */
+    public function indexAction()
+    {
+        $view = new ViewModel;
+        $view->setTerminal(true);
+        return $view;
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Controller/CreateAdminAccountController.php b/setup/module/Magento/Setup/src/Controller/CreateAdminAccountController.php
deleted file mode 100644
index b5379a0ba0dee..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/CreateAdminAccountController.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
-
-class CreateAdminAccountController extends AbstractActionController
-{
-    /**
-     * @var \Zend\View\Model\ViewModel
-     */
-    protected $view;
-
-    /**
-     * @param ViewModel $view
-     */
-    public function __construct(
-        ViewModel $view
-    ) {
-        $this->view = $view;
-    }
-
-    /**
-     * @return ViewModel
-     */
-    public function indexAction()
-    {
-        $this->view->setTerminal(true);
-        return $this->view;
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Controller/CustomizeYourStoreController.php b/setup/module/Magento/Setup/src/Controller/CustomizeYourStore.php
similarity index 55%
rename from setup/module/Magento/Setup/src/Controller/CustomizeYourStoreController.php
rename to setup/module/Magento/Setup/src/Controller/CustomizeYourStore.php
index e9c8378db0cac..905bb1690b114 100644
--- a/setup/module/Magento/Setup/src/Controller/CustomizeYourStoreController.php
+++ b/setup/module/Magento/Setup/src/Controller/CustomizeYourStore.php
@@ -11,27 +11,18 @@
 use Zend\View\Model\ViewModel;
 use Magento\Setup\Model\Lists;
 
-class CustomizeYourStoreController extends AbstractActionController
+class CustomizeYourStore extends AbstractActionController
 {
     /**
-     * @var \Zend\View\Model\ViewModel
-     */
-    protected $view;
-
-    /**
-     * @var \Magento\Setup\Model\Lists
+     * @var Lists
      */
     protected $list;
 
     /**
-     * @param ViewModel $view
-     * @param \Magento\Setup\Model\Lists $list
+     * @param Lists $list
      */
-    public function __construct(
-        ViewModel $view,
-        Lists $list
-    ) {
-        $this->view = $view;
+    public function __construct(Lists $list)
+    {
         $this->list = $list;
     }
 
@@ -40,13 +31,12 @@ public function __construct(
      */
     public function indexAction()
     {
-        $this->view->setVariables([
+        $view = new ViewModel([
             'timezone' => $this->list->getTimezoneList(),
             'currency' => $this->list->getCurrencyList(),
             'language' => $this->list->getLocaleList()
         ]);
-
-        $this->view->setTerminal(true);
-        return $this->view;
+        $view->setTerminal(true);
+        return $view;
     }
 }
diff --git a/setup/module/Magento/Setup/src/Controller/Data/FilePermissionsController.php b/setup/module/Magento/Setup/src/Controller/Data/FilePermissionsController.php
deleted file mode 100644
index 20771a69d821f..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/Data/FilePermissionsController.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller\Data;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\JsonModel;
-use Magento\Setup\Model\FilePermissions;
-
-class FilePermissionsController extends AbstractActionController
-{
-    /**
-     * @var JsonModel
-     */
-    protected $jsonModel;
-
-    /**
-     * @var FilePermissions
-     */
-    protected $permissions;
-
-    /**
-     * @param JsonModel $jsonModel
-     * @param FilePermissions $permissions
-     */
-    public function __construct(
-        JsonModel $jsonModel,
-        FilePermissions $permissions
-    ) {
-        $this->jsonModel = $jsonModel;
-        $this->permissions = $permissions;
-    }
-
-    /**
-     * @return JsonModel
-     */
-    public function indexAction()
-    {
-        $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
-        if ($this->permissions->getMissingWritableDirectoriesForInstallation()) {
-            $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
-        }
-
-        $data = [
-            'responseType' => $responseType,
-            'data' => [
-                'required' => $this->permissions->getInstallationWritableDirectories(),
-                'current' => $this->permissions->getInstallationCurrentWritableDirectories(),
-            ],
-        ];
-
-        return $this->jsonModel->setVariables($data);
-    }
-}
\ No newline at end of file
diff --git a/setup/module/Magento/Setup/src/Controller/Data/PhpExtensionsController.php b/setup/module/Magento/Setup/src/Controller/Data/PhpExtensionsController.php
deleted file mode 100644
index 62d592d98946f..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/Data/PhpExtensionsController.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * {license_notice}
- *   
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller\Data;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\JsonModel;
-use Magento\Setup\Model\PhpExtensions;
-
-class PhpExtensionsController extends AbstractActionController
-{
-    /**
-     * @var JsonModel
-     */
-    protected $jsonModel;
-
-    /**
-     * @var \Magento\Setup\Model\PhpExtensions
-     */
-    protected $extensions;
-
-    /**
-     * @param JsonModel $jsonModel
-     * @param PhpExtensions $extensions
-     */
-    public function __construct(
-        JsonModel $jsonModel,
-        PhpExtensions $extensions
-    ) {
-        $this->jsonModel = $jsonModel;
-        $this->extensions = $extensions;
-    }
-
-    /**
-     * @return JsonModel
-     */
-    public function indexAction()
-    {
-        $required = $this->extensions->getRequired();
-        $current = $this->extensions->getCurrent();
-
-        $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
-        if (array_diff($required, $current)) {
-            $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
-        }
-
-        $data = [
-            'responseType' => $responseType,
-            'data' => [
-                'required' => $required,
-                'current' => $current,
-            ],
-        ];
-
-        return $this->jsonModel->setVariables($data);
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Controller/Data/PhpVersionController.php b/setup/module/Magento/Setup/src/Controller/Data/PhpVersionController.php
deleted file mode 100644
index c0ab72741b646..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/Data/PhpVersionController.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * {license_notice}
- *   
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller\Data;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\JsonModel;
-
-class PhpVersionController extends AbstractActionController
-{
-    /**
-     * The minimum required version of PHP
-     */
-    const PHP_VERSION_MIN = '5.4.0';
-
-    /**
-     * @var JsonModel
-     */
-    protected $jsonModel;
-
-    /**
-     * @param JsonModel $jsonModel
-     */
-    public function __construct(JsonModel $jsonModel)
-    {
-        $this->jsonModel = $jsonModel;
-    }
-
-    /**
-     * @return JsonModel
-     */
-    public function indexAction()
-    {
-        $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
-        if (version_compare(PHP_VERSION, self::PHP_VERSION_MIN, '<') === true) {
-            $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
-        }
-
-        $data = [
-            'responseType' => $responseType,
-            'data' => [
-                'required' => self::PHP_VERSION_MIN,
-                'current' => PHP_VERSION,
-            ],
-        ];
-
-        return $this->jsonModel->setVariables($data);
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Controller/Data/StatesController.php b/setup/module/Magento/Setup/src/Controller/Data/StatesController.php
deleted file mode 100644
index fb5ffaf53d456..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/Data/StatesController.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * {license_notice}
- *   
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller\Data;
-
-use Magento\Setup\Model\Navigation;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\JsonModel;
-
-class StatesController extends AbstractActionController
-{
-    /**
-     * @var Navigation
-     */
-    protected $navigation;
-
-    /**
-     * @var JsonModel
-     */
-    protected $jsonModel;
-
-    /**
-     * @param Navigation $navigation
-     * @param JsonModel $jsonModel
-     */
-    public function __construct(Navigation $navigation, JsonModel $jsonModel)
-    {
-        $this->navigation = $navigation;
-        $this->jsonModel = $jsonModel;
-    }
-
-    /**
-     * @return JsonModel
-     */
-    public function indexAction()
-    {
-        return $this->jsonModel->setVariable('nav', $this->navigation->getData());
-    }
-}
\ No newline at end of file
diff --git a/setup/module/Magento/Setup/src/Controller/Data/DatabaseController.php b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php
similarity index 67%
rename from setup/module/Magento/Setup/src/Controller/Data/DatabaseController.php
rename to setup/module/Magento/Setup/src/Controller/DatabaseCheck.php
index 4ab2b9694f3cc..033e5aac77793 100644
--- a/setup/module/Magento/Setup/src/Controller/Data/DatabaseController.php
+++ b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php
@@ -5,7 +5,7 @@
  * @copyright   {copyright}
  * @license     {license_link}
  */
-namespace Magento\Setup\Controller\Data;
+namespace Magento\Setup\Controller;
 
 use Magento\Setup\Model\InstallerFactory;
 use Zend\Mvc\Controller\AbstractActionController;
@@ -13,15 +13,8 @@
 use Zend\Json\Json;
 use Magento\Setup\Model\WebLogger;
 
-class DatabaseController extends AbstractActionController
+class DatabaseCheck extends AbstractActionController
 {
-    /**
-     * JSON response object
-     *
-     * @var JsonModel
-     */
-    private $jsonResponse;
-
     /**
      * Installer service factory
      *
@@ -32,12 +25,10 @@ class DatabaseController extends AbstractActionController
     /**
      * Constructor
      *
-     * @param JsonModel $response
      * @param InstallerFactory $installerFactory
      */
-    public function __construct(JsonModel $response, InstallerFactory $installerFactory)
+    public function __construct(InstallerFactory $installerFactory)
     {
-        $this->jsonResponse = $response;
         $this->installerFactory = $installerFactory;
     }
 
@@ -53,10 +44,9 @@ public function indexAction()
             $installer = $this->installerFactory->create(new WebLogger);
             $password = isset($params['password']) ? $params['password'] : '';
             $installer->checkDatabaseConnection($params['name'], $params['host'], $params['user'], $password);
-            return $this->jsonResponse->setVariables(['success' => true]);
+            return new JsonModel(['success' => true]);
         } catch (\Exception $e) {
-            return $this->jsonResponse->setVariables(['success' => false, 'error' => $e->getMessage()]);
+            return new JsonModel(['success' => false, 'error' => $e->getMessage()]);
         }
     }
-
 }
diff --git a/setup/module/Magento/Setup/src/Controller/Environment.php b/setup/module/Magento/Setup/src/Controller/Environment.php
new file mode 100644
index 0000000000000..dfa8730e2ea2f
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Controller/Environment.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Setup\Controller;
+
+use Zend\Mvc\Controller\AbstractActionController;
+use Zend\View\Model\JsonModel;
+use Magento\Setup\Model\PhpExtensions;
+use Magento\Setup\Model\FilePermissions;
+
+class Environment extends AbstractActionController
+{
+    /**
+     * The minimum required version of PHP
+     */
+    const PHP_VERSION_MIN = '5.4.0';
+
+    /**
+     * @var \Magento\Setup\Model\PhpExtensions
+     */
+    protected $extensions;
+
+    /**
+     * @param PhpExtensions $extensions
+     * @param FilePermissions $permissions
+     */
+    public function __construct(PhpExtensions $extensions, FilePermissions $permissions)
+    {
+        $this->extensions = $extensions;
+        $this->permissions = $permissions;
+    }
+
+    /**
+     * @return JsonModel
+     */
+    public function phpVersionAction()
+    {
+        $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
+        if (version_compare(PHP_VERSION, self::PHP_VERSION_MIN, '<') === true) {
+            $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
+        }
+
+        $data = [
+            'responseType' => $responseType,
+            'data' => [
+                'required' => self::PHP_VERSION_MIN,
+                'current' => PHP_VERSION,
+            ],
+        ];
+        return new JsonModel($data);
+    }
+
+    /**
+     * @return JsonModel
+     */
+    public function phpExtensionsAction()
+    {
+        $required = $this->extensions->getRequired();
+        $current = $this->extensions->getCurrent();
+
+        $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
+        if (array_diff($required, $current)) {
+            $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
+        }
+
+        $data = [
+            'responseType' => $responseType,
+            'data' => [
+                'required' => $required,
+                'current' => $current,
+            ],
+        ];
+
+        return new JsonModel($data);
+    }
+
+    /**
+     * @return JsonModel
+     */
+    public function filePermissionsAction()
+    {
+        $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
+        if ($this->permissions->getMissingWritableDirectoriesForInstallation()) {
+            $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
+        }
+
+        $data = [
+            'responseType' => $responseType,
+            'data' => [
+                'required' => $this->permissions->getInstallationWritableDirectories(),
+                'current' => $this->permissions->getInstallationCurrentWritableDirectories(),
+            ],
+        ];
+
+        return new JsonModel($data);
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Controller/IndexController.php b/setup/module/Magento/Setup/src/Controller/Index.php
similarity index 51%
rename from setup/module/Magento/Setup/src/Controller/IndexController.php
rename to setup/module/Magento/Setup/src/Controller/Index.php
index 373b5b3abd036..f9b659c047632 100644
--- a/setup/module/Magento/Setup/src/Controller/IndexController.php
+++ b/setup/module/Magento/Setup/src/Controller/Index.php
@@ -11,26 +11,13 @@
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
 
-class IndexController extends AbstractActionController
+class Index extends AbstractActionController
 {
-    /**
-     * @var ViewModel
-     */
-    protected $view;
-
-    /**
-     * @param ViewModel $view
-     */
-    public function __construct(ViewModel $view)
-    {
-        $this->view = $view;
-    }
-
     /**
      * @return ViewModel
      */
     public function indexAction()
     {
-        return $this->view;
+        return new ViewModel;
     }
 }
diff --git a/setup/module/Magento/Setup/src/Controller/Install/StartController.php b/setup/module/Magento/Setup/src/Controller/Install.php
similarity index 77%
rename from setup/module/Magento/Setup/src/Controller/Install/StartController.php
rename to setup/module/Magento/Setup/src/Controller/Install.php
index 1b624e7f09688..c13db8d22a045 100644
--- a/setup/module/Magento/Setup/src/Controller/Install/StartController.php
+++ b/setup/module/Magento/Setup/src/Controller/Install.php
@@ -5,10 +5,10 @@
  * @copyright   {copyright}
  * @license     {license_link}
  */
-
-namespace Magento\Setup\Controller\Install;
+namespace Magento\Setup\Controller;
 
 use Zend\Mvc\Controller\AbstractActionController;
+use Zend\View\Model\ViewModel;
 use Magento\Setup\Model\WebLogger;
 use Zend\Json\Json;
 use Zend\View\Model\JsonModel;
@@ -17,21 +17,10 @@
 use Magento\Setup\Model\UserConfigurationDataMapper as UserConfig;
 use Magento\Setup\Model\AdminAccount;
 use Magento\Setup\Module\Setup\ConfigMapper;
+use Magento\Setup\Model\Installer\ProgressFactory;
 
-/**
- * UI Controller that handles installation
- *
- * @package Magento\Setup\Controller\Install
- */
-class StartController extends AbstractActionController
+class Install extends AbstractActionController
 {
-    /**
-     * JSON Model Object
-     *
-     * @var JsonModel
-     */
-    private $json;
-
     /**
      * @var WebLogger
      */
@@ -42,21 +31,36 @@ class StartController extends AbstractActionController
      */
     private $installer;
 
+    /**
+     * @var ProgressFactory
+     */
+    private $progressFactory;
+
     /**
      * Default Constructor
      *
-     * @param JsonModel $view
      * @param WebLogger $logger
      * @param InstallerFactory $installerFactory
+     * @param ProgressFactory $progressFactory
      */
     public function __construct(
-        JsonModel $view,
         WebLogger $logger,
-        InstallerFactory $installerFactory
+        InstallerFactory $installerFactory,
+        ProgressFactory $progressFactory
     ) {
-        $this->json = $view;
         $this->log = $logger;
         $this->installer = $installerFactory->create($logger);
+        $this->progressFactory = $progressFactory;
+    }
+
+    /**
+     * @return ViewModel
+     */
+    public function indexAction()
+    {
+        $view = new ViewModel;
+        $view->setTerminal(true);
+        return $view;
     }
 
     /**
@@ -64,9 +68,10 @@ public function __construct(
      *
      * @return JsonModel
      */
-    public function indexAction()
+    public function startAction()
     {
         $this->log->clear();
+        $json = new JsonModel;
         try {
             $data = array_merge(
                 $this->importDeploymentConfigForm(),
@@ -74,19 +79,39 @@ public function indexAction()
                 $this->importAdminUserForm()
             );
             $this->installer->install($data);
-            $this->json->setVariable(
+            $json->setVariable(
                 'key',
                 $this->installer->getInstallInfo()[
                     \Magento\Framework\App\DeploymentConfig\EncryptConfig::KEY_ENCRYPTION_KEY
                 ]
             );
-            $this->json->setVariable('success', true);
-            $this->json->setVariable('messages', $this->installer->getInstallInfo()[Installer::INFO_MESSAGE]);
+            $json->setVariable('success', true);
+            $json->setVariable('messages', $this->installer->getInstallInfo()[Installer::INFO_MESSAGE]);
         } catch(\Exception $e) {
             $this->log->logError($e);
-            $this->json->setVariable('success', false);
+            $json->setVariable('success', false);
+        }
+        return $json;
+    }
+
+    /**
+     * Checks progress of installation
+     *
+     * @return JsonModel
+     */
+    public function progressAction()
+    {
+        $percent = 0;
+        $success = false;
+        try {
+            $progress = $this->progressFactory->createFromLog($this->log);
+            $percent = sprintf('%d', $progress->getRatio() * 100);
+            $success = true;
+            $contents = $this->log->get();
+        } catch (\Exception $e) {
+            $contents = [(string)$e];
         }
-        return $this->json;
+        return new JsonModel(['progress' => $percent, 'success' => $success, 'console' => $contents]);
     }
 
     /**
diff --git a/setup/module/Magento/Setup/src/Controller/Install/ProgressController.php b/setup/module/Magento/Setup/src/Controller/Install/ProgressController.php
deleted file mode 100644
index a62fc0db43626..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/Install/ProgressController.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller\Install;
-
-use Magento\Setup\Model\WebLogger;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\JsonModel;
-use Magento\Setup\Model\Installer\ProgressFactory;
-
-class ProgressController extends AbstractActionController
-{
-    /**
-     * JSON response
-     *
-     * @var \Zend\View\Model\JsonModel
-     */
-    protected $json;
-
-    /**
-     * Web logger
-     *
-     * @var WebLogger
-     */
-    protected $logger;
-
-    /**
-     * Progress indicator factory
-     *
-     * @var ProgressFactory
-     */
-    protected $progressFactory;
-
-    /**
-     * Constructor
-     *
-     * @param JsonModel $view
-     * @param WebLogger $logger
-     * @param ProgressFactory $progressFactory
-     */
-    public function __construct(
-        JsonModel $view,
-        WebLogger $logger,
-        ProgressFactory $progressFactory
-    ) {
-        $this->logger = $logger;
-        $this->json = $view;
-        $this->progressFactory = $progressFactory;
-    }
-
-    /**
-     * Checks progress of installation
-     *
-     * @return JsonModel
-     */
-    public function indexAction()
-    {
-        $percent = 0;
-        $success = false;
-        try {
-            $progress = $this->progressFactory->createFromLog($this->logger);
-            $percent = sprintf('%d', $progress->getRatio() * 100);
-            $success = true;
-            $contents = $this->logger->get();
-        } catch (\Exception $e) {
-            $contents = [(string)$e];
-        }
-        return $this->json->setVariables(['progress' => $percent, 'success' => $success, 'console' => $contents]);
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Controller/InstallController.php b/setup/module/Magento/Setup/src/Controller/InstallController.php
deleted file mode 100644
index e304d2d38f902..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/InstallController.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
-
-class InstallController extends AbstractActionController
-{
-    /**
-     * @var \Zend\View\Model\ViewModel
-     */
-    protected $view;
-
-    /**
-     * @param ViewModel $view
-     */
-    public function __construct(
-        ViewModel $view
-    ) {
-        $this->view = $view;
-    }
-
-    /**
-     * @return ViewModel
-     */
-    public function indexAction()
-    {
-        $this->view->setTerminal(true);
-        return $this->view;
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Controller/LandingController.php b/setup/module/Magento/Setup/src/Controller/Landing.php
similarity index 65%
rename from setup/module/Magento/Setup/src/Controller/LandingController.php
rename to setup/module/Magento/Setup/src/Controller/Landing.php
index 235d7c737c193..3c509ad606524 100644
--- a/setup/module/Magento/Setup/src/Controller/LandingController.php
+++ b/setup/module/Magento/Setup/src/Controller/Landing.php
@@ -14,18 +14,13 @@
 use Composer\Json\JsonFile;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-class LandingController extends AbstractActionController
+class Landing extends AbstractActionController
 {
     /**
      * @var ServiceLocatorInterface
      */
     protected $serviceLocator;
 
-    /**
-     * @var ViewModel
-     */
-    protected $view;
-
     /**
      * @var array
      */
@@ -33,15 +28,12 @@ class LandingController extends AbstractActionController
 
     /**
      * @param ServiceLocatorInterface $serviceLocator
-     * @param ViewModel $view
      * @param DirectoryList $directoryList
      */
     public function __construct(
         ServiceLocatorInterface $serviceLocator,
-        ViewModel $view,
         DirectoryList $directoryList
     ) {
-        $this->view = $view;
         $jsonFile = new JsonFile($directoryList->getRoot() . '/composer.json');
         $this->composerJson = $jsonFile->read();
     }
@@ -51,10 +43,11 @@ public function __construct(
      */
     public function indexAction()
     {
-        $this->view->setTerminal(true);
-        $this->view->setVariable('languages', $this->serviceLocator->get('config')['languages']);
-        $this->view->setVariable('location', 'en_US');
-        $this->view->setVariable('version', $this->composerJson['version']);
-        return $this->view;
+        $view = new ViewModel;
+        $view->setTerminal(true);
+        $view->setVariable('languages', $this->serviceLocator->get('config')['languages']);
+        $view->setVariable('location', 'en_US');
+        $view->setVariable('version', $this->composerJson['version']);
+        return $view;
     }
 }
diff --git a/setup/module/Magento/Setup/src/Controller/LicenseController.php b/setup/module/Magento/Setup/src/Controller/License.php
similarity index 53%
rename from setup/module/Magento/Setup/src/Controller/LicenseController.php
rename to setup/module/Magento/Setup/src/Controller/License.php
index 4865873678648..31c07b4f9ed19 100644
--- a/setup/module/Magento/Setup/src/Controller/LicenseController.php
+++ b/setup/module/Magento/Setup/src/Controller/License.php
@@ -9,39 +9,30 @@
 
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
-use Magento\Setup\Model\License;
+use Magento\Setup\Model\License as LicenseModel;
 
 /**
  * Class LicenseController
  *
  * @package Magento\Setup\Controller
  */
-class LicenseController extends AbstractActionController
+class License extends AbstractActionController
 {
-    /**
-     * View object
-     *
-     * @var \Zend\View\Model\ViewModel
-     */
-    protected $view;
-
     /**
      * Licence Model
      *
-     * @var License
+     * @var LicenseModel
      */
     protected $license;
 
     /**
      * Constructor
      *
-     * @param License $license
-     * @param ViewModel $view
+     * @param LicenseModel $license
      */
-    public function __construct(License $license, ViewModel $view)
+    public function __construct(LicenseModel $license)
     {
         $this->license = $license;
-        $this->view = $view;
     }
 
     /**
@@ -52,12 +43,13 @@ public function __construct(License $license, ViewModel $view)
     public function indexAction()
     {
         $contents = $this->license->getContents();
+        $view = new ViewModel;
         if ($contents === false) {
-            $this->view->setTemplate('error/404');
-            $this->view->setVariable('message', 'Cannot find license file.');
+            $view->setTemplate('error/404');
+            $view->setVariable('message', 'Cannot find license file.');
         } else {
-            $this->view->setVariable('license', $contents);
+            $view->setVariable('license', $contents);
         }
-        return $this->view;
+        return $view;
     }
 }
diff --git a/setup/module/Magento/Setup/src/Controller/Navigation.php b/setup/module/Magento/Setup/src/Controller/Navigation.php
new file mode 100644
index 0000000000000..23c1ef1572a77
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Controller/Navigation.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Setup\Controller;
+
+use Magento\Setup\Model\Navigation as NavModel;
+use Zend\Mvc\Controller\AbstractActionController;
+use Zend\View\Model\JsonModel;
+use Zend\View\Model\ViewModel;
+
+class Navigation extends AbstractActionController
+{
+    /**
+     * @var NavModel
+     */
+    protected $navigation;
+
+    /**
+     * @param NavModel $navigation
+     */
+    public function __construct(NavModel $navigation)
+    {
+        $this->navigation = $navigation;
+    }
+
+    /**
+     * @return JsonModel
+     */
+    public function indexAction()
+    {
+        $json = new JsonModel;
+        return $json->setVariable('nav', $this->navigation->getData());
+    }
+
+    /**
+     * @return array|ViewModel
+     */
+    public function menuAction()
+    {
+        $view = new ViewModel;
+        $view->setTemplate('/magento/setup/navigation/menu.phtml');
+        $view->setTerminal(true);
+        $view->setVariable('menu', $this->navigation->getMenuItems());
+        $view->setVariable('main', $this->navigation->getMainItems());
+        return $view;
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Controller/ReadinessCheck.php b/setup/module/Magento/Setup/src/Controller/ReadinessCheck.php
new file mode 100644
index 0000000000000..d02c77b43ac21
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Controller/ReadinessCheck.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Setup\Controller;
+
+use Zend\Mvc\Controller\AbstractActionController;
+use Zend\View\Model\ViewModel;
+
+class ReadinessCheck extends AbstractActionController
+{
+    /**
+     * @return array|ViewModel
+     */
+    public function indexAction()
+    {
+        $view = new ViewModel;
+        $view->setTerminal(true);
+        return $view;
+    }
+
+    /**
+     * @return array|ViewModel
+     */
+    public function progressAction()
+    {
+        $view = new ViewModel;
+        $view->setTemplate('/magento/setup/readiness-check/progress.phtml');
+        $view->setTerminal(true);
+        return $view;
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Controller/ReadinessCheck/ProgressController.php b/setup/module/Magento/Setup/src/Controller/ReadinessCheck/ProgressController.php
deleted file mode 100644
index 3aa2cf144042c..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/ReadinessCheck/ProgressController.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller\ReadinessCheck;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
-
-class ProgressController extends AbstractActionController
-{
-    /**
-     * @var \Zend\View\Model\ViewModel
-     */
-    protected $view;
-
-    /**
-     * @param ViewModel $view
-     */
-    public function __construct(ViewModel $view)
-    {
-        $this->view = $view;
-    }
-
-    /**
-     * @return array|ViewModel
-     */
-    public function indexAction()
-    {
-        $this->view->setTerminal(true);
-        return $this->view;
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Controller/ReadinessCheckController.php b/setup/module/Magento/Setup/src/Controller/ReadinessCheckController.php
deleted file mode 100644
index 9fda3be892c80..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/ReadinessCheckController.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
-
-class ReadinessCheckController extends AbstractActionController
-{
-    /**
-     * @var \Zend\View\Model\ViewModel
-     */
-    protected $view;
-
-    /**
-     * @param ViewModel $view
-     */
-    public function __construct(ViewModel $view)
-    {
-        $this->view = $view;
-    }
-
-    /**
-     * @return array|ViewModel
-     */
-    public function indexAction()
-    {
-        $this->view->setTerminal(true);
-        return $this->view;
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Controller/Data/ResponseTypeInterface.php b/setup/module/Magento/Setup/src/Controller/ResponseTypeInterface.php
similarity index 87%
rename from setup/module/Magento/Setup/src/Controller/Data/ResponseTypeInterface.php
rename to setup/module/Magento/Setup/src/Controller/ResponseTypeInterface.php
index fc8e5a0615e77..4c114b74eda58 100644
--- a/setup/module/Magento/Setup/src/Controller/Data/ResponseTypeInterface.php
+++ b/setup/module/Magento/Setup/src/Controller/ResponseTypeInterface.php
@@ -6,7 +6,7 @@
  * @license   {license_link}
  */
 
-namespace Magento\Setup\Controller\Data;
+namespace Magento\Setup\Controller;
 
 interface ResponseTypeInterface
 {
diff --git a/setup/module/Magento/Setup/src/Controller/Success.php b/setup/module/Magento/Setup/src/Controller/Success.php
new file mode 100644
index 0000000000000..67c87f5eca2bb
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Controller/Success.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Setup\Controller;
+
+use Zend\Mvc\Controller\AbstractActionController;
+use Zend\View\Model\ViewModel;
+
+class Success extends AbstractActionController
+{
+    /**
+     * @return ViewModel
+     */
+    public function indexAction()
+    {
+        $view = new ViewModel;
+        $view->setTerminal(true);
+        return $view;
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Controller/SuccessController.php b/setup/module/Magento/Setup/src/Controller/SuccessController.php
deleted file mode 100644
index 3134e3013fe1d..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/SuccessController.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
-
-class SuccessController extends AbstractActionController
-{
-    /**
-     * @var \Zend\View\Model\ViewModel
-     */
-    protected $view;
-
-    /**
-     * @param ViewModel $view
-     */
-    public function __construct(
-        ViewModel $view
-    ) {
-        $this->view = $view;
-    }
-
-    /**
-     * @return ViewModel
-     */
-    public function indexAction()
-    {
-        $this->view->setTerminal(true);
-        return $this->view;
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
new file mode 100644
index 0000000000000..4eb1a93088d51
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Setup\Controller;
+
+use Zend\Mvc\Controller\AbstractActionController;
+use Zend\View\Model\ViewModel;
+
+class WebConfiguration extends AbstractActionController
+{
+    /**
+     * @return array|ViewModel
+     */
+    public function indexAction()
+    {
+        $view = new ViewModel;
+        $view->setTerminal(true);
+        return $view;
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php b/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
deleted file mode 100644
index 0bc604895a51d..0000000000000
--- a/setup/module/Magento/Setup/src/Controller/WebConfigurationController.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Setup\Controller;
-
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\ViewModel;
-
-class WebConfigurationController extends AbstractActionController
-{
-    /**
-     * View model
-     *
-     * @var \Zend\View\Model\ViewModel
-     */
-    protected $view;
-
-    /**
-     * Constructor
-     *
-     * @param ViewModel $view
-     */
-    public function __construct(ViewModel $view)
-    {
-        $this->view = $view;
-    }
-
-    /**
-     * Displays web configuration with default values.
-     * 
-     * @return array|ViewModel
-     */
-    public function indexAction()
-    {
-        $this->view->setTerminal(true);
-        $urlComponents = explode("/", $_SERVER['HTTP_REFERER']);
-        $baseUrl ='';
-        for ($i = 0; $i < count($urlComponents) - 2; $i++) {
-            $baseUrl .= $urlComponents[$i] . '/';
-        }
-        $this->view->setVariable('baseUrl', $baseUrl);
-        return $this->view;
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Mvc/Router/Http/Setup.php b/setup/module/Magento/Setup/src/Mvc/Router/Http/Setup.php
deleted file mode 100644
index 2ee4544a12a45..0000000000000
--- a/setup/module/Magento/Setup/src/Mvc/Router/Http/Setup.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license   {license_link}
- */
-
-namespace Magento\Setup\Mvc\Router\Http;
-
-use Traversable;
-use Zend\Mvc\Router\Exception;
-use Zend\Stdlib\ArrayUtils;
-use Zend\Stdlib\RequestInterface as Request;
-use Zend\Mvc\Router\Http\Regex as ZendRegex;
-use Zend\Mvc\Router\Http\RouteMatch;
-
-/**
- * Setup route.
- */
-class Setup extends ZendRegex
-{
-    /**
-     * {@inheritdoc}
-     */
-    public static function factory($options = array())
-    {
-        if ($options instanceof Traversable) {
-            $options = ArrayUtils::iteratorToArray($options);
-        } elseif (!is_array($options)) {
-            throw new Exception\InvalidArgumentException(
-                __METHOD__ . ' expects an array or Traversable set of options'
-            );
-        }
-
-        if (!isset($options['regex'])) {
-            throw new Exception\InvalidArgumentException('Missing "regex" in options array');
-        }
-
-        if (strpos($options['regex'], '?<controller>') === false) {
-            throw new Exception\InvalidArgumentException('Missing "?<controller>" part in "regex"');
-        }
-
-        if (!isset($options['spec'])) {
-            throw new Exception\InvalidArgumentException('Missing "spec" in options array');
-        }
-
-        if (!isset($options['defaults'])) {
-            $options['defaults'] = array();
-        }
-
-        return new static($options['regex'], $options['spec'], $options['defaults']);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function match(Request $request, $pathOffset = 0)
-    {
-        if (!method_exists($request, 'getUri')) {
-            return null;
-        }
-
-        /** @var  $uri \Zend\Uri\Http */
-        $uri  = $request->getUri();
-        $path = $uri->getPath();
-
-        $result = preg_match('(' . $this->regex . ')', $path, $matches, null, (int)$pathOffset);
-        if (!$result || !isset($matches['controller'])) {
-            return null;
-        }
-
-        foreach ($matches as $key => $value) {
-            if (is_numeric($key) || is_int($key) || $value === '') {
-                unset($matches[$key]);
-            }
-        }
-
-        $chunks = explode('/', substr(ltrim($path, '/'), $pathOffset));
-        array_pop($chunks); // Extract 'controller' part
-
-        array_unshift($chunks, $this->defaults['__NAMESPACE__']);
-        $namespace = str_replace(' ', '\\', ucwords(implode(' ', $chunks)));
-
-        $controller = ucwords($matches['controller']);
-        if (false === strpos($controller, 'Controller')) {
-            $controller .= 'Controller';
-        }
-
-        $matches['controller'] = $controller;
-        $matches['__NAMESPACE__'] = str_replace(' ', '', ucwords(str_replace('-', ' ', $namespace)));
-
-        $matchedLength = strlen($uri->getPath()) - $pathOffset;
-        return new RouteMatch(array_merge($this->defaults, $matches), $matchedLength);
-    }
-}
diff --git a/setup/module/Magento/Setup/view/layout/layout.phtml b/setup/module/Magento/Setup/view/layout/layout.phtml
index fe7bf0dd97aa5..caa54f65b5717 100644
--- a/setup/module/Magento/Setup/view/layout/layout.phtml
+++ b/setup/module/Magento/Setup/view/layout/layout.phtml
@@ -13,25 +13,25 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Magento Setup Tool</title>
         <?php echo $this->headLink()
-            ->appendStylesheet($this->basePath() . '/pub/bootstrap/css/bootstrap.min.css')
-            ->appendStylesheet($this->basePath() . '/pub/bootstrap/css/bootstrap-theme.min.css')
-            ->appendStylesheet($this->basePath() . '/pub/magento/setup/css/app.css');
+            ->appendStylesheet('pub/bootstrap/css/bootstrap.min.css')
+            ->appendStylesheet('pub/bootstrap/css/bootstrap-theme.min.css')
+            ->appendStylesheet('pub/magento/setup/css/app.css');
         ?>
         <?php echo $this->headScript()
-            ->appendFile($this->basePath() . '/pub/angular/angular.min.js')
-            ->appendFile($this->basePath() . '/pub/angular-ng-storage/angular-ng-storage.min.js')
-            ->appendFile($this->basePath() . '/pub/angular-ui-router/angular-ui-router.min.js')
-            ->appendFile($this->basePath() . '/pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js')
-            ->appendFile($this->basePath() . '/pub/magento/setup/app.js')
-            ->appendFile($this->basePath() . '/pub/magento/setup/main.js')
-            ->appendFile($this->basePath() . '/pub/magento/setup/landing.js')
-            ->appendFile($this->basePath() . '/pub/magento/setup/readiness-check.js')
-            ->appendFile($this->basePath() . '/pub/magento/setup/add-database.js')
-            ->appendFile($this->basePath() . '/pub/magento/setup/web-configuration.js')
-            ->appendFile($this->basePath() . '/pub/magento/setup/customize-your-store.js')
-            ->appendFile($this->basePath() . '/pub/magento/setup/create-admin-account.js')
-            ->appendFile($this->basePath() . '/pub/magento/setup/install.js')
-            ->appendFile($this->basePath() . '/pub/magento/setup/success.js');
+            ->appendFile('pub/angular/angular.min.js')
+            ->appendFile('pub/angular-ng-storage/angular-ng-storage.min.js')
+            ->appendFile('pub/angular-ui-router/angular-ui-router.min.js')
+            ->appendFile('pub/angular-ui-bootstrap/angular-ui-bootstrap.min.js')
+            ->appendFile('pub/magento/setup/app.js')
+            ->appendFile('pub/magento/setup/main.js')
+            ->appendFile('pub/magento/setup/landing.js')
+            ->appendFile('pub/magento/setup/readiness-check.js')
+            ->appendFile('pub/magento/setup/add-database.js')
+            ->appendFile('pub/magento/setup/web-configuration.js')
+            ->appendFile('pub/magento/setup/customize-your-store.js')
+            ->appendFile('pub/magento/setup/create-admin-account.js')
+            ->appendFile('pub/magento/setup/install.js')
+            ->appendFile('pub/magento/setup/success.js');
         ?>
         <?php echo $this->inlineScript() ?>
     </head>
diff --git a/setup/module/Magento/Setup/view/magento/setup/index.phtml b/setup/module/Magento/Setup/view/magento/setup/index.phtml
index b80694be655d4..478777850d1cc 100644
--- a/setup/module/Magento/Setup/view/magento/setup/index.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/index.phtml
@@ -7,7 +7,7 @@
  */
 ?>
 <div class="row">
-    <div ng-include="'controls/menu'"></div>
+    <div ng-include="'index.php/navigation/menu'"></div>
 
     <div class="container {{class}}" ng-controller="mainController" id="main">
         <div ui-view="root">
diff --git a/setup/module/Magento/Setup/view/magento/setup/controls/menu.phtml b/setup/module/Magento/Setup/view/magento/setup/navigation/menu.phtml
similarity index 100%
rename from setup/module/Magento/Setup/view/magento/setup/controls/menu.phtml
rename to setup/module/Magento/Setup/view/magento/setup/navigation/menu.phtml
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 9db7ba10718b6..89caac746e400 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -18,7 +18,7 @@ angular.module('add-database', ['ngStorage'])
         }
 
     $scope.testConnection = function () {
-        $http.post('data/database', $scope.db)
+        $http.post('index.php/database-check', $scope.db)
             .success(function (data) {
                 $scope.testConnection.result = data;
             })
diff --git a/setup/pub/magento/setup/install.js b/setup/pub/magento/setup/install.js
index 681df03f16149..66111d0f69162 100644
--- a/setup/pub/magento/setup/install.js
+++ b/setup/pub/magento/setup/install.js
@@ -78,10 +78,10 @@ angular.module('install', ['ngStorage'])
     .service('progress', ['$http', function ($http) {
         return {
             get: function (callback) {
-                $http.get('install/progress').then(callback);
+                $http.get('index.php/install/progress').then(callback);
             },
             post: function (data, callback) {
-                $http.post('install/start', data).success(callback);
+                $http.post('index.php/install/start', data).success(callback);
             }
         };
     }]);
diff --git a/setup/pub/magento/setup/landing.js b/setup/pub/magento/setup/landing.js
index a47bc55353aab..4230a0ac9d382 100644
--- a/setup/pub/magento/setup/landing.js
+++ b/setup/pub/magento/setup/landing.js
@@ -14,7 +14,7 @@ angular.module('landing', ['ngStorage'])
         function ($scope, $location, $localStorage) {
             $scope.selectLanguage = function () {
                 $localStorage.lang = $scope.modelLanguage;
-                window.location = '/setup/' + $scope.modelLanguage + '/index';
+                window.location = 'index.php/' + $scope.modelLanguage + '/index';
             };
         }
     ]);
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index 81edfaf611016..1762f593c25a2 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -59,7 +59,7 @@ main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navi
         states: [],
         load: function () {
             var self = this;
-            $http.get('data/states').success(function (data) {
+            $http.get('index.php/navigation').success(function (data) {
                 var currentState = $location.path().replace('/', '');
                 var isCurrentStateFound = false;
                 self.states = data.nav;
diff --git a/setup/pub/magento/setup/readiness-check.js b/setup/pub/magento/setup/readiness-check.js
index 1ea1160f28d2b..f0d18cbe16b1c 100644
--- a/setup/pub/magento/setup/readiness-check.js
+++ b/setup/pub/magento/setup/readiness-check.js
@@ -47,7 +47,7 @@ angular.module('readiness-check', [])
 
         $scope.items = {
             'php-version': {
-                url:'data/php-version',
+                url:'index.php/environment/php-version',
                 show: function() {
                     $scope.startProgress();
                     $scope.version.visible = true;
@@ -60,7 +60,7 @@ angular.module('readiness-check', [])
                 }
             },
             'php-extensions': {
-                url:'data/php-extensions',
+                url:'index.php/environment/php-extensions',
                 show: function() {
                     $scope.startProgress();
                     $scope.extensions.visible = true;
@@ -73,7 +73,7 @@ angular.module('readiness-check', [])
                 }
             },
             'file-permissions': {
-                url:'data/file-permissions',
+                url:'index.php/environment/file-permissions',
                 show: function() {
                     $scope.startProgress();
                     $scope.permissions.visible = true;

From a61b451da1efbe6a8a967486480a1d9ee5008500 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Tue, 25 Nov 2014 21:35:09 -0600
Subject: [PATCH 031/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Fixed the problem described in the issue plus 'Test Connection and
  Authentication' button press message disappearing is solved.
---
 .../view/magento/setup/add-database.phtml     | 19 +++++++++--
 setup/pub/magento/setup/add-database.js       | 32 ++++++++++++-------
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
index 551c34acf9cca..2b4a88e7492cf 100644
--- a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
@@ -15,7 +15,7 @@
     <h1>{{$state.current.header}}</h1>
 </div>
 
-<form novalidate name="database" class="form-horizontal" role="form" ng-submit="testConnection()">
+<form novalidate name="database" class="form-horizontal" role="form">
     <div class="bs-callout bs-callout-warning col-sm-12 hide">
         <h4>Did you want to use an existing or create a new database?</h4>
         <div class="radio col-sm-6">
@@ -129,7 +129,7 @@
         </div>
     </div>
 
-    <div class="form-group">
+    <div class="form-group" ng-click="testConnection()">
         <div class="col-sm-offset-4 col-sm-4">
             <button type="submit" class="btn btn-default" style="width: 100%;">
                 Test Connection and Authentication
@@ -175,6 +175,21 @@
         </div>
     </div>
 
+    <div class="form-group" ng-show="testConnectionNext.result.success === false && database.submitted" >
+        <div class="col-sm-4">
+            <input type="hidden"
+                   name="dbConnection"
+                   ng-model="db.connection"
+                   ng-if="!testConnectionNext.result.success"
+                   required />
+        </div>
+        <div  class="col-sm-4">
+            <div class="error-container">
+                <span class="glyphicon glyphicon-remove-sign">{{testConnectionNext.result.error}}</span>
+            </div>
+        </div>
+    </div>
+
     <div class="form-group" ng-if="db.useExistingDb==0">
         <label class="col-sm-3 control-label">Data Access<span class="required">*</span></label>
         <div class="col-sm-9">
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 9db7ba10718b6..2b2cf5f7d9289 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -17,18 +17,25 @@ angular.module('add-database', ['ngStorage'])
             $scope.db = $localStorage.db;
         }
 
-    $scope.testConnection = function () {
-        $http.post('data/database', $scope.db)
-            .success(function (data) {
-                $scope.testConnection.result = data;
-            })
-            .then(function () {
-                $scope.testConnection.pressed = true;
-                $timeout(function () {
-                    $scope.testConnection.pressed = false;
-                }, 2500);
-            });
-    };
+        $scope.testConnection = function () {
+            $http.post('data/database', $scope.db)
+                .success(function (data) {
+                    $scope.testConnection.result = data;
+                })
+                .then(function () {
+                    $scope.testConnection.pressed = true;
+                    $timeout(function () {
+                        $scope.testConnection.pressed = false;
+                    }, 9999999999);
+                });
+        };
+
+        $scope.testConnectionNext = function () {
+            $http.post('data/database', $scope.db)
+                .success(function (data) {
+                    $scope.testConnectionNext.result = data;
+                });
+        };
 
         $scope.$on('nextState', function () {
             $localStorage.db = $scope.db;
@@ -41,6 +48,7 @@ angular.module('add-database', ['ngStorage'])
 
         // Dispatch 'validation-response' event to parent controller
         $scope.validate = function() {
+            $scope.testConnectionNext();
             if ($scope.database.$valid) {
                 $scope.$emit('validation-response', true);
             } else {

From 8cdcfa07a82da9e6a71e996cebb7364a66a35e7d Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@ebay.com>
Date: Wed, 26 Nov 2014 11:12:35 +0200
Subject: [PATCH 032/474] MTA-773: Stabilize Catalog module. Products

- fixed random fail with fill category on product page for old tests
---
 .../Selenium/Element/MultisuggestElement.php  | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultisuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultisuggestElement.php
index af52f2aa20be7..1edfe1e3a1dc0 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultisuggestElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/MultisuggestElement.php
@@ -12,41 +12,40 @@
 use Mtf\Client\Element\Locator;
 
 /**
- * Class MultisuggestElement
- * Typified element class for multi suggest element
+ * Typified element class for multi suggest element.
  */
 class MultisuggestElement extends SuggestElement
 {
     /**
-     * Selector list choice
+     * Selector list choice.
      *
      * @var string
      */
     protected $listChoice = './/ul[contains(@class,"mage-suggest-choices")]';
 
     /**
-     * Selector choice item
+     * Selector choice item.
      *
      * @var string
      */
     protected $choice = './/li/div[text()="%s"]/..';
 
     /**
-     * Selector choice value
+     * Selector choice value.
      *
      * @var string
      */
     protected $choiceValue = './/li[contains(@class,"mage-suggest-choice")]/div';
 
     /**
-     * Selector remove choice item
+     * Selector remove choice item.
      *
      * @var string
      */
     protected $choiceClose = '.mage-suggest-choice-close';
 
     /**
-     * Set value
+     * Set value.
      *
      * @param array|string $values
      * @return void
@@ -58,13 +57,14 @@ public function setValue($values)
         $this->clear();
         foreach ((array)$values as $value) {
             if (!$this->isChoice($value)) {
+                $this->selectWindow();
                 parent::setValue($value);
             }
         }
     }
 
     /**
-     * Get value
+     * Get value.
      *
      * @return array
      */
@@ -84,7 +84,7 @@ public function getValue()
     }
 
     /**
-     * Check exist selected item
+     * Check exist selected item.
      *
      * @param string $value
      * @return bool
@@ -95,7 +95,7 @@ protected function isChoice($value)
     }
 
     /**
-     * Clear element
+     * Clear element.
      *
      * @return void
      */
@@ -107,4 +107,15 @@ protected function clear()
             $choiceClose = $this->find($this->choiceClose);
         }
     }
+
+    /**
+     * Select to last window.
+     *
+     * @return void
+     */
+    protected function selectWindow()
+    {
+        $windowHandles = $this->_driver->windowHandles();
+        $this->_driver->window(end($windowHandles));
+    }
 }

From 6eb594ecf425b3fcc9027987e712ada8996f74f7 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@ebay.com>
Date: Wed, 26 Nov 2014 11:41:14 +0200
Subject: [PATCH 033/474] MTA-773: Stabilize Catalog module. Products

- fixed fixture for simple product
---
 .../app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
index 719a875af3571..8a562a57ead05 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
@@ -624,6 +624,7 @@ public function __construct(
     protected $attributes = [
         'attribute_code' => 'attributes',
         'backend_type' => 'virtual',
+    ];
 
     protected $fpt = [
         'attribute_code' => 'fpt',
@@ -963,6 +964,7 @@ public function getIsVirtual()
     public function getAttributes()
     {
         return $this->getData('attributes');
+    }
 
     public function getFptData()
     {

From 51b1f42b0889ac79f91d430e7da833cac57d1b08 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 26 Nov 2014 14:35:36 -0600
Subject: [PATCH 034/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Removed test connection button.
---
 .../view/magento/setup/add-database.phtml     | 22 +++----------------
 setup/pub/magento/setup/add-database.js       | 15 +------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
index 2b4a88e7492cf..a762266263ce4 100644
--- a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
@@ -129,22 +129,6 @@
         </div>
     </div>
 
-    <div class="form-group" ng-click="testConnection()">
-        <div class="col-sm-offset-4 col-sm-4">
-            <button type="submit" class="btn btn-default" style="width: 100%;">
-                Test Connection and Authentication
-            </button>
-        </div>
-        <div class="col-sm-4" style="padding-top: 8px;">
-            <div ng-show="testConnection.result.success && testConnection.pressed" class="animate-show text-success">
-                <span class="glyphicon glyphicon-ok-sign text-success"></span>&nbsp;Test connection successful.
-            </div>
-            <div ng-show="!testConnection.result.success && testConnection.pressed" class="animate-show text-danger">
-                <span class="glyphicon glyphicon-remove-sign"></span>&nbsp;{{testConnection.result.error}}
-            </div>
-        </div>
-    </div>
-
     <div class="form-group" ng-if="db.useExistingDb==0">
         <label class="col-sm-4 control-label">New Database Name&nbsp;<span class="required">*</span></label>
         <div class="col-sm-4">
@@ -175,17 +159,17 @@
         </div>
     </div>
 
-    <div class="form-group" ng-show="testConnectionNext.result.success === false && database.submitted" >
+    <div class="form-group" ng-show="testConnection.result.success === false && database.submitted" >
         <div class="col-sm-4">
             <input type="hidden"
                    name="dbConnection"
                    ng-model="db.connection"
-                   ng-if="!testConnectionNext.result.success"
+                   ng-if="!testConnection.result.success"
                    required />
         </div>
         <div  class="col-sm-4">
             <div class="error-container">
-                <span class="glyphicon glyphicon-remove-sign">{{testConnectionNext.result.error}}</span>
+                <span class="glyphicon glyphicon-remove-sign">{{testConnection.result.error}}</span>
             </div>
         </div>
     </div>
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 2b2cf5f7d9289..2cf2f27bc615a 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -21,19 +21,6 @@ angular.module('add-database', ['ngStorage'])
             $http.post('data/database', $scope.db)
                 .success(function (data) {
                     $scope.testConnection.result = data;
-                })
-                .then(function () {
-                    $scope.testConnection.pressed = true;
-                    $timeout(function () {
-                        $scope.testConnection.pressed = false;
-                    }, 9999999999);
-                });
-        };
-
-        $scope.testConnectionNext = function () {
-            $http.post('data/database', $scope.db)
-                .success(function (data) {
-                    $scope.testConnectionNext.result = data;
                 });
         };
 
@@ -48,7 +35,7 @@ angular.module('add-database', ['ngStorage'])
 
         // Dispatch 'validation-response' event to parent controller
         $scope.validate = function() {
-            $scope.testConnectionNext();
+            $scope.testConnection();
             if ($scope.database.$valid) {
                 $scope.$emit('validation-response', true);
             } else {

From ecf56415f34a278682db1963e318d8f612832f02 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 26 Nov 2014 14:49:10 -0600
Subject: [PATCH 035/474] MAGETWO-30859: No input validation for HTTPS
 configuration data during installation

- Changes based on code review.
---
 .../Setup/view/magento/setup/web-configuration.phtml |  4 +---
 setup/pub/magento/setup/web-configuration.js         | 12 ++----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 114fcad168d82..01c3e42a52e4a 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -92,6 +92,7 @@ $hints = [
         </div>
 
         <div class="form-group" ng-if="showHttpsField()">
+            <label ng-show="config.https.front || config.https.admin" class="col-md-4 col-md-offset-3">Your HTTPS Store address:</label>
             <div class="col-md-4 col-md-offset-3">
                 <input type="text"
                        name="https"
@@ -99,9 +100,6 @@ $hints = [
                        ng-show="config.https.front || config.https.admin"
                        class="form-control"
                        ng-focus=""
-                       tooltip-placement="right"
-                       tooltip-trigger="focus"
-                       tooltip-append-to-body="true"
                        required />
             </div>
             <div class="col-md-offset-3 col-md-4" ng-show="webconfig.submitted">
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index f1ceb6438e100..0e19fc8f08288 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -10,13 +10,13 @@ angular.module('web-configuration', ['ngStorage'])
     .controller('webConfigurationController', ['$scope', '$state', '$localStorage', function ($scope, $state, $localStorage) {
         $scope.config = {
             address: {
-                web: 'http://www.example.com/',
+                web: '',
                 admin: 'admin'
             },
             https: {
                 front: false,
                 admin: false,
-                text: 'https://www.example.com/'
+                text: ''
             },
             rewrites: {
                 allowed: true
@@ -52,14 +52,6 @@ angular.module('web-configuration', ['ngStorage'])
             return angular.equals($scope.config.encrypt.type, 'user');
         }
 
-        $scope.$watch('config.https.front', function() {
-            $scope.config.https.text = 'https://www.example.com/';
-        });
-
-        $scope.$watch('config.https.admin', function() {
-            $scope.config.https.text = 'https://www.example.com/';
-        });
-
         $scope.showHttpsField = function() {
             return ($scope.config.https.front || $scope.config.https.admin);
         }

From d46834c3b51e3f8a7e6b1ea7fc4b65152ba27b20 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 26 Nov 2014 15:06:34 -0600
Subject: [PATCH 036/474] MAGETWO-30834: Admin user password validation doesn't
 work for characters number

- Changes based on code review feedback.
---
 .../magento/setup/create-admin-account.phtml    |  2 +-
 setup/pub/magento/setup/create-admin-account.js | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml b/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml
index e773bb4ac0beb..793bb45bca4e6 100644
--- a/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml
@@ -90,7 +90,7 @@ $passwordWizard = sprintf(
         </div>
         <div class="col-sm-offset-3 col-sm-4" ng-show="account.adminPassword.$invalid && account.submitted">
             <div class="error-container">
-                <span ng-show="account.adminPassword.$error.checkPassword">You must enter a valid password.</span>
+                <span ng-show="account.adminPassword.$error.checkPassword">Please enter a correct password.</span>
                 <span ng-show="account.adminPassword.$error.required">Please enter your new password.</span>
             </div>
         </div>
diff --git a/setup/pub/magento/setup/create-admin-account.js b/setup/pub/magento/setup/create-admin-account.js
index 949c490a8d7da..a196e7dfc2b72 100644
--- a/setup/pub/magento/setup/create-admin-account.js
+++ b/setup/pub/magento/setup/create-admin-account.js
@@ -46,14 +46,6 @@ angular.module('create-admin-account', ['ngStorage'])
             $localStorage.admin = $scope.admin;
         });
 
-        $scope.checkPasswordValidity = function() {
-            if (($scope.admin.passwordStatus.class === 'to-short') || ($scope.admin.passwordStatus.class === 'none')) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();
@@ -81,13 +73,8 @@ angular.module('create-admin-account', ['ngStorage'])
             require: "ngModel",
             link: function(scope, elm, attrs, ctrl){
                 var validator = function(value){
-                    var validated;
-                    if (!((value.length > 6) && (value.match(/[\d]+/) && value.match(/[a-zA-Z]+/)))) {
-                        validated = false;
-                    } else {
-                        validated = true;
-                    }
-                    ctrl.$setValidity('checkPassword', validated);
+                    var isValid = !(!((value.length > 6) && (value.match(/[\d]+/) && value.match(/[a-zA-Z]+/))));
+                    ctrl.$setValidity('checkPassword', isValid);
                     return value;
                 };
                 ctrl.$parsers.unshift(validator);

From 5fce2418772bf773c9844cdb82694205df53fc38 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Tue, 25 Nov 2014 14:41:15 -0600
Subject: [PATCH 037/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- added auto-detection of base URL in web installation wizard
- made the base URL entry optional
- cleanup of browser local storage at the start/end of wizard for better security and user experience

Conflicts:
	setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
	setup/pub/magento/setup/web-configuration.js
---
 .../Magento/Setup/src/Controller/Install.php  |  8 ++--
 .../Setup/src/Controller/WebConfiguration.php | 29 ++++++++++++-
 .../Setup/view/magento/setup/success.phtml    |  8 ++--
 .../magento/setup/web-configuration.phtml     | 43 +++++++++----------
 setup/pub/magento/setup/add-database.js       |  5 ++-
 setup/pub/magento/setup/main.js               |  5 ++-
 setup/pub/magento/setup/success.js            |  3 +-
 setup/pub/magento/setup/web-configuration.js  | 13 +++++-
 8 files changed, 77 insertions(+), 37 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/Install.php b/setup/module/Magento/Setup/src/Controller/Install.php
index c13db8d22a045..69d95cf3195ca 100644
--- a/setup/module/Magento/Setup/src/Controller/Install.php
+++ b/setup/module/Magento/Setup/src/Controller/Install.php
@@ -146,17 +146,15 @@ private function importUserConfigForm()
     {
         $source = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY);
         $result = [];
+        if (!empty($source['config']['address']['base_url'])) {
+            $result[UserConfig::KEY_BASE_URL] = $source['config']['address']['base_url'];
+        }
         $result[UserConfig::KEY_USE_SEF_URL] = isset($source['config']['rewrites']['allowed'])
             ? $source['config']['rewrites']['allowed'] : '';
-        $result[UserConfig::KEY_BASE_URL] = isset($source['config']['address']['web'])
-            ? $source['config']['address']['web'] : '';
         $result[UserConfig::KEY_IS_SECURE] = isset($source['config']['https']['front'])
             ? $source['config']['https']['front'] : '';
         $result[UserConfig::KEY_IS_SECURE_ADMIN] = isset($source['config']['https']['admin'])
             ? $source['config']['https']['admin'] : '';
-        $result[UserConfig::KEY_BASE_URL_SECURE] = (isset($source['config']['https']['front'])
-            || isset($source['config']['https']['admin']))
-            ? str_replace('http:', 'https:', $source['config']['address']['web']) : '';
         $result[UserConfig::KEY_LANGUAGE] = isset($source['store']['language'])
             ? $source['store']['language'] : '';
         $result[UserConfig::KEY_TIMEZONE] = isset($source['store']['timezone'])
diff --git a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
index 4eb1a93088d51..50d9ec9cf2912 100644
--- a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
+++ b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
@@ -9,15 +9,42 @@
 
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
+use Magento\Framework\App\Filesystem\DirectoryList;
 
 class WebConfiguration extends AbstractActionController
 {
     /**
+     * Directory list
+     *
+     * @var DirectoryList
+     */
+    private $dirList;
+
+    /**
+     * Constructor
+     *
+     * @param DirectoryList $dirList
+     */
+    public function __construct(DirectoryList $dirList)
+    {
+        $this->dirList = $dirList;
+    }
+
+    /**
+     * Displays web configuration form
+     *
      * @return array|ViewModel
      */
     public function indexAction()
     {
-        $view = new ViewModel;
+        $projectRoot = $this->dirList->getRoot();
+        $docRoot = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']);
+        if (false === strpos($projectRoot . '/', $docRoot . '/')) { // if project root is outside of current doc root
+            $urlPath = '';
+        } else {
+            $urlPath = substr($docRoot, strlen($projectRoot));
+        }
+        $view = new ViewModel(['autoBaseUrl' => 'http://' . $_SERVER['HTTP_HOST'] . $urlPath . '/']);
         $view->setTerminal(true);
         return $view;
     }
diff --git a/setup/module/Magento/Setup/view/magento/setup/success.phtml b/setup/module/Magento/Setup/view/magento/setup/success.phtml
index 5c4f26d1bb916..558291e2c2937 100644
--- a/setup/module/Magento/Setup/view/magento/setup/success.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/success.phtml
@@ -24,11 +24,11 @@
     </div>
     <div class="row p-top-10">
         <div class="col-sm-6">Your Store Address:</div>
-        <div class="col-sm-6"><a href="{{config.address.web}}">{{config.address.web}}</a></div>
+        <div class="col-sm-6"><a href="{{config.address.actual_base_url}}">{{config.address.actual_base_url}}</a></div>
     </div>
     <div class="row p-top-10">
         <div class="col-sm-6">Magento Admin Address:</div>
-        <div class="col-sm-6"><a href="{{config.address.web}}{{config.address.admin}}">{{config.address.web}}{{config.address.admin}}/</a></div>
+        <div class="col-sm-6"><a href="{{config.address.actual_base_url}}{{config.address.admin}}/">{{config.address.actual_base_url}}{{config.address.admin}}/</a></div>
     </div>
     <div class="row p-top-10">
         <div class="col-sm-6">Encryption Key:</div>
@@ -52,5 +52,5 @@
 </div>
 <div class="text-center">
     <div class="bold" ng-repeat="message in messages">{{message}}</div><br/>
-    <a type="button" class="btn btn-primary" href="{{config.address.web}}{{config.address.admin}}">Launch Magento Admin</a>
-</div>
\ No newline at end of file
+    <a type="button" class="btn btn-primary" href="{{config.address.actual_base_url}}{{config.address.admin}}/">Launch Magento Admin</a>
+</div>
diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 6f21e45dc5939..f7a8574ce587c 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -8,20 +8,21 @@
 ?>
 <?php
 $hints = [
-    'address_web' => sprintf(
+    'base_url' => sprintf(
         '<div><p>%s</p><p>%s</p></div>',
         'Enter the base URL that brings shoppers to your store (Ex. http://example.com/).',
-        'We recommend not using your actual IP address when your store goes live, otherwise all your shoppers will see it.'
+        'Leave empty for automatic detection (not recommended for production environment).'
     ),
     'encrypt_key' => sprintf(
         '<p>%s</p>',
-        'Key to encrypt sensitive data such as passwords and personally identifiable customer informaton in the Magento database. The encryption key is stored in [your Magento install dir]/app/etc/config.php/'
+        'Key to encrypt sensitive data such as passwords and personally identifiable customer informaton in the Magento database. The encryption key is stored in [your Magento install dir]/app/etc/local.xml/'
     ),
 ];
 ?>
+
 <div class="step-controls">
-    <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
-    <a href="" class="btn btn-primary" ng-click="nextState()">Next</a>
+    <a href="#" class="btn btn-primary" ng-click="previousState()">Previous</a>
+    <a href="#" class="btn btn-primary" ng-click="nextState()">Next</a>
 </div>
 
 <div class="page-header">
@@ -29,31 +30,29 @@ $hints = [
 </div>
 
 <form novalidate name="webconfig" class="form-horizontal" role="form">
-    <div class="form-group" ng-class="{'has-error': webconfig.web.$invalid && webconfig.submitted}">
-        <label class="col-md-3 control-label">Your Store Address&nbsp;<span class="required">*</span></label>
+    <div class="form-group" ng-class="{'has-error': webconfig.base_url.$invalid && webconfig.submitted}">
+        <label class="col-md-3 control-label">Base URL</label>
         <div class="col-md-4">
             <input type="text"
-                   name="web"
-                   ng-model="config.address.web"
+                   name="base_url"
+                   ng-model="config.address.base_url"
+                   ng-init="config.address.auto_base_url = '<?php echo $this->autoBaseUrl ?>'; config.address.base_url = config.address.auto_base_url;"
                    class="form-control"
-                   ng-init="config.address.web = '<?php echo $this->baseUrl?>'"
                    tooltip-placement="right"
-                   tooltip-html-unsafe="<?php echo $hints['address_web']; ?>"
+                   tooltip-html-unsafe="<?php echo $hints['base_url']; ?>"
                    tooltip-trigger="focus"
                    tooltip-append-to-body="true"
-                   required />
-        </div>
-        <div class="col-md-offset-3 col-md-4" ng-show="webconfig.web.$invalid && webconfig.submitted">
-            <div class="error-container">
-                <span ng-show="webconfig.web.$error.required">Please enter a valid base URL Admin URL path. (ex: http://www.example.com/)</span>
+                />
+            <div class="error-container" ng-show="webconfig.base_url.$invalid && webconfig.submitted">
+                <span>Please enter a valid Base URL (ex: http://www.example.com/)</span>
             </div>
         </div>
     </div>
 
     <div class="form-group" ng-class="{'has-error': webconfig.admin.$invalid && webconfig.submitted}">
         <label class="col-md-3 control-label">Magento Admin Address&nbsp;<span class="required">*</span></label>
-        <div class="col-md-4 input-group" style="padding-left: 15px; padding-right: 15px;">
-            <span class="input-group-addon">{{config.address.web}}</span>
+        <div class="input-group" style="padding-left: 15px; padding-right: 15px;">
+            <span class="input-group-addon">{{config.address.base_url}}</span>
             <input type="text"
                    name="admin"
                    class="form-control"
@@ -62,13 +61,13 @@ $hints = [
         </div>
         <div class="col-md-offset-3 col-md-4" ng-show="webconfig.admin.$invalid && webconfig.submitted">
             <div class="error-container">
-                <span ng-show="webconfig.admin.$error.required">Please enter a valid admin URL path.</span>
+                <span ng-show="webconfig.admin.$error.required">Please enter a valid Admin URL Path.</span>
             </div>
         </div>
     </div>
 
     <div class="collapsed-options">
-        <a href="" class="collapsed-options" ng-click="updateOnExpand(config.advanced)">Advanced Options</a>
+        <a href="#" class="collapsed-options" ng-click="updateOnExpand(config.advanced)">Advanced Options</a>
         <span class="caret"></span>
     </div>
 
@@ -142,6 +141,6 @@ $hints = [
 </form>
 
 <div class="step-controls">
-    <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
-    <a href="" class="btn btn-primary" ng-click="nextState()">Next</a>
+    <a href="#" class="btn btn-primary" ng-click="previousState()">Previous</a>
+    <a href="#" class="btn btn-primary" ng-click="nextState()">Next</a>
 </div>
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 89caac746e400..77177e9a803c0 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -10,7 +10,10 @@ angular.module('add-database', ['ngStorage'])
     .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', '$timeout', function ($scope, $state, $localStorage, $http, $timeout) {
         $scope.db = {
             useExistingDb: 1,
-            useAccess: 1
+            useAccess: 1,
+            host: 'localhost',
+            user: 'root',
+            name: 'magento'
         };
 
         if ($localStorage.db) {
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index 1762f593c25a2..7cdad615374de 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -6,8 +6,9 @@
  */
 
 'use strict';
-var main = angular.module('main', []);
-main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navigationService', function ($scope, $state, $rootScope, navigationService) {
+var main = angular.module('main', ['ngStorage']);
+main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navigationService', '$localStorage', function ($scope, $state, $rootScope, navigationService, $localStorage) {
+    $localStorage.$reset();
     navigationService.load();
     $rootScope.isMenuEnabled = true;
     $scope.itemStatus = function (order) {
diff --git a/setup/pub/magento/setup/success.js b/setup/pub/magento/setup/success.js
index 0f76134ad7deb..852d0c97c2804 100644
--- a/setup/pub/magento/setup/success.js
+++ b/setup/pub/magento/setup/success.js
@@ -12,4 +12,5 @@ angular.module('success', ['ngStorage'])
         $scope.admin  = $localStorage.admin;
         $scope.config = $localStorage.config;
         $scope.messages = $localStorage.messages;
-    }]);
\ No newline at end of file
+        $localStorage.$reset();
+    }]);
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index 08e0043d5a73f..49d4adbbf0635 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -10,6 +10,9 @@ angular.module('web-configuration', ['ngStorage'])
     .controller('webConfigurationController', ['$scope', '$state', '$localStorage', function ($scope, $state, $localStorage) {
         $scope.config = {
             address: {
+                base_url: '',
+                auto_base_url: '',
+                actual_base_url: '',
                 admin: 'admin'
             },
             https: {
@@ -40,6 +43,14 @@ angular.module('web-configuration', ['ngStorage'])
             obj.expanded = !obj.expanded;
         }
 
+        $scope.$watch('config.address.base_url', function() {
+            if (angular.equals($scope.config.address.base_url, '')) {
+                $scope.config.address.actual_base_url = $scope.config.address.auto_base_url;
+            } else {
+                $scope.config.address.actual_base_url = $scope.config.address.base_url;
+            }
+        });
+
         $scope.$watch('config.encrypt.type', function() {
             if(angular.equals($scope.config.encrypt.type, 'magento')){
                 $scope.config.encrypt.key = null;
@@ -71,4 +82,4 @@ angular.module('web-configuration', ['ngStorage'])
                 $scope.webconfig.submitted = false;
             }
         });
-    }]);
\ No newline at end of file
+    }]);

From d4992699e4f91b0d7de73a505515eee80464b3f4 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 26 Nov 2014 10:37:52 -0600
Subject: [PATCH 038/474] MAGETWO-31004: Validation of CLI

- Overriden Zend RouteListener
- Implemented validation of missing/extra parameters
- Implemented validation of parameters values
---
 setup/module/Magento/Setup/Module.php         |   7 +
 .../src/Controller/ConsoleController.php      |   2 +-
 .../Magento/Setup/src/Model/RouteMatcher.php  |  22 ++
 .../Magento/Setup/src/Model/Validator.php     | 296 ++++++++++++++++++
 .../Setup/src/Mvc/ValidatingRouteListener.php | 181 +++++++++++
 .../View/Console/ValidationErrorStrategy.php  |  62 ++++
 6 files changed, 569 insertions(+), 1 deletion(-)
 create mode 100644 setup/module/Magento/Setup/src/Model/RouteMatcher.php
 create mode 100644 setup/module/Magento/Setup/src/Model/Validator.php
 create mode 100644 setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
 create mode 100644 setup/module/Magento/Setup/src/Mvc/View/Console/ValidationErrorStrategy.php

diff --git a/setup/module/Magento/Setup/Module.php b/setup/module/Magento/Setup/Module.php
index f223309c83a6b..4e22de9b3e702 100644
--- a/setup/module/Magento/Setup/Module.php
+++ b/setup/module/Magento/Setup/Module.php
@@ -39,6 +39,13 @@ public function onBootstrap(EventInterface $e)
         /** @var \Zend\EventManager\SharedEventManager $sharedEvents */
         $sharedEvents = $events->getSharedManager();
 
+        // attach a ValidatingRouteListener before default RouteListener for parameter validation
+        $oldRouteListener = $application->getServiceManager()->get('routelistener');
+        $oldRouteListener->detach($events);
+        $routeListener = new \Magento\Setup\Mvc\ValidatingRouteListener();
+        $routeListener->attach($events);
+        $oldRouteListener->attach($events);
+
         $moduleRouteListener = new ModuleRouteListener();
         $moduleRouteListener->attach($events);
 
diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index 638a2b4a4e4f3..9dcedc5527d9e 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -298,9 +298,9 @@ public function installAction()
      */
     public function installDeploymentConfigAction()
     {
-        $this->installer->checkInstallationFilePermissions();
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
+        $this->installer->checkInstallationFilePermissions();
         $this->installer->installDeploymentConfig($request->getParams());
     }
 
diff --git a/setup/module/Magento/Setup/src/Model/RouteMatcher.php b/setup/module/Magento/Setup/src/Model/RouteMatcher.php
new file mode 100644
index 0000000000000..47a4f212ce3e7
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Model/RouteMatcher.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license   {license_link}
+ */
+
+namespace Magento\Setup\Model;
+
+class RouteMatcher extends \Zend\Console\RouteMatcher\DefaultRouteMatcher
+{
+    /**
+     * Public getter of parts, used for parameters validation
+     *
+     * @return array
+     */
+    public function getParts()
+    {
+        return $this->parts;
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Model/Validator.php b/setup/module/Magento/Setup/src/Model/Validator.php
new file mode 100644
index 0000000000000..5a0b652e8df03
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Model/Validator.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+namespace Magento\Setup\Model;
+
+use Magento\Setup\Module\Setup\ConfigMapper;
+use Magento\Setup\Controller\ConsoleController;
+
+class Validator
+{
+    private $validationMessages = [];
+
+    /**
+     * Get validation messages
+     *
+     * @return string
+     */
+    public function getValidationMessages()
+    {
+        $message = '';
+        foreach ($this->validationMessages as $key => $value) {
+            $message .= "{$key}: {$value}" . PHP_EOL;
+        }
+        return $message;
+    }
+
+    /**
+     * Check for any missing parameters
+     *
+     * @param array $expectedParams
+     * @param array $actualParams
+     * @return array
+     */
+    public static function checkMissingParameter($expectedParams, $actualParams)
+    {
+        $missingParams = array_diff(array_keys($expectedParams), array_keys($actualParams));
+        foreach ($missingParams as $key => $missingParam) {
+            /* disregard if optional parameter */
+            if (!$expectedParams[$missingParam]['required']) {
+                unset($missingParams[$key]);
+            }
+        }
+        return $missingParams;
+    }
+
+    /**
+     * Check for any extra parameters
+     *
+     * @param array $expectedParams
+     * @param array $actualParams
+     * @return array
+     */
+    public static function checkExtraParameter($expectedParams, $actualParams)
+    {
+        $extraParams = array_diff(array_keys($actualParams), array_keys($expectedParams));
+        return $extraParams;
+    }
+
+    /**
+     * Validate parameters according to action
+     *
+     * @param string $action
+     * @param array $data
+     * @return bool
+     */
+    public function validate($action, array $data)
+    {
+        switch ($action)
+        {
+            case ConsoleController::CMD_INSTALL:
+                return $this->validateInstall($data);
+            case ConsoleController::CMD_INSTALL_ADMIN_USER:
+                return $this->validateAdmin($data);
+            case ConsoleController::CMD_INSTALL_USER_CONFIG:
+                return $this->validateUserConfig($data);
+            case ConsoleController::CMD_INSTALL_CONFIG:
+                return $this->validateDeploymentConfig($data);
+            case ConsoleController::CMD_HELP:
+                return true;
+            default:
+                $this->validationMessages['Error'] = 'Unexpected error occurred.';
+        }
+        return false;
+    }
+
+    /**
+     * Validate parameter values of installation tool
+     *
+     * @param array $data
+     * @return bool
+     */
+    public function validateInstall(array $data)
+    {
+        $deploymentValid = $this->validateDeploymentConfig($data);
+        $adminValid = $this->validateAdmin($data);
+        $userValid = $this->validateUserConfig($data);
+        return $deploymentValid && $adminValid && $userValid;
+    }
+
+    /**
+     * Validate parameter values of deployment configuration tool
+     *
+     * @param array $data
+     * @return bool
+     */
+    public function validateDeploymentConfig(array $data)
+    {
+        $pass = true;
+        if (isset($data[ConfigMapper::KEY_BACKEND_FRONTNAME]) &&
+            !preg_match('/^[a-zA-Z0-9_]+$/', $data[ConfigMapper::KEY_BACKEND_FRONTNAME])
+        ) {
+            $pass = false;
+            $this->validationMessages[ConfigMapper::KEY_BACKEND_FRONTNAME] =
+                'Please use alphanumeric characters and underscore. ' .
+                "Current: {$data[ConfigMapper::KEY_BACKEND_FRONTNAME]}";
+        }
+        if (isset($data[ConfigMapper::KEY_SESSION_SAVE]) &&
+            $data[ConfigMapper::KEY_SESSION_SAVE] !== 'files' &&
+            $data[ConfigMapper::KEY_SESSION_SAVE] !== 'db'
+        ) {
+            $pass = false;
+            $this->validationMessages[ConfigMapper::KEY_SESSION_SAVE] =
+                "Please use 'files' or 'db'. Current: {$data[ConfigMapper::KEY_SESSION_SAVE]}";
+            ;
+        }
+        if (isset($data[ConfigMapper::KEY_ENCRYPTION_KEY]) &&
+            !$data[ConfigMapper::KEY_ENCRYPTION_KEY]
+        ) {
+            $pass = false;
+            $this->validationMessages[ConfigMapper::KEY_ENCRYPTION_KEY] =
+                "Please enter a valid encryption key. Current: {$data[ConfigMapper::KEY_ENCRYPTION_KEY]}";
+        }
+
+        return $pass;
+    }
+
+    /**
+     * Validate parameter values of user configuration tool
+     *
+     * @param array $data
+     * @return bool
+     */
+    public function validateUserConfig(array $data)
+    {
+        $pass = true;
+        // check URL
+        if (isset($data[UserConfigurationDataMapper::KEY_BASE_URL]) &&
+            !$this->validateUrl($data[UserConfigurationDataMapper::KEY_BASE_URL])) {
+            $pass = false;
+            $this->validationMessages[UserConfigurationDataMapper::KEY_BASE_URL] =
+                "Please enter a valid base url. Current: {$data[UserConfigurationDataMapper::KEY_BASE_URL]}";
+        }
+        if (isset($data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE]) &&
+            !$this->validateUrl($data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE])) {
+            $pass = false;
+            $this->validationMessages[UserConfigurationDataMapper::KEY_BASE_URL_SECURE] =
+                'Please enter a valid secure base url. ' .
+                "Current: {$data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE]}";
+        }
+
+        // check 0/1 options
+        $wrongOptionMessage = 'Please enter a valid option (0/1). ';
+        if (isset($data[UserConfigurationDataMapper::KEY_USE_SEF_URL]) &&
+            !$this->validateOneZero($data[UserConfigurationDataMapper::KEY_USE_SEF_URL])) {
+            $pass = false;
+            $this->validationMessages[UserConfigurationDataMapper::KEY_USE_SEF_URL] =
+                $wrongOptionMessage . "Current: {$data[UserConfigurationDataMapper::KEY_USE_SEF_URL]}";
+        }
+        if (isset($data[UserConfigurationDataMapper::KEY_IS_SECURE]) &&
+            !$this->validateOneZero($data[UserConfigurationDataMapper::KEY_IS_SECURE])) {
+            $pass = false;
+            $this->validationMessages[UserConfigurationDataMapper::KEY_IS_SECURE] =
+                $wrongOptionMessage . "Current: {$data[UserConfigurationDataMapper::KEY_IS_SECURE]}";
+        }
+        if (isset($data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN]) &&
+            !$this->validateOneZero($data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN])) {
+            $pass = false;
+            $this->validationMessages[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN] =
+                $wrongOptionMessage . "Current: {$data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN]}";
+        }
+        if (isset($data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY]) &&
+            !$this->validateOneZero($data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY])) {
+            $pass = false;
+            $this->validationMessages[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY] =
+                $wrongOptionMessage . "Current: {$data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY]}";
+        }
+
+        // check language, currency and timezone
+        $options = new Lists(new \Zend_Locale());
+        if (isset($data[UserConfigurationDataMapper::KEY_LANGUAGE])) {
+            if (!isset($options->getLocaleList()[$data[UserConfigurationDataMapper::KEY_LANGUAGE]])) {
+                $pass = false;
+                $this->validationMessages[UserConfigurationDataMapper::KEY_LANGUAGE] =
+                    'Please use a valid language. ' .
+                    "Current: {$data[UserConfigurationDataMapper::KEY_LANGUAGE]}";
+            }
+        }
+
+        if (isset($data[UserConfigurationDataMapper::KEY_CURRENCY])) {
+            if (!isset($options->getCurrencyList()[$data[UserConfigurationDataMapper::KEY_CURRENCY]])) {
+                $pass = false;
+                $this->validationMessages[UserConfigurationDataMapper::KEY_CURRENCY] =
+                    'Please use a valid currency. ' .
+                    "Current: {$data[UserConfigurationDataMapper::KEY_CURRENCY]}";
+            }
+        }
+
+        if (isset($data[UserConfigurationDataMapper::KEY_TIMEZONE])) {
+            if (!isset($options->getTimezoneList()[$data[UserConfigurationDataMapper::KEY_TIMEZONE]])) {
+                $pass = false;
+                $this->validationMessages[UserConfigurationDataMapper::KEY_TIMEZONE] =
+                    'Please use a valid timezone. ' .
+                    "Current: {$data[UserConfigurationDataMapper::KEY_TIMEZONE]}";
+            }
+        }
+
+        return $pass;
+    }
+
+    /**
+     * Validate parameter values of admin user setup tool
+     *
+     * @param array $data
+     * @return bool
+     */
+    public function validateAdmin(array $data)
+    {
+        $pass = true;
+        if (isset($data[AdminAccount::KEY_EMAIL]) &&
+            !$this->validateEmail($data[AdminAccount::KEY_EMAIL])
+        ) {
+            $pass = false;
+            $this->validationMessages[AdminAccount::KEY_EMAIL] =
+                'Please enter a valid email address. ' .
+                "Current: {$data[AdminAccount::KEY_EMAIL]}";
+        }
+        if (isset($data[AdminAccount::KEY_PASSWORD]) &&
+            strlen($data[AdminAccount::KEY_PASSWORD]) < 7
+        ) {
+            $pass = false;
+            $this->validationMessages[AdminAccount::KEY_PASSWORD] = 'Password must be at least 7 characters long.';
+        }
+
+        return $pass;
+
+    }
+
+    /**
+     * Validate email
+     *
+     * @param $email
+     * @return bool
+     */
+    private function validateEmail($email)
+    {
+        $validator = new \Zend\Validator\EmailAddress();
+        return $validator->isValid($email);
+    }
+
+    /**
+     * Validate URL
+     *
+     * @param string $url
+     * @param bool $secure
+     * @return bool
+     */
+    private function validateUrl($url, $secure = false)
+    {
+        $validator = new \Zend\Validator\Uri();
+        if ($validator->isValid($url)) {
+            if ($secure) {
+                return strpos($url, 'https://') !== false;
+            }
+            else {
+                return strpos($url, 'http://') !== false;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Validate if it's one or zero flag
+     *
+     * @param $flag
+     * @return bool
+     */
+    private function validateOneZero($flag)
+    {
+        return $flag === '0' || $flag === '1';
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php b/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
new file mode 100644
index 0000000000000..260155871a541
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license   {license_link}
+ */
+
+namespace Magento\Setup\Mvc;
+
+use Magento\Setup\Model\Validator;
+use Magento\Setup\Mvc\View\Console\ValidationErrorStrategy;
+use Zend\Mvc\Router\RouteMatch;
+use Zend\Mvc\MvcEvent;
+
+class ValidatingRouteListener extends \Zend\Mvc\RouteListener
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function onRoute($e)
+    {
+        $request = $e->getRequest();
+        // propagates to default RouteListener if not CLI
+        if (!$request instanceof \Zend\Console\Request) {
+            return null;
+        }
+
+        $router = $e->getRouter();
+        $match = $router->match($request);
+
+        $validationMessages = '';
+        // CLI routing miss, checks for missing/extra parameters
+        if (!$match instanceof RouteMatch) {
+            $validationMessages .= $this->checkForMissingAndExtraParams($e);
+        }
+
+        // Check parameter values
+        $validationMessages .= $this->checkParameters($e);
+        $this->displayMessage($e, $validationMessages);
+        return null;
+    }
+
+    /**
+     * Checks for missing and extra parameters
+     *
+     * @param MvcEvent $e
+     * @return string
+     */
+    private function checkForMissingAndExtraParams(MvcEvent $e)
+    {
+        $request = $e->getRequest();
+        $content = $request->getContent();
+        $serviceManager = $e->getApplication()->getServiceManager();
+
+        $userAction = $content[0];
+        array_shift($content);
+
+        $routes = $serviceManager->get('Config')['console']['router']['routes'];
+        $validationMessages = '';
+        if (isset($routes[$userAction])) {
+            // parse the expected parameters of the action
+            $matcher = new \Magento\Setup\Model\RouteMatcher($routes[$userAction]['options']['route']);
+            $parts = $matcher->getParts();
+            array_shift($parts);
+            $expectedParams = [];
+            foreach ($parts as $part) {
+                $expectedParams[$part['name']] = $part;
+            }
+            // parse user parameters
+            $userParams = $this->parseUserParams($content);
+
+            $missing = Validator::checkMissingParameter($expectedParams, $userParams);
+            $extra = Validator::checkExtraParameter($expectedParams, $userParams);
+            if (!empty($missing)) {
+                $validationMessages .= 'Missing parameters:' . PHP_EOL;
+                foreach ($missing as $missingParam) {
+                    $validationMessages .= $missingParam . PHP_EOL;
+                }
+            }
+            if (!empty($extra)) {
+                $validationMessages .= 'Unidentified parameters:' . PHP_EOL;
+                foreach ($extra as $extraParam) {
+                    $validationMessages .= $extraParam . PHP_EOL;
+                }
+            }
+            if (empty($missing) && empty($extra)) {
+                $validationMessages .= 'Please make sure parameters starts with --.' . PHP_EOL .
+                    'Note that some parameters require a value while some do not.' . PHP_EOL;
+            }
+
+        } else if (!is_null($userAction)) {
+            $validationMessages .= "Unknown action name '{$userAction}'." . PHP_EOL;
+        }
+
+        // set error to stop propagation
+        $e->setError('default_error');
+        return $validationMessages;
+    }
+
+    /**
+     * Check parameter values
+     *
+     * @param MvcEvent $e
+     * @return string
+     */
+    private function checkParameters(MvcEvent $e)
+    {
+        $request = $e->getRequest();
+        $content = $request->getContent();
+        $serviceManager = $e->getApplication()->getServiceManager();
+        $routes = $serviceManager->get('Config')['console']['router']['routes'];
+
+        $userAction = $content[0];
+        array_shift($content);
+
+        $validationMessages = '';
+        /*if (isset($routes[$userAction]['validators'])) {
+            $validatorChain = $routes[$userAction]['validators'];
+            $pass = true;
+            foreach ($validatorChain as $validatorClassName) {
+                if (class_exists($validatorClassName)) {
+                    $validator = new $validatorClassName();
+                    $validatorInterface = 'Magento\\Setup\\Model\\ValidatorInterface';
+                    if ($validator instanceof $validatorInterface) {
+                        if (!$validator->validate($content)) {
+                            $validationMessages .= $validator->getValidationMessages();
+                            $pass = false;
+                        }
+                    }
+                }
+            }
+            if (!$pass) {
+                // set error to stop propagation
+                $e->setError('Validation_error');
+            }
+        }*/
+
+        if (isset($routes[$userAction])) {
+            $validator = new Validator();
+            $userParam = $this->parseUserParams($content);
+            if (!$validator->validate($userAction, $userParam)) {
+                $validationMessages .= 'Invalid parameter values:' . PHP_EOL . $validator->getValidationMessages();
+                // set error to stop propagation
+                $e->setError('Validation_error');
+            }
+        }
+
+        return $validationMessages;
+    }
+
+    private function displayMessage(MvcEvent $e, $validationMessages)
+    {
+        $validationErrorStrategy = new ValidationErrorStrategy();
+        $validationErrorStrategy->setErrorMessage($validationMessages);
+        $validationErrorStrategy->handleNotFoundError($e);
+    }
+
+    /**
+     * Parse user input
+     *
+     * @param array $content
+     * @return array
+     */
+    private function parseUserParams(array $content)
+    {
+        $parameters = [];
+        foreach ($content as $param) {
+            $parsed = explode('=', $param, 2);
+            $value = isset($parsed[1]) ? $parsed[1] : '';
+            if (strpos($parsed[0], '--') !== false) {
+                $key = substr($parsed[0], 2, strlen($parsed[0]) - 2);
+            } else {
+                $key = $parsed[0];
+            }
+
+            $parameters[$key] = $value;
+        }
+        return $parameters;
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Mvc/View/Console/ValidationErrorStrategy.php b/setup/module/Magento/Setup/src/Mvc/View/Console/ValidationErrorStrategy.php
new file mode 100644
index 0000000000000..bf4939650d75f
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Mvc/View/Console/ValidationErrorStrategy.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license   {license_link}
+ */
+
+namespace Magento\Setup\Mvc\View\Console;
+
+use Zend\Mvc\MvcEvent;
+use Zend\View\Model\ConsoleModel;
+use Zend\Console\ColorInterface;
+
+class ValidationErrorStrategy extends \Zend\Mvc\View\Console\RouteNotFoundStrategy
+{
+    /**
+     * Error message
+     *
+     * @var string
+     */
+    private $errorMessage = '';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handleNotFoundError(MvcEvent $e)
+    {
+        $request = $e->getRequest();
+        $serviceManager = $e->getApplication()->getServiceManager();
+        $moduleManager = $serviceManager->get('ModuleManager');
+        $console = $serviceManager->get('console');
+        $scriptName = basename($request->getScriptName());
+
+        $banner = $this->getConsoleBanner($console, $moduleManager);
+
+        $usage = $this->getConsoleUsage($console, $scriptName, $moduleManager);
+
+        $result  = $banner ? rtrim($banner, "\r\n")        : '';
+        $result .= $usage  ? "\n\n" . trim($usage, "\r\n") : '';
+        $result .= "\n";
+
+        $this->errorMessage = $console->colorize($this->errorMessage, ColorInterface::RED);
+        $result .= $this->errorMessage . "\n";
+
+        $model = new ConsoleModel();
+        $model->setErrorLevel(1);
+        $model->setResult($result);
+
+        $e->setResult($model);
+    }
+
+    /**
+     * Set error message
+     *
+     * @param string $message
+     */
+    public function setErrorMessage($message)
+    {
+        $this->errorMessage = $message;
+    }
+}

From 04fbbc96cf14e3f9a4dd96648b576dc2c6a24d84 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 26 Nov 2014 17:33:52 -0600
Subject: [PATCH 039/474] MAGETWO-31004 Validation of CLI:

- fixed inproper switch case in Validator
- fixed code style
---
 .../src/Controller/ConsoleController.php      |  2 +-
 .../Magento/Setup/src/Model/Validator.php     |  4 +---
 .../Setup/src/Mvc/ValidatingRouteListener.php | 20 -------------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index 9dcedc5527d9e..1a44a16860dc2 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -229,7 +229,7 @@ private static function getCliConfig()
                 'usage_desc' => 'Set maintenance mode, optionally for specified addresses',
             ],
             self::CMD_HELP => [
-                'route' => self::CMD_HELP . ' (' . implode('|', self::$helpOptions) . '):type',
+                'route' => self::CMD_HELP . ' (' . implode('|', self::$helpOptions) . '):topic',
                 'usage' => '<' . implode('|', self::$helpOptions) . '>',
                 'usage_short' => self::CMD_HELP . ' <topic>',
                 'usage_desc' => 'Help about particular command or topic:',
diff --git a/setup/module/Magento/Setup/src/Model/Validator.php b/setup/module/Magento/Setup/src/Model/Validator.php
index 5a0b652e8df03..a2feda17cc876 100644
--- a/setup/module/Magento/Setup/src/Model/Validator.php
+++ b/setup/module/Magento/Setup/src/Model/Validator.php
@@ -80,10 +80,8 @@ public function validate($action, array $data)
                 return $this->validateUserConfig($data);
             case ConsoleController::CMD_INSTALL_CONFIG:
                 return $this->validateDeploymentConfig($data);
-            case ConsoleController::CMD_HELP:
-                return true;
             default:
-                $this->validationMessages['Error'] = 'Unexpected error occurred.';
+                return true;
         }
         return false;
     }
diff --git a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php b/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
index 260155871a541..201dd33c3289e 100644
--- a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
+++ b/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
@@ -115,26 +115,6 @@ private function checkParameters(MvcEvent $e)
         array_shift($content);
 
         $validationMessages = '';
-        /*if (isset($routes[$userAction]['validators'])) {
-            $validatorChain = $routes[$userAction]['validators'];
-            $pass = true;
-            foreach ($validatorChain as $validatorClassName) {
-                if (class_exists($validatorClassName)) {
-                    $validator = new $validatorClassName();
-                    $validatorInterface = 'Magento\\Setup\\Model\\ValidatorInterface';
-                    if ($validator instanceof $validatorInterface) {
-                        if (!$validator->validate($content)) {
-                            $validationMessages .= $validator->getValidationMessages();
-                            $pass = false;
-                        }
-                    }
-                }
-            }
-            if (!$pass) {
-                // set error to stop propagation
-                $e->setError('Validation_error');
-            }
-        }*/
 
         if (isset($routes[$userAction])) {
             $validator = new Validator();

From a7296330eb022ceb38bb9240afb1a9969a49a752 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 26 Nov 2014 17:56:11 -0600
Subject: [PATCH 040/474] MAGETWO-30852: Old encryption key did not saved after
 update

- made changes according to CR feedback
---
 .../Legacy/_files/obsolete_classes_ee.php     |  1 +
 .../Framework/Encryption/EncryptorTest.php    | 24 +++++++++++++++++++
 .../Framework/Encryption/Encryptor.php        |  2 +-
 .../Magento/Setup/src/Model/Installer.php     |  5 +++-
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes_ee.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes_ee.php
index 7c05e6752f304..22fd1c9bf6458 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes_ee.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes_ee.php
@@ -142,4 +142,5 @@
     ['Magento\Reward\Model\Observer'],
     ['Magento\WebsiteRestriction\Model\Observer'],
     ['Magento\MultipleWishlist\Block\Rss'],
+    ['Magento\Pci\Model\Encryption', 'Magento\Framework\Encryption\Encryptor'],
 );
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
index d2ffce367d75d..6a796536c13ed 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
@@ -153,6 +153,30 @@ public function testDecrypt()
         $this->assertEquals($encrypted, base64_encode($crypt->encrypt($actual)));
     }
 
+    public function testEncryptDecryptNewKeyAdded()
+    {
+        $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', array(), array(), '', false);
+        $deploymentConfigMock->expects($this->at(0))
+            ->method('get')
+            ->with(Encryptor::PARAM_CRYPT_KEY)
+            ->will($this->returnValue("cryptKey1"));
+        $deploymentConfigMock->expects($this->at(1))
+            ->method('get')
+            ->with(Encryptor::PARAM_CRYPT_KEY)
+            ->will($this->returnValue("cryptKey1\ncryptKey2"));
+        $model1 = new Encryptor($this->_randomGenerator, $deploymentConfigMock);
+        // simulate an encryption key is being added
+        $model2 = new Encryptor($this->_randomGenerator, $deploymentConfigMock);
+
+        // sample data to encrypt
+        $data = 'Mares eat oats and does eat oats, but little lambs eat ivy.';
+        // encrypt with old key
+        $encryptedData = $model1->encrypt($data);
+        $decryptedData = $model2->decrypt($encryptedData);
+
+        $this->assertSame($data, $decryptedData, 'Encryptor failed to decrypt data encrypted by old keys.');
+    }
+
     public function testValidateKey()
     {
         $actual = $this->_model->validateKey('some_key');
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
index e8c0dd6bbc5b0..709e73cd6c4e0 100644
--- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -306,7 +306,7 @@ public function exportKeys()
      */
     protected function getCrypt($key = null, $cipherVersion = null, $initVector = true)
     {
-        if (null === $key && null == $cipherVersion) {
+        if (null === $key && null === $cipherVersion) {
             $cipherVersion = self::CIPHER_RIJNDAEL_256;
         }
 
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 6d85300d56690..e783bc4048524 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -33,6 +33,7 @@
 use Magento\Framework\App\DeploymentConfig\SessionConfig;
 use Magento\Framework\App\DeploymentConfig\ResourceConfig;
 use Magento\Setup\Module\Setup\ConfigMapper;
+use Magento\Framework\App\DeploymentConfig\Reader;
 
 /**
  * Class Installer contains the logic to install Magento application.
@@ -324,6 +325,8 @@ private function createBackendConfig($data)
 
     /**
      * Creates encrypt deployment configuration segment
+     * No encryption key will be generated if there is an existing deployment config file.
+     * Old encryption keys will persist.
      *
      * @param \ArrayObject|array $data
      * @return \Magento\Framework\App\DeploymentConfig\SegmentInterface
@@ -332,7 +335,7 @@ private function createEncryptConfig($data)
     {
         $key = $data[ConfigMapper::KEY_ENCRYPTION_KEY];
         // retrieve old encryption keys
-        $reader = new \Magento\Framework\App\DeploymentConfig\Reader($this->directoryList);
+        $reader = new Reader($this->directoryList);
         $deploymentConfig = new Config($reader);
         if ($deploymentConfig->isAvailable()) {
             $encryptInfo = $deploymentConfig->getSegment(EncryptConfig::CONFIG_KEY);

From fff194145479fe059b0e950f22dec9b740f67b69 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 26 Nov 2014 18:09:14 -0600
Subject: [PATCH 041/474] MAGETWO-30852: Old encryption key did not saved after
 update

- rephrased function docblock
---
 setup/module/Magento/Setup/src/Model/Installer.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index e783bc4048524..9c22e19ab0e1d 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -325,8 +325,9 @@ private function createBackendConfig($data)
 
     /**
      * Creates encrypt deployment configuration segment
-     * No encryption key will be generated if there is an existing deployment config file.
+     * No new encryption key will be added if there is an existing deployment config file unless user provides one.
      * Old encryption keys will persist.
+     * A new encryption key will be generated if there is no existing deployment config file.
      *
      * @param \ArrayObject|array $data
      * @return \Magento\Framework\App\DeploymentConfig\SegmentInterface

From 137c1ef29eb1027af2017c02e818068dc1d5cc01 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Wed, 26 Nov 2014 19:14:26 -0600
Subject: [PATCH 042/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- fixed the infinite loop to setup application when doc root is set to "pub"
- wrapped RewriteEngine directive in setup .htaccess into IfModule
---
 lib/internal/Magento/Framework/App/Http.php   | 92 ++++++------------
 .../Magento/Framework/App/Request/Http.php    | 21 ++++
 .../Magento/Framework/App/SetupInfo.php       | 97 +++++++++++++++++++
 setup/.htaccess                               |  5 +-
 .../Setup/src/Controller/WebConfiguration.php |  4 +-
 5 files changed, 156 insertions(+), 63 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/App/SetupInfo.php

diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index 87465dc638702..06f0d10381df3 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -23,14 +23,6 @@
  */
 class Http implements \Magento\Framework\AppInterface
 {
-    /**#@+
-     * Parameters for redirecting if the application is not installed
-     */
-    const NOT_INSTALLED_URL_PATH_PARAM = 'MAGE_NOT_INSTALLED_URL_PATH';
-    const NOT_INSTALLED_URL_PARAM = 'MAGE_NOT_INSTALLED_URL';
-    const NOT_INSTALLED_URL_PATH = 'setup/';
-    /**#@-*/
-
     /**
      * @var \Magento\Framework\ObjectManagerInterface
      */
@@ -135,7 +127,7 @@ public function launch()
     public function catchException(Bootstrap $bootstrap, \Exception $exception)
     {
         $result = $this->handleDeveloperMode($bootstrap, $exception)
-            || $this->handleBootstrapErrors($bootstrap)
+            || $this->handleBootstrapErrors($bootstrap, $exception)
             || $this->handleSessionException($bootstrap, $exception)
             || $this->handleInitException($exception)
             || $this->handleGenericReport($bootstrap, $exception);
@@ -153,8 +145,12 @@ private function handleDeveloperMode(Bootstrap $bootstrap, \Exception $exception
     {
         if ($bootstrap->isDeveloperMode()) {
             if (Bootstrap::ERR_IS_INSTALLED == $bootstrap->getErrorCode()) {
-                $this->redirectToSetup($bootstrap);
-                return true;
+                try {
+                    $this->redirectToSetup($bootstrap, $exception);
+                    return true;
+                } catch (\Exception $e) {
+                    $exception = $e;
+                }
             }
             $this->_response->setHttpResponseCode(500);
             $this->_response->setHeader('Content-Type', 'text/plain');
@@ -166,25 +162,36 @@ private function handleDeveloperMode(Bootstrap $bootstrap, \Exception $exception
     }
 
     /**
-     * If not installed, redirect to setup
+     * If not installed, try to redirect to installation wizard
      *
      * @param Bootstrap $bootstrap
+     * @param \Exception $exception
      * @return void
+     * @throws \Exception
      */
-    private function redirectToSetup(Bootstrap $bootstrap)
+    private function redirectToSetup(Bootstrap $bootstrap, \Exception $exception)
     {
-        $path = $this->getInstallerRedirectPath($bootstrap->getParams());
-        $this->_response->setRedirect($path);
-        $this->_response->sendHeaders();
+        $setupInfo = new SetupInfo($bootstrap->getParams());
+        $projectRoot = $this->_filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath();
+        if ($setupInfo->isAvailable($projectRoot)) {
+            $this->_response->setRedirect($setupInfo->getUrl());
+            $this->_response->sendHeaders();
+        } else {
+            $newMessage = $exception->getMessage() . "\nNOTE: web setup wizard is not accessible.\n"
+                . 'In order to install, use Magento Setup CLI or configure web access to the following directory: '
+                . $setupInfo->getDir($projectRoot);
+            throw new \Exception($newMessage, 0, $exception);
+        }
     }
 
     /**
      * Handler for bootstrap errors
      *
      * @param Bootstrap $bootstrap
+     * @param \Exception &$exception
      * @return bool
      */
-    private function handleBootstrapErrors(Bootstrap $bootstrap)
+    private function handleBootstrapErrors(Bootstrap $bootstrap, \Exception &$exception)
     {
         $bootstrapCode = $bootstrap->getErrorCode();
         if (Bootstrap::ERR_MAINTENANCE == $bootstrapCode) {
@@ -192,8 +199,12 @@ private function handleBootstrapErrors(Bootstrap $bootstrap)
             return true;
         }
         if (Bootstrap::ERR_IS_INSTALLED == $bootstrapCode) {
-            $this->redirectToSetup($bootstrap);
-            return true;
+            try {
+                $this->redirectToSetup($bootstrap, $exception);
+                return true;
+            } catch (\Exception $e) {
+                $exception = $e;
+            }
         }
         return false;
     }
@@ -208,8 +219,7 @@ private function handleBootstrapErrors(Bootstrap $bootstrap)
     private function handleSessionException(Bootstrap $bootstrap, \Exception $exception)
     {
         if ($exception instanceof \Magento\Framework\Session\Exception) {
-            $path = $this->getBaseUrlPath($bootstrap->getParams());
-            $this->_response->setRedirect($path);
+            $this->_response->setRedirect($this->_request->getDistroBaseUrl());
             $this->_response->sendHeaders();
             return true;
         }
@@ -251,44 +261,4 @@ private function handleGenericReport(Bootstrap $bootstrap, \Exception $exception
         require $this->_filesystem->getDirectoryRead(DirectoryList::PUB)->getAbsolutePath('errors/report.php');
         return true;
     }
-
-    /**
-     * Determines redirect URL when application is not installed
-     *
-     * @param array $server
-     * @return string
-     */
-    public function getInstallerRedirectPath($server)
-    {
-        if (isset($server[self::NOT_INSTALLED_URL_PARAM])) {
-            return $server[self::NOT_INSTALLED_URL_PARAM];
-        }
-        if (isset($server[self::NOT_INSTALLED_URL_PATH_PARAM])) {
-            $urlPath = $server[self::NOT_INSTALLED_URL_PATH_PARAM];
-        } else {
-            $urlPath = self::NOT_INSTALLED_URL_PATH;
-        }
-        return $this->getBaseUrlPath($server) . $urlPath;
-    }
-
-    /**
-     * Determines a base URL path from the environment
-     *
-     * @param string $server
-     * @return string
-     */
-    private function getBaseUrlPath($server)
-    {
-        $result = '';
-        if (isset($server['SCRIPT_NAME'])) {
-            $envPath = str_replace('\\', '/', dirname($server['SCRIPT_NAME']));
-            if ($envPath != '.' && $envPath != '/') {
-                $result = $envPath;
-            }
-        }
-        if (!preg_match('/\/$/', $result)) {
-            $result .= '/';
-        }
-        return $result;
-    }
 }
diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 8e72f61ec084c..d5cd24dd4a895 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -569,6 +569,27 @@ public function getDistroBaseUrl()
         return 'http://localhost/';
     }
 
+    /**
+     * Determines a base URL path from environment
+     *
+     * @param array $server
+     * @return string
+     */
+    public static function getDistroBaseUrlPath($server)
+    {
+        $result = '';
+        if (isset($server['SCRIPT_NAME'])) {
+            $envPath = str_replace('\\', '/', dirname($server['SCRIPT_NAME']));
+            if ($envPath != '.' && $envPath != '/') {
+                $result = $envPath;
+            }
+        }
+        if (!preg_match('/\/$/', $result)) {
+            $result .= '/';
+        }
+        return $result;
+    }
+
     /**
      * Retrieve full action name
      *
diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php
new file mode 100644
index 0000000000000..192bbb7d79b22
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/SetupInfo.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+namespace Magento\Framework\App;
+
+/**
+ * A model for determining information about setup application
+ */
+class SetupInfo
+{
+    /**#@+
+     * Initialization parameters for redirecting if the application is not installed
+     */
+    const NOT_INSTALLED_URL_PATH_PARAM = 'MAGE_NOT_INSTALLED_URL_PATH';
+    const NOT_INSTALLED_URL_PARAM = 'MAGE_NOT_INSTALLED_URL';
+    /**#@-*/
+
+    /**
+     * Default path relative to the project root
+     */
+    const DEFAULT_PATH = 'setup';
+
+    /**
+     * Environment variables
+     *
+     * @var array
+     */
+    private $server;
+
+    /**
+     * Constructor
+     *
+     * @param array $server
+     */
+    public function __construct($server)
+    {
+        $this->server = $server;
+    }
+
+    /**
+     * Gets setup application URL
+     *
+     * @return string
+     */
+    public function getUrl()
+    {
+        if (isset($this->server[self::NOT_INSTALLED_URL_PARAM])) {
+            return $this->server[self::NOT_INSTALLED_URL_PARAM];
+        }
+        return \Magento\Framework\App\Request\Http::getDistroBaseUrlPath($this->server) . trim($this->getPath(), '/') . '/';
+    }
+
+    /**
+     * Gets setup application directory path in the filesystem
+     *
+     * @param string $projectRoot
+     * @return string
+     */
+    public function getDir($projectRoot)
+    {
+        return rtrim($projectRoot, '/') . '/' . trim($this->getPath(), '/');
+    }
+
+    /**
+     * Checks if the setup application is available in current document root
+     *
+     * @param string $projectRoot
+     * @return bool
+     */
+    public function isAvailable($projectRoot)
+    {
+        if (isset($this->server['DOCUMENT_ROOT'])) {
+            $docRoot = str_replace('\\', '/', realpath($this->server['DOCUMENT_ROOT']));
+            $installDir = str_replace('\\', '/', realpath($this->getDir($projectRoot)));
+            return false !== strpos($installDir . '/', $docRoot . '/');
+        }
+        return false;
+    }
+
+    /**
+     * Gets relative path to setup application
+     *
+     * @return string
+     */
+    private function getPath()
+    {
+        if (isset($this->server[self::NOT_INSTALLED_URL_PATH_PARAM])) {
+            return $this->server[self::NOT_INSTALLED_URL_PATH_PARAM];
+        }
+        return self::DEFAULT_PATH;
+    }
+}
diff --git a/setup/.htaccess b/setup/.htaccess
index f3c9a4b7e82cd..3e6764bf4bab2 100644
--- a/setup/.htaccess
+++ b/setup/.htaccess
@@ -1,2 +1,5 @@
-RewriteEngine Off
 Options -Indexes
+
+<IfModule mod_rewrite.c>
+    RewriteEngine Off
+</IfModule>
diff --git a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
index 50d9ec9cf2912..f92494478ede2 100644
--- a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
+++ b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
@@ -10,6 +10,7 @@
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\SetupInfo;
 
 class WebConfiguration extends AbstractActionController
 {
@@ -37,9 +38,10 @@ public function __construct(DirectoryList $dirList)
      */
     public function indexAction()
     {
+        $setupInfo = new SetupInfo($_SERVER);
         $projectRoot = $this->dirList->getRoot();
         $docRoot = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']);
-        if (false === strpos($projectRoot . '/', $docRoot . '/')) { // if project root is outside of current doc root
+        if ($setupInfo->isAvailable($this->dirList->getRoot())) {
             $urlPath = '';
         } else {
             $urlPath = substr($docRoot, strlen($projectRoot));

From 43159ba314dd2992b4733749d6053b2c15ff611e Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 26 Nov 2014 23:58:23 -0600
Subject: [PATCH 043/474] MAGETWO-30953: Add URL format validation

- Implmented url validation both in front and backend. It doesn't matter
  now if you put slash at the end or not.
---
 .../src/Model/UserConfigurationDataMapper.php |  3 ++
 .../magento/setup/web-configuration.phtml     | 18 ++++----
 setup/pub/magento/setup/web-configuration.js  | 44 ++++++++++++++++++-
 3 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index 3ce4e38db3633..18b490c5a89a2 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -69,6 +69,9 @@ public function getConfigData($data)
                     && (!isset($data[self::KEY_BASE_URL_SECURE]))) {
                     continue;
                 }
+                if (($key === self::KEY_BASE_URL) || ($key === self::KEY_BASE_URL_SECURE)) {
+                    $data[$key] = rtrim($data[$key], '/') . '/';
+                }
                 $configData[$path] = $data[$key];
             }
         }
diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 01c3e42a52e4a..e387a42abca48 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -34,20 +34,21 @@ $hints = [
     <div class="form-group" ng-class="{'has-error': webconfig.web.$invalid && webconfig.submitted}">
         <label class="col-md-3 control-label">Your Store Address&nbsp;<span class="required">*</span></label>
         <div class="col-md-4">
-            <input type="text"
+            <input ng-blur="addSlash()"
+                   type="text"
                    name="web"
                    ng-model="config.address.web"
                    class="form-control"
-                   ng-focus=""
                    tooltip-placement="right"
                    tooltip-html-unsafe="<?php echo $hints['address_web']; ?>"
                    tooltip-trigger="focus"
                    tooltip-append-to-body="true"
-                   required />
+                   required
+                   validate-httpurl />
         </div>
         <div class="col-md-offset-3 col-md-4" ng-show="webconfig.web.$invalid && webconfig.submitted">
             <div class="error-container">
-                <span ng-show="webconfig.web.$error.required">Please enter a valid base URL Admin URL path. (ex: http://www.example.com/)</span>
+                <span ng-show="webconfig.web.$error.required || webconfig.web.$error.validateHttpurl">Please enter a valid base URL path. (ex: http://www.example.com/)</span>
             </div>
         </div>
     </div>
@@ -91,7 +92,7 @@ $hints = [
             </div>
         </div>
 
-        <div class="form-group" ng-if="showHttpsField()">
+        <div class="form-group" ng-show="showHttpsField()">
             <label ng-show="config.https.front || config.https.admin" class="col-md-4 col-md-offset-3">Your HTTPS Store address:</label>
             <div class="col-md-4 col-md-offset-3">
                 <input type="text"
@@ -100,11 +101,12 @@ $hints = [
                        ng-show="config.https.front || config.https.admin"
                        class="form-control"
                        ng-focus=""
-                       required />
+                       required
+                       validate-httpsurl />
             </div>
-            <div class="col-md-offset-3 col-md-4" ng-show="webconfig.submitted">
+            <div class="col-md-offset-3 col-md-4" ng-show="webconfig.https.$invalid && webconfig.submitted">
                 <div class="error-container">
-                    <span>You must enter HTTPS URL.</span>
+                    <span ng-show="webconfig.https.$error.required || webconfig.https.$error.validateHttpsurl">Please enter a valid HTTPS base URL path. (ex: https://www.example.com/)</span>
                 </div>
             </div>
         </div>
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index 0e19fc8f08288..fe5b5adf64389 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -56,6 +56,20 @@ angular.module('web-configuration', ['ngStorage'])
             return ($scope.config.https.front || $scope.config.https.admin);
         }
 
+        $scope.addSlash = function() {
+            if (angular.isUndefined($scope.config.address.web)) {
+                return;
+            }
+
+            var p = $scope.config.address.web;
+            if (p.length > 1) {
+                var lastChar = p.substr(-1);
+                if (lastChar != '/') {
+                    $scope.config.address.web = p + '/';
+                }
+            }
+        };
+
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();
@@ -77,4 +91,32 @@ angular.module('web-configuration', ['ngStorage'])
                 $scope.webconfig.submitted = false;
             }
         });
-    }]);
\ No newline at end of file
+    }])
+    .directive('validateHttpurl', function() {
+        return{
+            require: "ngModel",
+            link: function(scope, elm, attrs, ctrl){
+                var validator = function(value){
+                    var isValid  = value.match(/^(http):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/);
+                    ctrl.$setValidity('validateHttpurl', isValid);
+                    return value;
+                };
+                ctrl.$parsers.unshift(validator);
+                ctrl.$formatters.unshift(validator);
+            }
+        };
+    })
+    .directive('validateHttpsurl', function() {
+        return{
+            require: "ngModel",
+            link: function(scope, elm, attrs, ctrl){
+                var validator = function(value){
+                    var isValid  = value.match(/^(https):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/);
+                    ctrl.$setValidity('validateHttpsurl', isValid);
+                    return value;
+                };
+                ctrl.$parsers.unshift(validator);
+                ctrl.$formatters.unshift(validator);
+            }
+        };
+    });
\ No newline at end of file

From 1a7327a78fa5f112b8506277c154ae1eea3096d3 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 27 Nov 2014 00:07:41 -0600
Subject: [PATCH 044/474] MAGETWO-30834: Admin user password validation doesn't
 work for characters number

- Fixed the error message.
---
 .../Magento/Setup/view/magento/setup/create-admin-account.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml b/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml
index 793bb45bca4e6..bc584fecd0b17 100644
--- a/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/create-admin-account.phtml
@@ -90,7 +90,7 @@ $passwordWizard = sprintf(
         </div>
         <div class="col-sm-offset-3 col-sm-4" ng-show="account.adminPassword.$invalid && account.submitted">
             <div class="error-container">
-                <span ng-show="account.adminPassword.$error.checkPassword">Please enter a correct password.</span>
+                <span ng-show="account.adminPassword.$error.checkPassword">Please enter at least 7 alpha-numeric characters.</span>
                 <span ng-show="account.adminPassword.$error.required">Please enter your new password.</span>
             </div>
         </div>

From 1cdb0a6ab4c9ec75ea83b7aeb1bc455087c23675 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 27 Nov 2014 00:35:42 -0600
Subject: [PATCH 045/474] MAGETWO-30859: No input validation for HTTPS
 configuration data during installation

- Fixed the problem of entering saved https input from previous session.
---
 .../Magento/Setup/view/magento/setup/web-configuration.phtml   | 2 +-
 setup/pub/magento/setup/web-configuration.js                   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index e387a42abca48..ffaf4af641795 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -98,7 +98,7 @@ $hints = [
                 <input type="text"
                        name="https"
                        ng-model="config.https.text"
-                       ng-show="config.https.front || config.https.admin"
+                       ng-if="config.https.front || config.https.admin"
                        class="form-control"
                        ng-focus=""
                        required
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index fe5b5adf64389..f369a210f5410 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -32,6 +32,7 @@ angular.module('web-configuration', ['ngStorage'])
 
         if ($localStorage.config) {
             $scope.config = $localStorage.config;
+            $scope.config.https.text = '';
         }
 
         $scope.$on('nextState', function () {
@@ -111,7 +112,7 @@ angular.module('web-configuration', ['ngStorage'])
             require: "ngModel",
             link: function(scope, elm, attrs, ctrl){
                 var validator = function(value){
-                    var isValid  = value.match(/^(https):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/);
+                    var isValid  = angular.isUndefined(value) || (value === "") || value.match(/^(https):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/);
                     ctrl.$setValidity('validateHttpsurl', isValid);
                     return value;
                 };

From 84da5960a2bab09277c09f9a555266a39734774d Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 27 Nov 2014 01:04:22 -0600
Subject: [PATCH 046/474] MAGETWO-30953: Add URL format validation

- Fixed issue of entering https saved value from previous session.
---
 .../Magento/Setup/src/Model/UserConfigurationDataMapper.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index 18b490c5a89a2..32eed61a9d52a 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -63,6 +63,9 @@ class UserConfigurationDataMapper
     public function getConfigData($data)
     {
         $configData = [];
+        if ($data[self::KEY_BASE_URL_SECURE] === '') {
+            unset($data[self::KEY_BASE_URL_SECURE] );
+        }
         foreach (self::$pathDataMap as $path => $key) {
             if (isset($data[$key])) {
                 if ((($key === self::KEY_IS_SECURE) || ($key === self::KEY_IS_SECURE_ADMIN))

From c9f0ad661deb8b4a89dd1ca2f6de605e0c399987 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Thu, 27 Nov 2014 02:41:04 -0600
Subject: [PATCH 047/474] MAGETWO-30852: Old encryption key did not saved after
 update

- added unit test
- changed decrypt logic
---
 .../Framework/Encryption/EncryptorTest.php    | 23 ++++++++++++++++++-
 .../Framework/Encryption/Encryptor.php        | 10 ++++----
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
index 6a796536c13ed..dd2fea3bc162d 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
@@ -117,6 +117,28 @@ public function encryptWithEmptyKeyDataProvider()
         return array(array(null), array(0), array(''), array('0'));
     }
 
+    /**
+     * @param mixed $key
+     *
+     * @dataProvider decryptWithEmptyKeyDataProvider
+     */
+    public function testDecryptWithEmptyKey($key)
+    {
+        $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', array(), array(), '', false);
+        $deploymentConfigMock->expects($this->any())
+            ->method('get')
+            ->with(Encryptor::PARAM_CRYPT_KEY)
+            ->will($this->returnValue($key));
+        $model = new Encryptor($this->_randomGenerator, $deploymentConfigMock);
+        $value = 'arbitrary_string';
+        $this->assertEquals('', $model->decrypt($value));
+    }
+
+    public function decryptWithEmptyKeyDataProvider()
+    {
+        return array(array(null), array(0), array(''), array('0'));
+    }
+
     public function testEncrypt()
     {
         // sample data to encrypt
@@ -127,7 +149,6 @@ public function testEncrypt()
         // Extract the initialization vector and encrypted data
         $parts = explode(':', $actual, 4);
         list(, , $iv, $encryptedData) = $parts;
-        echo $actual;
 
         // Decrypt returned data with RIJNDAEL_256 cipher, cbc mode
         $crypt = new Crypt('cryptKey', MCRYPT_RIJNDAEL_256, MCRYPT_MODE_CBC, $iv);
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
index 709e73cd6c4e0..b57defd545dd7 100644
--- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -248,7 +248,7 @@ public function decrypt($data)
             }
             $crypt = $this->getCrypt($this->keys[$keyVersion], $cryptVersion, $initVector);
             if (null === $crypt) {
-                return $data;
+                return '';
             }
             return trim($crypt->decrypt(base64_decode((string)$data)));
         }
@@ -312,10 +312,12 @@ protected function getCrypt($key = null, $cipherVersion = null, $initVector = tr
 
         if (null === $key) {
             $key = $this->keys[$this->keyVersion];
-            if (!$key) {
-                return null;
-            }
         }
+
+        if (!$key) {
+            return null;
+        }
+
         if (null === $cipherVersion) {
             $cipherVersion = $this->cipher;
         }

From bc77d0be42c827d7981ab5369b99df441cd8924a Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Thu, 27 Nov 2014 03:02:43 -0600
Subject: [PATCH 048/474] MAGETWO-31004: Validation of CLI

- small change to Validator class
---
 .../Magento/Setup/src/Model/Validator.php     | 58 +++++++++----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/Validator.php b/setup/module/Magento/Setup/src/Model/Validator.php
index a2feda17cc876..44129b07bb75e 100644
--- a/setup/module/Magento/Setup/src/Model/Validator.php
+++ b/setup/module/Magento/Setup/src/Model/Validator.php
@@ -83,7 +83,6 @@ public function validate($action, array $data)
             default:
                 return true;
         }
-        return false;
     }
 
     /**
@@ -106,7 +105,7 @@ public function validateInstall(array $data)
      * @param array $data
      * @return bool
      */
-    public function validateDeploymentConfig(array $data)
+    private function validateDeploymentConfig(array $data)
     {
         $pass = true;
         if (isset($data[ConfigMapper::KEY_BACKEND_FRONTNAME]) &&
@@ -143,7 +142,7 @@ public function validateDeploymentConfig(array $data)
      * @param array $data
      * @return bool
      */
-    public function validateUserConfig(array $data)
+    private function validateUserConfig(array $data)
     {
         $pass = true;
         // check URL
@@ -154,7 +153,7 @@ public function validateUserConfig(array $data)
                 "Please enter a valid base url. Current: {$data[UserConfigurationDataMapper::KEY_BASE_URL]}";
         }
         if (isset($data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE]) &&
-            !$this->validateUrl($data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE])) {
+            !$this->validateUrl($data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE], true)) {
             $pass = false;
             $this->validationMessages[UserConfigurationDataMapper::KEY_BASE_URL_SECURE] =
                 'Please enter a valid secure base url. ' .
@@ -162,31 +161,22 @@ public function validateUserConfig(array $data)
         }
 
         // check 0/1 options
-        $wrongOptionMessage = 'Please enter a valid option (0/1). ';
-        if (isset($data[UserConfigurationDataMapper::KEY_USE_SEF_URL]) &&
-            !$this->validateOneZero($data[UserConfigurationDataMapper::KEY_USE_SEF_URL])) {
-            $pass = false;
-            $this->validationMessages[UserConfigurationDataMapper::KEY_USE_SEF_URL] =
-                $wrongOptionMessage . "Current: {$data[UserConfigurationDataMapper::KEY_USE_SEF_URL]}";
+        $flags = [];
+        if (isset($data[UserConfigurationDataMapper::KEY_USE_SEF_URL])) {
+            $flags[UserConfigurationDataMapper::KEY_USE_SEF_URL] = $data[UserConfigurationDataMapper::KEY_USE_SEF_URL];
         }
-        if (isset($data[UserConfigurationDataMapper::KEY_IS_SECURE]) &&
-            !$this->validateOneZero($data[UserConfigurationDataMapper::KEY_IS_SECURE])) {
-            $pass = false;
-            $this->validationMessages[UserConfigurationDataMapper::KEY_IS_SECURE] =
-                $wrongOptionMessage . "Current: {$data[UserConfigurationDataMapper::KEY_IS_SECURE]}";
+        if (isset($data[UserConfigurationDataMapper::KEY_IS_SECURE])) {
+            $flags[UserConfigurationDataMapper::KEY_IS_SECURE] = $data[UserConfigurationDataMapper::KEY_IS_SECURE];
         }
-        if (isset($data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN]) &&
-            !$this->validateOneZero($data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN])) {
-            $pass = false;
-            $this->validationMessages[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN] =
-                $wrongOptionMessage . "Current: {$data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN]}";
+        if (isset($data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN])) {
+            $flags[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN] =
+                $data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN];
         }
-        if (isset($data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY]) &&
-            !$this->validateOneZero($data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY])) {
-            $pass = false;
-            $this->validationMessages[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY] =
-                $wrongOptionMessage . "Current: {$data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY]}";
+        if (isset($data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY])) {
+            $flags[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY] =
+                $data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY];
         }
+        $pass = $this->validateOneZero($flags);
 
         // check language, currency and timezone
         $options = new Lists(new \Zend_Locale());
@@ -226,7 +216,7 @@ public function validateUserConfig(array $data)
      * @param array $data
      * @return bool
      */
-    public function validateAdmin(array $data)
+    private function validateAdmin(array $data)
     {
         $pass = true;
         if (isset($data[AdminAccount::KEY_EMAIL]) &&
@@ -282,13 +272,21 @@ private function validateUrl($url, $secure = false)
     }
 
     /**
-     * Validate if it's one or zero flag
+     * Validate if all flags are of 0/1 option
      *
-     * @param $flag
+     * @param array $flags
      * @return bool
      */
-    private function validateOneZero($flag)
+    private function validateOneZero(array $flags = [])
     {
-        return $flag === '0' || $flag === '1';
+        $wrongOptionMessage = 'Please enter a valid option (0/1). ';
+        $pass = true;
+        foreach ($flags as $key => $flag) {
+            if ($flag !== '0' && $flag !== '1') {
+                $pass = false;
+                $this->validationMessages[$key] = "{$wrongOptionMessage} Current: {$flag}";
+            }
+        }
+        return $pass;
     }
 }

From db6c7fcad3e49eb0ccc2cd866602debd803804e7 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Thu, 27 Nov 2014 05:14:57 -0600
Subject: [PATCH 049/474] MAGETWO-31004: Validation of CLI

- fix validate user configuration logic
---
 setup/module/Magento/Setup/src/Model/Validator.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/Validator.php b/setup/module/Magento/Setup/src/Model/Validator.php
index 44129b07bb75e..2e7cb648b8aed 100644
--- a/setup/module/Magento/Setup/src/Model/Validator.php
+++ b/setup/module/Magento/Setup/src/Model/Validator.php
@@ -123,7 +123,6 @@ private function validateDeploymentConfig(array $data)
             $pass = false;
             $this->validationMessages[ConfigMapper::KEY_SESSION_SAVE] =
                 "Please use 'files' or 'db'. Current: {$data[ConfigMapper::KEY_SESSION_SAVE]}";
-            ;
         }
         if (isset($data[ConfigMapper::KEY_ENCRYPTION_KEY]) &&
             !$data[ConfigMapper::KEY_ENCRYPTION_KEY]
@@ -176,7 +175,9 @@ private function validateUserConfig(array $data)
             $flags[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY] =
                 $data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY];
         }
-        $pass = $this->validateOneZero($flags);
+        if (!$this->validateOneZero($flags)) {
+            $pass = false;
+        }
 
         // check language, currency and timezone
         $options = new Lists(new \Zend_Locale());

From 0f4d12aaa8e899b5993e7333dbca1b9b35dd330c Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@ebay.com>
Date: Thu, 27 Nov 2014 16:06:09 +0200
Subject: [PATCH 050/474] MTA-773: Stabilize Catalog module. Products

- fixed selector after pull
---
 .../Block/Adminhtml/Product/Edit/Action/Attribute.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php
index c53ceb7550582..700f4176df3c5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php
@@ -13,27 +13,26 @@
 use Magento\Backend\Test\Block\Widget\Form;
 
 /**
- * Class Attribute
- * Product attribute massaction edit page
+ * Product attribute massaction edit page.
  */
 class Attribute extends Form
 {
     /**
-     * CSS selector for 'save' button
+     * CSS selector for 'save' button.
      *
      * @var string
      */
-    protected $saveButton = '[data-ui-id="attribute-save-button"]';
+    protected $saveButton = '[data-ui-id="page-actions-toolbar-save-button"]';
 
     /**
-     * XPath selector for checkbox that enables price editing
+     * XPath selector for checkbox that enables price editing.
      *
      * @var string
      */
     protected $priceFieldEnablerSelector = '//*[@id="attribute-price-container"]/div[1]/div/label//*[@type="checkbox"]';
 
     /**
-     * Enable price field editing
+     * Enable price field editing.
      *
      * @return void
      */

From a13efe653a2736d69022d88d4eab5a99db62d78a Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Thu, 27 Nov 2014 20:31:46 +0200
Subject: [PATCH 051/474] MAGETWO-3121: CLONE - Authenticated RSS admin user
 has access to all RSS feeds

---
 .../Rss/App/Action/Plugin/BackendAuthentication.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
index 3b82eee8f5342..02fd70b8d23f7 100644
--- a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
+++ b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
@@ -38,7 +38,10 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
      * @var array
      */
     protected $aclResources = array(
-        'feed' => 'Magento_Rss::rss'
+        'feed' => 'Magento_Rss::rss',
+        'notifystock' => 'Magento_Catalog::catalog_inventory',
+        'new_order' => 'Magento_Sales::actions_view',
+        'review' => 'Magento_Reports::review_product'
     );
 
     /**
@@ -84,7 +87,10 @@ public function aroundDispatch(AbstractAction $subject, \Closure $proceed, Reque
                 : $this->aclResources[$request->getControllerName()]
             : null;
 
-        if (!$resource) {
+        $type = $request->getParam('type');
+        $resourceType = isset($this->aclResources[$type]) ? $this->aclResources[$type] : null;
+
+        if (!$resource || !$resourceType) {
             return parent::aroundDispatch($subject, $proceed, $request);
         }
 
@@ -101,7 +107,8 @@ public function aroundDispatch(AbstractAction $subject, \Closure $proceed, Reque
         }
 
         // Verify if logged in and authorized
-        if (!$session->isLoggedIn() || !$this->authorization->isAllowed($resource)) {
+        if (!$session->isLoggedIn() || !$this->authorization->isAllowed($resource)
+            || !$this->authorization->isAllowed($resourceType)) {
             $this->httpAuthentication->setAuthenticationFailed('RSS Feeds');
             return $this->_response;
         }

From e627df8dc1e4333c443b973bcd8a5bd3d7f50705 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@ebay.com>
Date: Fri, 28 Nov 2014 15:40:56 +0200
Subject: [PATCH 052/474] MTA-773: Stabilize Catalog module. Products

- skip test because bug MAGETWO-31179
---
 .../testCreate.csv                            | 38 +++++++++----------
 .../testCreate.csv                            | 16 ++++----
 .../UpdateVirtualProductEntityTest/test.csv   | 24 ++++++------
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv
index bcce9e2518fce..7de15e64d1dbe 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv
@@ -1,19 +1,19 @@
-"product/data/name";"product/data/sku";"product/data/tax_class_id/dataSet";"product/data/price/value";"product/data/special_price";"product/data/short_description";"product/data/description";"product/data/weight";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/visibility";"product/data/custom_options/preset";"product/data/checkout_data/preset";"product/data/custom_options/import_products";"product/data/price/preset";"product/data/group_price/preset";"product/data/tier_price/preset";"constraint"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10000";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"50";"657";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"drop_down_with_one_option_fixed_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10001";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"51";"658";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"drop_down_with_one_option_percent_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10002";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"52";"659";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10003";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"53";"660";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10004";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"54";"661";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10005";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"55";"662";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10006";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"56";"663";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10007";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"57";"664";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10008";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"58";"665";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductVisibleInCategory, assertProductPage"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10009";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"59";"75";"In Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInStock"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10010";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"60";"0";"Out of Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10011";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"61";"138";"-";"Search";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductSearchableBySku"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10012";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"62";"139";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductSearchableBySku, assertProductPage"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10013";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"63";"140";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage"
-"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10014";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"64";"141";"-";"-";"-";"-";"-";"-";"default";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductGroupedPriceOnProductPage"
-"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10015";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"65";"142";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductSpecialPriceOnProductPage"
-"Simple Product %isolation%";"simple_sku_%isolation%";"None";"10016";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"66";"143";"-";"-";"-";"-";"-";"-";"-";"default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductTierPriceOnProductPage"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10017";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"67";"144";"-";"-";"options-suite";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductCustomOptionsOnProductPage"
+"product/data/name";"product/data/sku";"product/data/tax_class_id/dataSet";"product/data/price/value";"product/data/special_price";"product/data/short_description";"product/data/description";"product/data/weight";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/visibility";"product/data/custom_options/preset";"product/data/checkout_data/preset";"product/data/custom_options/import_products";"product/data/price/preset";"product/data/group_price/preset";"product/data/tier_price/preset";"constraint";"issue"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10000";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"50";"657";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"drop_down_with_one_option_fixed_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10001";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"51";"658";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"drop_down_with_one_option_percent_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10002";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"52";"659";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10003";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"53";"660";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10004";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"54";"661";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"Bug: MAGETWO-31179"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10005";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"55";"662";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"Bug: MAGETWO-31179"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10006";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"56";"663";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10007";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"57";"664";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10008";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"58";"665";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductVisibleInCategory, assertProductPage";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10009";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"59";"75";"In Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInStock";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10010";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"60";"0";"Out of Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10011";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"61";"138";"-";"Search";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductSearchableBySku";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10012";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"62";"139";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductSearchableBySku, assertProductPage";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10013";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"63";"140";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10014";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"64";"141";"-";"-";"-";"-";"-";"-";"default";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductGroupedPriceOnProductPage";"Bug: MAGETWO-31179"
+"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10015";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"65";"142";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductSpecialPriceOnProductPage";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"None";"10016";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"66";"143";"-";"-";"-";"-";"-";"-";"-";"default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductTierPriceOnProductPage";""
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10017";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"67";"144";"-";"-";"options-suite";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductCustomOptionsOnProductPage";""
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv
index cbc73ef8063d8..a71fbe94bb308 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv
@@ -1,8 +1,8 @@
-"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category";"product/data/group_price/preset";"product/data/price/preset";"product/data/tier_price/preset";"product/data/inventory_manage_stock";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"constraint"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"None";"999";"Yes";"category_%isolation%";"-";"-";"MAGETWO-23002";"Yes";"In Stock";"-";"-";"Catalog, Search";"assertProductSaveMessage, assertProductVisibleInCategory, assertProductForm, assertProductSearchableBySku"
-"VirtualProduct %isolation%";"-";"10";"Taxable Goods";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"-";"Out of Stock";"-";"-";"Search";"assertProductSaveMessage, assertProductForm, assertProductSkuAutoGenerated, assertProductSearchableBySku"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"category_%isolation%";"MAGETWO-23055";"-";"-";"-";"-";"-";"-";"Catalog";"assertProductSaveMessage, assertProductForm, assertProductVisibleInCategory"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"-";"-";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"assertProductSaveMessage, assertProductSearchableBySku, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductCustomOptionsOnProductPage"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"No";"In Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductInStock"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"999";"Yes";"-";"-";"-";"default";"-";"Out of Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductTierPriceOnProductPage, assertProductOutOfStock"
+"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category";"product/data/group_price/preset";"product/data/price/preset";"product/data/tier_price/preset";"product/data/inventory_manage_stock";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"constraint";"issue"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid";""
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"None";"999";"Yes";"category_%isolation%";"-";"-";"MAGETWO-23002";"Yes";"In Stock";"-";"-";"Catalog, Search";"assertProductSaveMessage, assertProductVisibleInCategory, assertProductForm, assertProductSearchableBySku";""
+"VirtualProduct %isolation%";"-";"10";"Taxable Goods";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"-";"Out of Stock";"-";"-";"Search";"assertProductSaveMessage, assertProductForm, assertProductSkuAutoGenerated, assertProductSearchableBySku";""
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"category_%isolation%";"MAGETWO-23055";"-";"-";"-";"-";"-";"-";"Catalog";"assertProductSaveMessage, assertProductForm, assertProductVisibleInCategory";"Bug: MAGETWO-31179"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"-";"-";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"assertProductSaveMessage, assertProductSearchableBySku, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductCustomOptionsOnProductPage";"Bug: MAGETWO-31179"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"No";"In Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductInStock";""
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"999";"Yes";"-";"-";"-";"default";"-";"Out of Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductTierPriceOnProductPage, assertProductOutOfStock";""
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv
index 8c4e634beabb1..a77032186810c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv
@@ -1,12 +1,12 @@
-"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category_ids/presets";"product/data/group_price/preset";"product/data/special_price";"product/data/tier_price/preset";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/visibility";"constraint"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductTierPriceOnProductPage, assertProductSearchableBySku "
-"virtual_product_%isolation%";"virtual_sku_%isolation%";"120.00";"Taxable Goods";"999";"Yes";"-";"-";"45";"-";"In Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductSearchableBySku"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"185.00";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductPage, assertProductOutOfStock, assertProductTierPriceOnProductPage, assertProductSearchableBySku"
-"virtual_product_%isolation%";"virtual_sku_%isolation%";"99.99";"Taxable Goods";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"5.00";"None";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku"
-"virtual_product_%isolation%";"virtual_sku_%isolation%";"145.00";"Taxable Goods";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductSearchableBySku"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"-";"Yes";"default_subcategory";"-";"45";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku"
-"virtual_product_%isolation%";"virtual_sku_%isolation%";"5.00";"Taxable Goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock,  assertProductSearchableBySku"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"120.00";"None";"999";"Yes";"default_subcategory";"-";"-";"-";"In Stock";"options-suite";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"Taxable Goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductSpecialPriceOnProductPage, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductInCategory, assertProductSearchableBySku"
+"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category_ids/presets";"product/data/group_price/preset";"product/data/special_price";"product/data/tier_price/preset";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/visibility";"constraint";"issue"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductTierPriceOnProductPage, assertProductSearchableBySku";""
+"virtual_product_%isolation%";"virtual_sku_%isolation%";"120.00";"Taxable Goods";"999";"Yes";"-";"-";"45";"-";"In Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductSearchableBySku";""
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"185.00";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductPage, assertProductOutOfStock, assertProductTierPriceOnProductPage, assertProductSearchableBySku";""
+"virtual_product_%isolation%";"virtual_sku_%isolation%";"99.99";"Taxable Goods";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku";""
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"5.00";"None";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku";""
+"virtual_product_%isolation%";"virtual_sku_%isolation%";"145.00";"Taxable Goods";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductSearchableBySku";"Bug: MAGETWO-31179"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"-";"Yes";"default_subcategory";"-";"45";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku";""
+"virtual_product_%isolation%";"virtual_sku_%isolation%";"5.00";"Taxable Goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock,  assertProductSearchableBySku";"Bug: MAGETWO-31179"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"120.00";"None";"999";"Yes";"default_subcategory";"-";"-";"-";"In Stock";"options-suite";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku";""
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"Taxable Goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku";"Bug: MAGETWO-31179"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductSpecialPriceOnProductPage, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductInCategory, assertProductSearchableBySku";"Bug: MAGETWO-31179"

From c4791dcb134064f43680a92067210c2d218f4cda Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Fri, 28 Nov 2014 17:04:27 +0200
Subject: [PATCH 053/474] MAGETWO-3121: CLONE - Authenticated RSS admin user
 has access to all RSS feeds

---
 .../Plugin/BackendAuthenticationTest.php      | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php

diff --git a/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php b/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
new file mode 100644
index 0000000000000..0a263a878cb18
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Rss\App\Action\Plugin;
+
+class BackendAuthenticationTest extends \PHPUnit_Framework_TestCase
+{
+    public function testAroundDispatch()
+    {
+        /** @var \Magento\Backend\App\AbstractAction|\PHPUnit_Framework_MockObject_MockObject $subject */
+        $subject = $this->getMock('Magento\Backend\App\AbstractAction', [], [], '', false);
+
+        /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject $response */
+        $response = $this->getMock('Magento\Framework\App\ResponseInterface', [], [], '', false);
+
+        $proceed = function () use ($response) {
+            return $response;
+        };
+
+        /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject $request */
+        $request = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
+        $request->expects($this->atLeastOnce())->method('getControllerName')->will($this->returnValue('feed'));
+        $request->expects($this->atLeastOnce())->method('getActionName')->will($this->returnValue('index'));
+        $request->expects($this->once())->method('getParam')->with('type')->will($this->returnValue('notifystock'));
+
+        /** @var \Magento\Backend\Model\Auth\StorageInterface|\PHPUnit_Framework_MockObject_MockObject $session */
+        $session = $this->getMock('Magento\Backend\Model\Auth\StorageInterface', [], [], '', false);
+        $session->expects($this->at(0))->method('isLoggedIn')->will($this->returnValue(false));
+        $session->expects($this->at(1))->method('isLoggedIn')->will($this->returnValue(true));
+
+        $username = 'admin';
+        $password = '123123qa';
+        $auth = $this->getMock('Magento\Backend\Model\Auth', [], [], '', false);
+        $auth->expects($this->once())->method('getAuthStorage')->will($this->returnValue($session));
+        $auth->expects($this->once())->method('login')->with($username, $password);
+
+        /** @var \Magento\Framework\HTTP\Authentication|\PHPUnit_Framework_MockObject_MockObject $httpAuthentication */
+        $httpAuthentication = $this->getMock('Magento\Framework\HTTP\Authentication', [], [], '', false);
+        $httpAuthentication->expects($this->once())->method('getCredentials')->will($this->returnValue([$username, $password]));
+        $httpAuthentication->expects($this->once())->method('setAuthenticationFailed')->with('RSS Feeds');
+
+        $authorization = $this->getMock('Magento\Framework\AuthorizationInterface', [], [], '', false);
+        $authorization->expects($this->at(0))->method('isAllowed')->with('Magento_Rss::rss')->will($this->returnValue(true));
+        $authorization->expects($this->at(1))->method('isAllowed')->with('Magento_Catalog::catalog_inventory')->will($this->returnValue(false));
+
+        /** @var \Magento\Rss\App\Action\Plugin\BackendAuthentication $plugin */
+        $plugin = (new \Magento\TestFramework\Helper\ObjectManager($this))
+            ->getObject(
+                'Magento\Rss\App\Action\Plugin\BackendAuthentication',
+                [
+                    'auth' => $auth,
+                    'httpAuthentication' => $httpAuthentication,
+                    'response' => $response,
+                    'authorization' => $authorization
+                ]
+            );
+        $this->assertSame(
+            $response,
+            $plugin->aroundDispatch($subject, $proceed, $request)
+        );
+    }
+}

From bebe6388cac833c243267a54b0ff135f1faf0ff9 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Fri, 28 Nov 2014 19:07:21 +0200
Subject: [PATCH 054/474] MAGETWO-3121: CLONE - Authenticated RSS admin user
 has access to all RSS feeds

---
 .../Action/Plugin/BackendAuthentication.php   | 12 +++++-------
 app/code/Magento/Rss/etc/adminhtml/di.xml     | 10 ++++++++++
 .../Plugin/BackendAuthenticationTest.php      | 19 +++++++++++++++----
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
index 02fd70b8d23f7..4af47f86acd5b 100644
--- a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
+++ b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
@@ -37,12 +37,7 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
     /**
      * @var array
      */
-    protected $aclResources = array(
-        'feed' => 'Magento_Rss::rss',
-        'notifystock' => 'Magento_Catalog::catalog_inventory',
-        'new_order' => 'Magento_Sales::actions_view',
-        'review' => 'Magento_Reports::review_product'
-    );
+    protected $aclResources;
 
     /**
      * @param \Magento\Backend\Model\Auth $auth
@@ -53,6 +48,7 @@ class BackendAuthentication extends \Magento\Backend\App\Action\Plugin\Authentic
      * @param \Magento\Framework\HTTP\Authentication $httpAuthentication
      * @param \Magento\Framework\Logger $logger
      * @param \Magento\Framework\AuthorizationInterface $authorization
+     * @param array $aclResources
      */
     public function __construct(
         \Magento\Backend\Model\Auth $auth,
@@ -62,11 +58,13 @@ public function __construct(
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\Framework\HTTP\Authentication $httpAuthentication,
         \Magento\Framework\Logger $logger,
-        \Magento\Framework\AuthorizationInterface $authorization
+        \Magento\Framework\AuthorizationInterface $authorization,
+        array $aclResources
     ) {
         $this->httpAuthentication = $httpAuthentication;
         $this->logger = $logger;
         $this->authorization = $authorization;
+        $this->aclResources = $aclResources;
         parent::__construct($auth, $url, $response, $actionFlag, $messageManager);
     }
 
diff --git a/app/code/Magento/Rss/etc/adminhtml/di.xml b/app/code/Magento/Rss/etc/adminhtml/di.xml
index 270ec124a184e..f4b2e362a7b8f 100644
--- a/app/code/Magento/Rss/etc/adminhtml/di.xml
+++ b/app/code/Magento/Rss/etc/adminhtml/di.xml
@@ -11,4 +11,14 @@
     <type name="Magento\Rss\Controller\Adminhtml\Feed">
         <plugin name="adminAuthentication" type="Magento\Rss\App\Action\Plugin\BackendAuthentication"/>
     </type>
+    <type name="Magento\Rss\App\Action\Plugin\BackendAuthentication">
+        <arguments>
+            <argument name="aclResources" xsi:type="array">
+                <item name="feed" xsi:type="string">Magento_Rss::rss</item>
+                <item name="notifystock" xsi:type="string">Magento_Catalog::catalog_inventory</item>
+                <item name="new_order" xsi:type="string">Magento_Sales::actions_view</item>
+                <item name="review" xsi:type="string">Magento_Reports::review_product</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php b/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
index 0a263a878cb18..ea67a451342c7 100644
--- a/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
@@ -40,12 +40,22 @@ public function testAroundDispatch()
 
         /** @var \Magento\Framework\HTTP\Authentication|\PHPUnit_Framework_MockObject_MockObject $httpAuthentication */
         $httpAuthentication = $this->getMock('Magento\Framework\HTTP\Authentication', [], [], '', false);
-        $httpAuthentication->expects($this->once())->method('getCredentials')->will($this->returnValue([$username, $password]));
+        $httpAuthentication->expects($this->once())->method('getCredentials')
+            ->will($this->returnValue([$username, $password]));
         $httpAuthentication->expects($this->once())->method('setAuthenticationFailed')->with('RSS Feeds');
 
         $authorization = $this->getMock('Magento\Framework\AuthorizationInterface', [], [], '', false);
-        $authorization->expects($this->at(0))->method('isAllowed')->with('Magento_Rss::rss')->will($this->returnValue(true));
-        $authorization->expects($this->at(1))->method('isAllowed')->with('Magento_Catalog::catalog_inventory')->will($this->returnValue(false));
+        $authorization->expects($this->at(0))->method('isAllowed')->with('Magento_Rss::rss')
+            ->will($this->returnValue(true));
+        $authorization->expects($this->at(1))->method('isAllowed')->with('Magento_Catalog::catalog_inventory')
+            ->will($this->returnValue(false));
+
+        $aclResources = [
+            'feed' => 'Magento_Rss::rss',
+            'notifystock' => 'Magento_Catalog::catalog_inventory',
+            'new_order' => 'Magento_Sales::actions_view',
+            'review' => 'Magento_Reports::review_product'
+        ];
 
         /** @var \Magento\Rss\App\Action\Plugin\BackendAuthentication $plugin */
         $plugin = (new \Magento\TestFramework\Helper\ObjectManager($this))
@@ -55,7 +65,8 @@ public function testAroundDispatch()
                     'auth' => $auth,
                     'httpAuthentication' => $httpAuthentication,
                     'response' => $response,
-                    'authorization' => $authorization
+                    'authorization' => $authorization,
+                    'aclResources' => $aclResources
                 ]
             );
         $this->assertSame(

From 96d6bac73790e99815d5624dfea63e5e19488a53 Mon Sep 17 00:00:00 2001
From: Vitaliy Honcharenko <vgoncharenko@ebay.com>
Date: Fri, 28 Nov 2014 19:27:56 +0200
Subject: [PATCH 055/474] MTA-773: Stabilize Catalog module. Products

- change selectors after update
---
 .../tests/app/Magento/Banner/Test/Block/Banners.php  | 12 ++++++++----
 .../tests/app/Magento/Banner/Test/Page/CmsIndex.xml  |  2 +-
 .../Test/Block/Product/Compare/ListCompare.php       |  2 +-
 .../Test/Block/Adminhtml/Edit/CustomerForm.xml       |  2 +-
 .../Mtf/TestSuite/GithubPublicationTests.php         |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Banners.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Banners.php
index 9816dc1ffae38..fb09460fd7383 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Banners.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Banners.php
@@ -12,15 +12,19 @@
 use Mtf\Block\Block;
 
 /**
- * Banners block
- * Banner block in Banner widget on frontend
+ * Banner block in Banner widget on frontend.
  */
 class Banners extends Block
 {
-    protected $bannerText = '.inner .banner';
+    /**
+     * Banner text css selector.
+     *
+     * @var string
+     */
+    protected $bannerText = '.banner-item';
 
     /**
-     * Return Banner content
+     * Return Banner content.
      *
      * @return array
      */
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Page/CmsIndex.xml b/dev/tests/functional/tests/app/Magento/Banner/Test/Page/CmsIndex.xml
index 1e522740e2e2f..6d69914ddd126 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Page/CmsIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Page/CmsIndex.xml
@@ -11,7 +11,7 @@
     <blocks>
         <bannersBlock>
             <class>Magento\Banner\Test\Block\Banners</class>
-            <locator>.widget.banners</locator>
+            <locator>.widget.block-banners</locator>
             <strategy>css selector</strategy>
         </bannersBlock>
         <widgetView>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
index 7782667468e07..26dee0b124c9d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
@@ -79,7 +79,7 @@ class ListCompare extends Block
      *
      * @var string
      */
-    protected $isEmpty = 'p.empty';
+    protected $isEmpty = 'div.empty:last-child';
 
     /**
      * Selector for message block.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.xml
index 0e125577e7a80..8b9a22fbfd085 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.xml
@@ -30,7 +30,7 @@
     </account_information>
     <addresses>
         <class>\Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses</class>
-        <selector>#customer_info_tabs_addresses</selector>
+        <selector>#tab_customer_address</selector>
         <strategy>css selector</strategy>
     </addresses>
 </tabs>
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/GithubPublicationTests.php b/dev/tests/functional/testsuites/Mtf/TestSuite/GithubPublicationTests.php
index 1df13225a9f9f..14235af242d89 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/GithubPublicationTests.php
+++ b/dev/tests/functional/testsuites/Mtf/TestSuite/GithubPublicationTests.php
@@ -49,7 +49,7 @@ public static function suite()
         $suite->addTestSuite('Magento\Checkout\Test\TestCase\Guest\PaypalExpress\ProductPageTest');
 
         // Creating Grouped product and assign it to the category (MAGETWO-13610)
-        $suite->addTestSuite('Magento\Catalog\Test\TestCase\Product\CreateGroupedTest');
+        $suite->addTestSuite('Magento\GroupedProduct\Test\TestCase\CreateGroupedTest');
 
         // Creating Virtual product with required fields only and assign it to the category (MAGETWO-13593)
         $suite->addTestSuite('Magento\Catalog\Test\TestCase\Product\CreateVirtualTest');

From f4c6b788de84eeb29e940bca17cd7d7f9c3dda9f Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Fri, 28 Nov 2014 19:34:42 +0200
Subject: [PATCH 056/474] MAGETWO-3121: CLONE - Authenticated RSS admin user
 has access to all RSS feeds

---
 .../Plugin/BackendAuthenticationTest.php      | 154 +++++++++---------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php b/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
index ea67a451342c7..6169924937562 100644
--- a/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
@@ -1,77 +1,77 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Rss\App\Action\Plugin;
-
-class BackendAuthenticationTest extends \PHPUnit_Framework_TestCase
-{
-    public function testAroundDispatch()
-    {
-        /** @var \Magento\Backend\App\AbstractAction|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock('Magento\Backend\App\AbstractAction', [], [], '', false);
-
-        /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject $response */
-        $response = $this->getMock('Magento\Framework\App\ResponseInterface', [], [], '', false);
-
-        $proceed = function () use ($response) {
-            return $response;
-        };
-
-        /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject $request */
-        $request = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
-        $request->expects($this->atLeastOnce())->method('getControllerName')->will($this->returnValue('feed'));
-        $request->expects($this->atLeastOnce())->method('getActionName')->will($this->returnValue('index'));
-        $request->expects($this->once())->method('getParam')->with('type')->will($this->returnValue('notifystock'));
-
-        /** @var \Magento\Backend\Model\Auth\StorageInterface|\PHPUnit_Framework_MockObject_MockObject $session */
-        $session = $this->getMock('Magento\Backend\Model\Auth\StorageInterface', [], [], '', false);
-        $session->expects($this->at(0))->method('isLoggedIn')->will($this->returnValue(false));
-        $session->expects($this->at(1))->method('isLoggedIn')->will($this->returnValue(true));
-
-        $username = 'admin';
-        $password = '123123qa';
-        $auth = $this->getMock('Magento\Backend\Model\Auth', [], [], '', false);
-        $auth->expects($this->once())->method('getAuthStorage')->will($this->returnValue($session));
-        $auth->expects($this->once())->method('login')->with($username, $password);
-
-        /** @var \Magento\Framework\HTTP\Authentication|\PHPUnit_Framework_MockObject_MockObject $httpAuthentication */
-        $httpAuthentication = $this->getMock('Magento\Framework\HTTP\Authentication', [], [], '', false);
-        $httpAuthentication->expects($this->once())->method('getCredentials')
-            ->will($this->returnValue([$username, $password]));
-        $httpAuthentication->expects($this->once())->method('setAuthenticationFailed')->with('RSS Feeds');
-
-        $authorization = $this->getMock('Magento\Framework\AuthorizationInterface', [], [], '', false);
-        $authorization->expects($this->at(0))->method('isAllowed')->with('Magento_Rss::rss')
-            ->will($this->returnValue(true));
-        $authorization->expects($this->at(1))->method('isAllowed')->with('Magento_Catalog::catalog_inventory')
-            ->will($this->returnValue(false));
-
-        $aclResources = [
-            'feed' => 'Magento_Rss::rss',
-            'notifystock' => 'Magento_Catalog::catalog_inventory',
-            'new_order' => 'Magento_Sales::actions_view',
-            'review' => 'Magento_Reports::review_product'
-        ];
-
-        /** @var \Magento\Rss\App\Action\Plugin\BackendAuthentication $plugin */
-        $plugin = (new \Magento\TestFramework\Helper\ObjectManager($this))
-            ->getObject(
-                'Magento\Rss\App\Action\Plugin\BackendAuthentication',
-                [
-                    'auth' => $auth,
-                    'httpAuthentication' => $httpAuthentication,
-                    'response' => $response,
-                    'authorization' => $authorization,
-                    'aclResources' => $aclResources
-                ]
-            );
-        $this->assertSame(
-            $response,
-            $plugin->aroundDispatch($subject, $proceed, $request)
-        );
-    }
-}
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Rss\App\Action\Plugin;
+
+class BackendAuthenticationTest extends \PHPUnit_Framework_TestCase
+{
+    public function testAroundDispatch()
+    {
+        /** @var \Magento\Backend\App\AbstractAction|\PHPUnit_Framework_MockObject_MockObject $subject */
+        $subject = $this->getMock('Magento\Backend\App\AbstractAction', [], [], '', false);
+
+        /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject $response */
+        $response = $this->getMock('Magento\Framework\App\ResponseInterface', [], [], '', false);
+
+        $proceed = function () use ($response) {
+            return $response;
+        };
+
+        /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject $request */
+        $request = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
+        $request->expects($this->atLeastOnce())->method('getControllerName')->will($this->returnValue('feed'));
+        $request->expects($this->atLeastOnce())->method('getActionName')->will($this->returnValue('index'));
+        $request->expects($this->once())->method('getParam')->with('type')->will($this->returnValue('notifystock'));
+
+        /** @var \Magento\Backend\Model\Auth\StorageInterface|\PHPUnit_Framework_MockObject_MockObject $session */
+        $session = $this->getMock('Magento\Backend\Model\Auth\StorageInterface', [], [], '', false);
+        $session->expects($this->at(0))->method('isLoggedIn')->will($this->returnValue(false));
+        $session->expects($this->at(1))->method('isLoggedIn')->will($this->returnValue(true));
+
+        $username = 'admin';
+        $password = '123123qa';
+        $auth = $this->getMock('Magento\Backend\Model\Auth', [], [], '', false);
+        $auth->expects($this->once())->method('getAuthStorage')->will($this->returnValue($session));
+        $auth->expects($this->once())->method('login')->with($username, $password);
+
+        /** @var \Magento\Framework\HTTP\Authentication|\PHPUnit_Framework_MockObject_MockObject $httpAuthentication */
+        $httpAuthentication = $this->getMock('Magento\Framework\HTTP\Authentication', [], [], '', false);
+        $httpAuthentication->expects($this->once())->method('getCredentials')
+            ->will($this->returnValue([$username, $password]));
+        $httpAuthentication->expects($this->once())->method('setAuthenticationFailed')->with('RSS Feeds');
+
+        $authorization = $this->getMock('Magento\Framework\AuthorizationInterface', [], [], '', false);
+        $authorization->expects($this->at(0))->method('isAllowed')->with('Magento_Rss::rss')
+            ->will($this->returnValue(true));
+        $authorization->expects($this->at(1))->method('isAllowed')->with('Magento_Catalog::catalog_inventory')
+            ->will($this->returnValue(false));
+
+        $aclResources = [
+            'feed' => 'Magento_Rss::rss',
+            'notifystock' => 'Magento_Catalog::catalog_inventory',
+            'new_order' => 'Magento_Sales::actions_view',
+            'review' => 'Magento_Reports::review_product'
+        ];
+
+        /** @var \Magento\Rss\App\Action\Plugin\BackendAuthentication $plugin */
+        $plugin = (new \Magento\TestFramework\Helper\ObjectManager($this))
+            ->getObject(
+                'Magento\Rss\App\Action\Plugin\BackendAuthentication',
+                [
+                    'auth' => $auth,
+                    'httpAuthentication' => $httpAuthentication,
+                    'response' => $response,
+                    'authorization' => $authorization,
+                    'aclResources' => $aclResources
+                ]
+            );
+        $this->assertSame(
+            $response,
+            $plugin->aroundDispatch($subject, $proceed, $request)
+        );
+    }
+}

From dee9e8dbcc4b946acecc613ba7cc9bf3b92e11b7 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Fri, 28 Nov 2014 20:25:27 -0600
Subject: [PATCH 057/474] MAGETWO-31004: Validation of CLI

- moved validation of parameter value
- implemented checking parameter missing values or unnecessary values
---
 .../src/Controller/ConsoleController.php      | 48 +++++++---
 .../Magento/Setup/src/Model/Validator.php     | 41 ++++++++-
 .../Setup/src/Mvc/ValidatingRouteListener.php | 89 ++++++++-----------
 .../View/Console/ValidationErrorStrategy.php  | 62 -------------
 4 files changed, 112 insertions(+), 128 deletions(-)
 delete mode 100644 setup/module/Magento/Setup/src/Mvc/View/Console/ValidationErrorStrategy.php

diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index 1a44a16860dc2..124e24cdcfe63 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -19,6 +19,7 @@
 use Magento\Setup\Model\AdminAccount;
 use Magento\Framework\App\MaintenanceMode;
 use Magento\Setup\Module\Setup\ConfigMapper;
+use Magento\Setup\Model\Validator;
 
 /**
  * Controller that handles all setup commands via command line interface.
@@ -101,6 +102,13 @@ class ConsoleController extends AbstractActionController
      */
     private $installer;
 
+    /**
+     * Parameter value validator
+     *
+     * @var Validator
+     */
+    private $validator;
+
     /**
      * Gets router configuration to be used in module definition
      *
@@ -229,7 +237,7 @@ private static function getCliConfig()
                 'usage_desc' => 'Set maintenance mode, optionally for specified addresses',
             ],
             self::CMD_HELP => [
-                'route' => self::CMD_HELP . ' (' . implode('|', self::$helpOptions) . '):topic',
+                'route' => self::CMD_HELP . ' (' . implode('|', self::$helpOptions) . '):type',
                 'usage' => '<' . implode('|', self::$helpOptions) . '>',
                 'usage_short' => self::CMD_HELP . ' <topic>',
                 'usage_desc' => 'Help about particular command or topic:',
@@ -255,6 +263,7 @@ public function __construct(
         $this->options = $options;
         $this->installer = $installerFactory->create($consoleLogger);
         $this->maintenanceMode = $maintenanceMode;
+        $this->validator = new Validator();
     }
 
     /**
@@ -287,7 +296,11 @@ public function installAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $this->installer->install($request->getParams());
+        if ($this->validator->validate(self::CMD_INSTALL, $request->getParams()->toArray())) {
+            $this->installer->install($request->getParams());
+        } else {
+            $this->log->log($this->validator->getValidationMessages());
+        }
     }
 
     /**
@@ -300,8 +313,12 @@ public function installDeploymentConfigAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $this->installer->checkInstallationFilePermissions();
-        $this->installer->installDeploymentConfig($request->getParams());
+        if ($this->validator->validate(self::CMD_INSTALL_CONFIG, $request->getParams()->toArray())) {
+            $this->installer->checkInstallationFilePermissions();
+            $this->installer->installDeploymentConfig($request->getParams());
+        } else {
+            $this->log->log($this->validator->getValidationMessages());
+        }
     }
 
     /**
@@ -349,7 +366,11 @@ public function installUserConfigAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $this->installer->installUserConfig($request->getParams());
+        if ($this->validator->validate(self::CMD_INSTALL_USER_CONFIG, $request->getParams()->toArray())) {
+            $this->installer->installUserConfig($request->getParams());
+        } else {
+            $this->log->log($this->validator->getValidationMessages());
+        }
     }
 
     /**
@@ -361,7 +382,11 @@ public function installAdminUserAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $this->installer->installAdminUser($request->getParams());
+        if ($this->validator->validate(self::CMD_INSTALL_ADMIN_USER, $request->getParams()->toArray())) {
+            $this->installer->installAdminUser($request->getParams());
+        } else {
+            $this->log->log($this->validator->getValidationMessages());
+        }
     }
 
     /**
@@ -424,14 +449,11 @@ public function helpAction()
             case UserConfig::KEY_TIMEZONE:
                 return $this->arrayToString($this->options->getTimezoneList());
             default:
-                if (isset($details[$type])) {
-                    if ($details[$type]['usage']) {
-                        $formatted = $this->formatCliUsage($details[$type]['usage']);
-                        return "\nAvailable parameters:\n{$formatted}\n";
-                    }
-                    return "\nThis command has no parameters.\n";
+                if ($details[$type]['usage']) {
+                    $formatted = $this->formatCliUsage($details[$type]['usage']);
+                    return "\nAvailable parameters:\n{$formatted}\n";
                 }
-                throw new \InvalidArgumentException("Unknown type: {$type}");
+                return "\nThis command has no parameters.\n";
         }
     }
 
diff --git a/setup/module/Magento/Setup/src/Model/Validator.php b/setup/module/Magento/Setup/src/Model/Validator.php
index 2e7cb648b8aed..8730b4a2e369e 100644
--- a/setup/module/Magento/Setup/src/Model/Validator.php
+++ b/setup/module/Magento/Setup/src/Model/Validator.php
@@ -61,6 +61,45 @@ public static function checkExtraParameter($expectedParams, $actualParams)
         return $extraParams;
     }
 
+    /**
+     * Checks for parameters that are missing values
+     *
+     * @param $expectedParams
+     * @param $actualParams
+     * @return array
+     */
+    public static function checkMissingValue($expectedParams, $actualParams)
+    {
+        $missingValues = [];
+        foreach ($actualParams as $param => $value) {
+            if (isset($expectedParams[$param])) {
+                if ($value === '' && $expectedParams[$param]['hasValue']) {
+                    $missingValues[] = $param;
+                }
+            }
+        }
+        return $missingValues;
+    }
+
+    /**
+     * Checks for parameters that do not need values
+     *
+     * @param $expectedParams
+     * @param $actualParams
+     * @return array
+     */
+    public static function checkExtraValue($expectedParams, $actualParams)
+    {
+        $extraValues = [];
+        foreach ($actualParams as $param => $value) {
+            if (isset($expectedParams[$param])) {
+                if ($value !== '' && !$expectedParams[$param]['hasValue']) {
+                    $extraValues[] = $param;
+                }
+            }
+        }
+        return $extraValues;
+    }
     /**
      * Validate parameters according to action
      *
@@ -91,7 +130,7 @@ public function validate($action, array $data)
      * @param array $data
      * @return bool
      */
-    public function validateInstall(array $data)
+    private function validateInstall(array $data)
     {
         $deploymentValid = $this->validateDeploymentConfig($data);
         $adminValid = $this->validateAdmin($data);
diff --git a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php b/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
index 201dd33c3289e..1611ed43e9615 100644
--- a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
+++ b/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
@@ -9,9 +9,10 @@
 namespace Magento\Setup\Mvc;
 
 use Magento\Setup\Model\Validator;
-use Magento\Setup\Mvc\View\Console\ValidationErrorStrategy;
+use Zend\View\Model\ConsoleModel;
 use Zend\Mvc\Router\RouteMatch;
 use Zend\Mvc\MvcEvent;
+use Zend\Console\ColorInterface;
 
 class ValidatingRouteListener extends \Zend\Mvc\RouteListener
 {
@@ -33,11 +34,10 @@ public function onRoute($e)
         // CLI routing miss, checks for missing/extra parameters
         if (!$match instanceof RouteMatch) {
             $validationMessages .= $this->checkForMissingAndExtraParams($e);
+            $this->displayMessage($e, $validationMessages);
+            // set error to stop propagation
+            $e->setError('default_error');
         }
-
-        // Check parameter values
-        $validationMessages .= $this->checkParameters($e);
-        $this->displayMessage($e, $validationMessages);
         return null;
     }
 
@@ -70,70 +70,55 @@ private function checkForMissingAndExtraParams(MvcEvent $e)
             // parse user parameters
             $userParams = $this->parseUserParams($content);
 
-            $missing = Validator::checkMissingParameter($expectedParams, $userParams);
-            $extra = Validator::checkExtraParameter($expectedParams, $userParams);
-            if (!empty($missing)) {
-                $validationMessages .= 'Missing parameters:' . PHP_EOL;
-                foreach ($missing as $missingParam) {
+            $missingParams = Validator::checkMissingParameter($expectedParams, $userParams);
+            $extraParams = Validator::checkExtraParameter($expectedParams, $userParams);
+            $missingValues = Validator::checkMissingValue($expectedParams, $userParams);
+            $extraValues = Validator::checkExtraValue($expectedParams, $userParams);
+
+            if (!empty($missingParams)) {
+                $validationMessages .= PHP_EOL . 'Missing parameters:' . PHP_EOL;
+                foreach ($missingParams as $missingParam) {
                     $validationMessages .= $missingParam . PHP_EOL;
                 }
             }
-            if (!empty($extra)) {
-                $validationMessages .= 'Unidentified parameters:' . PHP_EOL;
-                foreach ($extra as $extraParam) {
+            if (!empty($extraParams)) {
+                $validationMessages .= PHP_EOL . 'Unidentified parameters:' . PHP_EOL;
+                foreach ($extraParams as $extraParam) {
                     $validationMessages .= $extraParam . PHP_EOL;
                 }
             }
-            if (empty($missing) && empty($extra)) {
-                $validationMessages .= 'Please make sure parameters starts with --.' . PHP_EOL .
-                    'Note that some parameters require a value while some do not.' . PHP_EOL;
+            if (!empty($missingValues)) {
+                $validationMessages .= PHP_EOL . 'Parameters missing value:' . PHP_EOL;
+                foreach ($missingValues as $missingValue) {
+                    $validationMessages .= $missingValue . PHP_EOL;
+                }
+            }
+            if (!empty($extraValues)) {
+                $validationMessages .= PHP_EOL . 'Parameters that don\'t need value:' . PHP_EOL;
+                foreach ($extraValues as $extraValue) {
+                    $validationMessages .= $extraValue . PHP_EOL;
+                }
+            }
+            if (empty($missingParams) && empty($extraParams) && empty($missingValues) && empty($extraValue)) {
+                $validationMessages .= 'Please make sure parameters starts with --.' . PHP_EOL;
             }
 
         } else if (!is_null($userAction)) {
             $validationMessages .= "Unknown action name '{$userAction}'." . PHP_EOL;
         }
 
-        // set error to stop propagation
-        $e->setError('default_error');
-        return $validationMessages;
-    }
-
-    /**
-     * Check parameter values
-     *
-     * @param MvcEvent $e
-     * @return string
-     */
-    private function checkParameters(MvcEvent $e)
-    {
-        $request = $e->getRequest();
-        $content = $request->getContent();
-        $serviceManager = $e->getApplication()->getServiceManager();
-        $routes = $serviceManager->get('Config')['console']['router']['routes'];
-
-        $userAction = $content[0];
-        array_shift($content);
-
-        $validationMessages = '';
-
-        if (isset($routes[$userAction])) {
-            $validator = new Validator();
-            $userParam = $this->parseUserParams($content);
-            if (!$validator->validate($userAction, $userParam)) {
-                $validationMessages .= 'Invalid parameter values:' . PHP_EOL . $validator->getValidationMessages();
-                // set error to stop propagation
-                $e->setError('Validation_error');
-            }
-        }
-
         return $validationMessages;
     }
 
     private function displayMessage(MvcEvent $e, $validationMessages)
     {
-        $validationErrorStrategy = new ValidationErrorStrategy();
-        $validationErrorStrategy->setErrorMessage($validationMessages);
-        $validationErrorStrategy->handleNotFoundError($e);
+        $serviceManager = $e->getApplication()->getServiceManager();
+        $console = $serviceManager->get('console');
+        $validationMessages = $console->colorize($validationMessages, ColorInterface::RED);
+        $model = new ConsoleModel();
+        $model->setErrorLevel(1);
+        $model->setResult($validationMessages);
+        $e->setResult($model);
     }
 
     /**
diff --git a/setup/module/Magento/Setup/src/Mvc/View/Console/ValidationErrorStrategy.php b/setup/module/Magento/Setup/src/Mvc/View/Console/ValidationErrorStrategy.php
deleted file mode 100644
index bf4939650d75f..0000000000000
--- a/setup/module/Magento/Setup/src/Mvc/View/Console/ValidationErrorStrategy.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license   {license_link}
- */
-
-namespace Magento\Setup\Mvc\View\Console;
-
-use Zend\Mvc\MvcEvent;
-use Zend\View\Model\ConsoleModel;
-use Zend\Console\ColorInterface;
-
-class ValidationErrorStrategy extends \Zend\Mvc\View\Console\RouteNotFoundStrategy
-{
-    /**
-     * Error message
-     *
-     * @var string
-     */
-    private $errorMessage = '';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handleNotFoundError(MvcEvent $e)
-    {
-        $request = $e->getRequest();
-        $serviceManager = $e->getApplication()->getServiceManager();
-        $moduleManager = $serviceManager->get('ModuleManager');
-        $console = $serviceManager->get('console');
-        $scriptName = basename($request->getScriptName());
-
-        $banner = $this->getConsoleBanner($console, $moduleManager);
-
-        $usage = $this->getConsoleUsage($console, $scriptName, $moduleManager);
-
-        $result  = $banner ? rtrim($banner, "\r\n")        : '';
-        $result .= $usage  ? "\n\n" . trim($usage, "\r\n") : '';
-        $result .= "\n";
-
-        $this->errorMessage = $console->colorize($this->errorMessage, ColorInterface::RED);
-        $result .= $this->errorMessage . "\n";
-
-        $model = new ConsoleModel();
-        $model->setErrorLevel(1);
-        $model->setResult($result);
-
-        $e->setResult($model);
-    }
-
-    /**
-     * Set error message
-     *
-     * @param string $message
-     */
-    public function setErrorMessage($message)
-    {
-        $this->errorMessage = $message;
-    }
-}

From 1571b6d80e58276e5e3ab893e1abe2617b4677f3 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Sun, 30 Nov 2014 00:14:05 -0600
Subject: [PATCH 058/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Fixed an error when providing a wrong hostname doesn't allow it to go
  next.
---
 .../view/magento/setup/add-database.phtml     | 15 ++++++++-----
 setup/pub/magento/setup/add-database.js       | 22 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
index a762266263ce4..17046f46e6ed6 100644
--- a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
@@ -159,17 +159,22 @@
         </div>
     </div>
 
-    <div class="form-group" ng-show="testConnection.result.success === false && database.submitted" >
+    <div class="form-group" ng-show="database.submitted" >
         <div class="col-sm-4">
             <input type="hidden"
                    name="dbConnection"
                    ng-model="db.connection"
-                   ng-if="!testConnection.result.success"
-                   required />
+                   ng-required="!testConnection.result.success" />
         </div>
         <div  class="col-sm-4">
-            <div class="error-container">
-                <span class="glyphicon glyphicon-remove-sign">{{testConnection.result.error}}</span>
+            <div ng-show="testConnection.result === undefined" class="animate-show text-success">
+                <span class="glyphicon text-success">&nbsp;Testing database connection......</span>
+            </div>
+            <div ng-show="testConnection.result.success === false && testConnection.result !== undefined" class="error-container animate-show text-danger">
+                <span class="glyphicon glyphicon-remove-sign">&nbsp;{{testConnection.result.error}}</span>
+            </div>
+            <div ng-show="testConnection.result.success === undefined && testConnection.result !== undefined" class="error-container animate-show text-danger">
+                <span class="glyphicon glyphicon-remove-sign">&nbsp;Unknown Database Server Host.</span>
             </div>
         </div>
     </div>
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 2cf2f27bc615a..362e7a0c733a4 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -50,4 +50,24 @@ angular.module('add-database', ['ngStorage'])
                 $scope.database.submitted = false;
             }
         });
-    }]);
+    }])
+    .directive('testHostname', function() {
+        return{
+            require: "ngModel",
+            link: function(scope, elm, attrs, ctrl){
+                var validator = function(value){
+                    scope.testConnection();
+                    var isValid;
+                    if (scope.testConnection.result.success === undefined) {
+                        isValid = false;
+                    } else {
+                        isValid = true;
+                    }
+                    ctrl.$setValidity('testHostname', isValid);
+                    return value;
+                };
+                ctrl.$parsers.unshift(validator);
+                ctrl.$formatters.unshift(validator);
+            }
+        };
+    });

From 112dae6c4a294825999b1b96538919355236e851 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Mon, 1 Dec 2014 14:53:22 +0200
Subject: [PATCH 059/474] MAGETWO-3121: CLONE - Authenticated RSS admin user
 has access to all RSS feeds

---
 .../Magento/Rss/App/Action/Plugin/BackendAuthentication.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
index 4af47f86acd5b..6ffd9c418a88b 100644
--- a/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
+++ b/app/code/Magento/Rss/App/Action/Plugin/BackendAuthentication.php
@@ -76,6 +76,8 @@ public function __construct(
      * @param RequestInterface $request
      * @return ResponseInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function aroundDispatch(AbstractAction $subject, \Closure $proceed, RequestInterface $request)
     {

From a595894c4369b7f7c20148756fbd88955ea620a0 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Mon, 1 Dec 2014 10:02:33 -0600
Subject: [PATCH 060/474] MAGETWO-31004: Validation of CLI

- fixing build scripts which use http for base_url_secure
---
 dev/build/core_dev/api-functional/build.xml | 3 ++-
 dev/build/core_dev/functional/build.xml     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/build/core_dev/api-functional/build.xml b/dev/build/core_dev/api-functional/build.xml
index 608745aafe8b6..67119dd0f728f 100644
--- a/dev/build/core_dev/api-functional/build.xml
+++ b/dev/build/core_dev/api-functional/build.xml
@@ -14,6 +14,7 @@
     <property name="product_root_dir" location="${env.deploy_directory}/${env.build.key}/build-${env.build.number}"/>
     <property name="product_edition_code" value="${env.magento_edition}"/>
     <property name="magento_instance_base_url" value="${env.http_host}${env.build.key}/build-${env.build.number}"/>
+    <property name="magento_instance_base_url_secure" value="${env.https_host}${env.build.key}/build-${env.build.number}"/>
 
     <target name="run" depends="_server_info" description="Test Magento Web API.">
         <antcall target="_deploy_magento"/>
@@ -78,7 +79,7 @@
             <replacefilter token="{{db_user}}" value="${env.db_user}"/>
             <replacefilter token="{{db_password}}" value="${env.db_password}"/>
             <replacefilter token="{{url}}" value="${magento_instance_base_url}"/>
-            <replacefilter token="{{secure_url}}" value="${magento_instance_base_url}"/>
+            <replacefilter token="{{secure_url}}" value="${magento_instance_base_url_secure}"/>
         </replace>
 
         <!--Prepare phpunit.xml-->
diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index 9cc592234cd10..389ea9a8a51ca 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -188,7 +188,7 @@
             <replacefilter token="{{db_user}}" value="${env.db_user}"/>
             <replacefilter token="{{db_password}}" value="${env.db_password}"/>
             <replacefilter token="{{url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}"/>
-            <replacefilter token="{{secure_url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}"/>
+            <replacefilter token="{{secure_url}}" value="${env.https_host}${env.build.key}/instance-${instanceIndex}"/>
         </replace>
 
         <condition property="env.bamboo_tests_configuration" value="basic">

From a16605dfc971b44061d053a7b5df1f5c46e496a0 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Mon, 1 Dec 2014 10:53:07 -0600
Subject: [PATCH 061/474] MAGETWO-31004: Validation of CLI

- fixed default route not showing banner and usage
- minor change to validator
---
 .../Magento/Setup/src/Model/Validator.php     |  8 ++--
 .../Setup/src/Mvc/ValidatingRouteListener.php | 39 ++++++++++++-------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/Validator.php b/setup/module/Magento/Setup/src/Model/Validator.php
index 8730b4a2e369e..d4440697e2b83 100644
--- a/setup/module/Magento/Setup/src/Model/Validator.php
+++ b/setup/module/Magento/Setup/src/Model/Validator.php
@@ -36,7 +36,7 @@ public function getValidationMessages()
      * @param array $actualParams
      * @return array
      */
-    public static function checkMissingParameter($expectedParams, $actualParams)
+    public function checkMissingParameter($expectedParams, $actualParams)
     {
         $missingParams = array_diff(array_keys($expectedParams), array_keys($actualParams));
         foreach ($missingParams as $key => $missingParam) {
@@ -55,7 +55,7 @@ public static function checkMissingParameter($expectedParams, $actualParams)
      * @param array $actualParams
      * @return array
      */
-    public static function checkExtraParameter($expectedParams, $actualParams)
+    public function checkExtraParameter($expectedParams, $actualParams)
     {
         $extraParams = array_diff(array_keys($actualParams), array_keys($expectedParams));
         return $extraParams;
@@ -68,7 +68,7 @@ public static function checkExtraParameter($expectedParams, $actualParams)
      * @param $actualParams
      * @return array
      */
-    public static function checkMissingValue($expectedParams, $actualParams)
+    public function checkMissingValue($expectedParams, $actualParams)
     {
         $missingValues = [];
         foreach ($actualParams as $param => $value) {
@@ -88,7 +88,7 @@ public static function checkMissingValue($expectedParams, $actualParams)
      * @param $actualParams
      * @return array
      */
-    public static function checkExtraValue($expectedParams, $actualParams)
+    public function checkExtraValue($expectedParams, $actualParams)
     {
         $extraValues = [];
         foreach ($actualParams as $param => $value) {
diff --git a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php b/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
index 1611ed43e9615..d0d579954ea89 100644
--- a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
+++ b/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
@@ -33,21 +33,23 @@ public function onRoute($e)
         $validationMessages = '';
         // CLI routing miss, checks for missing/extra parameters
         if (!$match instanceof RouteMatch) {
-            $validationMessages .= $this->checkForMissingAndExtraParams($e);
-            $this->displayMessage($e, $validationMessages);
-            // set error to stop propagation
-            $e->setError('default_error');
+            $validationMessages .= $this->checkParams($e);
+            if ('' !== $validationMessages) {
+                $this->displayMessage($e, $validationMessages);
+                // set error to stop propagation
+                $e->setError('default_error');
+            }
         }
         return null;
     }
 
     /**
-     * Checks for missing and extra parameters
+     * Checks parameters
      *
      * @param MvcEvent $e
      * @return string
      */
-    private function checkForMissingAndExtraParams(MvcEvent $e)
+    private function checkParams(MvcEvent $e)
     {
         $request = $e->getRequest();
         $content = $request->getContent();
@@ -70,41 +72,48 @@ private function checkForMissingAndExtraParams(MvcEvent $e)
             // parse user parameters
             $userParams = $this->parseUserParams($content);
 
-            $missingParams = Validator::checkMissingParameter($expectedParams, $userParams);
-            $extraParams = Validator::checkExtraParameter($expectedParams, $userParams);
-            $missingValues = Validator::checkMissingValue($expectedParams, $userParams);
-            $extraValues = Validator::checkExtraValue($expectedParams, $userParams);
+            $validator = new Validator();
+            $missingParams = $validator->checkMissingParameter($expectedParams, $userParams);
+            $extraParams = $validator->checkExtraParameter($expectedParams, $userParams);
+            $missingValues = $validator->checkMissingValue($expectedParams, $userParams);
+            $extraValues = $validator->checkExtraValue($expectedParams, $userParams);
 
             if (!empty($missingParams)) {
-                $validationMessages .= PHP_EOL . 'Missing parameters:' . PHP_EOL;
+                $validationMessages .= 'Missing parameters:' . PHP_EOL;
                 foreach ($missingParams as $missingParam) {
                     $validationMessages .= $missingParam . PHP_EOL;
                 }
+                $validationMessages .= PHP_EOL;
             }
             if (!empty($extraParams)) {
-                $validationMessages .= PHP_EOL . 'Unidentified parameters:' . PHP_EOL;
+                $validationMessages .= 'Unidentified parameters:' . PHP_EOL;
                 foreach ($extraParams as $extraParam) {
                     $validationMessages .= $extraParam . PHP_EOL;
                 }
+                $validationMessages .= PHP_EOL;
             }
             if (!empty($missingValues)) {
-                $validationMessages .= PHP_EOL . 'Parameters missing value:' . PHP_EOL;
+                $validationMessages .= 'Parameters missing value:' . PHP_EOL;
                 foreach ($missingValues as $missingValue) {
                     $validationMessages .= $missingValue . PHP_EOL;
                 }
+                $validationMessages .= PHP_EOL;
             }
             if (!empty($extraValues)) {
-                $validationMessages .= PHP_EOL . 'Parameters that don\'t need value:' . PHP_EOL;
+                $validationMessages .= 'Parameters that don\'t need value:' . PHP_EOL;
                 foreach ($extraValues as $extraValue) {
                     $validationMessages .= $extraValue . PHP_EOL;
                 }
+                $validationMessages .= PHP_EOL;
             }
             if (empty($missingParams) && empty($extraParams) && empty($missingValues) && empty($extraValue)) {
-                $validationMessages .= 'Please make sure parameters starts with --.' . PHP_EOL;
+                $validationMessages .= 'Please make sure parameters start with --.' . PHP_EOL;
+                $validationMessages .= PHP_EOL;
             }
 
         } else if (!is_null($userAction)) {
             $validationMessages .= "Unknown action name '{$userAction}'." . PHP_EOL;
+            $validationMessages .= PHP_EOL;
         }
 
         return $validationMessages;

From 1287e9f0c66449ac479f9fdd4a0d6948692d098f Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Mon, 1 Dec 2014 11:04:25 -0600
Subject: [PATCH 062/474] MAGETWO-31004: Validation of CLI

- changes to build script
---
 dev/build/core_dev/functional/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index 389ea9a8a51ca..e015588de495e 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -317,7 +317,7 @@
             <arg value="-h${env.db_host}"/>
             <arg value="-D${env.db_name_prefix}${instanceIndex}"/>
             <arg value="-e"/>
-            <arg value="UPDATE core_config_data SET value='${env.http_host}${env.build.key}/instance-${instanceIndex}/' WHERE path='web/secure/base_url';
+            <arg value="UPDATE core_config_data SET value='${env.https_host}${env.build.key}/instance-${instanceIndex}/' WHERE path='web/secure/base_url';
                 UPDATE core_config_data SET value='${env.http_host}${env.build.key}/instance-${instanceIndex}/' WHERE path='web/unsecure/base_url';"/>
         </exec>
     </target>

From db4b38d5b05762ab0d273511bae708631e56eb50 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Mon, 1 Dec 2014 11:30:19 -0600
Subject: [PATCH 063/474] MAGETWO-30953: Add URL format validation

- Removed some duplication.
---
 .../magento/setup/web-configuration.phtml     |  8 ++---
 setup/pub/magento/setup/web-configuration.js  | 30 +------------------
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index ffaf4af641795..039a62ee26013 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -44,11 +44,11 @@ $hints = [
                    tooltip-trigger="focus"
                    tooltip-append-to-body="true"
                    required
-                   validate-httpurl />
+                   ng-pattern="/^(http):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/" />
         </div>
         <div class="col-md-offset-3 col-md-4" ng-show="webconfig.web.$invalid && webconfig.submitted">
             <div class="error-container">
-                <span ng-show="webconfig.web.$error.required || webconfig.web.$error.validateHttpurl">Please enter a valid base URL path. (ex: http://www.example.com/)</span>
+                <span ng-show="webconfig.web.$error.required || webconfig.web.$error.pattern">Please enter a valid base URL path. (ex: http://www.example.com/)</span>
             </div>
         </div>
     </div>
@@ -102,11 +102,11 @@ $hints = [
                        class="form-control"
                        ng-focus=""
                        required
-                       validate-httpsurl />
+                       ng-pattern="/^(https):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/" />
             </div>
             <div class="col-md-offset-3 col-md-4" ng-show="webconfig.https.$invalid && webconfig.submitted">
                 <div class="error-container">
-                    <span ng-show="webconfig.https.$error.required || webconfig.https.$error.validateHttpsurl">Please enter a valid HTTPS base URL path. (ex: https://www.example.com/)</span>
+                    <span ng-show="webconfig.https.$error.required || webconfig.https.$error.pattern">Please enter a valid HTTPS base URL path. (ex: https://www.example.com/)</span>
                 </div>
             </div>
         </div>
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index f369a210f5410..a77f79504cb00 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -92,32 +92,4 @@ angular.module('web-configuration', ['ngStorage'])
                 $scope.webconfig.submitted = false;
             }
         });
-    }])
-    .directive('validateHttpurl', function() {
-        return{
-            require: "ngModel",
-            link: function(scope, elm, attrs, ctrl){
-                var validator = function(value){
-                    var isValid  = value.match(/^(http):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/);
-                    ctrl.$setValidity('validateHttpurl', isValid);
-                    return value;
-                };
-                ctrl.$parsers.unshift(validator);
-                ctrl.$formatters.unshift(validator);
-            }
-        };
-    })
-    .directive('validateHttpsurl', function() {
-        return{
-            require: "ngModel",
-            link: function(scope, elm, attrs, ctrl){
-                var validator = function(value){
-                    var isValid  = angular.isUndefined(value) || (value === "") || value.match(/^(https):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/);
-                    ctrl.$setValidity('validateHttpsurl', isValid);
-                    return value;
-                };
-                ctrl.$parsers.unshift(validator);
-                ctrl.$formatters.unshift(validator);
-            }
-        };
-    });
\ No newline at end of file
+    }]);
\ No newline at end of file

From 8b2e05b5d25541e53a787de0aa70d267df8e39fa Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Mon, 1 Dec 2014 11:39:48 -0600
Subject: [PATCH 064/474] MAGETWO-30834: Admin user password validation doesn't
 work for characters number

- Change based on CR comment.
---
 setup/pub/magento/setup/create-admin-account.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/pub/magento/setup/create-admin-account.js b/setup/pub/magento/setup/create-admin-account.js
index a196e7dfc2b72..fbbea2f45b8b9 100644
--- a/setup/pub/magento/setup/create-admin-account.js
+++ b/setup/pub/magento/setup/create-admin-account.js
@@ -73,7 +73,7 @@ angular.module('create-admin-account', ['ngStorage'])
             require: "ngModel",
             link: function(scope, elm, attrs, ctrl){
                 var validator = function(value){
-                    var isValid = !(!((value.length > 6) && (value.match(/[\d]+/) && value.match(/[a-zA-Z]+/))));
+                    var isValid = (value.length > 6) && (value.match(/[\d]+/) && value.match(/[a-zA-Z]+/));
                     ctrl.$setValidity('checkPassword', isValid);
                     return value;
                 };

From c4f12fff86a52217cb795010295d3f48463ee19b Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Mon, 1 Dec 2014 12:22:17 -0600
Subject: [PATCH 065/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- tests
---
 .../Test/Legacy/_files/obsolete_constants.php |  15 ++
 .../Magento/Framework/App/HttpTest.php        |  67 +++++++--
 .../Framework/App/Request/HttpTest.php        |  26 +++-
 .../Magento/Framework/App/SetupInfoTest.php   | 132 ++++++++++++++++++
 .../Magento/Framework/App/SetupInfo.php       |  15 +-
 5 files changed, 231 insertions(+), 24 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index 646bc43563b08..38978153c734d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -699,4 +699,19 @@
         'Magento\Framework\Module\Declaration\Reader\Filesystem',
         'Magento\Framework\App\ObjectManagerFactory::INIT_PARAM_DEPLOYMENT_CONFIG'
     ],
+    [
+        'NOT_INSTALLED_URL_PATH_PARAM',
+        'Magento\Framework\App\Http',
+        'Magento\Framework\App\SetupInfo::PARAM_NOT_INSTALLED_URL_PATH'
+    ],
+    [
+        'NOT_INSTALLED_URL_PARAM',
+        'Magento\Framework\App\Http',
+        'Magento\Framework\App\SetupInfo::PARAM_NOT_INSTALLED_URL'
+    ],
+    [
+        'NOT_INSTALLED_URL_PATH',
+        'Magento\Framework\App\Http',
+        'Magento\Framework\App\SetupInfo::DEFAULT_PATH'
+    ],
 );
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php
index d0a772fc2baca..d6f8766d11e4a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php
@@ -8,6 +8,8 @@
 
 namespace Magento\Framework\App;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+
 class HttpTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -55,6 +57,11 @@ class HttpTest extends \PHPUnit_Framework_TestCase
      */
     protected $configLoaderMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filesystemMock;
+
     public function setUp()
     {
         $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
@@ -71,10 +78,7 @@ public function setUp()
             ->setMethods(['load'])
             ->getMock();
         $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
-        $this->responseMock = $this->getMockBuilder('Magento\Framework\App\Response\Http')
-            ->disableOriginalConstructor()
-            ->setMethods(['setBody', '__wakeup', 'sendHeaders', 'sendResponse', 'setRedirect'])
-            ->getMock();
+        $this->responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
         $this->frontControllerMock = $this->getMockBuilder('Magento\Framework\App\FrontControllerInterface')
             ->disableOriginalConstructor()
             ->setMethods(['dispatch'])
@@ -83,6 +87,7 @@ public function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['dispatch'])
             ->getMock();
+        $this->filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
 
         $this->http = $this->objectManager->getObject(
             'Magento\Framework\App\Http',
@@ -93,7 +98,7 @@ public function setUp()
                 'request' => $this->requestMock,
                 'response' => $this->responseMock,
                 'configLoader' => $this->configLoaderMock,
-                'filesystem' => $this->getMock('Magento\Framework\Filesystem', [], [], '', false),
+                'filesystem' => $this->filesystemMock,
             ]
         );
     }
@@ -151,16 +156,48 @@ function () {
         $this->http->launch();
     }
 
-    public function testNotInstalledException()
+    public function testHandleDeveloperModeNotInstalled()
+    {
+        $dir = $this->getMockForAbstractClass('Magento\Framework\Filesystem\Directory\ReadInterface');
+        $dir->expects($this->once())->method('getAbsolutePath')->willReturn(__DIR__);
+        $this->filesystemMock->expects($this->once())
+            ->method('getDirectoryRead')
+            ->with(DirectoryList::ROOT)
+            ->willReturn($dir);
+        $this->responseMock->expects($this->once())->method('setRedirect')->with('/_files/');
+        $this->responseMock->expects($this->once())->method('sendHeaders');
+        $bootstrap = $this->getBootstrapNotInstalled();
+        $bootstrap->expects($this->once())->method('getParams')->willReturn([
+            'SCRIPT_NAME' => '/index.php',
+            'DOCUMENT_ROOT' => __DIR__,
+            SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files',
+        ]);
+        $this->assertTrue($this->http->catchException($bootstrap, new \Exception('Test Message')));
+    }
+
+    public function testHandleDeveloperMode()
+    {
+        $this->filesystemMock->expects($this->once())
+            ->method('getDirectoryRead')
+            ->will($this->throwException(new \Exception('strange error')));
+        $this->responseMock->expects($this->once())->method('setHttpResponseCode')->with(500);
+        $this->responseMock->expects($this->once())->method('setHeader')->with('Content-Type', 'text/plain');
+        $constraint = new \PHPUnit_Framework_Constraint_StringStartsWith('strange error');
+        $this->responseMock->expects($this->once())->method('setBody')->with($constraint);
+        $this->responseMock->expects($this->once())->method('sendResponse');
+        $this->assertTrue($this->http->catchException($this->getBootstrapNotInstalled(), new \Exception('Test')));
+    }
+
+    /**
+     * Prepares a mock of bootstrap in "not installed" state
+     *
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getBootstrapNotInstalled()
     {
-        $expectedException = new \Exception('Test Message');
-        $bootstrapMock = $this->getMock('Magento\Framework\App\Bootstrap', [], [], '', false);
-        $bootstrapMock->expects($this->once())->method('isDeveloperMode')->willReturn(true);
-        $bootstrapMock->expects($this->once())->method('getErrorCode')->willReturn(Bootstrap::ERR_IS_INSTALLED);
-
-        $path = $this->http->getInstallerRedirectPath([]);
-        $this->responseMock->expects($this->once())->method('setRedirect')->with($path)->will($this->returnSelf());
-        $this->responseMock->expects($this->once())->method('sendHeaders')->will($this->returnSelf());
-        $this->assertTrue($this->http->catchException($bootstrapMock, $expectedException));
+        $bootstrap = $this->getMock('Magento\Framework\App\Bootstrap', [], [], '', false);
+        $bootstrap->expects($this->once())->method('isDeveloperMode')->willReturn(true);
+        $bootstrap->expects($this->once())->method('getErrorCode')->willReturn(Bootstrap::ERR_IS_INSTALLED);
+        return $bootstrap;
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Request/HttpTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Request/HttpTest.php
index 21334dd79a00f..05a8a473359f0 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Request/HttpTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Request/HttpTest.php
@@ -8,8 +8,6 @@
  */
 namespace Magento\Framework\App\Request;
 
-use Magento\Framework\App\Request\Http as Request;
-
 class HttpTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -408,6 +406,30 @@ public function testGetDistroBaseUrl($serverVariables, $expectedResult)
         $_SERVER = $originalServerValue;
     }
 
+    /**
+     * @param string $scriptName
+     * @param string $expected
+     * @dataProvider getDistroBaseUrlPathDataProvider
+     */
+    public function testGetDistroBaseUrlPath($scriptName, $expected)
+    {
+        $this->assertEquals($expected, Http::getDistroBaseUrlPath(['SCRIPT_NAME' => $scriptName]));
+    }
+
+    public function getDistroBaseUrlPathDataProvider()
+    {
+        return [
+            [null, '/'],
+            ['./index.php', '/'],
+            ['.\\index.php', '/'],
+            ['/index.php', '/'],
+            ['\\index.php', '/'],
+            ['subdir/script.php', 'subdir/'],
+            ['subdir\\script.php', 'subdir/'],
+            ['sub\\dir\\script.php', 'sub/dir/'],
+        ];
+    }
+
     public function testGetCookieDefault()
     {
         $key = "cookieName";
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php
new file mode 100644
index 0000000000000..1cd98b6639c5f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+namespace Magento\Framework\App;
+
+
+class SetupInfoTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @param array $server
+     * @param string $expected
+     * @dataProvider getUrlDataProvider
+     */
+    public function testGetUrl($server, $expected)
+    {
+        $info = new SetupInfo($server);
+        $this->assertEquals($expected, $info->getUrl());
+    }
+
+    /**
+     * @return array
+     */
+    public function getUrlDataProvider()
+    {
+        return [
+            [
+                [],
+                '/setup/'
+            ],
+            [
+                [SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => 'install'],
+                '/install/',
+            ],
+            [
+                [SetupInfo::PARAM_NOT_INSTALLED_URL => 'http://example.com/'],
+                'http://example.com/',
+            ],
+        ];
+    }
+
+    /**
+     * @param array $server
+     * @param string $projectRoot
+     * @param string $expected
+     * @dataProvider getDirDataProvider
+     */
+    public function testGetDir($server, $projectRoot, $expected)
+    {
+        $info = new SetupInfo($server);
+        $this->assertEquals($expected, $info->getDir($projectRoot));
+    }
+
+    /**
+     * @return array
+     */
+    public function getDirDataProvider()
+    {
+        return [
+            [
+                [],
+                '/test/root',
+                '/test/root/setup',
+            ],
+            [
+                [],
+                '/test/root/',
+                '/test/root/setup',
+            ],
+            [
+                [SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '/install/'],
+                '/test/',
+                '/test/install',
+            ],
+        ];
+    }
+
+    /**
+     * @param array $server
+     * @param string $projectRoot
+     * @param bool $expected
+     * @dataProvider isAvailableDataProvider
+     */
+    public function testIsAvailable($server, $projectRoot, $expected)
+    {
+        $info = new SetupInfo($server);
+        $this->assertEquals($expected, $info->isAvailable($projectRoot));
+    }
+
+    /**
+     * @return array
+     */
+    public function isAvailableDataProvider()
+    {
+        return [
+            'no doc root defined' => [
+                [],
+                'anything',
+                false
+            ],
+            'root = doc root, but no "setup" sub-directory' => [
+                ['DOCUMENT_ROOT' => __DIR__], // it will look for "setup/" sub-directory, but won't find anything
+                __DIR__,
+                false
+            ],
+            'root = doc root, nonexistent sub-directory' => [
+                ['DOCUMENT_ROOT' => __DIR__, SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => 'nonexistent'],
+                __DIR__,
+                false
+            ],
+            'root = doc root, existent sub-directory' => [
+                ['DOCUMENT_ROOT' => __DIR__, SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files'],
+                __DIR__,
+                true
+            ],
+            'root within doc root, existent sub-directory' => [
+                ['DOCUMENT_ROOT' => dirname(__DIR__), SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files'],
+                __DIR__,
+                true
+            ],
+            'root outside of doc root, existent sub-directory' => [
+                ['DOCUMENT_ROOT' => __DIR__, SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files'],
+                dirname(__DIR__),
+                false
+            ],
+        ];
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php
index 192bbb7d79b22..4ee0f87f40ee2 100644
--- a/lib/internal/Magento/Framework/App/SetupInfo.php
+++ b/lib/internal/Magento/Framework/App/SetupInfo.php
@@ -16,8 +16,8 @@ class SetupInfo
     /**#@+
      * Initialization parameters for redirecting if the application is not installed
      */
-    const NOT_INSTALLED_URL_PATH_PARAM = 'MAGE_NOT_INSTALLED_URL_PATH';
-    const NOT_INSTALLED_URL_PARAM = 'MAGE_NOT_INSTALLED_URL';
+    const PARAM_NOT_INSTALLED_URL_PATH = 'MAGE_NOT_INSTALLED_URL_PATH';
+    const PARAM_NOT_INSTALLED_URL = 'MAGE_NOT_INSTALLED_URL';
     /**#@-*/
 
     /**
@@ -49,10 +49,10 @@ public function __construct($server)
      */
     public function getUrl()
     {
-        if (isset($this->server[self::NOT_INSTALLED_URL_PARAM])) {
-            return $this->server[self::NOT_INSTALLED_URL_PARAM];
+        if (isset($this->server[self::PARAM_NOT_INSTALLED_URL])) {
+            return $this->server[self::PARAM_NOT_INSTALLED_URL];
         }
-        return \Magento\Framework\App\Request\Http::getDistroBaseUrlPath($this->server) . trim($this->getPath(), '/') . '/';
+        return Request\Http::getDistroBaseUrlPath($this->server) . trim($this->getPath(), '/') . '/';
     }
 
     /**
@@ -75,6 +75,7 @@ public function getDir($projectRoot)
     public function isAvailable($projectRoot)
     {
         if (isset($this->server['DOCUMENT_ROOT'])) {
+            // realpath() is used only to normalize path - there is no intent to check if path actually exists
             $docRoot = str_replace('\\', '/', realpath($this->server['DOCUMENT_ROOT']));
             $installDir = str_replace('\\', '/', realpath($this->getDir($projectRoot)));
             return false !== strpos($installDir . '/', $docRoot . '/');
@@ -89,8 +90,8 @@ public function isAvailable($projectRoot)
      */
     private function getPath()
     {
-        if (isset($this->server[self::NOT_INSTALLED_URL_PATH_PARAM])) {
-            return $this->server[self::NOT_INSTALLED_URL_PATH_PARAM];
+        if (isset($this->server[self::PARAM_NOT_INSTALLED_URL_PATH])) {
+            return $this->server[self::PARAM_NOT_INSTALLED_URL_PATH];
         }
         return self::DEFAULT_PATH;
     }

From 64c7f2a172f3bec4f34f8e5debf03162043ece5f Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Mon, 1 Dec 2014 13:18:21 -0600
Subject: [PATCH 066/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- fix for environment-specific directory separators
---
 lib/internal/Magento/Framework/App/Request/Http.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index d5cd24dd4a895..4e5e57aeb4779 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -579,7 +579,7 @@ public static function getDistroBaseUrlPath($server)
     {
         $result = '';
         if (isset($server['SCRIPT_NAME'])) {
-            $envPath = str_replace('\\', '/', dirname($server['SCRIPT_NAME']));
+            $envPath = str_replace('\\', '/', dirname(str_replace('\\', '/', $server['SCRIPT_NAME'])));
             if ($envPath != '.' && $envPath != '/') {
                 $result = $envPath;
             }

From dd71c4c214b6e26a92dbdfe25915e5fd22b03135 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Mon, 1 Dec 2014 15:55:06 -0600
Subject: [PATCH 067/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- fixed merge conflict error
---
 .../Magento/Setup/view/magento/setup/web-configuration.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index f7a8574ce587c..267114255e9d6 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -15,7 +15,7 @@ $hints = [
     ),
     'encrypt_key' => sprintf(
         '<p>%s</p>',
-        'Key to encrypt sensitive data such as passwords and personally identifiable customer informaton in the Magento database. The encryption key is stored in [your Magento install dir]/app/etc/local.xml/'
+        'Key to encrypt sensitive data such as passwords and personally identifiable customer informaton in the Magento database. The encryption key is stored in [your Magento install dir]/app/etc/config.php'
     ),
 ];
 ?>

From 900645d35c4f1a592e766e2d554f553cc561c789 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Mon, 1 Dec 2014 16:50:05 -0600
Subject: [PATCH 068/474] MAGETWO-31004 Validation of CLI

- removed use_secure and use_secure_admin flag
---
 dev/build/core_dev/functional/config/install.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/build/core_dev/functional/config/install.php b/dev/build/core_dev/functional/config/install.php
index b0ae71c0865e5..c3143fbf17d60 100644
--- a/dev/build/core_dev/functional/config/install.php
+++ b/dev/build/core_dev/functional/config/install.php
@@ -16,8 +16,6 @@
         'db_name'                => '{{db_name}}',
         'db_user'                => '{{db_user}}',
         'db_pass'                => '{{db_password}}',
-        'use_secure'             => '1',
-        'use_secure_admin'       => '1',
         'admin_use_security_key' => '0',
         'use_rewrites'           => '1',
         'admin_lastname'         => 'Admin',

From e91ede3813ba212a8715036d001fd34f1bb9b2d0 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Mon, 1 Dec 2014 16:50:42 -0600
Subject: [PATCH 069/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- coding style fix
---
 lib/internal/Magento/Framework/App/Http.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index 06f0d10381df3..b1988d6c51dce 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -128,7 +128,7 @@ public function catchException(Bootstrap $bootstrap, \Exception $exception)
     {
         $result = $this->handleDeveloperMode($bootstrap, $exception)
             || $this->handleBootstrapErrors($bootstrap, $exception)
-            || $this->handleSessionException($bootstrap, $exception)
+            || $this->handleSessionException($exception)
             || $this->handleInitException($exception)
             || $this->handleGenericReport($bootstrap, $exception);
         return $result;
@@ -212,11 +212,10 @@ private function handleBootstrapErrors(Bootstrap $bootstrap, \Exception &$except
     /**
      * Handler for session errors
      *
-     * @param Bootstrap $bootstrap
      * @param \Exception $exception
      * @return bool
      */
-    private function handleSessionException(Bootstrap $bootstrap, \Exception $exception)
+    private function handleSessionException(\Exception $exception)
     {
         if ($exception instanceof \Magento\Framework\Session\Exception) {
             $this->_response->setRedirect($this->_request->getDistroBaseUrl());

From 09c87d86fe22401ab0ad732661aac613be871bb2 Mon Sep 17 00:00:00 2001
From: Paul Lewis <plewis@ebay.com>
Date: Mon, 1 Dec 2014 19:09:21 -0600
Subject: [PATCH 070/474] MAGETWO-29546: DbStatusValidator does not provide
 enough information to perform successful update of the system

 - Fix unit and integration tests
 - put error array keys in constants
 - refactored a bit so module name and type are only needed in DbStatusValidator class
---
 .../Module/Plugin/DbStatusValidatorTest.php   |  5 +-
 .../Magento/Framework/Module/ManagerTest.php  | 33 ++++++---
 .../Module/Plugin/DbStatusValidatorTest.php   | 70 +++++++++++++++----
 .../Magento/Framework/Module/UpdaterTest.php  | 14 ++--
 .../Magento/Framework/Module/Manager.php      | 51 ++++++++++----
 .../Module/Plugin/DbStatusValidator.php       | 53 +++++++++++---
 .../Magento/Framework/Module/Updater.php      |  2 +-
 7 files changed, 176 insertions(+), 52 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index 844ac196370b3..4667e4e4d190d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -37,7 +37,10 @@ public function testValidationOutdatedDb()
             } catch (\Magento\Framework\Module\Exception $e) {
                 if ($e->getMessage() != 'Please update your database: first run "composer install" from the Magento ' .
                     'root/ and root/setup directories. Then run "php –f index.php update" from the Magento ' .
-                    'root/setup directory.'
+                    'root/setup directory.' . PHP_EOL .
+                    'Error details: database is out of date.' . PHP_EOL .
+                    'Magento_AdminNotification schema: current version - 0.1, latest version - 2.0.0.0' . PHP_EOL .
+                    'Magento_AdminNotification data: current version - 0.1, latest version - 2.0.0.0'
                 ) {
                     $failureMessage = "DB status validation doesn't work properly. Caught exception message is '"
                         . $e->getMessage() ."'";
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
index 4f17848b1848a..fb22d0f32e9c6 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
@@ -7,6 +7,8 @@
  */
 namespace Magento\Framework\Module;
 
+use Magento\Framework\Module\Plugin\DbStatusValidator;
+
 class ManagerTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -129,7 +131,7 @@ public function testIsDbSchemaUpToDate($moduleName, $dbVersion, $expectedResult)
             ->method('getDbVersion')
             ->with($resourceName)
             ->will($this->returnValue($dbVersion));
-        $this->assertSame($expectedResult, $this->_model->isDbSchemaUpToDate($moduleName, $resourceName));
+        $this->assertEquals($expectedResult, $this->_model->getDbSchemaVersionError($moduleName, $resourceName));
     }
 
     /**
@@ -146,7 +148,7 @@ public function testIsDbDataUpToDate($moduleName, $dbVersion, $expectedResult)
             ->method('getDataVersion')
             ->with($resourceName)
             ->will($this->returnValue($dbVersion));
-        $this->assertSame($expectedResult, $this->_model->isDbDataUpToDate($moduleName, $resourceName));
+        $this->assertEquals($expectedResult, $this->_model->getDbDataVersionError($moduleName, $resourceName));
     }
 
     /**
@@ -155,10 +157,25 @@ public function testIsDbDataUpToDate($moduleName, $dbVersion, $expectedResult)
     public function isDbUpToDateDataProvider()
     {
         return [
-            'version in config == version in db' => ['Module_One', '1', true],
-            'version in config < version in db' => ['Module_One', '2', false],
-            'version in config > version in db' => ['Module_Two', '1', false],
-            'no version in db' => ['Module_One', false, false],
+            'version in config == version in db' => ['Module_One', '1', []],
+            'version in config < version in db' =>
+                [
+                    'Module_One',
+                    '2',
+                    [DbStatusValidator::ERROR_KEY_CURRENT => '2', DbStatusValidator::ERROR_KEY_NEEDED => '1']
+                ],
+            'version in config > version in db' =>
+                [
+                    'Module_Two',
+                    '1',
+                    [DbStatusValidator::ERROR_KEY_CURRENT => '1', DbStatusValidator::ERROR_KEY_NEEDED => '2']
+                ],
+            'no version in db' =>
+                [
+                    'Module_One',
+                    false,
+                    [DbStatusValidator::ERROR_KEY_CURRENT => 'none', DbStatusValidator::ERROR_KEY_NEEDED => '1']
+                ],
         ];
     }
 
@@ -168,7 +185,7 @@ public function isDbUpToDateDataProvider()
      */
     public function testIsDbSchemaUpToDateException()
     {
-        $this->_model->isDbSchemaUpToDate('Module_Three', 'resource');
+        $this->_model->getDbSchemaVersionError('Module_Three', 'resource');
     }
 
     /**
@@ -177,6 +194,6 @@ public function testIsDbSchemaUpToDateException()
      */
     public function testIsDbDataUpToDateException()
     {
-        $this->_model->isDbDataUpToDate('Module_Three', 'resource');
+        $this->_model->getDbDataVersionError('Module_Three', 'resource');
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index e672738884ea5..3061da10e21fe 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -134,10 +134,10 @@ public function testAroundDispatchException(array $schemaValueMap, array $dataVa
         ;
         $this->_cacheMock->expects($this->never())->method('save');
         $this->moduleManager->expects($this->any())
-            ->method('isDbSchemaUpToDate')
+            ->method('getDbSchemaVersionError')
             ->will($this->returnValueMap($schemaValueMap));
         $this->moduleManager->expects($this->any())
-            ->method('isDbDataUpToDate')
+            ->method('getDbDataVersionError')
             ->will($this->returnValueMap($dataValueMap));
         $this->_model->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock);
     }
@@ -150,32 +150,74 @@ public function aroundDispatchExceptionDataProvider()
         return [
             'schema is outdated' => [
                 [
-                    ['Module_One', 'resource_Module_One', false],
-                    ['Module_Two', 'resource_Module_Two', true],
+                    ['Module_One', 'resource_Module_One',
+                     [
+                      DbStatusValidator::ERROR_KEY_MODULE => 'Module_One',
+                      DbStatusValidator::ERROR_KEY_TYPE => 'schema',
+                      DbStatusValidator::ERROR_KEY_CURRENT => 'none',
+                      DbStatusValidator::ERROR_KEY_NEEDED => '1'
+                     ]
+                    ],
+                    ['Module_Two', 'resource_Module_Two', []],
                 ],
                 [
-                    ['Module_One', 'resource_Module_One', true],
-                    ['Module_Two', 'resource_Module_Two', true],
+                    ['Module_One', 'resource_Module_One', []],
+                    ['Module_Two', 'resource_Module_Two', []],
                 ],
             ],
             'data is outdated' => [
                 [
-                    ['Module_One', 'resource_Module_One', true],
-                    ['Module_Two', 'resource_Module_Two', true],
+                    ['Module_One', 'resource_Module_One', []],
+                    ['Module_Two', 'resource_Module_Two', []],
                 ],
                 [
-                    ['Module_One', 'resource_Module_One', true],
-                    ['Module_Two', 'resource_Module_Two', false],
+                    ['Module_One', 'resource_Module_One', []],
+                    ['Module_Two', 'resource_Module_Two',
+                     [
+                         DbStatusValidator::ERROR_KEY_MODULE => 'Module_Two',
+                         DbStatusValidator::ERROR_KEY_TYPE => 'data',
+                         DbStatusValidator::ERROR_KEY_CURRENT => 'none',
+                         DbStatusValidator::ERROR_KEY_NEEDED => '1'
+                     ]
+                    ],
                 ],
             ],
             'both schema and data are outdated' => [
                 [
-                    ['Module_One', 'resource_Module_One', false],
-                    ['Module_Two', 'resource_Module_Two', false],
+                    ['Module_One', 'resource_Module_One',
+                     [
+                         DbStatusValidator::ERROR_KEY_MODULE => 'Module_One',
+                         DbStatusValidator::ERROR_KEY_TYPE => 'schema',
+                         DbStatusValidator::ERROR_KEY_CURRENT => 'none',
+                         DbStatusValidator::ERROR_KEY_NEEDED => '1'
+                     ]
+                    ],
+                    ['Module_Two', 'resource_Module_Two',
+                     [
+                         DbStatusValidator::ERROR_KEY_MODULE => 'Module_Two',
+                         DbStatusValidator::ERROR_KEY_TYPE => 'schema',
+                         DbStatusValidator::ERROR_KEY_CURRENT => 'none',
+                         DbStatusValidator::ERROR_KEY_NEEDED => '1'
+                     ]
+                    ],
                 ],
                 [
-                    ['Module_One', 'resource_Module_One', false],
-                    ['Module_Two', 'resource_Module_Two', false],
+                    ['Module_One', 'resource_Module_One',
+                     [
+                         DbStatusValidator::ERROR_KEY_MODULE => 'Module_One',
+                         DbStatusValidator::ERROR_KEY_TYPE => 'data',
+                         DbStatusValidator::ERROR_KEY_CURRENT => 'none',
+                         DbStatusValidator::ERROR_KEY_NEEDED => '1'
+                     ]
+                    ],
+                    ['Module_Two', 'resource_Module_Two',
+                     [
+                         DbStatusValidator::ERROR_KEY_MODULE => 'Module_Two',
+                         DbStatusValidator::ERROR_KEY_TYPE => 'data',
+                         DbStatusValidator::ERROR_KEY_CURRENT => 'none',
+                         DbStatusValidator::ERROR_KEY_NEEDED => '1'
+                     ]
+                    ],
                 ],
             ],
         ];
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php
index 638e5b1f71364..ba35e8c438833 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php
@@ -84,9 +84,9 @@ protected function setUp()
     public function testUpdateDataNotApplied()
     {
         $this->moduleManager->expects($this->once())
-            ->method('isDbDataUpToDate')
+            ->method('getDbDataVersionError')
             ->with('Test_Module', 'catalog_setup')
-            ->will($this->returnValue(true));
+            ->will($this->returnValue([]));
         $this->_factoryMock->expects($this->never())
             ->method('create');
         $this->_model->updateData();
@@ -95,9 +95,11 @@ public function testUpdateDataNotApplied()
     public function testUpdateData()
     {
         $this->moduleManager->expects($this->once())
-            ->method('isDbDataUpToDate')
+            ->method('getDbDataVersionError')
             ->with('Test_Module', 'catalog_setup')
-            ->will($this->returnValue(false));
+            ->will(
+                $this->returnValue(['module' => 'Test_Module', 'type' => 'data', 'current' => '1', 'needed' => '2'])
+            );
         $this->_factoryMock->expects($this->any())
             ->method('create')
             ->with('catalog_setup', 'Test_Module')
@@ -112,9 +114,9 @@ public function testUpdateData()
     public function testUpdateDataNoUpdates()
     {
         $this->moduleManager->expects($this->once())
-            ->method('isDbDataUpToDate')
+            ->method('getDbDataVersionError')
             ->with('Test_Module', 'catalog_setup')
-            ->will($this->returnValue(true));
+            ->will($this->returnValue([]));
         $this->_factoryMock->expects($this->never())
             ->method('create');
 
diff --git a/lib/internal/Magento/Framework/Module/Manager.php b/lib/internal/Magento/Framework/Module/Manager.php
index 8e7f97fe60368..890078e63afca 100644
--- a/lib/internal/Magento/Framework/Module/Manager.php
+++ b/lib/internal/Magento/Framework/Module/Manager.php
@@ -11,7 +11,8 @@
  */
 namespace Magento\Framework\Module;
 
-use \Magento\Framework\Module\Updater\SetupInterface;
+use Magento\Framework\Module\Plugin\DbStatusValidator;
+use Magento\Framework\Module\Updater\SetupInterface;
 
 class Manager
 {
@@ -103,27 +104,46 @@ protected function _isCustomOutputConfigEnabled($moduleName)
     }
 
     /**
-     * Check if DB schema is up to date
+     * Check if DB schema is up to date, return error data if it is not.
      *
      * @param string $moduleName
      * @param string $resourceName
-     * @return bool
+     * @return [] Contains current and needed version strings
      */
-    public function isDbSchemaUpToDate($moduleName, $resourceName)
+    public function getDbSchemaVersionError($moduleName, $resourceName)
     {
-        $dbVer = $this->_moduleResource->getDbVersion($resourceName);
-        return $this->isModuleVersionEqual($moduleName, $dbVer);
+        $dbVer = $this->_moduleResource->getDbVersion($resourceName); // version saved in DB
+
+        $configVer = $this->verifyModuleVersion($moduleName, $dbVer);
+
+        if ($configVer === true) {
+            return [];
+        } else {
+            $dbVer = $dbVer ?: 'none';
+            return [DbStatusValidator::ERROR_KEY_CURRENT => $dbVer, DbStatusValidator::ERROR_KEY_NEEDED => $configVer];
+        }
     }
 
     /**
+     * Check if DB data is up to date, return error data if it is not.
+     *
      * @param string $moduleName
      * @param string $resourceName
-     * @return bool
+     * @return []
      */
-    public function isDbDataUpToDate($moduleName, $resourceName)
+    public function getDbDataVersionError($moduleName, $resourceName)
     {
         $dataVer = $this->_moduleResource->getDataVersion($resourceName);
-        return $this->isModuleVersionEqual($moduleName, $dataVer);
+        $configVer = $this->verifyModuleVersion($moduleName, $dataVer);
+        if ($configVer === true) {
+            return [];
+        } else {
+            $dataVer = $dataVer ?: 'none';
+            return [
+                DbStatusValidator::ERROR_KEY_CURRENT => $dataVer,
+                DbStatusValidator::ERROR_KEY_NEEDED => $configVer
+            ];
+        }
     }
 
     /**
@@ -131,10 +151,10 @@ public function isDbDataUpToDate($moduleName, $resourceName)
      *
      * @param string $moduleName
      * @param string|bool $version
-     * @return bool
+     * @return true|string Returns true if up to date, string containing current version if it is not.
      * @throws \UnexpectedValueException
      */
-    private function isModuleVersionEqual($moduleName, $version)
+    private function verifyModuleVersion($moduleName, $version)
     {
         $module = $this->_moduleList->getModule($moduleName);
         if (empty($module['schema_version'])) {
@@ -142,6 +162,13 @@ private function isModuleVersionEqual($moduleName, $version)
         }
         $configVer = $module['schema_version'];
 
-        return ($version !== false && version_compare($configVer, $version) === SetupInterface::VERSION_COMPARE_EQUAL);
+        $compareResult = ($version !== false
+            && version_compare($configVer, $version) === SetupInterface::VERSION_COMPARE_EQUAL);
+
+        if ($compareResult) {
+            return true;
+        } else {
+            return $configVer;
+        }
     }
 }
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index a13026e64d6b3..2530365299d13 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -13,6 +13,15 @@
 
 class DbStatusValidator
 {
+    /**#@+
+     * Constants defined for keys of error array
+     */
+    const ERROR_KEY_MODULE = 'module';
+    const ERROR_KEY_TYPE = 'type';
+    const ERROR_KEY_CURRENT = 'current';
+    const ERROR_KEY_NEEDED = 'needed';
+    /**#@-*/
+
     /**
      * @var FrontendInterface
      */
@@ -66,10 +75,13 @@ public function aroundDispatch(
         \Magento\Framework\App\RequestInterface $request
     ) {
         if (!$this->cache->load('db_is_up_to_date')) {
-            if (!$this->isDbUpToDate()) {
+            $errors  = $this->getOutOfDateDbErrors();
+            if ($errors) {
+                $formattedErrors = $this->formatErrors($errors);
                 throw new \Magento\Framework\Module\Exception(
                     'Please update your database: first run "composer install" from the Magento root/ and root/setup '.
-                    'directories. Then run "php –f index.php update" from the Magento root/setup directory.'
+                    'directories. Then run "php –f index.php update" from the Magento root/setup directory.'. PHP_EOL .
+                    'Error details: database is out of date.' . PHP_EOL . implode(PHP_EOL, $formattedErrors)
                 );
             } else {
                 $this->cache->save('true', 'db_is_up_to_date');
@@ -78,22 +90,43 @@ public function aroundDispatch(
         return $proceed($request);
     }
 
+    private function formatErrors($errorsData)
+    {
+        $formattedErrors = [];
+        foreach ($errorsData as $error) {
+            $formattedErrors[] = $error[self::ERROR_KEY_MODULE] . ' ' . $error[self::ERROR_KEY_TYPE] .
+                ': current version - ' . $error[self::ERROR_KEY_CURRENT ] .
+                ', latest version - ' . $error[self::ERROR_KEY_NEEDED];
+        }
+        return $formattedErrors;
+    }
     /**
-     * Check if DB is up to date
+     * Get array of errors if DB is out of date, return [] if DB is current
      *
-     * @return bool
+     * @return [] Array of errors, each error contains module name, current version, needed version,
+     *              and type (schema or data).  The array will be empty if all schema and data are current.
      */
-    private function isDbUpToDate()
+    private function getOutOfDateDbErrors()
     {
+        $errors = [];
         foreach (array_keys($this->moduleList->getModules()) as $moduleName) {
             foreach ($this->resourceResolver->getResourceList($moduleName) as $resourceName) {
-                $isSchemaUpToDate = $this->moduleManager->isDbSchemaUpToDate($moduleName, $resourceName);
-                $isDataUpToDate = $this->moduleManager->isDbDataUpToDate($moduleName, $resourceName);
-                if (!$isSchemaUpToDate || !$isDataUpToDate) {
-                    return false;
+                $errorData = $this->moduleManager->getDbSchemaVersionError($moduleName, $resourceName);
+                if ($errorData) {
+                    $errors[] = array_merge(
+                        [self::ERROR_KEY_MODULE => $moduleName, '' . self::ERROR_KEY_TYPE . '' => 'schema'],
+                        $errorData
+                    );
+                }
+                $errorData = $this->moduleManager->getDbDataVersionError($moduleName, $resourceName);
+                if ($errorData) {
+                    $errors[] = array_merge(
+                        [self::ERROR_KEY_MODULE => $moduleName, self::ERROR_KEY_TYPE => 'data'],
+                        $errorData
+                    );
                 }
             }
         }
-        return true;
+        return $errors;
     }
 }
diff --git a/lib/internal/Magento/Framework/Module/Updater.php b/lib/internal/Magento/Framework/Module/Updater.php
index 3299ea48ed452..ceb72a867ef6a 100644
--- a/lib/internal/Magento/Framework/Module/Updater.php
+++ b/lib/internal/Magento/Framework/Module/Updater.php
@@ -58,7 +58,7 @@ public function updateData()
     {
         foreach (array_keys($this->_moduleList->getModules()) as $moduleName) {
             foreach ($this->_resourceResolver->getResourceList($moduleName) as $resourceName) {
-                if (!$this->_moduleManager->isDbDataUpToDate($moduleName, $resourceName)) {
+                if ($this->_moduleManager->getDbDataVersionError($moduleName, $resourceName)) {
                     $this->_setupFactory->create($resourceName, $moduleName)->applyDataUpdates();
                 }
             }

From 7749b6d573bc07e794ae11e23603145bfd9ea289 Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Tue, 2 Dec 2014 11:02:30 +0200
Subject: [PATCH 071/474] MTA-774: Stabilize Catalog module. Product Attributes

---
 .../AddProductsToCartBySkuFromWidgetTest.php  | 69 +++++++++++--------
 .../Product/Attribute/Edit/AttributeForm.php  | 46 ++++++++++---
 .../Adminhtml/Product/Attribute/Set/Main.php  | 11 +++
 .../Adminhtml/Product/Edit/ProductTab.php     | 27 ++++++--
 .../Block/Adminhtml/Product/ProductForm.php   |  3 +-
 ...sertAddedProductAttributeOnProductForm.php | 31 ++++++++-
 .../AssertProductAttributeIsFilterable.php    | 38 +++++++++-
 .../AssertProductAttributeIsUnique.php        | 27 +++++---
 .../CreateAttributeSetEntityTest.php          |  1 +
 ...ductAttributeEntityFromProductPageTest.php |  1 +
 .../CreateProductAttributeEntityTest.php      |  1 +
 .../testCreateProductAttribute.csv            |  2 +-
 .../DeleteAttributeSetTest.php                |  1 +
 .../UpdateAttributeSetTest.php                |  1 +
 .../AddNewAttributeFromProductPageStep.php    |  1 -
 15 files changed, 196 insertions(+), 64 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php
index 65e34b4849b6a..412e2d889aa6d 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php
@@ -44,21 +44,35 @@ class AddProductsToCartBySkuFromWidgetTest extends AbstractAdvancedCheckoutEntit
      *
      * @var WidgetInstanceIndex
      */
-    protected static $widgetInstanceIndex;
+    protected $widgetInstanceIndex;
 
     /**
      * Widget instance edit page.
      *
      * @var WidgetInstanceEdit
      */
-    protected static $widgetInstanceEdit;
+    protected $widgetInstanceEdit;
 
     /**
      * Order by SKU widget.
      *
      * @var Widget
      */
-    protected static $widget;
+    protected $widget;
+
+    /**
+     * Fixture Factory.
+     *
+     * @var FixtureFactory
+     */
+    protected $fixtureFactory;
+
+    /**
+     * Page AdminCache.
+     *
+     * @var AdminCache
+     */
+    protected $adminCache;
 
     /**
      * Injection data.
@@ -69,6 +83,8 @@ class AddProductsToCartBySkuFromWidgetTest extends AbstractAdvancedCheckoutEntit
      * @param CheckoutCart $checkoutCart
      * @param WidgetInstanceIndex $widgetInstanceIndex
      * @param WidgetInstanceEdit $widgetInstanceEdit
+     * @param FixtureFactory $fixtureFactory
+     * @param AdminCache $adminCache
      * @return void
      */
     public function __inject(
@@ -77,35 +93,29 @@ public function __inject(
         CustomerOrderSku $customerOrderSku,
         CheckoutCart $checkoutCart,
         WidgetInstanceIndex $widgetInstanceIndex,
-        WidgetInstanceEdit $widgetInstanceEdit
+        WidgetInstanceEdit $widgetInstanceEdit,
+        FixtureFactory $fixtureFactory,
+        AdminCache $adminCache
     ) {
         $this->cmsIndex = $cmsIndex;
         $this->customerAccountIndex = $customerAccountIndex;
         $this->customerOrderSku = $customerOrderSku;
         $this->checkoutCart = $checkoutCart;
-        self::$widgetInstanceIndex = $widgetInstanceIndex;
-        self::$widgetInstanceEdit = $widgetInstanceEdit;
+        $this->widgetInstanceIndex = $widgetInstanceIndex;
+        $this->widgetInstanceEdit = $widgetInstanceEdit;
+        $this->fixtureFactory = $fixtureFactory;
+        $this->adminCache = $adminCache;
     }
 
     /**
      * Create customer and widget.
      *
      * @param CustomerInjectable $customer
-     * @param FixtureFactory $fixtureFactory
-     * @param AdminCache $adminCache
      * @return array
      */
-    public function __prepare(CustomerInjectable $customer, FixtureFactory $fixtureFactory, AdminCache $adminCache)
+    public function __prepare(CustomerInjectable $customer)
     {
         $customer->persist();
-        self::$widget = $fixtureFactory->create(
-            '\Magento\AdvancedCheckout\Test\Fixture\Widget',
-            ['dataSet' => 'order_by_sku']
-        );
-        self::$widget->persist();
-        $adminCache->open();
-        $adminCache->getActionsBlock()->flushMagentoCache();
-        $adminCache->getMessagesBlock()->waitSuccessMessage();
 
         return ['customer' => $customer];
     }
@@ -124,6 +134,14 @@ public function test(CustomerInjectable $customer, $products, array $orderOption
         // Preconditions
         $products = $this->createProducts($products);
         $orderOptions = $this->prepareOrderOptions($products, $orderOptions);
+        $this->widget = $this->fixtureFactory->create(
+            '\Magento\AdvancedCheckout\Test\Fixture\Widget',
+            ['dataSet' => 'order_by_sku']
+        );
+        $this->widget->persist();
+        $this->adminCache->open();
+        $this->adminCache->getActionsBlock()->flushMagentoCache();
+        $this->adminCache->getMessagesBlock()->waitSuccessMessage();
         // Steps
         $this->cmsIndex->open();
         $this->loginCustomer($customer);
@@ -142,24 +160,15 @@ public function test(CustomerInjectable $customer, $products, array $orderOption
     }
 
     /**
-     * Clear shopping cart.
+     * Clear shopping cart and delete widget.
      *
      * @return void
      */
     public function tearDown()
     {
         $this->checkoutCart->open()->getCartBlock()->clearShoppingCart();
-    }
-
-    /**
-     * Delete widget.
-     *
-     * @return void
-     */
-    public static function tearDownAfterClass()
-    {
-        self::$widgetInstanceIndex->open();
-        self::$widgetInstanceIndex->getWidgetGrid()->searchAndOpen(['title' => self::$widget->getTitle()]);
-        self::$widgetInstanceEdit->getPageActionsBlock()->delete();
+        $this->widgetInstanceIndex->open();
+        $this->widgetInstanceIndex->getWidgetGrid()->searchAndOpen(['title' => $this->widget->getTitle()]);
+        $this->widgetInstanceEdit->getPageActionsBlock()->delete();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
index d81ccb05521bc..c78ef78496680 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Edit/AttributeForm.php
@@ -27,6 +27,13 @@ class AttributeForm extends FormTabs
      */
     protected $closedToggle = '//*[contains(@class,"collapsable-wrapper") and not(contains(@class,"opened"))]//strong';
 
+    /**
+     * Properties tab selector.
+     *
+     * @var string
+     */
+    protected $propertiesTab = '#product_attribute_tabs_main';
+
     /**
      * Get data of the tabs.
      *
@@ -40,22 +47,27 @@ class AttributeForm extends FormTabs
      */
     public function getData(FixtureInterface $fixture = null, Element $element = null)
     {
+        $this->waitForElementVisible($this->propertiesTab);
         $data = [];
         if (null === $fixture) {
             foreach ($this->tabs as $tabName => $tab) {
-                $this->openTab($tabName);
-                $this->expandAllToggles();
-                $tabData = $this->getTabElement($tabName)->getDataFormTab();
-                $data = array_merge($data, $tabData);
+                if ($this->isTabVisible($tabName)) {
+                    $this->openTab($tabName);
+                    $this->expandAllToggles();
+                    $tabData = $this->getTabElement($tabName)->getDataFormTab();
+                    $data = array_merge($data, $tabData);
+                }
             }
         } else {
             $isHasData = ($fixture instanceof InjectableFixture) ? $fixture->hasData() : true;
             $tabsFields = $isHasData ? $this->getFieldsByTabs($fixture) : [];
             foreach ($tabsFields as $tabName => $fields) {
-                $this->openTab($tabName);
-                $this->expandAllToggles();
-                $tabData = $this->getTabElement($tabName)->getDataFormTab($fields, $this->_rootElement);
-                $data = array_merge($data, $tabData);
+                if ($this->isTabVisible($tabName)) {
+                    $this->openTab($tabName);
+                    $this->expandAllToggles();
+                    $tabData = $this->getTabElement($tabName)->getDataFormTab($fields, $this->_rootElement);
+                    $data = array_merge($data, $tabData);
+                }
             }
         }
 
@@ -88,10 +100,24 @@ public function openTab($tabName)
             ? $this->tabs[$tabName]['strategy']
             : Locator::SELECTOR_CSS;
         $tab = $this->_rootElement->find($selector, $strategy);
-        $target = $this->browser->find('.logo');// Handle menu overlap problem
+        $target = $this->browser->find('.page-title .title');// Handle menu overlap problem
         $this->_rootElement->dragAndDrop($target);
         $tab->click();
-
         return $this;
     }
+
+    /**
+     * Check if tab is visible.
+     *
+     * @param string $tabName
+     * @return bool
+     */
+    protected function isTabVisible($tabName)
+    {
+        $selector = $this->tabs[$tabName]['selector'];
+        $strategy = isset($this->tabs[$tabName]['strategy'])
+            ? $this->tabs[$tabName]['strategy']
+            : Locator::SELECTOR_CSS;
+        return $this->_rootElement->find($selector, $strategy)->isVisible();
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
index 7e6a6ce3af959..cee386f4f6fe2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -10,6 +10,7 @@
 
 use Mtf\Block\Block;
 use Mtf\Client\Element\Locator;
+use Mtf\ObjectManager;
 
 /**
  * Class Main
@@ -45,6 +46,13 @@ class Main extends Block
      */
     protected $addGroupButton = '[data-ui-id="adminhtml-catalog-product-set-edit-add-group-button"]';
 
+    /**
+     * Selector for note block element.
+     *
+     * @var string
+     */
+    protected $noteBlock = 'p.note-block';
+
     /**
      * Move Attribute to Attribute Group
      *
@@ -63,6 +71,9 @@ public function moveAttribute(array $attributeData, $attributeGroup = 'Product D
         $attributeGroupLocator = sprintf($this->groups, $attributeGroup);
         $target = $this->_rootElement->find($attributeGroupLocator, Locator::SELECTOR_XPATH);
 
+        $target->click(); // Handle small resolution screen issue
+        $this->browser->find($this->noteBlock)->click();
+
         $attributeLabelLocator = sprintf($this->attribute, $attribute);
         $this->_rootElement->find($attributeLabelLocator, Locator::SELECTOR_XPATH)->dragAndDrop($target);
     }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php
index b5e1fa684a698..a158f7e5525d0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/ProductTab.php
@@ -8,10 +8,11 @@
 
 namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit;
 
+use Mtf\Client\Element;
+use Mtf\Client\Element\Locator;
 use Magento\Backend\Test\Block\Widget\Tab;
 use Magento\Catalog\Test\Block\Adminhtml\Product\Attribute\Edit;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Mtf\Client\Element\Locator;
 
 /**
  * General class for tabs on product FormTabs with "Add attribute" button.
@@ -23,7 +24,7 @@ class ProductTab extends Tab
      *
      * @var string
      */
-    protected $attributeSearch = "//div[contains(@data-role, '%s')]//*[@id='product-attribute-search-container']";
+    protected $attributeSearch = "//div[contains(@data-role, 'product-details')]//*[@data-toggle='dropdown']/span";
 
     /**
      * Selector for 'New Attribute' button.
@@ -32,6 +33,13 @@ class ProductTab extends Tab
      */
     protected $newAttributeButton = '[id^="create_attribute"]';
 
+    /**
+     * Selector for search input field.
+     *
+     * @var string
+     */
+    protected $searchAttribute = "//input[@data-role='product-attribute-search']";
+
     /**
      * Fixture mapping.
      *
@@ -56,7 +64,18 @@ protected function dataMapping(array $fields = null, $parent = null)
      */
     public function addNewAttribute($tabName)
     {
-        $this->_rootElement->find(sprintf($this->attributeSearch, $tabName), Locator::SELECTOR_XPATH)->click();
-        $this->_rootElement->find($this->newAttributeButton)->click();
+        $element = $this->_rootElement;
+        $selector = sprintf($this->attributeSearch, $tabName);
+        $element->waitUntil(
+            function () use ($element, $selector) {
+                return $element->find($selector, Locator::SELECTOR_XPATH)->isVisible() ? true : null;
+            }
+        );
+        $addAttributeToggle = $element->find($selector, Locator::SELECTOR_XPATH);
+        $addAttributeToggle->click();
+        if (!$addAttributeToggle->find($this->newAttributeButton)->isVisible()) {
+            $element->find($this->searchAttribute, Locator::SELECTOR_XPATH)->click();
+        }
+        $element->find($this->newAttributeButton)->click();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
index 5b5d6fd1fb2e1..e993f55eacb58 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php
@@ -185,7 +185,7 @@ protected function createCustomAttribute(InjectableFixture $product, $tabName =
         if (!$this->checkAttributeLabel($attribute)) {
             /** @var \Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab $tab */
             $tab = $this->openTab($tabName);
-            $tab->addNewAttribute();
+            $tab->addNewAttribute($tabName);
             $this->fillAttributeForm($attribute);
             $this->reinitRootElement();
         }
@@ -227,7 +227,6 @@ protected function showAdvancedSettings()
     public function openTab($tabName)
     {
         $this->showAdvancedSettings();
-
         return parent::openTab($tabName);
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
index 29c3bca20d57d..61e8459d25db1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
@@ -8,11 +8,14 @@
 
 namespace Magento\Catalog\Test\Constraint;
 
+use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Mtf\Fixture\InjectableFixture;
 use Mtf\Constraint\AbstractConstraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Mtf\ObjectManager;
 
 /**
  * Check attribute on product form.
@@ -34,6 +37,7 @@ class AssertAddedProductAttributeOnProductForm extends AbstractConstraint
      * @param CatalogProductIndex $productGrid
      * @param CatalogProductEdit $productEdit
      * @param CatalogProductAttribute $attribute
+     * @param CatalogAttributeSet $productTemplate
      * @param CatalogProductAttribute $productAttributeOriginal
      * @throws \Exception
      * @return void
@@ -43,11 +47,13 @@ public function processAssert(
         CatalogProductIndex $productGrid,
         CatalogProductEdit $productEdit,
         CatalogProductAttribute $attribute,
+        CatalogAttributeSet $productTemplate,
         CatalogProductAttribute $productAttributeOriginal = null
     ) {
-        $filterProduct = [
-            'sku' => $product->getSku(),
-        ];
+        if (!$product->hasData('sku')) {
+            $product = $this->createProductWithAttributeSet($productAttributeOriginal, $productTemplate);
+        }
+        $filterProduct = ['sku' => $product->getSku()];
         $productGrid->open();
         $productGrid->getProductGrid()->searchAndOpen($filterProduct);
 
@@ -70,4 +76,23 @@ public function toString()
     {
         return 'Product Attribute is present on Product form.';
     }
+
+    /**
+     * Create Product With AttributeSet.
+     *
+     * @param CatalogProductAttribute $attribute
+     * @param CatalogAttributeSet $productTemplate
+     * @return CatalogProductSimple
+     */
+    protected function createProductWithAttributeSet(
+        CatalogProductAttribute $attribute,
+        CatalogAttributeSet $productTemplate
+    ) {
+        $product = ObjectManager::getInstance()->create(
+            'Magento\Catalog\Test\TestStep\MoveAttributeToProductTemplateStep',
+            ['attribute' => $attribute, 'productTemplate' => $productTemplate]
+        )->run();
+        ObjectManager::getInstance()->create('Magento\Catalog\Test\TestStep\SaveProductTemplateStep')->run();
+        return $product['product'];
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
index de7f7279fd83f..042fd99d4af46 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
@@ -9,10 +9,13 @@
 namespace Magento\Catalog\Test\Constraint;
 
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
 use Magento\Cms\Test\Page\CmsIndex;
 use Mtf\Constraint\AbstractConstraint;
 use Mtf\Fixture\InjectableFixture;
+use Magento\Catalog\Test\Block\Adminhtml\Product\ProductForm;
 
 /**
  * Check whether the attribute filter is displayed on the frontend in Layered navigation.
@@ -20,7 +23,7 @@
 class AssertProductAttributeIsFilterable extends AbstractConstraint
 {
     /**
-     * Constraint severeness
+     * Constraint severeness.
      *
      * @var string
      */
@@ -33,14 +36,22 @@ class AssertProductAttributeIsFilterable extends AbstractConstraint
      * @param InjectableFixture $product
      * @param CatalogProductAttribute $attribute
      * @param CmsIndex $cmsIndex
+     * @param CatalogProductIndex $catalogProductIndex
+     * @param CatalogProductEdit $catalogProductEdit
      * @return void
      */
     public function processAssert(
         CatalogCategoryView $catalogCategoryView,
         InjectableFixture $product,
         CatalogProductAttribute $attribute,
-        CmsIndex $cmsIndex
+        CmsIndex $cmsIndex,
+        CatalogProductIndex $catalogProductIndex,
+        CatalogProductEdit $catalogProductEdit
     ) {
+        $catalogProductIndex->open()->getProductGrid()->searchAndOpen(['sku' => $product->getSku()]);
+        $productForm = $catalogProductEdit->getProductForm();
+        $this->setDefaultAttributeValue($productForm, $attribute);
+        $catalogProductEdit->getFormPageActions()->save();
         $cmsIndex->open()->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]);
         $label = $attribute->hasData('manage_frontend_label')
             ? $attribute->getManageFrontendLabel()
@@ -60,4 +71,27 @@ public function toString()
     {
         return 'Attribute is present in layered navigation on category page.';
     }
+
+    /**
+     * Set default attribute value.
+     *
+     * @param ProductForm $productForm
+     * @param CatalogProductAttribute $attribute
+     * @return void
+     */
+    protected function setDefaultAttributeValue(ProductForm $productForm, CatalogProductAttribute $attribute)
+    {
+        $attributeData = $attribute->getData();
+        if (isset($attributeData['options'])) {
+            foreach ($attributeData['options'] as $option) {
+                if ($option['is_default'] == 'Yes') {
+                    $defaultValue = $option['admin'];
+                }
+            }
+        } else {
+            $field = preg_grep('@^default_value@', array_keys($attributeData));
+            $defaultValue = $attributeData[array_shift($field)];
+        }
+        $productForm->getAttributeElement($attribute)->setValue($defaultValue);
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
index 7dac3dda454ce..e61b5b47453e7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
@@ -14,6 +14,7 @@
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Mtf\Constraint\AbstractConstraint;
+use Mtf\Fixture\FixtureFactory;
 
 /**
  * Check whether the attribute is unique.
@@ -37,30 +38,34 @@ class AssertProductAttributeIsUnique extends AbstractConstraint
      *
      * @param CatalogProductIndex $catalogProductIndex
      * @param CatalogProductEdit $catalogProductEdit
-     * @param CatalogProductSimple $product
      * @param CatalogProductAttribute $attribute
+     * @param FixtureFactory $fixtureFactory
      * @throws \Exception
      * @return void
      */
     public function processAssert(
         CatalogProductIndex $catalogProductIndex,
         CatalogProductEdit $catalogProductEdit,
-        CatalogProductSimple $product,
-        CatalogProductAttribute $attribute
+        CatalogProductAttribute $attribute,
+        FixtureFactory $fixtureFactory
     ) {
+        $simpleProduct = $fixtureFactory->createByCode(
+            'catalogProductSimple',
+            ['dataSet' => 'default', 'data' => ['custom_attribute' => $attribute]]
+        );
+
         $catalogProductIndex->open()->getGridPageActionBlock()->addProduct('simple');
         $productForm = $catalogProductEdit->getProductForm();
-        $productForm->fill($product);
+        $productForm->fill($simpleProduct);
         $catalogProductEdit->getFormPageActions()->save();
-        $failedAttributes = $productForm->getRequireNoticeAttributes($product);
-        $actualMessage = $failedAttributes['product-details'][$attribute->getFrontendLabel()];
-
-        $fixtureData = $attribute->getData();
-        $defaultValue = preg_grep('/^default_value/', array_keys($fixtureData));
+        $failedAttributes = $productForm->getRequireNoticeAttributes($simpleProduct);
+        $actualMessage = isset($failedAttributes['product-details'][$attribute->getFrontendLabel()])
+            ? $failedAttributes['product-details'][$attribute->getFrontendLabel()]
+            : null;
 
         \PHPUnit_Framework_Assert::assertEquals(
-            self::UNIQUE_MESSAGE,
-            sprintf($actualMessage, $fixtureData[array_shift($defaultValue)]),
+            sprintf(self::UNIQUE_MESSAGE, $attribute->getFrontendLabel()),
+            $actualMessage,
             'JS error notice on product edit page is not equal to expected.'
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
index 8876183d10179..898d7aa9a86db 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
@@ -80,6 +80,7 @@ public function testCreateAttributeSet(
         CatalogAttributeSet $attributeSet,
         CatalogProductAttribute $productAttribute
     ) {
+        $this->markTestIncomplete('CICD-1041');
         $productAttribute->persist();
 
         //Steps
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
index 42127bcc7736d..dd7e68e8eda7e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
@@ -67,6 +67,7 @@ public function __prepare(FixtureFactory $fixtureFactory)
      */
     public function test(CatalogProductAttribute $attribute)
     {
+        $this->markTestIncomplete("Bug: MAGETWO-31183");
         $this->attribute = $attribute;
         $this->executeScenario();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
index 1a9e6af219ae6..b43ce0e484113 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
@@ -45,6 +45,7 @@ class CreateProductAttributeEntityTest extends Scenario
      */
     public function testCreateProductAttribute(CatalogProductAttribute $productAttribute)
     {
+        $this->markTestIncomplete('CICD-1041');
         $this->attribute = $productAttribute;
         $this->executeScenario();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
index 217e673ba44a8..77e3f7cb0e801 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
@@ -1,7 +1,7 @@
 "productTemplate/dataSet";"productAttribute/data/frontend_label";"productAttribute/data/frontend_input";"productAttribute/data/options/preset";"productAttribute/data/is_required";"productAttribute/data/attribute_code";"productAttribute/data/is_global";"productAttribute/data/default_value_text";"productAttribute/data/default_value_textarea";"productAttribute/data/default_value_date/pattern";"productAttribute/data/default_value_yesno";"productAttribute/data/is_unique";"productAttribute/data/is_configurable";"productAttribute/data/manage_frontend_label";"productAttribute/data/is_searchable";"productAttribute/data/is_visible_in_advanced_search";"productAttribute/data/is_comparable";"productAttribute/data/is_filterable";"productAttribute/data/is_filterable_in_search";"productAttribute/data/is_used_for_promo_rules";"productAttribute/data/is_html_allowed_on_front";"productAttribute/data/is_visible_on_front";"productAttribute/data/used_in_product_listing";"productAttribute/data/used_for_sort_by";"constraint";"issue"
 "custom_attribute_set";"Text_Field_Admin_%isolation%";"Text Field";"-";"No";"attr_textfield_%isolation%";"-";"default_value_text%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm";""
 "custom_attribute_set";"Text_Field_Admin_%isolation%";"Text Area";"-";"Yes";"attr_textarea_%isolation%";"Store View";"-";"default_value_textarea%isolation%";"-";"-";"No";"-";"Area_Field%isolation%";"Yes";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertAttributeSearchableByLabel, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable";""
-"custom_attribute_set";"Date_Admin_%isolation%";"Date";"-";"No";"attr_date_%isolation%";"-";"-";"-";"n/j/y";"-";"No";"-";"Date_Store_View";"No";"No";"No";"-";"-";"-";"-";"Yes";"Yes";"Yes";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsUsedInSortOnFrontend, assertProductAttributeIsUsedPromoRules";""
+"custom_attribute_set";"Date_Admin_%isolation%";"Date";"-";"No";"attr_date_%isolation%";"-";"-";"-";"n/j/y";"-";"No";"-";"Date_Store_View";"Yes";"Yes";"No";"-";"-";"-";"-";"Yes";"Yes";"Yes";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsUsedInSortOnFrontend, assertProductAttributeIsUsedPromoRules";""
 "custom_attribute_set";"Yes/No_Admin_%isolation%";"Yes/No";"-";"Yes";"attr_yesno_%isolation%";"Global";"-";"-";"-";"No";"-";"-";"Yes/No_Global";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm";""
 "custom_attribute_set";"Multiple_Select_Admin_%isolation%";"Multiple Select";"default";"No";"attr_multiselect_%isolation%";"Website";"-";"-";"-";"-";"Yes";"-";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch, assertAttributeSearchableByLabel, assertAttributeOptionsOnProductForm";""
 "custom_attribute_set";"Dropdown_Admin_%isolation%";"Dropdown";"default";"Yes";"attr_dropdown_%isolation%";"Global";"-";"-";"-";"-";"No";"Yes";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"Yes";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertAttributeSearchableByLabel, assertProductAttributeIsComparable, assertProductAttributeIsUsedInSortOnFrontend, assertProductAttributeIsFilterable, assertProductAttributeIsConfigurable, assertProductAttributeIsFilterableInSearch, assertAttributeOptionsOnProductForm";""
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
index f28721e1af869..359ac790b51b8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
@@ -72,6 +72,7 @@ public function __inject(
      */
     public function test(FixtureFactory $fixtureFactory, CatalogAttributeSet $productTemplate)
     {
+        $this->markTestIncomplete("Bug: MAGETWO-31188");
         // Precondition
         $productTemplate->persist();
         $product = $fixtureFactory->createByCode(
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
index c6ffa4fe99017..33f7ed28456a6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
@@ -78,6 +78,7 @@ public function test(
         CatalogAttributeSet $attributeSetOriginal,
         CatalogProductAttribute $productAttributeOriginal
     ) {
+        $this->markTestIncomplete('CICD-1041');
         // Precondition
         $attributeSetOriginal->persist();
         $productAttributeOriginal->persist();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeFromProductPageStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeFromProductPageStep.php
index 1c2ed122e17b6..edec2d2a97d9b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeFromProductPageStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddNewAttributeFromProductPageStep.php
@@ -49,7 +49,6 @@ public function __construct(CatalogProductEdit $catalogProductEdit, $tabName)
     public function run()
     {
         $productForm = $this->catalogProductEdit->getProductForm();
-        /** @var \Magento\Catalog\Test\Block\Adminhtml\Product\Edit\ProductTab $productDetailsTab */
         $productForm->addNewAttribute($this->tabName);
     }
 }

From c9a960a975b9c25967c77390f7ee45be89da0987 Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Tue, 2 Dec 2014 12:08:44 +0200
Subject: [PATCH 072/474] MTA-774: Stabilize Catalog module. Product Attributes

- Skipp test by bug
---
 .../ProductAttribute/UpdateProductAttributeEntityTest.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
index 41510ab50e9c5..fd53aa92feb0d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
@@ -53,6 +53,7 @@ public function testUpdateProductAttribute(
         CatalogProductAttributeIndex $attributeIndex,
         CatalogProductAttributeNew $attributeNew
     ) {
+        $this->markTestIncomplete('CICD-1041');
         //Precondition
         $productTemplate->persist();
         $productAttributeOriginal->persist();

From 298bc87a2d2b881391701bd9dd5bf490e4fd4c22 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Tue, 2 Dec 2014 12:29:58 +0200
Subject: [PATCH 073/474] MAGETWO-31038: Order isn't placed with multishipping

---
 .../Multishipping/Controller/Checkout/Address/NewShipping.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
index 9ec628bc1dfe6..b7f98ff24e08d 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
@@ -32,7 +32,7 @@ public function execute()
             );
 
             $this->_view->getPage()->getConfig()->getTitle()->set(
-                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getDefaultTitle()
+                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getTitle()->getDefault()
             );
 
             if ($this->_getCheckout()->getCustomerDefaultShippingAddress()) {

From d62d66363fbe886e7624c97fc4562c392703e00a Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Tue, 2 Dec 2014 12:36:12 +0200
Subject: [PATCH 074/474] MAGETWO-31038: Order isn't placed with multishipping

---
 .../Magento/Multishipping/Test/TestCase/MultishippingTest.php    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestCase/MultishippingTest.php b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestCase/MultishippingTest.php
index 7a45314314d09..81826abc59694 100644
--- a/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestCase/MultishippingTest.php
+++ b/dev/tests/functional/tests/app/Magento/Multishipping/Test/TestCase/MultishippingTest.php
@@ -29,7 +29,6 @@ class MultishippingTest extends Functional
      */
     public function testMultishippingCheckout(GuestPaypalDirect $fixture)
     {
-        $this->markTestIncomplete('MAGETWO-28220');
         $fixture->persist();
 
         //Ensure shopping cart is empty

From aa14186d9b0ad5b5f158a126cb2693dc3af816e9 Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Wed, 12 Nov 2014 12:20:50 +0200
Subject: [PATCH 075/474] MAGETWO-30191: Cover installation via UI with
 functional test

---
 dev/build/core_dev/functional/build.xml       |   8 +
 dev/tests/functional/phpunit.xml.dist         |   1 +
 .../Install/Test/Block/CreateAdmin.php        |  35 ++++
 .../Install/Test/Block/CreateAdmin.xml        |  25 +++
 .../Install/Test/Block/CustomizeStore.php     |  35 ++++
 .../Magento/Install/Test/Block/Database.php   |  69 ++++++++
 .../Magento/Install/Test/Block/Database.xml   |  17 ++
 .../Magento/Install/Test/Block/Install.php    |  87 ++++++++++
 .../Magento/Install/Test/Block/Landing.php    |  52 ++++++
 .../Magento/Install/Test/Block/License.php    |  52 ++++++
 .../Magento/Install/Test/Block/Readiness.php  | 120 ++++++++++++++
 .../Install/Test/Block/WebConfiguration.php   |  35 ++++
 .../Install/Test/Block/WebConfiguration.xml   |  15 ++
 .../Constraint/AssertAgreementTextPresent.php |  50 ++++++
 .../Test/Constraint/AssertSuccessfulCheck.php |  62 ++++++++
 .../AssertSuccessfulDbConnection.php          |  50 ++++++
 .../Constraint/AssertSuccessfulInstall.php    |  79 ++++++++++
 .../Magento/Install/Test/Fixture/Install.php  | 130 +++++++++++++++
 .../Magento/Install/Test/Fixture/Install.xml  |  58 +++++++
 .../app/Magento/Install/Test/Page/Install.xml |  53 +++++++
 .../Install/Test/TestCase/InstallTest.php     | 149 ++++++++++++++++++
 .../Test/TestCase/InstallTest/test.csv        |   2 +
 .../app/Magento/Install/Test/etc/fixture.xml  |  58 +++++++
 23 files changed, 1242 insertions(+)
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulCheck.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulDbConnection.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulInstall.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml

diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index ce85b3651a72b..79733ceb9aa65 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -220,6 +220,14 @@
             <replacefilter token="{{tests_configuration}}" value="${env.bamboo_tests_configuration}" />
         </replace>
 
+        <replace file="${dir.build_directory}/instance-${instanceIndex}/build/core_dev/functional/config/install_data.xml">
+            <replacefilter token="{{db_host}}" value="${env.db_host}"/>
+            <replacefilter token="{{db_user}}" value="${env.db_user}"/>
+            <replacefilter token="{{db_password}}" value="${env.db_password}"/>
+            <replacefilter token="{{db_name}}" value="${env.db_name_prefix}${instanceIndex}"/>
+            <replacefilter token="{{url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}"/>
+        </replace>
+
         <script language="javascript"><![CDATA[
             var currentInstance = project.getProperty('instanceIndex');
             if (currentInstance > 0) {
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index bbc7216ef8411..f0a9c556e1a69 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -37,6 +37,7 @@
         <env name="server_config_path" value="config/server.yml.dist"/>
         <env name="isolation_config_path" value="config/isolation.yml.dist"/>
         <env name="handlers_config_path" value="config/handler.yml.dist"/>
+        <env name="handlers_config_path" value="config/install_data.yml.dist"/>
         <env name="configuration:Mtf/TestSuite/InjectableTests" value="basic"/>
         <env name="log_directory" value="var/log"/>
         <env name="events_preset" value="base"/>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
new file mode 100644
index 0000000000000..14206715fec39
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Block;
+
+use Mtf\Block\Form;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Create Admin Account block.
+ */
+class CreateAdmin extends Form
+{
+    /**
+     * 'Next' button.
+     *
+     * @var string
+     */
+    protected $next = "//*[.='Next']";
+
+    /**
+     * Click on 'Next' button.
+     *
+     * @return void
+     */
+    public function clickNext()
+    {
+        $this->_rootElement->find($this->next, Locator::SELECTOR_XPATH)->click();
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml
new file mode 100644
index 0000000000000..1687aeb73e589
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+<mapping strict="1">
+    <fields>
+        <username>
+            <selector>[name='adminUsername']</selector>
+        </username>
+        <email>
+            <selector>[name='adminEmail']</selector>
+        </email>
+        <password>
+            <selector>[name='adminPassword']</selector>
+        </password>
+        <password_confirmation>
+            <selector>[name='adminConfirm']</selector>
+        </password_confirmation>
+    </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
new file mode 100644
index 0000000000000..6c9f1dea17112
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Block;
+
+use Mtf\Block\Form;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Customize Your Store block.
+ */
+class CustomizeStore extends Form
+{
+    /**
+     * 'Next' button.
+     *
+     * @var string
+     */
+    protected $next = "//*[.='Next']";
+
+    /**
+     * Click on 'Next' button.
+     *
+     * @return void
+     */
+    public function clickNext()
+    {
+        $this->_rootElement->find($this->next, Locator::SELECTOR_XPATH)->click();
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
new file mode 100644
index 0000000000000..cad2c49941c14
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Block;
+
+use Mtf\Block\Form;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Database form.
+ */
+class Database extends Form
+{
+    /**
+     * 'Test Connection and Authentication' button.
+     *
+     * @var string
+     */
+    protected $testConnection = '//*[@class="btn btn-default"]';
+
+    /**
+     * 'Test connection successful.' message.
+     *
+     * @var string
+     */
+    protected $successConnectionMessage = "//*[@class='animate-show text-success']";
+
+    /**
+     * 'Next' button.
+     *
+     * @var string
+     */
+    protected $next = "//*[.='Next']";
+
+    /**
+     * Click on 'Test Connection and Authentication' button.
+     *
+     * @return void
+     */
+    public function clickTestConnection()
+    {
+        $this->_rootElement->find($this->testConnection, Locator::SELECTOR_XPATH)->click();
+    }
+
+    /**
+     * Get 'Test connection successful.' message.
+     *
+     * @return string
+     */
+    public function getSuccessConnectionMessage()
+    {
+        return $this->_rootElement->find($this->successConnectionMessage, Locator::SELECTOR_XPATH)->getText();
+    }
+
+    /**
+     * Click on 'Next' button.
+     *
+     * @return void
+     */
+    public function clickNext()
+    {
+        $this->_rootElement->find($this->next, Locator::SELECTOR_XPATH)->click();
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
new file mode 100644
index 0000000000000..3117a39be68a7
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+<mapping strict="1">
+    <fields>
+        <dbHost />
+        <dbUser />
+        <dbPassword />
+        <dbName />
+    </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
new file mode 100644
index 0000000000000..a84d38834d17d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Block;
+
+use Mtf\Block\Block;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Install block.
+ */
+class Install extends Block
+{
+    /**
+     * 'Install Now' button.
+     *
+     * @var string
+     */
+    protected $installNow = "//*[.='Install Now']";
+
+    /**
+     * Admin info block.
+     *
+     * @var string
+     */
+    protected $adminInfo = "//*[@id='admin-info']";
+
+    /**
+     * Database info block.
+     *
+     * @var string
+     */
+    protected $dbInfo = "//*[@id='db-info']";
+
+    /**
+     * 'Launch Magento Admin' button.
+     *
+     * @var string
+     */
+    protected $launchAdmin = "//*[.='Launch Magento Admin']";
+
+    /**
+     * Click on 'Install Now' button.
+     *
+     * @return void
+     */
+    public function clickInstallNow()
+    {
+        $this->_rootElement->find($this->installNow, Locator::SELECTOR_XPATH)->click();
+        $this->waitForElementVisible($this->launchAdmin, Locator::SELECTOR_XPATH);
+    }
+
+    /**
+     * Get admin info.
+     *
+     * @return string
+     */
+    public function getAdminInfo()
+    {
+        return $this->_rootElement->find($this->adminInfo, Locator::SELECTOR_XPATH)->getText();
+    }
+
+    /**
+     * Get database info.
+     *
+     * @return string
+     */
+    public function getDbInfo()
+    {
+        return $this->_rootElement->find($this->dbInfo, Locator::SELECTOR_XPATH)->getText();
+    }
+
+    /**
+     * Click on 'Launch Magento Admin' button.
+     *
+     * @return void
+     */
+    public function clickLaunchAdmin()
+    {
+        $this->_rootElement->find($this->launchAdmin, Locator::SELECTOR_XPATH)->click();
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
new file mode 100644
index 0000000000000..23939df66772b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Block;
+
+use Mtf\Block\Block;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Landing block.
+ */
+class Landing extends Block
+{
+    /**
+     * 'Agree and Set up Magento' button.
+     *
+     * @var string
+     */
+    protected $agreeAndSetup = '//*[@class="btn-lg btn-primary"]';
+
+    /**
+     * 'Terms & Agreement' link.
+     *
+     * @var string
+     */
+    protected $termsAndAgreement = "//*[text()[contains(.,'Terms & Agreement')]]";
+
+    /**
+     * Click on 'Agree and Set up Magento' button.
+     *
+     * @return void
+     */
+    public function clickAgreeAndSetup()
+    {
+        $this->_rootElement->find($this->agreeAndSetup, Locator::SELECTOR_XPATH)->click();
+    }
+
+    /**
+     * Click on 'Terms & Agreement' link.
+     *
+     * @return void
+     */
+    public function clickTermsAndAgreement()
+    {
+        $this->_rootElement->find($this->termsAndAgreement, Locator::SELECTOR_XPATH)->click();
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
new file mode 100644
index 0000000000000..60244ee075c9f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Block;
+
+use Mtf\Block\Block;
+use Mtf\Client\Element\Locator;
+
+/**
+ * License block.
+ */
+class License extends Block
+{
+    /**
+     * 'Back' button.
+     *
+     * @var string
+     */
+    protected $back = "//*[.=' Go Back']";
+
+    /**
+     * License text.
+     *
+     * @var string
+     */
+    protected $license = '//*[@class="col-xs-9"]';
+
+    /**
+     * Click on 'Back' button.
+     *
+     * @return void
+     */
+    public function clickBack()
+    {
+        $this->_rootElement->find($this->back, Locator::SELECTOR_XPATH)->click();
+    }
+
+    /**
+     * Get license text.
+     *
+     * @return string
+     */
+    public function getLicense()
+    {
+        return $this->_rootElement->find($this->license, Locator::SELECTOR_XPATH)->getText();
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
new file mode 100644
index 0000000000000..9f25348ec026f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Block;
+
+use Mtf\Block\Block;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Readiness block.
+ */
+class Readiness extends Block
+{
+    /**
+     * 'Start Readiness Check' button.
+     *
+     * @var string
+     */
+    protected $readinessCheck = "//*[.='Start Readiness Check']";
+
+    /**
+     * 'Next' button.
+     *
+     * @var string
+     */
+    protected $next = "//*[.='Next']";
+
+    /**
+     * 'Completed!' message.
+     *
+     * @var string
+     */
+    protected $completedMessage = "//*[.='Completed!']";
+
+    /**
+     * PHP Version successful check.
+     *
+     * @var string
+     */
+    protected $phpVersionCheck = "//*[@id='php-version'][contains(.,'Your PHP version is correct')]";
+
+    /**
+     * PHP Extensions successful check.
+     *
+     * @var string
+     */
+    protected $phpExtensionCheck = "//*[@id='php-extensions'][contains(.,'You meet 2 out of 2 PHP extensions requirements.')]";
+
+    /**
+     * File Permission check.
+     *
+     * @var string
+     */
+    protected $filePermissionCheck = "//*[@id='php-permissions']";
+
+    /**
+     * Click on 'Start Readiness Check' button.
+     *
+     * @return void
+     */
+    public function clickReadinessCheck()
+    {
+        $this->_rootElement->find($this->readinessCheck, Locator::SELECTOR_XPATH)->click();
+    }
+
+    /**
+     * Click on 'Next' button.
+     *
+     * @return void
+     */
+    public function clickNext()
+    {
+        $this->_rootElement->find($this->next, Locator::SELECTOR_XPATH)->click();
+    }
+
+    /**
+     * Get 'Completed!' message.
+     *
+     * @return string
+     */
+    public function getCompletedMessage()
+    {
+        return $this->_rootElement->find($this->completedMessage, Locator::SELECTOR_XPATH)->getText();
+    }
+
+    /**
+     * Get File Permissions check result.
+     *
+     * @return string
+     */
+    public function getFilePermissionCheck()
+    {
+        return $this->_rootElement->find($this->filePermissionCheck, Locator::SELECTOR_XPATH)->getText();
+    }
+
+    /**
+     * Get PHP Version check result.
+     *
+     * @return string
+     */
+    public function getPhpVersionCheck()
+    {
+        return $this->_rootElement->find($this->phpVersionCheck, Locator::SELECTOR_XPATH)->getText();
+    }
+
+    /**
+     * Get PHP Extensions check result.
+     *
+     * @return string
+     */
+    public function getPhpExtensionsCheck()
+    {
+        return $this->_rootElement->find($this->phpExtensionCheck, Locator::SELECTOR_XPATH)->getText();
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
new file mode 100644
index 0000000000000..d94c97266371b
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Block;
+
+use Mtf\Block\Form;
+use Mtf\Client\Element\Locator;
+
+/**
+ * Web configuration block.
+ */
+class WebConfiguration extends Form
+{
+    /**
+     * 'Next' button.
+     *
+     * @var string
+     */
+    protected $next = "//*[.='Next']";
+
+    /**
+     * Click on 'Next' button.
+     *
+     * @return void
+     */
+    public function clickNext()
+    {
+        $this->_rootElement->find($this->next, Locator::SELECTOR_XPATH)->click();
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
new file mode 100644
index 0000000000000..d6479e13c3b15
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+<mapping strict="1">
+    <fields>
+        <web />
+        <admin />
+    </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
new file mode 100644
index 0000000000000..30ffb4aaf0fab
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Magento\Install\Test\Page\Install;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertAgreementTextPresent
+ * Check that agreement text present on Terms & Agreement page during install.
+ */
+class AssertAgreementTextPresent extends AbstractConstraint
+{
+    /**
+     * Constraint severeness
+     *
+     * @var string
+     */
+    protected $severeness = 'low';
+
+    /**
+     * Assert that part of license agreement text is present on Terms & Agreement page.
+     *
+     * @param Install $installPage
+     * @return void
+     */
+    public function processAssert(Install $installPage)
+    {
+        \PHPUnit_Framework_Assert::assertContains(
+            'Open Software License ("OSL") v. 3.0',
+            $installPage->getLicenseBlock()->getLicense()
+        );
+    }
+
+    /**
+     * Returns a string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return "License agreement text is present on Terms & Agreement page";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulCheck.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulCheck.php
new file mode 100644
index 0000000000000..f6db0c00eb882
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulCheck.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Magento\Install\Test\Page\Install;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertSuccessfulCheck
+ * Check that PHP Version, PHP Extensions and File Permission are ok.
+ */
+class AssertSuccessfulCheck extends AbstractConstraint
+{
+    /**
+     * Constraint severeness
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Assert that PHP Version, PHP Extensions and File Permission are ok.
+     *
+     * @param Install $installPage
+     * @return void
+     */
+    public function processAssert(Install $installPage)
+    {
+        \PHPUnit_Framework_Assert::assertContains(
+            'Completed!',
+            $installPage->getReadinessBlock()->getCompletedMessage()
+        );
+        \PHPUnit_Framework_Assert::assertContains(
+            'Your PHP version is correct',
+            $installPage->getReadinessBlock()->getPhpVersionCheck()
+        );
+        \PHPUnit_Framework_Assert::assertContains(
+            'You meet 2 out of 2 PHP extensions requirements.',
+            $installPage->getReadinessBlock()->getPhpExtensionsCheck()
+        );
+        \PHPUnit_Framework_Assert::assertContains(
+            'You meet 4 out of 4 writable file permission requirements.',
+            $installPage->getReadinessBlock()->getFilePermissionCheck()
+        );
+    }
+
+    /**
+     * Returns a string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return "PHP Version, PHP Extensions and File Permission are ok";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulDbConnection.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulDbConnection.php
new file mode 100644
index 0000000000000..9f4a6dc8d8efc
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulDbConnection.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Magento\Install\Test\Page\Install;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertSuccessfulDbConnection
+ * Check that system can successfully connect to DB
+ */
+class AssertSuccessfulDbConnection extends AbstractConstraint
+{
+    /**
+     * Constraint severeness
+     *
+     * @var string
+     */
+    protected $severeness = 'low';
+
+    /**
+     * Assert that system can successfully connect to DB.
+     *
+     * @param Install $installPage
+     * @return void
+     */
+    public function processAssert(Install $installPage)
+    {
+        \PHPUnit_Framework_Assert::assertContains(
+            'Test connection successful.',
+            $installPage->getDatabaseBlock()->getSuccessConnectionMessage()
+        );
+    }
+
+    /**
+     * Returns a string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return "System successfully connected to DB";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulInstall.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulInstall.php
new file mode 100644
index 0000000000000..c9d7cda2599f0
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulInstall.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Magento\Install\Test\Page\Install;
+use Mtf\Constraint\AbstractConstraint;
+use Magento\User\Test\Fixture\User;
+
+/**
+ * Class AssertSuccessfulInstall
+ * Check that Magento successfully installed.
+ */
+class AssertSuccessfulInstall extends AbstractConstraint
+{
+    /**
+     * Constraint severeness
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Assert that Magento successfully installed.
+     *
+     * @param array $configData
+     * @param User $user
+     * @param Install $installPage
+     * @return void
+     */
+    public function processAssert(Install $installPage, array $configData, User $user)
+    {
+        \PHPUnit_Framework_Assert::assertContains(
+            $user->getUsername(),
+            $installPage->getInstallBlock()->getAdminInfo(),
+            'No admin name'
+        );
+        \PHPUnit_Framework_Assert::assertContains(
+            $user->getEmail(),
+            $installPage->getInstallBlock()->getAdminInfo(),
+            'No admin email'
+        );
+        \PHPUnit_Framework_Assert::assertContains(
+            $configData['web'],
+            $installPage->getInstallBlock()->getAdminInfo(),
+            'No store address'
+        );
+        \PHPUnit_Framework_Assert::assertContains(
+            $configData['admin'],
+            $installPage->getInstallBlock()->getAdminInfo(),
+            'No admin path'
+        );
+        \PHPUnit_Framework_Assert::assertContains(
+            $configData['dbName'],
+            $installPage->getInstallBlock()->getDbInfo(),
+            'No DB name'
+        );
+        \PHPUnit_Framework_Assert::assertContains(
+            $configData['dbUser'],
+            $installPage->getInstallBlock()->getDbInfo(),
+            'No DB username'
+        );
+    }
+
+    /**
+     * Returns a string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return "Install successfully finished";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
new file mode 100644
index 0000000000000..fc795cd9c4047
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Fixture;
+
+use Mtf\Fixture\InjectableFixture;
+
+/**
+ * Class Install
+ */
+class Install extends InjectableFixture
+{
+    /**
+     * @var string
+     */
+    protected $repositoryClass = 'Magento\Install\Test\Repository\Install';
+
+    /**
+     * @var string
+     */
+    protected $handlerInterface = 'Magento\Install\Test\Handler\Install\InstallInterface';
+
+    protected $defaultDataSet = [
+    ];
+
+    protected $dbHost = [
+        'attribute_code' => 'dbHost',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $dbUser = [
+        'attribute_code' => 'dbUser',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $dbPassword = [
+        'attribute_code' => 'dbPassword',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $dbName = [
+        'attribute_code' => 'dbName',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $web = [
+        'attribute_code' => 'web',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $admin = [
+        'attribute_code' => 'admin',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $adminUsername = [
+        'attribute_code' => 'adminUsername',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $adminEmail = [
+        'attribute_code' => 'adminEmail',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $adminPassword = [
+        'attribute_code' => 'adminPassword',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $adminConfirm = [
+        'attribute_code' => 'adminConfirm',
+        'backend_type' => 'virtual',
+    ];
+
+    public function getDbHost()
+    {
+        return $this->getData('dbHost');
+    }
+
+    public function getDbUser()
+    {
+        return $this->getData('dbUser');
+    }
+
+    public function getDbPassword()
+    {
+        return $this->getData('dbPassword');
+    }
+
+    public function getDbName()
+    {
+        return $this->getData('dbName');
+    }
+
+    public function getWeb()
+    {
+        return $this->getData('web');
+    }
+
+    public function getAdmin()
+    {
+        return $this->getData('admin');
+    }
+
+    public function getAdminUsername()
+    {
+        return $this->getData('adminUsername');
+    }
+
+    public function getAdminEmail()
+    {
+        return $this->getData('adminEmail');
+    }
+
+    public function getAdminPassword()
+    {
+        return $this->getData('adminPassword');
+    }
+
+    public function getAdminConfirm()
+    {
+        return $this->getData('adminConfirm');
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
new file mode 100644
index 0000000000000..e04a8ba8eaa8a
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+<fixture class="Magento\Install\Test\Fixture\Install">
+    <module>Magento_Install</module>
+    <type>virtual</type>
+    <entity_type>install</entity_type>
+    <fields>
+        <dbHost>
+            <attribute_code>dbHost</attribute_code>
+            <backend_type>virtual</backend_type>
+        </dbHost>
+        <dbUser>
+            <attribute_code>dbUser</attribute_code>
+            <backend_type>virtual</backend_type>
+        </dbUser>
+        <dbPassword>
+            <attribute_code>dbPassword</attribute_code>
+            <backend_type>virtual</backend_type>
+        </dbPassword>
+        <dbName>
+            <attribute_code>dbName</attribute_code>
+            <backend_type>virtual</backend_type>
+        </dbName>
+        <web>
+            <attribute_code>web</attribute_code>
+            <backend_type>virtual</backend_type>
+        </web>
+        <admin>
+            <attribute_code>admin</attribute_code>
+            <backend_type>virtual</backend_type>
+        </admin>
+        <adminUsername>
+            <attribute_code>adminUsername</attribute_code>
+            <backend_type>virtual</backend_type>
+        </adminUsername>
+        <adminEmail>
+            <attribute_code>adminEmail</attribute_code>
+            <backend_type>virtual</backend_type>
+        </adminEmail>
+        <adminPassword>
+            <attribute_code>adminPassword</attribute_code>
+            <backend_type>virtual</backend_type>
+        </adminPassword>
+        <adminConfirm>
+            <attribute_code>adminConfirm</attribute_code>
+            <backend_type>virtual</backend_type>
+        </adminConfirm>
+    </fields>
+    <repository_class>Magento\Install\Test\Repository\Install</repository_class>
+    <handler_interface>Magento\Install\Test\Handler\Install\InstallInterface</handler_interface>
+</fixture>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml
new file mode 100644
index 0000000000000..8857bccbd2b47
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+<page mca="setup/" module="Magento_Install">
+    <blocks>
+        <landingBlock>
+            <class>Magento\Install\Test\Block\Landing</class>
+            <locator>body</locator>
+            <strategy>css selector</strategy>
+        </landingBlock>
+        <licenseBlock>
+            <class>Magento\Install\Test\Block\License</class>
+            <locator>body</locator>
+            <strategy>css selector</strategy>
+        </licenseBlock>
+        <readinessBlock>
+            <class>Magento\Install\Test\Block\Readiness</class>
+            <locator>body</locator>
+            <strategy>css selector</strategy>
+        </readinessBlock>
+        <databaseBlock>
+            <class>Magento\Install\Test\Block\Database</class>
+            <locator>body</locator>
+            <strategy>css selector</strategy>
+        </databaseBlock>
+        <webConfigBlock>
+            <class>Magento\Install\Test\Block\WebConfiguration</class>
+            <locator>body</locator>
+            <strategy>css selector</strategy>
+        </webConfigBlock>
+        <customizeStoreBlock>
+            <class>Magento\Install\Test\Block\CustomizeStore</class>
+            <locator>body</locator>
+            <strategy>css selector</strategy>
+        </customizeStoreBlock>
+        <createAdminBlock>
+            <class>Magento\Install\Test\Block\CreateAdmin</class>
+            <locator>body</locator>
+            <strategy>css selector</strategy>
+        </createAdminBlock>
+        <installBlock>
+            <class>Magento\Install\Test\Block\Install</class>
+            <locator>body</locator>
+            <strategy>css selector</strategy>
+        </installBlock>
+    </blocks>
+</page>
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
new file mode 100644
index 0000000000000..434cd04a31ec4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\TestCase;
+
+use Magento\Cms\Test\Page\CmsIndex;
+use Magento\Install\Test\Page\Install;
+use Magento\User\Test\Fixture\User;
+use Mtf\Fixture\FixtureFactory;
+use Mtf\TestCase\Injectable;
+use Mtf\ObjectManager;
+use Magento\Install\Test\Constraint\AssertAgreementTextPresent;
+use Magento\Install\Test\Constraint\AssertSuccessfulCheck;
+use Magento\Install\Test\Constraint\AssertSuccessfulDbConnection;
+use Magento\Install\Test\Constraint\AssertSuccessfulInstall;
+
+/**
+ * Test Flow:
+ *
+ * Preconditions
+ * 1. Uninstall Magento.
+ *
+ * Steps
+ * 1. Go setup landing page.
+ * 2. Click on "Terms and agreements" button.
+ * 3. Check license agreement text.
+ * 4. Return back to landing page and click "Agree and Setup" button.
+ * 5. Click "Start Readiness Check" button.
+ * 6. Make sure PHP Version, PHP Extensions and File Permission are ok.
+ * 7. Click "Next" and fill DB credentials.
+ * 8. Click "Test Connection and Authentication" and make sure connection successful.
+ * 9. Click "Next" and fill store address and admin path.
+ * 10. Click "Next" and leave all default values.
+ * 11. Click "Next" and fill admin user info.
+ * 12. Click "Next" and on the "Step 6: Install" page click "Install Now" button.
+ * 13. Perform assertions.
+ *
+ * @group Installer and Upgrade/Downgrade (PS)
+ * @ZephyrId MAGETWO-15081
+ */
+class InstallTest extends Injectable
+{
+    /**
+     * Uninstall Magento before test.
+     *
+     * @param FixtureFactory $fixtureFactory
+     * @return array
+     */
+    public function __prepare(FixtureFactory $fixtureFactory)
+    {
+        $magentoBaseDir = dirname(dirname(dirname(MTF_BP)));
+        $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config');
+        // database
+        $configData = $systemConfig->getConfigParam('install_data/db_credentials');
+        //url
+        $urlConfig = $systemConfig->getConfigParam('install_data/url');
+        $configData['web'] = $urlConfig['base_url'];
+        $configData['admin'] = $urlConfig['backend_frontname'];
+        // admin user
+        $adminCredentials = $systemConfig->getConfigParam('application/backend_user_credentials');
+        $userData['username'] = $adminCredentials['login'];
+        $userData['password'] = $adminCredentials['password'];
+        $userData['password_confirmation'] = $adminCredentials['password'];
+        $user = $fixtureFactory->createByCode('user', ['dataSet' => 'default', 'data' => $userData]);
+        shell_exec("php -f $magentoBaseDir/setup/index.php uninstall");
+        return ['configData' => $configData, 'user' => $user];
+    }
+
+    /**
+     * @var Install
+     */
+    protected $installPage;
+
+    /**
+     * @var CmsIndex
+     */
+    protected $homePage;
+
+    /**
+     * Injection data.
+     *
+     * @param CmsIndex $homePage
+     * @param Install $installPage
+     * @return void
+     */
+    public function __inject(Install $installPage, CmsIndex $homePage)
+    {
+        $this->installPage = $installPage;
+        $this->homePage = $homePage;
+    }
+
+    /**
+     * Install Magento via web interface.
+     *
+     * @param array $configData
+     * @param User $user
+     * @param FixtureFactory $fixtureFactory
+     * @param AssertAgreementTextPresent $assertLicense
+     * @param AssertSuccessfulCheck $assertReadiness
+     * @param AssertSuccessfulDbConnection $assertDbConnection
+     * @param AssertSuccessfulInstall $assertInstall
+     * @return void
+     */
+    public function test(
+        array $configData,
+        User $user,
+        FixtureFactory $fixtureFactory,
+        AssertAgreementTextPresent $assertLicense,
+        AssertSuccessfulCheck $assertReadiness,
+        AssertSuccessfulDbConnection $assertDbConnection,
+        AssertSuccessfulInstall $assertInstall
+    ) {
+        // Preconditions
+        $installConfig = $fixtureFactory->createByCode('install', ['data' => $configData]);
+        // Steps
+        $this->homePage->open();
+        // Verify license agreement
+        $this->installPage->getLandingBlock()->clickTermsAndAgreement();
+        $assertLicense->processAssert($this->installPage);
+        $this->installPage->getLicenseBlock()->clickBack();
+        $this->installPage->getLandingBlock()->clickAgreeAndSetup();
+        // Step 1: Readiness Check
+        $this->installPage->getReadinessBlock()->clickReadinessCheck();
+        $assertReadiness->processAssert($this->installPage);
+        $this->installPage->getReadinessBlock()->clickNext();
+        // Step 2: Add a Database
+        $this->installPage->getDatabaseBlock()->fill($installConfig);
+        $this->installPage->getDatabaseBlock()->clickTestConnection();
+        $assertDbConnection->processAssert($this->installPage);
+        $this->installPage->getDatabaseBlock()->clickNext();
+        // Step 3: Web Configuration
+        $this->installPage->getWebConfigBlock()->fill($installConfig);
+        $this->installPage->getWebConfigBlock()->clickNext();
+        // Step 4: Customize Your Store
+        $this->installPage->getCustomizeStoreBlock()->clickNext();
+        // Step 5: Create Admin Account
+        $this->installPage->getCreateAdminBlock()->fill($user);
+        $this->installPage->getCreateAdminBlock()->clickNext();
+        // Step 6: Install
+        $this->installPage->getInstallBlock()->clickInstallNow();
+        $assertInstall->processAssert($this->installPage,$configData,$user);
+        $this->installPage->getInstallBlock()->clickLaunchAdmin();
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
new file mode 100644
index 0000000000000..b2bc7ca184274
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
@@ -0,0 +1,2 @@
+"constraint"
+"assertUserSuccessLogin"
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
new file mode 100644
index 0000000000000..fd19c31ebc17f
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+
+<fixture>
+    <install module="Magento_Install">
+        <type>virtual</type>
+        <entity_type>install</entity_type>
+        <fields>
+            <dbHost>
+                <attribute_code>dbHost</attribute_code>
+                <backend_type>virtual</backend_type>
+            </dbHost>
+            <dbUser>
+                <attribute_code>dbUser</attribute_code>
+                <backend_type>virtual</backend_type>
+            </dbUser>
+            <dbPassword>
+                <attribute_code>dbPassword</attribute_code>
+                <backend_type>virtual</backend_type>
+            </dbPassword>
+            <dbName>
+                <attribute_code>dbName</attribute_code>
+                <backend_type>virtual</backend_type>
+            </dbName>
+            <web>
+                <attribute_code>web</attribute_code>
+                <backend_type>virtual</backend_type>
+            </web>
+            <admin>
+                <attribute_code>admin</attribute_code>
+                <backend_type>virtual</backend_type>
+            </admin>
+            <adminUsername>
+                <attribute_code>adminUsername</attribute_code>
+                <backend_type>virtual</backend_type>
+            </adminUsername>
+            <adminEmail>
+                <attribute_code>adminEmail</attribute_code>
+                <backend_type>virtual</backend_type>
+            </adminEmail>
+            <adminPassword>
+                <attribute_code>adminPassword</attribute_code>
+                <backend_type>virtual</backend_type>
+            </adminPassword>
+            <adminConfirm>
+                <attribute_code>adminConfirm</attribute_code>
+                <backend_type>virtual</backend_type>
+            </adminConfirm>
+        </fields>
+    </install>
+</fixture>

From 4ee38c90db62429b396acd8c5ce9a274abbd4a64 Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Fri, 28 Nov 2014 14:08:58 +0200
Subject: [PATCH 076/474] MAGETWO-30191: Cover installation via UI with
 functional test

---
 dev/build/core_dev/functional/build.xml       |  2 +-
 .../functional/config/install_data.yml.dist   |  8 ++
 .../functional/config/install_data.yml.dist   |  8 ++
 dev/tests/functional/phpunit.xml.dist         |  2 +-
 .../Install/Test/Block/CreateAdmin.php        |  6 +-
 .../Install/Test/Block/CustomizeStore.php     |  6 +-
 .../Magento/Install/Test/Block/Database.php   | 14 +--
 .../Magento/Install/Test/Block/Install.php    | 26 ++++--
 .../Magento/Install/Test/Block/Landing.php    | 10 +--
 .../Magento/Install/Test/Block/License.php    | 10 +--
 .../Magento/Install/Test/Block/Readiness.php  | 37 +++-----
 .../Install/Test/Block/WebConfiguration.php   |  6 +-
 .../Constraint/AssertAgreementTextPresent.php | 15 ++--
 ...tion.php => AssertSuccessDbConnection.php} | 20 +++--
 .../Test/Constraint/AssertSuccessInstall.php  | 90 +++++++++++++++++++
 .../Constraint/AssertSuccessfulInstall.php    | 79 ----------------
 ...php => AssertSuccessfulReadinessCheck.php} | 41 ++++++---
 .../Magento/Install/Test/Fixture/Install.xml  | 20 -----
 .../Install/Test/TestCase/InstallTest.php     | 73 ++++++++-------
 .../app/Magento/Install/Test/etc/fixture.xml  | 20 -----
 .../app/Magento/Install/Test/etc/page.xml     | 15 ++++
 21 files changed, 274 insertions(+), 234 deletions(-)
 create mode 100644 dev/build/core_dev/functional/config/install_data.yml.dist
 create mode 100644 dev/tests/functional/config/install_data.yml.dist
 rename dev/tests/functional/tests/app/Magento/Install/Test/Constraint/{AssertSuccessfulDbConnection.php => AssertSuccessDbConnection.php} (62%)
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
 delete mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulInstall.php
 rename dev/tests/functional/tests/app/Magento/Install/Test/Constraint/{AssertSuccessfulCheck.php => AssertSuccessfulReadinessCheck.php} (60%)
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml

diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index 79733ceb9aa65..432154b2cb4da 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -220,7 +220,7 @@
             <replacefilter token="{{tests_configuration}}" value="${env.bamboo_tests_configuration}" />
         </replace>
 
-        <replace file="${dir.build_directory}/instance-${instanceIndex}/build/core_dev/functional/config/install_data.xml">
+        <replace file="${dir.build_directory}/instance-${instanceIndex}/build/core_dev/functional/config/install_data.yml">
             <replacefilter token="{{db_host}}" value="${env.db_host}"/>
             <replacefilter token="{{db_user}}" value="${env.db_user}"/>
             <replacefilter token="{{db_password}}" value="${env.db_password}"/>
diff --git a/dev/build/core_dev/functional/config/install_data.yml.dist b/dev/build/core_dev/functional/config/install_data.yml.dist
new file mode 100644
index 0000000000000..a9d5c87a2ee31
--- /dev/null
+++ b/dev/build/core_dev/functional/config/install_data.yml.dist
@@ -0,0 +1,8 @@
+db_credentials:
+    dbHost: {{db_host}}
+    dbUser: {{db_user}}
+    dbPassword: {{db_password}}
+    dbName: {{db_name}}
+url:
+    base_url: {{url}}
+    backend_frontname: backend
diff --git a/dev/tests/functional/config/install_data.yml.dist b/dev/tests/functional/config/install_data.yml.dist
new file mode 100644
index 0000000000000..d2de7317566e3
--- /dev/null
+++ b/dev/tests/functional/config/install_data.yml.dist
@@ -0,0 +1,8 @@
+db_credentials:
+    dbHost: '127.0.0.1'
+    dbUser: 'root'
+    dbPassword: ''
+    dbName: 'database_name'
+url:
+    base_url: 'http://127.0.0.1/magento2/index.php/'
+    backend_frontname: 'backend'
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index f0a9c556e1a69..f181ed3cca1d4 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -37,7 +37,7 @@
         <env name="server_config_path" value="config/server.yml.dist"/>
         <env name="isolation_config_path" value="config/isolation.yml.dist"/>
         <env name="handlers_config_path" value="config/handler.yml.dist"/>
-        <env name="handlers_config_path" value="config/install_data.yml.dist"/>
+        <env name="install_config_path" value="config/install_data.yml.dist"/>
         <env name="configuration:Mtf/TestSuite/InjectableTests" value="basic"/>
         <env name="log_directory" value="var/log"/>
         <env name="events_preset" value="base"/>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
index 14206715fec39..38ce82d5ca9e9 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
@@ -21,7 +21,7 @@ class CreateAdmin extends Form
      *
      * @var string
      */
-    protected $next = "//*[.='Next']";
+    protected $next = "[ng-click*='next']";
 
     /**
      * Click on 'Next' button.
@@ -30,6 +30,6 @@ class CreateAdmin extends Form
      */
     public function clickNext()
     {
-        $this->_rootElement->find($this->next, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
index 6c9f1dea17112..fbf0c11b960b8 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
@@ -21,7 +21,7 @@ class CustomizeStore extends Form
      *
      * @var string
      */
-    protected $next = "//*[.='Next']";
+    protected $next = "[ng-click*='next']";
 
     /**
      * Click on 'Next' button.
@@ -30,6 +30,6 @@ class CustomizeStore extends Form
      */
     public function clickNext()
     {
-        $this->_rootElement->find($this->next, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
index cad2c49941c14..ecf02fc465917 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
@@ -21,21 +21,21 @@ class Database extends Form
      *
      * @var string
      */
-    protected $testConnection = '//*[@class="btn btn-default"]';
+    protected $testConnection = '.btn-default';
 
     /**
      * 'Test connection successful.' message.
      *
      * @var string
      */
-    protected $successConnectionMessage = "//*[@class='animate-show text-success']";
+    protected $successConnectionMessage = ".text-success";
 
     /**
      * 'Next' button.
      *
      * @var string
      */
-    protected $next = "//*[.='Next']";
+    protected $next = "[ng-click*='next']";
 
     /**
      * Click on 'Test Connection and Authentication' button.
@@ -44,7 +44,7 @@ class Database extends Form
      */
     public function clickTestConnection()
     {
-        $this->_rootElement->find($this->testConnection, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->testConnection, Locator::SELECTOR_CSS)->click();
     }
 
     /**
@@ -54,7 +54,7 @@ public function clickTestConnection()
      */
     public function getSuccessConnectionMessage()
     {
-        return $this->_rootElement->find($this->successConnectionMessage, Locator::SELECTOR_XPATH)->getText();
+        return $this->_rootElement->find($this->successConnectionMessage, Locator::SELECTOR_CSS)->getText();
     }
 
     /**
@@ -64,6 +64,6 @@ public function getSuccessConnectionMessage()
      */
     public function clickNext()
     {
-        $this->_rootElement->find($this->next, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
index a84d38834d17d..99c7a78c15b82 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
@@ -21,7 +21,7 @@ class Install extends Block
      *
      * @var string
      */
-    protected $installNow = "//*[.='Install Now']";
+    protected $installNow = "//*[@ng-show='!isStarted']/button";
 
     /**
      * Admin info block.
@@ -42,7 +42,7 @@ class Install extends Block
      *
      * @var string
      */
-    protected $launchAdmin = "//*[.='Launch Magento Admin']";
+    protected $launchAdmin = "//*[@type='button']";
 
     /**
      * Click on 'Install Now' button.
@@ -62,7 +62,15 @@ public function clickInstallNow()
      */
     public function getAdminInfo()
     {
-        return $this->_rootElement->find($this->adminInfo, Locator::SELECTOR_XPATH)->getText();
+        $adminData = [];
+        $rows = $this->_rootElement->find('#admin-info .row')->getElements();
+        foreach ($rows as $row) {
+            $dataRow = $row->find('div')->getElements();
+            $key = strtolower(str_replace(' ', '_', str_replace(':', '', $dataRow[0]->getText())));
+            $adminData[$key] = $dataRow[1]->getText();
+        }
+
+        return $adminData;
     }
 
     /**
@@ -72,7 +80,15 @@ public function getAdminInfo()
      */
     public function getDbInfo()
     {
-        return $this->_rootElement->find($this->dbInfo, Locator::SELECTOR_XPATH)->getText();
+        $dbData = [];
+        $rows = $this->_rootElement->find('#db-info .row')->getElements();
+        foreach ($rows as $row) {
+            $dataRow = $row->find('div')->getElements();
+            $key = strtolower(str_replace(' ', '_', str_replace(':', '', $dataRow[0]->getText())));
+            $dbData[$key] = $dataRow[1]->getText();
+        }
+
+        return $dbData;
     }
 
     /**
@@ -84,4 +100,4 @@ public function clickLaunchAdmin()
     {
         $this->_rootElement->find($this->launchAdmin, Locator::SELECTOR_XPATH)->click();
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
index 23939df66772b..3308d69583aad 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
@@ -21,14 +21,14 @@ class Landing extends Block
      *
      * @var string
      */
-    protected $agreeAndSetup = '//*[@class="btn-lg btn-primary"]';
+    protected $agreeAndSetup = '.btn-lg.btn-primary';
 
     /**
      * 'Terms & Agreement' link.
      *
      * @var string
      */
-    protected $termsAndAgreement = "//*[text()[contains(.,'Terms & Agreement')]]";
+    protected $termsAndAgreement = "[ng-click*='previous']";
 
     /**
      * Click on 'Agree and Set up Magento' button.
@@ -37,7 +37,7 @@ class Landing extends Block
      */
     public function clickAgreeAndSetup()
     {
-        $this->_rootElement->find($this->agreeAndSetup, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->agreeAndSetup, Locator::SELECTOR_CSS)->click();
     }
 
     /**
@@ -47,6 +47,6 @@ public function clickAgreeAndSetup()
      */
     public function clickTermsAndAgreement()
     {
-        $this->_rootElement->find($this->termsAndAgreement, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->termsAndAgreement, Locator::SELECTOR_CSS)->click();
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
index 60244ee075c9f..dcc402e2cd050 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
@@ -21,14 +21,14 @@ class License extends Block
      *
      * @var string
      */
-    protected $back = "//*[.=' Go Back']";
+    protected $back = '.btn.btn-primary';
 
     /**
      * License text.
      *
      * @var string
      */
-    protected $license = '//*[@class="col-xs-9"]';
+    protected $license = '.container.ng-scope';
 
     /**
      * Click on 'Back' button.
@@ -37,7 +37,7 @@ class License extends Block
      */
     public function clickBack()
     {
-        $this->_rootElement->find($this->back, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->back, Locator::SELECTOR_CSS)->click();
     }
 
     /**
@@ -47,6 +47,6 @@ public function clickBack()
      */
     public function getLicense()
     {
-        return $this->_rootElement->find($this->license, Locator::SELECTOR_XPATH)->getText();
+        return $this->_rootElement->find($this->license, Locator::SELECTOR_CSS)->getText();
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
index 9f25348ec026f..9463367b61a56 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
@@ -21,42 +21,42 @@ class Readiness extends Block
      *
      * @var string
      */
-    protected $readinessCheck = "//*[.='Start Readiness Check']";
+    protected $readinessCheck = "[ng-click*='state.go']";
 
     /**
      * 'Next' button.
      *
      * @var string
      */
-    protected $next = "//*[.='Next']";
+    protected $next = "[ng-click*='next']";
 
     /**
      * 'Completed!' message.
-     *
+     * [ng-switch-when="true"]
      * @var string
      */
-    protected $completedMessage = "//*[.='Completed!']";
+    protected $completedMessage = '[ng-switch-when="true"]';
 
     /**
      * PHP Version successful check.
      *
      * @var string
      */
-    protected $phpVersionCheck = "//*[@id='php-version'][contains(.,'Your PHP version is correct')]";
+    protected $phpVersionCheck = '#php-version';
 
     /**
      * PHP Extensions successful check.
      *
      * @var string
      */
-    protected $phpExtensionCheck = "//*[@id='php-extensions'][contains(.,'You meet 2 out of 2 PHP extensions requirements.')]";
+    protected $phpExtensionCheck = '#php-extensions';
 
     /**
      * File Permission check.
      *
      * @var string
      */
-    protected $filePermissionCheck = "//*[@id='php-permissions']";
+    protected $filePermissionCheck = '#php-permissions';
 
     /**
      * Click on 'Start Readiness Check' button.
@@ -65,7 +65,8 @@ class Readiness extends Block
      */
     public function clickReadinessCheck()
     {
-        $this->_rootElement->find($this->readinessCheck, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->readinessCheck, Locator::SELECTOR_CSS)->click();
+        $this->waitForElementVisible($this->completedMessage, Locator::SELECTOR_CSS);
     }
 
     /**
@@ -75,17 +76,7 @@ public function clickReadinessCheck()
      */
     public function clickNext()
     {
-        $this->_rootElement->find($this->next, Locator::SELECTOR_XPATH)->click();
-    }
-
-    /**
-     * Get 'Completed!' message.
-     *
-     * @return string
-     */
-    public function getCompletedMessage()
-    {
-        return $this->_rootElement->find($this->completedMessage, Locator::SELECTOR_XPATH)->getText();
+        $this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
     }
 
     /**
@@ -95,7 +86,7 @@ public function getCompletedMessage()
      */
     public function getFilePermissionCheck()
     {
-        return $this->_rootElement->find($this->filePermissionCheck, Locator::SELECTOR_XPATH)->getText();
+        return $this->_rootElement->find($this->filePermissionCheck, Locator::SELECTOR_CSS)->getText();
     }
 
     /**
@@ -105,7 +96,7 @@ public function getFilePermissionCheck()
      */
     public function getPhpVersionCheck()
     {
-        return $this->_rootElement->find($this->phpVersionCheck, Locator::SELECTOR_XPATH)->getText();
+        return $this->_rootElement->find($this->phpVersionCheck, Locator::SELECTOR_CSS)->getText();
     }
 
     /**
@@ -115,6 +106,6 @@ public function getPhpVersionCheck()
      */
     public function getPhpExtensionsCheck()
     {
-        return $this->_rootElement->find($this->phpExtensionCheck, Locator::SELECTOR_XPATH)->getText();
+        return $this->_rootElement->find($this->phpExtensionCheck, Locator::SELECTOR_CSS)->getText();
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
index d94c97266371b..838318e05ca61 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
@@ -21,7 +21,7 @@ class WebConfiguration extends Form
      *
      * @var string
      */
-    protected $next = "//*[.='Next']";
+    protected $next = "[ng-click*='next']";
 
     /**
      * Click on 'Next' button.
@@ -30,6 +30,6 @@ class WebConfiguration extends Form
      */
     public function clickNext()
     {
-        $this->_rootElement->find($this->next, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
index 30ffb4aaf0fab..1833d86fc85bc 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
@@ -12,13 +12,17 @@
 use Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertAgreementTextPresent
  * Check that agreement text present on Terms & Agreement page during install.
  */
 class AssertAgreementTextPresent extends AbstractConstraint
 {
     /**
-     * Constraint severeness
+     * Part of license agreement text.
+     */
+    const LICENSE_AGREEMENT_TEXT = 'Open Software License ("OSL") v. 3.0';
+
+    /**
+     * Constraint severeness.
      *
      * @var string
      */
@@ -33,8 +37,9 @@ class AssertAgreementTextPresent extends AbstractConstraint
     public function processAssert(Install $installPage)
     {
         \PHPUnit_Framework_Assert::assertContains(
-            'Open Software License ("OSL") v. 3.0',
-            $installPage->getLicenseBlock()->getLicense()
+            self::LICENSE_AGREEMENT_TEXT,
+            $installPage->getLicenseBlock()->getLicense(),
+            'License agreement text is absent.'
         );
     }
 
@@ -45,6 +50,6 @@ public function processAssert(Install $installPage)
      */
     public function toString()
     {
-        return "License agreement text is present on Terms & Agreement page";
+        return "License agreement text is present on Terms & Agreement page.";
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulDbConnection.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php
similarity index 62%
rename from dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulDbConnection.php
rename to dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php
index 9f4a6dc8d8efc..de0997077afee 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulDbConnection.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php
@@ -12,13 +12,17 @@
 use Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertSuccessfulDbConnection
- * Check that system can successfully connect to DB
+ * Check that system can successfully connect to DB.
  */
-class AssertSuccessfulDbConnection extends AbstractConstraint
+class AssertSuccessDbConnection extends AbstractConstraint
 {
     /**
-     * Constraint severeness
+     * Successful connection message.
+     */
+    const SUCCESSFUL_CONNECTION = 'Test connection successful.';
+
+    /**
+     * Constraint severeness.
      *
      * @var string
      */
@@ -32,9 +36,11 @@ class AssertSuccessfulDbConnection extends AbstractConstraint
      */
     public function processAssert(Install $installPage)
     {
+        $installPage->getDatabaseBlock()->clickTestConnection();
         \PHPUnit_Framework_Assert::assertContains(
-            'Test connection successful.',
-            $installPage->getDatabaseBlock()->getSuccessConnectionMessage()
+            self::SUCCESSFUL_CONNECTION,
+            $installPage->getDatabaseBlock()->getSuccessConnectionMessage(),
+            'Unable to connect to database.'
         );
     }
 
@@ -45,6 +51,6 @@ public function processAssert(Install $installPage)
      */
     public function toString()
     {
-        return "System successfully connected to DB";
+        return "System successfully connected to DB.";
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
new file mode 100644
index 0000000000000..19fbbf5ee12ef
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Magento\Install\Test\Page\Install;
+use Mtf\Constraint\AbstractConstraint;
+use Magento\User\Test\Fixture\User;
+
+/**
+ * Check that Magento successfully installed.
+ */
+class AssertSuccessInstall extends AbstractConstraint
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'high';
+
+    /**
+     * Admin info fields mapping.
+     *
+     * @var array
+     */
+    protected $adminFieldsList = [
+        ['pageData' => 'username', 'fixture' => 'username'],
+        ['pageData' => 'e-mail', 'fixture' => 'email'],
+        ['pageData' => 'your_store_address', 'fixture' => 'web'],
+        ['pageData' => 'magento_admin_address', 'fixture' => 'admin']
+    ];
+
+    /**
+     * Database info fields mapping.
+     *
+     * @var array
+     */
+    protected $dbFieldsList = [
+        ['pageData' => 'database_name', 'fixture' => 'dbName'],
+        ['pageData' => 'username', 'fixture' => 'dbUser']
+    ];
+
+    /**
+     * Assert that Magento successfully installed.
+     *
+     * @param $installConfig
+     * @param User $user
+     * @param Install $installPage
+     * @return void
+     */
+    public function processAssert(Install $installPage, $installConfig, User $user)
+    {
+        $adminData = $installPage->getInstallBlock()->getAdminInfo();
+        $dbData = $installPage->getInstallBlock()->getDbInfo();
+
+        $allData = array_merge($user->getData(), $installConfig->getData());
+        $allData['admin'] = $allData['web'] . $allData['admin'] . '/';
+
+        foreach ($this->adminFieldsList as $field) {
+            \PHPUnit_Framework_Assert::assertEquals(
+                $allData[$field['fixture']],
+                $adminData[$field['pageData']],
+                'Wrong admin information is displayed.'
+            );
+        }
+        foreach ($this->dbFieldsList as $field) {
+            \PHPUnit_Framework_Assert::assertEquals(
+                $allData[$field['fixture']],
+                $dbData[$field['pageData']],
+                'Wrong database information is displayed.'
+            );
+        }
+    }
+
+    /**
+     * Returns a string representation of successful assertion.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return "Install successfully finished.";
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulInstall.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulInstall.php
deleted file mode 100644
index c9d7cda2599f0..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulInstall.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-namespace Magento\Install\Test\Constraint;
-
-use Magento\Install\Test\Page\Install;
-use Mtf\Constraint\AbstractConstraint;
-use Magento\User\Test\Fixture\User;
-
-/**
- * Class AssertSuccessfulInstall
- * Check that Magento successfully installed.
- */
-class AssertSuccessfulInstall extends AbstractConstraint
-{
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
-
-    /**
-     * Assert that Magento successfully installed.
-     *
-     * @param array $configData
-     * @param User $user
-     * @param Install $installPage
-     * @return void
-     */
-    public function processAssert(Install $installPage, array $configData, User $user)
-    {
-        \PHPUnit_Framework_Assert::assertContains(
-            $user->getUsername(),
-            $installPage->getInstallBlock()->getAdminInfo(),
-            'No admin name'
-        );
-        \PHPUnit_Framework_Assert::assertContains(
-            $user->getEmail(),
-            $installPage->getInstallBlock()->getAdminInfo(),
-            'No admin email'
-        );
-        \PHPUnit_Framework_Assert::assertContains(
-            $configData['web'],
-            $installPage->getInstallBlock()->getAdminInfo(),
-            'No store address'
-        );
-        \PHPUnit_Framework_Assert::assertContains(
-            $configData['admin'],
-            $installPage->getInstallBlock()->getAdminInfo(),
-            'No admin path'
-        );
-        \PHPUnit_Framework_Assert::assertContains(
-            $configData['dbName'],
-            $installPage->getInstallBlock()->getDbInfo(),
-            'No DB name'
-        );
-        \PHPUnit_Framework_Assert::assertContains(
-            $configData['dbUser'],
-            $installPage->getInstallBlock()->getDbInfo(),
-            'No DB username'
-        );
-    }
-
-    /**
-     * Returns a string representation of successful assertion.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return "Install successfully finished";
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulCheck.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
similarity index 60%
rename from dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulCheck.php
rename to dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
index f6db0c00eb882..41a9888407c7a 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
@@ -12,13 +12,27 @@
 use Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertSuccessfulCheck
  * Check that PHP Version, PHP Extensions and File Permission are ok.
  */
-class AssertSuccessfulCheck extends AbstractConstraint
+class AssertSuccessfulReadinessCheck extends AbstractConstraint
 {
     /**
-     * Constraint severeness
+     * PHP version message.
+     */
+    const PHP_VERSION_MESSAGE = 'Your PHP version is correct';
+
+    /**
+     * PHP extensions message.
+     */
+    const PHP_EXTENSIONS_MESSAGE = 'You meet 2 out of 2 PHP extensions requirements.';
+
+    /**
+     * File permission message.
+     */
+    const FILE_PERMISSION_MESSAGE = 'You meet 4 out of 4 writable file permission requirements.';
+
+    /**
+     * Constraint severeness.
      *
      * @var string
      */
@@ -33,20 +47,19 @@ class AssertSuccessfulCheck extends AbstractConstraint
     public function processAssert(Install $installPage)
     {
         \PHPUnit_Framework_Assert::assertContains(
-            'Completed!',
-            $installPage->getReadinessBlock()->getCompletedMessage()
-        );
-        \PHPUnit_Framework_Assert::assertContains(
-            'Your PHP version is correct',
-            $installPage->getReadinessBlock()->getPhpVersionCheck()
+            self::PHP_VERSION_MESSAGE,
+            $installPage->getReadinessBlock()->getPhpVersionCheck(),
+            'PHP version is incorrect.'
         );
         \PHPUnit_Framework_Assert::assertContains(
-            'You meet 2 out of 2 PHP extensions requirements.',
-            $installPage->getReadinessBlock()->getPhpExtensionsCheck()
+            self::PHP_EXTENSIONS_MESSAGE,
+            $installPage->getReadinessBlock()->getPhpExtensionsCheck(),
+            'PHP extensions missed.'
         );
         \PHPUnit_Framework_Assert::assertContains(
-            'You meet 4 out of 4 writable file permission requirements.',
-            $installPage->getReadinessBlock()->getFilePermissionCheck()
+            self::FILE_PERMISSION_MESSAGE,
+            $installPage->getReadinessBlock()->getFilePermissionCheck(),
+            'File permissions does not meet requirements.'
         );
     }
 
@@ -57,6 +70,6 @@ public function processAssert(Install $installPage)
      */
     public function toString()
     {
-        return "PHP Version, PHP Extensions and File Permission are ok";
+        return "PHP Version, PHP Extensions and File Permission are ok.";
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
index e04a8ba8eaa8a..06d50c1e73769 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
@@ -32,26 +32,6 @@
             <attribute_code>web</attribute_code>
             <backend_type>virtual</backend_type>
         </web>
-        <admin>
-            <attribute_code>admin</attribute_code>
-            <backend_type>virtual</backend_type>
-        </admin>
-        <adminUsername>
-            <attribute_code>adminUsername</attribute_code>
-            <backend_type>virtual</backend_type>
-        </adminUsername>
-        <adminEmail>
-            <attribute_code>adminEmail</attribute_code>
-            <backend_type>virtual</backend_type>
-        </adminEmail>
-        <adminPassword>
-            <attribute_code>adminPassword</attribute_code>
-            <backend_type>virtual</backend_type>
-        </adminPassword>
-        <adminConfirm>
-            <attribute_code>adminConfirm</attribute_code>
-            <backend_type>virtual</backend_type>
-        </adminConfirm>
     </fields>
     <repository_class>Magento\Install\Test\Repository\Install</repository_class>
     <handler_interface>Magento\Install\Test\Handler\Install\InstallInterface</handler_interface>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
index 434cd04a31ec4..76ef367c572e3 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
@@ -10,16 +10,20 @@
 
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Install\Test\Page\Install;
+use Magento\Install\Test\Fixture\Install as InstallConfig;
 use Magento\User\Test\Fixture\User;
 use Mtf\Fixture\FixtureFactory;
 use Mtf\TestCase\Injectable;
 use Mtf\ObjectManager;
 use Magento\Install\Test\Constraint\AssertAgreementTextPresent;
-use Magento\Install\Test\Constraint\AssertSuccessfulCheck;
-use Magento\Install\Test\Constraint\AssertSuccessfulDbConnection;
-use Magento\Install\Test\Constraint\AssertSuccessfulInstall;
+use Magento\Install\Test\Constraint\AssertSuccessfulReadinessCheck;
+use Magento\Install\Test\Constraint\AssertSuccessDbConnection;
+use Magento\Install\Test\Constraint\AssertSuccessInstall;
 
 /**
+ * PLEASE ADD NECESSARY INFO BEFORE RUNNING TEST TO
+ * ../dev/tests/functional/config/install_data.yml.dist
+ *
  * Test Flow:
  *
  * Preconditions
@@ -45,16 +49,30 @@
  */
 class InstallTest extends Injectable
 {
+    /**
+     * Install page.
+     *
+     * @var Install
+     */
+    protected $installPage;
+
+    /**
+     * Cms index page.
+     *
+     * @var CmsIndex
+     */
+    protected $homePage;
+
     /**
      * Uninstall Magento before test.
      *
      * @param FixtureFactory $fixtureFactory
+     * @param ObjectManager $objectManager
      * @return array
      */
-    public function __prepare(FixtureFactory $fixtureFactory)
+    public function __prepare(FixtureFactory $fixtureFactory, ObjectManager $objectManager)
     {
-        $magentoBaseDir = dirname(dirname(dirname(MTF_BP)));
-        $systemConfig = ObjectManager::getInstance()->create('Mtf\System\Config');
+        $systemConfig = $objectManager->getInstance()->create('Mtf\System\Config');
         // database
         $configData = $systemConfig->getConfigParam('install_data/db_credentials');
         //url
@@ -67,19 +85,10 @@ public function __prepare(FixtureFactory $fixtureFactory)
         $userData['password'] = $adminCredentials['password'];
         $userData['password_confirmation'] = $adminCredentials['password'];
         $user = $fixtureFactory->createByCode('user', ['dataSet' => 'default', 'data' => $userData]);
-        shell_exec("php -f $magentoBaseDir/setup/index.php uninstall");
-        return ['configData' => $configData, 'user' => $user];
-    }
-
-    /**
-     * @var Install
-     */
-    protected $installPage;
+        $installConfig = $fixtureFactory->createByCode('install', ['data' => $configData]);
 
-    /**
-     * @var CmsIndex
-     */
-    protected $homePage;
+        return ['user' => $user, 'installConfig' => $installConfig];
+    }
 
     /**
      * Injection data.
@@ -90,6 +99,9 @@ public function __prepare(FixtureFactory $fixtureFactory)
      */
     public function __inject(Install $installPage, CmsIndex $homePage)
     {
+        $magentoBaseDir = dirname(dirname(dirname(MTF_BP)));
+        // Uninstall Magento
+        shell_exec("php -f $magentoBaseDir/setup/index.php uninstall");
         $this->installPage = $installPage;
         $this->homePage = $homePage;
     }
@@ -97,26 +109,22 @@ public function __inject(Install $installPage, CmsIndex $homePage)
     /**
      * Install Magento via web interface.
      *
-     * @param array $configData
      * @param User $user
-     * @param FixtureFactory $fixtureFactory
+     * @param InstallConfig $installConfig
      * @param AssertAgreementTextPresent $assertLicense
-     * @param AssertSuccessfulCheck $assertReadiness
-     * @param AssertSuccessfulDbConnection $assertDbConnection
-     * @param AssertSuccessfulInstall $assertInstall
+     * @param AssertSuccessfulReadinessCheck $assertReadiness
+     * @param AssertSuccessDbConnection $assertDbConnection
+     * @param AssertSuccessInstall $assertInstall
      * @return void
      */
     public function test(
-        array $configData,
         User $user,
-        FixtureFactory $fixtureFactory,
+        InstallConfig $installConfig,
         AssertAgreementTextPresent $assertLicense,
-        AssertSuccessfulCheck $assertReadiness,
-        AssertSuccessfulDbConnection $assertDbConnection,
-        AssertSuccessfulInstall $assertInstall
+        AssertSuccessfulReadinessCheck $assertReadiness,
+        AssertSuccessDbConnection $assertDbConnection,
+        AssertSuccessInstall $assertInstall
     ) {
-        // Preconditions
-        $installConfig = $fixtureFactory->createByCode('install', ['data' => $configData]);
         // Steps
         $this->homePage->open();
         // Verify license agreement
@@ -130,7 +138,6 @@ public function test(
         $this->installPage->getReadinessBlock()->clickNext();
         // Step 2: Add a Database
         $this->installPage->getDatabaseBlock()->fill($installConfig);
-        $this->installPage->getDatabaseBlock()->clickTestConnection();
         $assertDbConnection->processAssert($this->installPage);
         $this->installPage->getDatabaseBlock()->clickNext();
         // Step 3: Web Configuration
@@ -143,7 +150,7 @@ public function test(
         $this->installPage->getCreateAdminBlock()->clickNext();
         // Step 6: Install
         $this->installPage->getInstallBlock()->clickInstallNow();
-        $assertInstall->processAssert($this->installPage,$configData,$user);
+        $assertInstall->processAssert($this->installPage, $installConfig, $user); //передавть инсталлКонфиг
         $this->installPage->getInstallBlock()->clickLaunchAdmin();
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
index fd19c31ebc17f..b28864d6d3828 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
@@ -33,26 +33,6 @@
                 <attribute_code>web</attribute_code>
                 <backend_type>virtual</backend_type>
             </web>
-            <admin>
-                <attribute_code>admin</attribute_code>
-                <backend_type>virtual</backend_type>
-            </admin>
-            <adminUsername>
-                <attribute_code>adminUsername</attribute_code>
-                <backend_type>virtual</backend_type>
-            </adminUsername>
-            <adminEmail>
-                <attribute_code>adminEmail</attribute_code>
-                <backend_type>virtual</backend_type>
-            </adminEmail>
-            <adminPassword>
-                <attribute_code>adminPassword</attribute_code>
-                <backend_type>virtual</backend_type>
-            </adminPassword>
-            <adminConfirm>
-                <attribute_code>adminConfirm</attribute_code>
-                <backend_type>virtual</backend_type>
-            </adminConfirm>
         </fields>
     </install>
 </fixture>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml
new file mode 100644
index 0000000000000..833b540683bd2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+<page module="Magento_Install">
+    <install>
+        <mca>setup/</mca>
+        <class>Magento\Install\Test\Page\Install</class>
+    </install>
+</page>

From 7e84956cc5c840d31478cb06be149cde8b5093c5 Mon Sep 17 00:00:00 2001
From: Oleksii Kolesnyk <okolesnyk@ebay.com>
Date: Tue, 2 Dec 2014 16:45:04 +0200
Subject: [PATCH 077/474] MTA-773: Stabilize Catalog module. Products

- fix selectors
---
 .../Magento/Catalog/Test/Block/Product/Compare/ListCompare.php  | 1 +
 .../app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php  | 2 +-
 .../app/Magento/Customer/Test/Page/CustomerAccountIndex.xml     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
index 26dee0b124c9d..96600954c3071 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/ListCompare.php
@@ -245,6 +245,7 @@ public function isProductVisibleInCompareBlock($productName = '')
      */
     public function getEmptyMessage()
     {
+        $this->waitForElementVisible($this->isEmpty);
         $isEmpty = $this->_rootElement->find($this->isEmpty);
         if ($isEmpty->isVisible()) {
             return $isEmpty->getText();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
index f2f1da979c7e5..fdf08aeb10e44 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
@@ -20,7 +20,7 @@ class Sidebar extends ListCompare
      *
      * @var string
      */
-    protected $isEmpty = 'p.empty';
+    protected $isEmpty = 'div.empty';
 
     /**
      * Product name selector.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml
index ced89879c6b0c..94b43c27dae3f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAccountIndex.xml
@@ -36,7 +36,7 @@
         </infoBlock>
         <compareProductsBlock>
             <class>Magento\Catalog\Test\Block\Product\Compare\Sidebar</class>
-            <locator>.block.compare</locator>
+            <locator>.block-compare</locator>
             <strategy>css selector</strategy>
         </compareProductsBlock>
         <additionalAddressBlock>

From 0346187d8ce9a42a1caf8d70c99dbece6776cbb2 Mon Sep 17 00:00:00 2001
From: Oleksii Kolesnyk <okolesnyk@ebay.com>
Date: Tue, 2 Dec 2014 18:48:08 +0200
Subject: [PATCH 078/474] MTA-773: Stabilize Catalog module. Products

- fix selectors
---
 .../Selenium/Element/GlobalsearchElement.php  | 195 ++++++++++++++++++
 .../Selenium/Element/SuggestElement.php       |  21 +-
 .../Edit/Tab/ProductDetails/CategoryIds.php   |  20 +-
 3 files changed, 234 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php

diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php
new file mode 100644
index 0000000000000..8fa5dfe807be2
--- /dev/null
+++ b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Mtf\Client\Driver\Selenium\Element;
+
+use Mtf\Client\Element\Locator;
+use Mtf\Client\Driver\Selenium\Element;
+
+/**
+ * Typified element class for global search element.
+ */
+class GlobalsearchElement extends Element
+{
+    /**
+     * Search icon selector.
+     *
+     * @var string
+     */
+    protected $searchIcon = '[for="search-global"]';
+
+    /**
+     * Locator for initialized suggest container.
+     *
+     * @var string
+     */
+    protected $initializedSuggest = './/*[contains(@class,"search-global-field") and .//*[@class="mage-suggest"]]';
+
+    /**
+     * Selector for search input element.
+     *
+     * @var string
+     */
+    protected $searchInput = '#search-global';
+
+    /**
+     * Result dropdown selector.
+     *
+     * @var string
+     */
+    protected $searchResult = '.autocomplete-results';
+
+    /**
+     * Item selector of search result.
+     *
+     * @var string
+     */
+    protected $resultItem = 'li';
+
+    /**
+     * "Backspace" key code.
+     */
+    const BACKSPACE = "\xEE\x80\x83";
+
+    /**
+     * Set value.
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setValue($value)
+    {
+        $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
+
+        $this->waitInitElement();
+
+        if (!$this->find($this->searchInput)->isVisible()) {
+            $this->find($this->searchIcon)->click();
+        }
+        $this->selectWindow();
+        $this->clear();
+        $this->find($this->searchInput)->_getWrappedElement()->value($value);
+        $this->selectWindow();
+
+        $this->waitResult();
+    }
+
+    /**
+     * Clear value of element.
+     *
+     * @return void
+     */
+    protected function clear()
+    {
+        $element = $this->find($this->searchInput);
+        while ('' != $element->getValue()) {
+            $element->keys([self::BACKSPACE]);
+        }
+    }
+
+    /**
+     * Select to last window.
+     *
+     * @return void
+     */
+    protected function selectWindow()
+    {
+        $windowHandles = $this->_driver->windowHandles();
+        $this->_driver->window(end($windowHandles));
+    }
+
+    /**
+     * Wait init search suggest container.
+     *
+     * @return void
+     * @throws \Exception
+     */
+    protected function waitInitElement()
+    {
+        $browser = clone $this;
+        $selector = $this->initializedSuggest;
+
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                return $browser->find($selector, Locator::SELECTOR_XPATH)->isVisible() ? true : null;
+            }
+        );
+    }
+
+    /**
+     * Wait for search result is visible.
+     *
+     * @return void
+     */
+    public function waitResult()
+    {
+        $browser = clone $this;
+        $selector = $this->searchResult;
+
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                if ($browser->find($selector)->isVisible()) {
+                    return true;
+                } else {
+                    $browser->selectWindow();
+                    return null;
+                }
+            }
+        );
+    }
+
+    /**
+     * Get value.
+     *
+     * @throws \BadMethodCallException
+     */
+    public function getValue()
+    {
+        throw new \BadMethodCallException('Not applicable for this class of elements (GlobalSearch)');
+    }
+
+    /**
+     * Checking exist value in search result.
+     *
+     * @param string $value
+     * @return bool
+     */
+    public function isExistValueInSearchResult($value)
+    {
+        $searchResult = $this->find($this->searchResult);
+        if (!$searchResult->isVisible()) {
+            return false;
+        }
+        $searchResults = $this->getSearchResults();
+        return in_array($value, $searchResults);
+    }
+
+    /**
+     * Get search results.
+     *
+     * @return array
+     */
+    protected function getSearchResults()
+    {
+        /** @var Element $searchResult */
+        $searchResult = $this->find($this->searchResult);
+        $resultItems = $searchResult->find($this->resultItem)->getElements();
+        $resultArray = [];
+
+        /** @var Element $resultItem */
+        foreach ($resultItems as $resultItem) {
+            $resultItemLink = $resultItem->find('a');
+            $resultText = $resultItemLink->isVisible()
+                ? trim($resultItemLink->getText())
+                : trim($resultItem->getText());
+            $resultArray[] = $resultText;
+        }
+
+        return $resultArray;
+    }
+}
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php
index 4db817f7172db..355a8a446652c 100755
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/SuggestElement.php
@@ -17,6 +17,11 @@
  */
 class SuggestElement extends Element
 {
+    /**
+     * "Backspace" key code.
+     */
+    const BACKSPACE = "\xEE\x80\x83";
+
     /**
      * Selector suggest input
      *
@@ -48,11 +53,25 @@ public function setValue($value)
     {
         $this->_eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
 
-        $this->find($this->suggest)->setValue($value);
+        $this->clear();
+        $this->find($this->suggest)->_getWrappedElement()->value($value);
         $this->waitResult();
         $this->find(sprintf($this->resultItem, $value), Locator::SELECTOR_XPATH)->click();
     }
 
+    /**
+     * Clear value of element.
+     *
+     * @return void
+     */
+    protected function clear()
+    {
+        $element = $this->find($this->suggest);
+        while ($element->getValue() != '') {
+            $element->keys([self::BACKSPACE]);
+        }
+    }
+
     /**
      * Wait for search result is visible
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
index 2ec712ac6d64a..882bb392dcbc8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
@@ -46,7 +46,25 @@ class CategoryIds extends MultisuggestElement
      */
     public function setValue($values)
     {
-        $this->find($this->top, Locator::SELECTOR_XPATH)->click();
+        $this->waitInitElement();
         parent::setValue($values);
     }
+
+    /**
+     * Wait init search suggest container.
+     *
+     * @return void
+     * @throws \Exception
+     */
+    protected function waitInitElement()
+    {
+        $browser = clone $this;
+        $selector = '.mage-suggest.category-select';
+
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                return $browser->find($selector)->isVisible() ? true : null;
+            }
+        );
+    }
 }

From e41c534b77426186ec02080501cc4ce13ddaebc1 Mon Sep 17 00:00:00 2001
From: tpogrebniak <tpogrebniak@ebay.com>
Date: Tue, 2 Dec 2014 19:22:25 +0200
Subject: [PATCH 079/474] MAGETWO-28245: Store Views are switched by themselves

---
 app/code/Magento/Store/Model/Store.php           | 16 ++++++++++++++--
 .../testsuite/Magento/Store/Model/StoreTest.php  |  8 ++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index add9b0383d4d3..7735cb251669f 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -1190,7 +1190,8 @@ public function setCookie()
     {
         $cookieMetadata = $this->_cookieMetadataFactory->createPublicCookieMetadata()
             ->setHttpOnly(true)
-            ->setDurationOneYear();
+            ->setDurationOneYear()
+            ->setPath($this->getStorePath());
         $this->_cookieManager->setPublicCookie(
             self::COOKIE_NAME,
             $this->getCode(),
@@ -1216,7 +1217,18 @@ public function getStoreCodeFromCookie()
      */
     public function deleteCookie()
     {
-        $this->_cookieManager->deleteCookie(self::COOKIE_NAME);
+        $cookieMetadata = $this->_cookieMetadataFactory->createPublicCookieMetadata()
+            ->setPath($this->getStorePath());
+        $this->_cookieManager->deleteCookie(self::COOKIE_NAME, $cookieMetadata);
         return $this;
     }
+
+    /**
+     * @return string
+     */
+    public function getStorePath()
+    {
+        $parsedUrl = parse_url($this->getBaseUrl());
+        return isset($parsedUrl['path']) ? $parsedUrl['path'] : '/';
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
index 275b3de6a9880..cdd2f82e2b262 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -71,10 +71,14 @@ protected function tearDown()
 
     public function testSetCookie()
     {
+        $model = $this->getMock('Magento\Store\Model\Store', array('getStorePath'), $this->modelParams);
+        $model->expects($this->once())
+            ->method('getStorePath')
+            ->will($this->returnValue('/'));
         $storeCode = 'store code';
         $this->assertArrayNotHasKey(Store::COOKIE_NAME, $_COOKIE);
-        $this->model->setCode($storeCode);
-        $this->model->setCookie();
+        $model->setCode($storeCode);
+        $model->setCookie();
         $this->assertEquals($storeCode, $_COOKIE[Store::COOKIE_NAME]);
     }
 

From 26fd50338773c0ba88b629a442af313473872aa3 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Tue, 2 Dec 2014 10:30:48 -0600
Subject: [PATCH 080/474] MAGETWO-30290: Progress bar and log do not work
 properly in IE

- Fixed the problem according to description.
---
 .../Setup/view/magento/setup/install.phtml    |  2 +-
 setup/pub/magento/setup/add-database.js       |  3 ++-
 setup/pub/magento/setup/app.js                | 11 ++++++++++
 .../pub/magento/setup/create-admin-account.js |  3 ++-
 .../pub/magento/setup/customize-your-store.js |  3 ++-
 setup/pub/magento/setup/install.js            | 20 +++++++++++--------
 setup/pub/magento/setup/success.js            | 10 +++++-----
 setup/pub/magento/setup/web-configuration.js  |  3 ++-
 8 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/install.phtml b/setup/module/Magento/Setup/view/magento/setup/install.phtml
index 8ae67953bb76d..86d074641bca7 100644
--- a/setup/module/Magento/Setup/view/magento/setup/install.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/install.phtml
@@ -21,7 +21,7 @@
 </div>
 
 <div ng-show="isStarted">
-    <div class="progress"><div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{progress}}" aria-valuemin="0" aria-valuemax="100" style="width: {{progress}}%; min-width: 5em;">{{progressText}}</div></div>
+    <div class="progress"><div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{progress}}" aria-valuemin="0" aria-valuemax="100" ng-style="barStyle(progress)">{{progressText}}</div></div>
     <div ng-show="isFailed" class="error-container">
         <span class="glyphicon glyphicon-remove-sign "></span>
         <span>Installation is incomplete. Check the console log for errors before trying again.</span>
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 362e7a0c733a4..cccb331454042 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('add-database', ['ngStorage'])
-    .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', '$timeout', function ($scope, $state, $localStorage, $http, $timeout) {
+    .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', '$timeout', 'Storage', function ($scope, $state, $localStorage, $http, $timeout, Storage) {
         $scope.db = {
             useExistingDb: 1,
             useAccess: 1
@@ -26,6 +26,7 @@ angular.module('add-database', ['ngStorage'])
 
         $scope.$on('nextState', function () {
             $localStorage.db = $scope.db;
+            Storage.db = $scope.db;
         });
 
         // Listens on form validate event, dispatched by parent controller
diff --git a/setup/pub/magento/setup/app.js b/setup/pub/magento/setup/app.js
index 24733b6744f31..efb89990288ce 100644
--- a/setup/pub/magento/setup/app.js
+++ b/setup/pub/magento/setup/app.js
@@ -22,6 +22,17 @@ var app = angular.module(
         'success'
     ]);
 
+
+app.factory('Storage', function () {
+    return {
+        db: {},
+        admin: {},
+        store: {},
+        config: {},
+        messages: {}
+    };
+});
+
 app.config(function ($stateProvider) {
     app.stateProvider = $stateProvider;
 })
diff --git a/setup/pub/magento/setup/create-admin-account.js b/setup/pub/magento/setup/create-admin-account.js
index fbbea2f45b8b9..7334c3204dfae 100644
--- a/setup/pub/magento/setup/create-admin-account.js
+++ b/setup/pub/magento/setup/create-admin-account.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('create-admin-account', ['ngStorage'])
-    .controller('createAdminAccountController', ['$scope', '$state', '$localStorage', function ($scope, $state, $localStorage) {
+    .controller('createAdminAccountController', ['$scope', '$state', '$localStorage', 'Storage', function ($scope, $state, $localStorage, Storage) {
         $scope.admin = {
             'passwordStatus': {
                 class: 'none',
@@ -44,6 +44,7 @@ angular.module('create-admin-account', ['ngStorage'])
 
         $scope.$on('nextState', function () {
             $localStorage.admin = $scope.admin;
+            Storage.admin = $scope.admin;
         });
 
         // Listens on form validate event, dispatched by parent controller
diff --git a/setup/pub/magento/setup/customize-your-store.js b/setup/pub/magento/setup/customize-your-store.js
index 0ec425f67ac11..c73e300f809d1 100644
--- a/setup/pub/magento/setup/customize-your-store.js
+++ b/setup/pub/magento/setup/customize-your-store.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('customize-your-store', ['ngStorage'])
-    .controller('customizeYourStoreController', ['$scope', '$localStorage', function ($scope, $localStorage) {
+    .controller('customizeYourStoreController', ['$scope', '$localStorage', 'Storage', function ($scope, $localStorage, Storage) {
         $scope.store = {
             timezone: 'America/Los_Angeles',
             currency: 'USD',
@@ -21,5 +21,6 @@ angular.module('customize-your-store', ['ngStorage'])
 
         $scope.$on('nextState', function () {
             $localStorage.store = $scope.store;
+            Storage.store = $scope.store;
         });
     }]);
diff --git a/setup/pub/magento/setup/install.js b/setup/pub/magento/setup/install.js
index 681df03f16149..928fbdbcbc6f8 100644
--- a/setup/pub/magento/setup/install.js
+++ b/setup/pub/magento/setup/install.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('install', ['ngStorage'])
-    .controller('installController', ['$scope', '$sce', '$timeout', '$localStorage', '$rootScope', 'progress', function ($scope, $sce, $timeout, $localStorage, $rootScope, progress) {
+    .controller('installController', ['$scope', '$sce', '$timeout', '$localStorage', '$rootScope', 'progress', 'Storage', function ($scope, $sce, $timeout, $localStorage, $rootScope, progress, Storage) {
         $scope.isStarted = false;
         $scope.isInProgress = false;
         $scope.isConsole = false;
@@ -16,6 +16,10 @@ angular.module('install', ['ngStorage'])
             $scope.isConsole = $scope.isConsole === false;
         };
 
+        $scope.barStyle = function (value) {
+            return { width: value + '%' };
+        };
+
         $scope.checkProgress = function () {
             if ($scope.isInProgress) {
                 $scope.displayProgress();
@@ -43,18 +47,18 @@ angular.module('install', ['ngStorage'])
 
         $scope.start = function () {
             var data = {
-                'db': $localStorage.db,
-                'admin': $localStorage.admin,
-                'store': $localStorage.store,
-                'config': $localStorage.config
+                'db': Storage.db,
+                'admin': Storage.admin,
+                'store': Storage.store,
+                'config': Storage.config
             };
             $scope.isStarted = true;
             $scope.isInProgress = true;
             progress.post(data, function (response) {
                 $scope.isInProgress = false;
                 if (response.success) {
-                    $localStorage.config.encrypt.key = response.key;
-                    $localStorage.messages = response.messages;
+                    Storage.config.encrypt.key = response.key;
+                    Storage.messages = response.messages;
                     $scope.nextState();
                 } else {
                     $scope.displayFailure();
@@ -78,7 +82,7 @@ angular.module('install', ['ngStorage'])
     .service('progress', ['$http', function ($http) {
         return {
             get: function (callback) {
-                $http.get('install/progress').then(callback);
+                $http.post('install/progress').then(callback);
             },
             post: function (data, callback) {
                 $http.post('install/start', data).success(callback);
diff --git a/setup/pub/magento/setup/success.js b/setup/pub/magento/setup/success.js
index 0f76134ad7deb..a8e153de507f1 100644
--- a/setup/pub/magento/setup/success.js
+++ b/setup/pub/magento/setup/success.js
@@ -7,9 +7,9 @@
 
 'use strict';
 angular.module('success', ['ngStorage'])
-    .controller('successController', ['$scope', '$localStorage', function ($scope, $localStorage) {
-        $scope.db     = $localStorage.db;
-        $scope.admin  = $localStorage.admin;
-        $scope.config = $localStorage.config;
-        $scope.messages = $localStorage.messages;
+    .controller('successController', ['$scope', '$localStorage', 'Storage', function ($scope, $localStorage, Storage) {
+        $scope.db     = Storage.db;
+        $scope.admin  = Storage.admin;
+        $scope.config = Storage.config;
+        $scope.messages = Storage.messages;
     }]);
\ No newline at end of file
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index a77f79504cb00..fdac9f4b2a130 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('web-configuration', ['ngStorage'])
-    .controller('webConfigurationController', ['$scope', '$state', '$localStorage', function ($scope, $state, $localStorage) {
+    .controller('webConfigurationController', ['$scope', '$state', '$localStorage', 'Storage', function ($scope, $state, $localStorage, Storage) {
         $scope.config = {
             address: {
                 web: '',
@@ -37,6 +37,7 @@ angular.module('web-configuration', ['ngStorage'])
 
         $scope.$on('nextState', function () {
             $localStorage.config = $scope.config;
+            Storage.config = $scope.config;
         });
 
         $scope.updateOnExpand = function(obj) {

From ac2f2bbd179da5638ec40d1dd89a2a1dbd556f48 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Tue, 2 Dec 2014 12:00:47 -0600
Subject: [PATCH 081/474] MAGETWO-21308: [GITHUB] DDL cache should be tagged

- fixed integration test of cache types controller
- added an isolation safeguard to integration testing framework that prevents corrupting deployment configuration file
---
 .../TestFramework/Bootstrap/DocBlock.php      |   1 +
 .../Isolation/DeploymentConfig.php            |  71 +++++++++
 .../Adminhtml/Cache/MassActionTest.php        | 145 ++++++++++++++++++
 .../Controller/Adminhtml/CacheTest.php        |  98 +-----------
 .../_files/cache/all_types_disabled.php       |  21 ---
 .../cache/all_types_disabled_rollback.php     |   9 --
 .../_files/cache/all_types_enabled.php        |  21 ---
 .../cache/all_types_enabled_rollback.php      |   9 --
 8 files changed, 221 insertions(+), 154 deletions(-)
 create mode 100644 dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled_rollback.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled_rollback.php

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
index 7ea0f945bbe3d..b8bdfb61356c0 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
@@ -53,6 +53,7 @@ protected function _getSubscribers(\Magento\TestFramework\Application $applicati
             new \Magento\TestFramework\Workaround\Cleanup\TestCaseProperties(),
             new \Magento\TestFramework\Workaround\Cleanup\StaticProperties(),
             new \Magento\TestFramework\Isolation\WorkingDirectory(),
+            new \Magento\TestFramework\Isolation\DeploymentConfig(),
             new \Magento\TestFramework\Annotation\AppIsolation($application),
             new \Magento\TestFramework\Event\Transaction(
                 new \Magento\TestFramework\EventManager(
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php b/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
new file mode 100644
index 0000000000000..b0a9c24b85ad9
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\TestFramework\Isolation;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\DeploymentConfig\Reader;
+
+/**
+ * A listener that watches for integrity of deployment configuration
+ */
+class DeploymentConfig
+{
+    /**
+     * Deployment configuration reader
+     *
+     * @var Reader
+     */
+    private $reader;
+
+    /**
+     * Initial value of deployment configuration
+     *
+     * @var mixed
+     */
+    private $config;
+
+    /**
+     * Memorizes the initial value of configuration reader and the configuration value
+     *
+     * Assumption: this is done once right before executing very first test suite.
+     * It is assumed that deployment configuration is valid at this point
+     *
+     * @return void
+     */
+    public function startTestSuite()
+    {
+        if (null === $this->reader) {
+            $this->reader = Bootstrap::getObjectManager()->get('Magento\Framework\App\DeploymentConfig\Reader');
+            $this->config = $this->reader->load();
+        }
+    }
+
+    /**
+     * Checks if deployment configuration has been changed by a test
+     *
+     * Changing deployment configuration violates isolation between tests, so further tests may become broken.
+     * To fix this issue, find out why this test changes deployment configuration.
+     * If this is intentional, then it must be reverted to the previous state within the test.
+     * After that, the application needs to be wiped out and reinstalled.
+     *
+     * @param \PHPUnit_Framework_TestCase $test
+     * @return void
+     */
+    public function endTest(\PHPUnit_Framework_TestCase $test)
+    {
+        $config = $this->reader->load();
+        if ($this->config != $config) {
+            $error = "\n\nERROR: deployment configuration is corrupted. The application state is no longer valid.\n"
+                . 'Further tests may fail.'
+                . " This test failure may be misleading, if you are re-running it on a corrupted application.\n"
+                . $test->toString() . "\n";
+            $test->fail($error);
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
new file mode 100644
index 0000000000000..6a44625a80e16
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+namespace Magento\Backend\Controller\Adminhtml\Cache;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Cache\Type\ConfigSegment;
+
+class MassActionTest extends \Magento\Backend\Utility\Controller
+{
+    /**
+     * Configuration segment of cache types
+     *
+     * @var ConfigSegment
+     */
+    private static $typesSegment;
+
+    public static function setUpBeforeClass()
+    {
+        /** @var \Magento\Framework\App\DeploymentConfig $config */
+        $config = Bootstrap::getObjectManager()->get('Magento\Framework\App\DeploymentConfig');
+        $data = $config->getSegment(ConfigSegment::SEGMENT_KEY);
+        self::$typesSegment = new ConfigSegment($data);
+    }
+
+    protected function tearDown()
+    {
+        /** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
+        $cacheState = Bootstrap::getObjectManager()->get('Magento\Framework\App\Cache\StateInterface');
+        foreach (self::$typesSegment->getData() as $type => $value) {
+            $cacheState->setEnabled($type, $value);
+            $cacheState->persist();
+        }
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider massActionsDataProvider
+     * @param array $typesToEnable
+     */
+    public function testMassEnableAction($typesToEnable = array())
+    {
+        $this->setAll(false);
+
+        $this->getRequest()->setParams(array('types' => $typesToEnable));
+        $this->dispatch('backend/admin/cache/massEnable');
+
+        Bootstrap::getInstance()->reinitialize();
+
+        /** @var  \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList */
+        $cacheTypeList = Bootstrap::getObjectManager()->get('Magento\Framework\App\Cache\TypeListInterface');
+        $types = array_keys($cacheTypeList->getTypes());
+        /** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
+        $cacheState = Bootstrap::getObjectManager()->get('Magento\Framework\App\Cache\StateInterface');
+        foreach ($types as $type) {
+            if (in_array($type, $typesToEnable)) {
+                $this->assertTrue($cacheState->isEnabled($type), "Type '{$type}' has not been enabled");
+            } else {
+                $this->assertFalse($cacheState->isEnabled($type), "Type '{$type}' must remain disabled");
+            }
+        }
+    }
+
+    /**
+     * @dataProvider massActionsDataProvider
+     * @param array $typesToDisable
+     */
+    public function testMassDisableAction($typesToDisable = array())
+    {
+        $this->setAll(true);
+
+        $this->getRequest()->setParams(array('types' => $typesToDisable));
+        $this->dispatch('backend/admin/cache/massDisable');
+
+        Bootstrap::getInstance()->reinitialize();
+
+        /** @var  \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList */
+        $cacheTypeList = Bootstrap::getObjectManager()->get('Magento\Framework\App\Cache\TypeListInterface');
+        $types = array_keys($cacheTypeList->getTypes());
+        /** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
+        $cacheState = Bootstrap::getObjectManager()->get('Magento\Framework\App\Cache\StateInterface');
+        foreach ($types as $type) {
+            if (in_array($type, $typesToDisable)) {
+                $this->assertFalse($cacheState->isEnabled($type), "Type '{$type}' has not been disabled");
+            } else {
+                $this->assertTrue($cacheState->isEnabled($type), "Type '{$type}' must remain enabled");
+            }
+        }
+    }
+
+    /**
+     * Sets all cache types to enabled or disabled state
+     *
+     * @param bool $isEnabled
+     * @return void
+     */
+    private function setAll($isEnabled)
+    {
+        /** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
+        $cacheState = Bootstrap::getObjectManager()->get('Magento\Framework\App\Cache\StateInterface');
+        foreach (array_keys(self::$typesSegment->getData()) as $type) {
+            $cacheState->setEnabled($type, $isEnabled);
+        }
+        $cacheState->persist();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_invalidated.php
+     * @dataProvider massActionsDataProvider
+     * @param array $typesToRefresh
+     */
+    public function testMassRefreshAction($typesToRefresh = array())
+    {
+        $this->getRequest()->setParams(array('types' => $typesToRefresh));
+        $this->dispatch('backend/admin/cache/massRefresh');
+
+        /** @var $cacheTypeList \Magento\Framework\App\Cache\TypeListInterface */
+        $cacheTypeList = Bootstrap::getObjectManager()->get('Magento\Framework\App\Cache\TypeListInterface');
+        $invalidatedTypes = array_keys($cacheTypeList->getInvalidated());
+        $failed = array_intersect($typesToRefresh, $invalidatedTypes);
+        $this->assertEmpty($failed, 'Could not refresh following cache types: ' . join(', ', $failed));
+    }
+
+    /**
+     * @return array
+     */
+    public function massActionsDataProvider()
+    {
+        return array(
+            'no types' => array(array()),
+            'existing types' => array(
+                array(
+                    \Magento\Framework\App\Cache\Type\Config::TYPE_IDENTIFIER,
+                    \Magento\Framework\App\Cache\Type\Layout::TYPE_IDENTIFIER,
+                    \Magento\Framework\App\Cache\Type\Block::TYPE_IDENTIFIER
+                )
+            )
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
index 01e754ad52fe1..d3bc0e203278b 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
@@ -18,10 +18,12 @@ class CacheTest extends \Magento\Backend\Utility\Controller
      */
     public function testFlushAllAction()
     {
-        $this->dispatch('backend/admin/cache/flushAll');
-
         /** @var $cache \Magento\Framework\App\Cache */
         $cache = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Framework\App\Cache');
+        $this->assertNotEmpty($cache->load('APPLICATION_FIXTURE'));
+
+        $this->dispatch('backend/admin/cache/flushAll');
+
         /** @var $cachePool \Magento\Framework\App\Cache\Frontend\Pool */
         $this->assertFalse($cache->load('APPLICATION_FIXTURE'));
 
@@ -59,98 +61,6 @@ public function testFlushSystemAction()
         }
     }
 
-    /**
-     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
-     * @dataProvider massActionsDataProvider
-     * @param array $typesToEnable
-     */
-    public function testMassEnableAction($typesToEnable = array())
-    {
-        $this->getRequest()->setParams(array('types' => $typesToEnable));
-        $this->dispatch('backend/admin/cache/massEnable');
-
-        /** @var  \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList */
-        $cacheTypeList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\TypeListInterface'
-        );
-        $types = array_keys($cacheTypeList->getTypes());
-        /** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
-        $cacheState = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\StateInterface'
-        );
-        foreach ($types as $type) {
-            if (in_array($type, $typesToEnable)) {
-                $this->assertTrue($cacheState->isEnabled($type), "Type '{$type}' has not been enabled");
-            } else {
-                $this->assertFalse($cacheState->isEnabled($type), "Type '{$type}' must remain disabled");
-            }
-        }
-    }
-
-    /**
-     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
-     * @dataProvider massActionsDataProvider
-     * @param array $typesToDisable
-     */
-    public function testMassDisableAction($typesToDisable = array())
-    {
-        $this->getRequest()->setParams(array('types' => $typesToDisable));
-        $this->dispatch('backend/admin/cache/massDisable');
-
-        /** @var  \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList */
-        $cacheTypeList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\TypeListInterface'
-        );
-        $types = array_keys($cacheTypeList->getTypes());
-        /** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
-        $cacheState = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\StateInterface'
-        );
-        foreach ($types as $type) {
-            if (in_array($type, $typesToDisable)) {
-                $this->assertFalse($cacheState->isEnabled($type), "Type '{$type}' has not been disabled");
-            } else {
-                $this->assertTrue($cacheState->isEnabled($type), "Type '{$type}' must remain enabled");
-            }
-        }
-    }
-
-    /**
-     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_invalidated.php
-     * @dataProvider massActionsDataProvider
-     * @param array $typesToRefresh
-     */
-    public function testMassRefreshAction($typesToRefresh = array())
-    {
-        $this->getRequest()->setParams(array('types' => $typesToRefresh));
-        $this->dispatch('backend/admin/cache/massRefresh');
-
-        /** @var $cacheTypeList \Magento\Framework\App\Cache\TypeListInterface */
-        $cacheTypeList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\TypeListInterface'
-        );
-        $invalidatedTypes = array_keys($cacheTypeList->getInvalidated());
-        $failed = array_intersect($typesToRefresh, $invalidatedTypes);
-        $this->assertEmpty($failed, 'Could not refresh following cache types: ' . join(', ', $failed));
-    }
-
-    /**
-     * @return array
-     */
-    public function massActionsDataProvider()
-    {
-        return array(
-            'no types' => array(array()),
-            'existing types' => array(
-                array(
-                    \Magento\Framework\App\Cache\Type\Config::TYPE_IDENTIFIER,
-                    \Magento\Framework\App\Cache\Type\Layout::TYPE_IDENTIFIER,
-                    \Magento\Framework\App\Cache\Type\Block::TYPE_IDENTIFIER
-                )
-            )
-        );
-    }
-
     /**
      * @dataProvider massActionsInvalidTypesDataProvider
      * @param $action
diff --git a/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled.php
deleted file mode 100644
index c75fbb1b20dcc..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/** @var $cacheTypeList \Magento\Framework\App\Cache\TypeListInterface */
-$cacheTypeList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    'Magento\Framework\App\Cache\TypeListInterface'
-);
-$types = array_keys($cacheTypeList->getTypes());
-
-/** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
-$cacheState = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->get('Magento\Framework\App\Cache\StateInterface');
-foreach ($types as $type) {
-    $cacheState->setEnabled($type, false);
-}
-$cacheState->persist();
diff --git a/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled_rollback.php
deleted file mode 100644
index 56c11e8971fc4..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_disabled_rollback.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-include __DIR__ . '/empty_storage.php';
diff --git a/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled.php
deleted file mode 100644
index b5667920dcd2b..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/** @var $cacheTypeList \Magento\Framework\App\Cache\TypeListInterface */
-$cacheTypeList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    'Magento\Framework\App\Cache\TypeListInterface'
-);
-$types = array_keys($cacheTypeList->getTypes());
-
-/** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
-$cacheState = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->get('Magento\Framework\App\Cache\StateInterface');
-foreach ($types as $type) {
-    $cacheState->setEnabled($type, true);
-}
-$cacheState->persist();
diff --git a/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled_rollback.php b/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled_rollback.php
deleted file mode 100644
index 56c11e8971fc4..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Backend/controllers/_files/cache/all_types_enabled_rollback.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-include __DIR__ . '/empty_storage.php';

From 74758f12b62fb11fdc3515ddddaa4b5615279d08 Mon Sep 17 00:00:00 2001
From: Paul Lewis <plewis@ebay.com>
Date: Tue, 2 Dec 2014 12:50:59 -0600
Subject: [PATCH 082/474] MAGETWO-29546: DbStatusValidator does not provide
 enough information to perform successful update of the system

 - Add missing docblock
---
 .../Magento/Framework/Module/Plugin/DbStatusValidator.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index 2530365299d13..5559eabd9c600 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -90,6 +90,12 @@ public function aroundDispatch(
         return $proceed($request);
     }
 
+    /**
+     * Format each error in the error data from getOutOfDataDbErrors into a single message
+     *
+     * @param $errorsData array of error data from getOutOfDateDbErrors
+     * @return array Messages that can be used to log the error
+     */
     private function formatErrors($errorsData)
     {
         $formattedErrors = [];
@@ -100,6 +106,7 @@ private function formatErrors($errorsData)
         }
         return $formattedErrors;
     }
+
     /**
      * Get array of errors if DB is out of date, return [] if DB is current
      *

From 2c7a537adeea50eeecbfbe134283b2207d4a61db Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Mon, 1 Dec 2014 22:37:44 -0600
Subject: [PATCH 083/474] MAGETWO-29704: composer.json Files Optimized

- moved composer dependencies for components in root composer.json
- removed composer.json from setup
- implemented test for consistency of dependencies in root and child composer.json
---
 composer.json                                 |   27 +-
 composer.lock                                 | 2971 ++++++++---------
 .../Magento/Test/Integrity/ComposerTest.php   |   55 +-
 setup/.gitignore                              |    3 -
 setup/composer.json                           |   35 -
 5 files changed, 1508 insertions(+), 1583 deletions(-)
 delete mode 100644 setup/.gitignore
 delete mode 100644 setup/composer.json

diff --git a/composer.json b/composer.json
index 7f1c0d2c12472..2e4c8e4e57673 100644
--- a/composer.json
+++ b/composer.json
@@ -11,29 +11,37 @@
         "zendframework/zend-soap": "2.3.1",
         "zendframework/zend-uri": "2.3.1",
         "zendframework/zend-validator": "2.3.1",
-        "magento/zendframework1": "1.12.9"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "4.1.0",
-        "squizlabs/php_codesniffer": "1.5.3",
-        "phpmd/phpmd": "@stable",
         "zendframework/zend-console": "2.3.1",
         "zendframework/zend-modulemanager": "2.3.1",
         "zendframework/zend-mvc": "2.3.1",
         "zendframework/zend-eventmanager": "2.3.1",
         "zendframework/zend-view": "2.3.1",
-        "zendframework/zend-text": "2.3.1",
         "zendframework/zend-servicemanager": "2.3.1",
         "zendframework/zend-json": "2.3.1",
-        "zendframework/zend-db": "2.3.1",
         "zendframework/zend-config": "2.3.1",
         "zendframework/zend-form": "2.3.1",
         "zendframework/zend-di": "2.3.1",
         "zendframework/zend-serializer": "2.3.1",
         "zendframework/zend-log": "2.3.1",
         "zendframework/zend-http": "2.3.1",
+        "magento/zendframework1": "1.12.9",
         "composer/composer": "1.0.0-alpha8"
     },
+    "require-dev": {
+        "phpunit/phpunit": "4.1.0",
+        "squizlabs/php_codesniffer": "1.5.3",
+        "phpmd/phpmd": "@stable",
+        "lib-libxml": "*",
+        "ext-ctype": "*",
+        "ext-gd": "*",
+        "ext-spl": "*",
+        "ext-dom": "*",
+        "ext-simplexml": "*",
+        "ext-mcrypt": "*",
+        "ext-hash": "*",
+        "ext-curl": "*",
+        "ext-iconv": "*"
+    },
     "replace": {
         "magento/module-admin-gws": "self.version",
         "magento/module-admin-notification": "self.version",
@@ -205,8 +213,7 @@
             ],
             "twbs/bootstrap": [
                 "lib/web/jquery/jquery.tabs.js",
-                "lib/web/jquery/jquery.popups.js",
-                "lib/web/jquery/bootstrap-carousel"
+                "lib/web/jquery/jquery.popups.js"
             ],
             "tinymce/tinymce": "lib/web/tiny_mce"
         }
diff --git a/composer.lock b/composer.lock
index b124cd9596271..a0956d5a3c49c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,254 +4,403 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "feffae58a0df6c6fa0d746eef011e9db",
+    "hash": "c1a177ebcfecbbe62b46639b5d15ab42",
     "packages": [
         {
-            "name": "magento/zendframework1",
-            "version": "1.12.9",
+            "name": "composer/composer",
+            "version": "1.0.0-alpha8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/magento/zf1.git",
-                "reference": "c22ff60d6e49862a51281600aa7a8e58fbc3940f"
+                "url": "https://github.com/composer/composer.git",
+                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/zf1/zipball/c22ff60d6e49862a51281600aa7a8e58fbc3940f",
-                "reference": "c22ff60d6e49862a51281600aa7a8e58fbc3940f",
+                "url": "https://api.github.com/repos/composer/composer/zipball/1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
+                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.2.11"
+                "justinrainbow/json-schema": "1.1.*",
+                "php": ">=5.3.2",
+                "seld/jsonlint": "1.*",
+                "symfony/console": "~2.3",
+                "symfony/finder": "~2.2",
+                "symfony/process": "~2.1"
             },
             "require-dev": {
-                "phpunit/dbunit": "1.3.*",
-                "phpunit/phpunit": "3.7.*"
+                "phpunit/phpunit": "~3.7.10"
+            },
+            "suggest": {
+                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+                "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic"
             },
+            "bin": [
+                "bin/composer"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12.x-dev"
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "Zend_": "library/"
+                    "Composer": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "library/"
-            ],
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "Magento Zend Framework 1",
-            "homepage": "http://framework.zend.com/",
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Dependency Manager",
+            "homepage": "http://getcomposer.org/",
             "keywords": [
-                "ZF1",
-                "framework"
+                "autoload",
+                "dependency",
+                "package"
             ],
-            "time": "2014-11-24 22:50:41"
+            "time": "2014-01-06 18:39:59"
         },
         {
-            "name": "zendframework/zend-code",
-            "version": "2.3.1",
-            "target-dir": "Zend/Code",
+            "name": "justinrainbow/json-schema",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendCode.git",
-                "reference": "3e7cc92f946c23fb28959457fa0608c5eba29ed8"
+                "url": "https://github.com/justinrainbow/json-schema.git",
+                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendCode/zipball/3e7cc92f946c23fb28959457fa0608c5eba29ed8",
-                "reference": "3e7cc92f946c23fb28959457fa0608c5eba29ed8",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
+                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-eventmanager": "self.version"
-            },
-            "require-dev": {
-                "doctrine/common": ">=2.1",
-                "zendframework/zend-stdlib": "self.version"
-            },
-            "suggest": {
-                "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
-                "zendframework/zend-stdlib": "Zend\\Stdlib component"
+                "php": ">=5.3.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
-                }
-            },
             "autoload": {
                 "psr-0": {
-                    "Zend\\Code\\": ""
+                    "JsonSchema": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "NewBSD"
             ],
-            "description": "provides facilities to generate arbitrary code using an object oriented interface",
+            "authors": [
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch",
+                    "homepage": "http://wiedler.ch/igor/"
+                },
+                {
+                    "name": "Bruno Prieto Reis",
+                    "email": "bruno.p.reis@gmail.com"
+                },
+                {
+                    "name": "Justin Rainbow",
+                    "email": "justin.rainbow@gmail.com"
+                },
+                {
+                    "name": "Robert Schönthal",
+                    "email": "robert.schoenthal@gmail.com",
+                    "homepage": "http://digitalkaoz.net"
+                }
+            ],
+            "description": "A library to validate a json schema.",
+            "homepage": "https://github.com/justinrainbow/json-schema",
             "keywords": [
-                "code",
-                "zf2"
+                "json",
+                "schema"
             ],
-            "time": "2014-04-15 15:28:49"
+            "time": "2012-01-03 00:33:17"
         },
         {
-            "name": "zendframework/zend-escaper",
-            "version": "2.3.1",
-            "target-dir": "Zend/Escaper",
+            "name": "magento/zendframework1",
+            "version": "1.12.9",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendEscaper.git",
-                "reference": "dddee2104337bbf3522f9ef591c361a40aabf7cc"
+                "url": "https://github.com/magento/zf1.git",
+                "reference": "c22ff60d6e49862a51281600aa7a8e58fbc3940f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/dddee2104337bbf3522f9ef591c361a40aabf7cc",
-                "reference": "dddee2104337bbf3522f9ef591c361a40aabf7cc",
+                "url": "https://api.github.com/repos/magento/zf1/zipball/c22ff60d6e49862a51281600aa7a8e58fbc3940f",
+                "reference": "c22ff60d6e49862a51281600aa7a8e58fbc3940f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23"
+                "php": ">=5.2.11"
+            },
+            "require-dev": {
+                "phpunit/dbunit": "1.3.*",
+                "phpunit/phpunit": "3.7.*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "1.12.x-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "Zend\\Escaper\\": ""
+                    "Zend_": "library/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "library/"
+            ],
             "license": [
                 "BSD-3-Clause"
             ],
+            "description": "Magento Zend Framework 1",
+            "homepage": "http://framework.zend.com/",
             "keywords": [
-                "escaper",
-                "zf2"
+                "ZF1",
+                "framework"
             ],
-            "time": "2014-04-15 15:29:16"
+            "time": "2014-11-24 22:50:41"
         },
         {
-            "name": "zendframework/zend-eventmanager",
-            "version": "2.3.1",
-            "target-dir": "Zend/EventManager",
+            "name": "seld/jsonlint",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendEventManager.git",
-                "reference": "957faa0580c40ef6bf6cf3e87a36d594042fe133"
+                "url": "https://github.com/Seldaek/jsonlint.git",
+                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendEventManager/zipball/957faa0580c40ef6bf6cf3e87a36d594042fe133",
-                "reference": "957faa0580c40ef6bf6cf3e87a36d594042fe133",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/a7bc2ec9520ad15382292591b617c43bdb1fec35",
+                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-stdlib": "self.version"
+                "php": ">=5.3.0"
             },
+            "bin": [
+                "bin/jsonlint"
+            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
-                }
-            },
             "autoload": {
-                "psr-0": {
-                    "Zend\\EventManager\\": ""
+                "psr-4": {
+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "JSON Linter",
             "keywords": [
-                "eventmanager",
-                "zf2"
+                "json",
+                "linter",
+                "parser",
+                "validator"
             ],
-            "time": "2014-04-15 14:47:18"
+            "time": "2014-09-05 15:36:20"
         },
         {
-            "name": "zendframework/zend-server",
-            "version": "2.3.1",
-            "target-dir": "Zend/Server",
+            "name": "symfony/console",
+            "version": "v2.6.0",
+            "target-dir": "Symfony/Component/Console",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendServer.git",
-                "reference": "b491a401b1710785b5dbf69e77ee2f13764fb0ff"
+                "url": "https://github.com/symfony/Console.git",
+                "reference": "d3bac228fd7a2aac9193e241b239880b3ba39a10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendServer/zipball/b491a401b1710785b5dbf69e77ee2f13764fb0ff",
-                "reference": "b491a401b1710785b5dbf69e77ee2f13764fb0ff",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/d3bac228fd7a2aac9193e241b239880b3ba39a10",
+                "reference": "d3bac228fd7a2aac9193e241b239880b3ba39a10",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-code": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1",
+                "symfony/process": "~2.1"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "Zend\\Server\\": ""
+                    "Symfony\\Component\\Console\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "keywords": [
-                "server",
-                "zf2"
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
             ],
-            "time": "2014-04-15 14:47:18"
+            "description": "Symfony Console Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-11-20 13:24:23"
         },
         {
-            "name": "zendframework/zend-soap",
+            "name": "symfony/finder",
+            "version": "v2.6.0",
+            "target-dir": "Symfony/Component/Finder",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Finder.git",
+                "reference": "d574347c652a14cfee0349f744c7880e1d9029fd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Finder/zipball/d574347c652a14cfee0349f744c7880e1d9029fd",
+                "reference": "d574347c652a14cfee0349f744c7880e1d9029fd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Finder\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-11-28 10:00:40"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v2.6.0",
+            "target-dir": "Symfony/Component/Process",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Process.git",
+                "reference": "dc88f75d1c07791e5733f90be747961dce26cf05"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Process/zipball/dc88f75d1c07791e5733f90be747961dce26cf05",
+                "reference": "dc88f75d1c07791e5733f90be747961dce26cf05",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Process\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-11-04 14:29:39"
+        },
+        {
+            "name": "zendframework/zend-code",
             "version": "2.3.1",
-            "target-dir": "Zend/Soap",
+            "target-dir": "Zend/Code",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendSoap.git",
-                "reference": "29b7dfe2b2d1fcf219557ff8821506a55510a53d"
+                "url": "https://github.com/zendframework/Component_ZendCode.git",
+                "reference": "3e7cc92f946c23fb28959457fa0608c5eba29ed8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendSoap/zipball/29b7dfe2b2d1fcf219557ff8821506a55510a53d",
-                "reference": "29b7dfe2b2d1fcf219557ff8821506a55510a53d",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendCode/zipball/3e7cc92f946c23fb28959457fa0608c5eba29ed8",
+                "reference": "3e7cc92f946c23fb28959457fa0608c5eba29ed8",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.23",
-                "zendframework/zend-server": "self.version",
-                "zendframework/zend-stdlib": "self.version",
-                "zendframework/zend-uri": "self.version"
+                "zendframework/zend-eventmanager": "self.version"
             },
             "require-dev": {
-                "zendframework/zend-http": "self.version"
+                "doctrine/common": ">=2.1",
+                "zendframework/zend-stdlib": "self.version"
             },
             "suggest": {
-                "zendframework/zend-http": "Zend\\Http component"
+                "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
+                "zendframework/zend-stdlib": "Zend\\Stdlib component"
             },
             "type": "library",
             "extra": {
@@ -262,46 +411,50 @@
             },
             "autoload": {
                 "psr-0": {
-                    "Zend\\Soap\\": ""
+                    "Zend\\Code\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
+            "description": "provides facilities to generate arbitrary code using an object oriented interface",
             "keywords": [
-                "soap",
+                "code",
                 "zf2"
             ],
-            "time": "2014-04-15 14:47:18"
+            "time": "2014-04-15 15:28:49"
         },
         {
-            "name": "zendframework/zend-stdlib",
+            "name": "zendframework/zend-config",
             "version": "2.3.1",
-            "target-dir": "Zend/Stdlib",
+            "target-dir": "Zend/Config",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendStdlib.git",
-                "reference": "c1f4830018b5d4f034d32fa01a9e17ea176f56f6"
+                "url": "https://github.com/zendframework/Component_ZendConfig.git",
+                "reference": "61b81c6ea60c1947e13b4effbfffcd9bb59c2180"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/c1f4830018b5d4f034d32fa01a9e17ea176f56f6",
-                "reference": "c1f4830018b5d4f034d32fa01a9e17ea176f56f6",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendConfig/zipball/61b81c6ea60c1947e13b4effbfffcd9bb59c2180",
+                "reference": "61b81c6ea60c1947e13b4effbfffcd9bb59c2180",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23"
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "self.version"
             },
             "require-dev": {
-                "zendframework/zend-eventmanager": "self.version",
-                "zendframework/zend-serializer": "self.version",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-i18n": "self.version",
+                "zendframework/zend-json": "self.version",
                 "zendframework/zend-servicemanager": "self.version"
             },
             "suggest": {
-                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-                "zendframework/zend-serializer": "Zend\\Serializer component",
-                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
             },
             "type": "library",
             "extra": {
@@ -312,38 +465,38 @@
             },
             "autoload": {
                 "psr-0": {
-                    "Zend\\Stdlib\\": ""
+                    "Zend\\Config\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
+            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
             "keywords": [
-                "stdlib",
+                "config",
                 "zf2"
             ],
-            "time": "2014-04-15 15:28:48"
+            "time": "2014-04-15 15:29:04"
         },
         {
-            "name": "zendframework/zend-uri",
+            "name": "zendframework/zend-console",
             "version": "2.3.1",
-            "target-dir": "Zend/Uri",
+            "target-dir": "Zend/Console",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendUri.git",
-                "reference": "cf120804a7ef1b906979b110c6f34c8592a7c36b"
+                "url": "https://github.com/zendframework/Component_ZendConsole.git",
+                "reference": "6720a94d30272eefe10bef4801cc41a027530b1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendUri/zipball/cf120804a7ef1b906979b110c6f34c8592a7c36b",
-                "reference": "cf120804a7ef1b906979b110c6f34c8592a7c36b",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendConsole/zipball/6720a94d30272eefe10bef4801cc41a027530b1c",
+                "reference": "6720a94d30272eefe10bef4801cc41a027530b1c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.23",
-                "zendframework/zend-escaper": "self.version",
-                "zendframework/zend-validator": "self.version"
+                "zendframework/zend-stdlib": "self.version"
             },
             "type": "library",
             "extra": {
@@ -354,57 +507,44 @@
             },
             "autoload": {
                 "psr-0": {
-                    "Zend\\Uri\\": ""
+                    "Zend\\Console\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
             "keywords": [
-                "uri",
+                "console",
                 "zf2"
             ],
-            "time": "2014-04-15 14:47:18"
+            "time": "2014-04-15 15:29:14"
         },
         {
-            "name": "zendframework/zend-validator",
+            "name": "zendframework/zend-di",
             "version": "2.3.1",
-            "target-dir": "Zend/Validator",
+            "target-dir": "Zend/Di",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendValidator.git",
-                "reference": "ac9848e54c6c75de81ee7a82c3187cd25a898990"
+                "url": "https://github.com/zendframework/Component_ZendDi.git",
+                "reference": "45450000c83937a73a261a32480637b4198f4cea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendValidator/zipball/ac9848e54c6c75de81ee7a82c3187cd25a898990",
-                "reference": "ac9848e54c6c75de81ee7a82c3187cd25a898990",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendDi/zipball/45450000c83937a73a261a32480637b4198f4cea",
+                "reference": "45450000c83937a73a261a32480637b4198f4cea",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.23",
+                "zendframework/zend-code": "self.version",
                 "zendframework/zend-stdlib": "self.version"
             },
             "require-dev": {
-                "zendframework/zend-db": "self.version",
-                "zendframework/zend-filter": "self.version",
-                "zendframework/zend-i18n": "self.version",
-                "zendframework/zend-math": "self.version",
-                "zendframework/zend-servicemanager": "self.version",
-                "zendframework/zend-session": "self.version",
-                "zendframework/zend-uri": "self.version"
+                "zendframework/zend-servicemanager": "self.version"
             },
             "suggest": {
-                "zendframework/zend-db": "Zend\\Db component",
-                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
-                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators",
-                "zendframework/zend-math": "Zend\\Math component",
-                "zendframework/zend-resources": "Translations of validator messages",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
-                "zendframework/zend-session": "Zend\\Session component",
-                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
             },
             "type": "library",
             "extra": {
@@ -415,1125 +555,1097 @@
             },
             "autoload": {
                 "psr-0": {
-                    "Zend\\Validator\\": ""
+                    "Zend\\Di\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides a set of commonly needed validators",
             "keywords": [
-                "validator",
+                "di",
                 "zf2"
             ],
-            "time": "2014-04-15 15:28:42"
-        }
-    ],
-    "packages-dev": [
+            "time": "2014-04-15 15:29:10"
+        },
         {
-            "name": "composer/composer",
-            "version": "1.0.0-alpha8",
+            "name": "zendframework/zend-escaper",
+            "version": "2.3.1",
+            "target-dir": "Zend/Escaper",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/composer.git",
-                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46"
+                "url": "https://github.com/zendframework/Component_ZendEscaper.git",
+                "reference": "dddee2104337bbf3522f9ef591c361a40aabf7cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
-                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/dddee2104337bbf3522f9ef591c361a40aabf7cc",
+                "reference": "dddee2104337bbf3522f9ef591c361a40aabf7cc",
                 "shasum": ""
             },
             "require": {
-                "justinrainbow/json-schema": "1.1.*",
-                "php": ">=5.3.2",
-                "seld/jsonlint": "1.*",
-                "symfony/console": "~2.3",
-                "symfony/finder": "~2.2",
-                "symfony/process": "~2.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~3.7.10"
-            },
-            "suggest": {
-                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
-                "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic"
+                "php": ">=5.3.23"
             },
-            "bin": [
-                "bin/composer"
-            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "Composer": "src/"
+                    "Zend\\Escaper\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de",
-                    "role": "Developer"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "Dependency Manager",
-            "homepage": "http://getcomposer.org/",
             "keywords": [
-                "autoload",
-                "dependency",
-                "package"
+                "escaper",
+                "zf2"
             ],
-            "time": "2014-01-06 18:39:59"
+            "time": "2014-04-15 15:29:16"
         },
         {
-            "name": "doctrine/instantiator",
-            "version": "1.0.4",
+            "name": "zendframework/zend-eventmanager",
+            "version": "2.3.1",
+            "target-dir": "Zend/EventManager",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
+                "url": "https://github.com/zendframework/Component_ZendEventManager.git",
+                "reference": "957faa0580c40ef6bf6cf3e87a36d594042fe133"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
-                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendEventManager/zipball/957faa0580c40ef6bf6cf3e87a36d594042fe133",
+                "reference": "957faa0580c40ef6bf6cf3e87a36d594042fe133",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "self.version"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "Doctrine\\Instantiator\\": "src"
+                    "Zend\\EventManager\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
             "keywords": [
-                "constructor",
-                "instantiate"
+                "eventmanager",
+                "zf2"
             ],
-            "time": "2014-10-13 12:58:55"
+            "time": "2014-04-15 14:47:18"
         },
         {
-            "name": "justinrainbow/json-schema",
-            "version": "1.1.0",
+            "name": "zendframework/zend-filter",
+            "version": "2.3.1",
+            "target-dir": "Zend/Filter",
             "source": {
                 "type": "git",
-                "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c"
+                "url": "https://github.com/zendframework/Component_ZendFilter.git",
+                "reference": "1889b7aa499beccadac770780a73e1a40e0f8a53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
-                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendFilter/zipball/1889b7aa499beccadac770780a73e1a40e0f8a53",
+                "reference": "1889b7aa499beccadac770780a73e1a40e0f8a53",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-crypt": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-uri": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-crypt": "Zend\\Crypt component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
             "autoload": {
                 "psr-0": {
-                    "JsonSchema": "src/"
+                    "Zend\\Filter\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "NewBSD"
-            ],
-            "authors": [
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch",
-                    "homepage": "http://wiedler.ch/igor/"
-                },
-                {
-                    "name": "Bruno Prieto Reis",
-                    "email": "bruno.p.reis@gmail.com"
-                },
-                {
-                    "name": "Justin Rainbow",
-                    "email": "justin.rainbow@gmail.com"
-                },
-                {
-                    "name": "Robert Schönthal",
-                    "email": "robert.schoenthal@gmail.com",
-                    "homepage": "http://digitalkaoz.net"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "A library to validate a json schema.",
-            "homepage": "https://github.com/justinrainbow/json-schema",
+            "description": "provides a set of commonly needed data filters",
             "keywords": [
-                "json",
-                "schema"
+                "filter",
+                "zf2"
             ],
-            "time": "2012-01-03 00:33:17"
+            "time": "2014-04-15 15:28:47"
         },
         {
-            "name": "pdepend/pdepend",
-            "version": "2.0.3",
+            "name": "zendframework/zend-form",
+            "version": "2.3.1",
+            "target-dir": "Zend/Form",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "dc582a3c0180664a8fbfc5a34efaf4cc13fccc60"
+                "url": "https://github.com/zendframework/Component_ZendForm.git",
+                "reference": "2e91090e63f865c1c0b8c21157d4eaffad341f59"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/dc582a3c0180664a8fbfc5a34efaf4cc13fccc60",
-                "reference": "dc582a3c0180664a8fbfc5a34efaf4cc13fccc60",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendForm/zipball/2e91090e63f865c1c0b8c21157d4eaffad341f59",
+                "reference": "2e91090e63f865c1c0b8c21157d4eaffad341f59",
                 "shasum": ""
             },
             "require": {
-                "symfony/config": "@stable",
-                "symfony/dependency-injection": "@stable",
-                "symfony/filesystem": "@stable"
+                "php": ">=5.3.23",
+                "zendframework/zend-inputfilter": "self.version",
+                "zendframework/zend-stdlib": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "3.*@stable",
-                "squizlabs/php_codesniffer": "@stable"
+                "zendframework/zend-captcha": "self.version",
+                "zendframework/zend-code": "self.version",
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-i18n": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-validator": "self.version",
+                "zendframework/zend-view": "self.version",
+                "zendframework/zendservice-recaptcha": "*"
+            },
+            "suggest": {
+                "zendframework/zend-captcha": "Zend\\Captcha component",
+                "zendframework/zend-code": "Zend\\Code component",
+                "zendframework/zend-eventmanager": "Zend\\EventManager component",
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-validator": "Zend\\Validator component",
+                "zendframework/zend-view": "Zend\\View component",
+                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
             },
-            "bin": [
-                "src/bin/pdepend"
-            ],
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
             "autoload": {
                 "psr-0": {
-                    "PDepend\\": "src/main/php/"
+                    "Zend\\Form\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Official version of pdepend to be handled with Composer",
-            "time": "2014-10-08 06:54:50"
+            "keywords": [
+                "form",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:02"
         },
         {
-            "name": "phpmd/phpmd",
-            "version": "2.1.3",
+            "name": "zendframework/zend-http",
+            "version": "2.3.1",
+            "target-dir": "Zend/Http",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "1a485d9db869137af5e9678bd844568c92998b25"
+                "url": "https://github.com/zendframework/Component_ZendHttp.git",
+                "reference": "b13fc4c30c39364409ef68a9f9b5975765a3ff5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/1a485d9db869137af5e9678bd844568c92998b25",
-                "reference": "1a485d9db869137af5e9678bd844568c92998b25",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendHttp/zipball/b13fc4c30c39364409ef68a9f9b5975765a3ff5a",
+                "reference": "b13fc4c30c39364409ef68a9f9b5975765a3ff5a",
                 "shasum": ""
             },
             "require": {
-                "pdepend/pdepend": "2.0.*",
-                "php": ">=5.3.0",
-                "symfony/config": "2.5.*",
-                "symfony/dependency-injection": "2.5.*",
-                "symfony/filesystem": "2.5.*"
+                "php": ">=5.3.23",
+                "zendframework/zend-loader": "self.version",
+                "zendframework/zend-stdlib": "self.version",
+                "zendframework/zend-uri": "self.version",
+                "zendframework/zend-validator": "self.version"
             },
-            "bin": [
-                "src/bin/phpmd"
-            ],
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
             "autoload": {
                 "psr-0": {
-                    "PHPMD\\": "src/main/php"
+                    "Zend\\Http\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Official version of PHPMD handled with Composer.",
-            "time": "2014-09-25 15:56:22"
+            "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
+            "keywords": [
+                "http",
+                "zf2"
+            ],
+            "time": "2014-04-15 14:47:18"
         },
         {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.0.11",
+            "name": "zendframework/zend-inputfilter",
+            "version": "2.3.1",
+            "target-dir": "Zend/InputFilter",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "53603b3c995f5aab6b59c8e08c3a663d2cc810b7"
+                "url": "https://github.com/zendframework/Component_ZendInputFilter.git",
+                "reference": "a45d2180c819f9ff9e74be1bf4c5c8dd1d9649e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/53603b3c995f5aab6b59c8e08c3a663d2cc810b7",
-                "reference": "53603b3c995f5aab6b59c8e08c3a663d2cc810b7",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendInputFilter/zipball/a45d2180c819f9ff9e74be1bf4c5c8dd1d9649e9",
+                "reference": "a45d2180c819f9ff9e74be1bf4c5c8dd1d9649e9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "~1.0",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4.1"
+                "php": ">=5.3.23",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-stdlib": "self.version",
+                "zendframework/zend-validator": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-servicemanager": "self.version"
             },
             "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
+                "zendframework/zend-servicemanager": "To support plugin manager support"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-0": {
+                    "Zend\\InputFilter\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
             "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
+                "inputfilter",
+                "zf2"
             ],
-            "time": "2014-08-31 06:33:04"
+            "time": "2014-04-15 14:47:18"
         },
         {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.3.4",
+            "name": "zendframework/zend-json",
+            "version": "2.3.1",
+            "target-dir": "Zend/Json",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+                "url": "https://github.com/zendframework/Component_ZendJson.git",
+                "reference": "eb281da42d3f5bba5acb664359029b6fa7c62e28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendJson/zipball/eb281da42d3f5bba5acb664359029b6fa7c62e28",
+                "reference": "eb281da42d3f5bba5acb664359029b6fa7c62e28",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-http": "self.version",
+                "zendframework/zend-server": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-http": "Zend\\Http component",
+                "zendframework/zend-server": "Zend\\Server component"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
             "autoload": {
-                "classmap": [
-                    "File/"
-                ]
+                "psr-0": {
+                    "Zend\\Json\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
             "keywords": [
-                "filesystem",
-                "iterator"
+                "json",
+                "zf2"
             ],
-            "time": "2013-10-10 15:34:57"
+            "time": "2014-04-15 14:47:18"
         },
         {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.0",
+            "name": "zendframework/zend-loader",
+            "version": "2.3.1",
+            "target-dir": "Zend/Loader",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
+                "url": "https://github.com/zendframework/Component_ZendLoader.git",
+                "reference": "37abb23b0b2608584673f8388d1563a1fd604f09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendLoader/zipball/37abb23b0b2608584673f8388d1563a1fd604f09",
+                "reference": "37abb23b0b2608584673f8388d1563a1fd604f09",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.23"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
             "autoload": {
-                "classmap": [
-                    "Text/"
-                ]
+                "psr-0": {
+                    "Zend\\Loader\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
             "keywords": [
-                "template"
+                "loader",
+                "zf2"
             ],
-            "time": "2014-01-30 17:20:04"
+            "time": "2014-04-15 15:28:53"
         },
         {
-            "name": "phpunit/php-timer",
-            "version": "1.0.5",
+            "name": "zendframework/zend-log",
+            "version": "2.3.1",
+            "target-dir": "Zend/Log",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
+                "url": "https://github.com/zendframework/Component_ZendLog.git",
+                "reference": "606ef20717a935afec1400f54bd1b03faf859c47"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendLog/zipball/606ef20717a935afec1400f54bd1b03faf859c47",
+                "reference": "606ef20717a935afec1400f54bd1b03faf859c47",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.23",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-console": "self.version",
+                "zendframework/zend-db": "self.version",
+                "zendframework/zend-escaper": "self.version",
+                "zendframework/zend-mail": "self.version",
+                "zendframework/zend-validator": "self.version"
+            },
+            "suggest": {
+                "ext-mongo": "*",
+                "zendframework/zend-console": "Zend\\Console component",
+                "zendframework/zend-db": "Zend\\Db component",
+                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML formatter",
+                "zendframework/zend-mail": "Zend\\Mail component",
+                "zendframework/zend-validator": "Zend\\Validator component"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
             "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
+                "psr-0": {
+                    "Zend\\Log\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "description": "component for general purpose logging",
             "keywords": [
-                "timer"
+                "log",
+                "logging",
+                "zf2"
             ],
-            "time": "2013-08-02 07:42:54"
+            "time": "2014-04-15 15:28:45"
         },
         {
-            "name": "phpunit/php-token-stream",
-            "version": "1.3.0",
+            "name": "zendframework/zend-math",
+            "version": "2.3.1",
+            "target-dir": "Zend/Math",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "f8d5d08c56de5cfd592b3340424a81733259a876"
+                "url": "https://github.com/zendframework/Component_ZendMath.git",
+                "reference": "be6de5ba3d47e3f9a6732badea8bc724c49d0552"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/f8d5d08c56de5cfd592b3340424a81733259a876",
-                "reference": "f8d5d08c56de5cfd592b3340424a81733259a876",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendMath/zipball/be6de5ba3d47e3f9a6732badea8bc724c49d0552",
+                "reference": "be6de5ba3d47e3f9a6732badea8bc724c49d0552",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
+                "php": ">=5.3.23"
             },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
+            "suggest": {
+                "ext-bcmath": "If using the bcmath functionality",
+                "ext-gmp": "If using the gmp functionality",
+                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
+                "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-0": {
+                    "Zend\\Math\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
             "keywords": [
-                "tokenizer"
+                "math",
+                "zf2"
             ],
-            "time": "2014-08-31 06:12:13"
+            "time": "2014-04-15 15:29:09"
         },
         {
-            "name": "phpunit/phpunit",
-            "version": "4.1.0",
+            "name": "zendframework/zend-modulemanager",
+            "version": "2.3.1",
+            "target-dir": "Zend/ModuleManager",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "efb1b1334605594417a3bd466477772d06d460a8"
+                "url": "https://github.com/zendframework/Component_ZendModuleManager.git",
+                "reference": "bfff608492fdfea1f2b815285e0ed8b467a99c9f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/efb1b1334605594417a3bd466477772d06d460a8",
-                "reference": "efb1b1334605594417a3bd466477772d06d460a8",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendModuleManager/zipball/bfff608492fdfea1f2b815285e0ed8b467a99c9f",
+                "reference": "bfff608492fdfea1f2b815285e0ed8b467a99c9f",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpunit/php-code-coverage": "~2.0",
-                "phpunit/php-file-iterator": "~1.3.1",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "~1.0.2",
-                "phpunit/phpunit-mock-objects": "~2.1",
-                "sebastian/comparator": "~1.0",
-                "sebastian/diff": "~1.1",
-                "sebastian/environment": "~1.0",
-                "sebastian/exporter": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.0"
+                "php": ">=5.3.23",
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-config": "self.version",
+                "zendframework/zend-console": "self.version",
+                "zendframework/zend-loader": "self.version",
+                "zendframework/zend-mvc": "self.version",
+                "zendframework/zend-servicemanager": "self.version"
             },
             "suggest": {
-                "phpunit/php-invoker": "~1.1"
+                "zendframework/zend-config": "Zend\\Config component",
+                "zendframework/zend-console": "Zend\\Console component",
+                "zendframework/zend-loader": "Zend\\Loader component",
+                "zendframework/zend-mvc": "Zend\\Mvc component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
             },
-            "bin": [
-                "phpunit"
-            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1.x-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-0": {
+                    "Zend\\ModuleManager\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "",
-                "../../symfony/yaml/"
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "http://www.phpunit.de/",
             "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
+                "modulemanager",
+                "zf2"
             ],
-            "time": "2014-05-02 07:13:40"
+            "time": "2014-04-15 15:28:50"
         },
         {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.0",
+            "name": "zendframework/zend-mvc",
+            "version": "2.3.1",
+            "target-dir": "Zend/Mvc",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "c63d2367247365f688544f0d500af90a11a44c65"
+                "url": "https://github.com/zendframework/Component_ZendMvc.git",
+                "reference": "d7708af7028aa6c42255fe2d9ece53f0e5d76e2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65",
-                "reference": "c63d2367247365f688544f0d500af90a11a44c65",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendMvc/zipball/d7708af7028aa6c42255fe2d9ece53f0e5d76e2c",
+                "reference": "d7708af7028aa6c42255fe2d9ece53f0e5d76e2c",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.1",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2"
+                "php": ">=5.3.23",
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-stdlib": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.3"
+                "zendframework/zend-authentication": "self.version",
+                "zendframework/zend-console": "self.version",
+                "zendframework/zend-di": "self.version",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-form": "self.version",
+                "zendframework/zend-http": "self.version",
+                "zendframework/zend-i18n": "self.version",
+                "zendframework/zend-inputfilter": "self.version",
+                "zendframework/zend-json": "self.version",
+                "zendframework/zend-log": "self.version",
+                "zendframework/zend-modulemanager": "self.version",
+                "zendframework/zend-serializer": "self.version",
+                "zendframework/zend-session": "self.version",
+                "zendframework/zend-text": "self.version",
+                "zendframework/zend-uri": "self.version",
+                "zendframework/zend-validator": "self.version",
+                "zendframework/zend-version": "self.version",
+                "zendframework/zend-view": "self.version"
             },
             "suggest": {
-                "ext-soap": "*"
+                "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
+                "zendframework/zend-config": "Zend\\Config component",
+                "zendframework/zend-console": "Zend\\Console component",
+                "zendframework/zend-di": "Zend\\Di component",
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-form": "Zend\\Form component",
+                "zendframework/zend-http": "Zend\\Http component",
+                "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
+                "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
+                "zendframework/zend-json": "Zend\\Json component",
+                "zendframework/zend-log": "Zend\\Log component",
+                "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
+                "zendframework/zend-stdlib": "Zend\\Stdlib component",
+                "zendframework/zend-text": "Zend\\Text component",
+                "zendframework/zend-uri": "Zend\\Uri component",
+                "zendframework/zend-validator": "Zend\\Validator component",
+                "zendframework/zend-version": "Zend\\Version component",
+                "zendframework/zend-view": "Zend\\View component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3.x-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-0": {
+                    "Zend\\Mvc\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
             "keywords": [
-                "mock",
-                "xunit"
+                "mvc",
+                "zf2"
             ],
-            "time": "2014-10-03 05:12:11"
+            "time": "2014-04-15 15:29:05"
         },
         {
-            "name": "sebastian/comparator",
-            "version": "1.0.1",
+            "name": "zendframework/zend-serializer",
+            "version": "2.3.1",
+            "target-dir": "Zend/Serializer",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef"
+                "url": "https://github.com/zendframework/Component_ZendSerializer.git",
+                "reference": "3187aa2a9c9713932f84006700f922ee1253328d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e54a01c0da1b87db3c5a3c4c5277ddf331da4aef",
-                "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendSerializer/zipball/3187aa2a9c9713932f84006700f922ee1253328d",
+                "reference": "3187aa2a9c9713932f84006700f922ee1253328d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.1",
-                "sebastian/exporter": "~1.0"
+                "php": ">=5.3.23",
+                "zendframework/zend-json": "self.version",
+                "zendframework/zend-math": "self.version",
+                "zendframework/zend-stdlib": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.1"
+                "zendframework/zend-servicemanager": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-servicemanager": "To support plugin manager support"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-0": {
+                    "Zend\\Serializer\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
             "keywords": [
-                "comparator",
-                "compare",
-                "equality"
+                "serializer",
+                "zf2"
             ],
-            "time": "2014-05-11 23:00:21"
+            "time": "2014-04-15 15:29:03"
         },
         {
-            "name": "sebastian/diff",
-            "version": "1.2.0",
+            "name": "zendframework/zend-server",
+            "version": "2.3.1",
+            "target-dir": "Zend/Server",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7"
+                "url": "https://github.com/zendframework/Component_ZendServer.git",
+                "reference": "b491a401b1710785b5dbf69e77ee2f13764fb0ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7",
-                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendServer/zipball/b491a401b1710785b5dbf69e77ee2f13764fb0ff",
+                "reference": "b491a401b1710785b5dbf69e77ee2f13764fb0ff",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
+                "php": ">=5.3.23",
+                "zendframework/zend-code": "self.version",
+                "zendframework/zend-stdlib": "self.version"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-0": {
+                    "Zend\\Server\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "http://www.github.com/sebastianbergmann/diff",
             "keywords": [
-                "diff"
+                "server",
+                "zf2"
             ],
-            "time": "2014-08-15 10:29:00"
+            "time": "2014-04-15 14:47:18"
         },
         {
-            "name": "sebastian/environment",
-            "version": "1.2.0",
+            "name": "zendframework/zend-servicemanager",
+            "version": "2.3.1",
+            "target-dir": "Zend/ServiceManager",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d"
+                "url": "https://github.com/zendframework/Component_ZendServiceManager.git",
+                "reference": "652ab6e142b7afd1eede8f0f33b47d2599786c84"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0d9bf79554d2a999da194a60416c15cf461eb67d",
-                "reference": "0d9bf79554d2a999da194a60416c15cf461eb67d",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendServiceManager/zipball/652ab6e142b7afd1eede8f0f33b47d2599786c84",
+                "reference": "652ab6e142b7afd1eede8f0f33b47d2599786c84",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.23"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.3"
+                "zendframework/zend-di": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-di": "Zend\\Di component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-0": {
+                    "Zend\\ServiceManager\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
             "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
+                "servicemanager",
+                "zf2"
             ],
-            "time": "2014-10-22 06:38:05"
+            "time": "2014-04-15 15:28:43"
         },
         {
-            "name": "sebastian/exporter",
-            "version": "1.0.2",
+            "name": "zendframework/zend-soap",
+            "version": "2.3.1",
+            "target-dir": "Zend/Soap",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0"
+                "url": "https://github.com/zendframework/Component_ZendSoap.git",
+                "reference": "29b7dfe2b2d1fcf219557ff8821506a55510a53d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0",
-                "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendSoap/zipball/29b7dfe2b2d1fcf219557ff8821506a55510a53d",
+                "reference": "29b7dfe2b2d1fcf219557ff8821506a55510a53d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.23",
+                "zendframework/zend-server": "self.version",
+                "zendframework/zend-stdlib": "self.version",
+                "zendframework/zend-uri": "self.version"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "zendframework/zend-http": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-http": "Zend\\Http component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-0": {
+                    "Zend\\Soap\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
             "keywords": [
-                "export",
-                "exporter"
+                "soap",
+                "zf2"
             ],
-            "time": "2014-09-10 00:51:36"
+            "time": "2014-04-15 14:47:18"
         },
         {
-            "name": "sebastian/version",
-            "version": "1.0.3",
+            "name": "zendframework/zend-stdlib",
+            "version": "2.3.1",
+            "target-dir": "Zend/Stdlib",
             "source": {
                 "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43"
+                "url": "https://github.com/zendframework/Component_ZendStdlib.git",
+                "reference": "c1f4830018b5d4f034d32fa01a9e17ea176f56f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
-                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/c1f4830018b5d4f034d32fa01a9e17ea176f56f6",
+                "reference": "c1f4830018b5d4f034d32fa01a9e17ea176f56f6",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=5.3.23"
+            },
+            "require-dev": {
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-serializer": "self.version",
+                "zendframework/zend-servicemanager": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+                "zendframework/zend-serializer": "Zend\\Serializer component",
+                "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+            },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ]
+                "psr-0": {
+                    "Zend\\Stdlib\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
+            "keywords": [
+                "stdlib",
+                "zf2"
             ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2014-03-07 15:35:33"
+            "time": "2014-04-15 15:28:48"
         },
         {
-            "name": "seld/jsonlint",
-            "version": "1.3.0",
+            "name": "zendframework/zend-uri",
+            "version": "2.3.1",
+            "target-dir": "Zend/Uri",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35"
+                "url": "https://github.com/zendframework/Component_ZendUri.git",
+                "reference": "cf120804a7ef1b906979b110c6f34c8592a7c36b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/a7bc2ec9520ad15382292591b617c43bdb1fec35",
-                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendUri/zipball/cf120804a7ef1b906979b110c6f34c8592a7c36b",
+                "reference": "cf120804a7ef1b906979b110c6f34c8592a7c36b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=5.3.23",
+                "zendframework/zend-escaper": "self.version",
+                "zendframework/zend-validator": "self.version"
             },
-            "bin": [
-                "bin/jsonlint"
-            ],
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
             "autoload": {
-                "psr-4": {
-                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+                "psr-0": {
+                    "Zend\\Uri\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "JSON Linter",
+            "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
             "keywords": [
-                "json",
-                "linter",
-                "parser",
-                "validator"
+                "uri",
+                "zf2"
             ],
-            "time": "2014-09-05 15:36:20"
+            "time": "2014-04-15 14:47:18"
         },
         {
-            "name": "squizlabs/php_codesniffer",
-            "version": "1.5.3",
+            "name": "zendframework/zend-validator",
+            "version": "2.3.1",
+            "target-dir": "Zend/Validator",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "396178ada8499ec492363587f037125bf7b07fcc"
+                "url": "https://github.com/zendframework/Component_ZendValidator.git",
+                "reference": "ac9848e54c6c75de81ee7a82c3187cd25a898990"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/396178ada8499ec492363587f037125bf7b07fcc",
-                "reference": "396178ada8499ec492363587f037125bf7b07fcc",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendValidator/zipball/ac9848e54c6c75de81ee7a82c3187cd25a898990",
+                "reference": "ac9848e54c6c75de81ee7a82c3187cd25a898990",
                 "shasum": ""
             },
             "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.1.2"
+                "php": ">=5.3.23",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-db": "self.version",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-i18n": "self.version",
+                "zendframework/zend-math": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-session": "self.version",
+                "zendframework/zend-uri": "self.version"
             },
             "suggest": {
-                "phpunit/php-timer": "dev-master"
+                "zendframework/zend-db": "Zend\\Db component",
+                "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator",
+                "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators",
+                "zendframework/zend-math": "Zend\\Math component",
+                "zendframework/zend-resources": "Translations of validator messages",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
+                "zendframework/zend-session": "Zend\\Session component",
+                "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators"
             },
-            "bin": [
-                "scripts/phpcs"
-            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-phpcs-fixer": "2.0.x-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
-                "classmap": [
-                    "CodeSniffer.php",
-                    "CodeSniffer/CLI.php",
-                    "CodeSniffer/Exception.php",
-                    "CodeSniffer/File.php",
-                    "CodeSniffer/Report.php",
-                    "CodeSniffer/Reporting.php",
-                    "CodeSniffer/Sniff.php",
-                    "CodeSniffer/Tokens.php",
-                    "CodeSniffer/Reports/",
-                    "CodeSniffer/CommentParser/",
-                    "CodeSniffer/Tokenizers/",
-                    "CodeSniffer/DocGenerators/",
-                    "CodeSniffer/Standards/AbstractPatternSniff.php",
-                    "CodeSniffer/Standards/AbstractScopeSniff.php",
-                    "CodeSniffer/Standards/AbstractVariableSniff.php",
-                    "CodeSniffer/Standards/IncorrectPatternException.php",
-                    "CodeSniffer/Standards/Generic/Sniffs/",
-                    "CodeSniffer/Standards/MySource/Sniffs/",
-                    "CodeSniffer/Standards/PEAR/Sniffs/",
-                    "CodeSniffer/Standards/PSR1/Sniffs/",
-                    "CodeSniffer/Standards/PSR2/Sniffs/",
-                    "CodeSniffer/Standards/Squiz/Sniffs/",
-                    "CodeSniffer/Standards/Zend/Sniffs/"
-                ]
+                "psr-0": {
+                    "Zend\\Validator\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "description": "provides a set of commonly needed validators",
             "keywords": [
-                "phpcs",
-                "standards"
+                "validator",
+                "zf2"
             ],
-            "time": "2014-05-01 03:07:07"
+            "time": "2014-04-15 15:28:42"
         },
         {
-            "name": "symfony/config",
-            "version": "v2.5.7",
-            "target-dir": "Symfony/Component/Config",
+            "name": "zendframework/zend-view",
+            "version": "2.3.1",
+            "target-dir": "Zend/View",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Config.git",
-                "reference": "7b11dceebaaf877b75bc1aedfd831a2ddc326de9"
+                "url": "https://github.com/zendframework/Component_ZendView.git",
+                "reference": "71b6c73d4ba2f5908fe64b2a554064b22443e327"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/7b11dceebaaf877b75bc1aedfd831a2ddc326de9",
-                "reference": "7b11dceebaaf877b75bc1aedfd831a2ddc326de9",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendView/zipball/71b6c73d4ba2f5908fe64b2a554064b22443e327",
+                "reference": "71b6c73d4ba2f5908fe64b2a554064b22443e327",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "symfony/filesystem": "~2.3"
+                "php": ">=5.3.23",
+                "zendframework/zend-eventmanager": "self.version",
+                "zendframework/zend-loader": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "zendframework/zend-authentication": "self.version",
+                "zendframework/zend-escaper": "self.version",
+                "zendframework/zend-feed": "self.version",
+                "zendframework/zend-filter": "self.version",
+                "zendframework/zend-http": "self.version",
+                "zendframework/zend-i18n": "self.version",
+                "zendframework/zend-json": "self.version",
+                "zendframework/zend-mvc": "self.version",
+                "zendframework/zend-navigation": "self.version",
+                "zendframework/zend-paginator": "self.version",
+                "zendframework/zend-permissions-acl": "self.version",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-uri": "self.version"
+            },
+            "suggest": {
+                "zendframework/zend-authentication": "Zend\\Authentication component",
+                "zendframework/zend-escaper": "Zend\\Escaper component",
+                "zendframework/zend-feed": "Zend\\Feed component",
+                "zendframework/zend-filter": "Zend\\Filter component",
+                "zendframework/zend-http": "Zend\\Http component",
+                "zendframework/zend-i18n": "Zend\\I18n component",
+                "zendframework/zend-json": "Zend\\Json component",
+                "zendframework/zend-mvc": "Zend\\Mvc component",
+                "zendframework/zend-navigation": "Zend\\Navigation component",
+                "zendframework/zend-paginator": "Zend\\Paginator component",
+                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
+                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+                "zendframework/zend-uri": "Zend\\Uri component"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "Symfony\\Component\\Config\\": ""
+                    "Zend\\View\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
+            "description": "provides a system of helpers, output filters, and variable escaping",
+            "keywords": [
+                "view",
+                "zf2"
             ],
-            "description": "Symfony Config Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-11-20 13:22:25"
-        },
+            "time": "2014-04-15 15:28:55"
+        }
+    ],
+    "packages-dev": [
         {
-            "name": "symfony/console",
-            "version": "v2.6.0",
-            "target-dir": "Symfony/Component/Console",
+            "name": "doctrine/instantiator",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Console.git",
-                "reference": "d3bac228fd7a2aac9193e241b239880b3ba39a10"
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/d3bac228fd7a2aac9193e241b239880b3ba39a10",
-                "reference": "d3bac228fd7a2aac9193e241b239880b3ba39a10",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
+                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3,<8.0-DEV"
             },
             "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/process": "~2.1"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "Symfony\\Component\\Console\\": ""
+                    "Doctrine\\Instantiator\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1542,1178 +1654,985 @@
             ],
             "authors": [
                 {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
                 }
             ],
-            "description": "Symfony Console Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-11-20 13:24:23"
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2014-10-13 12:58:55"
         },
         {
-            "name": "symfony/dependency-injection",
-            "version": "v2.5.7",
-            "target-dir": "Symfony/Component/DependencyInjection",
+            "name": "pdepend/pdepend",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/DependencyInjection.git",
-                "reference": "662d8f5e4a7542dca4194fb3f3bda0a57e65f0a4"
+                "url": "https://github.com/pdepend/pdepend.git",
+                "reference": "dc582a3c0180664a8fbfc5a34efaf4cc13fccc60"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/662d8f5e4a7542dca4194fb3f3bda0a57e65f0a4",
-                "reference": "662d8f5e4a7542dca4194fb3f3bda0a57e65f0a4",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/dc582a3c0180664a8fbfc5a34efaf4cc13fccc60",
+                "reference": "dc582a3c0180664a8fbfc5a34efaf4cc13fccc60",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "symfony/config": "@stable",
+                "symfony/dependency-injection": "@stable",
+                "symfony/filesystem": "@stable"
             },
             "require-dev": {
-                "symfony/config": "~2.2",
-                "symfony/expression-language": "~2.4",
-                "symfony/yaml": "~2.0"
-            },
-            "suggest": {
-                "symfony/config": "",
-                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-                "symfony/yaml": ""
+                "phpunit/phpunit": "3.*@stable",
+                "squizlabs/php_codesniffer": "@stable"
             },
+            "bin": [
+                "src/bin/pdepend"
+            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev"
-                }
-            },
             "autoload": {
                 "psr-0": {
-                    "Symfony\\Component\\DependencyInjection\\": ""
+                    "PDepend\\": "src/main/php/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
+                "BSD-3-Clause"
             ],
-            "description": "Symfony DependencyInjection Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-11-16 17:28:00"
+            "description": "Official version of pdepend to be handled with Composer",
+            "time": "2014-10-08 06:54:50"
         },
         {
-            "name": "symfony/filesystem",
-            "version": "v2.5.7",
-            "target-dir": "Symfony/Component/Filesystem",
+            "name": "phpmd/phpmd",
+            "version": "2.1.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "3c3e382bd869b3ec10008a3d9ef455b1cc2868db"
+                "url": "https://github.com/phpmd/phpmd.git",
+                "reference": "1a485d9db869137af5e9678bd844568c92998b25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/3c3e382bd869b3ec10008a3d9ef455b1cc2868db",
-                "reference": "3c3e382bd869b3ec10008a3d9ef455b1cc2868db",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/1a485d9db869137af5e9678bd844568c92998b25",
+                "reference": "1a485d9db869137af5e9678bd844568c92998b25",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "pdepend/pdepend": "2.0.*",
+                "php": ">=5.3.0",
+                "symfony/config": "2.5.*",
+                "symfony/dependency-injection": "2.5.*",
+                "symfony/filesystem": "2.5.*"
             },
+            "bin": [
+                "src/bin/phpmd"
+            ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev"
-                }
-            },
             "autoload": {
                 "psr-0": {
-                    "Symfony\\Component\\Filesystem\\": ""
+                    "PHPMD\\": "src/main/php"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Filesystem Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-11-16 17:28:00"
+            "description": "Official version of PHPMD handled with Composer.",
+            "time": "2014-09-25 15:56:22"
         },
         {
-            "name": "symfony/finder",
-            "version": "v2.6.0",
-            "target-dir": "Symfony/Component/Finder",
+            "name": "phpunit/php-code-coverage",
+            "version": "2.0.12",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Finder.git",
-                "reference": "d574347c652a14cfee0349f744c7880e1d9029fd"
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "7ce9da20f96964bb7a4033f53834df13328dbeab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/d574347c652a14cfee0349f744c7880e1d9029fd",
-                "reference": "d574347c652a14cfee0349f744c7880e1d9029fd",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7ce9da20f96964bb7a4033f53834df13328dbeab",
+                "reference": "7ce9da20f96964bb7a4033f53834df13328dbeab",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "~1.0",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4.1"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Finder\\": ""
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Symfony Finder Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-11-28 10:00:40"
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2014-12-02 13:17:01"
         },
         {
-            "name": "symfony/process",
-            "version": "v2.6.0",
-            "target-dir": "Symfony/Component/Process",
+            "name": "phpunit/php-file-iterator",
+            "version": "1.3.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Process.git",
-                "reference": "dc88f75d1c07791e5733f90be747961dce26cf05"
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Process/zipball/dc88f75d1c07791e5733f90be747961dce26cf05",
-                "reference": "dc88f75d1c07791e5733f90be747961dce26cf05",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
             "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Process\\": ""
-                }
+                "classmap": [
+                    "File/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
                 }
             ],
-            "description": "Symfony Process Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-11-04 14:29:39"
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2013-10-10 15:34:57"
         },
         {
-            "name": "zendframework/zend-config",
-            "version": "2.3.1",
-            "target-dir": "Zend/Config",
+            "name": "phpunit/php-text-template",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendConfig.git",
-                "reference": "61b81c6ea60c1947e13b4effbfffcd9bb59c2180"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendConfig/zipball/61b81c6ea60c1947e13b4effbfffcd9bb59c2180",
-                "reference": "61b81c6ea60c1947e13b4effbfffcd9bb59c2180",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-stdlib": "self.version"
-            },
-            "require-dev": {
-                "zendframework/zend-filter": "self.version",
-                "zendframework/zend-i18n": "self.version",
-                "zendframework/zend-json": "self.version",
-                "zendframework/zend-servicemanager": "self.version"
-            },
-            "suggest": {
-                "zendframework/zend-filter": "Zend\\Filter component",
-                "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
+                "php": ">=5.3.3"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
-                }
-            },
             "autoload": {
-                "psr-0": {
-                    "Zend\\Config\\": ""
-                }
+                "classmap": [
+                    "Text/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
             "keywords": [
-                "config",
-                "zf2"
+                "template"
             ],
-            "time": "2014-04-15 15:29:04"
+            "time": "2014-01-30 17:20:04"
         },
         {
-            "name": "zendframework/zend-console",
-            "version": "2.3.1",
-            "target-dir": "Zend/Console",
+            "name": "phpunit/php-timer",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendConsole.git",
-                "reference": "6720a94d30272eefe10bef4801cc41a027530b1c"
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendConsole/zipball/6720a94d30272eefe10bef4801cc41a027530b1c",
-                "reference": "6720a94d30272eefe10bef4801cc41a027530b1c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-stdlib": "self.version"
+                "php": ">=5.3.3"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
-                }
-            },
             "autoload": {
-                "psr-0": {
-                    "Zend\\Console\\": ""
-                }
+                "classmap": [
+                    "PHP/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
             "license": [
                 "BSD-3-Clause"
             ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
             "keywords": [
-                "console",
-                "zf2"
+                "timer"
             ],
-            "time": "2014-04-15 15:29:14"
+            "time": "2013-08-02 07:42:54"
         },
         {
-            "name": "zendframework/zend-db",
-            "version": "2.3.1",
-            "target-dir": "Zend/Db",
+            "name": "phpunit/php-token-stream",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendDb.git",
-                "reference": "29bb7f1ceacb32fa3e1c122bc3d14da6490aba2c"
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "f8d5d08c56de5cfd592b3340424a81733259a876"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendDb/zipball/29bb7f1ceacb32fa3e1c122bc3d14da6490aba2c",
-                "reference": "29bb7f1ceacb32fa3e1c122bc3d14da6490aba2c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/f8d5d08c56de5cfd592b3340424a81733259a876",
+                "reference": "f8d5d08c56de5cfd592b3340424a81733259a876",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23"
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
             },
             "require-dev": {
-                "zendframework/zend-eventmanager": "self.version",
-                "zendframework/zend-servicemanager": "self.version",
-                "zendframework/zend-stdlib": "self.version"
-            },
-            "suggest": {
-                "zendframework/zend-eventmanager": "Zend\\EventManager component",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-                "zendframework/zend-stdlib": "Zend\\Stdlib component"
+                "phpunit/phpunit": "~4.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Zend\\Db\\": ""
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
             "keywords": [
-                "db",
-                "zf2"
+                "tokenizer"
             ],
-            "time": "2014-04-15 15:29:07"
+            "time": "2014-08-31 06:12:13"
         },
         {
-            "name": "zendframework/zend-di",
-            "version": "2.3.1",
-            "target-dir": "Zend/Di",
+            "name": "phpunit/phpunit",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendDi.git",
-                "reference": "45450000c83937a73a261a32480637b4198f4cea"
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "efb1b1334605594417a3bd466477772d06d460a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendDi/zipball/45450000c83937a73a261a32480637b4198f4cea",
-                "reference": "45450000c83937a73a261a32480637b4198f4cea",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/efb1b1334605594417a3bd466477772d06d460a8",
+                "reference": "efb1b1334605594417a3bd466477772d06d460a8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-code": "self.version",
-                "zendframework/zend-stdlib": "self.version"
-            },
-            "require-dev": {
-                "zendframework/zend-servicemanager": "self.version"
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpunit/php-code-coverage": "~2.0",
+                "phpunit/php-file-iterator": "~1.3.1",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "~1.0.2",
+                "phpunit/phpunit-mock-objects": "~2.1",
+                "sebastian/comparator": "~1.0",
+                "sebastian/diff": "~1.1",
+                "sebastian/environment": "~1.0",
+                "sebastian/exporter": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.0"
             },
             "suggest": {
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+                "phpunit/php-invoker": "~1.1"
             },
+            "bin": [
+                "phpunit"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "4.1.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Zend\\Di\\": ""
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "",
+                "../../symfony/yaml/"
+            ],
             "license": [
                 "BSD-3-Clause"
             ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "http://www.phpunit.de/",
             "keywords": [
-                "di",
-                "zf2"
+                "phpunit",
+                "testing",
+                "xunit"
             ],
-            "time": "2014-04-15 15:29:10"
+            "time": "2014-05-02 07:13:40"
         },
         {
-            "name": "zendframework/zend-filter",
-            "version": "2.3.1",
-            "target-dir": "Zend/Filter",
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendFilter.git",
-                "reference": "1889b7aa499beccadac770780a73e1a40e0f8a53"
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "c63d2367247365f688544f0d500af90a11a44c65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendFilter/zipball/1889b7aa499beccadac770780a73e1a40e0f8a53",
-                "reference": "1889b7aa499beccadac770780a73e1a40e0f8a53",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65",
+                "reference": "c63d2367247365f688544f0d500af90a11a44c65",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-stdlib": "self.version"
+                "doctrine/instantiator": "~1.0,>=1.0.1",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2"
             },
             "require-dev": {
-                "zendframework/zend-crypt": "self.version",
-                "zendframework/zend-servicemanager": "self.version",
-                "zendframework/zend-uri": "self.version"
+                "phpunit/phpunit": "~4.3"
             },
             "suggest": {
-                "zendframework/zend-crypt": "Zend\\Crypt component",
-                "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-                "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
+                "ext-soap": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "2.3.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Zend\\Filter\\": ""
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides a set of commonly needed data filters",
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
             "keywords": [
-                "filter",
-                "zf2"
+                "mock",
+                "xunit"
             ],
-            "time": "2014-04-15 15:28:47"
+            "time": "2014-10-03 05:12:11"
         },
         {
-            "name": "zendframework/zend-form",
-            "version": "2.3.1",
-            "target-dir": "Zend/Form",
+            "name": "sebastian/comparator",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendForm.git",
-                "reference": "2e91090e63f865c1c0b8c21157d4eaffad341f59"
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendForm/zipball/2e91090e63f865c1c0b8c21157d4eaffad341f59",
-                "reference": "2e91090e63f865c1c0b8c21157d4eaffad341f59",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e54a01c0da1b87db3c5a3c4c5277ddf331da4aef",
+                "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-inputfilter": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.1",
+                "sebastian/exporter": "~1.0"
             },
             "require-dev": {
-                "zendframework/zend-captcha": "self.version",
-                "zendframework/zend-code": "self.version",
-                "zendframework/zend-eventmanager": "self.version",
-                "zendframework/zend-filter": "self.version",
-                "zendframework/zend-i18n": "self.version",
-                "zendframework/zend-servicemanager": "self.version",
-                "zendframework/zend-validator": "self.version",
-                "zendframework/zend-view": "self.version",
-                "zendframework/zendservice-recaptcha": "*"
-            },
-            "suggest": {
-                "zendframework/zend-captcha": "Zend\\Captcha component",
-                "zendframework/zend-code": "Zend\\Code component",
-                "zendframework/zend-eventmanager": "Zend\\EventManager component",
-                "zendframework/zend-filter": "Zend\\Filter component",
-                "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-                "zendframework/zend-validator": "Zend\\Validator component",
-                "zendframework/zend-view": "Zend\\View component",
-                "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha component"
+                "phpunit/phpunit": "~4.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Zend\\Form\\": ""
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
             "keywords": [
-                "form",
-                "zf2"
+                "comparator",
+                "compare",
+                "equality"
             ],
-            "time": "2014-04-15 15:29:02"
+            "time": "2014-05-11 23:00:21"
         },
         {
-            "name": "zendframework/zend-http",
-            "version": "2.3.1",
-            "target-dir": "Zend/Http",
+            "name": "sebastian/diff",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendHttp.git",
-                "reference": "b13fc4c30c39364409ef68a9f9b5975765a3ff5a"
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendHttp/zipball/b13fc4c30c39364409ef68a9f9b5975765a3ff5a",
-                "reference": "b13fc4c30c39364409ef68a9f9b5975765a3ff5a",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7",
+                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-loader": "self.version",
-                "zendframework/zend-stdlib": "self.version",
-                "zendframework/zend-uri": "self.version",
-                "zendframework/zend-validator": "self.version"
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Zend\\Http\\": ""
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "http://www.github.com/sebastianbergmann/diff",
             "keywords": [
-                "http",
-                "zf2"
+                "diff"
             ],
-            "time": "2014-04-15 14:47:18"
+            "time": "2014-08-15 10:29:00"
         },
         {
-            "name": "zendframework/zend-inputfilter",
-            "version": "2.3.1",
-            "target-dir": "Zend/InputFilter",
+            "name": "sebastian/environment",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendInputFilter.git",
-                "reference": "a45d2180c819f9ff9e74be1bf4c5c8dd1d9649e9"
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendInputFilter/zipball/a45d2180c819f9ff9e74be1bf4c5c8dd1d9649e9",
-                "reference": "a45d2180c819f9ff9e74be1bf4c5c8dd1d9649e9",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7",
+                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-filter": "self.version",
-                "zendframework/zend-stdlib": "self.version",
-                "zendframework/zend-validator": "self.version"
-            },
-            "require-dev": {
-                "zendframework/zend-servicemanager": "self.version"
-            },
-            "suggest": {
-                "zendframework/zend-servicemanager": "To support plugin manager support"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Zend\\InputFilter\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "keywords": [
-                "inputfilter",
-                "zf2"
-            ],
-            "time": "2014-04-15 14:47:18"
-        },
-        {
-            "name": "zendframework/zend-json",
-            "version": "2.3.1",
-            "target-dir": "Zend/Json",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendJson.git",
-                "reference": "eb281da42d3f5bba5acb664359029b6fa7c62e28"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendJson/zipball/eb281da42d3f5bba5acb664359029b6fa7c62e28",
-                "reference": "eb281da42d3f5bba5acb664359029b6fa7c62e28",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-stdlib": "self.version"
+                "php": ">=5.3.3"
             },
             "require-dev": {
-                "zendframework/zend-http": "self.version",
-                "zendframework/zend-server": "self.version"
-            },
-            "suggest": {
-                "zendframework/zend-http": "Zend\\Http component",
-                "zendframework/zend-server": "Zend\\Server component"
+                "phpunit/phpunit": "~4.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Zend\\Json\\": ""
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
-            "keywords": [
-                "json",
-                "zf2"
-            ],
-            "time": "2014-04-15 14:47:18"
-        },
-        {
-            "name": "zendframework/zend-loader",
-            "version": "2.3.1",
-            "target-dir": "Zend/Loader",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendLoader.git",
-                "reference": "37abb23b0b2608584673f8388d1563a1fd604f09"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendLoader/zipball/37abb23b0b2608584673f8388d1563a1fd604f09",
-                "reference": "37abb23b0b2608584673f8388d1563a1fd604f09",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Zend\\Loader\\": ""
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
                 }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
             ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
             "keywords": [
-                "loader",
-                "zf2"
+                "Xdebug",
+                "environment",
+                "hhvm"
             ],
-            "time": "2014-04-15 15:28:53"
+            "time": "2014-10-25 08:00:45"
         },
         {
-            "name": "zendframework/zend-log",
-            "version": "2.3.1",
-            "target-dir": "Zend/Log",
+            "name": "sebastian/exporter",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendLog.git",
-                "reference": "606ef20717a935afec1400f54bd1b03faf859c47"
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendLog/zipball/606ef20717a935afec1400f54bd1b03faf859c47",
-                "reference": "606ef20717a935afec1400f54bd1b03faf859c47",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0",
+                "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-servicemanager": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "php": ">=5.3.3"
             },
             "require-dev": {
-                "zendframework/zend-console": "self.version",
-                "zendframework/zend-db": "self.version",
-                "zendframework/zend-escaper": "self.version",
-                "zendframework/zend-mail": "self.version",
-                "zendframework/zend-validator": "self.version"
-            },
-            "suggest": {
-                "ext-mongo": "*",
-                "zendframework/zend-console": "Zend\\Console component",
-                "zendframework/zend-db": "Zend\\Db component",
-                "zendframework/zend-escaper": "Zend\\Escaper component, for use in the XML formatter",
-                "zendframework/zend-mail": "Zend\\Mail component",
-                "zendframework/zend-validator": "Zend\\Validator component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Zend\\Log\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "component for general purpose logging",
-            "keywords": [
-                "log",
-                "logging",
-                "zf2"
-            ],
-            "time": "2014-04-15 15:28:45"
-        },
-        {
-            "name": "zendframework/zend-math",
-            "version": "2.3.1",
-            "target-dir": "Zend/Math",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendMath.git",
-                "reference": "be6de5ba3d47e3f9a6732badea8bc724c49d0552"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendMath/zipball/be6de5ba3d47e3f9a6732badea8bc724c49d0552",
-                "reference": "be6de5ba3d47e3f9a6732badea8bc724c49d0552",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23"
-            },
-            "suggest": {
-                "ext-bcmath": "If using the bcmath functionality",
-                "ext-gmp": "If using the gmp functionality",
-                "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if OpenSSL/Mcrypt extensions are unavailable",
-                "zendframework/zend-servicemanager": ">= current version, if using the BigInteger::factory functionality"
+                "phpunit/phpunit": "~4.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Zend\\Math\\": ""
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "keywords": [
-                "math",
-                "zf2"
-            ],
-            "time": "2014-04-15 15:29:09"
-        },
-        {
-            "name": "zendframework/zend-modulemanager",
-            "version": "2.3.1",
-            "target-dir": "Zend/ModuleManager",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendModuleManager.git",
-                "reference": "bfff608492fdfea1f2b815285e0ed8b467a99c9f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendModuleManager/zipball/bfff608492fdfea1f2b815285e0ed8b467a99c9f",
-                "reference": "bfff608492fdfea1f2b815285e0ed8b467a99c9f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-eventmanager": "self.version",
-                "zendframework/zend-stdlib": "self.version"
-            },
-            "require-dev": {
-                "zendframework/zend-config": "self.version",
-                "zendframework/zend-console": "self.version",
-                "zendframework/zend-loader": "self.version",
-                "zendframework/zend-mvc": "self.version",
-                "zendframework/zend-servicemanager": "self.version"
-            },
-            "suggest": {
-                "zendframework/zend-config": "Zend\\Config component",
-                "zendframework/zend-console": "Zend\\Console component",
-                "zendframework/zend-loader": "Zend\\Loader component",
-                "zendframework/zend-mvc": "Zend\\Mvc component",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Zend\\ModuleManager\\": ""
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
                 }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
             ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
             "keywords": [
-                "modulemanager",
-                "zf2"
+                "export",
+                "exporter"
             ],
-            "time": "2014-04-15 15:28:50"
+            "time": "2014-09-10 00:51:36"
         },
         {
-            "name": "zendframework/zend-mvc",
-            "version": "2.3.1",
-            "target-dir": "Zend/Mvc",
+            "name": "sebastian/version",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendMvc.git",
-                "reference": "d7708af7028aa6c42255fe2d9ece53f0e5d76e2c"
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendMvc/zipball/d7708af7028aa6c42255fe2d9ece53f0e5d76e2c",
-                "reference": "d7708af7028aa6c42255fe2d9ece53f0e5d76e2c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-eventmanager": "self.version",
-                "zendframework/zend-servicemanager": "self.version",
-                "zendframework/zend-stdlib": "self.version"
-            },
-            "require-dev": {
-                "zendframework/zend-authentication": "self.version",
-                "zendframework/zend-console": "self.version",
-                "zendframework/zend-di": "self.version",
-                "zendframework/zend-filter": "self.version",
-                "zendframework/zend-form": "self.version",
-                "zendframework/zend-http": "self.version",
-                "zendframework/zend-i18n": "self.version",
-                "zendframework/zend-inputfilter": "self.version",
-                "zendframework/zend-json": "self.version",
-                "zendframework/zend-log": "self.version",
-                "zendframework/zend-modulemanager": "self.version",
-                "zendframework/zend-serializer": "self.version",
-                "zendframework/zend-session": "self.version",
-                "zendframework/zend-text": "self.version",
-                "zendframework/zend-uri": "self.version",
-                "zendframework/zend-validator": "self.version",
-                "zendframework/zend-version": "self.version",
-                "zendframework/zend-view": "self.version"
-            },
-            "suggest": {
-                "zendframework/zend-authentication": "Zend\\Authentication component for Identity plugin",
-                "zendframework/zend-config": "Zend\\Config component",
-                "zendframework/zend-console": "Zend\\Console component",
-                "zendframework/zend-di": "Zend\\Di component",
-                "zendframework/zend-filter": "Zend\\Filter component",
-                "zendframework/zend-form": "Zend\\Form component",
-                "zendframework/zend-http": "Zend\\Http component",
-                "zendframework/zend-i18n": "Zend\\I18n component for translatable segments",
-                "zendframework/zend-inputfilter": "Zend\\Inputfilter component",
-                "zendframework/zend-json": "Zend\\Json component",
-                "zendframework/zend-log": "Zend\\Log component",
-                "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
-                "zendframework/zend-serializer": "Zend\\Serializer component",
-                "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
-                "zendframework/zend-stdlib": "Zend\\Stdlib component",
-                "zendframework/zend-text": "Zend\\Text component",
-                "zendframework/zend-uri": "Zend\\Uri component",
-                "zendframework/zend-validator": "Zend\\Validator component",
-                "zendframework/zend-version": "Zend\\Version component",
-                "zendframework/zend-view": "Zend\\View component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
-                }
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+                "shasum": ""
             },
+            "type": "library",
             "autoload": {
-                "psr-0": {
-                    "Zend\\Mvc\\": ""
-                }
+                "classmap": [
+                    "src/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "keywords": [
-                "mvc",
-                "zf2"
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
             ],
-            "time": "2014-04-15 15:29:05"
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2014-03-07 15:35:33"
         },
         {
-            "name": "zendframework/zend-serializer",
-            "version": "2.3.1",
-            "target-dir": "Zend/Serializer",
+            "name": "squizlabs/php_codesniffer",
+            "version": "1.5.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendSerializer.git",
-                "reference": "3187aa2a9c9713932f84006700f922ee1253328d"
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "396178ada8499ec492363587f037125bf7b07fcc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendSerializer/zipball/3187aa2a9c9713932f84006700f922ee1253328d",
-                "reference": "3187aa2a9c9713932f84006700f922ee1253328d",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/396178ada8499ec492363587f037125bf7b07fcc",
+                "reference": "396178ada8499ec492363587f037125bf7b07fcc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-json": "self.version",
-                "zendframework/zend-math": "self.version",
-                "zendframework/zend-stdlib": "self.version"
-            },
-            "require-dev": {
-                "zendframework/zend-servicemanager": "self.version"
+                "ext-tokenizer": "*",
+                "php": ">=5.1.2"
             },
             "suggest": {
-                "zendframework/zend-servicemanager": "To support plugin manager support"
+                "phpunit/php-timer": "dev-master"
             },
+            "bin": [
+                "scripts/phpcs"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-phpcs-fixer": "2.0.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Zend\\Serializer\\": ""
-                }
+                "classmap": [
+                    "CodeSniffer.php",
+                    "CodeSniffer/CLI.php",
+                    "CodeSniffer/Exception.php",
+                    "CodeSniffer/File.php",
+                    "CodeSniffer/Report.php",
+                    "CodeSniffer/Reporting.php",
+                    "CodeSniffer/Sniff.php",
+                    "CodeSniffer/Tokens.php",
+                    "CodeSniffer/Reports/",
+                    "CodeSniffer/CommentParser/",
+                    "CodeSniffer/Tokenizers/",
+                    "CodeSniffer/DocGenerators/",
+                    "CodeSniffer/Standards/AbstractPatternSniff.php",
+                    "CodeSniffer/Standards/AbstractScopeSniff.php",
+                    "CodeSniffer/Standards/AbstractVariableSniff.php",
+                    "CodeSniffer/Standards/IncorrectPatternException.php",
+                    "CodeSniffer/Standards/Generic/Sniffs/",
+                    "CodeSniffer/Standards/MySource/Sniffs/",
+                    "CodeSniffer/Standards/PEAR/Sniffs/",
+                    "CodeSniffer/Standards/PSR1/Sniffs/",
+                    "CodeSniffer/Standards/PSR2/Sniffs/",
+                    "CodeSniffer/Standards/Squiz/Sniffs/",
+                    "CodeSniffer/Standards/Zend/Sniffs/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer",
             "keywords": [
-                "serializer",
-                "zf2"
+                "phpcs",
+                "standards"
             ],
-            "time": "2014-04-15 15:29:03"
+            "time": "2014-05-01 03:07:07"
         },
         {
-            "name": "zendframework/zend-servicemanager",
-            "version": "2.3.1",
-            "target-dir": "Zend/ServiceManager",
+            "name": "symfony/config",
+            "version": "v2.5.7",
+            "target-dir": "Symfony/Component/Config",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendServiceManager.git",
-                "reference": "652ab6e142b7afd1eede8f0f33b47d2599786c84"
+                "url": "https://github.com/symfony/Config.git",
+                "reference": "7b11dceebaaf877b75bc1aedfd831a2ddc326de9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendServiceManager/zipball/652ab6e142b7afd1eede8f0f33b47d2599786c84",
-                "reference": "652ab6e142b7afd1eede8f0f33b47d2599786c84",
+                "url": "https://api.github.com/repos/symfony/Config/zipball/7b11dceebaaf877b75bc1aedfd831a2ddc326de9",
+                "reference": "7b11dceebaaf877b75bc1aedfd831a2ddc326de9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23"
-            },
-            "require-dev": {
-                "zendframework/zend-di": "self.version"
-            },
-            "suggest": {
-                "zendframework/zend-di": "Zend\\Di component"
+                "php": ">=5.3.3",
+                "symfony/filesystem": "~2.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "2.5-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "Zend\\ServiceManager\\": ""
+                    "Symfony\\Component\\Config\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "keywords": [
-                "servicemanager",
-                "zf2"
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
             ],
-            "time": "2014-04-15 15:28:43"
+            "description": "Symfony Config Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-11-20 13:22:25"
         },
         {
-            "name": "zendframework/zend-text",
-            "version": "2.3.1",
-            "target-dir": "Zend/Text",
+            "name": "symfony/dependency-injection",
+            "version": "v2.5.7",
+            "target-dir": "Symfony/Component/DependencyInjection",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendText.git",
-                "reference": "74215098b67b89e61ed8d1bf82c4fe79fa311885"
+                "url": "https://github.com/symfony/DependencyInjection.git",
+                "reference": "662d8f5e4a7542dca4194fb3f3bda0a57e65f0a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendText/zipball/74215098b67b89e61ed8d1bf82c4fe79fa311885",
-                "reference": "74215098b67b89e61ed8d1bf82c4fe79fa311885",
+                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/662d8f5e4a7542dca4194fb3f3bda0a57e65f0a4",
+                "reference": "662d8f5e4a7542dca4194fb3f3bda0a57e65f0a4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-servicemanager": "self.version",
-                "zendframework/zend-stdlib": "self.version"
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "symfony/config": "~2.2",
+                "symfony/expression-language": "~2.4",
+                "symfony/yaml": "~2.0"
+            },
+            "suggest": {
+                "symfony/config": "",
+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+                "symfony/yaml": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "2.5-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "Zend\\Text\\": ""
+                    "Symfony\\Component\\DependencyInjection\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "keywords": [
-                "text",
-                "zf2"
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
             ],
-            "time": "2014-04-15 15:29:13"
+            "description": "Symfony DependencyInjection Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-11-16 17:28:00"
         },
         {
-            "name": "zendframework/zend-view",
-            "version": "2.3.1",
-            "target-dir": "Zend/View",
+            "name": "symfony/filesystem",
+            "version": "v2.5.7",
+            "target-dir": "Symfony/Component/Filesystem",
             "source": {
                 "type": "git",
-                "url": "https://github.com/zendframework/Component_ZendView.git",
-                "reference": "71b6c73d4ba2f5908fe64b2a554064b22443e327"
+                "url": "https://github.com/symfony/Filesystem.git",
+                "reference": "3c3e382bd869b3ec10008a3d9ef455b1cc2868db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/Component_ZendView/zipball/71b6c73d4ba2f5908fe64b2a554064b22443e327",
-                "reference": "71b6c73d4ba2f5908fe64b2a554064b22443e327",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/3c3e382bd869b3ec10008a3d9ef455b1cc2868db",
+                "reference": "3c3e382bd869b3ec10008a3d9ef455b1cc2868db",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.23",
-                "zendframework/zend-eventmanager": "self.version",
-                "zendframework/zend-loader": "self.version",
-                "zendframework/zend-stdlib": "self.version"
-            },
-            "require-dev": {
-                "zendframework/zend-authentication": "self.version",
-                "zendframework/zend-escaper": "self.version",
-                "zendframework/zend-feed": "self.version",
-                "zendframework/zend-filter": "self.version",
-                "zendframework/zend-http": "self.version",
-                "zendframework/zend-i18n": "self.version",
-                "zendframework/zend-json": "self.version",
-                "zendframework/zend-mvc": "self.version",
-                "zendframework/zend-navigation": "self.version",
-                "zendframework/zend-paginator": "self.version",
-                "zendframework/zend-permissions-acl": "self.version",
-                "zendframework/zend-servicemanager": "self.version",
-                "zendframework/zend-uri": "self.version"
-            },
-            "suggest": {
-                "zendframework/zend-authentication": "Zend\\Authentication component",
-                "zendframework/zend-escaper": "Zend\\Escaper component",
-                "zendframework/zend-feed": "Zend\\Feed component",
-                "zendframework/zend-filter": "Zend\\Filter component",
-                "zendframework/zend-http": "Zend\\Http component",
-                "zendframework/zend-i18n": "Zend\\I18n component",
-                "zendframework/zend-json": "Zend\\Json component",
-                "zendframework/zend-mvc": "Zend\\Mvc component",
-                "zendframework/zend-navigation": "Zend\\Navigation component",
-                "zendframework/zend-paginator": "Zend\\Paginator component",
-                "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component",
-                "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-                "zendframework/zend-uri": "Zend\\Uri component"
+                "php": ">=5.3.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev",
-                    "dev-develop": "2.4-dev"
+                    "dev-master": "2.5-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
-                    "Zend\\View\\": ""
+                    "Symfony\\Component\\Filesystem\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause"
+                "MIT"
             ],
-            "description": "provides a system of helpers, output filters, and variable escaping",
-            "keywords": [
-                "view",
-                "zf2"
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
             ],
-            "time": "2014-04-15 15:28:55"
+            "description": "Symfony Filesystem Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-11-16 17:28:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "phpmd/phpmd": 0,
-        "composer/composer": 15
+        "composer/composer": 15,
+        "phpmd/phpmd": 0
     },
     "prefer-stable": false,
     "platform": {
         "php": "~5.4.11|~5.5.0"
     },
-    "platform-dev": []
+    "platform-dev": {
+        "lib-libxml": "*",
+        "ext-ctype": "*",
+        "ext-gd": "*",
+        "ext-spl": "*",
+        "ext-dom": "*",
+        "ext-simplexml": "*",
+        "ext-mcrypt": "*",
+        "ext-hash": "*",
+        "ext-curl": "*",
+        "ext-iconv": "*"
+    }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index efc45839f3a60..ddd8f97b3bd23 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -56,7 +56,7 @@ public static function setUpBeforeClass()
         self::$shell = self::createShell();
         self::$isComposerAvailable = self::isComposerAvailable();
         self::$root = Files::init()->getPathToSource();
-        self::$rootJson = json_decode(file_get_contents(self::$root . '/composer.json'));
+        self::$rootJson = json_decode(file_get_contents(self::$root . '/composer.json'), true);
         self::$dependencies = [];
     }
 
@@ -148,27 +148,31 @@ private function assertMagentoConventions($dir, $packageType, \StdClass $json)
                 $this->assertDependsOnPhp($json->require);
                 $this->assertDependsOnFramework($json->require);
                 $this->assertDependsOnInstaller($json->require);
+                $this->assertRequireInSync($json);
                 break;
             case 'magento2-language':
                 $this->assertRegExp('/^magento\/language\-[a-z]{2}_[a-z]{2}$/', $json->name);
                 $this->assertDependsOnFramework($json->require);
                 $this->assertDependsOnInstaller($json->require);
+                $this->assertRequireInSync($json);
                 break;
             case 'magento2-theme':
                 $this->assertRegExp('/^magento\/theme-(?:adminhtml|frontend)(\-[a-z0-9_]+)+$/', $json->name);
                 $this->assertDependsOnPhp($json->require);
                 $this->assertDependsOnFramework($json->require);
                 $this->assertDependsOnInstaller($json->require);
+                $this->assertRequireInSync($json);
                 break;
             case 'magento2-library':
                 $this->assertDependsOnPhp($json->require);
                 $this->assertRegExp('/^magento\/framework$/', $json->name);
                 $this->assertDependsOnInstaller($json->require);
+                $this->assertRequireInSync($json);
                 break;
             case 'project':
                 sort(self::$dependencies);
                 $dependenciesListed = [];
-                foreach (array_keys((array)self::$rootJson->replace) as $key) {
+                foreach (array_keys((array)self::$rootJson['replace']) as $key) {
                     if (ReplaceFilter::isMagentoComponent($key)) {
                         $dependenciesListed[] = $key;
                     }
@@ -288,13 +292,46 @@ private function assertDependsOnInstaller(\StdClass $json)
     private function assertVersionInSync($name, $version)
     {
         $this->assertEquals(
-            self::$rootJson->version,
+            self::$rootJson['version'],
             $version,
             "Version {$version} in component {$name} is inconsistent with version "
-            . self::$rootJson->version . ' in root composer.json'
+            . self::$rootJson['version'] . ' in root composer.json'
         );
     }
 
+    /**
+     * Make sure requirements of components are reflected in root composer.json
+     *
+     * @param \StdClass $json
+     */
+    private function assertRequireInSync(\StdClass $json)
+    {
+        $name = $json->name;
+        if (isset($json->require)) {
+            $errors = [];
+            foreach ($json->require as $depName => $depVersion) {
+                if ($depName == 'magento/magento-composer-installer') {
+                    // Magento Composer Installer is not needed for already existing components
+                    continue;
+                }
+                if (!isset(self::$rootJson['require-dev'][$depName]) && !isset(self::$rootJson['require'][$depName])
+                    && !isset(self::$rootJson['replace'][$depName])) {
+                    $errors[] = "'$name' depends on '$depName'";
+                }
+            }
+            if (!empty($errors)) {
+                $this->fail(
+                    "The following dependencies are missing in root 'composer.json',"
+                    . " while declared in child components.\n"
+                    . "Consider adding them to 'require-dev' section (if needed for child components only),"
+                    . " to 'replace' section (if they are present in the project),"
+                    . " to 'require' section (if needed for the skeleton).\n"
+                    . join("\n", $errors)
+                );
+            }
+        }
+    }
+
     /**
      * Convert a fully qualified module name to a composer package name according to conventions
      *
@@ -348,16 +385,16 @@ private function assertComposerAvailable()
 
     public function testComponentPathsInRoot()
     {
-        if (!isset(self::$rootJson->extra) || !isset(self::$rootJson->extra->component_paths)) {
+        if (!isset(self::$rootJson['extra']) || !isset(self::$rootJson['extra']['component_paths'])) {
             $this->markTestSkipped("The root composer.json file doesn't mention any extra component paths information");
         }
-        $this->assertObjectHasAttribute(
+        $this->assertArrayHasKey(
             'replace',
             self::$rootJson,
             "If there are any component paths specified, then they must be reflected in 'replace' section"
         );
         $flat = [];
-        foreach (self::$rootJson->extra->component_paths as $key => $element) {
+        foreach (self::$rootJson['extra']['component_paths'] as $key => $element) {
             if (is_string($element)) {
                 $flat[] = [$key, $element];
             } elseif (is_array($element)) {
@@ -373,9 +410,9 @@ public function testComponentPathsInRoot()
                 self::$root . '/' . $path,
                 "Missing or invalid component path: {$component} -> {$path}"
             );
-            $this->assertObjectHasAttribute(
+            $this->assertArrayHasKey(
                 $component,
-                self::$rootJson->replace,
+                self::$rootJson['replace'],
                 "The {$component} is specified in 'extra->component_paths', but missing in 'replace' section"
             );
         }
diff --git a/setup/.gitignore b/setup/.gitignore
deleted file mode 100644
index a8d6c8e247a15..0000000000000
--- a/setup/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-composer.lock
-composer.phar
-vendor/*
diff --git a/setup/composer.json b/setup/composer.json
deleted file mode 100644
index 03bb200f8010d..0000000000000
--- a/setup/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "magento/project-setup",
-    "version": "0.1.0-alpha104",
-    "require": {
-        "zendframework/zend-console": "2.3.1",
-        "zendframework/zend-modulemanager": "2.3.1",
-        "zendframework/zend-mvc": "2.3.1",
-        "zendframework/zend-eventmanager": "2.3.1",
-        "zendframework/zend-view": "2.3.1",
-        "zendframework/zend-text": "2.3.1",
-        "zendframework/zend-servicemanager": "2.3.1",
-        "zendframework/zend-stdlib": "2.3.1",
-        "zendframework/zend-json": "2.3.1",
-        "zendframework/zend-db": "2.3.1",
-        "zendframework/zend-uri": "2.3.1",
-        "zendframework/zend-config": "2.3.1",
-        "zendframework/zend-form": "2.3.1",
-        "zendframework/zend-di": "2.3.1",
-        "zendframework/zend-serializer": "2.3.1",
-        "zendframework/zend-log": "2.3.1",
-        "zendframework/zend-http": "2.3.1",
-        "magento/zendframework1": "1.12.9",
-        "composer/composer": "1.0.0-alpha8"
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\Composer\\": "module/Magento/Composer/src/",
-            "Magento\\Filesystem\\": "module/Magento/Filesystem/src/",
-            "Magento\\Locale\\": "module/Magento/Locale/src/",
-            "Magento\\Setup\\": "module/Magento/Setup/src/",
-            "Magento\\Config\\": "module/Magento/Config/src/",
-            "Magento\\": ["../app/code/Magento/", "../lib/internal/Magento/"]
-        }
-    }
-}

From 9b0add70f22db730c756a6879d6ae8899c32f7f9 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Tue, 2 Dec 2014 16:11:22 -0600
Subject: [PATCH 084/474] MAGETWO-30953: Add URL format validation

- Changed url format checking pattern - now using AngularJS provided
  library.
---
 .../view/magento/setup/web-configuration.phtml     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 039a62ee26013..360b055d3e0ce 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -35,7 +35,7 @@ $hints = [
         <label class="col-md-3 control-label">Your Store Address&nbsp;<span class="required">*</span></label>
         <div class="col-md-4">
             <input ng-blur="addSlash()"
-                   type="text"
+                   type="url"
                    name="web"
                    ng-model="config.address.web"
                    class="form-control"
@@ -43,12 +43,11 @@ $hints = [
                    tooltip-html-unsafe="<?php echo $hints['address_web']; ?>"
                    tooltip-trigger="focus"
                    tooltip-append-to-body="true"
-                   required
-                   ng-pattern="/^(http):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/" />
+                   required />
         </div>
         <div class="col-md-offset-3 col-md-4" ng-show="webconfig.web.$invalid && webconfig.submitted">
             <div class="error-container">
-                <span ng-show="webconfig.web.$error.required || webconfig.web.$error.pattern">Please enter a valid base URL path. (ex: http://www.example.com/)</span>
+                <span ng-show="webconfig.web.$error.required || webconfig.web.$error.url">Please enter a valid base URL path. (ex: http://www.example.com/)</span>
             </div>
         </div>
     </div>
@@ -95,18 +94,17 @@ $hints = [
         <div class="form-group" ng-show="showHttpsField()">
             <label ng-show="config.https.front || config.https.admin" class="col-md-4 col-md-offset-3">Your HTTPS Store address:</label>
             <div class="col-md-4 col-md-offset-3">
-                <input type="text"
+                <input type="url"
                        name="https"
                        ng-model="config.https.text"
                        ng-if="config.https.front || config.https.admin"
                        class="form-control"
                        ng-focus=""
-                       required
-                       ng-pattern="/^(https):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/" />
+                       required />
             </div>
             <div class="col-md-offset-3 col-md-4" ng-show="webconfig.https.$invalid && webconfig.submitted">
                 <div class="error-container">
-                    <span ng-show="webconfig.https.$error.required || webconfig.https.$error.pattern">Please enter a valid HTTPS base URL path. (ex: https://www.example.com/)</span>
+                    <span ng-show="webconfig.https.$error.required || webconfig.https.$error.url">Please enter a valid HTTPS base URL path. (ex: https://www.example.com/)</span>
                 </div>
             </div>
         </div>

From e491efeb37c9b1d5c444848c18148f25747a60f6 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Tue, 2 Dec 2014 16:29:04 -0600
Subject: [PATCH 085/474] MAGETWO-21308: [GITHUB] DDL cache should be tagged

- integration tests + isolation fixes
---
 .../Adminhtml/Product/AttributeTest.php       |  1 -
 .../Core/Model/Resource/Layout/UpdateTest.php |  1 -
 .../Object/Copy/Config/ReaderTest.php         | 13 +--
 .../Framework/TranslateCachingTest.php        | 43 +++++++++
 .../Magento/Framework/TranslateTest.php       | 87 +++++--------------
 .../Logging/Model/Config/ReaderTest.php       | 13 ++-
 .../Magento/Widget/Model/Config/DataTest.php  |  9 +-
 .../Widget/Model/Config/ReaderTest.php        | 13 ++-
 8 files changed, 101 insertions(+), 79 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
index 9b44c3e8f31c1..758f75188fa83 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/AttributeTest.php
@@ -207,7 +207,6 @@ public function testSaveActionApplyToData()
 
     /**
      * @magentoDataFixture Magento/Translation/_files/db_translate_admin_store.php
-     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
      * @magentoDataFixture Magento/Catalog/controllers/_files/attribute_user_defined.php
      * @magentoAppIsolation enabled
      */
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
index d9d2ed9964524..241b75a5b9240 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
@@ -42,7 +42,6 @@ public function testFetchUpdatesByHandle()
     }
 
     /**
-     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
      * @magentoDataFixture Magento/Backend/controllers/_files/cache/application_cache.php
      * @magentoDataFixture Magento/Core/_files/layout_cache.php
      */
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php
index e3eae575a06c8..719b67de3c6a6 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php
@@ -9,11 +9,9 @@
  */
 namespace Magento\Framework\Object\Copy\Config;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Cache\State;
 
-/**
- * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
- */
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -26,10 +24,15 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
      */
     private $fileResolver;
 
+    public static function setUpBeforeClass()
+    {
+        Bootstrap::getInstance()->reinitialize([State::PARAM_BAN_CACHE => true]);
+    }
+
     public function setUp()
     {
         $this->fileResolver = $this->getMockForAbstractClass('Magento\Framework\Config\FileResolverInterface');
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
         $this->model = $objectManager->create(
             'Magento\Framework\Object\Copy\Config\Reader',
             array('fileResolver' => $this->fileResolver)
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
new file mode 100644
index 0000000000000..4b27178091b44
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Framework;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+class TranslateCachingTest extends \PHPUnit_Framework_TestCase
+{
+    public static function tearDownAfterClass()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var \Magento\Framework\App\Cache\Type\Translate $cache */
+        $cache = $objectManager->get('Magento\Framework\App\Cache\Type\Translate');
+        $cache->clean();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Translation/_files/db_translate.php
+     */
+    public function testLoadDataCaching()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var \Magento\Framework\Translate $model */
+        $model = $objectManager->get('Magento\Framework\Translate');
+
+        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND); // this is supposed to cache the fixture
+        $this->assertEquals('Fixture Db Translation', __('Fixture String'));
+
+        /** @var \Magento\Translation\Model\Resource\String $translateString */
+        $translateString = $objectManager->create('Magento\Translation\Model\Resource\String');
+        $translateString->saveTranslate('Fixture String', 'New Db Translation');
+
+        $this->assertEquals('Fixture Db Translation', __('Fixture String'), 'Translation is expected to be cached');
+
+        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND, true);
+        $this->assertEquals('New Db Translation', __('Fixture String'), 'Forced load should not use cache');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
index 259769bdfb152..3856db89d7a6f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
@@ -7,29 +7,20 @@
  */
 namespace Magento\Framework;
 
-/**
- * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
- */
+use Magento\Framework\App\Cache\State;
+use Magento\TestFramework\Helper\Bootstrap;
+
 class TranslateTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \Magento\Framework\Translate
-     */
-    protected $_model;
-
-    /**
-     * @var \Magento\Framework\View\DesignInterface
-     */
-    protected $_designModel;
-
-    /**
-     * @var \Magento\Framework\View\FileSystem
-     */
-    protected $_viewFileSystem;
+    public static function setUpBeforeClass()
+    {
+        Bootstrap::getInstance()->reinitialize([State::PARAM_BAN_CACHE => true]);
+    }
 
     protected function setUp()
     {
-        $this->_viewFileSystem = $this->getMock(
+        /** @var \Magento\Framework\View\FileSystem $viewFileSystem */
+        $viewFileSystem = $this->getMock(
             'Magento\Framework\View\FileSystem',
             array('getLocaleFileName', 'getDesignTheme'),
             array(),
@@ -37,20 +28,20 @@ protected function setUp()
             false
         );
 
-        $this->_viewFileSystem->expects($this->any())
-            ->method(
-                'getLocaleFileName'
-            )->will(
+        $viewFileSystem->expects($this->any())
+            ->method('getLocaleFileName')
+            ->will(
                 $this->returnValue(dirname(__DIR__) . '/Core/Model/_files/design/frontend/test_default/i18n/en_US.csv')
             );
 
-        $theme = $this->getMock('\Magento\Framework\View\Design\ThemeInterface', array());
+        /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
+        $theme = $this->getMock('Magento\Framework\View\Design\ThemeInterface', array());
         $theme->expects($this->any())->method('getId')->will($this->returnValue(10));
 
-        $this->_viewFileSystem->expects($this->any())->method('getDesignTheme')->will($this->returnValue($theme));
+        $viewFileSystem->expects($this->any())->method('getDesignTheme')->will($this->returnValue($theme));
 
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $objectManager->addSharedInstance($this->_viewFileSystem, 'Magento\Framework\View\FileSystem');
+        $objectManager = Bootstrap::getObjectManager();
+        $objectManager->addSharedInstance($viewFileSystem, 'Magento\Framework\View\FileSystem');
 
         /** @var $moduleReader \Magento\Framework\Module\Dir\Reader */
         $moduleReader = $objectManager->get('Magento\Framework\Module\Dir\Reader');
@@ -61,8 +52,8 @@ protected function setUp()
             dirname(__DIR__) . '/Core/Model/_files/Magento/Catalog/i18n'
         );
 
-        /** @var \Magento\Core\Model\View\Design _designModel */
-        $this->_designModel = $this->getMock(
+        /** @var \Magento\Core\Model\View\Design $designModel */
+        $designModel = $this->getMock(
             'Magento\Core\Model\View\Design',
             array('getDesignTheme'),
             array(
@@ -76,49 +67,19 @@ protected function setUp()
             )
         );
 
-        $this->_designModel->expects($this->any())->method('getDesignTheme')->will($this->returnValue($theme));
+        $designModel->expects($this->any())->method('getDesignTheme')->will($this->returnValue($theme));
 
-        $objectManager->addSharedInstance($this->_designModel, 'Magento\Core\Model\View\Design\Proxy');
+        $objectManager->addSharedInstance($designModel, 'Magento\Core\Model\View\Design\Proxy');
 
-        $this->_model = $objectManager->create('Magento\Framework\Translate');
-        $objectManager->addSharedInstance($this->_model, 'Magento\Framework\Translate');
+        $model = $objectManager->create('Magento\Framework\Translate');
+        $objectManager->addSharedInstance($model, 'Magento\Framework\Translate');
         $objectManager->removeSharedInstance('Magento\Framework\Phrase\Renderer\Composite');
         $objectManager->removeSharedInstance('Magento\Framework\Phrase\Renderer\Translate');
         \Magento\Framework\Phrase::setRenderer($objectManager->get('Magento\Framework\Phrase\RendererInterface'));
-        $this->_model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND);
-    }
-
-    /**
-     * @magentoDataFixture Magento/Translation/_files/db_translate.php
-     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
-     * @covers \Magento\Translation\Model\Resource\Translate::getStoreId
-     * @covers \Magento\Translation\Model\Resource\String::getStoreId
-     */
-    public function testLoadDataCaching()
-    {
-        /** @var \Magento\Translation\Model\Resource\String $translateString */
-        $translateString = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Translation\Model\Resource\String'
-        );
-        $translateString->saveTranslate('Fixture String', 'New Db Translation');
-
-        $this->_model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND);
-        $this->assertEquals(
-            'Fixture Db Translation', 
-            __('Fixture String'), 
-            'Translation is expected to be cached'
-        );
-
-        $this->_model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND, true);
-        $this->assertEquals(
-            'New Db Translation', 
-            __('Fixture String'), 
-            'Forced load should not use cache'
-        );
+        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND);
     }
 
     /**
-     * @magentoAppIsolation enabled
      * @dataProvider translateDataProvider
      */
     public function testTranslate($inputText, $expectedTranslation)
diff --git a/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php
index b943a2e461f8e..4e70feb11bd4a 100644
--- a/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php
@@ -7,9 +7,9 @@
  */
 namespace Magento\Logging\Model\Config;
 
-/**
- * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
- */
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Cache\State;
+
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -22,10 +22,15 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
      */
     private $fileResolver;
 
+    public static function setUpBeforeClass()
+    {
+        Bootstrap::getInstance()->reinitialize([State::PARAM_BAN_CACHE => true]);
+    }
+
     protected function setUp()
     {
         $this->fileResolver = $this->getMockForAbstractClass('Magento\Framework\Config\FileResolverInterface');
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
         $this->model = $objectManager->create(
             'Magento\Logging\Model\Config\Reader',
             ['fileResolver' => $this->fileResolver]
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
index e192ea584caa4..e477c198cf077 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
@@ -8,12 +8,19 @@
  */
 namespace Magento\Widget\Model\Config;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Cache\State;
+
 /**
- * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
  * @magentoAppArea adminhtml
  */
 class DataTest extends \PHPUnit_Framework_TestCase
 {
+    public static function setUpBeforeClass()
+    {
+        Bootstrap::getInstance()->reinitialize([State::PARAM_BAN_CACHE => true]);
+    }
+
     public function testGet()
     {
         $fileResolver = $this->getMockForAbstractClass('Magento\Framework\Config\FileResolverInterface');
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
index 7914ccedae005..2ac90ea3af8d0 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
@@ -7,9 +7,9 @@
  */
 namespace Magento\Widget\Model\Config;
 
-/**
- * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
- */
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Cache\State;
+
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -22,10 +22,15 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
      */
     private $fileResolver;
 
+    public static function setUpBeforeClass()
+    {
+        Bootstrap::getInstance()->reinitialize([State::PARAM_BAN_CACHE => true]);
+    }
+
     public function setUp()
     {
         $this->fileResolver = $this->getMockForAbstractClass('Magento\Framework\Config\FileResolverInterface');
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
         $this->model = $objectManager->create(
             'Magento\Widget\Model\Config\Reader', ['fileResolver' => $this->fileResolver]
         );

From a6aa442c47cf02f3174483a7b4aec01022b8aea2 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Tue, 2 Dec 2014 11:14:35 -0600
Subject: [PATCH 086/474] MAGETWO-31004: Validation of CLI

- made changes according to CR feedback
---
 dev/build/core_dev/api-functional/build.xml   |   2 -
 .../api-functional/install-config-mysql.php   |   1 -
 setup/config/application.config.php           |   2 +-
 setup/module/Magento/Setup/Module.php         |   7 -
 .../src/Controller/ConsoleController.php      |  63 ++--
 .../Controller/Install/StartController.php    |  16 +-
 .../Magento/Setup/src/Model/AdminAccount.php  |  32 ++
 .../DeploymentConfigMapper.php}               |  34 +-
 .../Magento/Setup/src/Model/Installer.php     |  57 ++-
 .../src/Model/UserConfigurationDataMapper.php | 101 ++++++
 .../Magento/Setup/src/Model/Validator.php     | 332 ------------------
 .../Setup/src/Mvc/Console/RouteListener.php   |  78 ++++
 .../{Model => Mvc/Console}/RouteMatcher.php   |   5 +-
 .../src/Mvc/Console/VerboseValidator.php      | 196 +++++++++++
 .../Setup/src/Mvc/ValidatingRouteListener.php | 155 --------
 15 files changed, 523 insertions(+), 558 deletions(-)
 rename setup/module/Magento/Setup/src/{Module/Setup/ConfigMapper.php => Model/DeploymentConfigMapper.php} (55%)
 delete mode 100644 setup/module/Magento/Setup/src/Model/Validator.php
 create mode 100644 setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
 rename setup/module/Magento/Setup/src/{Model => Mvc/Console}/RouteMatcher.php (78%)
 create mode 100644 setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
 delete mode 100644 setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php

diff --git a/dev/build/core_dev/api-functional/build.xml b/dev/build/core_dev/api-functional/build.xml
index 67119dd0f728f..b527b1b491091 100644
--- a/dev/build/core_dev/api-functional/build.xml
+++ b/dev/build/core_dev/api-functional/build.xml
@@ -14,7 +14,6 @@
     <property name="product_root_dir" location="${env.deploy_directory}/${env.build.key}/build-${env.build.number}"/>
     <property name="product_edition_code" value="${env.magento_edition}"/>
     <property name="magento_instance_base_url" value="${env.http_host}${env.build.key}/build-${env.build.number}"/>
-    <property name="magento_instance_base_url_secure" value="${env.https_host}${env.build.key}/build-${env.build.number}"/>
 
     <target name="run" depends="_server_info" description="Test Magento Web API.">
         <antcall target="_deploy_magento"/>
@@ -79,7 +78,6 @@
             <replacefilter token="{{db_user}}" value="${env.db_user}"/>
             <replacefilter token="{{db_password}}" value="${env.db_password}"/>
             <replacefilter token="{{url}}" value="${magento_instance_base_url}"/>
-            <replacefilter token="{{secure_url}}" value="${magento_instance_base_url_secure}"/>
         </replace>
 
         <!--Prepare phpunit.xml-->
diff --git a/dev/build/core_dev/api-functional/install-config-mysql.php b/dev/build/core_dev/api-functional/install-config-mysql.php
index c0963d03ea1bd..6d0c1ae324309 100644
--- a/dev/build/core_dev/api-functional/install-config-mysql.php
+++ b/dev/build/core_dev/api-functional/install-config-mysql.php
@@ -14,7 +14,6 @@
     'db_prefix'              => '{{db_table_prefix}}',
     'backend_frontname'      => 'backend',
     'base_url'               => '{{url}}/',
-    'base_url_secure'        => '{{secure_url}}/',
     'session_save'           => 'db',
     'admin_username'         => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
     'admin_password'         => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
diff --git a/setup/config/application.config.php b/setup/config/application.config.php
index abaf4eba53192..8fe94fb8497f2 100644
--- a/setup/config/application.config.php
+++ b/setup/config/application.config.php
@@ -21,7 +21,7 @@
             __DIR__ . '/autoload/{,*.}{global,local}.php',
         ),
     ],
-    'listeners' => ['Magento\Setup\Mvc\Bootstrap\InitParamListener'],
+    'listeners' => ['Magento\Setup\Mvc\Bootstrap\InitParamListener', 'Magento\Setup\Mvc\Console\RouteListener',],
     'service_manager' => [
         'factories' => [
             InitParamListener::BOOTSTRAP_PARAM => 'Magento\Setup\Mvc\Bootstrap\InitParamListener',
diff --git a/setup/module/Magento/Setup/Module.php b/setup/module/Magento/Setup/Module.php
index 4e22de9b3e702..f223309c83a6b 100644
--- a/setup/module/Magento/Setup/Module.php
+++ b/setup/module/Magento/Setup/Module.php
@@ -39,13 +39,6 @@ public function onBootstrap(EventInterface $e)
         /** @var \Zend\EventManager\SharedEventManager $sharedEvents */
         $sharedEvents = $events->getSharedManager();
 
-        // attach a ValidatingRouteListener before default RouteListener for parameter validation
-        $oldRouteListener = $application->getServiceManager()->get('routelistener');
-        $oldRouteListener->detach($events);
-        $routeListener = new \Magento\Setup\Mvc\ValidatingRouteListener();
-        $routeListener->attach($events);
-        $oldRouteListener->attach($events);
-
         $moduleRouteListener = new ModuleRouteListener();
         $moduleRouteListener->attach($events);
 
diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index 124e24cdcfe63..ad2ee18da4335 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -12,14 +12,14 @@
 use Magento\Setup\Model\InstallerFactory;
 use Magento\Setup\Model\Installer;
 use Magento\Setup\Model\ConsoleLogger;
+use Magento\Setup\Model\UserConfigurationDataMapper;
 use Zend\Console\Request as ConsoleRequest;
 use Zend\EventManager\EventManagerInterface;
 use Zend\Mvc\Controller\AbstractActionController;
 use Magento\Setup\Model\UserConfigurationDataMapper as UserConfig;
 use Magento\Setup\Model\AdminAccount;
 use Magento\Framework\App\MaintenanceMode;
-use Magento\Setup\Module\Setup\ConfigMapper;
-use Magento\Setup\Model\Validator;
+use Magento\Setup\Model\DeploymentConfigMapper;
 
 /**
  * Controller that handles all setup commands via command line interface.
@@ -102,13 +102,6 @@ class ConsoleController extends AbstractActionController
      */
     private $installer;
 
-    /**
-     * Parameter value validator
-     *
-     * @var Validator
-     */
-    private $validator;
-
     /**
      * Gets router configuration to be used in module definition
      *
@@ -151,16 +144,16 @@ public static function getConsoleUsage()
      */
     private static function getCliConfig()
     {
-        $deployConfig = '--' . ConfigMapper::KEY_DB_HOST . '='
-            . ' --' . ConfigMapper::KEY_DB_NAME . '='
-            . ' --' . ConfigMapper::KEY_DB_USER . '='
-            . ' --' . ConfigMapper::KEY_BACKEND_FRONTNAME . '='
-            . ' [--' . ConfigMapper::KEY_DB_PASS . '=]'
-            . ' [--' . ConfigMapper::KEY_DB_PREFIX . '=]'
-            . ' [--' . ConfigMapper::KEY_DB_MODEL . '=]'
-            . ' [--' . ConfigMapper::KEY_DB_INIT_STATEMENTS . '=]'
-            . ' [--' . ConfigMapper::KEY_SESSION_SAVE . '=]'
-            . ' [--' . ConfigMapper::KEY_ENCRYPTION_KEY . '=]'
+        $deployConfig = '--' . DeploymentConfigMapper::KEY_DB_HOST . '='
+            . ' --' . DeploymentConfigMapper::KEY_DB_NAME . '='
+            . ' --' . DeploymentConfigMapper::KEY_DB_USER . '='
+            . ' --' . DeploymentConfigMapper::KEY_BACKEND_FRONTNAME . '='
+            . ' [--' . DeploymentConfigMapper::KEY_DB_PASS . '=]'
+            . ' [--' . DeploymentConfigMapper::KEY_DB_PREFIX . '=]'
+            . ' [--' . DeploymentConfigMapper::KEY_DB_MODEL . '=]'
+            . ' [--' . DeploymentConfigMapper::KEY_DB_INIT_STATEMENTS . '=]'
+            . ' [--' . DeploymentConfigMapper::KEY_SESSION_SAVE . '=]'
+            . ' [--' . DeploymentConfigMapper::KEY_ENCRYPTION_KEY . '=]'
             . ' [--' . Installer::ENABLE_MODULES . '=]'
             . ' [--' . Installer::DISABLE_MODULES . '=]';
         $userConfig = '[--' . UserConfig::KEY_BASE_URL . '=]'
@@ -263,7 +256,6 @@ public function __construct(
         $this->options = $options;
         $this->installer = $installerFactory->create($consoleLogger);
         $this->maintenanceMode = $maintenanceMode;
-        $this->validator = new Validator();
     }
 
     /**
@@ -296,10 +288,11 @@ public function installAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        if ($this->validator->validate(self::CMD_INSTALL, $request->getParams()->toArray())) {
+        $validationMessages = Installer::validateInstall($request->getParams()->toArray());
+        if ('' === $validationMessages) {
             $this->installer->install($request->getParams());
         } else {
-            $this->log->log($this->validator->getValidationMessages());
+            $this->log->log(PHP_EOL . $validationMessages);
         }
     }
 
@@ -313,11 +306,12 @@ public function installDeploymentConfigAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        if ($this->validator->validate(self::CMD_INSTALL_CONFIG, $request->getParams()->toArray())) {
+        $validationMessages = DeploymentConfigMapper::validateDeploymentConfig($request->getParams()->toArray());
+        if ('' === $validationMessages) {
             $this->installer->checkInstallationFilePermissions();
             $this->installer->installDeploymentConfig($request->getParams());
         } else {
-            $this->log->log($this->validator->getValidationMessages());
+            $this->log->log(PHP_EOL . $validationMessages);
         }
     }
 
@@ -366,10 +360,11 @@ public function installUserConfigAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        if ($this->validator->validate(self::CMD_INSTALL_USER_CONFIG, $request->getParams()->toArray())) {
+        $validationMessages = UserConfigurationDataMapper::validateUserConfig($request->getParams()->toArray());
+        if ('' === $validationMessages) {
             $this->installer->installUserConfig($request->getParams());
         } else {
-            $this->log->log($this->validator->getValidationMessages());
+            $this->log->log(PHP_EOL . $validationMessages);
         }
     }
 
@@ -382,10 +377,11 @@ public function installAdminUserAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        if ($this->validator->validate(self::CMD_INSTALL_ADMIN_USER, $request->getParams()->toArray())) {
+        $validationMessages = AdminAccount::validateAdmin($request->getParams()->toArray());
+        if ('' === $validationMessages) {
             $this->installer->installAdminUser($request->getParams());
         } else {
-            $this->log->log($this->validator->getValidationMessages());
+            $this->log->log(PHP_EOL . $validationMessages);
         }
     }
 
@@ -449,11 +445,14 @@ public function helpAction()
             case UserConfig::KEY_TIMEZONE:
                 return $this->arrayToString($this->options->getTimezoneList());
             default:
-                if ($details[$type]['usage']) {
-                    $formatted = $this->formatCliUsage($details[$type]['usage']);
-                    return "\nAvailable parameters:\n{$formatted}\n";
+                if (isset($details[$type])) {
+                    if ($details[$type]['usage']) {
+                        $formatted = $this->formatCliUsage($details[$type]['usage']);
+                        return "\nAvailable parameters:\n{$formatted}\n";
+                    }
+                    return "\nThis command has no parameters.\n";
                 }
-                return "\nThis command has no parameters.\n";
+                throw new \InvalidArgumentException("Unknown type: {$type}");
         }
     }
 
diff --git a/setup/module/Magento/Setup/src/Controller/Install/StartController.php b/setup/module/Magento/Setup/src/Controller/Install/StartController.php
index b8a0d9f27eebc..f4ea22ae213f3 100644
--- a/setup/module/Magento/Setup/src/Controller/Install/StartController.php
+++ b/setup/module/Magento/Setup/src/Controller/Install/StartController.php
@@ -16,7 +16,7 @@
 use Magento\Setup\Model\Installer;
 use Magento\Setup\Model\UserConfigurationDataMapper as UserConfig;
 use Magento\Setup\Model\AdminAccount;
-use Magento\Setup\Module\Setup\ConfigMapper;
+use Magento\Setup\Model\DeploymentConfigMapper;
 
 /**
  * UI Controller that handles installation
@@ -98,15 +98,15 @@ private function importDeploymentConfigForm()
     {
         $source = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY);
         $result = [];
-        $result[ConfigMapper::KEY_DB_HOST] = isset($source['db']['host']) ? $source['db']['host'] : '';
-        $result[ConfigMapper::KEY_DB_NAME] = isset($source['db']['name']) ? $source['db']['name'] : '';
-        $result[ConfigMapper::KEY_DB_USER] = isset($source['db']['user']) ? $source['db']['user'] :'';
-        $result[ConfigMapper::KEY_DB_PASS] = isset($source['db']['password']) ? $source['db']['password'] : '';
-        $result[ConfigMapper::KEY_DB_PREFIX] = isset($source['db']['tablePrefix']) ? $source['db']['tablePrefix'] : '';
-        $result[ConfigMapper::KEY_BACKEND_FRONTNAME] = isset($source['config']['address']['admin'])
+        $result[DeploymentConfigMapper::KEY_DB_HOST] = isset($source['db']['host']) ? $source['db']['host'] : '';
+        $result[DeploymentConfigMapper::KEY_DB_NAME] = isset($source['db']['name']) ? $source['db']['name'] : '';
+        $result[DeploymentConfigMapper::KEY_DB_USER] = isset($source['db']['user']) ? $source['db']['user'] :'';
+        $result[DeploymentConfigMapper::KEY_DB_PASS] = isset($source['db']['password']) ? $source['db']['password'] : '';
+        $result[DeploymentConfigMapper::KEY_DB_PREFIX] = isset($source['db']['tablePrefix']) ? $source['db']['tablePrefix'] : '';
+        $result[DeploymentConfigMapper::KEY_BACKEND_FRONTNAME] = isset($source['config']['address']['admin'])
             ? $source['config']['address']['admin']
             : '';
-        $result[ConfigMapper::KEY_ENCRYPTION_KEY] = isset($source['config']['encrypt']['key'])
+        $result[DeploymentConfigMapper::KEY_ENCRYPTION_KEY] = isset($source['config']['encrypt']['key'])
             ? $source['config']['encrypt']['key']
             : '';
         return $result;
diff --git a/setup/module/Magento/Setup/src/Model/AdminAccount.php b/setup/module/Magento/Setup/src/Model/AdminAccount.php
index 08196411dfca1..b18487964ed73 100644
--- a/setup/module/Magento/Setup/src/Model/AdminAccount.php
+++ b/setup/module/Magento/Setup/src/Model/AdminAccount.php
@@ -85,6 +85,38 @@ public function save()
         $this->saveAdminUserRole($adminId);
     }
 
+    /**
+     * Validate parameter values of admin user setup tool
+     *
+     * @param array $data
+     * @return bool
+     */
+    public static function validateAdmin(array $data)
+    {
+        $validationMessages = '';
+        if (isset($data[self::KEY_EMAIL]) && !self::validateEmail($data[self::KEY_EMAIL])) {
+            $validationMessages .= self::KEY_EMAIL . ': Please enter a valid email address. ' .
+                "Current: {$data[self::KEY_EMAIL]}" . PHP_EOL;
+        }
+        if (isset($data[self::KEY_PASSWORD]) && strlen($data[self::KEY_PASSWORD]) < 7) {
+            $validationMessages .= self::KEY_PASSWORD . ': Password must be at least 7 characters long.' . PHP_EOL;
+        }
+
+        return $validationMessages;
+    }
+
+    /**
+     * Validate email
+     *
+     * @param $email
+     * @return bool
+     */
+    private static function validateEmail($email)
+    {
+        $validator = new \Zend\Validator\EmailAddress();
+        return $validator->isValid($email);
+    }
+
     /**
      * Uses the information in data[] to create the admin user.
      *
diff --git a/setup/module/Magento/Setup/src/Module/Setup/ConfigMapper.php b/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
similarity index 55%
rename from setup/module/Magento/Setup/src/Module/Setup/ConfigMapper.php
rename to setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
index 7af3fa492097f..3131b24a1518b 100644
--- a/setup/module/Magento/Setup/src/Module/Setup/ConfigMapper.php
+++ b/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
@@ -6,7 +6,7 @@
  * @license     {license_link}
  */
 
-namespace Magento\Setup\Module\Setup;
+namespace Magento\Setup\Model;
 
 use Magento\Framework\App\DeploymentConfig\BackendConfig;
 use Magento\Framework\App\DeploymentConfig\DbConfig;
@@ -14,7 +14,7 @@
 use Magento\Framework\App\DeploymentConfig\InstallConfig;
 use Magento\Framework\App\DeploymentConfig\SessionConfig;
 
-class ConfigMapper
+class DeploymentConfigMapper
 {
     /**#@+
      * Parameters for setup tool
@@ -50,4 +50,34 @@ class ConfigMapper
         self::KEY_BACKEND_FRONTNAME => BackendConfig::KEY_FRONTNAME,
         self::KEY_ENCRYPTION_KEY => EncryptConfig::KEY_ENCRYPTION_KEY,
     ];
+
+    /**
+     * Validate parameter values of deployment configuration tool
+     *
+     * @param array $data
+     * @return string
+     */
+    public static function validateDeploymentConfig(array $data)
+    {
+        $validationMessages = '';
+        if (isset($data[self::KEY_BACKEND_FRONTNAME]) &&
+            !preg_match('/^[a-zA-Z0-9_]+$/', $data[self::KEY_BACKEND_FRONTNAME])
+        ) {
+            $validationMessages .= self::KEY_BACKEND_FRONTNAME .
+                ': Please use alphanumeric characters and underscore. ' .
+                "Current: {$data[self::KEY_BACKEND_FRONTNAME]}" . PHP_EOL;
+        }
+        if (isset($data[self::KEY_SESSION_SAVE]) && $data[self::KEY_SESSION_SAVE] !== 'files' &&
+            $data[self::KEY_SESSION_SAVE] !== 'db'
+        ) {
+            $validationMessages .= self::KEY_SESSION_SAVE .
+                ": Please use 'files' or 'db'. Current: {$data[self::KEY_SESSION_SAVE]}" . PHP_EOL;
+        }
+        if (isset($data[self::KEY_ENCRYPTION_KEY]) && !$data[self::KEY_ENCRYPTION_KEY]) {
+            $validationMessages .= self::KEY_ENCRYPTION_KEY .
+                ": Please enter a valid encryption key. Current: {$data[self::KEY_ENCRYPTION_KEY]}" . PHP_EOL;
+        }
+
+        return $validationMessages;
+    }
 }
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 50ad1ce6db1a2..dcc691b022c93 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -31,7 +31,6 @@
 use Magento\Framework\App\DeploymentConfig\InstallConfig;
 use Magento\Framework\App\DeploymentConfig\SessionConfig;
 use Magento\Framework\App\DeploymentConfig\ResourceConfig;
-use Magento\Setup\Module\Setup\ConfigMapper;
 
 /**
  * Class Installer contains the logic to install Magento application.
@@ -316,7 +315,8 @@ private function createModulesConfig($request)
     private function createBackendConfig($data)
     {
         $backendConfigData = array(
-            ConfigMapper::$paramMap[ConfigMapper::KEY_BACKEND_FRONTNAME] => $data[ConfigMapper::KEY_BACKEND_FRONTNAME]
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_BACKEND_FRONTNAME] =>
+                $data[DeploymentConfigMapper::KEY_BACKEND_FRONTNAME]
         );
         return new BackendConfig($backendConfigData);
     }
@@ -330,7 +330,8 @@ private function createBackendConfig($data)
     private function createEncryptConfig($data)
     {
         $cryptConfigData =
-            array(ConfigMapper::$paramMap[ConfigMapper::KEY_ENCRYPTION_KEY] => $data[ConfigMapper::KEY_ENCRYPTION_KEY]);
+            array(DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_ENCRYPTION_KEY] =>
+                $data[DeploymentConfigMapper::KEY_ENCRYPTION_KEY]);
         return new EncryptConfig($cryptConfigData);
     }
 
@@ -343,20 +344,25 @@ private function createEncryptConfig($data)
     private function createDbConfig($data)
     {
         $defaultConnection = [
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_HOST] => $data[ConfigMapper::KEY_DB_HOST],
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_INIT_STATEMENTS] =>
-                isset($data[ConfigMapper::KEY_DB_INIT_STATEMENTS]) ? $data[ConfigMapper::KEY_DB_INIT_STATEMENTS] : null,
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_MODEL] => isset($data[ConfigMapper::KEY_DB_MODEL]) ?
-                $data[ConfigMapper::KEY_DB_MODEL] : null,
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_NAME] => $data[ConfigMapper::KEY_DB_NAME],
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_PASS] => isset($data[ConfigMapper::KEY_DB_PASS]) ?
-                $data[ConfigMapper::KEY_DB_PASS] : null,
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_USER] => $data[ConfigMapper::KEY_DB_USER],
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_HOST] =>
+                $data[DeploymentConfigMapper::KEY_DB_HOST],
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_INIT_STATEMENTS] =>
+                isset($data[DeploymentConfigMapper::KEY_DB_INIT_STATEMENTS]) ?
+                    $data[DeploymentConfigMapper::KEY_DB_INIT_STATEMENTS] : null,
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_MODEL] =>
+                isset($data[DeploymentConfigMapper::KEY_DB_MODEL]) ? $data[DeploymentConfigMapper::KEY_DB_MODEL] : null,
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_NAME] =>
+                $data[DeploymentConfigMapper::KEY_DB_NAME],
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_PASS] =>
+                isset($data[DeploymentConfigMapper::KEY_DB_PASS]) ? $data[DeploymentConfigMapper::KEY_DB_PASS] : null,
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_USER] =>
+                $data[DeploymentConfigMapper::KEY_DB_USER],
         ];
 
         $dbConfigData = array(
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_PREFIX] => isset($data[ConfigMapper::KEY_DB_PREFIX]) ?
-                    $data[ConfigMapper::KEY_DB_PREFIX] : null,
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_PREFIX] =>
+                isset($data[DeploymentConfigMapper::KEY_DB_PREFIX]) ?
+                    $data[DeploymentConfigMapper::KEY_DB_PREFIX] : null,
             'connection' => [
                 'default' => $defaultConnection,
             ]
@@ -372,8 +378,9 @@ private function createDbConfig($data)
      */
     private function createSessionConfig($data)
     {
-        $sessionConfigData = array(ConfigMapper::$paramMap[ConfigMapper::KEY_SESSION_SAVE] =>
-            isset($data[ConfigMapper::KEY_SESSION_SAVE]) ? $data[ConfigMapper::KEY_SESSION_SAVE] : null);
+        $sessionConfigData = array(DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_SESSION_SAVE] =>
+            isset($data[DeploymentConfigMapper::KEY_SESSION_SAVE]) ?
+                $data[DeploymentConfigMapper::KEY_SESSION_SAVE] : null);
         return new SessionConfig($sessionConfigData);
     }
 
@@ -385,7 +392,8 @@ private function createSessionConfig($data)
      */
     private function createInstallConfig($data)
     {
-        $installConfigData = array(ConfigMapper::$paramMap[ConfigMapper::KEY_DATE] => $data[ConfigMapper::KEY_DATE]);
+        $installConfigData = array(DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DATE] =>
+            $data[DeploymentConfigMapper::KEY_DATE]);
         return new InstallConfig($installConfigData);
     }
 
@@ -706,6 +714,21 @@ public function getInstallInfo()
     }
 
 
+    /**
+     * Validate install parameter values
+     *
+     * @param array $data
+     * @return string
+     */
+    public static function validateInstall(array $data)
+    {
+        $validationMessages = '';
+        $validationMessages .=  DeploymentConfigMapper::validateDeploymentConfig($data);
+        $validationMessages .= UserConfigurationDataMapper::validateUserConfig($data);
+        $validationMessages .= AdminAccount::validateAdmin($data);
+        return $validationMessages;
+    }
+
     /**
      * Deletes the database and creates it again
      *
diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index 32eed61a9d52a..eb964bc10cdac 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -81,4 +81,105 @@ public function getConfigData($data)
 
         return $configData;
     }
+
+    /**
+     * Validate parameter values of user configuration tool
+     *
+     * @param array $data
+     * @return string
+     */
+    public static function validateUserConfig(array $data)
+    {
+        $validationMessages = '';
+        // check URL
+        if (isset($data[self::KEY_BASE_URL]) && !self::validateUrl($data[self::KEY_BASE_URL])) {
+            $validationMessages .= self::KEY_BASE_URL .
+                ": Please enter a valid base url. Current: {$data[self::KEY_BASE_URL]}" . PHP_EOL;
+        }
+        if (isset($data[self::KEY_BASE_URL_SECURE]) && !self::validateUrl($data[self::KEY_BASE_URL_SECURE], true)) {
+            $validationMessages .= self::KEY_BASE_URL_SECURE .
+                ": Please enter a valid secure base url. Current: {$data[self::KEY_BASE_URL_SECURE]}" . PHP_EOL;
+        }
+
+        // check 0/1 options
+        $flags = [];
+        if (isset($data[self::KEY_USE_SEF_URL])) {
+            $flags[self::KEY_USE_SEF_URL] = $data[self::KEY_USE_SEF_URL];
+        }
+        if (isset($data[self::KEY_IS_SECURE])) {
+            $flags[self::KEY_IS_SECURE] = $data[self::KEY_IS_SECURE];
+        }
+        if (isset($data[self::KEY_IS_SECURE_ADMIN])) {
+            $flags[self::KEY_IS_SECURE_ADMIN] = $data[self::KEY_IS_SECURE_ADMIN];
+        }
+        if (isset($data[self::KEY_ADMIN_USE_SECURITY_KEY])) {
+            $flags[self::KEY_ADMIN_USE_SECURITY_KEY] = $data[self::KEY_ADMIN_USE_SECURITY_KEY];
+        }
+
+        $validationMessages .= self::validateOneZeroFlags($flags);
+
+        // check language, currency and timezone
+        $options = new Lists(new \Zend_Locale());
+        if (isset($data[self::KEY_LANGUAGE])) {
+            if (!isset($options->getLocaleList()[$data[self::KEY_LANGUAGE]])) {
+                $validationMessages .= self::KEY_LANGUAGE . ': Please use a valid language. ' .
+                    "Current: {$data[self::KEY_LANGUAGE]}" . PHP_EOL;
+            }
+        }
+
+        if (isset($data[self::KEY_CURRENCY])) {
+            if (!isset($options->getCurrencyList()[$data[self::KEY_CURRENCY]])) {
+                $validationMessages .= self::KEY_CURRENCY . ': Please use a valid currency. ' .
+                    "Current: {$data[self::KEY_CURRENCY]}" . PHP_EOL;
+            }
+        }
+
+        if (isset($data[self::KEY_TIMEZONE])) {
+            if (!isset($options->getTimezoneList()[$data[self::KEY_TIMEZONE]])) {
+                $validationMessages .= self::KEY_TIMEZONE . ': Please use a valid timezone. ' .
+                    "Current: {$data[self::KEY_TIMEZONE]}" . PHP_EOL;
+            }
+        }
+
+        return $validationMessages;
+    }
+
+    /**
+     * Validate if all flags are of 0/1 option
+     *
+     * @param array $flags
+     * @return string
+     */
+    private static function validateOneZeroFlags(array $flags = [])
+    {
+        $validationMessages = '';
+        $wrongOptionMessage = 'Please enter a valid option (0/1). ';
+        foreach ($flags as $key => $flag) {
+            if ($flag !== '0' && $flag !== '1') {
+                $validationMessages .= "{$key}: {$wrongOptionMessage} Current: {$flag}" . PHP_EOL;
+            }
+        }
+        return $validationMessages;
+    }
+
+    /**
+     * Validate URL
+     *
+     * @param string $url
+     * @param bool $secure
+     * @return bool
+     */
+    private function validateUrl($url, $secure = false)
+    {
+        $validator = new \Zend\Validator\Uri();
+        if ($validator->isValid($url)) {
+            if ($secure) {
+                return strpos($url, 'https://') !== false;
+            }
+            else {
+                return strpos($url, 'http://') !== false;
+            }
+        }
+        return false;
+    }
 }
diff --git a/setup/module/Magento/Setup/src/Model/Validator.php b/setup/module/Magento/Setup/src/Model/Validator.php
deleted file mode 100644
index d4440697e2b83..0000000000000
--- a/setup/module/Magento/Setup/src/Model/Validator.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-namespace Magento\Setup\Model;
-
-use Magento\Setup\Module\Setup\ConfigMapper;
-use Magento\Setup\Controller\ConsoleController;
-
-class Validator
-{
-    private $validationMessages = [];
-
-    /**
-     * Get validation messages
-     *
-     * @return string
-     */
-    public function getValidationMessages()
-    {
-        $message = '';
-        foreach ($this->validationMessages as $key => $value) {
-            $message .= "{$key}: {$value}" . PHP_EOL;
-        }
-        return $message;
-    }
-
-    /**
-     * Check for any missing parameters
-     *
-     * @param array $expectedParams
-     * @param array $actualParams
-     * @return array
-     */
-    public function checkMissingParameter($expectedParams, $actualParams)
-    {
-        $missingParams = array_diff(array_keys($expectedParams), array_keys($actualParams));
-        foreach ($missingParams as $key => $missingParam) {
-            /* disregard if optional parameter */
-            if (!$expectedParams[$missingParam]['required']) {
-                unset($missingParams[$key]);
-            }
-        }
-        return $missingParams;
-    }
-
-    /**
-     * Check for any extra parameters
-     *
-     * @param array $expectedParams
-     * @param array $actualParams
-     * @return array
-     */
-    public function checkExtraParameter($expectedParams, $actualParams)
-    {
-        $extraParams = array_diff(array_keys($actualParams), array_keys($expectedParams));
-        return $extraParams;
-    }
-
-    /**
-     * Checks for parameters that are missing values
-     *
-     * @param $expectedParams
-     * @param $actualParams
-     * @return array
-     */
-    public function checkMissingValue($expectedParams, $actualParams)
-    {
-        $missingValues = [];
-        foreach ($actualParams as $param => $value) {
-            if (isset($expectedParams[$param])) {
-                if ($value === '' && $expectedParams[$param]['hasValue']) {
-                    $missingValues[] = $param;
-                }
-            }
-        }
-        return $missingValues;
-    }
-
-    /**
-     * Checks for parameters that do not need values
-     *
-     * @param $expectedParams
-     * @param $actualParams
-     * @return array
-     */
-    public function checkExtraValue($expectedParams, $actualParams)
-    {
-        $extraValues = [];
-        foreach ($actualParams as $param => $value) {
-            if (isset($expectedParams[$param])) {
-                if ($value !== '' && !$expectedParams[$param]['hasValue']) {
-                    $extraValues[] = $param;
-                }
-            }
-        }
-        return $extraValues;
-    }
-    /**
-     * Validate parameters according to action
-     *
-     * @param string $action
-     * @param array $data
-     * @return bool
-     */
-    public function validate($action, array $data)
-    {
-        switch ($action)
-        {
-            case ConsoleController::CMD_INSTALL:
-                return $this->validateInstall($data);
-            case ConsoleController::CMD_INSTALL_ADMIN_USER:
-                return $this->validateAdmin($data);
-            case ConsoleController::CMD_INSTALL_USER_CONFIG:
-                return $this->validateUserConfig($data);
-            case ConsoleController::CMD_INSTALL_CONFIG:
-                return $this->validateDeploymentConfig($data);
-            default:
-                return true;
-        }
-    }
-
-    /**
-     * Validate parameter values of installation tool
-     *
-     * @param array $data
-     * @return bool
-     */
-    private function validateInstall(array $data)
-    {
-        $deploymentValid = $this->validateDeploymentConfig($data);
-        $adminValid = $this->validateAdmin($data);
-        $userValid = $this->validateUserConfig($data);
-        return $deploymentValid && $adminValid && $userValid;
-    }
-
-    /**
-     * Validate parameter values of deployment configuration tool
-     *
-     * @param array $data
-     * @return bool
-     */
-    private function validateDeploymentConfig(array $data)
-    {
-        $pass = true;
-        if (isset($data[ConfigMapper::KEY_BACKEND_FRONTNAME]) &&
-            !preg_match('/^[a-zA-Z0-9_]+$/', $data[ConfigMapper::KEY_BACKEND_FRONTNAME])
-        ) {
-            $pass = false;
-            $this->validationMessages[ConfigMapper::KEY_BACKEND_FRONTNAME] =
-                'Please use alphanumeric characters and underscore. ' .
-                "Current: {$data[ConfigMapper::KEY_BACKEND_FRONTNAME]}";
-        }
-        if (isset($data[ConfigMapper::KEY_SESSION_SAVE]) &&
-            $data[ConfigMapper::KEY_SESSION_SAVE] !== 'files' &&
-            $data[ConfigMapper::KEY_SESSION_SAVE] !== 'db'
-        ) {
-            $pass = false;
-            $this->validationMessages[ConfigMapper::KEY_SESSION_SAVE] =
-                "Please use 'files' or 'db'. Current: {$data[ConfigMapper::KEY_SESSION_SAVE]}";
-        }
-        if (isset($data[ConfigMapper::KEY_ENCRYPTION_KEY]) &&
-            !$data[ConfigMapper::KEY_ENCRYPTION_KEY]
-        ) {
-            $pass = false;
-            $this->validationMessages[ConfigMapper::KEY_ENCRYPTION_KEY] =
-                "Please enter a valid encryption key. Current: {$data[ConfigMapper::KEY_ENCRYPTION_KEY]}";
-        }
-
-        return $pass;
-    }
-
-    /**
-     * Validate parameter values of user configuration tool
-     *
-     * @param array $data
-     * @return bool
-     */
-    private function validateUserConfig(array $data)
-    {
-        $pass = true;
-        // check URL
-        if (isset($data[UserConfigurationDataMapper::KEY_BASE_URL]) &&
-            !$this->validateUrl($data[UserConfigurationDataMapper::KEY_BASE_URL])) {
-            $pass = false;
-            $this->validationMessages[UserConfigurationDataMapper::KEY_BASE_URL] =
-                "Please enter a valid base url. Current: {$data[UserConfigurationDataMapper::KEY_BASE_URL]}";
-        }
-        if (isset($data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE]) &&
-            !$this->validateUrl($data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE], true)) {
-            $pass = false;
-            $this->validationMessages[UserConfigurationDataMapper::KEY_BASE_URL_SECURE] =
-                'Please enter a valid secure base url. ' .
-                "Current: {$data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE]}";
-        }
-
-        // check 0/1 options
-        $flags = [];
-        if (isset($data[UserConfigurationDataMapper::KEY_USE_SEF_URL])) {
-            $flags[UserConfigurationDataMapper::KEY_USE_SEF_URL] = $data[UserConfigurationDataMapper::KEY_USE_SEF_URL];
-        }
-        if (isset($data[UserConfigurationDataMapper::KEY_IS_SECURE])) {
-            $flags[UserConfigurationDataMapper::KEY_IS_SECURE] = $data[UserConfigurationDataMapper::KEY_IS_SECURE];
-        }
-        if (isset($data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN])) {
-            $flags[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN] =
-                $data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN];
-        }
-        if (isset($data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY])) {
-            $flags[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY] =
-                $data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY];
-        }
-        if (!$this->validateOneZero($flags)) {
-            $pass = false;
-        }
-
-        // check language, currency and timezone
-        $options = new Lists(new \Zend_Locale());
-        if (isset($data[UserConfigurationDataMapper::KEY_LANGUAGE])) {
-            if (!isset($options->getLocaleList()[$data[UserConfigurationDataMapper::KEY_LANGUAGE]])) {
-                $pass = false;
-                $this->validationMessages[UserConfigurationDataMapper::KEY_LANGUAGE] =
-                    'Please use a valid language. ' .
-                    "Current: {$data[UserConfigurationDataMapper::KEY_LANGUAGE]}";
-            }
-        }
-
-        if (isset($data[UserConfigurationDataMapper::KEY_CURRENCY])) {
-            if (!isset($options->getCurrencyList()[$data[UserConfigurationDataMapper::KEY_CURRENCY]])) {
-                $pass = false;
-                $this->validationMessages[UserConfigurationDataMapper::KEY_CURRENCY] =
-                    'Please use a valid currency. ' .
-                    "Current: {$data[UserConfigurationDataMapper::KEY_CURRENCY]}";
-            }
-        }
-
-        if (isset($data[UserConfigurationDataMapper::KEY_TIMEZONE])) {
-            if (!isset($options->getTimezoneList()[$data[UserConfigurationDataMapper::KEY_TIMEZONE]])) {
-                $pass = false;
-                $this->validationMessages[UserConfigurationDataMapper::KEY_TIMEZONE] =
-                    'Please use a valid timezone. ' .
-                    "Current: {$data[UserConfigurationDataMapper::KEY_TIMEZONE]}";
-            }
-        }
-
-        return $pass;
-    }
-
-    /**
-     * Validate parameter values of admin user setup tool
-     *
-     * @param array $data
-     * @return bool
-     */
-    private function validateAdmin(array $data)
-    {
-        $pass = true;
-        if (isset($data[AdminAccount::KEY_EMAIL]) &&
-            !$this->validateEmail($data[AdminAccount::KEY_EMAIL])
-        ) {
-            $pass = false;
-            $this->validationMessages[AdminAccount::KEY_EMAIL] =
-                'Please enter a valid email address. ' .
-                "Current: {$data[AdminAccount::KEY_EMAIL]}";
-        }
-        if (isset($data[AdminAccount::KEY_PASSWORD]) &&
-            strlen($data[AdminAccount::KEY_PASSWORD]) < 7
-        ) {
-            $pass = false;
-            $this->validationMessages[AdminAccount::KEY_PASSWORD] = 'Password must be at least 7 characters long.';
-        }
-
-        return $pass;
-
-    }
-
-    /**
-     * Validate email
-     *
-     * @param $email
-     * @return bool
-     */
-    private function validateEmail($email)
-    {
-        $validator = new \Zend\Validator\EmailAddress();
-        return $validator->isValid($email);
-    }
-
-    /**
-     * Validate URL
-     *
-     * @param string $url
-     * @param bool $secure
-     * @return bool
-     */
-    private function validateUrl($url, $secure = false)
-    {
-        $validator = new \Zend\Validator\Uri();
-        if ($validator->isValid($url)) {
-            if ($secure) {
-                return strpos($url, 'https://') !== false;
-            }
-            else {
-                return strpos($url, 'http://') !== false;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Validate if all flags are of 0/1 option
-     *
-     * @param array $flags
-     * @return bool
-     */
-    private function validateOneZero(array $flags = [])
-    {
-        $wrongOptionMessage = 'Please enter a valid option (0/1). ';
-        $pass = true;
-        foreach ($flags as $key => $flag) {
-            if ($flag !== '0' && $flag !== '1') {
-                $pass = false;
-                $this->validationMessages[$key] = "{$wrongOptionMessage} Current: {$flag}";
-            }
-        }
-        return $pass;
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php b/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
new file mode 100644
index 0000000000000..cbbca6b6ce5ed
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license   {license_link}
+ */
+
+namespace Magento\Setup\Mvc\Console;
+
+use Zend\View\Model\ConsoleModel;
+use Zend\Mvc\Router\RouteMatch;
+use Zend\Mvc\MvcEvent;
+use Zend\Console\ColorInterface;
+use Zend\EventManager\EventManagerInterface;
+
+/**
+ * Custom route listener to validate user parameters
+ */
+class RouteListener extends \Zend\Mvc\RouteListener
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function onRoute($e)
+    {
+        $request = $e->getRequest();
+        // propagates to default RouteListener if not CLI
+        if (!$request instanceof \Zend\Console\Request) {
+            return null;
+        }
+
+        $router = $e->getRouter();
+        $match = $router->match($request);
+
+        // CLI routing miss, checks for missing/extra parameters
+        if (!$match instanceof RouteMatch) {
+            $content = $request->getContent();
+            $config = $e->getApplication()->getServiceManager()->get('Config')['console']['router']['routes'];
+
+            $verboseValidator = new VerboseValidator();
+            $validationMessages = $verboseValidator->validate($content, $config);
+
+            if ('' !== $validationMessages) {
+                $this->displayMessages($e, $validationMessages);
+                // set error to stop propagation
+                $e->setError('default_error');
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Display messages on console
+     *
+     * @param MvcEvent $e
+     * @param $validationMessages
+     */
+    private function displayMessages(MvcEvent $e, $validationMessages)
+    {
+        /** @var \Zend\Console\Adapter\AdapterInterface $console */
+        $console = $e->getApplication()->getServiceManager()->get('console');
+        $validationMessages = $console->colorize($validationMessages, ColorInterface::RED);
+        $model = new ConsoleModel();
+        $model->setErrorLevel(1);
+        $model->setResult($validationMessages);
+        $e->setResult($model);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attach(EventManagerInterface $events)
+    {
+        // set a higher priority than default route listener so it gets triggered first
+        $this->listeners[] = $events->attach(MvcEvent::EVENT_ROUTE, array($this, 'onRoute'), 10);
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Model/RouteMatcher.php b/setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php
similarity index 78%
rename from setup/module/Magento/Setup/src/Model/RouteMatcher.php
rename to setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php
index 47a4f212ce3e7..646210c4afe8a 100644
--- a/setup/module/Magento/Setup/src/Model/RouteMatcher.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php
@@ -6,8 +6,11 @@
  * @license   {license_link}
  */
 
-namespace Magento\Setup\Model;
+namespace Magento\Setup\Mvc\Console;
 
+/**
+ * Extending ZF RouteMatcher for a public getter
+ */
 class RouteMatcher extends \Zend\Console\RouteMatcher\DefaultRouteMatcher
 {
     /**
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
new file mode 100644
index 0000000000000..c84991f46f127
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license   {license_link}
+ */
+
+namespace Magento\Setup\Mvc\Console;
+
+/**
+ * Validator for checking parameters in CLI
+ */
+class VerboseValidator
+{
+    /**
+     * Checks parameters and returns validation messages
+     *
+     * @param array $data
+     * @param array $config
+     * @return string
+     */
+    public function validate(array $data, array $config)
+    {
+        $validationMessages = '';
+        if (!empty($data)) {
+            $userAction = $data[0];
+            array_shift($data);
+        } else {
+            // user did not provide any action or parameters, treat as default action
+            return '';
+        }
+
+        if (isset($config[$userAction])) {
+            // parse the expected parameters of the action
+            $matcher = new RouteMatcher($config[$userAction]['options']['route']);
+            $parts = $matcher->getParts();
+            array_shift($parts);
+            $expectedParams = [];
+            foreach ($parts as $part) {
+                $expectedParams[$part['name']] = $part;
+            }
+            // parse user parameters
+            $userParams = $this->parseUserParams($data);
+
+            $missingParams = $this->checkMissingParameter($expectedParams, $userParams);
+            $extraParams = $this->checkExtraParameter($expectedParams, $userParams);
+            $missingValues = $this->checkMissingValue($expectedParams, $userParams);
+            $extraValues = $this->checkExtraValue($expectedParams, $userParams);
+
+            $validationMessages = PHP_EOL;
+
+            if (!empty($missingParams)) {
+                $validationMessages .= 'Missing parameters:' . PHP_EOL;
+                foreach ($missingParams as $missingParam) {
+                    $validationMessages .= $missingParam . PHP_EOL;
+                }
+                $validationMessages .= PHP_EOL;
+            }
+            if (!empty($extraParams)) {
+                $validationMessages .= 'Unidentified parameters:' . PHP_EOL;
+                foreach ($extraParams as $extraParam) {
+                    $validationMessages .= $extraParam . PHP_EOL;
+                }
+                $validationMessages .= PHP_EOL;
+            }
+            if (!empty($missingValues)) {
+                $validationMessages .= 'Parameters missing value:' . PHP_EOL;
+                foreach ($missingValues as $missingValue) {
+                    $validationMessages .= $missingValue . PHP_EOL;
+                }
+                $validationMessages .= PHP_EOL;
+            }
+            if (!empty($extraValues)) {
+                $validationMessages .= 'Parameters that don\'t need value:' . PHP_EOL;
+                foreach ($extraValues as $extraValue) {
+                    $validationMessages .= $extraValue . PHP_EOL;
+                }
+                $validationMessages .= PHP_EOL;
+            }
+            if (empty($missingParams) && empty($extraParams) && empty($missingValues) && empty($extraValue)) {
+                $validationMessages .= 'Please make sure parameters start with --.' . PHP_EOL;
+                $validationMessages .= PHP_EOL;
+            }
+
+            // add usage message
+            $validationMessages .= 'Usage:' . PHP_EOL;
+            $validationMessages .= $config[$userAction]['options']['route'] . PHP_EOL . PHP_EOL;
+
+        } else if (!is_null($userAction)) {
+            $validationMessages .= PHP_EOL . "Unknown action name '{$userAction}'." . PHP_EOL . PHP_EOL;
+            $validationMessages .= 'Available options: ' . PHP_EOL;
+            foreach (array_keys($config) as $action) {
+                $validationMessages .= $action . PHP_EOL;
+            }
+            $validationMessages .= PHP_EOL;
+        }
+
+
+        return $validationMessages;
+    }
+
+    /**
+     * Parse user input
+     *
+     * @param array $content
+     * @return array
+     */
+    private function parseUserParams(array $content)
+    {
+        $parameters = [];
+        foreach ($content as $param) {
+            $parsed = explode('=', $param, 2);
+            $value = isset($parsed[1]) ? $parsed[1] : '';
+            if (strpos($parsed[0], '--') !== false) {
+                $key = substr($parsed[0], 2, strlen($parsed[0]) - 2);
+            } else {
+                $key = $parsed[0];
+            }
+
+            $parameters[$key] = $value;
+        }
+        return $parameters;
+    }
+    /**
+     * Check for any missing parameters
+     *
+     * @param array $expectedParams
+     * @param array $actualParams
+     * @return array
+     */
+    public function checkMissingParameter($expectedParams, $actualParams)
+    {
+        $missingParams = array_diff(array_keys($expectedParams), array_keys($actualParams));
+        foreach ($missingParams as $key => $missingParam) {
+            /* disregard if optional parameter */
+            if (!$expectedParams[$missingParam]['required']) {
+                unset($missingParams[$key]);
+            }
+        }
+        return $missingParams;
+    }
+
+    /**
+     * Check for any extra parameters
+     *
+     * @param array $expectedParams
+     * @param array $actualParams
+     * @return array
+     */
+    public function checkExtraParameter($expectedParams, $actualParams)
+    {
+        $extraParams = array_diff(array_keys($actualParams), array_keys($expectedParams));
+        return $extraParams;
+    }
+
+    /**
+     * Checks for parameters that are missing values
+     *
+     * @param $expectedParams
+     * @param $actualParams
+     * @return array
+     */
+    public function checkMissingValue($expectedParams, $actualParams)
+    {
+        $missingValues = [];
+        foreach ($actualParams as $param => $value) {
+            if (isset($expectedParams[$param])) {
+                if ($value === '' && $expectedParams[$param]['hasValue']) {
+                    $missingValues[] = $param;
+                }
+            }
+        }
+        return $missingValues;
+    }
+
+    /**
+     * Checks for parameters that do not need values
+     *
+     * @param $expectedParams
+     * @param $actualParams
+     * @return array
+     */
+    public function checkExtraValue($expectedParams, $actualParams)
+    {
+        $extraValues = [];
+        foreach ($actualParams as $param => $value) {
+            if (isset($expectedParams[$param])) {
+                if ($value !== '' && !$expectedParams[$param]['hasValue']) {
+                    $extraValues[] = $param;
+                }
+            }
+        }
+        return $extraValues;
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php b/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
deleted file mode 100644
index d0d579954ea89..0000000000000
--- a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license   {license_link}
- */
-
-namespace Magento\Setup\Mvc;
-
-use Magento\Setup\Model\Validator;
-use Zend\View\Model\ConsoleModel;
-use Zend\Mvc\Router\RouteMatch;
-use Zend\Mvc\MvcEvent;
-use Zend\Console\ColorInterface;
-
-class ValidatingRouteListener extends \Zend\Mvc\RouteListener
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function onRoute($e)
-    {
-        $request = $e->getRequest();
-        // propagates to default RouteListener if not CLI
-        if (!$request instanceof \Zend\Console\Request) {
-            return null;
-        }
-
-        $router = $e->getRouter();
-        $match = $router->match($request);
-
-        $validationMessages = '';
-        // CLI routing miss, checks for missing/extra parameters
-        if (!$match instanceof RouteMatch) {
-            $validationMessages .= $this->checkParams($e);
-            if ('' !== $validationMessages) {
-                $this->displayMessage($e, $validationMessages);
-                // set error to stop propagation
-                $e->setError('default_error');
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Checks parameters
-     *
-     * @param MvcEvent $e
-     * @return string
-     */
-    private function checkParams(MvcEvent $e)
-    {
-        $request = $e->getRequest();
-        $content = $request->getContent();
-        $serviceManager = $e->getApplication()->getServiceManager();
-
-        $userAction = $content[0];
-        array_shift($content);
-
-        $routes = $serviceManager->get('Config')['console']['router']['routes'];
-        $validationMessages = '';
-        if (isset($routes[$userAction])) {
-            // parse the expected parameters of the action
-            $matcher = new \Magento\Setup\Model\RouteMatcher($routes[$userAction]['options']['route']);
-            $parts = $matcher->getParts();
-            array_shift($parts);
-            $expectedParams = [];
-            foreach ($parts as $part) {
-                $expectedParams[$part['name']] = $part;
-            }
-            // parse user parameters
-            $userParams = $this->parseUserParams($content);
-
-            $validator = new Validator();
-            $missingParams = $validator->checkMissingParameter($expectedParams, $userParams);
-            $extraParams = $validator->checkExtraParameter($expectedParams, $userParams);
-            $missingValues = $validator->checkMissingValue($expectedParams, $userParams);
-            $extraValues = $validator->checkExtraValue($expectedParams, $userParams);
-
-            if (!empty($missingParams)) {
-                $validationMessages .= 'Missing parameters:' . PHP_EOL;
-                foreach ($missingParams as $missingParam) {
-                    $validationMessages .= $missingParam . PHP_EOL;
-                }
-                $validationMessages .= PHP_EOL;
-            }
-            if (!empty($extraParams)) {
-                $validationMessages .= 'Unidentified parameters:' . PHP_EOL;
-                foreach ($extraParams as $extraParam) {
-                    $validationMessages .= $extraParam . PHP_EOL;
-                }
-                $validationMessages .= PHP_EOL;
-            }
-            if (!empty($missingValues)) {
-                $validationMessages .= 'Parameters missing value:' . PHP_EOL;
-                foreach ($missingValues as $missingValue) {
-                    $validationMessages .= $missingValue . PHP_EOL;
-                }
-                $validationMessages .= PHP_EOL;
-            }
-            if (!empty($extraValues)) {
-                $validationMessages .= 'Parameters that don\'t need value:' . PHP_EOL;
-                foreach ($extraValues as $extraValue) {
-                    $validationMessages .= $extraValue . PHP_EOL;
-                }
-                $validationMessages .= PHP_EOL;
-            }
-            if (empty($missingParams) && empty($extraParams) && empty($missingValues) && empty($extraValue)) {
-                $validationMessages .= 'Please make sure parameters start with --.' . PHP_EOL;
-                $validationMessages .= PHP_EOL;
-            }
-
-        } else if (!is_null($userAction)) {
-            $validationMessages .= "Unknown action name '{$userAction}'." . PHP_EOL;
-            $validationMessages .= PHP_EOL;
-        }
-
-        return $validationMessages;
-    }
-
-    private function displayMessage(MvcEvent $e, $validationMessages)
-    {
-        $serviceManager = $e->getApplication()->getServiceManager();
-        $console = $serviceManager->get('console');
-        $validationMessages = $console->colorize($validationMessages, ColorInterface::RED);
-        $model = new ConsoleModel();
-        $model->setErrorLevel(1);
-        $model->setResult($validationMessages);
-        $e->setResult($model);
-    }
-
-    /**
-     * Parse user input
-     *
-     * @param array $content
-     * @return array
-     */
-    private function parseUserParams(array $content)
-    {
-        $parameters = [];
-        foreach ($content as $param) {
-            $parsed = explode('=', $param, 2);
-            $value = isset($parsed[1]) ? $parsed[1] : '';
-            if (strpos($parsed[0], '--') !== false) {
-                $key = substr($parsed[0], 2, strlen($parsed[0]) - 2);
-            } else {
-                $key = $parsed[0];
-            }
-
-            $parameters[$key] = $value;
-        }
-        return $parameters;
-    }
-}

From b5b788d280e303dcb0d20ef5917543a18c3913fb Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Tue, 2 Dec 2014 17:26:45 -0600
Subject: [PATCH 087/474] MAGETWO-31004: Validation of CLI

- removed base_url_secure in functional test
---
 dev/build/core_dev/functional/build.xml          | 5 +----
 dev/build/core_dev/functional/config/install.php | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index e015588de495e..4e07cb7c039db 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -51,7 +51,6 @@
                 db_password: '',
                 deploy_directory: '',
                 http_host: ' (e.g. http://myhost.com/mypath/)',
-                https_host: ' (e.g. https://myhost.com/mypath/)',
                 instance_count: '',
                 selenium_browser: ' (e.g. firefox, googlechrome etc; see server.yml.dist)',
                 selenium_host: '',
@@ -188,7 +187,6 @@
             <replacefilter token="{{db_user}}" value="${env.db_user}"/>
             <replacefilter token="{{db_password}}" value="${env.db_password}"/>
             <replacefilter token="{{url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}"/>
-            <replacefilter token="{{secure_url}}" value="${env.https_host}${env.build.key}/instance-${instanceIndex}"/>
         </replace>
 
         <condition property="env.bamboo_tests_configuration" value="basic">
@@ -317,8 +315,7 @@
             <arg value="-h${env.db_host}"/>
             <arg value="-D${env.db_name_prefix}${instanceIndex}"/>
             <arg value="-e"/>
-            <arg value="UPDATE core_config_data SET value='${env.https_host}${env.build.key}/instance-${instanceIndex}/' WHERE path='web/secure/base_url';
-                UPDATE core_config_data SET value='${env.http_host}${env.build.key}/instance-${instanceIndex}/' WHERE path='web/unsecure/base_url';"/>
+            <arg value="UPDATE core_config_data SET value='${env.http_host}${env.build.key}/instance-${instanceIndex}/' WHERE path='web/unsecure/base_url';"/>
         </exec>
     </target>
 </project>
diff --git a/dev/build/core_dev/functional/config/install.php b/dev/build/core_dev/functional/config/install.php
index c3143fbf17d60..fde6055ccff36 100644
--- a/dev/build/core_dev/functional/config/install.php
+++ b/dev/build/core_dev/functional/config/install.php
@@ -24,7 +24,6 @@
         'admin_username'         => 'admin',
         'admin_password'         => '123123q', // must be at least of 7 both numeric and alphanumeric characters
         'base_url'               => '{{url}}',
-        'base_url_secure'        => '{{secure_url}}',
         'session_save'           => 'db',
         'backend_frontname'      => 'backend',
     ),

From 8802f258b886a4b5b5f5355a5a0a3cdfc1fa3179 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Wed, 26 Nov 2014 11:11:37 -0600
Subject: [PATCH 088/474] MAGETWO-29035: Installation fails if cli php is
 different than apache configured

- refactored cache manager entry point
- utilized application functionality in setup for data upgrades and cache management
- removed scripts from dev/shell in favor of Setup Tools
---
 dev/shell/cache.php                           |   5 +-
 dev/shell/run_data_fixtures.php               |  21 --
 dev/shell/user_config_data.php                |  45 ----
 .../Framework/App/Cache/ManagerAppTest.php    | 242 +++++++++---------
 .../Framework/App/Cache/ManagerTest.php       | 141 ++++++++++
 .../Framework/App/Console/ResponseTest.php    |  17 +-
 .../Magento/Framework/App/Cache/Manager.php   | 140 ++++++++++
 .../Framework/App/Cache/ManagerApp.php        | 187 ++++----------
 .../Framework/App/Console/Response.php        |  24 ++
 setup/index.php                               |   2 +-
 .../src/Controller/ConsoleController.php      |  13 +
 setup/module/Magento/Setup/src/Exception.php  |  13 +
 .../Magento/Setup/src/Model/Installer.php     |  96 ++++---
 .../Setup/src/Model/InstallerFactory.php      |   1 +
 14 files changed, 577 insertions(+), 370 deletions(-)
 delete mode 100644 dev/shell/run_data_fixtures.php
 delete mode 100644 dev/shell/user_config_data.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php
 create mode 100644 lib/internal/Magento/Framework/App/Cache/Manager.php
 create mode 100644 setup/module/Magento/Setup/src/Exception.php

diff --git a/dev/shell/cache.php b/dev/shell/cache.php
index 19ed518d21983..e786b16647c53 100644
--- a/dev/shell/cache.php
+++ b/dev/shell/cache.php
@@ -43,11 +43,8 @@
     $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
     $bootstrap = Bootstrap::create(BP, $params);
     /** @var ManagerApp $app */
-    $app = $bootstrap->createApplication('Magento\Framework\App\Cache\ManagerApp', ['request' => $opt]);
+    $app = $bootstrap->createApplication('Magento\Framework\App\Cache\ManagerApp', ['requestArgs' => $opt]);
     $bootstrap->run($app);
-    echo "Current status:\n";
-    var_export($app->getStatusSummary());
-    echo "\n";
 } catch (\Exception $e) {
     echo $e;
     exit(1);
diff --git a/dev/shell/run_data_fixtures.php b/dev/shell/run_data_fixtures.php
deleted file mode 100644
index 0eb9f4487646e..0000000000000
--- a/dev/shell/run_data_fixtures.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-use Magento\Framework\App\State as AppState;
-use Magento\Framework\Shell\ComplexParameter;
-
-require __DIR__ . '/../../app/bootstrap.php';
-$bootstrapParam = new ComplexParameter('bootstrap');
-$params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
-if (!isset($params[AppState::PARAM_MODE])) {
-    $params[AppState::PARAM_MODE] = AppState::MODE_DEVELOPER;
-}
-$bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $params);
-/** @var \Magento\Framework\Module\Updater $updater */
-$updater = $bootstrap->getObjectManager()->create('\Magento\Framework\Module\Updater');
-$updater->updateData();
diff --git a/dev/shell/user_config_data.php b/dev/shell/user_config_data.php
deleted file mode 100644
index 06eb5f37db1b9..0000000000000
--- a/dev/shell/user_config_data.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-use Magento\Framework\Shell\ComplexParameter;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Backend\Model\Config;
-use Magento\Framework\App\Bootstrap;
-
-require __DIR__ . '/../../app/bootstrap.php';
-
-$usage = 'Usage: php -f user_config_data.php -- '
-    . '--data=<string> - pairs of \'path=value\' separated by \'&\', where '. PHP_EOL
-    . '       \'path\' is path of the specified data group, e.g. web/unsecure/base_url, and ' . PHP_EOL
-    . '       \'value\' is value for the path specified, e.g. http://127.0.0.1/ ' . PHP_EOL
-    . '--bootstrap - add or override parameters of the bootstrap' . PHP_EOL
-    . ' NOTE: this tool supports writing data only in global scope ' . PHP_EOL
-    . ' Example Usage: php -f user_config_data.php -- '
-    . ' --data=' . escapeshellarg('web/seo/use_rewrites=1&web/unsecure/base_url=http://127.0.0.1/') . PHP_EOL;
-
-
-$opt = getopt('', ['data:']);
-if (empty($opt)) {
-    echo $usage;
-    exit(0);
-}
-
-try {
-    $dataParam = new ComplexParameter('data');
-    $request = $dataParam->mergeFromArgv($_SERVER);
-    $bootstrapParam = new ComplexParameter('bootstrap');
-    $params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
-    $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
-    $bootstrap = Bootstrap::create(BP, $params);
-    /** @var \Magento\Backend\App\UserConfig $app */
-    $app = $bootstrap->createApplication('Magento\Backend\App\UserConfig', ['request' => $request]);
-    $bootstrap->run($app);
-} catch (\Exception $e) {
-    echo $e;
-    exit(1);
-}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php
index 5ac1a099dbfdf..a35324186d7d2 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php
@@ -11,173 +11,165 @@
 class ManagerAppTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Cache\Manager|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $cacheTypeList;
+    private $cacheManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $cacheState;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Console\Response|\PHPUnit_Framework_MockObject_MockObject
      */
     private $response;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $frontendPool;
-
     protected function setUp()
     {
-        $this->cacheTypeList = $this->getMockForAbstractClass('Magento\Framework\App\Cache\TypeListInterface');
-        $this->cacheState = $this->getMockForAbstractClass('Magento\Framework\App\Cache\StateInterface');
+        $this->cacheManager = $this->getMock('Magento\Framework\App\Cache\Manager', [], [], '', false);
+        $this->cacheManager->expects($this->any())
+            ->method('getAvailableTypes')
+            ->will($this->returnValue(['foo', 'bar', 'baz']));
+        $this->cacheManager->expects($this->any())
+            ->method('getStatus')
+            ->will($this->returnValue(['foo' => true, 'bar' => true, 'baz' => false]));
         $this->response = $this->getMock('Magento\Framework\App\Console\Response', [], [], '', false);
-        $this->frontendPool = $this->getMock('Magento\Framework\App\Cache\Type\FrontendPool', [], [], '', false);
     }
 
-    public function testEmptyRequest()
+    public function testLaunchStatus()
     {
-        $this->cacheTypeList->expects($this->once())->method('getTypes')->willReturn(['foo' => '', 'bar' => '']);
-        $this->cacheState->expects($this->never())->method('setEnabled');
-        $this->cacheState->expects($this->never())->method('persist');
-        $this->frontendPool->expects($this->never())->method('get');
-        $model = $this->createModel([]);
+        $this->response->expects($this->once())
+            ->method('setBody')
+            ->with(
+                $this->matches("%aCurrent status:%afoo => enabled%abar => enabled%abaz => disabled%a")
+            );
+
+        $model = new ManagerApp($this->cacheManager, $this->response, []);
         $model->launch();
     }
 
-    /**
-     * Test setting all cache types to true
-     *
-     * In this fixture, there are 2 of 3 cache types disabled, but will be enabled
-     * so persist() should be invoked once, then clean() for each of those which changed
-     */
-    public function testSetAllTrue()
+    public function testLaunchEnable()
     {
-        $this->prepareCachesFixture();
-        $this->cacheState->expects($this->exactly(2))
+        $requestArgs = [
+            ManagerApp::KEY_SET => true,
+            ManagerApp::KEY_TYPES => 'foo,,bar, baz,',
+        ];
+        $this->cacheManager->expects($this->once())
             ->method('setEnabled')
-            ->will($this->returnValueMap([['bar', true], ['baz', true]]));
-        $this->cacheState->expects($this->once())->method('persist');
-        // pretend that all cache types use the same frontend
-        $frontend = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
-        $this->frontendPool->expects($this->exactly(2))->method('get')->will($this->returnValueMap([
-            ['bar', $frontend],
-            ['baz', $frontend],
-        ]));
-        $frontend->expects($this->exactly(2))->method('clean');
-        $model = $this->createModel([ManagerApp::KEY_SET => '1']);
-        $this->assertSame($this->response, $model->launch());
+            ->with(['foo', 'bar', 'baz'], true)
+            ->will($this->returnValue(['baz']));
+        $this->cacheManager->expects($this->once())
+            ->method('clean')
+            ->with(['baz']);
+
+        $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
+        $model->launch();
     }
 
-    /**
-     * Test setting all cache types to true
-     *
-     * Fixture is the same as in previous test, but here the intent to disable all of them.
-     * Since only one of them is enabled, the setter should be invoked only once.
-     * Also the operation of deactivating cache does not need cleanup (it is relevant when you enable it).
-     */
-    public function testSetAllFalse()
+    public function testLaunchFlush()
     {
-        $this->prepareCachesFixture();
-        $this->cacheState->expects($this->once())->method('setEnabled')->with('foo', false);
-        $this->cacheState->expects($this->once())->method('persist');
-        $this->frontendPool->expects($this->never())->method('get');
-        $model = $this->createModel([ManagerApp::KEY_SET => '0']);
+        $requestArgs = [
+            ManagerApp::KEY_FLUSH => true,
+            ManagerApp::KEY_TYPES => 'foo,bar',
+        ];
+        $this->cacheManager->expects($this->never())
+            ->method('setEnabled');
+        $this->cacheManager->expects($this->once())
+            ->method('flush')
+            ->with(['foo', 'bar']);
+        $this->cacheManager->expects($this->never())
+            ->method('clean');
+
+        $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
         $model->launch();
     }
 
-    /**
-     * Test setting certain cache types to true
-     *
-     * In the fixture, one of them is currently true and another false
-     * So only one of them will be changed (and cleaned up)
-     */
-    public function testSetTwoTrue()
+    public function testLaunchClean()
     {
-        $this->prepareCachesFixture(2, [['foo', true], ['baz', false]]);
-        $this->cacheState->expects($this->once())->method('setEnabled')->with('baz', true);
-        $this->cacheState->expects($this->once())->method('persist');
-        $frontend = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
-        $this->frontendPool->expects($this->once())->method('get')->with('baz')->willReturn($frontend);
-        $frontend->expects($this->once())->method('clean');
-        $model = $this->createModel([ManagerApp::KEY_SET => '1', ManagerApp::KEY_TYPES => 'foo,baz']);
+        $requestArgs = [
+            ManagerApp::KEY_CLEAN => true,
+            ManagerApp::KEY_TYPES => 'foo,bar',
+        ];
+        $this->cacheManager->expects($this->never())
+            ->method('setEnabled');
+        $this->cacheManager->expects($this->never())
+            ->method('flush');
+        $this->cacheManager->expects($this->once())
+            ->method('clean')
+            ->with(['foo', 'bar']);
+
+        $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
         $model->launch();
     }
 
-    /**
-     * A fixture for testing setting enabled/disabled
-     *
-     * @param int $qty
-     * @param array $map
-     * @return void
-     */
-    private function prepareCachesFixture($qty = 3, $map = [['foo', true], ['bar', false], ['baz', false]])
+    public function testLaunchSetAndClean()
     {
-        $typeList = ['foo' => '', 'bar' => '', 'baz' => ''];
-        $this->cacheTypeList->expects($this->once())->method('getTypes')->willReturn($typeList);
-        $this->cacheState->expects($this->exactly($qty))->method('isEnabled')->will($this->returnValueMap($map));
+        $requestArgs = [
+            ManagerApp::KEY_SET => true,
+            ManagerApp::KEY_CLEAN => true,
+            ManagerApp::KEY_TYPES => 'foo,bar',
+        ];
+        $this->cacheManager->expects($this->once())
+            ->method('setEnabled')
+            ->with(['foo', 'bar'], true);
+        $this->cacheManager->expects($this->never())
+            ->method('flush');
+        $this->cacheManager->expects($this->once())
+            ->method('clean')
+            ->with(['foo', 'bar']);
+
+        $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
+        $model->launch();
     }
 
-    /**
-     * Test flushing all cache types
-     *
-     * Emulates situation when some cache frontends reuse the same backend
-     * Asserts that the flush is invoked is only once per affected storage
-     */
-    public function testFlushAll()
+    public function testLaunchAll()
     {
-        $typeList = ['foo' => '', 'bar' => '', 'baz' => ''];
-        $this->cacheTypeList->expects($this->once())->method('getTypes')->willReturn($typeList);
-        $frontendFoo = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
-        $frontendBar = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
-        $frontendBaz = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
-        $this->frontendPool->expects($this->exactly(3))->method('get')->will($this->returnValueMap([
-            ['foo', $frontendFoo],
-            ['bar', $frontendBar],
-            ['baz', $frontendBaz],
-        ]));
-        $backendOne = $this->getMockForAbstractClass('Zend_Cache_Backend_Interface');
-        $backendTwo = $this->getMockForAbstractClass('Zend_Cache_Backend_Interface');
-        $frontendFoo->expects($this->once())->method('getBackend')->willReturn($backendOne);
-        $frontendBar->expects($this->once())->method('getBackend')->willReturn($backendOne);
-        $frontendBaz->expects($this->once())->method('getBackend')->willReturn($backendTwo);
-        $backendOne->expects($this->once())->method('clean');
-        $backendTwo->expects($this->once())->method('clean');
-        $model = $this->createModel([ManagerApp::KEY_FLUSH => '']);
+        $requestArgs = [
+            ManagerApp::KEY_SET => true,
+            ManagerApp::KEY_FLUSH => true,
+            ManagerApp::KEY_CLEAN => true,
+            ManagerApp::KEY_TYPES => 'foo,bar',
+        ];
+        $this->cacheManager->expects($this->once())
+            ->method('setEnabled')
+            ->with(['foo', 'bar'], true);
+        $this->cacheManager->expects($this->once())
+            ->method('flush')
+            ->with(['foo', 'bar']);
+        $this->cacheManager->expects($this->never())
+            ->method('clean');
+
+        $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
         $model->launch();
     }
 
-    public function testGetStatusSummary()
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Following requested cache types are not supported: 'unsupported', 'wrong'
+     */
+    public function testLaunchWithUnsupportedCacheTypes()
     {
-        $types = [
-            ['id' => 'foo', 'status' => true],
-            ['id' => 'bar', 'status' => false],
+        $requestArgs = [
+            ManagerApp::KEY_SET => true,
+            ManagerApp::KEY_TYPES => 'foo,unsupported,wrong,bar',
         ];
-        $this->cacheTypeList->expects($this->once())->method('getTypes')->willReturn($types);
-        $model = $this->createModel([]);
-        $this->assertSame(['foo' => true, 'bar' => false], $model->getStatusSummary());
+        $cacheManager = $this->getMock('Magento\Framework\App\Cache\Manager', [], [], '', false);
+        $cacheManager->expects($this->any())
+            ->method('getAvailableTypes')
+            ->will($this->returnValue(['foo', 'bar', 'baz']));
+        $cacheManager->expects($this->never())
+            ->method('setEnabled');
+
+        $model = new ManagerApp($cacheManager, $this->response, $requestArgs);
+        $model->launch();
     }
 
     public function testCatchException()
     {
-        $model = $this->createModel([]);
+        $exceptionMessage = 'Exception message';
+        $model = new ManagerApp($this->cacheManager, $this->response, []);
+        $this->response->expects($this->once())
+            ->method('setBody')
+            ->with($exceptionMessage);
         $this->assertFalse($model->catchException(
             $this->getMock('Magento\Framework\App\Bootstrap', [], [], '', false),
-            new \Exception
+            new \Exception($exceptionMessage)
         ));
     }
-
-    /**
-     * Creates the model with mocked dependencies
-     *
-     * @param array $request
-     * @return ManagerApp
-     */
-    private function createModel($request)
-    {
-        return new ManagerApp($this->cacheTypeList, $this->cacheState, $this->response, $this->frontendPool, $request);
-    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php
new file mode 100644
index 0000000000000..78661a2a3d59a
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+namespace Magento\Framework\App\Cache;
+
+class ManagerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Cache\TypeListInterface
+     */
+    private $cacheTypeList;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Cache\StateInterface
+     */
+    private $cacheState;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Console\Response
+     */
+    private $response;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Cache\Type\FrontendPool
+     */
+    private $frontendPool;
+
+    /**
+     * @var Manager
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->cacheTypeList = $this->getMockForAbstractClass('Magento\Framework\App\Cache\TypeListInterface');
+        $this->cacheState = $this->getMockForAbstractClass('Magento\Framework\App\Cache\StateInterface');
+        $this->response = $this->getMock('Magento\Framework\App\Console\Response', [], [], '', false);
+        $this->frontendPool = $this->getMock('Magento\Framework\App\Cache\Type\FrontendPool', [], [], '', false);
+        $this->model = new Manager($this->cacheTypeList, $this->cacheState, $this->frontendPool);
+    }
+
+    public function testEmptyRequest()
+    {
+        $this->cacheState->expects($this->never())->method('setEnabled');
+        $this->cacheState->expects($this->never())->method('persist');
+        $this->frontendPool->expects($this->never())->method('get');
+        $this->model->setEnabled([], true);
+    }
+
+    /**
+     * Test setting all cache types to true
+     *
+     * In this fixture, there are 2 of 3 cache types disabled, but will be enabled
+     * so persist() should be invoked once, then clean() for each of those which changed
+     */
+    public function testSetEnabledTrueAll()
+    {
+        $caches = ['foo', 'bar', 'baz'];
+        $cacheStatusMap = [['foo', true], ['bar', false], ['baz', false]];
+        $this->cacheState->expects($this->exactly(3))
+            ->method('isEnabled')
+            ->will($this->returnValueMap($cacheStatusMap));
+        $this->cacheState->expects($this->exactly(2))
+            ->method('setEnabled')
+            ->will($this->returnValueMap([['bar', true], ['baz', true]]));
+        $this->cacheState->expects($this->once())->method('persist');
+        $this->model->setEnabled($caches, true);
+    }
+
+    /**
+     * Test setting all cache types to true
+     *
+     * Fixture is the same as in previous test, but here the intent to disable all of them.
+     * Since only one of them is enabled, the setter should be invoked only once.
+     * Also the operation of deactivating cache does not need cleanup (it is relevant when you enable it).
+     */
+    public function testSetEnabledFalseAll()
+    {
+        $caches = ['foo', 'bar', 'baz'];
+        $cacheStatusMap = [['foo', true], ['bar', false], ['baz', false]];
+        $this->cacheState->expects($this->exactly(3))
+            ->method('isEnabled')
+            ->will($this->returnValueMap($cacheStatusMap));
+        $this->cacheState->expects($this->once())->method('setEnabled')->with('foo', false);
+        $this->cacheState->expects($this->once())->method('persist');
+        $this->frontendPool->expects($this->never())->method('get');
+        $this->model->setEnabled($caches, false);
+    }
+
+    /**
+     * Test flushing all cache types
+     *
+     * Emulates situation when some cache frontends reuse the same backend
+     * Asserts that the flush is invoked only once per affected storage
+     */
+    public function testFlushAll()
+    {
+        $cacheTypes = ['foo', 'bar', 'baz'];
+        $frontendFoo = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
+        $frontendBar = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
+        $frontendBaz = $this->getMockForAbstractClass('Magento\Framework\Cache\FrontendInterface');
+        $this->frontendPool->expects($this->exactly(3))->method('get')->will($this->returnValueMap([
+            ['foo', $frontendFoo],
+            ['bar', $frontendBar],
+            ['baz', $frontendBaz],
+        ]));
+        $backendOne = $this->getMockForAbstractClass('Zend_Cache_Backend_Interface');
+        $backendTwo = $this->getMockForAbstractClass('Zend_Cache_Backend_Interface');
+        $frontendFoo->expects($this->once())->method('getBackend')->willReturn($backendOne);
+        $frontendBar->expects($this->once())->method('getBackend')->willReturn($backendOne);
+        $frontendBaz->expects($this->once())->method('getBackend')->willReturn($backendTwo);
+        $backendOne->expects($this->once())->method('clean');
+        $backendTwo->expects($this->once())->method('clean');
+        $this->model->flush($cacheTypes);
+    }
+
+    public function testGetStatus()
+    {
+        $types = [
+            ['id' => 'foo', 'status' => true],
+            ['id' => 'bar', 'status' => false],
+        ];
+        $this->cacheTypeList->expects($this->once())->method('getTypes')->willReturn($types);
+        $this->assertSame(['foo' => true, 'bar' => false], $this->model->getStatus());
+    }
+
+    public function testGetAvailableTypes()
+    {
+        $types = [
+            ['id' => 'foo', 'status' => true],
+            ['id' => 'bar', 'status' => false],
+        ];
+        $this->cacheTypeList->expects($this->once())->method('getTypes')->willReturn($types);
+        $this->assertSame(['foo', 'bar'], $this->model->getAvailableTypes());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Console/ResponseTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Console/ResponseTest.php
index 6e68ecfa56bdb..54896e1f49d97 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Console/ResponseTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Console/ResponseTest.php
@@ -18,11 +18,11 @@ class ResponseTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->model = new \Magento\Framework\App\Console\Response();
+        $this->model->terminateOnSend(false);
     }
 
     public function testSendResponseDefaultBehaviour()
     {
-        $this->model->terminateOnSend(false);
         $this->assertEquals(0, $this->model->sendResponse());
     }
 
@@ -31,7 +31,6 @@ public function testSendResponseDefaultBehaviour()
      */
     public function testSetCode($code, $expectedCode)
     {
-        $this->model->terminateOnSend(false);
         $this->model->setCode($code);
         $result = $this->model->sendResponse();
         $this->assertEquals($expectedCode, $result);
@@ -44,4 +43,18 @@ public static function setCodeProvider()
         $lowestCode = -255;
         return array(array($largeCode, 255), array($lowCode, $lowCode), array($lowestCode, $lowestCode));
     }
+
+    public function testSetBody()
+    {
+        $output = 'output';
+        $this->expectOutputString($output);
+        $this->model->setBody($output);
+        $this->model->sendResponse();
+    }
+
+    public function testSetBodyNoOutput()
+    {
+        $this->expectOutputString('');
+        $this->model->sendResponse();
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/Cache/Manager.php b/lib/internal/Magento/Framework/App/Cache/Manager.php
new file mode 100644
index 0000000000000..adf24efdd2c29
--- /dev/null
+++ b/lib/internal/Magento/Framework/App/Cache/Manager.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+namespace Magento\Framework\App\Cache;
+
+use Magento\Framework\App;
+
+/**
+ * Cache status manager
+ */
+class Manager
+{
+    /**
+     * Cache types list
+     *
+     * @var TypeListInterface
+     */
+    private $cacheTypeList;
+
+    /**
+     * Cache state service
+     *
+     * @var StateInterface
+     */
+    private $cacheState;
+
+    /**
+     * Cache types pool
+     *
+     * @var Type\FrontendPool
+     */
+    private $pool;
+
+    /**
+     * Constructor
+     *
+     * @param TypeListInterface $cacheTypeList
+     * @param StateInterface $cacheState
+     * @param Type\FrontendPool $pool
+     */
+    public function __construct(
+        TypeListInterface $cacheTypeList,
+        StateInterface $cacheState,
+        Type\FrontendPool $pool
+    ) {
+        $this->cacheTypeList = $cacheTypeList;
+        $this->cacheState = $cacheState;
+        $this->pool = $pool;
+    }
+
+    /**
+     * Updates cache status for the requested types
+     *
+     * @param string[] $types
+     * @param bool $isEnabled
+     * @return array
+     */
+    public function setEnabled(array $types, $isEnabled)
+    {
+        $enabledTypes = [];
+        $isUpdated = false;
+        foreach ($types as $type) {
+            if ($this->cacheState->isEnabled($type) === $isEnabled) { // no need to poke it, if is not going to change
+                continue;
+            }
+            $this->cacheState->setEnabled($type, $isEnabled);
+            $isUpdated = true;
+            if ($isEnabled) {
+                $enabledTypes[] = $type;
+            }
+        }
+        if ($isUpdated) {
+            $this->cacheState->persist();
+        }
+        return $enabledTypes;
+    }
+
+    /**
+     * Cleans up caches
+     *
+     * @param array $types
+     * @return void
+     */
+    public function clean(array $types)
+    {
+        foreach ($types as $type) {
+            $frontend = $this->pool->get($type);
+            $frontend->clean();
+        }
+    }
+
+    /**
+     * Flushes specified cache storages
+     *
+     * @param string[] $types
+     */
+    public function flush(array $types)
+    {
+        $flushedBackend = [];
+        foreach ($types as $type) {
+            $backend = $this->pool->get($type)->getBackend();
+            if (in_array($backend, $flushedBackend, true)) { // it was already flushed from another frontend
+                continue;
+            }
+            $backend->clean();
+            $flushedBackend[] = $backend;
+        }
+    }
+
+    /**
+     * Presents summary about cache status
+     *
+     * @return array
+     */
+    public function getStatus()
+    {
+        $result = [];
+        foreach ($this->cacheTypeList->getTypes() as $type) {
+            $result[$type['id']] = $type['status'];
+        }
+        return $result;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAvailableTypes()
+    {
+        $result = [];
+        foreach ($this->cacheTypeList->getTypes() as $type) {
+            $result[] = $type['id'];
+        }
+        return $result;
+    }
+}
diff --git a/lib/internal/Magento/Framework/App/Cache/ManagerApp.php b/lib/internal/Magento/Framework/App/Cache/ManagerApp.php
index c0de8c9815fc1..9d79b28a3b1f2 100644
--- a/lib/internal/Magento/Framework/App/Cache/ManagerApp.php
+++ b/lib/internal/Magento/Framework/App/Cache/ManagerApp.php
@@ -26,20 +26,6 @@ class ManagerApp implements AppInterface
     const KEY_FLUSH = 'flush';
     /**#@- */
 
-    /**
-     * Cache types list
-     *
-     * @var TypeListInterface
-     */
-    private $cacheTypeList;
-
-    /**
-     * Cache state service
-     *
-     * @var StateInterface
-     */
-    private $cacheState;
-
     /**
      * Console response
      *
@@ -47,41 +33,32 @@ class ManagerApp implements AppInterface
      */
     private $response;
 
-    /**
-     * Cache types pool
-     *
-     * @var Type\FrontendPool
-     */
-    private $pool;
-
     /**
      * Requested changes
      *
      * @var array
      */
-    private $request;
+    private $requestArgs;
+    /**
+     * @var Manager
+     */
+    private $cacheManager;
 
     /**
      * Constructor
      *
-     * @param TypeListInterface $cacheTypeList
-     * @param StateInterface $cacheState
+     * @param Manager $cacheManager
      * @param Response $response
-     * @param Type\FrontendPool $pool
-     * @param array $request
+     * @param array $requestArgs
      */
     public function __construct(
-        TypeListInterface $cacheTypeList,
-        StateInterface $cacheState,
+        Manager $cacheManager,
         Response $response,
-        Type\FrontendPool $pool,
-        array $request
+        array $requestArgs
     ) {
-        $this->cacheTypeList = $cacheTypeList;
-        $this->cacheState = $cacheState;
+        $this->cacheManager = $cacheManager;
         $this->response = $response;
-        $this->pool = $pool;
-        $this->request = $request;
+        $this->requestArgs = $requestArgs;
     }
 
     /**
@@ -90,125 +67,56 @@ public function __construct(
      */
     public function launch()
     {
-        $this->response->terminateOnSend(false);
         $types = $this->getRequestedTypes();
-        $queue = $this->updateStatus($types);
-        $this->clean($queue, $types);
-        return $this->response;
-    }
 
-    /**
-     * Maps requested type from request into the current registry of types
-     *
-     * @return string[]
-     */
-    private function getRequestedTypes()
-    {
-        $requested = isset($this->request[self::KEY_TYPES]) ? explode(',', $this->request[self::KEY_TYPES]) : [];
-        $result = [];
-        foreach (array_keys($this->cacheTypeList->getTypes()) as $type) {
-            if (empty($requested) || in_array($type, $requested)) {
-                $result[] = $type;
-            }
+        $enabledTypes = [];
+        if (isset($this->requestArgs[self::KEY_SET])) {
+            $isEnabled = (bool)(int)$this->requestArgs[self::KEY_SET];
+            $enabledTypes = $this->cacheManager->setEnabled($types, $isEnabled);
         }
-        return $result;
-    }
-
-    /**
-     * Updates cache status for the requested types
-     *
-     * @param string[] $types
-     * @return string[] Queue of affected cache types that need cleanup
-     */
-    private function updateStatus($types)
-    {
-        if (!isset($this->request[self::KEY_SET])) {
-            return [];
-        }
-        $isEnabled = (bool)(int)$this->request[self::KEY_SET];
-        $isUpdated = false;
-        $cleanQueue = [];
-        foreach ($types as $type) {
-            if ($this->cacheState->isEnabled($type) === $isEnabled) { // no need to poke it, if is not going to change
-                continue;
-            }
-            $this->cacheState->setEnabled($type, $isEnabled);
-            $isUpdated = true;
-            if ($isEnabled) {
-                $cleanQueue[] = $type;
-            }
-        }
-        if ($isUpdated) {
-            $this->cacheState->persist();
-        }
-        return $cleanQueue;
-    }
-
-    /**
-     * Cleans up or flushes caches (depending on what was requested)
-     *
-     * Types listed at the "required" argument are mandatory to clean.
-     * But try flush first, as it is more efficient. So if something was requested or required and flushed, then there
-     * is no need to clean it anymore.
-     *
-     * @param string[] $required
-     * @param string[] $requested
-     * @return void
-     */
-    private function clean($required, $requested)
-    {
-        $flushed = $this->flush($requested);
-        if (isset($this->request[self::KEY_CLEAN])) {
-            $types = array_merge($requested, $required);
+        if (isset($this->requestArgs[self::KEY_FLUSH])) {
+            $this->cacheManager->flush($types);
         } else {
-            $types = $required;
-        }
-        foreach ($types as $type) {
-            $frontend = $this->pool->get($type);
-            if (in_array($type, $flushed)) { // it was already flushed
-                continue;
+            // If flush is requested, both enabled and requested cache types have already been cleaned by flush
+            if (isset($this->requestArgs[self::KEY_CLEAN])) {
+                $this->cacheManager->clean($types);
+            } elseif (!empty($enabledTypes)) {
+                $this->cacheManager->clean($enabledTypes);
             }
-            $frontend->clean();
         }
+        $output = "\nCurrent status:\n";
+        foreach ($this->cacheManager->getStatus() as $cache => $status) {
+            $output .= "$cache => " . ($status ? 'enabled' : 'disabled') . "\n";
+        }
+        $this->response->setBody($output);
+        return $this->response;
     }
 
     /**
-     * Flushes specified cache storages
-     *
-     * Returns array of types which were flushed
+     * Maps requested type from request into the current registry of types
      *
-     * @param string[] $types
      * @return string[]
      */
-    private function flush($types)
+    private function getRequestedTypes()
     {
-        $result = [];
-        if (isset($this->request[self::KEY_FLUSH])) {
-            foreach ($types as $type) {
-                $frontend = $this->pool->get($type);
-                $backend = $frontend->getBackend();
-                if (in_array($backend, $result, true)) { // it was already flushed from another frontend
-                    continue;
-                }
-                $backend->clean();
-                $result[$type] = $backend;
-            }
+        $requestedTypes = [];
+        if (isset($this->requestArgs[self::KEY_TYPES])) {
+            $requestedTypes = explode(',', $this->requestArgs[self::KEY_TYPES]);
+            $requestedTypes = array_filter(array_map('trim', $requestedTypes), 'strlen');
         }
-        return array_keys($result);
-    }
-
-    /**
-     * Presents summary about cache status
-     *
-     * @return array
-     */
-    public function getStatusSummary()
-    {
-        $result = [];
-        foreach ($this->cacheTypeList->getTypes() as $type) {
-            $result[$type['id']] = $type['status'];
+        $availableTypes = $this->cacheManager->getAvailableTypes();
+        if (empty($requestedTypes)) {
+            return $availableTypes;
+        } else {
+            $unsupportedTypes = array_diff($requestedTypes, $availableTypes);
+            if ($unsupportedTypes) {
+                throw new \InvalidArgumentException(
+                    "Following requested cache types are not supported: '" . join("', '", $unsupportedTypes) . "'.\n"
+                    . "Supported types: " . join(", ", $availableTypes) . ""
+                );
+            }
+            return array_values(array_intersect($availableTypes, $requestedTypes));
         }
-        return $result;
     }
 
     /**
@@ -216,6 +124,9 @@ public function getStatusSummary()
      */
     public function catchException(App\Bootstrap $bootstrap, \Exception $exception)
     {
+        $this->response->setBody($exception->getMessage());
+        $this->response->terminateOnSend(false);
+        $this->response->sendResponse();
         return false;
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Console/Response.php b/lib/internal/Magento/Framework/App/Console/Response.php
index 76b15fe1e0fdf..78321118d5e44 100644
--- a/lib/internal/Magento/Framework/App/Console/Response.php
+++ b/lib/internal/Magento/Framework/App/Console/Response.php
@@ -23,6 +23,11 @@ class Response implements \Magento\Framework\App\ResponseInterface
      */
     protected $code = 0;
 
+    /**
+     * @var string
+     */
+    private $body;
+
     /**
      * Set whether to terminate process on send or not
      *
@@ -36,12 +41,31 @@ class Response implements \Magento\Framework\App\ResponseInterface
      */
     public function sendResponse()
     {
+        if (!empty($this->body)) {
+            echo $this->body;
+        }
         if ($this->terminateOnSend) {
             exit($this->code);
         }
         return $this->code;
     }
 
+    /**
+     * @return string
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * @param string $body
+     */
+    public function setBody($body)
+    {
+        $this->body = $body;
+    }
+
     /**
      * @param int $code
      * @return void
diff --git a/setup/index.php b/setup/index.php
index 28094f85094d8..48333866d4f6a 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -6,5 +6,5 @@
  * @license   {license_link}
  */
 
-require __DIR__ . '/../app/autoload.php';
+require __DIR__ . '/../app/bootstrap.php';
 \Zend\Mvc\Application::init(require __DIR__ . '/config/application.config.php')->run();
diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index 638a2b4a4e4f3..6b5e27daab75a 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -277,6 +277,19 @@ public function setEventManager(EventManagerInterface $events)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function onDispatch(\Zend\Mvc\MvcEvent $e)
+    {
+        try {
+            return parent::onDispatch($e);
+        } catch (\Magento\Setup\Exception $exception) {
+            $this->log->log($exception->getMessage());
+            return $this->getResponse();
+        }
+    }
+
     /**
      * Controller for Install Command
      *
diff --git a/setup/module/Magento/Setup/src/Exception.php b/setup/module/Magento/Setup/src/Exception.php
new file mode 100644
index 0000000000000..16d19ffd91cce
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Exception.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Setup;
+
+class Exception extends \Exception {
+
+}
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 50ad1ce6db1a2..5490f1cd50a61 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -18,7 +18,6 @@
 use Magento\Setup\Module\ConnectionFactory;
 use Magento\Framework\Shell;
 use Magento\Framework\Shell\CommandRenderer;
-use Symfony\Component\Process\PhpExecutableFinder;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\MaintenanceMode;
 use Magento\Framework\Filesystem;
@@ -184,11 +183,22 @@ class Installer
      */
     private $execParams;
 
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * Constructor
      *
      * @param FilePermissions $filePermissions
      * @param Writer $deploymentConfigWriter
+     * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
      * @param SetupFactory $setupFactory
      * @param ModuleListInterface $moduleList
      * @param ModuleLoader $moduleLoader
@@ -204,6 +214,7 @@ class Installer
     public function __construct(
         FilePermissions $filePermissions,
         Writer $deploymentConfigWriter,
+        \Magento\Framework\App\DeploymentConfig $deploymentConfig,
         SetupFactory $setupFactory,
         ModuleListInterface $moduleList,
         ModuleLoader $moduleLoader,
@@ -230,8 +241,9 @@ public function __construct(
         $this->shell = new Shell($this->shellRenderer);
         $this->maintenanceMode = $maintenanceMode;
         $this->filesystem = $filesystem;
-        $this->execParams = urldecode(http_build_query($serviceManager->get(InitParamListener::BOOTSTRAP_PARAM)));
+        $this->execParams = $serviceManager->get(InitParamListener::BOOTSTRAP_PARAM);
         $this->installInfo[self::INFO_MESSAGE] = array();
+        $this->deploymentConfig = $deploymentConfig;
     }
 
     /**
@@ -501,6 +513,7 @@ public function installDeploymentConfig($data)
      */
     public function installSchema()
     {
+        $this->assertDeploymentConfigExists();
         $moduleNames = $this->moduleList->getNames();
 
         $this->log->log('Schema creation/updates:');
@@ -527,8 +540,9 @@ public function installSchema()
      */
     public function installDataFixtures()
     {
-        $params = [$this->directoryList->getRoot() . '/dev/shell/run_data_fixtures.php', $this->execParams];
-        $this->exec('-f %s -- --bootstrap=%s', $params);
+        /** @var \Magento\Framework\Module\Updater $updater */
+        $updater = $this->getObjectManager()->create('Magento\Framework\Module\Updater');
+        $updater->updateData();
     }
 
     /**
@@ -544,9 +558,14 @@ public function installUserConfig($data)
         if (count($configData) === 0) {
             return;
         }
-        $data = urldecode(http_build_query($configData));
-        $params = [$this->directoryList->getRoot() . '/dev/shell/user_config_data.php', $data, $this->execParams];
-        $this->exec('-f %s -- --data=%s --bootstrap=%s', $params);
+
+        /** @var \Magento\Backend\Model\Config\Factory $configFactory */
+        $configFactory = $this->getObjectManager()->create('Magento\Backend\Model\Config\Factory');
+        foreach ($configData as $key => $val) {
+            $configModel = $configFactory->create();
+            $configModel->setDataByPath($key, $val);
+            $configModel->save();
+        }
     }
 
     /**
@@ -599,6 +618,7 @@ private function installOrderIncrementPrefix($orderIncrementPrefix)
      */
     public function installAdminUser($data)
     {
+        $this->assertDeploymentConfigExists();
         $setup = $this->setupFactory->createSetup($this->log);
         $adminAccount = $this->adminAccountFactory->create($setup, (array)$data);
         $adminAccount->save();
@@ -629,8 +649,14 @@ public function uninstall()
      */
     private function enableCaches()
     {
-        $args = [$this->directoryList->getRoot() . '/dev/shell/cache.php', $this->execParams];
-        $this->exec('-f %s -- --set=1 --bootstrap=%s', $args);
+        /** @var \Magento\Framework\App\Cache\Manager $cacheManager */
+        $cacheManager = $this->getObjectManager()->create('Magento\Framework\App\Cache\Manager');
+        $types = $cacheManager->getAvailableTypes();
+        $enabledTypes = $cacheManager->setEnabled($types, true);
+        $cacheManager->clean($enabledTypes);
+
+        $this->log->log('Current status:');
+        $this->log->log(print_r($cacheManager->getStatus(), true));
     }
 
     /**
@@ -644,31 +670,6 @@ private function setMaintenanceMode($value)
         $this->maintenanceMode->set($value);
     }
 
-    /**
-     * Executes a command in CLI
-     *
-     * @param string $command
-     * @param array $args
-     * @return void
-     * @throws \Exception
-     */
-    private function exec($command, $args)
-    {
-        $phpFinder = new PhpExecutableFinder();
-        $phpPath = $phpFinder->find();
-        if (!$phpPath) {
-            throw new \Exception(
-                'Cannot find PHP executable path.'
-                . ' Please set $PATH environment variable to include the full path of the PHP executable'
-            );
-        }
-        $command = $phpPath . ' ' . $command;
-        $actualCommand = $this->shellRenderer->render($command, $args);
-        $this->log->log($actualCommand);
-        $output = $this->shell->execute($command, $args);
-        $this->log->log($output);
-    }
-
     /**
      * Checks Database Connection
      *
@@ -787,4 +788,31 @@ private function deleteDeploymentConfig()
             $this->log->log($e->getMessage());
         }
     }
+
+    /**
+     * Get object manager for Magento application
+     *
+     * @return \Magento\Framework\ObjectManagerInterface
+     */
+    private function getObjectManager()
+    {
+        if (null === $this->objectManager) {
+            $this->assertDeploymentConfigExists();
+            $factory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $this->execParams);
+            $this->objectManager = $factory->create($this->execParams);
+        }
+        return $this->objectManager;
+    }
+
+    /**
+     * Validates that deployment configuration exists
+     *
+     * @throws \Magento\Setup\Exception
+     */
+    private function assertDeploymentConfigExists()
+    {
+        if (!$this->deploymentConfig->isAvailable()) {
+            throw new \Magento\Setup\Exception("Can't run this operation: deployment configuration is absent.");
+        }
+    }
 }
diff --git a/setup/module/Magento/Setup/src/Model/InstallerFactory.php b/setup/module/Magento/Setup/src/Model/InstallerFactory.php
index d8760e2113182..242882d5b9300 100644
--- a/setup/module/Magento/Setup/src/Model/InstallerFactory.php
+++ b/setup/module/Magento/Setup/src/Model/InstallerFactory.php
@@ -40,6 +40,7 @@ public function create(LoggerInterface $log)
         return new Installer(
             $this->serviceLocator->get('Magento\Setup\Model\FilePermissions'),
             $this->serviceLocator->get('Magento\Framework\App\DeploymentConfig\Writer'),
+            $this->serviceLocator->get('Magento\Framework\App\DeploymentConfig'),
             $this->serviceLocator->get('Magento\Setup\Module\SetupFactory'),
             $this->serviceLocator->get('Magento\Framework\Module\ModuleList'),
             $this->serviceLocator->get('Magento\Framework\Module\ModuleList\Loader'),

From 1e56e9463f1e06293b8c84d01f7c1c9c65939bfb Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 3 Dec 2014 11:24:55 -0600
Subject: [PATCH 089/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Changes based on CR feedback.
---
 .../view/magento/setup/add-database.phtml     | 14 +++---
 setup/pub/magento/setup/add-database.js       | 47 ++++++++++---------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
index 17046f46e6ed6..73e52a2cb86b2 100644
--- a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
@@ -159,17 +159,15 @@
         </div>
     </div>
 
-    <div class="form-group" ng-show="database.submitted" >
+    <div class="form-group">
         <div class="col-sm-4">
             <input type="hidden"
-                   name="dbConnection"
-                   ng-model="db.connection"
-                   ng-required="!testConnection.result.success" />
+                   ng-model="testConn"
+                   ng-show="testConnection.result !== undefined && !testConnection.result.success"
+                   ng-bind="testConn"
+                   required />
         </div>
-        <div  class="col-sm-4">
-            <div ng-show="testConnection.result === undefined" class="animate-show text-success">
-                <span class="glyphicon text-success">&nbsp;Testing database connection......</span>
-            </div>
+        <div  class="col-sm-4" ng-show="database.submitted">
             <div ng-show="testConnection.result.success === false && testConnection.result !== undefined" class="error-container animate-show text-danger">
                 <span class="glyphicon glyphicon-remove-sign">&nbsp;{{testConnection.result.error}}</span>
             </div>
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index cccb331454042..3cc907844191f 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -7,12 +7,28 @@
 
 'use strict';
 angular.module('add-database', ['ngStorage'])
-    .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', '$timeout', 'Storage', function ($scope, $state, $localStorage, $http, $timeout, Storage) {
+    .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', '$timeout', 'Storage', '$interval', function ($scope, $state, $localStorage, $http, $timeout, Storage, $interval) {
         $scope.db = {
             useExistingDb: 1,
             useAccess: 1
         };
 
+        $scope.testConn = '';
+
+        var intervalPromise = $interval(function () {
+            $http.post('data/database', $scope.db)
+                .success(function (data) {
+                    $scope.testConnection.result = data;
+                    if (($scope.testConnection.result !== undefined) && (!$scope.testConnection.result.success)) {
+                        $scope.testConn = '';
+                    } else {
+                        $scope.testConn = 'mock';
+                    }
+                });
+        }, 500);
+
+        $scope.$on('$destroy', function () { $interval.cancel(intervalPromise); });
+
         if ($localStorage.db) {
             $scope.db = $localStorage.db;
         }
@@ -27,8 +43,14 @@ angular.module('add-database', ['ngStorage'])
         $scope.$on('nextState', function () {
             $localStorage.db = $scope.db;
             Storage.db = $scope.db;
+            $interval.cancel(intervalPromise);
+        });
+
+        $scope.$on('previousState()', function () {
+            $interval.cancel(intervalPromise);
         });
 
+
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();
@@ -36,7 +58,6 @@ angular.module('add-database', ['ngStorage'])
 
         // Dispatch 'validation-response' event to parent controller
         $scope.validate = function() {
-            $scope.testConnection();
             if ($scope.database.$valid) {
                 $scope.$emit('validation-response', true);
             } else {
@@ -51,24 +72,4 @@ angular.module('add-database', ['ngStorage'])
                 $scope.database.submitted = false;
             }
         });
-    }])
-    .directive('testHostname', function() {
-        return{
-            require: "ngModel",
-            link: function(scope, elm, attrs, ctrl){
-                var validator = function(value){
-                    scope.testConnection();
-                    var isValid;
-                    if (scope.testConnection.result.success === undefined) {
-                        isValid = false;
-                    } else {
-                        isValid = true;
-                    }
-                    ctrl.$setValidity('testHostname', isValid);
-                    return value;
-                };
-                ctrl.$parsers.unshift(validator);
-                ctrl.$formatters.unshift(validator);
-            }
-        };
-    });
+    }]);

From 81101aa87924367aad1a24a7764481d2436185a2 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 3 Dec 2014 11:50:49 -0600
Subject: [PATCH 090/474] MAGETWO-31004: Validation of CLI

- made changes according to CR feedback
---
 .../src/Controller/ConsoleController.php      |  30 +-----
 .../Controller/Install/StartController.php    |  12 +--
 .../Magento/Setup/src/Model/AdminAccount.php  |  32 ------
 .../src/Model/DeploymentConfigMapper.php      |  30 ------
 .../Magento/Setup/src/Model/Installer.php     |  16 ---
 .../src/Model/UserConfigurationDataMapper.php | 101 ------------------
 .../Setup/src/Mvc/Console/RouteListener.php   |   3 +-
 .../src/Mvc/Console/VerboseValidator.php      |   9 +-
 8 files changed, 17 insertions(+), 216 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index ad2ee18da4335..327f67e7020b1 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -288,12 +288,7 @@ public function installAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $validationMessages = Installer::validateInstall($request->getParams()->toArray());
-        if ('' === $validationMessages) {
-            $this->installer->install($request->getParams());
-        } else {
-            $this->log->log(PHP_EOL . $validationMessages);
-        }
+        $this->installer->install($request->getParams());
     }
 
     /**
@@ -306,13 +301,8 @@ public function installDeploymentConfigAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $validationMessages = DeploymentConfigMapper::validateDeploymentConfig($request->getParams()->toArray());
-        if ('' === $validationMessages) {
-            $this->installer->checkInstallationFilePermissions();
-            $this->installer->installDeploymentConfig($request->getParams());
-        } else {
-            $this->log->log(PHP_EOL . $validationMessages);
-        }
+        $this->installer->checkInstallationFilePermissions();
+        $this->installer->installDeploymentConfig($request->getParams());
     }
 
     /**
@@ -360,12 +350,7 @@ public function installUserConfigAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $validationMessages = UserConfigurationDataMapper::validateUserConfig($request->getParams()->toArray());
-        if ('' === $validationMessages) {
-            $this->installer->installUserConfig($request->getParams());
-        } else {
-            $this->log->log(PHP_EOL . $validationMessages);
-        }
+        $this->installer->installUserConfig($request->getParams());
     }
 
     /**
@@ -377,12 +362,7 @@ public function installAdminUserAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $validationMessages = AdminAccount::validateAdmin($request->getParams()->toArray());
-        if ('' === $validationMessages) {
-            $this->installer->installAdminUser($request->getParams());
-        } else {
-            $this->log->log(PHP_EOL . $validationMessages);
-        }
+        $this->installer->installAdminUser($request->getParams());
     }
 
     /**
diff --git a/setup/module/Magento/Setup/src/Controller/Install/StartController.php b/setup/module/Magento/Setup/src/Controller/Install/StartController.php
index f4ea22ae213f3..47e2f3e182100 100644
--- a/setup/module/Magento/Setup/src/Controller/Install/StartController.php
+++ b/setup/module/Magento/Setup/src/Controller/Install/StartController.php
@@ -101,14 +101,14 @@ private function importDeploymentConfigForm()
         $result[DeploymentConfigMapper::KEY_DB_HOST] = isset($source['db']['host']) ? $source['db']['host'] : '';
         $result[DeploymentConfigMapper::KEY_DB_NAME] = isset($source['db']['name']) ? $source['db']['name'] : '';
         $result[DeploymentConfigMapper::KEY_DB_USER] = isset($source['db']['user']) ? $source['db']['user'] :'';
-        $result[DeploymentConfigMapper::KEY_DB_PASS] = isset($source['db']['password']) ? $source['db']['password'] : '';
-        $result[DeploymentConfigMapper::KEY_DB_PREFIX] = isset($source['db']['tablePrefix']) ? $source['db']['tablePrefix'] : '';
+        $result[DeploymentConfigMapper::KEY_DB_PASS] =
+            isset($source['db']['password']) ? $source['db']['password'] : '';
+        $result[DeploymentConfigMapper::KEY_DB_PREFIX] =
+            isset($source['db']['tablePrefix']) ? $source['db']['tablePrefix'] : '';
         $result[DeploymentConfigMapper::KEY_BACKEND_FRONTNAME] = isset($source['config']['address']['admin'])
-            ? $source['config']['address']['admin']
-            : '';
+            ? $source['config']['address']['admin'] : '';
         $result[DeploymentConfigMapper::KEY_ENCRYPTION_KEY] = isset($source['config']['encrypt']['key'])
-            ? $source['config']['encrypt']['key']
-            : '';
+            ? $source['config']['encrypt']['key'] : '';
         return $result;
     }
 
diff --git a/setup/module/Magento/Setup/src/Model/AdminAccount.php b/setup/module/Magento/Setup/src/Model/AdminAccount.php
index b18487964ed73..08196411dfca1 100644
--- a/setup/module/Magento/Setup/src/Model/AdminAccount.php
+++ b/setup/module/Magento/Setup/src/Model/AdminAccount.php
@@ -85,38 +85,6 @@ public function save()
         $this->saveAdminUserRole($adminId);
     }
 
-    /**
-     * Validate parameter values of admin user setup tool
-     *
-     * @param array $data
-     * @return bool
-     */
-    public static function validateAdmin(array $data)
-    {
-        $validationMessages = '';
-        if (isset($data[self::KEY_EMAIL]) && !self::validateEmail($data[self::KEY_EMAIL])) {
-            $validationMessages .= self::KEY_EMAIL . ': Please enter a valid email address. ' .
-                "Current: {$data[self::KEY_EMAIL]}" . PHP_EOL;
-        }
-        if (isset($data[self::KEY_PASSWORD]) && strlen($data[self::KEY_PASSWORD]) < 7) {
-            $validationMessages .= self::KEY_PASSWORD . ': Password must be at least 7 characters long.' . PHP_EOL;
-        }
-
-        return $validationMessages;
-    }
-
-    /**
-     * Validate email
-     *
-     * @param $email
-     * @return bool
-     */
-    private static function validateEmail($email)
-    {
-        $validator = new \Zend\Validator\EmailAddress();
-        return $validator->isValid($email);
-    }
-
     /**
      * Uses the information in data[] to create the admin user.
      *
diff --git a/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php b/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
index 3131b24a1518b..5848e78d7815a 100644
--- a/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
+++ b/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
@@ -50,34 +50,4 @@ class DeploymentConfigMapper
         self::KEY_BACKEND_FRONTNAME => BackendConfig::KEY_FRONTNAME,
         self::KEY_ENCRYPTION_KEY => EncryptConfig::KEY_ENCRYPTION_KEY,
     ];
-
-    /**
-     * Validate parameter values of deployment configuration tool
-     *
-     * @param array $data
-     * @return string
-     */
-    public static function validateDeploymentConfig(array $data)
-    {
-        $validationMessages = '';
-        if (isset($data[self::KEY_BACKEND_FRONTNAME]) &&
-            !preg_match('/^[a-zA-Z0-9_]+$/', $data[self::KEY_BACKEND_FRONTNAME])
-        ) {
-            $validationMessages .= self::KEY_BACKEND_FRONTNAME .
-                ': Please use alphanumeric characters and underscore. ' .
-                "Current: {$data[self::KEY_BACKEND_FRONTNAME]}" . PHP_EOL;
-        }
-        if (isset($data[self::KEY_SESSION_SAVE]) && $data[self::KEY_SESSION_SAVE] !== 'files' &&
-            $data[self::KEY_SESSION_SAVE] !== 'db'
-        ) {
-            $validationMessages .= self::KEY_SESSION_SAVE .
-                ": Please use 'files' or 'db'. Current: {$data[self::KEY_SESSION_SAVE]}" . PHP_EOL;
-        }
-        if (isset($data[self::KEY_ENCRYPTION_KEY]) && !$data[self::KEY_ENCRYPTION_KEY]) {
-            $validationMessages .= self::KEY_ENCRYPTION_KEY .
-                ": Please enter a valid encryption key. Current: {$data[self::KEY_ENCRYPTION_KEY]}" . PHP_EOL;
-        }
-
-        return $validationMessages;
-    }
 }
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index dcc691b022c93..ff3315aa95613 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -713,22 +713,6 @@ public function getInstallInfo()
         return $this->installInfo;
     }
 
-
-    /**
-     * Validate install parameter values
-     *
-     * @param array $data
-     * @return string
-     */
-    public static function validateInstall(array $data)
-    {
-        $validationMessages = '';
-        $validationMessages .=  DeploymentConfigMapper::validateDeploymentConfig($data);
-        $validationMessages .= UserConfigurationDataMapper::validateUserConfig($data);
-        $validationMessages .= AdminAccount::validateAdmin($data);
-        return $validationMessages;
-    }
-
     /**
      * Deletes the database and creates it again
      *
diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index eb964bc10cdac..32eed61a9d52a 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -81,105 +81,4 @@ public function getConfigData($data)
 
         return $configData;
     }
-
-    /**
-     * Validate parameter values of user configuration tool
-     *
-     * @param array $data
-     * @return string
-     */
-    public static function validateUserConfig(array $data)
-    {
-        $validationMessages = '';
-        // check URL
-        if (isset($data[self::KEY_BASE_URL]) && !self::validateUrl($data[self::KEY_BASE_URL])) {
-            $validationMessages .= self::KEY_BASE_URL .
-                ": Please enter a valid base url. Current: {$data[self::KEY_BASE_URL]}" . PHP_EOL;
-        }
-        if (isset($data[self::KEY_BASE_URL_SECURE]) && !self::validateUrl($data[self::KEY_BASE_URL_SECURE], true)) {
-            $validationMessages .= self::KEY_BASE_URL_SECURE .
-                ": Please enter a valid secure base url. Current: {$data[self::KEY_BASE_URL_SECURE]}" . PHP_EOL;
-        }
-
-        // check 0/1 options
-        $flags = [];
-        if (isset($data[self::KEY_USE_SEF_URL])) {
-            $flags[self::KEY_USE_SEF_URL] = $data[self::KEY_USE_SEF_URL];
-        }
-        if (isset($data[self::KEY_IS_SECURE])) {
-            $flags[self::KEY_IS_SECURE] = $data[self::KEY_IS_SECURE];
-        }
-        if (isset($data[self::KEY_IS_SECURE_ADMIN])) {
-            $flags[self::KEY_IS_SECURE_ADMIN] = $data[self::KEY_IS_SECURE_ADMIN];
-        }
-        if (isset($data[self::KEY_ADMIN_USE_SECURITY_KEY])) {
-            $flags[self::KEY_ADMIN_USE_SECURITY_KEY] = $data[self::KEY_ADMIN_USE_SECURITY_KEY];
-        }
-
-        $validationMessages .= self::validateOneZeroFlags($flags);
-
-        // check language, currency and timezone
-        $options = new Lists(new \Zend_Locale());
-        if (isset($data[self::KEY_LANGUAGE])) {
-            if (!isset($options->getLocaleList()[$data[self::KEY_LANGUAGE]])) {
-                $validationMessages .= self::KEY_LANGUAGE . ': Please use a valid language. ' .
-                    "Current: {$data[self::KEY_LANGUAGE]}" . PHP_EOL;
-            }
-        }
-
-        if (isset($data[self::KEY_CURRENCY])) {
-            if (!isset($options->getCurrencyList()[$data[self::KEY_CURRENCY]])) {
-                $validationMessages .= self::KEY_CURRENCY . ': Please use a valid currency. ' .
-                    "Current: {$data[self::KEY_CURRENCY]}" . PHP_EOL;
-            }
-        }
-
-        if (isset($data[self::KEY_TIMEZONE])) {
-            if (!isset($options->getTimezoneList()[$data[self::KEY_TIMEZONE]])) {
-                $validationMessages .= self::KEY_TIMEZONE . ': Please use a valid timezone. ' .
-                    "Current: {$data[self::KEY_TIMEZONE]}" . PHP_EOL;
-            }
-        }
-
-        return $validationMessages;
-    }
-
-    /**
-     * Validate if all flags are of 0/1 option
-     *
-     * @param array $flags
-     * @return string
-     */
-    private static function validateOneZeroFlags(array $flags = [])
-    {
-        $validationMessages = '';
-        $wrongOptionMessage = 'Please enter a valid option (0/1). ';
-        foreach ($flags as $key => $flag) {
-            if ($flag !== '0' && $flag !== '1') {
-                $validationMessages .= "{$key}: {$wrongOptionMessage} Current: {$flag}" . PHP_EOL;
-            }
-        }
-        return $validationMessages;
-    }
-
-    /**
-     * Validate URL
-     *
-     * @param string $url
-     * @param bool $secure
-     * @return bool
-     */
-    private function validateUrl($url, $secure = false)
-    {
-        $validator = new \Zend\Validator\Uri();
-        if ($validator->isValid($url)) {
-            if ($secure) {
-                return strpos($url, 'https://') !== false;
-            }
-            else {
-                return strpos($url, 'http://') !== false;
-            }
-        }
-        return false;
-    }
 }
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php b/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
index cbbca6b6ce5ed..89897dd193d7d 100644
--- a/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
@@ -54,7 +54,8 @@ public function onRoute($e)
      * Display messages on console
      *
      * @param MvcEvent $e
-     * @param $validationMessages
+     * @param string $validationMessages
+     * @return void
      */
     private function displayMessages(MvcEvent $e, $validationMessages)
     {
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
index c84991f46f127..c0e0e29fda9dc 100644
--- a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
@@ -96,7 +96,6 @@ public function validate(array $data, array $config)
             $validationMessages .= PHP_EOL;
         }
 
-
         return $validationMessages;
     }
 
@@ -157,8 +156,8 @@ public function checkExtraParameter($expectedParams, $actualParams)
     /**
      * Checks for parameters that are missing values
      *
-     * @param $expectedParams
-     * @param $actualParams
+     * @param array $expectedParams
+     * @param array $actualParams
      * @return array
      */
     public function checkMissingValue($expectedParams, $actualParams)
@@ -177,8 +176,8 @@ public function checkMissingValue($expectedParams, $actualParams)
     /**
      * Checks for parameters that do not need values
      *
-     * @param $expectedParams
-     * @param $actualParams
+     * @param array $expectedParams
+     * @param array $actualParams
      * @return array
      */
     public function checkExtraValue($expectedParams, $actualParams)

From 570373f9ad42461bddc681f54a23aaa9d3e26166 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Wed, 3 Dec 2014 00:51:15 -0600
Subject: [PATCH 091/474] MAGETWO-29035: Installation fails if cli php is
 different than apache configured

- changed extensions readiness check to be based on root composer.lock
---
 .../Data/PhpExtensionsController.php          |  5 +-
 .../Magento/Setup/src/Model/PhpExtensions.php | 94 ++++++++-----------
 .../setup/readiness-check/progress.phtml      | 10 +-
 3 files changed, 45 insertions(+), 64 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/Data/PhpExtensionsController.php b/setup/module/Magento/Setup/src/Controller/Data/PhpExtensionsController.php
index 62d592d98946f..00d3b47d93d76 100644
--- a/setup/module/Magento/Setup/src/Controller/Data/PhpExtensionsController.php
+++ b/setup/module/Magento/Setup/src/Controller/Data/PhpExtensionsController.php
@@ -44,7 +44,8 @@ public function indexAction()
         $current = $this->extensions->getCurrent();
 
         $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
-        if (array_diff($required, $current)) {
+        $missing = array_values(array_diff($required, $current));
+        if ($missing) {
             $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
         }
 
@@ -52,7 +53,7 @@ public function indexAction()
             'responseType' => $responseType,
             'data' => [
                 'required' => $required,
-                'current' => $current,
+                'missing' => $missing,
             ],
         ];
 
diff --git a/setup/module/Magento/Setup/src/Model/PhpExtensions.php b/setup/module/Magento/Setup/src/Model/PhpExtensions.php
index 35ad7cc78d857..8ef424fccc60f 100644
--- a/setup/module/Magento/Setup/src/Model/PhpExtensions.php
+++ b/setup/module/Magento/Setup/src/Model/PhpExtensions.php
@@ -8,23 +8,17 @@
 
 namespace Magento\Setup\Model;
 
-use Magento\Composer\Reader\Json;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
 
 class PhpExtensions
 {
-    /**
-     * File reader for composer.json files
-     *
-     * @var \Magento\Composer\Reader\Json
-     */
-    protected $fileReader;
-
     /**
      * List of required extensions
      *
      * @var array
      */
-    protected $required = [];
+    protected $required;
 
     /**
      * List of currently installed extensions
@@ -34,12 +28,17 @@ class PhpExtensions
     protected $current = [];
 
     /**
-     * @param \Magento\Composer\Reader\Json $fileReader
+     * @var \Magento\Framework\Filesystem\Directory\ReadInterface
+     */
+    private $rootDir;
+
+    /**
+     * @param Filesystem $filesystem
      */
     public function __construct(
-        Json $fileReader
+        Filesystem $filesystem
     ) {
-        $this->fileReader = $fileReader;
+        $this->rootDir = $filesystem->getDirectoryRead(DirectoryList::ROOT);
     }
 
     /**
@@ -51,24 +50,34 @@ public function __construct(
      */
     public function getRequired()
     {
-        if (!$this->required) {
-            $extensions = [];
-            foreach ($this->fileReader->read() as $object) {
-                if (!property_exists($object, 'require')) {
-                    continue;
+        if (null === $this->required) {
+            if (!$this->rootDir->isExist('composer.lock')) {
+                $this->required = [];
+                return $this->required;
+            }
+            $composerInfo = json_decode($this->rootDir->readFile('composer.lock'), true);
+            $declaredDependencies = [];
+
+            if (!empty($composerInfo['platform-dev'])) {
+                $declaredDependencies = array_merge($declaredDependencies, array_keys($composerInfo['platform-dev']));
+            }
+            if (!empty($composerInfo['packages'])) {
+                foreach ($composerInfo['packages'] as $package) {
+                    if (!empty($package['require'])) {
+                        $declaredDependencies = array_merge($declaredDependencies, array_keys($package['require']));
+                    }
                 }
-                $items = get_object_vars($object->require);
-                $items = array_filter(array_keys($items), [$this, 'filter']);
-                if ($items) {
-                    $extensions = array_merge($extensions, $items);
+            }
+            if ($declaredDependencies) {
+                $declaredDependencies = array_unique($declaredDependencies);
+                $phpDependencies = [];
+                foreach ($declaredDependencies as $dependency) {
+                    if (stripos($dependency, 'ext-') === 0) {
+                        $phpDependencies[] = substr($dependency, 4);
+                    }
                 }
+                $this->required = array_unique($phpDependencies);
             }
-
-            $extensions = array_unique($extensions);
-            array_walk($extensions, [$this, 'process']);
-
-            $this->required = array_values($extensions);
-            unset($extensions);
         }
         return $this->required;
     }
@@ -81,37 +90,8 @@ public function getRequired()
     public function getCurrent()
     {
         if (!$this->current) {
-            foreach ($this->required as $extension) {
-                if (extension_loaded($extension)) {
-                    $this->current[] = $extension;
-                }
-            }
+            $this->current = array_map('strtolower', get_loaded_extensions());
         }
         return $this->current;
     }
-
-    /**
-     * Aplly filter to array of required items
-     *
-     * If item has prefix 'ext-' then return TRUE, otherwise return FALSE.
-     *
-     * @param string $value
-     * @return bool
-     */
-    protected function filter($value)
-    {
-        return strpos($value, 'ext-') === 0;
-    }
-
-    /**
-     * Process extension name
-     *
-     * Remove 'ext-' prefix from extension name.
-     *
-     * @param string $value
-     */
-    protected function process(&$value)
-    {
-        $value = preg_replace('/^ext-/', '', $value);
-    }
 }
diff --git a/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml b/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml
index 0fa302e91869f..d47009c3d7001 100644
--- a/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml
@@ -64,7 +64,7 @@
                 <span>PHP Extensions Check</span>
                 <div class="rediness-check-info">
                     <p>
-                        You meet {{extensions.data.current.length}} out of {{extensions.data.required.length}} PHP extensions requirements.
+                        You meet {{extensions.data.required.length}} out of {{extensions.data.required.length}} PHP extensions requirements.
                         <a href="#php-extensions" ng-click="updateOnExpand(extensions)">
                             <span ng-hide="extensions.expanded">More detail</span>
                             <span ng-show="extensions.expanded">Less detail</span>
@@ -89,7 +89,7 @@
                 <span>PHP Extensions Check</span>
                 <div class="rediness-check-info">
                     <p>
-                        {{extensions.data.required.length - extensions.data.current.length}} missing PHP extensions.
+                        {{extensions.data.missing.length}} missing PHP extensions.
                         <a href="#php-extensions" ng-click="updateOnExpand(extensions)">
                             <span ng-hide="extensions.expanded">More detail</span>
                             <span ng-show="extensions.expanded">Less detail</span>
@@ -99,9 +99,9 @@
                     <p>If you need more help, please call your hosting provider.</p>
                     <div class="rediness-check-block" ng-show="extensions.expanded">
                         <ul class="list-unstyled">
-                            <li ng-repeat="name in extensions.data.required" ng-switch="hasItem(extensions.data.current, name)">
-                                <span ng-switch-when="true" class="glyphicon glyphicon-ok text-success"></span>
-                                <span ng-switch-default class="glyphicon glyphicon-remove text-danger"></span>
+                            <li ng-repeat="name in extensions.data.required" ng-switch="extensions.data.missing.indexOf(name) >= 0">
+                                <span ng-switch-when="true" class="glyphicon glyphicon-remove text-danger"></span>
+                                <span ng-switch-default class="glyphicon glyphicon-ok text-success"></span>
                                 <span>PHP Extension {{name}}.</span>
                             </li>
                         </ul>

From f9add872e0a314e422cffe9328f55c004117de8e Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 3 Dec 2014 11:56:44 -0600
Subject: [PATCH 092/474] MAGETWO-31004: Validation of CLI

- removed trailing comma in one line array
---
 setup/config/application.config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/config/application.config.php b/setup/config/application.config.php
index 8fe94fb8497f2..3d0eadab753ae 100644
--- a/setup/config/application.config.php
+++ b/setup/config/application.config.php
@@ -21,7 +21,7 @@
             __DIR__ . '/autoload/{,*.}{global,local}.php',
         ),
     ],
-    'listeners' => ['Magento\Setup\Mvc\Bootstrap\InitParamListener', 'Magento\Setup\Mvc\Console\RouteListener',],
+    'listeners' => ['Magento\Setup\Mvc\Bootstrap\InitParamListener', 'Magento\Setup\Mvc\Console\RouteListener'],
     'service_manager' => [
         'factories' => [
             InitParamListener::BOOTSTRAP_PARAM => 'Magento\Setup\Mvc\Bootstrap\InitParamListener',

From 0f416df98bab2fc09f35a28a422b2ef9002320dc Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Wed, 3 Dec 2014 20:07:40 +0200
Subject: [PATCH 093/474] MTA-1113: Update functional tests for new customer
 form

---
 .../Selenium/Element/ConditionsElement.php    |  2 +-
 .../CreateBundleProductEntityTest/test.csv    |  4 +--
 .../TestCase/CreateTermEntityTest/test.csv    | 10 +++---
 .../TestCase/UpdateTermEntityTest/test.csv    |  8 ++---
 .../Block/Adminhtml/Edit/CustomerForm.xml     |  2 +-
 .../Customer/Test/Block/Form/CustomerForm.php | 36 ++++++++++++++++---
 .../AssertCustomerPasswordChanged.php         | 34 +++++-------------
 .../AssertWrongPassConfirmationMessage.php    | 31 +++++++++-------
 .../Test/Handler/CustomerInjectable/Curl.php  | 20 +++++------
 .../ChangeCustomerPasswordTest/test.csv       |  8 ++---
 .../Block/Adminhtml/Edit/CustomerForm.xml     |  2 +-
 .../test.csv                                  |  2 +-
 .../Block/Adminhtml/Edit/CustomerForm.xml     |  2 +-
 .../CreateGiftRegistryFrontendEntityTest.php  |  1 +
 .../CreateGiftRegistryTypeEntityTest.php      |  1 +
 .../UpdateGiftRegistryFrontendEntityTest.php  |  1 +
 .../UpdateGiftRegistryTypeEntityTest.php      |  1 +
 ...CopyProductToAnotherWishlistEntityTest.php |  1 +
 ...MoveProductToAnotherWishlistEntityTest.php |  1 +
 .../test.csv                                  | 12 +++----
 .../Test/Page/Adminhtml/ProductReportView.xml |  4 +--
 .../ViewedProductsReportEntityTest.php        | 14 +++++++-
 .../ViewedProductsReportEntityTest/test.csv   |  4 +--
 .../Block/Adminhtml/Edit/CustomerForm.xml     |  2 +-
 .../Block/Adminhtml/Edit/CustomerForm.xml     |  2 +-
 .../Constraint/AssertCartPriceRuleForm.php    |  5 +--
 .../Block/Adminhtml/Edit/CustomerForm.xml     |  2 +-
 27 files changed, 124 insertions(+), 88 deletions(-)

diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/ConditionsElement.php b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/ConditionsElement.php
index 939aec323db82..a314a44cdcb5a 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/ConditionsElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/ConditionsElement.php
@@ -169,7 +169,7 @@ class ConditionsElement extends AbstractElement
      *
      * @var string
      */
-    protected $ruleParamInput = '.element [name^="rule[conditions]"]';
+    protected $ruleParamInput = '.element [name^="rule"]';
 
     /**
      * Set value to conditions
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv
index a5cb3ad71d77d..c53c7a9219f24 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv
@@ -3,11 +3,11 @@
 "BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product offline";"Dynamic";"-";"-";"-";"Out of Stock";"Dynamic";"-";"category_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Separately";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage,  assertProductNotSearchableBySku";""
 "BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"Product online";"Dynamic";"-";"dynamic-200";"-";"In Stock";"Dynamic";"-";"category_%isolation%";"Bundle Product Dynamic";"-";"-";"-";"-";"-";"Price Range";"-";"-";"Together";"all_types_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_options";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertProductInStock, assertBundleItemsOnProductPage, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType";""
 "BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"-";"Fixed";"10";"fixed-15";"None";"-";"Fixed";"10";"-";"Bundle Product Fixed Required";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_fixed";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage";""
-"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"100";"fixed-24";"Taxable Goods";"In Stock";"Fixed";"10";"category_%isolation%";"Bundle Product Fixed";"default";"-";"-";"-";"-";"As Low as";"-";"-";"Separately";"all_types_fixed";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_fixed_and_custom_options";"all_types";"-";"Catalog, Search";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductVisibleInCategory, assertBundleProductPage, assertProductInStock, assertGroupedPriceOnBundleProductPage, assertBundleItemsOnProductPage, assertBundlePriceView, assertBundlePriceType";""
+"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"100";"fixed-24";"Taxable Goods";"In Stock";"Fixed";"10";"category_%isolation%";"Bundle Product Fixed";"default";"-";"-";"-";"-";"As Low as";"-";"-";"Separately";"all_types_fixed";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_fixed_and_custom_options";"all_types";"-";"Catalog, Search";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductVisibleInCategory, assertBundleProductPage, assertProductInStock, assertGroupedPriceOnBundleProductPage, assertBundleItemsOnProductPage, assertBundlePriceView, assertBundlePriceType";"MAGETWO-31179"
 "BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"10";"fixed-1";"Taxable Goods";"Out of Stock";"Fixed";"10";"category_%isolation%";"-";"-";"10";"m/d/Y";"m/d/Y +3 days";"-";"Price Range";"No";"Yes";"Together";"with_not_required_options";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"with_not_required_options";"-";"-";"Catalog";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm,  assertBundleProductPage, assertProductOutOfStock, assertBundlePriceView";"Bug: MAGETWO-26980"
 "BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"-";"Dynamic";"-";"dynamic-50";"-";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"default";"As Low as";"No";"No";"Together";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Search";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage, assertTierPriceOnBundleProductPage";""
 "Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-8";"-";"-";"-";"-";"-";"-";"-";"20";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory";""
-"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-32";"-";"-";"-";"-";"-";"-";"MAGETWO-23061";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";""
+"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-32";"-";"-";"-";"-";"-";"-";"MAGETWO-23061";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";"MAGETWO-31179"
 "Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-40";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";""
 "Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-115";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_1";"drop_down_with_one_option_fixed_price";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType, assertProductCustomOptionsOnBundleProductPage";""
 "Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-159";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_2";"drop_down_with_one_option_percent_price";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";""
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest/test.csv
index 45ac149ca4243..2d45351830d47 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest/test.csv
@@ -1,5 +1,5 @@
-"product";"agreement/data/name";"agreement/data/is_active";"agreement/data/is_html";"agreement/data/stores/dataSet/0";"agreement/data/checkbox_text";"agreement/data/content";"shipping/shipping_service";"shipping/shipping_method";"payment/method";"constraint"
-"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout"
-"catalogProductSimple::default";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"<html>";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout"
-"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout"
-"catalogProductSimple::default";"name%isolation%";"Disabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout"
+"product";"agreement/data/name";"agreement/data/is_active";"agreement/data/is_html";"agreement/data/stores/dataSet/0";"agreement/data/checkbox_text";"agreement/data/content";"shipping/shipping_service";"shipping/shipping_method";"payment/method";"constraint";"issue"
+"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306"
+"catalogProductSimple::default";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"<html>";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306"
+"catalogProductSimple::default";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306"
+"catalogProductSimple::default";"name%isolation%";"Disabled";"Text";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout";""
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest/test.csv
index 5c9fa47f3d824..8b971e8284429 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest/test.csv
@@ -1,4 +1,4 @@
-"product";"agreementOrigin/dataSet";"agreement/data/name";"agreement/data/is_active";"agreement/data/is_html";"agreement/data/stores/dataSet/0";"agreement/data/checkbox_text";"agreement/data/content";"shipping/shipping_service";"shipping/shipping_method";"payment/method";"constraint"
-"catalogProductSimple::default";"term_disabled_text";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout"
-"catalogProductSimple::default";"term_disabled_html";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"<html>";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout"
-"catalogProductSimple::default";"term_enabled_text";"name%isolation%";"Disabled";"HTML";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout"
+"product";"agreementOrigin/dataSet";"agreement/data/name";"agreement/data/is_active";"agreement/data/is_html";"agreement/data/stores/dataSet/0";"agreement/data/checkbox_text";"agreement/data/content";"shipping/shipping_service";"shipping/shipping_method";"payment/method";"constraint";"issue"
+"catalogProductSimple::default";"term_disabled_text";"name%isolation%";"Enabled";"HTML";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306"
+"catalogProductSimple::default";"term_disabled_html";"name%isolation%";"Enabled";"Text";"default";"test_checkbox%isolation%";"<html>";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermOnCheckout";"MAGETWO-31306"
+"catalogProductSimple::default";"term_enabled_text";"name%isolation%";"Disabled";"HTML";"default";"test_checkbox%isolation%";"TestMessage%isolation%";"Flat Rate";"Fixed";"checkmo";"assertTermSuccessSaveMessage, assertTermInGrid, assertTermAbsentOnCheckout";""
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.xml
index 0e125577e7a80..8b9a22fbfd085 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.xml
@@ -30,7 +30,7 @@
     </account_information>
     <addresses>
         <class>\Magento\Customer\Test\Block\Adminhtml\Edit\Tab\Addresses</class>
-        <selector>#customer_info_tabs_addresses</selector>
+        <selector>#tab_customer_address</selector>
         <strategy>css selector</strategy>
     </addresses>
 </tabs>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
index 3d201bb95b1d4..fe20e4ec2d07c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
@@ -9,29 +9,36 @@
 namespace Magento\Customer\Test\Block\Form;
 
 use Mtf\Block\Form;
+use Magento\Customer\Test\Fixture\CustomerInjectable;
 
 /**
- * Class CustomerForm
- * Customer account edit form
+ * Customer account edit form.
  */
 class CustomerForm extends Form
 {
     /**
-     * Save button button css selector
+     * Save button button css selector.
      *
      * @var string
      */
     protected $saveButton = '[type="submit"]';
 
     /**
-     * Locator for customer attribute on Edit Account Information page
+     * Locator for customer attribute on Edit Account Information page.
      *
      * @var string
      */
     protected $customerAttribute = "[name='%s[]']";
 
     /**
-     * Click on save button
+     * Validation text message for a field.
+     *
+     * @var string
+     */
+    protected $validationText = '.mage-error[for="%s"]';
+
+    /**
+     * Click on save button.
      *
      * @return void
      */
@@ -39,4 +46,23 @@ public function submit()
     {
         $this->_rootElement->find($this->saveButton)->click();
     }
+
+    /**
+     * Get all error validation messages for fields.
+     *
+     * @param CustomerInjectable $customer
+     * @return array
+     */
+    public function getValidationMessages(CustomerInjectable $customer)
+    {
+        $messages = [];
+        foreach(array_keys($customer->getData()) as $field) {
+            $element = $this->_rootElement->find(sprintf($this->validationText, str_replace('_', '-', $field)));
+            if ($element->isVisible()) {
+                $messages[$field] = $element->getText();
+            }
+        }
+
+        return $messages;
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
index 6a946bc9a0dd8..bce622084b4c3 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
@@ -11,32 +11,24 @@
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Mtf\Constraint\AbstractConstraint;
-use Magento\Cms\Test\Page\CmsIndex;
 use Mtf\Fixture\FixtureFactory;
 
 /**
- * Class AssertCustomerPasswordChanged
- * Check that login again to frontend with new password was success
+ * Check that login again to frontend with new password was success.
  */
 class AssertCustomerPasswordChanged extends AbstractConstraint
 {
     /**
-     * Welcome message after login
-     */
-    const SUCCESS_MESSAGE = 'Hello, %s!';
-
-    /**
-     * Constraint severeness
+     * Constraint severeness.
      *
      * @var string
      */
     protected $severeness = 'low';
 
     /**
-     * Assert that login again to frontend with new password was success
+     * Assert that login again to frontend with new password was success.
      *
      * @param FixtureFactory $fixtureFactory
-     * @param CmsIndex $cmsIndex
      * @param CustomerAccountIndex $customerAccountIndex
      * @param CustomerInjectable $initialCustomer
      * @param CustomerInjectable $customer
@@ -44,16 +36,10 @@ class AssertCustomerPasswordChanged extends AbstractConstraint
      */
     public function processAssert(
         FixtureFactory $fixtureFactory,
-        CmsIndex $cmsIndex,
         CustomerAccountIndex $customerAccountIndex,
         CustomerInjectable $initialCustomer,
         CustomerInjectable $customer
     ) {
-        $cmsIndex->open();
-        if ($cmsIndex->getLinksBlock()->isVisible()) {
-            $cmsIndex->getLinksBlock()->openLink('Log Out');
-        }
-
         $customer = $fixtureFactory->createByCode(
             'customerInjectable',
             [
@@ -66,21 +52,19 @@ public function processAssert(
             ]
         );
 
-        $loginCustomer = $this->objectManager->create(
+        $this->objectManager->create(
             'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep',
             ['customer' => $customer]
-        );
-        $loginCustomer->run();
+        )->run();
 
-        $customerName = $initialCustomer->getFirstname() . " " . $initialCustomer->getLastname();
-        \PHPUnit_Framework_Assert::assertEquals(
-            sprintf(self::SUCCESS_MESSAGE, $customerName),
-            $customerAccountIndex->getInfoBlock()->getWelcomeText()
+        \PHPUnit_Framework_Assert::assertTrue(
+            $customerAccountIndex->getAccountMenuBlock()->isVisible(),
+            'Customer Account Dashboard is not visible.'
         );
     }
 
     /**
-     * Returns a string representation of the object
+     * Returns a string representation of the object.
      *
      * @return string
      */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
index 25d013a6c7ffb..d5cc652f1fdc2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
@@ -8,48 +8,55 @@
 
 namespace Magento\Customer\Test\Constraint;
 
+use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountEdit;
 use Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertWrongPassConfirmationMessage
- * Check that conformation message is present
+ * Check that conformation message is present.
  */
 class AssertWrongPassConfirmationMessage extends AbstractConstraint
 {
     /**
      * Conformation message
      */
-    const CONFIRMATION_MESSAGE = 'Confirm your new password';
+    const CONFIRMATION_MESSAGE = 'Please enter the same value again.';
 
     /**
-     * Constraint severeness
+     * Constraint severeness.
      *
      * @var string
      */
     protected $severeness = 'low';
 
     /**
-     * Assert that conformation message is present
+     * Assert that conformation message is present.
      *
+     * @param CustomerInjectable $customer
      * @param CustomerAccountEdit $customerAccountEdit
      * @return void
      */
-    public function processAssert(CustomerAccountEdit $customerAccountEdit)
+    public function processAssert(CustomerInjectable $customer, CustomerAccountEdit $customerAccountEdit)
     {
-        \PHPUnit_Framework_Assert::assertEquals(
-            self::CONFIRMATION_MESSAGE,
-            $customerAccountEdit->getMessages()->getErrorMessages()
-        );
+        $validationMessages = $customerAccountEdit->getAccountInfoForm()->getValidationMessages($customer);
+        if (isset($validationMessages['password_confirmation'])) {
+            \PHPUnit_Framework_Assert::assertEquals(
+                self::CONFIRMATION_MESSAGE,
+                $validationMessages['password_confirmation'],
+                'Wrong password confirmation validation text message.'
+            );
+        } else {
+            \PHPUnit_Framework_TestCase::fail('Password confirmation validation message is absent.');
+        }
     }
 
     /**
-     * Returns a string representation of the object
+     * Returns a string representation of the object.
      *
      * @return string
      */
     public function toString()
     {
-        return 'Conformation message is displayed.';
+        return 'Password confirmation validation text message is displayed.';
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php
index e665bbacdf655..9f4f2d3e54c51 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php
@@ -133,7 +133,7 @@ protected function getCustomerId($email)
     protected function addAddress(array $data)
     {
         $curlData = [];
-        $url = $_ENV['app_backend_url'] . 'customer/index/save';
+        $url = $_ENV['app_backend_url'] . 'customer/index/save/id/' . $data['customer_id'];
         foreach ($data as $key => $value) {
             foreach ($this->curlMapping as $prefix => $prefixValues) {
                 if (in_array($key, $prefixValues)) {
@@ -176,18 +176,18 @@ protected function prepareAddressData(array $curlData)
                 $curlData['address'][$key]['street'] = [];
                 $curlData['address'][$key]['street'][] = $street;
             }
-            $newKey = '_item' . ($key + 1);
-            if ($curlData['address'][$key]['default_billing'] === 'Yes') {
-                unset($curlData['address'][$key]['default_billing']);
-                $curlData['account']['default_billing'] = $newKey;
+            $newKey = 'new_' . ($key);
+            if (isset($curlData['address'][$key]['default_billing'])) {
+                $value = $curlData['address'][$key]['default_billing'] === 'Yes' ? 'true' : 'false';
+                $curlData['address'][$key]['default_billing'] = $value;
             }
-            if ($curlData['address'][$key]['default_shipping'] === 'Yes') {
-                unset($curlData['address'][$key]['default_shipping']);
-                $curlData['account']['default_shipping'] = $newKey;
+            if (isset($curlData['address'][$key]['default_shipping'])) {
+                $value = $curlData['address'][$key]['default_shipping'] === 'Yes' ? 'true' : 'false';
+                $curlData['address'][$key]['default_shipping'] = $value;
             }
-            $curlData['address'][$newKey] = $curlData['address'][$key];
-            unset($curlData['address'][$key]);
+            $curlData['account']['customer_address'][$newKey] = $curlData['address'][$key];
         }
+        unset($curlData['address']);
 
         return $curlData;
     }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv
index 726c0a3d22d1f..b002dd32e3b58 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ChangeCustomerPasswordTest/test.csv
@@ -1,4 +1,4 @@
-"initialCustomer/dataSet";"customer/data/current_password";"customer/data/password";"customer/data/password_confirmation";"constraint";"issue"
-"default";"123123q";"123123a";"123123a";"assertCustomerInfoSuccessSavedMessage, assertCustomerPasswordChanged";"Bug: MAGETWO-29412"
-"default";"123123";"123123a";"123123a";"assertChangePasswordFailMessage";""
-"default";"123123q";"123123a";"123123";"assertWrongPassConfirmationMessage";""
+"initialCustomer/dataSet";"customer/data/current_password";"customer/data/password";"customer/data/password_confirmation";"constraint";
+"default";"123123q";"123123a";"123123a";"assertCustomerInfoSuccessSavedMessage, assertCustomerPasswordChanged";
+"default";"123123";"123123a";"123123a";"assertChangePasswordFailMessage";
+"default";"123123q";"123123a";"123123";"assertWrongPassConfirmationMessage";
diff --git a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Block/Adminhtml/Edit/CustomerForm.xml b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Block/Adminhtml/Edit/CustomerForm.xml
index a57d974d24c75..f8c1ebcf60f43 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Block/Adminhtml/Edit/CustomerForm.xml
+++ b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Block/Adminhtml/Edit/CustomerForm.xml
@@ -10,7 +10,7 @@
 <tabs>
     <store_credit>
         <class>\Magento\CustomerBalance\Test\Block\Adminhtml\Customer\Edit\Tab\Tab</class>
-        <selector>#customer_info_tabs_customerbalance</selector>
+        <selector>#tab_customerbalance</selector>
         <strategy>css selector</strategy>
         <wrapper>customerbalance</wrapper>
         <fields>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv
index 1b875f13b3663..5c74a32bed354 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv
@@ -11,5 +11,5 @@
 "DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"Taxable Goods";"11";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductCustomOptionsOnProductPage";""
 "DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"-";"-";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage";""
 "DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"10";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"5";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductSpecialPriceOnProductPage";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"365";"Taxable Goods";"23";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"default";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductGroupedPriceOnProductPage";""
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"365";"Taxable Goods";"23";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"default";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductGroupedPriceOnProductPage";"MAGETWO-31179"
 "DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"250";"Taxable Goods";"65";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"default";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductTierPriceOnProductPage";""
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Block/Adminhtml/Edit/CustomerForm.xml b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Block/Adminhtml/Edit/CustomerForm.xml
index 08556f13fcd8a..131aeaf7d71d0 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Block/Adminhtml/Edit/CustomerForm.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Block/Adminhtml/Edit/CustomerForm.xml
@@ -10,7 +10,7 @@
 <tabs>
     <gift_registry>
         <class>\Magento\GiftRegistry\Test\Block\Adminhtml\Customer\Edit\Tab\GiftRegistry</class>
-        <selector>#customer_info_tabs_giftregistry</selector>
+        <selector>#tab_giftregistry</selector>
         <strategy>css selector</strategy>
     </gift_registry>
 </tabs>
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryFrontendEntityTest.php
index 143bac40c6987..340c137d02586 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryFrontendEntityTest.php
@@ -151,6 +151,7 @@ public function __prepare(
      */
     public function test(GiftRegistry $giftRegistry, CustomerInjectable $customer)
     {
+        $this->markTestIncomplete('Bug: MAGETWO-31328');
         // Steps
         $this->cmsIndex->open();
         $this->cmsIndex->getLinksBlock()->openLink("Log In");
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryTypeEntityTest.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryTypeEntityTest.php
index 40aebf2bb2887..b87c645eb27fa 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryTypeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryTypeEntityTest.php
@@ -91,6 +91,7 @@ public function __inject(
      */
     public function test(GiftRegistryType $giftRegistryType)
     {
+        $this->markTestIncomplete('Bug: MAGETWO-31247');
         // Steps
         $this->giftRegistryIndex->open();
         $this->giftRegistryIndex->getPageActions()->addNew();
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryFrontendEntityTest.php
index aa5377a0a51f3..6b96d00f36b08 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryFrontendEntityTest.php
@@ -140,6 +140,7 @@ public function __prepare(
      */
     public function test(GiftRegistry $giftRegistryOrigin, GiftRegistry $giftRegistry, CustomerInjectable $customer)
     {
+        $this->markTestIncomplete('Bug: MAGETWO-31328');
         // Preconditions
         $this->customerAccountLogin->open()->getLoginBlock()->login($customer);
         $giftRegistryOrigin->persist();
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryTypeEntityTest.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryTypeEntityTest.php
index 807c129561c9c..dd2a3160da25b 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryTypeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryTypeEntityTest.php
@@ -102,6 +102,7 @@ public function __inject(
      */
     public function test(GiftRegistryType $giftRegistryType, GiftRegistryType $giftRegistryTypeInitial)
     {
+        $this->markTestIncomplete('Bug: MAGETWO-31247');
         // Steps
         $giftRegistryTypeInitial->persist();
         $filter = ['label' => $giftRegistryTypeInitial->getLabel()];
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/CopyProductToAnotherWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/CopyProductToAnotherWishlistEntityTest.php
index 7b1aabfb1c459..a0bdf3d33e12c 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/CopyProductToAnotherWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/CopyProductToAnotherWishlistEntityTest.php
@@ -53,6 +53,7 @@ class CopyProductToAnotherWishlistEntityTest extends AbstractActionProductToAnot
      */
     public function test(MultipleWishlist $multipleWishlist, CustomerInjectable $customer, $product, $qty, $qtyToAction)
     {
+        $this->markTestIncomplete('Bug: MAGETWO-31328');
         // Preconditions
         $this->createMultipleWishlist($multipleWishlist, $customer);
         $product = $this->createProduct($product, $qty);
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest.php
index 1b98a9e89ee8c..b682c4eee2e9c 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest.php
@@ -52,6 +52,7 @@ class MoveProductToAnotherWishlistEntityTest extends AbstractActionProductToAnot
      */
     public function test(MultipleWishlist $multipleWishlist, CustomerInjectable $customer, $product, $qty, $qtyToAction)
     {
+        $this->markTestIncomplete('Bug: MAGETWO-31328');
         // Preconditions
         $this->createMultipleWishlist($multipleWishlist, $customer);
         $product = $this->createProduct($product, $qty);
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest/test.csv
index 5e744edce0613..aee4edda5fbe3 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest/test.csv
@@ -1,6 +1,6 @@
-"description";"product";"qty";"qtyToAction";"constraint";"issue"
-"Move one product from two existed";"catalogProductSimple::default";"2";"1";"assertProductInDefaultWishlist, assertProductInCustomWishlist";"Bug: MAGETWO-28741"
-"Move one product - zero left";"downloadableProductInjectable::default";"-";"-";"assertProductAbsentInDefaultWishlist, assertProductInCustomWishlist";""
-"Move one product - zero left";"groupedProductInjectable::default";"-";"-";"assertProductAbsentInDefaultWishlist, assertProductInCustomWishlist";""
-"Move one product - zero left";"configurableProductInjectable::default";"1";"1";"assertProductAbsentInDefaultWishlist, assertProductInCustomWishlist";""
-"Move one product from two existed";"bundleProduct::bundle_fixed_product";"2";"1";"assertProductInDefaultWishlist, assertProductInCustomWishlist";"Bug: MAGETWO-28741"
\ No newline at end of file
+"description";"product";"qty";"qtyToAction";"constraint";
+"Move one product from two existed";"catalogProductSimple::default";"2";"1";"assertProductInDefaultWishlist, assertProductInCustomWishlist";
+"Move one product - zero left";"downloadableProductInjectable::default";"-";"-";"assertProductAbsentInDefaultWishlist, assertProductInCustomWishlist";
+"Move one product - zero left";"groupedProductInjectable::default";"-";"-";"assertProductAbsentInDefaultWishlist, assertProductInCustomWishlist";
+"Move one product - zero left";"configurableProductInjectable::default";"1";"1";"assertProductAbsentInDefaultWishlist, assertProductInCustomWishlist";
+"Move one product from two existed";"bundleProduct::bundle_fixed_product";"2";"1";"assertProductInDefaultWishlist, assertProductInCustomWishlist";
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml
index 3ea6f23ddf00b..ea40d1feccb21 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Page/Adminhtml/ProductReportView.xml
@@ -15,12 +15,12 @@
             <strategy>css selector</strategy>
         </actionsBlock>
         <gridBlock>
-            <class>Magento\Reports\Test\Block\Adminhtml\Viewed\FilterGrid</class>
+            <class>Magento\Reports\Test\Block\Adminhtml\Review\Products\Viewed\ProductGrid</class>
             <locator>.grid</locator>
             <strategy>css selector</strategy>
         </gridBlock>
         <filterBlock>
-            <class>Magento\Reports\Test\Block\Adminhtml\Viewed\Filter</class>
+            <class>Magento\Sales\Test\Block\Adminhtml\Report\Filter\Form</class>
             <locator>#filter_form</locator>
             <strategy>css selector</strategy>
         </filterBlock>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
index 32f63eeb48c12..c18b81f787032 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php
@@ -12,6 +12,7 @@
 use Mtf\TestCase\Injectable;
 use Mtf\Fixture\FixtureFactory;
 use Magento\Reports\Test\Page\Adminhtml\ProductReportView;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 
 /**
  * Test Creation for ViewedProductsReportEntity
@@ -55,6 +56,18 @@ class ViewedProductsReportEntityTest extends Injectable
      */
     protected $browser;
 
+    /**
+     * Delete all products
+     *
+     * @param CatalogProductIndex $catalogProductIndexPage
+     * @return void
+     */
+    public function __prepare(CatalogProductIndex $catalogProductIndexPage)
+    {
+        $catalogProductIndexPage->open();
+        $catalogProductIndexPage->getProductGrid()->massaction([], 'Delete', true, 'Select All');
+    }
+
     /**
      * Inject pages
      *
@@ -83,7 +96,6 @@ public function __inject(
      */
     public function test($products, array $viewsReport, $total)
     {
-        $this->markTestIncomplete('MAGETWO-15707');
         // Preconditions
         $productsList = $this->prepareProducts($products);
         $this->openProducts($productsList, $total);
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest/test.csv
index 390345cb8208f..fd637ffda83b6 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest/test.csv
@@ -1,4 +1,4 @@
 "description";"total";"products";"viewsReport/period_type";"viewsReport/from";"viewsReport/to";"viewsReport/show_empty_rows";"constraint"
 "view products on front and verify they all reflected in Year report";"2, 1";"catalogProductSimple::default, catalogProductVirtual::default";"Year";"m/d/Y -1 year";"m/d/Y";"No";"assertProductViewsReportTotalResult"
-"view products on front and verify they all reflected in Month report";"1, 1";"downloadableProductInjectable::default, catalogProductBundle::bundle_dynamic_product";"Month";"m/d/Y";"m/d/Y";"No";"assertProductViewsReportTotalResult"
-"view products on front and verify they all reflected in Day report";"1, 1";"configurableProductInjectable::default, catalogProductGrouped::default";"Day";"m/d/Y -1 day";"m/d/Y +1 day";"Yes";"assertProductViewsReportTotalResult"
+"view products on front and verify they all reflected in Month report";"1, 1";"downloadableProductInjectable::default, bundleProduct::bundle_dynamic_product";"Month";"m/d/Y";"m/d/Y";"No";"assertProductViewsReportTotalResult"
+"view products on front and verify they all reflected in Day report";"1, 1";"configurableProductInjectable::default, groupedProductInjectable::default";"Day";"m/d/Y -1 day";"m/d/Y +1 day";"Yes";"assertProductViewsReportTotalResult"
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/CustomerForm.xml b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/CustomerForm.xml
index 7bcb2c915fcb6..f021d70dfc11c 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/CustomerForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/Edit/CustomerForm.xml
@@ -10,7 +10,7 @@
 <tabs>
     <product_reviews>
         <class>\Magento\Review\Test\Block\Adminhtml\Customer\Edit\Tab\Reviews</class>
-        <selector>#customer_info_tabs_reviews</selector>
+        <selector>#tab_reviews</selector>
         <strategy>css selector</strategy>
     </product_reviews>
 </tabs>
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Block/Adminhtml/Edit/CustomerForm.xml b/dev/tests/functional/tests/app/Magento/Reward/Test/Block/Adminhtml/Edit/CustomerForm.xml
index 606f8ff00dffe..f874f6b3505b6 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Block/Adminhtml/Edit/CustomerForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Block/Adminhtml/Edit/CustomerForm.xml
@@ -10,7 +10,7 @@
 <tabs>
     <reward_points>
         <class>\Magento\Reward\Test\Block\Adminhtml\Edit\Tab\Reward</class>
-        <selector>#customer_info_tabs_customer_edit_tab_reward</selector>
+        <selector>#tab_customer_edit_tab_reward</selector>
         <strategy>css selector</strategy>
         <wrapper>reward</wrapper>
         <fields>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
index 6997a90f41316..631a497c0ce99 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
@@ -34,7 +34,8 @@ class AssertCartPriceRuleForm extends AbstractConstraint
         'conditions_serialized',
         'actions_serialized',
         'from_date',
-        'to_date'
+        'to_date',
+        'id'
     ];
 
     /**
@@ -91,7 +92,7 @@ protected function verify(array $fixtureData, array $formData)
                         . "\nActual: " . implode(", ", $formData[$key]);
                 }
             } else {
-                if ($value !== $formData[$key] && !in_array($key, $this->skippedFields)) {
+                if (!in_array($key, $this->skippedFields) && $value !== $formData[$key]) {
                     $errorMessage[] = "Data in " . $key . " field not equal."
                         . "\nExpected: " . $value
                         . "\nActual: " . $formData[$key];
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Edit/CustomerForm.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Edit/CustomerForm.xml
index 49449d2beafa6..9b56df7d6839c 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Edit/CustomerForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Edit/CustomerForm.xml
@@ -10,7 +10,7 @@
 <tabs>
     <wishlist>
         <class>\Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist</class>
-        <selector>#customer_info_tabs_wishlist</selector>
+        <selector>#tab_wishlist</selector>
         <strategy>css selector</strategy>
     </wishlist>
 </tabs>

From 597a80e9cc05eac73ddbff72851f2c4b2d6becf4 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Wed, 3 Dec 2014 13:10:56 -0600
Subject: [PATCH 094/474] MAGETWO-29035: Installation fails if cli php is
 different than apache configured

- removed unused code
---
 composer.json                                 |   3 +-
 composer.lock                                 | 365 +-----------------
 dev/build/publication/sanity/ee.xml           |   3 -
 .../Magento/Composer/src/FileResolver.php     |  57 ---
 .../Magento/Composer/src/Reader/Json.php      |  64 ---
 5 files changed, 22 insertions(+), 470 deletions(-)
 delete mode 100644 setup/module/Magento/Composer/src/FileResolver.php
 delete mode 100644 setup/module/Magento/Composer/src/Reader/Json.php

diff --git a/composer.json b/composer.json
index 2e4c8e4e57673..7a69c62b8e58a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,8 +24,7 @@
         "zendframework/zend-serializer": "2.3.1",
         "zendframework/zend-log": "2.3.1",
         "zendframework/zend-http": "2.3.1",
-        "magento/zendframework1": "1.12.9",
-        "composer/composer": "1.0.0-alpha8"
+        "magento/zendframework1": "1.12.9"
     },
     "require-dev": {
         "phpunit/phpunit": "4.1.0",
diff --git a/composer.lock b/composer.lock
index a0956d5a3c49c..d8e494ff94077 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,133 +4,8 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "c1a177ebcfecbbe62b46639b5d15ab42",
+    "hash": "7c81cdde588be2bb2bc0b00bdd326c6e",
     "packages": [
-        {
-            "name": "composer/composer",
-            "version": "1.0.0-alpha8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/composer.git",
-                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
-                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
-                "shasum": ""
-            },
-            "require": {
-                "justinrainbow/json-schema": "1.1.*",
-                "php": ">=5.3.2",
-                "seld/jsonlint": "1.*",
-                "symfony/console": "~2.3",
-                "symfony/finder": "~2.2",
-                "symfony/process": "~2.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~3.7.10"
-            },
-            "suggest": {
-                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
-                "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic"
-            },
-            "bin": [
-                "bin/composer"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Composer": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Dependency Manager",
-            "homepage": "http://getcomposer.org/",
-            "keywords": [
-                "autoload",
-                "dependency",
-                "package"
-            ],
-            "time": "2014-01-06 18:39:59"
-        },
-        {
-            "name": "justinrainbow/json-schema",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
-                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "JsonSchema": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "NewBSD"
-            ],
-            "authors": [
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch",
-                    "homepage": "http://wiedler.ch/igor/"
-                },
-                {
-                    "name": "Bruno Prieto Reis",
-                    "email": "bruno.p.reis@gmail.com"
-                },
-                {
-                    "name": "Justin Rainbow",
-                    "email": "justin.rainbow@gmail.com"
-                },
-                {
-                    "name": "Robert Schönthal",
-                    "email": "robert.schoenthal@gmail.com",
-                    "homepage": "http://digitalkaoz.net"
-                }
-            ],
-            "description": "A library to validate a json schema.",
-            "homepage": "https://github.com/justinrainbow/json-schema",
-            "keywords": [
-                "json",
-                "schema"
-            ],
-            "time": "2012-01-03 00:33:17"
-        },
         {
             "name": "magento/zendframework1",
             "version": "1.12.9",
@@ -178,203 +53,6 @@
             ],
             "time": "2014-11-24 22:50:41"
         },
-        {
-            "name": "seld/jsonlint",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/a7bc2ec9520ad15382292591b617c43bdb1fec35",
-                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "bin": [
-                "bin/jsonlint"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "JSON Linter",
-            "keywords": [
-                "json",
-                "linter",
-                "parser",
-                "validator"
-            ],
-            "time": "2014-09-05 15:36:20"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v2.6.0",
-            "target-dir": "Symfony/Component/Console",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Console.git",
-                "reference": "d3bac228fd7a2aac9193e241b239880b3ba39a10"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/d3bac228fd7a2aac9193e241b239880b3ba39a10",
-                "reference": "d3bac228fd7a2aac9193e241b239880b3ba39a10",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1",
-                "symfony/process": "~2.1"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Console\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-11-20 13:24:23"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v2.6.0",
-            "target-dir": "Symfony/Component/Finder",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Finder.git",
-                "reference": "d574347c652a14cfee0349f744c7880e1d9029fd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/d574347c652a14cfee0349f744c7880e1d9029fd",
-                "reference": "d574347c652a14cfee0349f744c7880e1d9029fd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Finder\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-11-28 10:00:40"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v2.6.0",
-            "target-dir": "Symfony/Component/Process",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Process.git",
-                "reference": "dc88f75d1c07791e5733f90be747961dce26cf05"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Process/zipball/dc88f75d1c07791e5733f90be747961dce26cf05",
-                "reference": "dc88f75d1c07791e5733f90be747961dce26cf05",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Process\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Process Component",
-            "homepage": "http://symfony.com",
-            "time": "2014-11-04 14:29:39"
-        },
         {
             "name": "zendframework/zend-code",
             "version": "2.3.1",
@@ -1745,16 +1423,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "2.0.12",
+            "version": "2.0.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "7ce9da20f96964bb7a4033f53834df13328dbeab"
+                "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7ce9da20f96964bb7a4033f53834df13328dbeab",
-                "reference": "7ce9da20f96964bb7a4033f53834df13328dbeab",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5",
+                "reference": "0e7d2eec5554f869fa7a4ec2d21e4b37af943ea5",
                 "shasum": ""
             },
             "require": {
@@ -1806,7 +1484,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-12-02 13:17:01"
+            "time": "2014-12-03 06:41:44"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2462,17 +2140,17 @@
         },
         {
             "name": "symfony/config",
-            "version": "v2.5.7",
+            "version": "v2.5.8",
             "target-dir": "Symfony/Component/Config",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Config.git",
-                "reference": "7b11dceebaaf877b75bc1aedfd831a2ddc326de9"
+                "reference": "92f0b4c625b8c42d394b53f879d2795d84bb8c4f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/7b11dceebaaf877b75bc1aedfd831a2ddc326de9",
-                "reference": "7b11dceebaaf877b75bc1aedfd831a2ddc326de9",
+                "url": "https://api.github.com/repos/symfony/Config/zipball/92f0b4c625b8c42d394b53f879d2795d84bb8c4f",
+                "reference": "92f0b4c625b8c42d394b53f879d2795d84bb8c4f",
                 "shasum": ""
             },
             "require": {
@@ -2506,21 +2184,21 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "http://symfony.com",
-            "time": "2014-11-20 13:22:25"
+            "time": "2014-12-02 20:15:53"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v2.5.7",
+            "version": "v2.5.8",
             "target-dir": "Symfony/Component/DependencyInjection",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DependencyInjection.git",
-                "reference": "662d8f5e4a7542dca4194fb3f3bda0a57e65f0a4"
+                "reference": "b4afda3c24867a17f93237ac1fcce917cc9d7695"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/662d8f5e4a7542dca4194fb3f3bda0a57e65f0a4",
-                "reference": "662d8f5e4a7542dca4194fb3f3bda0a57e65f0a4",
+                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/b4afda3c24867a17f93237ac1fcce917cc9d7695",
+                "reference": "b4afda3c24867a17f93237ac1fcce917cc9d7695",
                 "shasum": ""
             },
             "require": {
@@ -2563,21 +2241,21 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "http://symfony.com",
-            "time": "2014-11-16 17:28:00"
+            "time": "2014-12-02 21:48:32"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v2.5.7",
+            "version": "v2.5.8",
             "target-dir": "Symfony/Component/Filesystem",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "3c3e382bd869b3ec10008a3d9ef455b1cc2868db"
+                "reference": "e5fc05a3a1dbb4ea0bed80fe7bd21ba3cab88c42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/3c3e382bd869b3ec10008a3d9ef455b1cc2868db",
-                "reference": "3c3e382bd869b3ec10008a3d9ef455b1cc2868db",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/e5fc05a3a1dbb4ea0bed80fe7bd21ba3cab88c42",
+                "reference": "e5fc05a3a1dbb4ea0bed80fe7bd21ba3cab88c42",
                 "shasum": ""
             },
             "require": {
@@ -2610,13 +2288,12 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "http://symfony.com",
-            "time": "2014-11-16 17:28:00"
+            "time": "2014-12-02 20:15:53"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "composer/composer": 15,
         "phpmd/phpmd": 0
     },
     "prefer-stable": false,
diff --git a/dev/build/publication/sanity/ee.xml b/dev/build/publication/sanity/ee.xml
index a1e4c2d1faa58..91e83d5d42dde 100644
--- a/dev/build/publication/sanity/ee.xml
+++ b/dev/build/publication/sanity/ee.xml
@@ -25,9 +25,6 @@
         <item>
             <path>vendor</path>
         </item>
-        <item>
-            <path>setup/vendor</path>
-        </item>
         <item>
             <word>CHANGELOG</word>
             <path>CHANGELOG.md</path>
diff --git a/setup/module/Magento/Composer/src/FileResolver.php b/setup/module/Magento/Composer/src/FileResolver.php
deleted file mode 100644
index a56fe0bdba482..0000000000000
--- a/setup/module/Magento/Composer/src/FileResolver.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license   {license_link}
- */
-
-namespace Magento\Composer;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Config\FileIteratorFactory;
-
-class FileResolver implements \Magento\Framework\Config\FileResolverInterface
-{
-    /**
-     * Directory reader
-     *
-     * @var \Magento\Framework\Filesystem\Directory\ReadInterface
-     */
-    protected $directoryRead;
-
-    /**
-     * File Iterator
-     *
-     * @var \Magento\Framework\Config\FileIteratorFactory
-     */
-    protected $iteratorFactory;
-
-    /**
-     * @param \Magento\Framework\Filesystem $filesystem
-     * @param \Magento\Framework\Config\FileIteratorFactory $iteratorFactory
-     */
-    public function __construct(
-        \Magento\Framework\Filesystem $filesystem,
-        FileIteratorFactory $iteratorFactory
-    ) {
-        $this->directoryRead = $filesystem->getDirectoryRead(DirectoryList::MODULES);
-        $this->iteratorFactory = $iteratorFactory;
-    }
-
-    /**
-     * Collect files and wrap them into an Iterator object
-     *
-     * @param string $filename
-     * @param string $scope
-     * @return \Magento\Framework\Config\FileIterator
-     */
-    public function get($filename, $scope)
-    {
-        $iterator = $this->iteratorFactory->create(
-            $this->directoryRead,
-            $this->directoryRead->search('/*/*/' . $filename)
-        );
-        return $iterator;
-    }
-}
diff --git a/setup/module/Magento/Composer/src/Reader/Json.php b/setup/module/Magento/Composer/src/Reader/Json.php
deleted file mode 100644
index 979f000560b92..0000000000000
--- a/setup/module/Magento/Composer/src/Reader/Json.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-namespace Magento\Composer\Reader;
-
-use Magento\Composer\FileResolver;
-
-class Json
-{
-    /**
-     * @var \Magento\Composer\FileResolver
-     */
-    protected $fileResolver;
-
-    /**
-     * The name of file that stores configuration
-     *
-     * @var string
-     */
-    protected $fileName;
-
-    /**
-     * @param FileResolver $fileResolver
-     * @param string $fileName
-     */
-    public function __construct(
-        FileResolver $fileResolver,
-        $fileName = 'composer.json'
-    ) {
-        $this->fileResolver = $fileResolver;
-        $this->fileName = $fileName;
-    }
-
-    /**
-     * @return array
-     */
-    public function read()
-    {
-        $fileList = $this->fileResolver->get($this->fileName, '');
-        if (!count($fileList)) {
-            return [];
-        }
-        return $this->readFiles($fileList);
-    }
-
-    /**
-     * @param array $fileList
-     * @return array
-     * @throws \Exception
-     */
-    protected function readFiles($fileList)
-    {
-        $result = [];
-        foreach ($fileList as $content) {
-            $result[] = json_decode($content);
-        }
-        return $result;
-    }
-}

From a3988bad01975292c82dc71f6b5926c8279979ef Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 3 Dec 2014 13:23:01 -0600
Subject: [PATCH 095/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Improved user experience.
---
 setup/pub/magento/setup/add-database.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 3cc907844191f..f9d67c4763414 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -46,16 +46,31 @@ angular.module('add-database', ['ngStorage'])
             $interval.cancel(intervalPromise);
         });
 
-        $scope.$on('previousState()', function () {
+        $scope.$on('previousState', function () {
             $interval.cancel(intervalPromise);
         });
 
-
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();
         });
 
+        $scope.$watch('db.host', function(newVal, oldVal) {
+            $scope.database.$valid = false;
+        });
+
+        $scope.$watch('db.user', function(newVal, oldVal) {
+            $scope.database.$valid = false;
+        });
+
+        $scope.$watch('db.password', function(newVal, oldVal) {
+            $scope.database.$valid = false;
+        });
+
+        $scope.$watch('db.name', function(newVal, oldVal) {
+            $scope.database.$valid = false;
+        });
+
         // Dispatch 'validation-response' event to parent controller
         $scope.validate = function() {
             if ($scope.database.$valid) {

From c31e63cb17be4710d0236b9edb682a6f07ef90e6 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Wed, 3 Dec 2014 15:13:16 -0600
Subject: [PATCH 096/474] MAGETWO-21308: [GITHUB] DDL cache should be tagged

- added support for @magentoCache annotation in integration tests
- fixed cache isolation between certain integration tests using this directive
---
 .../TestFramework/Annotation/Cache.php        | 133 ++++++++++++++++++
 .../TestFramework/Bootstrap/DocBlock.php      |   1 +
 .../Object/Copy/Config/ReaderTest.php         |   9 +-
 .../Magento/Framework/TranslateTest.php       |   9 +-
 .../Logging/Model/Config/ReaderTest.php       |   9 +-
 .../Magento/Widget/Model/Config/DataTest.php  |  11 +-
 .../Widget/Model/Config/ReaderTest.php        |   9 +-
 7 files changed, 149 insertions(+), 32 deletions(-)
 create mode 100644 dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
new file mode 100644
index 0000000000000..de5662e27693f
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\TestFramework\Annotation;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Implementation of the @magentoCache DocBlock annotation
+ */
+class Cache
+{
+    /**
+     * Original values for cache type states
+     *
+     * @var array
+     */
+    private $origValues = [];
+
+    /**
+     * Handler for 'startTest' event
+     *
+     * @param \PHPUnit_Framework_TestCase $test
+     * @return void
+     */
+    public function startTest(\PHPUnit_Framework_TestCase $test)
+    {
+        $annotations = $test->getAnnotations();
+        $class = isset($annotations['class']['magentoCache']) ? $annotations['class']['magentoCache'] : [];
+        $method = isset($annotations['method']['magentoCache']) ? $annotations['method']['magentoCache'] : [];
+        $chosenAnnotations = $method ?: $class;
+        if (!$chosenAnnotations) {
+            return;
+        }
+        $this->setValues($this->parseValues($chosenAnnotations, $test), $test);
+    }
+
+    /**
+     * Handler for 'endTest' event
+     *
+     * @param \PHPUnit_Framework_TestCase $test
+     * @return void
+     */
+    public function endTest(\PHPUnit_Framework_TestCase $test)
+    {
+        if ($this->origValues) {
+            $this->setValues($this->origValues, $test);
+            $this->origValues = [];
+        }
+    }
+
+    /**
+     * Determines from docblock annotations which cache types to set
+     *
+     * @param array $annotations
+     * @param \PHPUnit_Framework_TestCase $test
+     * @return array
+     */
+    private function parseValues($annotations, \PHPUnit_Framework_TestCase $test)
+    {
+        $result = [];
+        $typeList = self::getTypeList();
+        foreach ($annotations as $subject) {
+            if (!preg_match('/^([a-z_]+)\s([01])$/', $subject, $matches)) {
+                self::fail("Invalid @magentoCache declaration: '{$subject}'", $test);
+            }
+            list(, $requestedType, $requestedEnabled) = $matches;
+            if ('all' === $requestedType) {
+                $result = [];
+                foreach ($typeList->getTypes() as $type => $row) {
+                    $result[$type] = $row['status'];
+                }
+            } else {
+                $result[$requestedType] = $requestedEnabled;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Sets the values of cache types
+     *
+     * @param array $values
+     * @param \PHPUnit_Framework_TestCase $test
+     */
+    private function setValues($values, \PHPUnit_Framework_TestCase $test)
+    {
+        $typeList = self::getTypeList();
+        if (!$this->origValues) {
+            $this->origValues = [];
+            foreach ($typeList->getTypes() as $type => $row) {
+                $this->origValues[$type] = $row['status'];
+            }
+        }
+        /** @var \Magento\Framework\App\Cache\StateInterface $states */
+        $states = Bootstrap::getInstance()->getObjectManager()->get('Magento\Framework\App\Cache\StateInterface');
+        foreach ($values as $type => $isEnabled) {
+            if (!isset($this->origValues[$type])) {
+                self::fail("Unknown cache type specified: '{$type}' in @magentoCache", $test);
+            }
+            $states->setEnabled($type, $isEnabled);
+        }
+    }
+
+    /**
+     * Getter for cache types list
+     *
+     * @return \Magento\Framework\App\Cache\TypeListInterface
+     */
+    private static function getTypeList()
+    {
+        /** @var \Magento\Framework\App\Cache\TypeListInterface $typeList */
+        return Bootstrap::getInstance()->getObjectManager()->get('Magento\Framework\App\Cache\TypeListInterface');
+    }
+
+    /**
+     * Fails the test with specified error message
+     *
+     * @param string $message
+     * @param \PHPUnit_Framework_TestCase $test
+     * @throws \Exception
+     */
+    private static function fail($message, \PHPUnit_Framework_TestCase $test)
+    {
+        $test->fail("{$message} in the test '{$test->toString()}'");
+        throw new \Exception('The above line was supposed to throw an exception.');
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
index b8bdfb61356c0..60f8517c4a564 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Bootstrap/DocBlock.php
@@ -64,6 +64,7 @@ protected function _getSubscribers(\Magento\TestFramework\Application $applicati
                 )
             ),
             new \Magento\TestFramework\Annotation\AppArea($application),
+            new \Magento\TestFramework\Annotation\Cache($application),
             new \Magento\TestFramework\Annotation\ConfigFixture(),
             new \Magento\TestFramework\Annotation\AdminConfigFixture()
         );
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php
index 719b67de3c6a6..0d7420b8dc20f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php
@@ -10,8 +10,10 @@
 namespace Magento\Framework\Object\Copy\Config;
 
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\App\Cache\State;
 
+/**
+ * @magentoCache all 0
+ */
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -24,11 +26,6 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
      */
     private $fileResolver;
 
-    public static function setUpBeforeClass()
-    {
-        Bootstrap::getInstance()->reinitialize([State::PARAM_BAN_CACHE => true]);
-    }
-
     public function setUp()
     {
         $this->fileResolver = $this->getMockForAbstractClass('Magento\Framework\Config\FileResolverInterface');
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
index 3856db89d7a6f..5fbe138d4aaee 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
@@ -7,16 +7,13 @@
  */
 namespace Magento\Framework;
 
-use Magento\Framework\App\Cache\State;
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * @magentoCache all 0
+ */
 class TranslateTest extends \PHPUnit_Framework_TestCase
 {
-    public static function setUpBeforeClass()
-    {
-        Bootstrap::getInstance()->reinitialize([State::PARAM_BAN_CACHE => true]);
-    }
-
     protected function setUp()
     {
         /** @var \Magento\Framework\View\FileSystem $viewFileSystem */
diff --git a/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php
index 4e70feb11bd4a..50e6a61c8fbf5 100644
--- a/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php
@@ -8,8 +8,10 @@
 namespace Magento\Logging\Model\Config;
 
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\App\Cache\State;
 
+/**
+ * @magentoCache all 0
+ */
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -22,11 +24,6 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
      */
     private $fileResolver;
 
-    public static function setUpBeforeClass()
-    {
-        Bootstrap::getInstance()->reinitialize([State::PARAM_BAN_CACHE => true]);
-    }
-
     protected function setUp()
     {
         $this->fileResolver = $this->getMockForAbstractClass('Magento\Framework\Config\FileResolverInterface');
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
index e477c198cf077..539cac857c809 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
@@ -8,19 +8,14 @@
  */
 namespace Magento\Widget\Model\Config;
 
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\App\Cache\State;
-
 /**
  * @magentoAppArea adminhtml
  */
 class DataTest extends \PHPUnit_Framework_TestCase
 {
-    public static function setUpBeforeClass()
-    {
-        Bootstrap::getInstance()->reinitialize([State::PARAM_BAN_CACHE => true]);
-    }
-
+    /**
+     * @magentoCache config 0
+     */
     public function testGet()
     {
         $fileResolver = $this->getMockForAbstractClass('Magento\Framework\Config\FileResolverInterface');
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
index 2ac90ea3af8d0..50c8e3e670ceb 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
@@ -8,8 +8,10 @@
 namespace Magento\Widget\Model\Config;
 
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\App\Cache\State;
 
+/**
+ * @magentoCache all 0
+ */
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -22,11 +24,6 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
      */
     private $fileResolver;
 
-    public static function setUpBeforeClass()
-    {
-        Bootstrap::getInstance()->reinitialize([State::PARAM_BAN_CACHE => true]);
-    }
-
     public function setUp()
     {
         $this->fileResolver = $this->getMockForAbstractClass('Magento\Framework\Config\FileResolverInterface');

From a26cd4e5cbc5a9a7f010c8eca8fc88410634b33c Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Wed, 3 Dec 2014 13:27:50 -0600
Subject: [PATCH 097/474] MAGETWO-29035: Installation fails if cli php is
 different than apache configured

- fixed code style
---
 .../static/testsuite/Magento/Test/Integrity/ComposerTest.php     | 1 +
 lib/internal/Magento/Framework/App/Cache/Manager.php             | 1 +
 lib/internal/Magento/Framework/App/Console/Response.php          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index ddd8f97b3bd23..d787c27ce6484 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -303,6 +303,7 @@ private function assertVersionInSync($name, $version)
      * Make sure requirements of components are reflected in root composer.json
      *
      * @param \StdClass $json
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     private function assertRequireInSync(\StdClass $json)
     {
diff --git a/lib/internal/Magento/Framework/App/Cache/Manager.php b/lib/internal/Magento/Framework/App/Cache/Manager.php
index adf24efdd2c29..ad855f2828254 100644
--- a/lib/internal/Magento/Framework/App/Cache/Manager.php
+++ b/lib/internal/Magento/Framework/App/Cache/Manager.php
@@ -98,6 +98,7 @@ public function clean(array $types)
      * Flushes specified cache storages
      *
      * @param string[] $types
+     * @return void
      */
     public function flush(array $types)
     {
diff --git a/lib/internal/Magento/Framework/App/Console/Response.php b/lib/internal/Magento/Framework/App/Console/Response.php
index 78321118d5e44..1d2f31e9ba09e 100644
--- a/lib/internal/Magento/Framework/App/Console/Response.php
+++ b/lib/internal/Magento/Framework/App/Console/Response.php
@@ -60,6 +60,7 @@ public function getBody()
 
     /**
      * @param string $body
+     * @return void
      */
     public function setBody($body)
     {

From f1bb8c43562cbff7b341127b7b12c94ea519540c Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 3 Dec 2014 16:28:30 -0600
Subject: [PATCH 098/474] MAGETWO-30296: Session loss on 404 pages when using
 Varnish

- moved remove cooke from vcl_recv to vcl_deliver
---
 app/code/Magento/PageCache/etc/varnish.vcl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/PageCache/etc/varnish.vcl b/app/code/Magento/PageCache/etc/varnish.vcl
index 294dd0ecaf30d..f0b036b905356 100644
--- a/app/code/Magento/PageCache/etc/varnish.vcl
+++ b/app/code/Magento/PageCache/etc/varnish.vcl
@@ -47,10 +47,6 @@ sub vcl_recv {
         return (pass);
     }
 
-    if (req.url ~ "\.(css|js|jpg|png|gif|tiff|bmp|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|woff)(\?|$)") {
-         unset req.http.Cookie;
-    }
-
     set req.grace = 1m;
 
     return (lookup);
@@ -107,6 +103,10 @@ sub vcl_deliver {
     } else {
         unset resp.http.Age;
     }
+
+    if (req.url ~ "\.(css|js|jpg|png|gif|tiff|bmp|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|woff)(\?|$)") {
+        unset resp.http.Cookie;
+    }
     unset resp.http.X-Magento-Debug;
     unset resp.http.X-Magento-Tags;
     unset resp.http.X-Powered-By;

From 8e9c693290254bb346323d23ef07b042ee872eb7 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Wed, 3 Dec 2014 17:23:07 -0600
Subject: [PATCH 099/474] MAGETWO-21308: [GITHUB] DDL cache should be tagged

- code style (NPath complexity)
---
 .../Magento/TestFramework/Annotation/Cache.php      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
index de5662e27693f..022cecb35aa9c 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
@@ -30,14 +30,15 @@ class Cache
      */
     public function startTest(\PHPUnit_Framework_TestCase $test)
     {
-        $annotations = $test->getAnnotations();
-        $class = isset($annotations['class']['magentoCache']) ? $annotations['class']['magentoCache'] : [];
-        $method = isset($annotations['method']['magentoCache']) ? $annotations['method']['magentoCache'] : [];
-        $chosenAnnotations = $method ?: $class;
-        if (!$chosenAnnotations) {
+        $source = $test->getAnnotations();
+        if (isset($source['method']['magentoCache'])) {
+            $annotations = $source['method']['magentoCache'];
+        } elseif (isset($source['class']['magentoCache'])) {
+            $annotations = $source['class']['magentoCache'];
+        } else {
             return;
         }
-        $this->setValues($this->parseValues($chosenAnnotations, $test), $test);
+        $this->setValues($this->parseValues($annotations, $test), $test);
     }
 
     /**

From 5acb78ef9cc1e491b3566d6a80acbb62cfcfc24a Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 3 Dec 2014 17:27:16 -0600
Subject: [PATCH 100/474] MAGETWO-30296: Session loss on 404 pages when using
 Varnish

- remove unnecessary unset cookie in vcl_deliver
---
 app/code/Magento/PageCache/etc/varnish.vcl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/PageCache/etc/varnish.vcl b/app/code/Magento/PageCache/etc/varnish.vcl
index f0b036b905356..4b2a337ba321f 100644
--- a/app/code/Magento/PageCache/etc/varnish.vcl
+++ b/app/code/Magento/PageCache/etc/varnish.vcl
@@ -104,9 +104,6 @@ sub vcl_deliver {
         unset resp.http.Age;
     }
 
-    if (req.url ~ "\.(css|js|jpg|png|gif|tiff|bmp|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|woff)(\?|$)") {
-        unset resp.http.Cookie;
-    }
     unset resp.http.X-Magento-Debug;
     unset resp.http.X-Magento-Tags;
     unset resp.http.X-Powered-By;

From 0b89f27a1ed4e0a677c13a8a73e48bd9c75ea77a Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 3 Dec 2014 19:11:17 -0600
Subject: [PATCH 101/474] MAGETWO-31004: Validation of CLI

- made changes to validator
- corrected usage output
---
 .../src/Controller/ConsoleController.php      | 23 +++++++++---
 .../src/Mvc/Console/VerboseValidator.php      | 37 +++++++++++++++++--
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index 327f67e7020b1..16263d084c189 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -12,7 +12,6 @@
 use Magento\Setup\Model\InstallerFactory;
 use Magento\Setup\Model\Installer;
 use Magento\Setup\Model\ConsoleLogger;
-use Magento\Setup\Model\UserConfigurationDataMapper;
 use Zend\Console\Request as ConsoleRequest;
 use Zend\EventManager\EventManagerInterface;
 use Zend\Mvc\Controller\AbstractActionController;
@@ -137,6 +136,20 @@ public static function getConsoleUsage()
         return $result;
     }
 
+    /**
+     * Gets command usage
+     *
+     * @return array
+     */
+    public static function getCommandUsage()
+    {
+        $result = [];
+        foreach (self::getCliConfig() as $key => $cmd) {
+            $result[$key] = $cmd['usage'];
+        }
+        return $result;
+    }
+
     /**
      * The CLI that this controller implements
      *
@@ -416,7 +429,7 @@ public function maintenanceAction()
     public function helpAction()
     {
         $type = $this->getRequest()->getParam('type');
-        $details = self::getCliConfig();
+        $usages = self::getCommandUsage();
         switch($type) {
             case UserConfig::KEY_LANGUAGE:
                 return $this->arrayToString($this->options->getLocaleList());
@@ -425,9 +438,9 @@ public function helpAction()
             case UserConfig::KEY_TIMEZONE:
                 return $this->arrayToString($this->options->getTimezoneList());
             default:
-                if (isset($details[$type])) {
-                    if ($details[$type]['usage']) {
-                        $formatted = $this->formatCliUsage($details[$type]['usage']);
+                if (isset($usages[$type])) {
+                    if ($usages[$type]) {
+                        $formatted = $this->formatCliUsage($usages[$type]);
                         return "\nAvailable parameters:\n{$formatted}\n";
                     }
                     return "\nThis command has no parameters.\n";
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
index c0e0e29fda9dc..8737827ae4781 100644
--- a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
@@ -8,6 +8,8 @@
 
 namespace Magento\Setup\Mvc\Console;
 
+use Magento\Setup\Controller\ConsoleController;
+
 /**
  * Validator for checking parameters in CLI
  */
@@ -79,13 +81,14 @@ public function validate(array $data, array $config)
                 $validationMessages .= PHP_EOL;
             }
             if (empty($missingParams) && empty($extraParams) && empty($missingValues) && empty($extraValue)) {
-                $validationMessages .= 'Please make sure parameters start with --.' . PHP_EOL;
-                $validationMessages .= PHP_EOL;
+                $validationMessages .= 'Please make sure parameters are in correct format and are not repeated.';
+                $validationMessages .= PHP_EOL . PHP_EOL;
             }
 
             // add usage message
-            $validationMessages .= 'Usage:' . PHP_EOL;
-            $validationMessages .= $config[$userAction]['options']['route'] . PHP_EOL . PHP_EOL;
+            $usages = ConsoleController::getCommandUsage();
+            $validationMessages .= 'Usage:' . PHP_EOL . "{$userAction} ";
+            $validationMessages .= $usages[$userAction] . PHP_EOL . PHP_EOL;
 
         } else if (!is_null($userAction)) {
             $validationMessages .= PHP_EOL . "Unknown action name '{$userAction}'." . PHP_EOL . PHP_EOL;
@@ -137,6 +140,19 @@ public function checkMissingParameter($expectedParams, $actualParams)
                 unset($missingParams[$key]);
             }
         }
+        // some parameters have alternative names, verify user input with theses alternative names
+        foreach ($missingParams as $key => $missingParam) {
+            foreach (array_keys($actualParams) as $actualParam) {
+                if (isset($expectedParams[$missingParam]['alternatives'])) {
+                    foreach ($expectedParams[$missingParam]['alternatives'] as $alternative) {
+                        if ($actualParam === $alternative) {
+                            unset($missingParams[$key]);
+                            break 2;
+                        }
+                    }
+                }
+            }
+        }
         return $missingParams;
     }
 
@@ -150,6 +166,19 @@ public function checkMissingParameter($expectedParams, $actualParams)
     public function checkExtraParameter($expectedParams, $actualParams)
     {
         $extraParams = array_diff(array_keys($actualParams), array_keys($expectedParams));
+        // some parameters have alternative names, make sure $extraParams doesn't contain these alternatives names
+        foreach ($extraParams as $key => $extraParam) {
+            foreach ($expectedParams as $expectedParam) {
+                if (isset($expectedParam['alternatives'])) {
+                    foreach ($expectedParam['alternatives'] as $alternative) {
+                        if ($extraParam === $alternative) {
+                            unset($extraParams[$key]);
+                            break 2;
+                        }
+                    }
+                }
+            }
+        }
         return $extraParams;
     }
 

From 526caa508ea0c84fb367c5a22e6a695a17458ab6 Mon Sep 17 00:00:00 2001
From: vgrygor <vgrygor@ebay.com>
Date: Thu, 4 Dec 2014 13:11:59 +0200
Subject: [PATCH 102/474] MAGETWO-30317: Css minificator works incorrectly.

---
 .../Css/PreProcessor/Adapter/OyejorgeTest.php       | 13 +++++++++++++
 .../Css/PreProcessor/_files/minificate.css          |  1 +
 lib/internal/Less/Parser.php                        |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/OyejorgeTest.php b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/OyejorgeTest.php
index 7322fe411904d..758d5af0a4e08 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/OyejorgeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/OyejorgeTest.php
@@ -39,4 +39,17 @@ public function testProcess()
             : file_get_contents(__DIR__ . '/../_files/oyejorge.css');
         $this->assertEquals($expectedCss, $this->model->process($sourceFilePath));
     }
+
+    /**
+     *  Patch in MAGETWO-30317
+     */
+    public function testMinificatorProcess()
+    {
+        $sourceFilePath = realpath(__DIR__ . '/../_files/oyejorge.less');
+        $options = array('relativeUrls' => false, 'compress' => true);
+        $parser = new \Less_Parser($options);
+        $parser->parseFile($sourceFilePath, '');
+        $expectedCss = file_get_contents(__DIR__ . '/../_files/minificate.css');
+        $this->assertEquals($expectedCss, $parser->getCss());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css
new file mode 100644
index 0000000000000..e0a7f5ba7f704
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css
@@ -0,0 +1 @@
+#header{color:#4d926f}h2{color:#4d926f}#header{-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;-o-border-radius:5px;border-radius:5px}#footer{-webkit-border-radius:10px;-moz-border-radius:10px;-ms-border-radius:10px;-o-border-radius:10px;border-radius:10px}#header h1{font-size:26px;font-weight:bold}#header p{font-size:12px}#header p a{text-decoration:none}#header p a:hover{border-width:1px}#header{color:#333;border-left:1px;border-right:2px}#footer{color:#141;border-color:#7d2717}body{background-image:url(Magento_Theme::validation_advice_bg.gif)}
\ No newline at end of file
diff --git a/lib/internal/Less/Parser.php b/lib/internal/Less/Parser.php
index e759f2ea1c6e1..d7121e0210b9a 100644
--- a/lib/internal/Less/Parser.php
+++ b/lib/internal/Less/Parser.php
@@ -179,7 +179,7 @@ public function getCss(){
 		}
 
 		if( Less_Parser::$options['compress'] ){
-			$css = preg_replace('/(^(\s)+)|((\s)+$)/', '', $css);
+            $css = preg_replace('/\s*([a-z]{2,})\s*(:|>|,|!)\s*("[^"]*"|\'[^\']*\'|[\w]*|[^;]*)/', '$1$2$3', $css);
 		}
 
 		//reset php settings

From 380542447371b1fd9ae50296e1d7b1f454b58957 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com>
Date: Thu, 4 Dec 2014 17:29:24 +0200
Subject: [PATCH 103/474] MAGETWO-31358: [TD] Tax Service coverage issues

---
 .../Tax/Model/TaxRateManagementTest.php       | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateManagementTest.php

diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateManagementTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateManagementTest.php
new file mode 100644
index 0000000000000..529313ce6b05f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateManagementTest.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Tax\Model;
+
+class TaxRateManagementTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Tax\Model\TaxRateManagement
+     */
+    protected $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchCriteriaBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filterBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $taxRuleRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $taxRateRepositoryMock;
+
+    protected function setUp()
+    {
+        $this->filterBuilderMock = $this->getMock('\Magento\Framework\Api\FilterBuilder', [], [], '', false);
+        $this->taxRuleRepositoryMock = $this->getMock('\Magento\Tax\Api\TaxRuleRepositoryInterface', [], [], '', false);
+        $this->taxRateRepositoryMock = $this->getMock('\Magento\Tax\Api\TaxRateRepositoryInterface', [], [], '', false);
+        $this->searchCriteriaBuilderMock = $this->getMock(
+            '\Magento\Framework\Api\SearchCriteriaBuilder',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->model = new \Magento\Tax\Model\TaxRateManagement(
+            $this->taxRuleRepositoryMock,
+            $this->taxRateRepositoryMock,
+            $this->filterBuilderMock,
+            $this->searchCriteriaBuilderMock
+        );
+    }
+
+    public function testGetRatesByCustomerAndProductTaxClassId()
+    {
+        $customerTaxClassId = 4;
+        $productTaxClassId = 42;
+        $rateIds = [10];
+        $productFilterMock = $this->getMock('\Magento\Framework\Api\Filter', [], [], '', false);
+        $customerFilterMock = $this->getMock('\Magento\Framework\Api\Filter', [], [], '', false);
+        $searchCriteriaMock = $this->getMock('\Magento\Framework\Api\SearchCriteria', [], [], '', false);
+        $searchResultsMock = $this->getMock('\Magento\Tax\Api\Data\TaxRuleSearchResultsInterface', [], [], '', false);
+        $taxRuleMock = $this->getMock('\Magento\Tax\Api\Data\TaxRuleInterface', [], [], '', false);
+        $taxRateMock = $this->getMock('\Magento\Tax\Api\Data\TaxRateInterface', [], [], '', false);
+
+        $this->filterBuilderMock->expects($this->exactly(2))->method('setField')->withConsecutive(
+            ['customer_tax_class_ids'],
+            ['product_tax_class_ids']
+        )->willReturnSelf();
+        $this->filterBuilderMock->expects($this->exactly(2))->method('setValue')->withConsecutive(
+            [$this->equalTo([$customerTaxClassId])],
+            [$this->equalTo([$productTaxClassId])]
+        )->willReturnSelf();
+        $this->filterBuilderMock->expects($this->exactly(2))->method('create')->willReturnOnConsecutiveCalls(
+            $customerFilterMock,
+            $productFilterMock
+        );
+        $this->searchCriteriaBuilderMock->expects($this->exactly(2))->method('addFilter')->withConsecutive(
+            [[$customerFilterMock]],
+            [[$productFilterMock]]
+        );
+        $this->searchCriteriaBuilderMock->expects($this->once())->method('create')->willReturn($searchCriteriaMock);
+        $this->taxRuleRepositoryMock->expects($this->once())->method('getList')->with($searchCriteriaMock)
+            ->willReturn($searchResultsMock);
+        $searchResultsMock->expects($this->once())->method('getItems')->willReturn([$taxRuleMock]);
+        $taxRuleMock->expects($this->once())->method('getTaxRateIds')->willReturn($rateIds);
+        $this->taxRateRepositoryMock->expects($this->once())->method('get')->with($rateIds[0])
+            ->willReturn($taxRateMock);
+        $this->assertEquals(
+            [$taxRateMock],
+            $this->model->getRatesByCustomerAndProductTaxClassId($customerTaxClassId, $productTaxClassId)
+        );
+    }
+}

From aee77c80b596cc01ebab0b11892d9eb9618186e6 Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Thu, 4 Dec 2014 18:22:38 +0200
Subject: [PATCH 104/474] MTA-1081: Test Creation for InstallationEntity

- Added data set to the test
---
 dev/tests/functional/composer.json            |  1 -
 .../functional/config/install_data.yml.dist   |  6 +-
 .../Magento/Backend/Test/Block/Page/Main.php  | 34 ++++++++
 .../Backend/Test/Page/Adminhtml/Dashboard.xml |  5 ++
 .../Install/Test/Block/ConfigurationForm.php  | 82 ++++++++++++++++++
 .../Install/Test/Block/CreateAdmin.xml        |  2 +-
 .../Install/Test/Block/CustomizeStore.xml     | 21 +++++
 .../Magento/Install/Test/Block/Database.xml   |  5 +-
 .../Install/Test/Block/WebConfiguration.php   | 24 ++++--
 .../Install/Test/Block/WebConfiguration.xml   | 21 ++++-
 .../Constraint/AssertCurrencySelected.php     | 66 +++++++++++++++
 .../Test/Constraint/AssertKeyCreated.php      | 68 +++++++++++++++
 .../Constraint/AssertLanguageSelected.php     | 67 +++++++++++++++
 .../Test/Constraint/AssertRewritesEnabled.php | 72 ++++++++++++++++
 .../Constraint/AssertSecureUrlEnabled.php     | 81 ++++++++++++++++++
 .../Test/Constraint/AssertSuccessInstall.php  |  9 +-
 .../Constraint/AssertTablePrefixCreated.php   | 56 +++++++++++++
 .../Magento/Install/Test/Fixture/Install.php  | 84 ++++++++++++++++++-
 .../Magento/Install/Test/Fixture/Install.xml  | 46 +++++++++-
 .../Install/Test/TestCase/InstallTest.php     | 62 +++++++-------
 .../Test/TestCase/InstallTest/test.csv        |  9 +-
 .../Magento/Install/Test/etc/constraint.xml   | 41 +++++++++
 .../app/Magento/Install/Test/etc/fixture.xml  |  6 +-
 .../Magento/Theme/Test/Block/Html/Footer.php  |  2 +-
 .../Constraint/AssertUserSuccessLogin.php     |  1 +
 25 files changed, 810 insertions(+), 61 deletions(-)
 create mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/ConfigurationForm.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertTablePrefixCreated.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index ac15946538a97..b004c39d46c39 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -21,7 +21,6 @@
             "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
             "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
             "Test\\": "generated/Test/"
-
         }
     }
 }
diff --git a/dev/tests/functional/config/install_data.yml.dist b/dev/tests/functional/config/install_data.yml.dist
index d2de7317566e3..06ab837ed7cd6 100644
--- a/dev/tests/functional/config/install_data.yml.dist
+++ b/dev/tests/functional/config/install_data.yml.dist
@@ -1,8 +1,8 @@
 db_credentials:
     dbHost: '127.0.0.1'
     dbUser: 'root'
-    dbPassword: ''
-    dbName: 'database_name'
+    dbPassword: '123123q'
+    dbname: 'pr'
 url:
-    base_url: 'http://127.0.0.1/magento2/index.php/'
+    base_url: 'http://192.168.56.101/pr/'
     backend_frontname: 'backend'
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
new file mode 100644
index 0000000000000..16fc7bbc3174c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Backend\Test\Block\Page;
+
+use Mtf\Block\Block;
+
+/**
+ * Main block.
+ */
+class Main extends Block
+{
+    /**
+     * Selector for prices.
+     *
+     * @var string
+     */
+    protected $priceBlock = '.price';
+
+    /**
+     * Get price block.
+     *
+     * @return string
+     */
+    public function getPrice()
+    {
+        return $this->_rootElement->find($this->priceBlock)->getText();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
index 7e2dd7406d204..62f41ed0e12e1 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
@@ -19,6 +19,11 @@
             <locator>.page-title</locator>
             <strategy>css selector</strategy>
         </titleBlock>
+        <mainBlock>
+            <class>Magento\Backend\Test\Block\Page\Main</class>
+            <locator>.dashboard-main</locator>
+            <strategy>css selector</strategy>
+        </mainBlock>
         <menuBlock>
             <class>Magento\Backend\Test\Block\Menu</class>
             <locator>.navigation</locator>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/ConfigurationForm.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/ConfigurationForm.php
new file mode 100644
index 0000000000000..bfacaad52da98
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/ConfigurationForm.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Install\Test\Block;
+
+use Mtf\Client\Element;
+
+/**
+ * Is used to replace locator on radio button.
+ *
+ * @api
+ */
+class ConfigurationForm extends \Mtf\Block\Form
+{
+    /**
+     * Fixture mapping.
+     *
+     * @param array|null $fields
+     * @param string|null $parent
+     * @return array
+     */
+    protected function dataMapping(array $fields = null, $parent = null)
+    {
+        $mapping = [];
+        $mappingFields = ($parent !== null) ? $parent : $this->mapping;
+        $data = ($this->mappingMode || null === $fields) ? $mappingFields : $fields;
+        foreach ($data as $key => $value) {
+            if (isset($value['value'])) {
+                $value = $value['value'];
+            }
+            if (!$this->mappingMode && is_array($value) && null !== $fields
+                && isset($mappingFields[$key]['composite'])
+            ) {
+                $mapping[$key] = $this->dataMapping($value, $mappingFields[$key]);
+            } else {
+                $mapping[$key]['selector'] = isset($mappingFields[$key]['selector'])
+                    ? $mappingFields[$key]['selector']
+                    : (($this->wrapper != '') ? "[name='{$this->wrapper}" . "[{$key}]']" : "[name={$key}]");
+                if (isset($fields[$key]) && strpos($mapping[$key]['selector'], '%s') !== false) {
+                    $mapping[$key]['selector'] = sprintf($mapping[$key]['selector'], $fields[$key]);
+                    $fields[$key] = "Yes";
+                    $value = "Yes";
+                }
+                $mapping[$key]['strategy'] = isset($mappingFields[$key]['strategy'])
+                    ? $mappingFields[$key]['strategy']
+                    : Element\Locator::SELECTOR_CSS;
+                $mapping[$key]['input'] = isset($mappingFields[$key]['input'])
+                    ? $mappingFields[$key]['input']
+                    : null;
+                $mapping[$key]['class'] = isset($mappingFields[$key]['class'])
+                    ? $mappingFields[$key]['class']
+                    : null;
+                $mapping[$key]['value'] = $this->mappingMode
+                    ? (isset($fields[$key]['value']) ? $fields[$key]['value'] : $fields[$key])
+                    : $value;
+            }
+        }
+
+        return $mapping;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml
index 1687aeb73e589..4b4c273e145ba 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml
@@ -7,7 +7,7 @@
  * @license     {license_link}
  */
 -->
-<mapping strict="1">
+<mapping strict="0">
     <fields>
         <username>
             <selector>[name='adminUsername']</selector>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml
new file mode 100644
index 0000000000000..954f66be0af8c
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+<mapping strict="0">
+    <fields>
+        <currency>
+            <selector>[ng-model*='currency']</selector>
+            <input>select</input>
+        </currency>
+        <language>
+            <selector>[ng-model*='language']</selector>
+            <input>select</input>
+        </language>
+    </fields>
+</mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
index 3117a39be68a7..420f8128ca14d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
@@ -7,11 +7,12 @@
  * @license     {license_link}
  */
 -->
-<mapping strict="1">
+<mapping strict="0">
     <fields>
         <dbHost />
         <dbUser />
         <dbPassword />
-        <dbName />
+        <dbname />
+        <dbTablePrefix />
     </fields>
 </mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
index 838318e05ca61..96f881de2b507 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
@@ -8,13 +8,10 @@
 
 namespace Magento\Install\Test\Block;
 
-use Mtf\Block\Form;
-use Mtf\Client\Element\Locator;
-
 /**
  * Web configuration block.
  */
-class WebConfiguration extends Form
+class WebConfiguration extends ConfigurationForm
 {
     /**
      * 'Next' button.
@@ -23,6 +20,13 @@ class WebConfiguration extends Form
      */
     protected $next = "[ng-click*='next']";
 
+    /**
+     * 'Advanced Options' locator.
+     *
+     * @var string
+     */
+    protected $advancedOptions = "[ng-click*='advanced']";
+
     /**
      * Click on 'Next' button.
      *
@@ -30,6 +34,16 @@ class WebConfiguration extends Form
      */
     public function clickNext()
     {
-        $this->_rootElement->find($this->next, Locator::SELECTOR_CSS)->click();
+        $this->_rootElement->find($this->next)->click();
+    }
+
+    /**
+     * Click on 'Advanced Options' button.
+     *
+     * @return void
+     */
+    public function clickAdvancedOptions()
+    {
+        $this->_rootElement->find($this->advancedOptions)->click();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
index d6479e13c3b15..edd3b4f66b87d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
@@ -7,9 +7,28 @@
  * @license     {license_link}
  */
 -->
-<mapping strict="1">
+<mapping strict="0">
     <fields>
         <web />
         <admin />
+        <keyOwn>
+            <selector>[value="%s"]</selector>
+            <input>checkbox</input>
+        </keyOwn>
+        <keyValue>
+            <selector>[name="key"]</selector>
+        </keyValue>
+        <apacheRewrites>
+            <selector>[ng-model*="rewrites"]</selector>
+            <input>checkbox</input>
+        </apacheRewrites>
+        <httpsFront>
+            <selector>[ng-model*="front"]</selector>
+            <input>checkbox</input>
+        </httpsFront>
+        <httpsAdmin>
+            <selector>[ng-model*="admin"]</selector>
+            <input>checkbox</input>
+        </httpsAdmin>
     </fields>
 </mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
new file mode 100644
index 0000000000000..fbadf447735e2
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that selected currency symbol displays in admin.
+ */
+class AssertCurrencySelected extends AbstractConstraint
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'low';
+
+    /**
+     * Assert that selected currency symbol displays on dashboard.
+     *
+     * @param string $currencySymbol
+     * @param Dashboard $dashboardPage
+     * @return void
+     */
+    public function processAssert($currencySymbol, Dashboard $dashboardPage)
+    {
+        \PHPUnit_Framework_Assert::assertTrue(
+            strpos($dashboardPage->getMainBlock()->getPrice(), $currencySymbol) !== false,
+            'Selected currency symbol not displays on dashboard.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Selected currency displays in admin.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
new file mode 100644
index 0000000000000..de68ee0c9bc96
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Install\Test\Page\Install;
+use Magento\Install\Test\Fixture\Install as InstallConfig;
+
+/**
+ * Assert that selected encryption key displays on success full install page.
+ */
+class AssertKeyCreated extends AbstractConstraint
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'low';
+
+    /**
+     * Assert that selected encryption key displays on success full install page.
+     *
+     * @param Install $installPage
+     * @param InstallConfig $installConfig
+     * @return void
+     */
+    public function processAssert(Install $installPage, InstallConfig $installConfig)
+    {
+        \PHPUnit_Framework_Assert::assertEquals(
+            $installConfig->getKeyValue(),
+            $installPage->getInstallBlock()->getAdminInfo()['encryption_key'],
+            'Selected encryption key on install page not equals to data from fixture.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Selected encryption key displays on success full install page.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
new file mode 100644
index 0000000000000..4708ddf9d4621
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Magento\Cms\Test\Page\CmsIndex;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that selected language currently displays on frontend.
+ */
+class AssertLanguageSelected extends AbstractConstraint
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'low';
+
+    /**
+     * Assert that selected language currently displays on frontend.
+     *
+     * @param string $languageTemplate
+     * @param CmsIndex $indexPage
+     * @return void
+     */
+    public function processAssert($languageTemplate, CmsIndex $indexPage)
+    {
+        $indexPage->open();
+        \PHPUnit_Framework_Assert::assertTrue(
+            $indexPage->getLinksBlock()->isLinkVisible($languageTemplate),
+            'Selected language not displays on frontend.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Selected language currently displays on frontend.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
new file mode 100644
index 0000000000000..31c9614b8ffca
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Mtf\Client\Browser;
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that apache redirect correct work.
+ */
+class AssertRewritesEnabled extends AbstractConstraint
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'low';
+
+    /**
+     * Assert that apache redirect correct work.
+     *
+     * @param Browser $browser
+     * @return void
+     */
+    public function processAssert(Browser $browser)
+    {
+        $frontUrl = str_replace('index.php/', '', $_ENV['app_frontend_url']);
+        $browser->open($frontUrl . 'index.php/');
+        \PHPUnit_Framework_Assert::assertEquals(
+            $frontUrl,
+            $browser->getUrl(),
+            'Apache redirect on front page not work.'
+        );
+
+        $browser->open($frontUrl . 'index.php/backend/');
+        $isRedirect = strpos($browser->getUrl(), 'index.php') !== false;
+        \PHPUnit_Framework_Assert::assertTrue($isRedirect, 'Apache redirect on backend not work.');
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Apache redirect correct work.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
new file mode 100644
index 0000000000000..dfaee659177f4
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Mtf\Client\Browser;
+use Mtf\TestStep\TestStepFactory;
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
+
+/**
+ * Assert that Secure Urls Enabled.
+ */
+class AssertSecureUrlEnabled extends AbstractConstraint
+{
+    /**
+     * Constraint severeness.
+     *
+     * @var string
+     */
+    protected $severeness = 'low';
+
+    /**
+     * Assert that Secure Urls Enabled.
+     *
+     * @param CatalogProductSimple $productSimple
+     * @param TestStepFactory $stepFactory
+     * @param Browser $browser
+     * @return void
+     */
+    public function processAssert(CatalogProductSimple $productSimple, TestStepFactory $stepFactory, Browser $browser)
+    {
+        $browser->getUrl();
+        \PHPUnit_Framework_Assert::assertTrue(
+            strpos($browser->getUrl(), 'https://') !== false,
+            'Assert that Secure Urls not displayed on backend.'
+        );
+
+        $productSimple->persist();
+        $stepFactory->create(
+            'Magento\Catalog\Test\TestStep\AddProductsToTheCartStep',
+            ['products' => [$productSimple]]
+        )->run();
+        $stepFactory->create('Magento\Catalog\Test\TestStep\ProceedToCheckoutStep')->run();
+        \PHPUnit_Framework_Assert::assertTrue(
+            strpos($browser->getUrl(), 'https://') !== false,
+            'Assert that Secure Urls not displayed on frontend.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Secure Urls display successful.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
index 19fbbf5ee12ef..fc06cda1c7da6 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
@@ -8,9 +8,10 @@
 
 namespace Magento\Install\Test\Constraint;
 
+use Magento\User\Test\Fixture\User;
 use Magento\Install\Test\Page\Install;
 use Mtf\Constraint\AbstractConstraint;
-use Magento\User\Test\Fixture\User;
+use Magento\Install\Test\Fixture\Install as InstallConfig;
 
 /**
  * Check that Magento successfully installed.
@@ -42,19 +43,19 @@ class AssertSuccessInstall extends AbstractConstraint
      * @var array
      */
     protected $dbFieldsList = [
-        ['pageData' => 'database_name', 'fixture' => 'dbName'],
+        ['pageData' => 'database_name', 'fixture' => 'dbname'],
         ['pageData' => 'username', 'fixture' => 'dbUser']
     ];
 
     /**
      * Assert that Magento successfully installed.
      *
-     * @param $installConfig
+     * @param InstallConfig $installConfig
      * @param User $user
      * @param Install $installPage
      * @return void
      */
-    public function processAssert(Install $installPage, $installConfig, User $user)
+    public function processAssert(Install $installPage, InstallConfig $installConfig, User $user)
     {
         $adminData = $installPage->getInstallBlock()->getAdminInfo();
         $dbData = $installPage->getInstallBlock()->getDbInfo();
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertTablePrefixCreated.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertTablePrefixCreated.php
new file mode 100644
index 0000000000000..e2833d2eb5fef
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertTablePrefixCreated.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Install\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Class AssertTablePrefixCreated
+ */
+class AssertTablePrefixCreated extends AbstractConstraint
+{
+    /**
+     * Constraint severeness
+     *
+     * @var string
+     */
+    protected $severeness = 'low';
+
+    /**
+     * @return void
+     */
+    public function processAssert()
+    {
+        //
+    }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        //
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
index fc795cd9c4047..f0a80794af760 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
@@ -43,8 +43,8 @@ class Install extends InjectableFixture
         'backend_type' => 'virtual',
     ];
 
-    protected $dbName = [
-        'attribute_code' => 'dbName',
+    protected $dbname = [
+        'attribute_code' => 'dbname',
         'backend_type' => 'virtual',
     ];
 
@@ -78,6 +78,46 @@ class Install extends InjectableFixture
         'backend_type' => 'virtual',
     ];
 
+    protected $apacheRewrites = [
+        'attribute_code' => 'apacheRewrites',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $dbTablePrefix = [
+        'attribute_code' => 'dbTablePrefix',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $keyOwn = [
+        'attribute_code' => 'keyOwn',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $httpsAdmin = [
+        'attribute_code' => 'httpsAdmin',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $httpsFront = [
+        'attribute_code' => 'httpsFront',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $keyValue = [
+        'attribute_code' => 'keyValue',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $language = [
+        'attribute_code' => 'language',
+        'backend_type' => 'virtual',
+    ];
+
+    protected $currency = [
+        'attribute_code' => 'language',
+        'backend_type' => 'virtual',
+    ];
+
     public function getDbHost()
     {
         return $this->getData('dbHost');
@@ -127,4 +167,44 @@ public function getAdminConfirm()
     {
         return $this->getData('adminConfirm');
     }
+
+    public function getCurrency()
+    {
+        return $this->getData('currency');
+    }
+
+    public function getApacheRewrites()
+    {
+        return $this->getData('apacheRewrites');
+    }
+
+    public function getKeyOwn()
+    {
+        return $this->getData('keyOwn');
+    }
+
+    public function getKeyValue()
+    {
+        return $this->getData('keyValue');
+    }
+
+    public function getLanguage()
+    {
+        return $this->getData('language');
+    }
+
+    public function getHttpsAdmin()
+    {
+        return $this->getData('httpsAdmin');
+    }
+
+    public function getHttpsFront()
+    {
+        return $this->getData('httpsFront');
+    }
+
+    public function getDbTablePrefix()
+    {
+        return $this->getData('dbTablePrefix');
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
index 06d50c1e73769..b531a34e8126c 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
@@ -20,18 +20,58 @@
             <attribute_code>dbUser</attribute_code>
             <backend_type>virtual</backend_type>
         </dbUser>
+        <dbTablePrefix>
+            <attribute_code>dbTablePrefix</attribute_code>
+            <backend_type>virtual</backend_type>
+        </dbTablePrefix>
         <dbPassword>
             <attribute_code>dbPassword</attribute_code>
             <backend_type>virtual</backend_type>
         </dbPassword>
-        <dbName>
-            <attribute_code>dbName</attribute_code>
+        <dbname>
+            <attribute_code>dbname</attribute_code>
             <backend_type>virtual</backend_type>
-        </dbName>
+        </dbname>
         <web>
             <attribute_code>web</attribute_code>
             <backend_type>virtual</backend_type>
         </web>
+        <dbTablePrefix>
+            <attribute_code>dbTablePrefix</attribute_code>
+            <backend_type>virtual</backend_type>
+        </dbTablePrefix>
+        <admin>
+            <attribute_code>admin</attribute_code>
+            <backend_type>virtual</backend_type>
+        </admin>
+        <httpsFront>
+            <attribute_code>httpsFront</attribute_code>
+            <backend_type>virtual</backend_type>
+        </httpsFront>
+        <httpsAdmin>
+            <attribute_code>httpsAdmin</attribute_code>
+            <backend_type>virtual</backend_type>
+        </httpsAdmin>
+        <apacheRewrites>
+            <attribute_code>apacheRewrites</attribute_code>
+            <backend_type>virtual</backend_type>
+        </apacheRewrites>
+        <keyOwn>
+            <attribute_code>keyOwn</attribute_code>
+            <backend_type>virtual</backend_type>
+        </keyOwn>
+        <keyValue>
+            <attribute_code>keyValue</attribute_code>
+            <backend_type>virtual</backend_type>
+        </keyValue>
+        <language>
+            <attribute_code>language</attribute_code>
+            <backend_type>virtual</backend_type>
+        </language>
+        <currency>
+            <attribute_code>currency</attribute_code>
+            <backend_type>virtual</backend_type>
+        </currency>
     </fields>
     <repository_class>Magento\Install\Test\Repository\Install</repository_class>
     <handler_interface>Magento\Install\Test\Handler\Install\InstallInterface</handler_interface>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
index 76ef367c572e3..04425ca2f5924 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
@@ -14,11 +14,10 @@
 use Magento\User\Test\Fixture\User;
 use Mtf\Fixture\FixtureFactory;
 use Mtf\TestCase\Injectable;
-use Mtf\ObjectManager;
+use Mtf\System\Config;
 use Magento\Install\Test\Constraint\AssertAgreementTextPresent;
 use Magento\Install\Test\Constraint\AssertSuccessfulReadinessCheck;
 use Magento\Install\Test\Constraint\AssertSuccessDbConnection;
-use Magento\Install\Test\Constraint\AssertSuccessInstall;
 
 /**
  * PLEASE ADD NECESSARY INFO BEFORE RUNNING TEST TO
@@ -26,10 +25,10 @@
  *
  * Test Flow:
  *
- * Preconditions
+ * Preconditions:
  * 1. Uninstall Magento.
  *
- * Steps
+ * Steps:
  * 1. Go setup landing page.
  * 2. Click on "Terms and agreements" button.
  * 3. Check license agreement text.
@@ -66,28 +65,18 @@ class InstallTest extends Injectable
     /**
      * Uninstall Magento before test.
      *
-     * @param FixtureFactory $fixtureFactory
-     * @param ObjectManager $objectManager
+     * @param Config $systemConfig
      * @return array
      */
-    public function __prepare(FixtureFactory $fixtureFactory, ObjectManager $objectManager)
+    public function __prepare(Config $systemConfig)
     {
-        $systemConfig = $objectManager->getInstance()->create('Mtf\System\Config');
-        // database
+        // Prepare config data
         $configData = $systemConfig->getConfigParam('install_data/db_credentials');
-        //url
         $urlConfig = $systemConfig->getConfigParam('install_data/url');
         $configData['web'] = $urlConfig['base_url'];
         $configData['admin'] = $urlConfig['backend_frontname'];
-        // admin user
-        $adminCredentials = $systemConfig->getConfigParam('application/backend_user_credentials');
-        $userData['username'] = $adminCredentials['login'];
-        $userData['password'] = $adminCredentials['password'];
-        $userData['password_confirmation'] = $adminCredentials['password'];
-        $user = $fixtureFactory->createByCode('user', ['dataSet' => 'default', 'data' => $userData]);
-        $installConfig = $fixtureFactory->createByCode('install', ['data' => $configData]);
 
-        return ['user' => $user, 'installConfig' => $installConfig];
+        return ['configData' => $configData];
     }
 
     /**
@@ -100,7 +89,7 @@ public function __prepare(FixtureFactory $fixtureFactory, ObjectManager $objectM
     public function __inject(Install $installPage, CmsIndex $homePage)
     {
         $magentoBaseDir = dirname(dirname(dirname(MTF_BP)));
-        // Uninstall Magento
+        // Uninstall Magento.
         shell_exec("php -f $magentoBaseDir/setup/index.php uninstall");
         $this->installPage = $installPage;
         $this->homePage = $homePage;
@@ -110,47 +99,54 @@ public function __inject(Install $installPage, CmsIndex $homePage)
      * Install Magento via web interface.
      *
      * @param User $user
-     * @param InstallConfig $installConfig
+     * @param array $install
+     * @param array $configData
+     * @param FixtureFactory $fixtureFactory
      * @param AssertAgreementTextPresent $assertLicense
      * @param AssertSuccessfulReadinessCheck $assertReadiness
      * @param AssertSuccessDbConnection $assertDbConnection
-     * @param AssertSuccessInstall $assertInstall
-     * @return void
+     * @return array
      */
     public function test(
         User $user,
-        InstallConfig $installConfig,
+        array $install,
+        array $configData,
+        FixtureFactory $fixtureFactory,
         AssertAgreementTextPresent $assertLicense,
         AssertSuccessfulReadinessCheck $assertReadiness,
-        AssertSuccessDbConnection $assertDbConnection,
-        AssertSuccessInstall $assertInstall
+        AssertSuccessDbConnection $assertDbConnection
     ) {
+        $dataConfig = array_merge($install, $configData);
+        /** @var InstallConfig $installConfig */
+        $installConfig = $fixtureFactory->create('Magento\Install\Test\Fixture\Install', ['data' => $dataConfig]);
         // Steps
         $this->homePage->open();
-        // Verify license agreement
+        // Verify license agreement.
         $this->installPage->getLandingBlock()->clickTermsAndAgreement();
         $assertLicense->processAssert($this->installPage);
         $this->installPage->getLicenseBlock()->clickBack();
         $this->installPage->getLandingBlock()->clickAgreeAndSetup();
-        // Step 1: Readiness Check
+        // Step 1: Readiness Check.
         $this->installPage->getReadinessBlock()->clickReadinessCheck();
         $assertReadiness->processAssert($this->installPage);
         $this->installPage->getReadinessBlock()->clickNext();
-        // Step 2: Add a Database
+        // Step 2: Add a Database.
         $this->installPage->getDatabaseBlock()->fill($installConfig);
         $assertDbConnection->processAssert($this->installPage);
         $this->installPage->getDatabaseBlock()->clickNext();
-        // Step 3: Web Configuration
+        // Step 3: Web Configuration.
+        $this->installPage->getWebConfigBlock()->clickAdvancedOptions();
         $this->installPage->getWebConfigBlock()->fill($installConfig);
         $this->installPage->getWebConfigBlock()->clickNext();
         // Step 4: Customize Your Store
+        $this->installPage->getCustomizeStoreBlock()->fill($installConfig);
         $this->installPage->getCustomizeStoreBlock()->clickNext();
-        // Step 5: Create Admin Account
+        // Step 5: Create Admin Account.
         $this->installPage->getCreateAdminBlock()->fill($user);
         $this->installPage->getCreateAdminBlock()->clickNext();
-        // Step 6: Install
+        // Step 6: Install.
         $this->installPage->getInstallBlock()->clickInstallNow();
-        $assertInstall->processAssert($this->installPage, $installConfig, $user); //передавть инсталлКонфиг
-        $this->installPage->getInstallBlock()->clickLaunchAdmin();
+
+        return ['installConfig' => $installConfig];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
index b2bc7ca184274..6fade52fc9a3d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
@@ -1,2 +1,7 @@
-"constraint"
-"assertUserSuccessLogin"
+"user/dataSet";"install/dbTablePrefix";"install/admin";"install/httpsFront";"install/httpsAdmin";"install/apacheRewrites";"install/keyOwn";"install/keyValue";"install/language";"install/currency";"currencySymbol";"languageTemplate";"constraint";"description";"issue"
+"default";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin";"install with default values";""
+"default";"-";"custom";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin";"install with custom admin path";""
+"default";"-";"-";"-";"-";"-";"user";"123123qa";"German (Germany)";"Euro (EUR)";"€";"Suchbegriffe";"assertSuccessInstall, assertKeyCreated, assertUserSuccessLogin, assertCurrencySelected, assertLanguageSelected";"install with custom encryption key and changed currency and locale";""
+"default";"prefix1_";"-";"-";"-";"-";"-";"-";"Chinese (China)";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin, assertTablePrefixCreated";"install with table prefix";""
+"default";"-";"-";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin, assertRewritesEnabled";"install with enabled url rewrites";""
+"default";"-";"-";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin, assertSecureUrlEnabled";"install with enabled secure urls";"MAGETWO-31409"
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
new file mode 100644
index 0000000000000..ac612d4de6e77
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+<constraint>
+    <assertAgreementTextPresent module="Magento_Install">
+        <severeness>low</severeness>
+    </assertAgreementTextPresent>
+    <assertSuccessDbConnection module="Magento_Install">
+        <severeness>low</severeness>
+    </assertSuccessDbConnection>
+    <assertSuccessfulReadinessCheck module="Magento_Install">
+        <severeness>low</severeness>
+    </assertSuccessfulReadinessCheck>
+    <assertSuccessInstall module="Magento_Install">
+        <severeness>low</severeness>
+    </assertSuccessInstall>
+    <assertKeyCreated module="Magento_Install">
+        <severeness>low</severeness>
+    </assertKeyCreated>
+    <assertLanguageSelected module="Magento_Install">
+        <severeness>low</severeness>
+    </assertLanguageSelected>
+    <assertCurrencySelected module="Magento_Install">
+        <severeness>low</severeness>
+    </assertCurrencySelected>
+    <assertTablePrefixCreated module="Magento_Install">
+        <severeness>low</severeness>
+    </assertTablePrefixCreated>
+    <assertRewritesEnabled module="Magento_Install">
+        <severeness>low</severeness>
+    </assertRewritesEnabled>
+    <assertSecureUrlEnabled module="Magento_Install">
+        <severeness>low</severeness>
+    </assertSecureUrlEnabled>
+</constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
index b28864d6d3828..f2bbf3984604d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
@@ -25,10 +25,10 @@
                 <attribute_code>dbPassword</attribute_code>
                 <backend_type>virtual</backend_type>
             </dbPassword>
-            <dbName>
-                <attribute_code>dbName</attribute_code>
+            <dbname>
+                <attribute_code>dbname</attribute_code>
                 <backend_type>virtual</backend_type>
-            </dbName>
+            </dbname>
             <web>
                 <attribute_code>web</attribute_code>
                 <backend_type>virtual</backend_type>
diff --git a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
index 9e7afe8a6340b..d31e7207c1f04 100644
--- a/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
+++ b/dev/tests/functional/tests/app/Magento/Theme/Test/Block/Html/Footer.php
@@ -31,7 +31,7 @@ class Footer extends Block
      *
      * @var string
      */
-    protected $variableSelector = './/div[contains(@class, "links")]/*[text()="%s"]';
+    protected $variableSelector = './/ul[contains(@class, "links")]/*[text()="%s"]';
 
     /**
      * Store group dropdown selector
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
index 5fdaa694c48bd..c5467b5c70216 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
@@ -41,6 +41,7 @@ public function processAssert(
         Dashboard $dashboard,
         User $customAdmin = null
     ) {
+        $adminAuth->open();
         $adminUser = $customAdmin === null ? $user : $customAdmin;
         if ($dashboard->getAdminPanelHeader()->isVisible()) {
             $dashboard->getAdminPanelHeader()->logOut();

From 32e47bf48a0ee7ad723eca86313dbd56d1a81ac3 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Thu, 4 Dec 2014 10:45:04 -0600
Subject: [PATCH 105/474] MAGETWO-29704: composer.json Files Optimized

- added missing ZF dependency
---
 composer.json |  1 +
 composer.lock | 74 ++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/composer.json b/composer.json
index 7a69c62b8e58a..7762738a0b1c2 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,7 @@
         "zendframework/zend-console": "2.3.1",
         "zendframework/zend-modulemanager": "2.3.1",
         "zendframework/zend-mvc": "2.3.1",
+        "zendframework/zend-text": "2.3.1",
         "zendframework/zend-eventmanager": "2.3.1",
         "zendframework/zend-view": "2.3.1",
         "zendframework/zend-servicemanager": "2.3.1",
diff --git a/composer.lock b/composer.lock
index d8e494ff94077..5fe75bcec8441 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7c81cdde588be2bb2bc0b00bdd326c6e",
+    "hash": "e21eec06d0e4c84539bfd2abc42d5e4c",
     "packages": [
         {
             "name": "magento/zendframework1",
@@ -1111,6 +1111,48 @@
             ],
             "time": "2014-04-15 15:28:48"
         },
+        {
+            "name": "zendframework/zend-text",
+            "version": "2.3.1",
+            "target-dir": "Zend/Text",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zendframework/Component_ZendText.git",
+                "reference": "74215098b67b89e61ed8d1bf82c4fe79fa311885"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zendframework/Component_ZendText/zipball/74215098b67b89e61ed8d1bf82c4fe79fa311885",
+                "reference": "74215098b67b89e61ed8d1bf82c4fe79fa311885",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.23",
+                "zendframework/zend-servicemanager": "self.version",
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3-dev",
+                    "dev-develop": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend\\Text\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "keywords": [
+                "text",
+                "zf2"
+            ],
+            "time": "2014-04-15 15:29:13"
+        },
         {
             "name": "zendframework/zend-uri",
             "version": "2.3.1",
@@ -1347,25 +1389,25 @@
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "dc582a3c0180664a8fbfc5a34efaf4cc13fccc60"
+                "reference": "1b0acf162da4f30237987e61e177a57f78e3d87e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/dc582a3c0180664a8fbfc5a34efaf4cc13fccc60",
-                "reference": "dc582a3c0180664a8fbfc5a34efaf4cc13fccc60",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1b0acf162da4f30237987e61e177a57f78e3d87e",
+                "reference": "1b0acf162da4f30237987e61e177a57f78e3d87e",
                 "shasum": ""
             },
             "require": {
-                "symfony/config": "@stable",
-                "symfony/dependency-injection": "@stable",
-                "symfony/filesystem": "@stable"
+                "symfony/config": ">=2.4",
+                "symfony/dependency-injection": ">=2.4",
+                "symfony/filesystem": ">=2.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "3.*@stable",
+                "phpunit/phpunit": "4.*@stable",
                 "squizlabs/php_codesniffer": "@stable"
             },
             "bin": [
@@ -1382,7 +1424,7 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2014-10-08 06:54:50"
+            "time": "2014-12-04 12:38:39"
         },
         {
             "name": "phpmd/phpmd",
@@ -1799,16 +1841,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "1.0.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef"
+                "reference": "c484a80f97573ab934e37826dba0135a3301b26a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e54a01c0da1b87db3c5a3c4c5277ddf331da4aef",
-                "reference": "e54a01c0da1b87db3c5a3c4c5277ddf331da4aef",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c484a80f97573ab934e37826dba0135a3301b26a",
+                "reference": "c484a80f97573ab934e37826dba0135a3301b26a",
                 "shasum": ""
             },
             "require": {
@@ -1822,7 +1864,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
@@ -1859,7 +1901,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2014-05-11 23:00:21"
+            "time": "2014-11-16 21:32:38"
         },
         {
             "name": "sebastian/diff",

From aeb896a305891e04484fc781516ce4bae3596e65 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com>
Date: Thu, 4 Dec 2014 19:00:03 +0200
Subject: [PATCH 106/474] MAGETWO-31358: [TD] Tax Service coverage issues

---
 .../Tax/Model/TaxRuleRepositoryTest.php       | 105 ++++++++++++++----
 1 file changed, 82 insertions(+), 23 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php
index e4097170407c2..788349e649a8d 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleRepositoryTest.php
@@ -7,6 +7,8 @@
  */
 namespace Magento\Tax\Model;
 
+use Magento\Framework\Model\Exception as ModelException;
+use Magento\Framework\Api\SearchCriteria as SearchCriteria;
 
 class TaxRuleRepositoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -59,7 +61,11 @@ protected function setUp()
         );
         $this->ruleFactory = $this->getMock('\Magento\Tax\Model\Calculation\RuleFactory', [], [], '', false);
         $this->collectionFactory = $this->getMock(
-            '\Magento\Tax\Model\Resource\Calculation\Rule\CollectionFactory', ['create'], [], '', false
+            '\Magento\Tax\Model\Resource\Calculation\Rule\CollectionFactory',
+            ['create'],
+            [],
+            '',
+            false
         );
         $this->resource = $this->getMock('\Magento\Tax\Model\Resource\Calculation\Rule', [], [], '', false);
 
@@ -110,30 +116,83 @@ public function testSave()
         $this->assertEquals($rule, $this->model->save($rule));
     }
 
-    public function testGetList()
+    /**
+     * @dataProvider saveExceptionsDataProvider
+     * @param $exceptionObject
+     * @param $exceptionName
+     * @param $exceptionMessage
+     */
+    public function testSaveWithExceptions($exceptionObject, $exceptionName, $exceptionMessage)
     {
-        $taxRuleOne = $this->getMock('\Magento\Tax\Api\Data\TaxRuleInterface');
-        $taxRuleTwo = $this->getMock('\Magento\Tax\Api\Data\TaxRuleInterface');
-        $searchCriteria = $this->getMock('\Magento\Framework\Api\SearchCriteria', [], [], '', false);
-        $searchCriteria->expects($this->once())->method('getFilterGroups')->willReturn([]);
-        $searchCriteria->expects($this->once())->method('getPageSize')->willReturn(20);
-        $searchCriteria->expects($this->once())->method('getCurrentPage')->willReturn(0);
-
-        $result = $this->getMock('\Magento\Tax\Api\Data\TaxRuleSearchResultsInterface');
-        $collection = $this->objectManager->getCollectionMock(
-            '\Magento\Tax\Model\Resource\TaxClass\Collection',
-            [$taxRuleOne, $taxRuleTwo]
-        );
-        $collection->expects($this->any())->method('getSize')->willReturn(2);
-        $collection->expects($this->any())->method('setItems')->with([$taxRuleOne, $taxRuleTwo]);
-        $collection->expects($this->once())->method('setCurPage')->with(0);
-        $collection->expects($this->once())->method('setPageSize')->with(20);
+        $rule = $this->getMock('\Magento\Tax\Model\Calculation\Rule', [], [], '', false);
+        $rule->expects($this->once())->method('getId')->willReturn(10);
 
-        $this->searchResultBuilder->expects($this->once())->method('setSearchCriteria')->with($searchCriteria);
-        $this->searchResultBuilder->expects($this->once())->method('setTotalCount')->with(2);
-        $this->searchResultBuilder->expects($this->once())->method('create')->willReturn($result);
-        $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
+        $this->taxRuleRegistry->expects($this->once())->method('retrieveTaxRule')->with(10)->willReturn($rule);
+        $this->resource->expects($this->once())->method('save')->with($rule)
+            ->willThrowException($exceptionObject);
+        $this->taxRuleRegistry->expects($this->never())->method('registerTaxRule');
+
+        $this->setExpectedException($exceptionName, $exceptionMessage);
+        $this->model->save($rule);
+    }
 
-        $this->assertEquals($result, $this->model->getList($searchCriteria));
+    public function saveExceptionsDataProvider()
+    {
+        return [
+            [
+                new \Magento\Framework\Model\Exception('Could not save'),
+                '\Magento\Framework\Exception\CouldNotSaveException',
+                'Could not save'
+            ], [
+                new \Magento\Framework\Model\Exception('InputError', ModelException::ERROR_CODE_ENTITY_ALREADY_EXISTS),
+                '\Magento\Framework\Exception\InputException',
+                'InputError'
+            ], [
+                new \Magento\Framework\Exception\NoSuchEntityException('No such entity'),
+                '\Magento\Framework\Exception\NoSuchEntityException',
+                'No such entity'
+            ]
+        ];
+    }
+
+    public function testGetList()
+    {
+        $collectionSize = 1;
+        $currentPage = 42;
+        $pageSize = 4;
+
+        $searchCriteriaMock = $this->getMock('\Magento\Framework\Api\SearchCriteria', [], [], '', false);
+        $collectionMock = $this->getMock('Magento\Tax\Model\Resource\Calculation\Rule\Collection', [], [], '', false);
+        $filterGroupMock = $this->getMock('\Magento\Framework\Api\Search\FilterGroup', [], [], '', false);
+        $filterMock = $this->getMock('\Magento\Framework\Api\Filter', [], [], '', false);
+        $sortOrderMock = $this->getMock('\Magento\Framework\Api\SortOrder', [], [], '', false);
+
+        $this->searchResultBuilder->expects($this->once())->method('setSearchCriteria')->with($searchCriteriaMock);
+        $this->collectionFactory->expects($this->once())->method('create')->willReturn($collectionMock);
+        $searchCriteriaMock->expects($this->once())->method('getFilterGroups')->willReturn([$filterGroupMock]);
+        $filterGroupMock->expects($this->exactly(2))->method('getFilters')->willReturn([$filterMock]);
+        $filterMock->expects($this->exactly(2))->method('getConditionType')->willReturn('eq');
+        $filterMock->expects($this->exactly(2))->method('getField')->willReturnOnConsecutiveCalls(
+            'rate.tax_calculation_rate_id',
+            'cd.customer_tax_class_id'
+        );
+        $filterMock->expects($this->once())->method('getValue')->willReturn('value');
+        $collectionMock->expects($this->exactly(2))->method('joinCalculationData')->withConsecutive(['rate'], ['cd']);
+        $collectionMock->expects($this->once())->method('addFieldToFilter')
+            ->with([0 => 'rate.tax_calculation_rate_id'], [0 => ['eq' => 'value']]);
+        $collectionMock->expects($this->once())->method('getSize')->willReturn($collectionSize);
+        $this->searchResultBuilder->expects($this->once())->method('setTotalCount')->with($collectionSize);
+        $searchCriteriaMock->expects($this->once())->method('getSortOrders')->willReturn([$sortOrderMock]);
+        $sortOrderMock->expects($this->once())->method('getField')->willReturn('sort_order');
+        $sortOrderMock->expects($this->once())->method('getDirection')->willReturn(SearchCriteria::SORT_ASC);
+        $collectionMock->expects($this->once())->method('addOrder')->with('position', 'ASC');
+        $searchCriteriaMock->expects($this->once())->method('getCurrentPage')->willReturn($currentPage);
+        $collectionMock->expects($this->once())->method('setCurPage')->with($currentPage);
+        $searchCriteriaMock->expects($this->once())->method('getPageSize')->willReturn($pageSize);
+        $collectionMock->expects($this->once())->method('setPageSize')->with($pageSize);
+        $collectionMock->expects($this->once())->method('getItems')->willReturn([]);
+        $this->searchResultBuilder->expects($this->once())->method('setItems')->with([]);
+        $this->searchResultBuilder->expects($this->once())->method('create')->willReturnSelf();
+        $this->assertEquals($this->searchResultBuilder, $this->model->getList($searchCriteriaMock));
     }
 }

From dd0cabf98a3e66be71b33a1a6b6e372aa9d7758d Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 4 Dec 2014 11:04:29 -0600
Subject: [PATCH 107/474] MAGETWO-30859: No input validation for HTTPS
 configuration data during installation

- Changes based on feedback from QA.
---
 .../Magento/Setup/src/Model/UserConfigurationDataMapper.php  | 3 +--
 .../Magento/Setup/view/magento/setup/web-configuration.phtml | 4 ++--
 setup/pub/magento/setup/web-configuration.js                 | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index 32eed61a9d52a..26b24e12ea2b7 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -63,7 +63,7 @@ class UserConfigurationDataMapper
     public function getConfigData($data)
     {
         $configData = [];
-        if ($data[self::KEY_BASE_URL_SECURE] === '') {
+        if (!($data[self::KEY_IS_SECURE] || $data[self::KEY_IS_SECURE_ADMIN])) {
             unset($data[self::KEY_BASE_URL_SECURE] );
         }
         foreach (self::$pathDataMap as $path => $key) {
@@ -78,7 +78,6 @@ public function getConfigData($data)
                 $configData[$path] = $data[$key];
             }
         }
-
         return $configData;
     }
 }
diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 360b055d3e0ce..3d02677ca1f51 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -80,12 +80,12 @@ $hints = [
             <div class="col-md-5">
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" ng-checked="" ng-model="config.https.front">&nbsp;Use HTTPS for Magento Storefront
+                        <input type="checkbox" ng-checked="config.https.front" ng-model="config.https.front">&nbsp;Use HTTPS for Magento Storefront
                     </label>
                 </div>
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" ng-checked="" ng-model="config.https.admin">&nbsp;Use HTTPS for Magento Admin
+                        <input type="checkbox" ng-checked="config.https.admin" ng-model="config.https.admin">&nbsp;Use HTTPS for Magento Admin
                     </label>
                 </div>
             </div>
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index fdac9f4b2a130..46e932588b924 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -10,13 +10,13 @@ angular.module('web-configuration', ['ngStorage'])
     .controller('webConfigurationController', ['$scope', '$state', '$localStorage', 'Storage', function ($scope, $state, $localStorage, Storage) {
         $scope.config = {
             address: {
-                web: '',
+                web: 'http://www.example.com/',
                 admin: 'admin'
             },
             https: {
                 front: false,
                 admin: false,
-                text: ''
+                text: 'https://www.example.com/'
             },
             rewrites: {
                 allowed: true
@@ -32,7 +32,6 @@ angular.module('web-configuration', ['ngStorage'])
 
         if ($localStorage.config) {
             $scope.config = $localStorage.config;
-            $scope.config.https.text = '';
         }
 
         $scope.$on('nextState', function () {

From d1f315bb81d9336c480edfe4477c8487e2b97d59 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Thu, 4 Dec 2014 11:24:18 -0600
Subject: [PATCH 108/474] MAGETWO-29704: composer.json Files Optimized

- added missing Composer dependency
---
 composer.json |   3 +-
 composer.lock | 325 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 326 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 7762738a0b1c2..fa37300e48aa5 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,8 @@
         "zendframework/zend-serializer": "2.3.1",
         "zendframework/zend-log": "2.3.1",
         "zendframework/zend-http": "2.3.1",
-        "magento/zendframework1": "1.12.9"
+        "magento/zendframework1": "1.12.9",
+        "composer/composer": "1.0.0-alpha8"
     },
     "require-dev": {
         "phpunit/phpunit": "4.1.0",
diff --git a/composer.lock b/composer.lock
index 5fe75bcec8441..f4b84ac8f7996 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,133 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "e21eec06d0e4c84539bfd2abc42d5e4c",
+    "hash": "7bfce2fe781eef9f39a37ae9b2064111",
     "packages": [
+        {
+            "name": "composer/composer",
+            "version": "1.0.0-alpha8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/composer.git",
+                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/composer/zipball/1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
+                "reference": "1eb1df44a97fb2daca1bb8b007f3bee012f0aa46",
+                "shasum": ""
+            },
+            "require": {
+                "justinrainbow/json-schema": "1.1.*",
+                "php": ">=5.3.2",
+                "seld/jsonlint": "1.*",
+                "symfony/console": "~2.3",
+                "symfony/finder": "~2.2",
+                "symfony/process": "~2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~3.7.10"
+            },
+            "suggest": {
+                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+                "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic"
+            },
+            "bin": [
+                "bin/composer"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Composer": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Dependency Manager",
+            "homepage": "http://getcomposer.org/",
+            "keywords": [
+                "autoload",
+                "dependency",
+                "package"
+            ],
+            "time": "2014-01-06 18:39:59"
+        },
+        {
+            "name": "justinrainbow/json-schema",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/justinrainbow/json-schema.git",
+                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
+                "reference": "05ff6d8d79fe3ad190b0663d80d3f9deee79416c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "JsonSchema": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "NewBSD"
+            ],
+            "authors": [
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch",
+                    "homepage": "http://wiedler.ch/igor/"
+                },
+                {
+                    "name": "Bruno Prieto Reis",
+                    "email": "bruno.p.reis@gmail.com"
+                },
+                {
+                    "name": "Justin Rainbow",
+                    "email": "justin.rainbow@gmail.com"
+                },
+                {
+                    "name": "Robert Schönthal",
+                    "email": "robert.schoenthal@gmail.com",
+                    "homepage": "http://digitalkaoz.net"
+                }
+            ],
+            "description": "A library to validate a json schema.",
+            "homepage": "https://github.com/justinrainbow/json-schema",
+            "keywords": [
+                "json",
+                "schema"
+            ],
+            "time": "2012-01-03 00:33:17"
+        },
         {
             "name": "magento/zendframework1",
             "version": "1.12.9",
@@ -53,6 +178,203 @@
             ],
             "time": "2014-11-24 22:50:41"
         },
+        {
+            "name": "seld/jsonlint",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/jsonlint.git",
+                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/a7bc2ec9520ad15382292591b617c43bdb1fec35",
+                "reference": "a7bc2ec9520ad15382292591b617c43bdb1fec35",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "bin": [
+                "bin/jsonlint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "JSON Linter",
+            "keywords": [
+                "json",
+                "linter",
+                "parser",
+                "validator"
+            ],
+            "time": "2014-09-05 15:36:20"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v2.6.1",
+            "target-dir": "Symfony/Component/Console",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Console.git",
+                "reference": "ef825fd9f809d275926547c9e57cbf14968793e8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/ef825fd9f809d275926547c9e57cbf14968793e8",
+                "reference": "ef825fd9f809d275926547c9e57cbf14968793e8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1",
+                "symfony/process": "~2.1"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Console\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-12-02 20:19:20"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v2.6.1",
+            "target-dir": "Symfony/Component/Finder",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Finder.git",
+                "reference": "0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Finder/zipball/0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721",
+                "reference": "0d3ef7f6ec55a7af5eca7914eaa0dacc04ccc721",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Finder\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-12-02 20:19:20"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v2.6.1",
+            "target-dir": "Symfony/Component/Process",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Process.git",
+                "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Process/zipball/bf0c9bd625f13b0b0bbe39919225cf145dfb935a",
+                "reference": "bf0c9bd625f13b0b0bbe39919225cf145dfb935a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Process\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-12-02 20:19:20"
+        },
         {
             "name": "zendframework/zend-code",
             "version": "2.3.1",
@@ -2336,6 +2658,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
+        "composer/composer": 15,
         "phpmd/phpmd": 0
     },
     "prefer-stable": false,

From 7d2d874d8caf227469ef23c7db9b4e6596be539d Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Thu, 4 Dec 2014 11:43:11 -0600
Subject: [PATCH 109/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- fixed auto-detecting base URL in Setup Wizard when project is in sub-directory
---
 .../module/Magento/Setup/src/Controller/WebConfiguration.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
index f92494478ede2..6e95ae8041895 100644
--- a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
+++ b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
@@ -42,9 +42,9 @@ public function indexAction()
         $projectRoot = $this->dirList->getRoot();
         $docRoot = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']);
         if ($setupInfo->isAvailable($this->dirList->getRoot())) {
-            $urlPath = '';
+            $urlPath = substr($projectRoot, strlen($docRoot));
         } else {
-            $urlPath = substr($docRoot, strlen($projectRoot));
+            $urlPath = '';
         }
         $view = new ViewModel(['autoBaseUrl' => 'http://' . $_SERVER['HTTP_HOST'] . $urlPath . '/']);
         $view->setTerminal(true);

From 365c72ea4c75df9d78cc0ce1b7381d9d210b997b Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Thu, 4 Dec 2014 12:20:55 -0600
Subject: [PATCH 110/474] MAGETWO-29035: Installation fails if cli php is
 different than apache configured

- removed excessive autoload declaration
---
 composer.json | 6 +-----
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index fa37300e48aa5..62a3d35d4bb9e 100644
--- a/composer.json
+++ b/composer.json
@@ -236,11 +236,7 @@
             "Magento\\TestFramework\\Inspection\\": "dev/tests/static/framework/Magento/TestFramework/Inspection/",
             "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/",
             "Magento\\ToolkitFramework\\": "dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/",
-            "Magento\\Composer\\": "setup/module/Magento/Composer/src/",
-            "Magento\\Filesystem\\": "setup/module/Magento/Filesystem/src/",
-            "Magento\\Locale\\": "setup/module/Magento/Locale/src/",
-            "Magento\\Setup\\": "setup/module/Magento/Setup/src/",
-            "Magento\\Config\\": "setup/module/Magento/Config/src/"
+            "Magento\\Setup\\": "setup/module/Magento/Setup/src/"
         }
     }
 }
diff --git a/composer.lock b/composer.lock
index f4b84ac8f7996..30d4a1b82381e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7bfce2fe781eef9f39a37ae9b2064111",
+    "hash": "85c56fe611b85286519e940449aaaff5",
     "packages": [
         {
             "name": "composer/composer",

From fc0253bbb9fe1af07be351273ab3841eebcae17b Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 4 Dec 2014 14:30:43 -0600
Subject: [PATCH 111/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Fixed issues found by QA.
---
 setup/pub/magento/setup/add-database.js | 6 +++---
 setup/pub/magento/setup/main.js         | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index f9d67c4763414..6477614564964 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -12,9 +12,7 @@ angular.module('add-database', ['ngStorage'])
             useExistingDb: 1,
             useAccess: 1
         };
-
-        $scope.testConn = '';
-
+        $scope.testConn = 'mock';
         var intervalPromise = $interval(function () {
             $http.post('data/database', $scope.db)
                 .success(function (data) {
@@ -47,6 +45,8 @@ angular.module('add-database', ['ngStorage'])
         });
 
         $scope.$on('previousState', function () {
+            $localStorage.db = $scope.db;
+            Storage.db = $scope.db;
             $interval.cancel(intervalPromise);
         });
 
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index 81edfaf611016..fbbf5b0bafa75 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -32,7 +32,10 @@ main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navi
         };
 
         $scope.previousState = function () {
-            $state.go(navigationService.getPreviousState().id);
+            if ($scope.validate()) {
+                $scope.$broadcast('previousState', $state.$current);
+                $state.go(navigationService.getPreviousState().id);
+            }
         };
 
         // Flag indicating the validity of the form

From cb2ae795cd323d3d518132de0af88c62626d9e5d Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Tue, 2 Dec 2014 16:11:22 -0600
Subject: [PATCH 112/474] MAGETWO-30953: Add URL format validation

- Changed url format checking pattern - now using AngularJS provided
  library.
---
 .../view/magento/setup/web-configuration.phtml     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 039a62ee26013..360b055d3e0ce 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -35,7 +35,7 @@ $hints = [
         <label class="col-md-3 control-label">Your Store Address&nbsp;<span class="required">*</span></label>
         <div class="col-md-4">
             <input ng-blur="addSlash()"
-                   type="text"
+                   type="url"
                    name="web"
                    ng-model="config.address.web"
                    class="form-control"
@@ -43,12 +43,11 @@ $hints = [
                    tooltip-html-unsafe="<?php echo $hints['address_web']; ?>"
                    tooltip-trigger="focus"
                    tooltip-append-to-body="true"
-                   required
-                   ng-pattern="/^(http):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/" />
+                   required />
         </div>
         <div class="col-md-offset-3 col-md-4" ng-show="webconfig.web.$invalid && webconfig.submitted">
             <div class="error-container">
-                <span ng-show="webconfig.web.$error.required || webconfig.web.$error.pattern">Please enter a valid base URL path. (ex: http://www.example.com/)</span>
+                <span ng-show="webconfig.web.$error.required || webconfig.web.$error.url">Please enter a valid base URL path. (ex: http://www.example.com/)</span>
             </div>
         </div>
     </div>
@@ -95,18 +94,17 @@ $hints = [
         <div class="form-group" ng-show="showHttpsField()">
             <label ng-show="config.https.front || config.https.admin" class="col-md-4 col-md-offset-3">Your HTTPS Store address:</label>
             <div class="col-md-4 col-md-offset-3">
-                <input type="text"
+                <input type="url"
                        name="https"
                        ng-model="config.https.text"
                        ng-if="config.https.front || config.https.admin"
                        class="form-control"
                        ng-focus=""
-                       required
-                       ng-pattern="/^(https):\/\/(([a-zA-Z0-9$\-_.+!*'(),;:&=]|%[0-9a-fA-F]{2})+@)?(((25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])(\.(25[0-5]|2[0-4][0-9]|[0-1][0-9][0-9]|[1-9][0-9]|[0-9])){3})|localhost|([a-zA-Z0-9\-\u00C0-\u017F]+\.)+([a-zA-Z]{2,}))(:[0-9]+)?(\/(([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*(\/([a-zA-Z0-9$\-_.+!*'(),;:@&=]|%[0-9a-fA-F]{2})*)*)?(\?([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?(\#([a-zA-Z0-9$\-_.+!*'(),;:@&=\/?]|%[0-9a-fA-F]{2})*)?)?$/" />
+                       required />
             </div>
             <div class="col-md-offset-3 col-md-4" ng-show="webconfig.https.$invalid && webconfig.submitted">
                 <div class="error-container">
-                    <span ng-show="webconfig.https.$error.required || webconfig.https.$error.pattern">Please enter a valid HTTPS base URL path. (ex: https://www.example.com/)</span>
+                    <span ng-show="webconfig.https.$error.required || webconfig.https.$error.url">Please enter a valid HTTPS base URL path. (ex: https://www.example.com/)</span>
                 </div>
             </div>
         </div>

From e35dad7da41a8e11b8057a6329aa7f4d56e8ab0a Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 3 Dec 2014 11:24:55 -0600
Subject: [PATCH 113/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Changes based on CR feedback.
---
 .../view/magento/setup/add-database.phtml     | 14 +++---
 setup/pub/magento/setup/add-database.js       | 48 ++++++++++---------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
index 17046f46e6ed6..73e52a2cb86b2 100644
--- a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
@@ -159,17 +159,15 @@
         </div>
     </div>
 
-    <div class="form-group" ng-show="database.submitted" >
+    <div class="form-group">
         <div class="col-sm-4">
             <input type="hidden"
-                   name="dbConnection"
-                   ng-model="db.connection"
-                   ng-required="!testConnection.result.success" />
+                   ng-model="testConn"
+                   ng-show="testConnection.result !== undefined && !testConnection.result.success"
+                   ng-bind="testConn"
+                   required />
         </div>
-        <div  class="col-sm-4">
-            <div ng-show="testConnection.result === undefined" class="animate-show text-success">
-                <span class="glyphicon text-success">&nbsp;Testing database connection......</span>
-            </div>
+        <div  class="col-sm-4" ng-show="database.submitted">
             <div ng-show="testConnection.result.success === false && testConnection.result !== undefined" class="error-container animate-show text-danger">
                 <span class="glyphicon glyphicon-remove-sign">&nbsp;{{testConnection.result.error}}</span>
             </div>
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 362e7a0c733a4..3cc907844191f 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -7,12 +7,28 @@
 
 'use strict';
 angular.module('add-database', ['ngStorage'])
-    .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', '$timeout', function ($scope, $state, $localStorage, $http, $timeout) {
+    .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', '$timeout', 'Storage', '$interval', function ($scope, $state, $localStorage, $http, $timeout, Storage, $interval) {
         $scope.db = {
             useExistingDb: 1,
             useAccess: 1
         };
 
+        $scope.testConn = '';
+
+        var intervalPromise = $interval(function () {
+            $http.post('data/database', $scope.db)
+                .success(function (data) {
+                    $scope.testConnection.result = data;
+                    if (($scope.testConnection.result !== undefined) && (!$scope.testConnection.result.success)) {
+                        $scope.testConn = '';
+                    } else {
+                        $scope.testConn = 'mock';
+                    }
+                });
+        }, 500);
+
+        $scope.$on('$destroy', function () { $interval.cancel(intervalPromise); });
+
         if ($localStorage.db) {
             $scope.db = $localStorage.db;
         }
@@ -26,8 +42,15 @@ angular.module('add-database', ['ngStorage'])
 
         $scope.$on('nextState', function () {
             $localStorage.db = $scope.db;
+            Storage.db = $scope.db;
+            $interval.cancel(intervalPromise);
+        });
+
+        $scope.$on('previousState()', function () {
+            $interval.cancel(intervalPromise);
         });
 
+
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();
@@ -35,7 +58,6 @@ angular.module('add-database', ['ngStorage'])
 
         // Dispatch 'validation-response' event to parent controller
         $scope.validate = function() {
-            $scope.testConnection();
             if ($scope.database.$valid) {
                 $scope.$emit('validation-response', true);
             } else {
@@ -50,24 +72,4 @@ angular.module('add-database', ['ngStorage'])
                 $scope.database.submitted = false;
             }
         });
-    }])
-    .directive('testHostname', function() {
-        return{
-            require: "ngModel",
-            link: function(scope, elm, attrs, ctrl){
-                var validator = function(value){
-                    scope.testConnection();
-                    var isValid;
-                    if (scope.testConnection.result.success === undefined) {
-                        isValid = false;
-                    } else {
-                        isValid = true;
-                    }
-                    ctrl.$setValidity('testHostname', isValid);
-                    return value;
-                };
-                ctrl.$parsers.unshift(validator);
-                ctrl.$formatters.unshift(validator);
-            }
-        };
-    });
+    }]);

From 971b09e49cb8ef868181d384cff46b2e5844a778 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Tue, 2 Dec 2014 11:14:35 -0600
Subject: [PATCH 114/474] MAGETWO-31004: Validation of CLI

- made changes according to CR feedback
---
 dev/build/core_dev/api-functional/build.xml   |   2 -
 .../api-functional/install-config-mysql.php   |   1 -
 setup/config/application.config.php           |   2 +-
 setup/module/Magento/Setup/Module.php         |   7 -
 .../src/Controller/ConsoleController.php      |  63 ++--
 .../Controller/Install/StartController.php    |  16 +-
 .../Magento/Setup/src/Model/AdminAccount.php  |  32 ++
 .../DeploymentConfigMapper.php}               |  34 +-
 .../Magento/Setup/src/Model/Installer.php     |  57 ++-
 .../src/Model/UserConfigurationDataMapper.php | 101 ++++++
 .../Magento/Setup/src/Model/Validator.php     | 332 ------------------
 .../Setup/src/Mvc/Console/RouteListener.php   |  78 ++++
 .../{Model => Mvc/Console}/RouteMatcher.php   |   5 +-
 .../src/Mvc/Console/VerboseValidator.php      | 196 +++++++++++
 .../Setup/src/Mvc/ValidatingRouteListener.php | 155 --------
 15 files changed, 523 insertions(+), 558 deletions(-)
 rename setup/module/Magento/Setup/src/{Module/Setup/ConfigMapper.php => Model/DeploymentConfigMapper.php} (55%)
 delete mode 100644 setup/module/Magento/Setup/src/Model/Validator.php
 create mode 100644 setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
 rename setup/module/Magento/Setup/src/{Model => Mvc/Console}/RouteMatcher.php (78%)
 create mode 100644 setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
 delete mode 100644 setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php

diff --git a/dev/build/core_dev/api-functional/build.xml b/dev/build/core_dev/api-functional/build.xml
index 67119dd0f728f..b527b1b491091 100644
--- a/dev/build/core_dev/api-functional/build.xml
+++ b/dev/build/core_dev/api-functional/build.xml
@@ -14,7 +14,6 @@
     <property name="product_root_dir" location="${env.deploy_directory}/${env.build.key}/build-${env.build.number}"/>
     <property name="product_edition_code" value="${env.magento_edition}"/>
     <property name="magento_instance_base_url" value="${env.http_host}${env.build.key}/build-${env.build.number}"/>
-    <property name="magento_instance_base_url_secure" value="${env.https_host}${env.build.key}/build-${env.build.number}"/>
 
     <target name="run" depends="_server_info" description="Test Magento Web API.">
         <antcall target="_deploy_magento"/>
@@ -79,7 +78,6 @@
             <replacefilter token="{{db_user}}" value="${env.db_user}"/>
             <replacefilter token="{{db_password}}" value="${env.db_password}"/>
             <replacefilter token="{{url}}" value="${magento_instance_base_url}"/>
-            <replacefilter token="{{secure_url}}" value="${magento_instance_base_url_secure}"/>
         </replace>
 
         <!--Prepare phpunit.xml-->
diff --git a/dev/build/core_dev/api-functional/install-config-mysql.php b/dev/build/core_dev/api-functional/install-config-mysql.php
index c0963d03ea1bd..6d0c1ae324309 100644
--- a/dev/build/core_dev/api-functional/install-config-mysql.php
+++ b/dev/build/core_dev/api-functional/install-config-mysql.php
@@ -14,7 +14,6 @@
     'db_prefix'              => '{{db_table_prefix}}',
     'backend_frontname'      => 'backend',
     'base_url'               => '{{url}}/',
-    'base_url_secure'        => '{{secure_url}}/',
     'session_save'           => 'db',
     'admin_username'         => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
     'admin_password'         => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
diff --git a/setup/config/application.config.php b/setup/config/application.config.php
index abaf4eba53192..8fe94fb8497f2 100644
--- a/setup/config/application.config.php
+++ b/setup/config/application.config.php
@@ -21,7 +21,7 @@
             __DIR__ . '/autoload/{,*.}{global,local}.php',
         ),
     ],
-    'listeners' => ['Magento\Setup\Mvc\Bootstrap\InitParamListener'],
+    'listeners' => ['Magento\Setup\Mvc\Bootstrap\InitParamListener', 'Magento\Setup\Mvc\Console\RouteListener',],
     'service_manager' => [
         'factories' => [
             InitParamListener::BOOTSTRAP_PARAM => 'Magento\Setup\Mvc\Bootstrap\InitParamListener',
diff --git a/setup/module/Magento/Setup/Module.php b/setup/module/Magento/Setup/Module.php
index 4e22de9b3e702..f223309c83a6b 100644
--- a/setup/module/Magento/Setup/Module.php
+++ b/setup/module/Magento/Setup/Module.php
@@ -39,13 +39,6 @@ public function onBootstrap(EventInterface $e)
         /** @var \Zend\EventManager\SharedEventManager $sharedEvents */
         $sharedEvents = $events->getSharedManager();
 
-        // attach a ValidatingRouteListener before default RouteListener for parameter validation
-        $oldRouteListener = $application->getServiceManager()->get('routelistener');
-        $oldRouteListener->detach($events);
-        $routeListener = new \Magento\Setup\Mvc\ValidatingRouteListener();
-        $routeListener->attach($events);
-        $oldRouteListener->attach($events);
-
         $moduleRouteListener = new ModuleRouteListener();
         $moduleRouteListener->attach($events);
 
diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index 124e24cdcfe63..ad2ee18da4335 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -12,14 +12,14 @@
 use Magento\Setup\Model\InstallerFactory;
 use Magento\Setup\Model\Installer;
 use Magento\Setup\Model\ConsoleLogger;
+use Magento\Setup\Model\UserConfigurationDataMapper;
 use Zend\Console\Request as ConsoleRequest;
 use Zend\EventManager\EventManagerInterface;
 use Zend\Mvc\Controller\AbstractActionController;
 use Magento\Setup\Model\UserConfigurationDataMapper as UserConfig;
 use Magento\Setup\Model\AdminAccount;
 use Magento\Framework\App\MaintenanceMode;
-use Magento\Setup\Module\Setup\ConfigMapper;
-use Magento\Setup\Model\Validator;
+use Magento\Setup\Model\DeploymentConfigMapper;
 
 /**
  * Controller that handles all setup commands via command line interface.
@@ -102,13 +102,6 @@ class ConsoleController extends AbstractActionController
      */
     private $installer;
 
-    /**
-     * Parameter value validator
-     *
-     * @var Validator
-     */
-    private $validator;
-
     /**
      * Gets router configuration to be used in module definition
      *
@@ -151,16 +144,16 @@ public static function getConsoleUsage()
      */
     private static function getCliConfig()
     {
-        $deployConfig = '--' . ConfigMapper::KEY_DB_HOST . '='
-            . ' --' . ConfigMapper::KEY_DB_NAME . '='
-            . ' --' . ConfigMapper::KEY_DB_USER . '='
-            . ' --' . ConfigMapper::KEY_BACKEND_FRONTNAME . '='
-            . ' [--' . ConfigMapper::KEY_DB_PASS . '=]'
-            . ' [--' . ConfigMapper::KEY_DB_PREFIX . '=]'
-            . ' [--' . ConfigMapper::KEY_DB_MODEL . '=]'
-            . ' [--' . ConfigMapper::KEY_DB_INIT_STATEMENTS . '=]'
-            . ' [--' . ConfigMapper::KEY_SESSION_SAVE . '=]'
-            . ' [--' . ConfigMapper::KEY_ENCRYPTION_KEY . '=]'
+        $deployConfig = '--' . DeploymentConfigMapper::KEY_DB_HOST . '='
+            . ' --' . DeploymentConfigMapper::KEY_DB_NAME . '='
+            . ' --' . DeploymentConfigMapper::KEY_DB_USER . '='
+            . ' --' . DeploymentConfigMapper::KEY_BACKEND_FRONTNAME . '='
+            . ' [--' . DeploymentConfigMapper::KEY_DB_PASS . '=]'
+            . ' [--' . DeploymentConfigMapper::KEY_DB_PREFIX . '=]'
+            . ' [--' . DeploymentConfigMapper::KEY_DB_MODEL . '=]'
+            . ' [--' . DeploymentConfigMapper::KEY_DB_INIT_STATEMENTS . '=]'
+            . ' [--' . DeploymentConfigMapper::KEY_SESSION_SAVE . '=]'
+            . ' [--' . DeploymentConfigMapper::KEY_ENCRYPTION_KEY . '=]'
             . ' [--' . Installer::ENABLE_MODULES . '=]'
             . ' [--' . Installer::DISABLE_MODULES . '=]';
         $userConfig = '[--' . UserConfig::KEY_BASE_URL . '=]'
@@ -263,7 +256,6 @@ public function __construct(
         $this->options = $options;
         $this->installer = $installerFactory->create($consoleLogger);
         $this->maintenanceMode = $maintenanceMode;
-        $this->validator = new Validator();
     }
 
     /**
@@ -296,10 +288,11 @@ public function installAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        if ($this->validator->validate(self::CMD_INSTALL, $request->getParams()->toArray())) {
+        $validationMessages = Installer::validateInstall($request->getParams()->toArray());
+        if ('' === $validationMessages) {
             $this->installer->install($request->getParams());
         } else {
-            $this->log->log($this->validator->getValidationMessages());
+            $this->log->log(PHP_EOL . $validationMessages);
         }
     }
 
@@ -313,11 +306,12 @@ public function installDeploymentConfigAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        if ($this->validator->validate(self::CMD_INSTALL_CONFIG, $request->getParams()->toArray())) {
+        $validationMessages = DeploymentConfigMapper::validateDeploymentConfig($request->getParams()->toArray());
+        if ('' === $validationMessages) {
             $this->installer->checkInstallationFilePermissions();
             $this->installer->installDeploymentConfig($request->getParams());
         } else {
-            $this->log->log($this->validator->getValidationMessages());
+            $this->log->log(PHP_EOL . $validationMessages);
         }
     }
 
@@ -366,10 +360,11 @@ public function installUserConfigAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        if ($this->validator->validate(self::CMD_INSTALL_USER_CONFIG, $request->getParams()->toArray())) {
+        $validationMessages = UserConfigurationDataMapper::validateUserConfig($request->getParams()->toArray());
+        if ('' === $validationMessages) {
             $this->installer->installUserConfig($request->getParams());
         } else {
-            $this->log->log($this->validator->getValidationMessages());
+            $this->log->log(PHP_EOL . $validationMessages);
         }
     }
 
@@ -382,10 +377,11 @@ public function installAdminUserAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        if ($this->validator->validate(self::CMD_INSTALL_ADMIN_USER, $request->getParams()->toArray())) {
+        $validationMessages = AdminAccount::validateAdmin($request->getParams()->toArray());
+        if ('' === $validationMessages) {
             $this->installer->installAdminUser($request->getParams());
         } else {
-            $this->log->log($this->validator->getValidationMessages());
+            $this->log->log(PHP_EOL . $validationMessages);
         }
     }
 
@@ -449,11 +445,14 @@ public function helpAction()
             case UserConfig::KEY_TIMEZONE:
                 return $this->arrayToString($this->options->getTimezoneList());
             default:
-                if ($details[$type]['usage']) {
-                    $formatted = $this->formatCliUsage($details[$type]['usage']);
-                    return "\nAvailable parameters:\n{$formatted}\n";
+                if (isset($details[$type])) {
+                    if ($details[$type]['usage']) {
+                        $formatted = $this->formatCliUsage($details[$type]['usage']);
+                        return "\nAvailable parameters:\n{$formatted}\n";
+                    }
+                    return "\nThis command has no parameters.\n";
                 }
-                return "\nThis command has no parameters.\n";
+                throw new \InvalidArgumentException("Unknown type: {$type}");
         }
     }
 
diff --git a/setup/module/Magento/Setup/src/Controller/Install/StartController.php b/setup/module/Magento/Setup/src/Controller/Install/StartController.php
index b8a0d9f27eebc..f4ea22ae213f3 100644
--- a/setup/module/Magento/Setup/src/Controller/Install/StartController.php
+++ b/setup/module/Magento/Setup/src/Controller/Install/StartController.php
@@ -16,7 +16,7 @@
 use Magento\Setup\Model\Installer;
 use Magento\Setup\Model\UserConfigurationDataMapper as UserConfig;
 use Magento\Setup\Model\AdminAccount;
-use Magento\Setup\Module\Setup\ConfigMapper;
+use Magento\Setup\Model\DeploymentConfigMapper;
 
 /**
  * UI Controller that handles installation
@@ -98,15 +98,15 @@ private function importDeploymentConfigForm()
     {
         $source = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY);
         $result = [];
-        $result[ConfigMapper::KEY_DB_HOST] = isset($source['db']['host']) ? $source['db']['host'] : '';
-        $result[ConfigMapper::KEY_DB_NAME] = isset($source['db']['name']) ? $source['db']['name'] : '';
-        $result[ConfigMapper::KEY_DB_USER] = isset($source['db']['user']) ? $source['db']['user'] :'';
-        $result[ConfigMapper::KEY_DB_PASS] = isset($source['db']['password']) ? $source['db']['password'] : '';
-        $result[ConfigMapper::KEY_DB_PREFIX] = isset($source['db']['tablePrefix']) ? $source['db']['tablePrefix'] : '';
-        $result[ConfigMapper::KEY_BACKEND_FRONTNAME] = isset($source['config']['address']['admin'])
+        $result[DeploymentConfigMapper::KEY_DB_HOST] = isset($source['db']['host']) ? $source['db']['host'] : '';
+        $result[DeploymentConfigMapper::KEY_DB_NAME] = isset($source['db']['name']) ? $source['db']['name'] : '';
+        $result[DeploymentConfigMapper::KEY_DB_USER] = isset($source['db']['user']) ? $source['db']['user'] :'';
+        $result[DeploymentConfigMapper::KEY_DB_PASS] = isset($source['db']['password']) ? $source['db']['password'] : '';
+        $result[DeploymentConfigMapper::KEY_DB_PREFIX] = isset($source['db']['tablePrefix']) ? $source['db']['tablePrefix'] : '';
+        $result[DeploymentConfigMapper::KEY_BACKEND_FRONTNAME] = isset($source['config']['address']['admin'])
             ? $source['config']['address']['admin']
             : '';
-        $result[ConfigMapper::KEY_ENCRYPTION_KEY] = isset($source['config']['encrypt']['key'])
+        $result[DeploymentConfigMapper::KEY_ENCRYPTION_KEY] = isset($source['config']['encrypt']['key'])
             ? $source['config']['encrypt']['key']
             : '';
         return $result;
diff --git a/setup/module/Magento/Setup/src/Model/AdminAccount.php b/setup/module/Magento/Setup/src/Model/AdminAccount.php
index 08196411dfca1..b18487964ed73 100644
--- a/setup/module/Magento/Setup/src/Model/AdminAccount.php
+++ b/setup/module/Magento/Setup/src/Model/AdminAccount.php
@@ -85,6 +85,38 @@ public function save()
         $this->saveAdminUserRole($adminId);
     }
 
+    /**
+     * Validate parameter values of admin user setup tool
+     *
+     * @param array $data
+     * @return bool
+     */
+    public static function validateAdmin(array $data)
+    {
+        $validationMessages = '';
+        if (isset($data[self::KEY_EMAIL]) && !self::validateEmail($data[self::KEY_EMAIL])) {
+            $validationMessages .= self::KEY_EMAIL . ': Please enter a valid email address. ' .
+                "Current: {$data[self::KEY_EMAIL]}" . PHP_EOL;
+        }
+        if (isset($data[self::KEY_PASSWORD]) && strlen($data[self::KEY_PASSWORD]) < 7) {
+            $validationMessages .= self::KEY_PASSWORD . ': Password must be at least 7 characters long.' . PHP_EOL;
+        }
+
+        return $validationMessages;
+    }
+
+    /**
+     * Validate email
+     *
+     * @param $email
+     * @return bool
+     */
+    private static function validateEmail($email)
+    {
+        $validator = new \Zend\Validator\EmailAddress();
+        return $validator->isValid($email);
+    }
+
     /**
      * Uses the information in data[] to create the admin user.
      *
diff --git a/setup/module/Magento/Setup/src/Module/Setup/ConfigMapper.php b/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
similarity index 55%
rename from setup/module/Magento/Setup/src/Module/Setup/ConfigMapper.php
rename to setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
index 7af3fa492097f..3131b24a1518b 100644
--- a/setup/module/Magento/Setup/src/Module/Setup/ConfigMapper.php
+++ b/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
@@ -6,7 +6,7 @@
  * @license     {license_link}
  */
 
-namespace Magento\Setup\Module\Setup;
+namespace Magento\Setup\Model;
 
 use Magento\Framework\App\DeploymentConfig\BackendConfig;
 use Magento\Framework\App\DeploymentConfig\DbConfig;
@@ -14,7 +14,7 @@
 use Magento\Framework\App\DeploymentConfig\InstallConfig;
 use Magento\Framework\App\DeploymentConfig\SessionConfig;
 
-class ConfigMapper
+class DeploymentConfigMapper
 {
     /**#@+
      * Parameters for setup tool
@@ -50,4 +50,34 @@ class ConfigMapper
         self::KEY_BACKEND_FRONTNAME => BackendConfig::KEY_FRONTNAME,
         self::KEY_ENCRYPTION_KEY => EncryptConfig::KEY_ENCRYPTION_KEY,
     ];
+
+    /**
+     * Validate parameter values of deployment configuration tool
+     *
+     * @param array $data
+     * @return string
+     */
+    public static function validateDeploymentConfig(array $data)
+    {
+        $validationMessages = '';
+        if (isset($data[self::KEY_BACKEND_FRONTNAME]) &&
+            !preg_match('/^[a-zA-Z0-9_]+$/', $data[self::KEY_BACKEND_FRONTNAME])
+        ) {
+            $validationMessages .= self::KEY_BACKEND_FRONTNAME .
+                ': Please use alphanumeric characters and underscore. ' .
+                "Current: {$data[self::KEY_BACKEND_FRONTNAME]}" . PHP_EOL;
+        }
+        if (isset($data[self::KEY_SESSION_SAVE]) && $data[self::KEY_SESSION_SAVE] !== 'files' &&
+            $data[self::KEY_SESSION_SAVE] !== 'db'
+        ) {
+            $validationMessages .= self::KEY_SESSION_SAVE .
+                ": Please use 'files' or 'db'. Current: {$data[self::KEY_SESSION_SAVE]}" . PHP_EOL;
+        }
+        if (isset($data[self::KEY_ENCRYPTION_KEY]) && !$data[self::KEY_ENCRYPTION_KEY]) {
+            $validationMessages .= self::KEY_ENCRYPTION_KEY .
+                ": Please enter a valid encryption key. Current: {$data[self::KEY_ENCRYPTION_KEY]}" . PHP_EOL;
+        }
+
+        return $validationMessages;
+    }
 }
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 50ad1ce6db1a2..dcc691b022c93 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -31,7 +31,6 @@
 use Magento\Framework\App\DeploymentConfig\InstallConfig;
 use Magento\Framework\App\DeploymentConfig\SessionConfig;
 use Magento\Framework\App\DeploymentConfig\ResourceConfig;
-use Magento\Setup\Module\Setup\ConfigMapper;
 
 /**
  * Class Installer contains the logic to install Magento application.
@@ -316,7 +315,8 @@ private function createModulesConfig($request)
     private function createBackendConfig($data)
     {
         $backendConfigData = array(
-            ConfigMapper::$paramMap[ConfigMapper::KEY_BACKEND_FRONTNAME] => $data[ConfigMapper::KEY_BACKEND_FRONTNAME]
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_BACKEND_FRONTNAME] =>
+                $data[DeploymentConfigMapper::KEY_BACKEND_FRONTNAME]
         );
         return new BackendConfig($backendConfigData);
     }
@@ -330,7 +330,8 @@ private function createBackendConfig($data)
     private function createEncryptConfig($data)
     {
         $cryptConfigData =
-            array(ConfigMapper::$paramMap[ConfigMapper::KEY_ENCRYPTION_KEY] => $data[ConfigMapper::KEY_ENCRYPTION_KEY]);
+            array(DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_ENCRYPTION_KEY] =>
+                $data[DeploymentConfigMapper::KEY_ENCRYPTION_KEY]);
         return new EncryptConfig($cryptConfigData);
     }
 
@@ -343,20 +344,25 @@ private function createEncryptConfig($data)
     private function createDbConfig($data)
     {
         $defaultConnection = [
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_HOST] => $data[ConfigMapper::KEY_DB_HOST],
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_INIT_STATEMENTS] =>
-                isset($data[ConfigMapper::KEY_DB_INIT_STATEMENTS]) ? $data[ConfigMapper::KEY_DB_INIT_STATEMENTS] : null,
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_MODEL] => isset($data[ConfigMapper::KEY_DB_MODEL]) ?
-                $data[ConfigMapper::KEY_DB_MODEL] : null,
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_NAME] => $data[ConfigMapper::KEY_DB_NAME],
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_PASS] => isset($data[ConfigMapper::KEY_DB_PASS]) ?
-                $data[ConfigMapper::KEY_DB_PASS] : null,
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_USER] => $data[ConfigMapper::KEY_DB_USER],
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_HOST] =>
+                $data[DeploymentConfigMapper::KEY_DB_HOST],
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_INIT_STATEMENTS] =>
+                isset($data[DeploymentConfigMapper::KEY_DB_INIT_STATEMENTS]) ?
+                    $data[DeploymentConfigMapper::KEY_DB_INIT_STATEMENTS] : null,
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_MODEL] =>
+                isset($data[DeploymentConfigMapper::KEY_DB_MODEL]) ? $data[DeploymentConfigMapper::KEY_DB_MODEL] : null,
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_NAME] =>
+                $data[DeploymentConfigMapper::KEY_DB_NAME],
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_PASS] =>
+                isset($data[DeploymentConfigMapper::KEY_DB_PASS]) ? $data[DeploymentConfigMapper::KEY_DB_PASS] : null,
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_USER] =>
+                $data[DeploymentConfigMapper::KEY_DB_USER],
         ];
 
         $dbConfigData = array(
-            ConfigMapper::$paramMap[ConfigMapper::KEY_DB_PREFIX] => isset($data[ConfigMapper::KEY_DB_PREFIX]) ?
-                    $data[ConfigMapper::KEY_DB_PREFIX] : null,
+            DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DB_PREFIX] =>
+                isset($data[DeploymentConfigMapper::KEY_DB_PREFIX]) ?
+                    $data[DeploymentConfigMapper::KEY_DB_PREFIX] : null,
             'connection' => [
                 'default' => $defaultConnection,
             ]
@@ -372,8 +378,9 @@ private function createDbConfig($data)
      */
     private function createSessionConfig($data)
     {
-        $sessionConfigData = array(ConfigMapper::$paramMap[ConfigMapper::KEY_SESSION_SAVE] =>
-            isset($data[ConfigMapper::KEY_SESSION_SAVE]) ? $data[ConfigMapper::KEY_SESSION_SAVE] : null);
+        $sessionConfigData = array(DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_SESSION_SAVE] =>
+            isset($data[DeploymentConfigMapper::KEY_SESSION_SAVE]) ?
+                $data[DeploymentConfigMapper::KEY_SESSION_SAVE] : null);
         return new SessionConfig($sessionConfigData);
     }
 
@@ -385,7 +392,8 @@ private function createSessionConfig($data)
      */
     private function createInstallConfig($data)
     {
-        $installConfigData = array(ConfigMapper::$paramMap[ConfigMapper::KEY_DATE] => $data[ConfigMapper::KEY_DATE]);
+        $installConfigData = array(DeploymentConfigMapper::$paramMap[DeploymentConfigMapper::KEY_DATE] =>
+            $data[DeploymentConfigMapper::KEY_DATE]);
         return new InstallConfig($installConfigData);
     }
 
@@ -706,6 +714,21 @@ public function getInstallInfo()
     }
 
 
+    /**
+     * Validate install parameter values
+     *
+     * @param array $data
+     * @return string
+     */
+    public static function validateInstall(array $data)
+    {
+        $validationMessages = '';
+        $validationMessages .=  DeploymentConfigMapper::validateDeploymentConfig($data);
+        $validationMessages .= UserConfigurationDataMapper::validateUserConfig($data);
+        $validationMessages .= AdminAccount::validateAdmin($data);
+        return $validationMessages;
+    }
+
     /**
      * Deletes the database and creates it again
      *
diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index 32eed61a9d52a..eb964bc10cdac 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -81,4 +81,105 @@ public function getConfigData($data)
 
         return $configData;
     }
+
+    /**
+     * Validate parameter values of user configuration tool
+     *
+     * @param array $data
+     * @return string
+     */
+    public static function validateUserConfig(array $data)
+    {
+        $validationMessages = '';
+        // check URL
+        if (isset($data[self::KEY_BASE_URL]) && !self::validateUrl($data[self::KEY_BASE_URL])) {
+            $validationMessages .= self::KEY_BASE_URL .
+                ": Please enter a valid base url. Current: {$data[self::KEY_BASE_URL]}" . PHP_EOL;
+        }
+        if (isset($data[self::KEY_BASE_URL_SECURE]) && !self::validateUrl($data[self::KEY_BASE_URL_SECURE], true)) {
+            $validationMessages .= self::KEY_BASE_URL_SECURE .
+                ": Please enter a valid secure base url. Current: {$data[self::KEY_BASE_URL_SECURE]}" . PHP_EOL;
+        }
+
+        // check 0/1 options
+        $flags = [];
+        if (isset($data[self::KEY_USE_SEF_URL])) {
+            $flags[self::KEY_USE_SEF_URL] = $data[self::KEY_USE_SEF_URL];
+        }
+        if (isset($data[self::KEY_IS_SECURE])) {
+            $flags[self::KEY_IS_SECURE] = $data[self::KEY_IS_SECURE];
+        }
+        if (isset($data[self::KEY_IS_SECURE_ADMIN])) {
+            $flags[self::KEY_IS_SECURE_ADMIN] = $data[self::KEY_IS_SECURE_ADMIN];
+        }
+        if (isset($data[self::KEY_ADMIN_USE_SECURITY_KEY])) {
+            $flags[self::KEY_ADMIN_USE_SECURITY_KEY] = $data[self::KEY_ADMIN_USE_SECURITY_KEY];
+        }
+
+        $validationMessages .= self::validateOneZeroFlags($flags);
+
+        // check language, currency and timezone
+        $options = new Lists(new \Zend_Locale());
+        if (isset($data[self::KEY_LANGUAGE])) {
+            if (!isset($options->getLocaleList()[$data[self::KEY_LANGUAGE]])) {
+                $validationMessages .= self::KEY_LANGUAGE . ': Please use a valid language. ' .
+                    "Current: {$data[self::KEY_LANGUAGE]}" . PHP_EOL;
+            }
+        }
+
+        if (isset($data[self::KEY_CURRENCY])) {
+            if (!isset($options->getCurrencyList()[$data[self::KEY_CURRENCY]])) {
+                $validationMessages .= self::KEY_CURRENCY . ': Please use a valid currency. ' .
+                    "Current: {$data[self::KEY_CURRENCY]}" . PHP_EOL;
+            }
+        }
+
+        if (isset($data[self::KEY_TIMEZONE])) {
+            if (!isset($options->getTimezoneList()[$data[self::KEY_TIMEZONE]])) {
+                $validationMessages .= self::KEY_TIMEZONE . ': Please use a valid timezone. ' .
+                    "Current: {$data[self::KEY_TIMEZONE]}" . PHP_EOL;
+            }
+        }
+
+        return $validationMessages;
+    }
+
+    /**
+     * Validate if all flags are of 0/1 option
+     *
+     * @param array $flags
+     * @return string
+     */
+    private static function validateOneZeroFlags(array $flags = [])
+    {
+        $validationMessages = '';
+        $wrongOptionMessage = 'Please enter a valid option (0/1). ';
+        foreach ($flags as $key => $flag) {
+            if ($flag !== '0' && $flag !== '1') {
+                $validationMessages .= "{$key}: {$wrongOptionMessage} Current: {$flag}" . PHP_EOL;
+            }
+        }
+        return $validationMessages;
+    }
+
+    /**
+     * Validate URL
+     *
+     * @param string $url
+     * @param bool $secure
+     * @return bool
+     */
+    private function validateUrl($url, $secure = false)
+    {
+        $validator = new \Zend\Validator\Uri();
+        if ($validator->isValid($url)) {
+            if ($secure) {
+                return strpos($url, 'https://') !== false;
+            }
+            else {
+                return strpos($url, 'http://') !== false;
+            }
+        }
+        return false;
+    }
 }
diff --git a/setup/module/Magento/Setup/src/Model/Validator.php b/setup/module/Magento/Setup/src/Model/Validator.php
deleted file mode 100644
index d4440697e2b83..0000000000000
--- a/setup/module/Magento/Setup/src/Model/Validator.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-namespace Magento\Setup\Model;
-
-use Magento\Setup\Module\Setup\ConfigMapper;
-use Magento\Setup\Controller\ConsoleController;
-
-class Validator
-{
-    private $validationMessages = [];
-
-    /**
-     * Get validation messages
-     *
-     * @return string
-     */
-    public function getValidationMessages()
-    {
-        $message = '';
-        foreach ($this->validationMessages as $key => $value) {
-            $message .= "{$key}: {$value}" . PHP_EOL;
-        }
-        return $message;
-    }
-
-    /**
-     * Check for any missing parameters
-     *
-     * @param array $expectedParams
-     * @param array $actualParams
-     * @return array
-     */
-    public function checkMissingParameter($expectedParams, $actualParams)
-    {
-        $missingParams = array_diff(array_keys($expectedParams), array_keys($actualParams));
-        foreach ($missingParams as $key => $missingParam) {
-            /* disregard if optional parameter */
-            if (!$expectedParams[$missingParam]['required']) {
-                unset($missingParams[$key]);
-            }
-        }
-        return $missingParams;
-    }
-
-    /**
-     * Check for any extra parameters
-     *
-     * @param array $expectedParams
-     * @param array $actualParams
-     * @return array
-     */
-    public function checkExtraParameter($expectedParams, $actualParams)
-    {
-        $extraParams = array_diff(array_keys($actualParams), array_keys($expectedParams));
-        return $extraParams;
-    }
-
-    /**
-     * Checks for parameters that are missing values
-     *
-     * @param $expectedParams
-     * @param $actualParams
-     * @return array
-     */
-    public function checkMissingValue($expectedParams, $actualParams)
-    {
-        $missingValues = [];
-        foreach ($actualParams as $param => $value) {
-            if (isset($expectedParams[$param])) {
-                if ($value === '' && $expectedParams[$param]['hasValue']) {
-                    $missingValues[] = $param;
-                }
-            }
-        }
-        return $missingValues;
-    }
-
-    /**
-     * Checks for parameters that do not need values
-     *
-     * @param $expectedParams
-     * @param $actualParams
-     * @return array
-     */
-    public function checkExtraValue($expectedParams, $actualParams)
-    {
-        $extraValues = [];
-        foreach ($actualParams as $param => $value) {
-            if (isset($expectedParams[$param])) {
-                if ($value !== '' && !$expectedParams[$param]['hasValue']) {
-                    $extraValues[] = $param;
-                }
-            }
-        }
-        return $extraValues;
-    }
-    /**
-     * Validate parameters according to action
-     *
-     * @param string $action
-     * @param array $data
-     * @return bool
-     */
-    public function validate($action, array $data)
-    {
-        switch ($action)
-        {
-            case ConsoleController::CMD_INSTALL:
-                return $this->validateInstall($data);
-            case ConsoleController::CMD_INSTALL_ADMIN_USER:
-                return $this->validateAdmin($data);
-            case ConsoleController::CMD_INSTALL_USER_CONFIG:
-                return $this->validateUserConfig($data);
-            case ConsoleController::CMD_INSTALL_CONFIG:
-                return $this->validateDeploymentConfig($data);
-            default:
-                return true;
-        }
-    }
-
-    /**
-     * Validate parameter values of installation tool
-     *
-     * @param array $data
-     * @return bool
-     */
-    private function validateInstall(array $data)
-    {
-        $deploymentValid = $this->validateDeploymentConfig($data);
-        $adminValid = $this->validateAdmin($data);
-        $userValid = $this->validateUserConfig($data);
-        return $deploymentValid && $adminValid && $userValid;
-    }
-
-    /**
-     * Validate parameter values of deployment configuration tool
-     *
-     * @param array $data
-     * @return bool
-     */
-    private function validateDeploymentConfig(array $data)
-    {
-        $pass = true;
-        if (isset($data[ConfigMapper::KEY_BACKEND_FRONTNAME]) &&
-            !preg_match('/^[a-zA-Z0-9_]+$/', $data[ConfigMapper::KEY_BACKEND_FRONTNAME])
-        ) {
-            $pass = false;
-            $this->validationMessages[ConfigMapper::KEY_BACKEND_FRONTNAME] =
-                'Please use alphanumeric characters and underscore. ' .
-                "Current: {$data[ConfigMapper::KEY_BACKEND_FRONTNAME]}";
-        }
-        if (isset($data[ConfigMapper::KEY_SESSION_SAVE]) &&
-            $data[ConfigMapper::KEY_SESSION_SAVE] !== 'files' &&
-            $data[ConfigMapper::KEY_SESSION_SAVE] !== 'db'
-        ) {
-            $pass = false;
-            $this->validationMessages[ConfigMapper::KEY_SESSION_SAVE] =
-                "Please use 'files' or 'db'. Current: {$data[ConfigMapper::KEY_SESSION_SAVE]}";
-        }
-        if (isset($data[ConfigMapper::KEY_ENCRYPTION_KEY]) &&
-            !$data[ConfigMapper::KEY_ENCRYPTION_KEY]
-        ) {
-            $pass = false;
-            $this->validationMessages[ConfigMapper::KEY_ENCRYPTION_KEY] =
-                "Please enter a valid encryption key. Current: {$data[ConfigMapper::KEY_ENCRYPTION_KEY]}";
-        }
-
-        return $pass;
-    }
-
-    /**
-     * Validate parameter values of user configuration tool
-     *
-     * @param array $data
-     * @return bool
-     */
-    private function validateUserConfig(array $data)
-    {
-        $pass = true;
-        // check URL
-        if (isset($data[UserConfigurationDataMapper::KEY_BASE_URL]) &&
-            !$this->validateUrl($data[UserConfigurationDataMapper::KEY_BASE_URL])) {
-            $pass = false;
-            $this->validationMessages[UserConfigurationDataMapper::KEY_BASE_URL] =
-                "Please enter a valid base url. Current: {$data[UserConfigurationDataMapper::KEY_BASE_URL]}";
-        }
-        if (isset($data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE]) &&
-            !$this->validateUrl($data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE], true)) {
-            $pass = false;
-            $this->validationMessages[UserConfigurationDataMapper::KEY_BASE_URL_SECURE] =
-                'Please enter a valid secure base url. ' .
-                "Current: {$data[UserConfigurationDataMapper::KEY_BASE_URL_SECURE]}";
-        }
-
-        // check 0/1 options
-        $flags = [];
-        if (isset($data[UserConfigurationDataMapper::KEY_USE_SEF_URL])) {
-            $flags[UserConfigurationDataMapper::KEY_USE_SEF_URL] = $data[UserConfigurationDataMapper::KEY_USE_SEF_URL];
-        }
-        if (isset($data[UserConfigurationDataMapper::KEY_IS_SECURE])) {
-            $flags[UserConfigurationDataMapper::KEY_IS_SECURE] = $data[UserConfigurationDataMapper::KEY_IS_SECURE];
-        }
-        if (isset($data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN])) {
-            $flags[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN] =
-                $data[UserConfigurationDataMapper::KEY_IS_SECURE_ADMIN];
-        }
-        if (isset($data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY])) {
-            $flags[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY] =
-                $data[UserConfigurationDataMapper::KEY_ADMIN_USE_SECURITY_KEY];
-        }
-        if (!$this->validateOneZero($flags)) {
-            $pass = false;
-        }
-
-        // check language, currency and timezone
-        $options = new Lists(new \Zend_Locale());
-        if (isset($data[UserConfigurationDataMapper::KEY_LANGUAGE])) {
-            if (!isset($options->getLocaleList()[$data[UserConfigurationDataMapper::KEY_LANGUAGE]])) {
-                $pass = false;
-                $this->validationMessages[UserConfigurationDataMapper::KEY_LANGUAGE] =
-                    'Please use a valid language. ' .
-                    "Current: {$data[UserConfigurationDataMapper::KEY_LANGUAGE]}";
-            }
-        }
-
-        if (isset($data[UserConfigurationDataMapper::KEY_CURRENCY])) {
-            if (!isset($options->getCurrencyList()[$data[UserConfigurationDataMapper::KEY_CURRENCY]])) {
-                $pass = false;
-                $this->validationMessages[UserConfigurationDataMapper::KEY_CURRENCY] =
-                    'Please use a valid currency. ' .
-                    "Current: {$data[UserConfigurationDataMapper::KEY_CURRENCY]}";
-            }
-        }
-
-        if (isset($data[UserConfigurationDataMapper::KEY_TIMEZONE])) {
-            if (!isset($options->getTimezoneList()[$data[UserConfigurationDataMapper::KEY_TIMEZONE]])) {
-                $pass = false;
-                $this->validationMessages[UserConfigurationDataMapper::KEY_TIMEZONE] =
-                    'Please use a valid timezone. ' .
-                    "Current: {$data[UserConfigurationDataMapper::KEY_TIMEZONE]}";
-            }
-        }
-
-        return $pass;
-    }
-
-    /**
-     * Validate parameter values of admin user setup tool
-     *
-     * @param array $data
-     * @return bool
-     */
-    private function validateAdmin(array $data)
-    {
-        $pass = true;
-        if (isset($data[AdminAccount::KEY_EMAIL]) &&
-            !$this->validateEmail($data[AdminAccount::KEY_EMAIL])
-        ) {
-            $pass = false;
-            $this->validationMessages[AdminAccount::KEY_EMAIL] =
-                'Please enter a valid email address. ' .
-                "Current: {$data[AdminAccount::KEY_EMAIL]}";
-        }
-        if (isset($data[AdminAccount::KEY_PASSWORD]) &&
-            strlen($data[AdminAccount::KEY_PASSWORD]) < 7
-        ) {
-            $pass = false;
-            $this->validationMessages[AdminAccount::KEY_PASSWORD] = 'Password must be at least 7 characters long.';
-        }
-
-        return $pass;
-
-    }
-
-    /**
-     * Validate email
-     *
-     * @param $email
-     * @return bool
-     */
-    private function validateEmail($email)
-    {
-        $validator = new \Zend\Validator\EmailAddress();
-        return $validator->isValid($email);
-    }
-
-    /**
-     * Validate URL
-     *
-     * @param string $url
-     * @param bool $secure
-     * @return bool
-     */
-    private function validateUrl($url, $secure = false)
-    {
-        $validator = new \Zend\Validator\Uri();
-        if ($validator->isValid($url)) {
-            if ($secure) {
-                return strpos($url, 'https://') !== false;
-            }
-            else {
-                return strpos($url, 'http://') !== false;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Validate if all flags are of 0/1 option
-     *
-     * @param array $flags
-     * @return bool
-     */
-    private function validateOneZero(array $flags = [])
-    {
-        $wrongOptionMessage = 'Please enter a valid option (0/1). ';
-        $pass = true;
-        foreach ($flags as $key => $flag) {
-            if ($flag !== '0' && $flag !== '1') {
-                $pass = false;
-                $this->validationMessages[$key] = "{$wrongOptionMessage} Current: {$flag}";
-            }
-        }
-        return $pass;
-    }
-}
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php b/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
new file mode 100644
index 0000000000000..cbbca6b6ce5ed
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license   {license_link}
+ */
+
+namespace Magento\Setup\Mvc\Console;
+
+use Zend\View\Model\ConsoleModel;
+use Zend\Mvc\Router\RouteMatch;
+use Zend\Mvc\MvcEvent;
+use Zend\Console\ColorInterface;
+use Zend\EventManager\EventManagerInterface;
+
+/**
+ * Custom route listener to validate user parameters
+ */
+class RouteListener extends \Zend\Mvc\RouteListener
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function onRoute($e)
+    {
+        $request = $e->getRequest();
+        // propagates to default RouteListener if not CLI
+        if (!$request instanceof \Zend\Console\Request) {
+            return null;
+        }
+
+        $router = $e->getRouter();
+        $match = $router->match($request);
+
+        // CLI routing miss, checks for missing/extra parameters
+        if (!$match instanceof RouteMatch) {
+            $content = $request->getContent();
+            $config = $e->getApplication()->getServiceManager()->get('Config')['console']['router']['routes'];
+
+            $verboseValidator = new VerboseValidator();
+            $validationMessages = $verboseValidator->validate($content, $config);
+
+            if ('' !== $validationMessages) {
+                $this->displayMessages($e, $validationMessages);
+                // set error to stop propagation
+                $e->setError('default_error');
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Display messages on console
+     *
+     * @param MvcEvent $e
+     * @param $validationMessages
+     */
+    private function displayMessages(MvcEvent $e, $validationMessages)
+    {
+        /** @var \Zend\Console\Adapter\AdapterInterface $console */
+        $console = $e->getApplication()->getServiceManager()->get('console');
+        $validationMessages = $console->colorize($validationMessages, ColorInterface::RED);
+        $model = new ConsoleModel();
+        $model->setErrorLevel(1);
+        $model->setResult($validationMessages);
+        $e->setResult($model);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function attach(EventManagerInterface $events)
+    {
+        // set a higher priority than default route listener so it gets triggered first
+        $this->listeners[] = $events->attach(MvcEvent::EVENT_ROUTE, array($this, 'onRoute'), 10);
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Model/RouteMatcher.php b/setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php
similarity index 78%
rename from setup/module/Magento/Setup/src/Model/RouteMatcher.php
rename to setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php
index 47a4f212ce3e7..646210c4afe8a 100644
--- a/setup/module/Magento/Setup/src/Model/RouteMatcher.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php
@@ -6,8 +6,11 @@
  * @license   {license_link}
  */
 
-namespace Magento\Setup\Model;
+namespace Magento\Setup\Mvc\Console;
 
+/**
+ * Extending ZF RouteMatcher for a public getter
+ */
 class RouteMatcher extends \Zend\Console\RouteMatcher\DefaultRouteMatcher
 {
     /**
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
new file mode 100644
index 0000000000000..c84991f46f127
--- /dev/null
+++ b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license   {license_link}
+ */
+
+namespace Magento\Setup\Mvc\Console;
+
+/**
+ * Validator for checking parameters in CLI
+ */
+class VerboseValidator
+{
+    /**
+     * Checks parameters and returns validation messages
+     *
+     * @param array $data
+     * @param array $config
+     * @return string
+     */
+    public function validate(array $data, array $config)
+    {
+        $validationMessages = '';
+        if (!empty($data)) {
+            $userAction = $data[0];
+            array_shift($data);
+        } else {
+            // user did not provide any action or parameters, treat as default action
+            return '';
+        }
+
+        if (isset($config[$userAction])) {
+            // parse the expected parameters of the action
+            $matcher = new RouteMatcher($config[$userAction]['options']['route']);
+            $parts = $matcher->getParts();
+            array_shift($parts);
+            $expectedParams = [];
+            foreach ($parts as $part) {
+                $expectedParams[$part['name']] = $part;
+            }
+            // parse user parameters
+            $userParams = $this->parseUserParams($data);
+
+            $missingParams = $this->checkMissingParameter($expectedParams, $userParams);
+            $extraParams = $this->checkExtraParameter($expectedParams, $userParams);
+            $missingValues = $this->checkMissingValue($expectedParams, $userParams);
+            $extraValues = $this->checkExtraValue($expectedParams, $userParams);
+
+            $validationMessages = PHP_EOL;
+
+            if (!empty($missingParams)) {
+                $validationMessages .= 'Missing parameters:' . PHP_EOL;
+                foreach ($missingParams as $missingParam) {
+                    $validationMessages .= $missingParam . PHP_EOL;
+                }
+                $validationMessages .= PHP_EOL;
+            }
+            if (!empty($extraParams)) {
+                $validationMessages .= 'Unidentified parameters:' . PHP_EOL;
+                foreach ($extraParams as $extraParam) {
+                    $validationMessages .= $extraParam . PHP_EOL;
+                }
+                $validationMessages .= PHP_EOL;
+            }
+            if (!empty($missingValues)) {
+                $validationMessages .= 'Parameters missing value:' . PHP_EOL;
+                foreach ($missingValues as $missingValue) {
+                    $validationMessages .= $missingValue . PHP_EOL;
+                }
+                $validationMessages .= PHP_EOL;
+            }
+            if (!empty($extraValues)) {
+                $validationMessages .= 'Parameters that don\'t need value:' . PHP_EOL;
+                foreach ($extraValues as $extraValue) {
+                    $validationMessages .= $extraValue . PHP_EOL;
+                }
+                $validationMessages .= PHP_EOL;
+            }
+            if (empty($missingParams) && empty($extraParams) && empty($missingValues) && empty($extraValue)) {
+                $validationMessages .= 'Please make sure parameters start with --.' . PHP_EOL;
+                $validationMessages .= PHP_EOL;
+            }
+
+            // add usage message
+            $validationMessages .= 'Usage:' . PHP_EOL;
+            $validationMessages .= $config[$userAction]['options']['route'] . PHP_EOL . PHP_EOL;
+
+        } else if (!is_null($userAction)) {
+            $validationMessages .= PHP_EOL . "Unknown action name '{$userAction}'." . PHP_EOL . PHP_EOL;
+            $validationMessages .= 'Available options: ' . PHP_EOL;
+            foreach (array_keys($config) as $action) {
+                $validationMessages .= $action . PHP_EOL;
+            }
+            $validationMessages .= PHP_EOL;
+        }
+
+
+        return $validationMessages;
+    }
+
+    /**
+     * Parse user input
+     *
+     * @param array $content
+     * @return array
+     */
+    private function parseUserParams(array $content)
+    {
+        $parameters = [];
+        foreach ($content as $param) {
+            $parsed = explode('=', $param, 2);
+            $value = isset($parsed[1]) ? $parsed[1] : '';
+            if (strpos($parsed[0], '--') !== false) {
+                $key = substr($parsed[0], 2, strlen($parsed[0]) - 2);
+            } else {
+                $key = $parsed[0];
+            }
+
+            $parameters[$key] = $value;
+        }
+        return $parameters;
+    }
+    /**
+     * Check for any missing parameters
+     *
+     * @param array $expectedParams
+     * @param array $actualParams
+     * @return array
+     */
+    public function checkMissingParameter($expectedParams, $actualParams)
+    {
+        $missingParams = array_diff(array_keys($expectedParams), array_keys($actualParams));
+        foreach ($missingParams as $key => $missingParam) {
+            /* disregard if optional parameter */
+            if (!$expectedParams[$missingParam]['required']) {
+                unset($missingParams[$key]);
+            }
+        }
+        return $missingParams;
+    }
+
+    /**
+     * Check for any extra parameters
+     *
+     * @param array $expectedParams
+     * @param array $actualParams
+     * @return array
+     */
+    public function checkExtraParameter($expectedParams, $actualParams)
+    {
+        $extraParams = array_diff(array_keys($actualParams), array_keys($expectedParams));
+        return $extraParams;
+    }
+
+    /**
+     * Checks for parameters that are missing values
+     *
+     * @param $expectedParams
+     * @param $actualParams
+     * @return array
+     */
+    public function checkMissingValue($expectedParams, $actualParams)
+    {
+        $missingValues = [];
+        foreach ($actualParams as $param => $value) {
+            if (isset($expectedParams[$param])) {
+                if ($value === '' && $expectedParams[$param]['hasValue']) {
+                    $missingValues[] = $param;
+                }
+            }
+        }
+        return $missingValues;
+    }
+
+    /**
+     * Checks for parameters that do not need values
+     *
+     * @param $expectedParams
+     * @param $actualParams
+     * @return array
+     */
+    public function checkExtraValue($expectedParams, $actualParams)
+    {
+        $extraValues = [];
+        foreach ($actualParams as $param => $value) {
+            if (isset($expectedParams[$param])) {
+                if ($value !== '' && !$expectedParams[$param]['hasValue']) {
+                    $extraValues[] = $param;
+                }
+            }
+        }
+        return $extraValues;
+    }
+}
diff --git a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php b/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
deleted file mode 100644
index d0d579954ea89..0000000000000
--- a/setup/module/Magento/Setup/src/Mvc/ValidatingRouteListener.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license   {license_link}
- */
-
-namespace Magento\Setup\Mvc;
-
-use Magento\Setup\Model\Validator;
-use Zend\View\Model\ConsoleModel;
-use Zend\Mvc\Router\RouteMatch;
-use Zend\Mvc\MvcEvent;
-use Zend\Console\ColorInterface;
-
-class ValidatingRouteListener extends \Zend\Mvc\RouteListener
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function onRoute($e)
-    {
-        $request = $e->getRequest();
-        // propagates to default RouteListener if not CLI
-        if (!$request instanceof \Zend\Console\Request) {
-            return null;
-        }
-
-        $router = $e->getRouter();
-        $match = $router->match($request);
-
-        $validationMessages = '';
-        // CLI routing miss, checks for missing/extra parameters
-        if (!$match instanceof RouteMatch) {
-            $validationMessages .= $this->checkParams($e);
-            if ('' !== $validationMessages) {
-                $this->displayMessage($e, $validationMessages);
-                // set error to stop propagation
-                $e->setError('default_error');
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Checks parameters
-     *
-     * @param MvcEvent $e
-     * @return string
-     */
-    private function checkParams(MvcEvent $e)
-    {
-        $request = $e->getRequest();
-        $content = $request->getContent();
-        $serviceManager = $e->getApplication()->getServiceManager();
-
-        $userAction = $content[0];
-        array_shift($content);
-
-        $routes = $serviceManager->get('Config')['console']['router']['routes'];
-        $validationMessages = '';
-        if (isset($routes[$userAction])) {
-            // parse the expected parameters of the action
-            $matcher = new \Magento\Setup\Model\RouteMatcher($routes[$userAction]['options']['route']);
-            $parts = $matcher->getParts();
-            array_shift($parts);
-            $expectedParams = [];
-            foreach ($parts as $part) {
-                $expectedParams[$part['name']] = $part;
-            }
-            // parse user parameters
-            $userParams = $this->parseUserParams($content);
-
-            $validator = new Validator();
-            $missingParams = $validator->checkMissingParameter($expectedParams, $userParams);
-            $extraParams = $validator->checkExtraParameter($expectedParams, $userParams);
-            $missingValues = $validator->checkMissingValue($expectedParams, $userParams);
-            $extraValues = $validator->checkExtraValue($expectedParams, $userParams);
-
-            if (!empty($missingParams)) {
-                $validationMessages .= 'Missing parameters:' . PHP_EOL;
-                foreach ($missingParams as $missingParam) {
-                    $validationMessages .= $missingParam . PHP_EOL;
-                }
-                $validationMessages .= PHP_EOL;
-            }
-            if (!empty($extraParams)) {
-                $validationMessages .= 'Unidentified parameters:' . PHP_EOL;
-                foreach ($extraParams as $extraParam) {
-                    $validationMessages .= $extraParam . PHP_EOL;
-                }
-                $validationMessages .= PHP_EOL;
-            }
-            if (!empty($missingValues)) {
-                $validationMessages .= 'Parameters missing value:' . PHP_EOL;
-                foreach ($missingValues as $missingValue) {
-                    $validationMessages .= $missingValue . PHP_EOL;
-                }
-                $validationMessages .= PHP_EOL;
-            }
-            if (!empty($extraValues)) {
-                $validationMessages .= 'Parameters that don\'t need value:' . PHP_EOL;
-                foreach ($extraValues as $extraValue) {
-                    $validationMessages .= $extraValue . PHP_EOL;
-                }
-                $validationMessages .= PHP_EOL;
-            }
-            if (empty($missingParams) && empty($extraParams) && empty($missingValues) && empty($extraValue)) {
-                $validationMessages .= 'Please make sure parameters start with --.' . PHP_EOL;
-                $validationMessages .= PHP_EOL;
-            }
-
-        } else if (!is_null($userAction)) {
-            $validationMessages .= "Unknown action name '{$userAction}'." . PHP_EOL;
-            $validationMessages .= PHP_EOL;
-        }
-
-        return $validationMessages;
-    }
-
-    private function displayMessage(MvcEvent $e, $validationMessages)
-    {
-        $serviceManager = $e->getApplication()->getServiceManager();
-        $console = $serviceManager->get('console');
-        $validationMessages = $console->colorize($validationMessages, ColorInterface::RED);
-        $model = new ConsoleModel();
-        $model->setErrorLevel(1);
-        $model->setResult($validationMessages);
-        $e->setResult($model);
-    }
-
-    /**
-     * Parse user input
-     *
-     * @param array $content
-     * @return array
-     */
-    private function parseUserParams(array $content)
-    {
-        $parameters = [];
-        foreach ($content as $param) {
-            $parsed = explode('=', $param, 2);
-            $value = isset($parsed[1]) ? $parsed[1] : '';
-            if (strpos($parsed[0], '--') !== false) {
-                $key = substr($parsed[0], 2, strlen($parsed[0]) - 2);
-            } else {
-                $key = $parsed[0];
-            }
-
-            $parameters[$key] = $value;
-        }
-        return $parameters;
-    }
-}

From 5306d6b6135d9eceb0b675c5dbddec5ad4e2e11c Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Tue, 2 Dec 2014 17:26:45 -0600
Subject: [PATCH 115/474] MAGETWO-31004: Validation of CLI

- removed base_url_secure in functional test
---
 dev/build/core_dev/functional/build.xml          | 5 +----
 dev/build/core_dev/functional/config/install.php | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index e015588de495e..4e07cb7c039db 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -51,7 +51,6 @@
                 db_password: '',
                 deploy_directory: '',
                 http_host: ' (e.g. http://myhost.com/mypath/)',
-                https_host: ' (e.g. https://myhost.com/mypath/)',
                 instance_count: '',
                 selenium_browser: ' (e.g. firefox, googlechrome etc; see server.yml.dist)',
                 selenium_host: '',
@@ -188,7 +187,6 @@
             <replacefilter token="{{db_user}}" value="${env.db_user}"/>
             <replacefilter token="{{db_password}}" value="${env.db_password}"/>
             <replacefilter token="{{url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}"/>
-            <replacefilter token="{{secure_url}}" value="${env.https_host}${env.build.key}/instance-${instanceIndex}"/>
         </replace>
 
         <condition property="env.bamboo_tests_configuration" value="basic">
@@ -317,8 +315,7 @@
             <arg value="-h${env.db_host}"/>
             <arg value="-D${env.db_name_prefix}${instanceIndex}"/>
             <arg value="-e"/>
-            <arg value="UPDATE core_config_data SET value='${env.https_host}${env.build.key}/instance-${instanceIndex}/' WHERE path='web/secure/base_url';
-                UPDATE core_config_data SET value='${env.http_host}${env.build.key}/instance-${instanceIndex}/' WHERE path='web/unsecure/base_url';"/>
+            <arg value="UPDATE core_config_data SET value='${env.http_host}${env.build.key}/instance-${instanceIndex}/' WHERE path='web/unsecure/base_url';"/>
         </exec>
     </target>
 </project>
diff --git a/dev/build/core_dev/functional/config/install.php b/dev/build/core_dev/functional/config/install.php
index c3143fbf17d60..fde6055ccff36 100644
--- a/dev/build/core_dev/functional/config/install.php
+++ b/dev/build/core_dev/functional/config/install.php
@@ -24,7 +24,6 @@
         'admin_username'         => 'admin',
         'admin_password'         => '123123q', // must be at least of 7 both numeric and alphanumeric characters
         'base_url'               => '{{url}}',
-        'base_url_secure'        => '{{secure_url}}',
         'session_save'           => 'db',
         'backend_frontname'      => 'backend',
     ),

From f42538c56220a1a44ed41eb7a250c812e05ed162 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 3 Dec 2014 13:23:01 -0600
Subject: [PATCH 116/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Improved user experience.
---
 setup/pub/magento/setup/add-database.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 3cc907844191f..f9d67c4763414 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -46,16 +46,31 @@ angular.module('add-database', ['ngStorage'])
             $interval.cancel(intervalPromise);
         });
 
-        $scope.$on('previousState()', function () {
+        $scope.$on('previousState', function () {
             $interval.cancel(intervalPromise);
         });
 
-
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();
         });
 
+        $scope.$watch('db.host', function(newVal, oldVal) {
+            $scope.database.$valid = false;
+        });
+
+        $scope.$watch('db.user', function(newVal, oldVal) {
+            $scope.database.$valid = false;
+        });
+
+        $scope.$watch('db.password', function(newVal, oldVal) {
+            $scope.database.$valid = false;
+        });
+
+        $scope.$watch('db.name', function(newVal, oldVal) {
+            $scope.database.$valid = false;
+        });
+
         // Dispatch 'validation-response' event to parent controller
         $scope.validate = function() {
             if ($scope.database.$valid) {

From 00f16f566ee8a464e9aea9946d35e6a3546c611b Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 3 Dec 2014 11:50:49 -0600
Subject: [PATCH 117/474] MAGETWO-31004: Validation of CLI

- made changes according to CR feedback
---
 .../src/Controller/ConsoleController.php      |  30 +-----
 .../Controller/Install/StartController.php    |  12 +--
 .../Magento/Setup/src/Model/AdminAccount.php  |  32 ------
 .../src/Model/DeploymentConfigMapper.php      |  30 ------
 .../Magento/Setup/src/Model/Installer.php     |  16 ---
 .../src/Model/UserConfigurationDataMapper.php | 101 ------------------
 .../Setup/src/Mvc/Console/RouteListener.php   |   3 +-
 .../src/Mvc/Console/VerboseValidator.php      |   9 +-
 8 files changed, 17 insertions(+), 216 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index ad2ee18da4335..327f67e7020b1 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -288,12 +288,7 @@ public function installAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $validationMessages = Installer::validateInstall($request->getParams()->toArray());
-        if ('' === $validationMessages) {
-            $this->installer->install($request->getParams());
-        } else {
-            $this->log->log(PHP_EOL . $validationMessages);
-        }
+        $this->installer->install($request->getParams());
     }
 
     /**
@@ -306,13 +301,8 @@ public function installDeploymentConfigAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $validationMessages = DeploymentConfigMapper::validateDeploymentConfig($request->getParams()->toArray());
-        if ('' === $validationMessages) {
-            $this->installer->checkInstallationFilePermissions();
-            $this->installer->installDeploymentConfig($request->getParams());
-        } else {
-            $this->log->log(PHP_EOL . $validationMessages);
-        }
+        $this->installer->checkInstallationFilePermissions();
+        $this->installer->installDeploymentConfig($request->getParams());
     }
 
     /**
@@ -360,12 +350,7 @@ public function installUserConfigAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $validationMessages = UserConfigurationDataMapper::validateUserConfig($request->getParams()->toArray());
-        if ('' === $validationMessages) {
-            $this->installer->installUserConfig($request->getParams());
-        } else {
-            $this->log->log(PHP_EOL . $validationMessages);
-        }
+        $this->installer->installUserConfig($request->getParams());
     }
 
     /**
@@ -377,12 +362,7 @@ public function installAdminUserAction()
     {
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
-        $validationMessages = AdminAccount::validateAdmin($request->getParams()->toArray());
-        if ('' === $validationMessages) {
-            $this->installer->installAdminUser($request->getParams());
-        } else {
-            $this->log->log(PHP_EOL . $validationMessages);
-        }
+        $this->installer->installAdminUser($request->getParams());
     }
 
     /**
diff --git a/setup/module/Magento/Setup/src/Controller/Install/StartController.php b/setup/module/Magento/Setup/src/Controller/Install/StartController.php
index f4ea22ae213f3..47e2f3e182100 100644
--- a/setup/module/Magento/Setup/src/Controller/Install/StartController.php
+++ b/setup/module/Magento/Setup/src/Controller/Install/StartController.php
@@ -101,14 +101,14 @@ private function importDeploymentConfigForm()
         $result[DeploymentConfigMapper::KEY_DB_HOST] = isset($source['db']['host']) ? $source['db']['host'] : '';
         $result[DeploymentConfigMapper::KEY_DB_NAME] = isset($source['db']['name']) ? $source['db']['name'] : '';
         $result[DeploymentConfigMapper::KEY_DB_USER] = isset($source['db']['user']) ? $source['db']['user'] :'';
-        $result[DeploymentConfigMapper::KEY_DB_PASS] = isset($source['db']['password']) ? $source['db']['password'] : '';
-        $result[DeploymentConfigMapper::KEY_DB_PREFIX] = isset($source['db']['tablePrefix']) ? $source['db']['tablePrefix'] : '';
+        $result[DeploymentConfigMapper::KEY_DB_PASS] =
+            isset($source['db']['password']) ? $source['db']['password'] : '';
+        $result[DeploymentConfigMapper::KEY_DB_PREFIX] =
+            isset($source['db']['tablePrefix']) ? $source['db']['tablePrefix'] : '';
         $result[DeploymentConfigMapper::KEY_BACKEND_FRONTNAME] = isset($source['config']['address']['admin'])
-            ? $source['config']['address']['admin']
-            : '';
+            ? $source['config']['address']['admin'] : '';
         $result[DeploymentConfigMapper::KEY_ENCRYPTION_KEY] = isset($source['config']['encrypt']['key'])
-            ? $source['config']['encrypt']['key']
-            : '';
+            ? $source['config']['encrypt']['key'] : '';
         return $result;
     }
 
diff --git a/setup/module/Magento/Setup/src/Model/AdminAccount.php b/setup/module/Magento/Setup/src/Model/AdminAccount.php
index b18487964ed73..08196411dfca1 100644
--- a/setup/module/Magento/Setup/src/Model/AdminAccount.php
+++ b/setup/module/Magento/Setup/src/Model/AdminAccount.php
@@ -85,38 +85,6 @@ public function save()
         $this->saveAdminUserRole($adminId);
     }
 
-    /**
-     * Validate parameter values of admin user setup tool
-     *
-     * @param array $data
-     * @return bool
-     */
-    public static function validateAdmin(array $data)
-    {
-        $validationMessages = '';
-        if (isset($data[self::KEY_EMAIL]) && !self::validateEmail($data[self::KEY_EMAIL])) {
-            $validationMessages .= self::KEY_EMAIL . ': Please enter a valid email address. ' .
-                "Current: {$data[self::KEY_EMAIL]}" . PHP_EOL;
-        }
-        if (isset($data[self::KEY_PASSWORD]) && strlen($data[self::KEY_PASSWORD]) < 7) {
-            $validationMessages .= self::KEY_PASSWORD . ': Password must be at least 7 characters long.' . PHP_EOL;
-        }
-
-        return $validationMessages;
-    }
-
-    /**
-     * Validate email
-     *
-     * @param $email
-     * @return bool
-     */
-    private static function validateEmail($email)
-    {
-        $validator = new \Zend\Validator\EmailAddress();
-        return $validator->isValid($email);
-    }
-
     /**
      * Uses the information in data[] to create the admin user.
      *
diff --git a/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php b/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
index 3131b24a1518b..5848e78d7815a 100644
--- a/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
+++ b/setup/module/Magento/Setup/src/Model/DeploymentConfigMapper.php
@@ -50,34 +50,4 @@ class DeploymentConfigMapper
         self::KEY_BACKEND_FRONTNAME => BackendConfig::KEY_FRONTNAME,
         self::KEY_ENCRYPTION_KEY => EncryptConfig::KEY_ENCRYPTION_KEY,
     ];
-
-    /**
-     * Validate parameter values of deployment configuration tool
-     *
-     * @param array $data
-     * @return string
-     */
-    public static function validateDeploymentConfig(array $data)
-    {
-        $validationMessages = '';
-        if (isset($data[self::KEY_BACKEND_FRONTNAME]) &&
-            !preg_match('/^[a-zA-Z0-9_]+$/', $data[self::KEY_BACKEND_FRONTNAME])
-        ) {
-            $validationMessages .= self::KEY_BACKEND_FRONTNAME .
-                ': Please use alphanumeric characters and underscore. ' .
-                "Current: {$data[self::KEY_BACKEND_FRONTNAME]}" . PHP_EOL;
-        }
-        if (isset($data[self::KEY_SESSION_SAVE]) && $data[self::KEY_SESSION_SAVE] !== 'files' &&
-            $data[self::KEY_SESSION_SAVE] !== 'db'
-        ) {
-            $validationMessages .= self::KEY_SESSION_SAVE .
-                ": Please use 'files' or 'db'. Current: {$data[self::KEY_SESSION_SAVE]}" . PHP_EOL;
-        }
-        if (isset($data[self::KEY_ENCRYPTION_KEY]) && !$data[self::KEY_ENCRYPTION_KEY]) {
-            $validationMessages .= self::KEY_ENCRYPTION_KEY .
-                ": Please enter a valid encryption key. Current: {$data[self::KEY_ENCRYPTION_KEY]}" . PHP_EOL;
-        }
-
-        return $validationMessages;
-    }
 }
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index dcc691b022c93..ff3315aa95613 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -713,22 +713,6 @@ public function getInstallInfo()
         return $this->installInfo;
     }
 
-
-    /**
-     * Validate install parameter values
-     *
-     * @param array $data
-     * @return string
-     */
-    public static function validateInstall(array $data)
-    {
-        $validationMessages = '';
-        $validationMessages .=  DeploymentConfigMapper::validateDeploymentConfig($data);
-        $validationMessages .= UserConfigurationDataMapper::validateUserConfig($data);
-        $validationMessages .= AdminAccount::validateAdmin($data);
-        return $validationMessages;
-    }
-
     /**
      * Deletes the database and creates it again
      *
diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index eb964bc10cdac..32eed61a9d52a 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -81,105 +81,4 @@ public function getConfigData($data)
 
         return $configData;
     }
-
-    /**
-     * Validate parameter values of user configuration tool
-     *
-     * @param array $data
-     * @return string
-     */
-    public static function validateUserConfig(array $data)
-    {
-        $validationMessages = '';
-        // check URL
-        if (isset($data[self::KEY_BASE_URL]) && !self::validateUrl($data[self::KEY_BASE_URL])) {
-            $validationMessages .= self::KEY_BASE_URL .
-                ": Please enter a valid base url. Current: {$data[self::KEY_BASE_URL]}" . PHP_EOL;
-        }
-        if (isset($data[self::KEY_BASE_URL_SECURE]) && !self::validateUrl($data[self::KEY_BASE_URL_SECURE], true)) {
-            $validationMessages .= self::KEY_BASE_URL_SECURE .
-                ": Please enter a valid secure base url. Current: {$data[self::KEY_BASE_URL_SECURE]}" . PHP_EOL;
-        }
-
-        // check 0/1 options
-        $flags = [];
-        if (isset($data[self::KEY_USE_SEF_URL])) {
-            $flags[self::KEY_USE_SEF_URL] = $data[self::KEY_USE_SEF_URL];
-        }
-        if (isset($data[self::KEY_IS_SECURE])) {
-            $flags[self::KEY_IS_SECURE] = $data[self::KEY_IS_SECURE];
-        }
-        if (isset($data[self::KEY_IS_SECURE_ADMIN])) {
-            $flags[self::KEY_IS_SECURE_ADMIN] = $data[self::KEY_IS_SECURE_ADMIN];
-        }
-        if (isset($data[self::KEY_ADMIN_USE_SECURITY_KEY])) {
-            $flags[self::KEY_ADMIN_USE_SECURITY_KEY] = $data[self::KEY_ADMIN_USE_SECURITY_KEY];
-        }
-
-        $validationMessages .= self::validateOneZeroFlags($flags);
-
-        // check language, currency and timezone
-        $options = new Lists(new \Zend_Locale());
-        if (isset($data[self::KEY_LANGUAGE])) {
-            if (!isset($options->getLocaleList()[$data[self::KEY_LANGUAGE]])) {
-                $validationMessages .= self::KEY_LANGUAGE . ': Please use a valid language. ' .
-                    "Current: {$data[self::KEY_LANGUAGE]}" . PHP_EOL;
-            }
-        }
-
-        if (isset($data[self::KEY_CURRENCY])) {
-            if (!isset($options->getCurrencyList()[$data[self::KEY_CURRENCY]])) {
-                $validationMessages .= self::KEY_CURRENCY . ': Please use a valid currency. ' .
-                    "Current: {$data[self::KEY_CURRENCY]}" . PHP_EOL;
-            }
-        }
-
-        if (isset($data[self::KEY_TIMEZONE])) {
-            if (!isset($options->getTimezoneList()[$data[self::KEY_TIMEZONE]])) {
-                $validationMessages .= self::KEY_TIMEZONE . ': Please use a valid timezone. ' .
-                    "Current: {$data[self::KEY_TIMEZONE]}" . PHP_EOL;
-            }
-        }
-
-        return $validationMessages;
-    }
-
-    /**
-     * Validate if all flags are of 0/1 option
-     *
-     * @param array $flags
-     * @return string
-     */
-    private static function validateOneZeroFlags(array $flags = [])
-    {
-        $validationMessages = '';
-        $wrongOptionMessage = 'Please enter a valid option (0/1). ';
-        foreach ($flags as $key => $flag) {
-            if ($flag !== '0' && $flag !== '1') {
-                $validationMessages .= "{$key}: {$wrongOptionMessage} Current: {$flag}" . PHP_EOL;
-            }
-        }
-        return $validationMessages;
-    }
-
-    /**
-     * Validate URL
-     *
-     * @param string $url
-     * @param bool $secure
-     * @return bool
-     */
-    private function validateUrl($url, $secure = false)
-    {
-        $validator = new \Zend\Validator\Uri();
-        if ($validator->isValid($url)) {
-            if ($secure) {
-                return strpos($url, 'https://') !== false;
-            }
-            else {
-                return strpos($url, 'http://') !== false;
-            }
-        }
-        return false;
-    }
 }
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php b/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
index cbbca6b6ce5ed..89897dd193d7d 100644
--- a/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
@@ -54,7 +54,8 @@ public function onRoute($e)
      * Display messages on console
      *
      * @param MvcEvent $e
-     * @param $validationMessages
+     * @param string $validationMessages
+     * @return void
      */
     private function displayMessages(MvcEvent $e, $validationMessages)
     {
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
index c84991f46f127..c0e0e29fda9dc 100644
--- a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
@@ -96,7 +96,6 @@ public function validate(array $data, array $config)
             $validationMessages .= PHP_EOL;
         }
 
-
         return $validationMessages;
     }
 
@@ -157,8 +156,8 @@ public function checkExtraParameter($expectedParams, $actualParams)
     /**
      * Checks for parameters that are missing values
      *
-     * @param $expectedParams
-     * @param $actualParams
+     * @param array $expectedParams
+     * @param array $actualParams
      * @return array
      */
     public function checkMissingValue($expectedParams, $actualParams)
@@ -177,8 +176,8 @@ public function checkMissingValue($expectedParams, $actualParams)
     /**
      * Checks for parameters that do not need values
      *
-     * @param $expectedParams
-     * @param $actualParams
+     * @param array $expectedParams
+     * @param array $actualParams
      * @return array
      */
     public function checkExtraValue($expectedParams, $actualParams)

From ea1f79606d66b6615d4a3189299466350e9f1378 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 3 Dec 2014 11:56:44 -0600
Subject: [PATCH 118/474] MAGETWO-31004: Validation of CLI

- removed trailing comma in one line array
---
 setup/config/application.config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/config/application.config.php b/setup/config/application.config.php
index 8fe94fb8497f2..3d0eadab753ae 100644
--- a/setup/config/application.config.php
+++ b/setup/config/application.config.php
@@ -21,7 +21,7 @@
             __DIR__ . '/autoload/{,*.}{global,local}.php',
         ),
     ],
-    'listeners' => ['Magento\Setup\Mvc\Bootstrap\InitParamListener', 'Magento\Setup\Mvc\Console\RouteListener',],
+    'listeners' => ['Magento\Setup\Mvc\Bootstrap\InitParamListener', 'Magento\Setup\Mvc\Console\RouteListener'],
     'service_manager' => [
         'factories' => [
             InitParamListener::BOOTSTRAP_PARAM => 'Magento\Setup\Mvc\Bootstrap\InitParamListener',

From b3b3952f6c3e3e42e6874ea580c8283f717b81f2 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 3 Dec 2014 19:11:17 -0600
Subject: [PATCH 119/474] MAGETWO-31004: Validation of CLI

- made changes to validator
- corrected usage output
---
 .../src/Controller/ConsoleController.php      | 23 +++++++++---
 .../src/Mvc/Console/VerboseValidator.php      | 37 +++++++++++++++++--
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index 327f67e7020b1..16263d084c189 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -12,7 +12,6 @@
 use Magento\Setup\Model\InstallerFactory;
 use Magento\Setup\Model\Installer;
 use Magento\Setup\Model\ConsoleLogger;
-use Magento\Setup\Model\UserConfigurationDataMapper;
 use Zend\Console\Request as ConsoleRequest;
 use Zend\EventManager\EventManagerInterface;
 use Zend\Mvc\Controller\AbstractActionController;
@@ -137,6 +136,20 @@ public static function getConsoleUsage()
         return $result;
     }
 
+    /**
+     * Gets command usage
+     *
+     * @return array
+     */
+    public static function getCommandUsage()
+    {
+        $result = [];
+        foreach (self::getCliConfig() as $key => $cmd) {
+            $result[$key] = $cmd['usage'];
+        }
+        return $result;
+    }
+
     /**
      * The CLI that this controller implements
      *
@@ -416,7 +429,7 @@ public function maintenanceAction()
     public function helpAction()
     {
         $type = $this->getRequest()->getParam('type');
-        $details = self::getCliConfig();
+        $usages = self::getCommandUsage();
         switch($type) {
             case UserConfig::KEY_LANGUAGE:
                 return $this->arrayToString($this->options->getLocaleList());
@@ -425,9 +438,9 @@ public function helpAction()
             case UserConfig::KEY_TIMEZONE:
                 return $this->arrayToString($this->options->getTimezoneList());
             default:
-                if (isset($details[$type])) {
-                    if ($details[$type]['usage']) {
-                        $formatted = $this->formatCliUsage($details[$type]['usage']);
+                if (isset($usages[$type])) {
+                    if ($usages[$type]) {
+                        $formatted = $this->formatCliUsage($usages[$type]);
                         return "\nAvailable parameters:\n{$formatted}\n";
                     }
                     return "\nThis command has no parameters.\n";
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
index c0e0e29fda9dc..8737827ae4781 100644
--- a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
@@ -8,6 +8,8 @@
 
 namespace Magento\Setup\Mvc\Console;
 
+use Magento\Setup\Controller\ConsoleController;
+
 /**
  * Validator for checking parameters in CLI
  */
@@ -79,13 +81,14 @@ public function validate(array $data, array $config)
                 $validationMessages .= PHP_EOL;
             }
             if (empty($missingParams) && empty($extraParams) && empty($missingValues) && empty($extraValue)) {
-                $validationMessages .= 'Please make sure parameters start with --.' . PHP_EOL;
-                $validationMessages .= PHP_EOL;
+                $validationMessages .= 'Please make sure parameters are in correct format and are not repeated.';
+                $validationMessages .= PHP_EOL . PHP_EOL;
             }
 
             // add usage message
-            $validationMessages .= 'Usage:' . PHP_EOL;
-            $validationMessages .= $config[$userAction]['options']['route'] . PHP_EOL . PHP_EOL;
+            $usages = ConsoleController::getCommandUsage();
+            $validationMessages .= 'Usage:' . PHP_EOL . "{$userAction} ";
+            $validationMessages .= $usages[$userAction] . PHP_EOL . PHP_EOL;
 
         } else if (!is_null($userAction)) {
             $validationMessages .= PHP_EOL . "Unknown action name '{$userAction}'." . PHP_EOL . PHP_EOL;
@@ -137,6 +140,19 @@ public function checkMissingParameter($expectedParams, $actualParams)
                 unset($missingParams[$key]);
             }
         }
+        // some parameters have alternative names, verify user input with theses alternative names
+        foreach ($missingParams as $key => $missingParam) {
+            foreach (array_keys($actualParams) as $actualParam) {
+                if (isset($expectedParams[$missingParam]['alternatives'])) {
+                    foreach ($expectedParams[$missingParam]['alternatives'] as $alternative) {
+                        if ($actualParam === $alternative) {
+                            unset($missingParams[$key]);
+                            break 2;
+                        }
+                    }
+                }
+            }
+        }
         return $missingParams;
     }
 
@@ -150,6 +166,19 @@ public function checkMissingParameter($expectedParams, $actualParams)
     public function checkExtraParameter($expectedParams, $actualParams)
     {
         $extraParams = array_diff(array_keys($actualParams), array_keys($expectedParams));
+        // some parameters have alternative names, make sure $extraParams doesn't contain these alternatives names
+        foreach ($extraParams as $key => $extraParam) {
+            foreach ($expectedParams as $expectedParam) {
+                if (isset($expectedParam['alternatives'])) {
+                    foreach ($expectedParam['alternatives'] as $alternative) {
+                        if ($extraParam === $alternative) {
+                            unset($extraParams[$key]);
+                            break 2;
+                        }
+                    }
+                }
+            }
+        }
         return $extraParams;
     }
 

From 7c6c77d0f91b797d9fc25b42cf7c2b7f5f3eaea9 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 4 Dec 2014 11:04:29 -0600
Subject: [PATCH 120/474] MAGETWO-30859: No input validation for HTTPS
 configuration data during installation

- Changes based on feedback from QA.
---
 .../Magento/Setup/src/Model/UserConfigurationDataMapper.php  | 3 +--
 .../Magento/Setup/view/magento/setup/web-configuration.phtml | 4 ++--
 setup/pub/magento/setup/web-configuration.js                 | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index 32eed61a9d52a..26b24e12ea2b7 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -63,7 +63,7 @@ class UserConfigurationDataMapper
     public function getConfigData($data)
     {
         $configData = [];
-        if ($data[self::KEY_BASE_URL_SECURE] === '') {
+        if (!($data[self::KEY_IS_SECURE] || $data[self::KEY_IS_SECURE_ADMIN])) {
             unset($data[self::KEY_BASE_URL_SECURE] );
         }
         foreach (self::$pathDataMap as $path => $key) {
@@ -78,7 +78,6 @@ public function getConfigData($data)
                 $configData[$path] = $data[$key];
             }
         }
-
         return $configData;
     }
 }
diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 360b055d3e0ce..3d02677ca1f51 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -80,12 +80,12 @@ $hints = [
             <div class="col-md-5">
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" ng-checked="" ng-model="config.https.front">&nbsp;Use HTTPS for Magento Storefront
+                        <input type="checkbox" ng-checked="config.https.front" ng-model="config.https.front">&nbsp;Use HTTPS for Magento Storefront
                     </label>
                 </div>
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" ng-checked="" ng-model="config.https.admin">&nbsp;Use HTTPS for Magento Admin
+                        <input type="checkbox" ng-checked="config.https.admin" ng-model="config.https.admin">&nbsp;Use HTTPS for Magento Admin
                     </label>
                 </div>
             </div>
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index a77f79504cb00..9227e453276e0 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -10,13 +10,13 @@ angular.module('web-configuration', ['ngStorage'])
     .controller('webConfigurationController', ['$scope', '$state', '$localStorage', function ($scope, $state, $localStorage) {
         $scope.config = {
             address: {
-                web: '',
+                web: 'http://www.example.com/',
                 admin: 'admin'
             },
             https: {
                 front: false,
                 admin: false,
-                text: ''
+                text: 'https://www.example.com/'
             },
             rewrites: {
                 allowed: true
@@ -32,7 +32,6 @@ angular.module('web-configuration', ['ngStorage'])
 
         if ($localStorage.config) {
             $scope.config = $localStorage.config;
-            $scope.config.https.text = '';
         }
 
         $scope.$on('nextState', function () {

From bfa0606e0eae1a6d76e8137c442a6d1273951627 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 4 Dec 2014 14:30:43 -0600
Subject: [PATCH 121/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Fixed issues found by QA.
---
 setup/pub/magento/setup/add-database.js | 6 +++---
 setup/pub/magento/setup/main.js         | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index f9d67c4763414..6477614564964 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -12,9 +12,7 @@ angular.module('add-database', ['ngStorage'])
             useExistingDb: 1,
             useAccess: 1
         };
-
-        $scope.testConn = '';
-
+        $scope.testConn = 'mock';
         var intervalPromise = $interval(function () {
             $http.post('data/database', $scope.db)
                 .success(function (data) {
@@ -47,6 +45,8 @@ angular.module('add-database', ['ngStorage'])
         });
 
         $scope.$on('previousState', function () {
+            $localStorage.db = $scope.db;
+            Storage.db = $scope.db;
             $interval.cancel(intervalPromise);
         });
 
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index 81edfaf611016..fbbf5b0bafa75 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -32,7 +32,10 @@ main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navi
         };
 
         $scope.previousState = function () {
-            $state.go(navigationService.getPreviousState().id);
+            if ($scope.validate()) {
+                $scope.$broadcast('previousState', $state.$current);
+                $state.go(navigationService.getPreviousState().id);
+            }
         };
 
         // Flag indicating the validity of the form

From 39f69b10994366ce104b7289e17ebef004ffe0d4 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 4 Dec 2014 15:51:43 -0600
Subject: [PATCH 122/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Few changes are related to this issue, but maximum of them are for
  reverting changes related to MAGETWO-30290 after rebasing the branch.
---
 .../Setup/view/magento/setup/install.phtml    |  2 +-
 setup/pub/magento/setup/add-database.js       |  4 +---
 setup/pub/magento/setup/app.js                | 11 ----------
 .../pub/magento/setup/create-admin-account.js |  3 +--
 .../pub/magento/setup/customize-your-store.js |  3 +--
 setup/pub/magento/setup/install.js            | 20 ++++++++-----------
 setup/pub/magento/setup/success.js            | 10 +++++-----
 setup/pub/magento/setup/web-configuration.js  |  3 +--
 8 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/install.phtml b/setup/module/Magento/Setup/view/magento/setup/install.phtml
index 86d074641bca7..8ae67953bb76d 100644
--- a/setup/module/Magento/Setup/view/magento/setup/install.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/install.phtml
@@ -21,7 +21,7 @@
 </div>
 
 <div ng-show="isStarted">
-    <div class="progress"><div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{progress}}" aria-valuemin="0" aria-valuemax="100" ng-style="barStyle(progress)">{{progressText}}</div></div>
+    <div class="progress"><div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{progress}}" aria-valuemin="0" aria-valuemax="100" style="width: {{progress}}%; min-width: 5em;">{{progressText}}</div></div>
     <div ng-show="isFailed" class="error-container">
         <span class="glyphicon glyphicon-remove-sign "></span>
         <span>Installation is incomplete. Check the console log for errors before trying again.</span>
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 6477614564964..cef0276073b96 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('add-database', ['ngStorage'])
-    .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', '$timeout', 'Storage', '$interval', function ($scope, $state, $localStorage, $http, $timeout, Storage, $interval) {
+    .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', '$timeout', '$interval', function ($scope, $state, $localStorage, $http, $timeout, $interval) {
         $scope.db = {
             useExistingDb: 1,
             useAccess: 1
@@ -40,13 +40,11 @@ angular.module('add-database', ['ngStorage'])
 
         $scope.$on('nextState', function () {
             $localStorage.db = $scope.db;
-            Storage.db = $scope.db;
             $interval.cancel(intervalPromise);
         });
 
         $scope.$on('previousState', function () {
             $localStorage.db = $scope.db;
-            Storage.db = $scope.db;
             $interval.cancel(intervalPromise);
         });
 
diff --git a/setup/pub/magento/setup/app.js b/setup/pub/magento/setup/app.js
index efb89990288ce..24733b6744f31 100644
--- a/setup/pub/magento/setup/app.js
+++ b/setup/pub/magento/setup/app.js
@@ -22,17 +22,6 @@ var app = angular.module(
         'success'
     ]);
 
-
-app.factory('Storage', function () {
-    return {
-        db: {},
-        admin: {},
-        store: {},
-        config: {},
-        messages: {}
-    };
-});
-
 app.config(function ($stateProvider) {
     app.stateProvider = $stateProvider;
 })
diff --git a/setup/pub/magento/setup/create-admin-account.js b/setup/pub/magento/setup/create-admin-account.js
index 7334c3204dfae..fbbea2f45b8b9 100644
--- a/setup/pub/magento/setup/create-admin-account.js
+++ b/setup/pub/magento/setup/create-admin-account.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('create-admin-account', ['ngStorage'])
-    .controller('createAdminAccountController', ['$scope', '$state', '$localStorage', 'Storage', function ($scope, $state, $localStorage, Storage) {
+    .controller('createAdminAccountController', ['$scope', '$state', '$localStorage', function ($scope, $state, $localStorage) {
         $scope.admin = {
             'passwordStatus': {
                 class: 'none',
@@ -44,7 +44,6 @@ angular.module('create-admin-account', ['ngStorage'])
 
         $scope.$on('nextState', function () {
             $localStorage.admin = $scope.admin;
-            Storage.admin = $scope.admin;
         });
 
         // Listens on form validate event, dispatched by parent controller
diff --git a/setup/pub/magento/setup/customize-your-store.js b/setup/pub/magento/setup/customize-your-store.js
index c73e300f809d1..0ec425f67ac11 100644
--- a/setup/pub/magento/setup/customize-your-store.js
+++ b/setup/pub/magento/setup/customize-your-store.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('customize-your-store', ['ngStorage'])
-    .controller('customizeYourStoreController', ['$scope', '$localStorage', 'Storage', function ($scope, $localStorage, Storage) {
+    .controller('customizeYourStoreController', ['$scope', '$localStorage', function ($scope, $localStorage) {
         $scope.store = {
             timezone: 'America/Los_Angeles',
             currency: 'USD',
@@ -21,6 +21,5 @@ angular.module('customize-your-store', ['ngStorage'])
 
         $scope.$on('nextState', function () {
             $localStorage.store = $scope.store;
-            Storage.store = $scope.store;
         });
     }]);
diff --git a/setup/pub/magento/setup/install.js b/setup/pub/magento/setup/install.js
index 928fbdbcbc6f8..681df03f16149 100644
--- a/setup/pub/magento/setup/install.js
+++ b/setup/pub/magento/setup/install.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('install', ['ngStorage'])
-    .controller('installController', ['$scope', '$sce', '$timeout', '$localStorage', '$rootScope', 'progress', 'Storage', function ($scope, $sce, $timeout, $localStorage, $rootScope, progress, Storage) {
+    .controller('installController', ['$scope', '$sce', '$timeout', '$localStorage', '$rootScope', 'progress', function ($scope, $sce, $timeout, $localStorage, $rootScope, progress) {
         $scope.isStarted = false;
         $scope.isInProgress = false;
         $scope.isConsole = false;
@@ -16,10 +16,6 @@ angular.module('install', ['ngStorage'])
             $scope.isConsole = $scope.isConsole === false;
         };
 
-        $scope.barStyle = function (value) {
-            return { width: value + '%' };
-        };
-
         $scope.checkProgress = function () {
             if ($scope.isInProgress) {
                 $scope.displayProgress();
@@ -47,18 +43,18 @@ angular.module('install', ['ngStorage'])
 
         $scope.start = function () {
             var data = {
-                'db': Storage.db,
-                'admin': Storage.admin,
-                'store': Storage.store,
-                'config': Storage.config
+                'db': $localStorage.db,
+                'admin': $localStorage.admin,
+                'store': $localStorage.store,
+                'config': $localStorage.config
             };
             $scope.isStarted = true;
             $scope.isInProgress = true;
             progress.post(data, function (response) {
                 $scope.isInProgress = false;
                 if (response.success) {
-                    Storage.config.encrypt.key = response.key;
-                    Storage.messages = response.messages;
+                    $localStorage.config.encrypt.key = response.key;
+                    $localStorage.messages = response.messages;
                     $scope.nextState();
                 } else {
                     $scope.displayFailure();
@@ -82,7 +78,7 @@ angular.module('install', ['ngStorage'])
     .service('progress', ['$http', function ($http) {
         return {
             get: function (callback) {
-                $http.post('install/progress').then(callback);
+                $http.get('install/progress').then(callback);
             },
             post: function (data, callback) {
                 $http.post('install/start', data).success(callback);
diff --git a/setup/pub/magento/setup/success.js b/setup/pub/magento/setup/success.js
index a8e153de507f1..0f76134ad7deb 100644
--- a/setup/pub/magento/setup/success.js
+++ b/setup/pub/magento/setup/success.js
@@ -7,9 +7,9 @@
 
 'use strict';
 angular.module('success', ['ngStorage'])
-    .controller('successController', ['$scope', '$localStorage', 'Storage', function ($scope, $localStorage, Storage) {
-        $scope.db     = Storage.db;
-        $scope.admin  = Storage.admin;
-        $scope.config = Storage.config;
-        $scope.messages = Storage.messages;
+    .controller('successController', ['$scope', '$localStorage', function ($scope, $localStorage) {
+        $scope.db     = $localStorage.db;
+        $scope.admin  = $localStorage.admin;
+        $scope.config = $localStorage.config;
+        $scope.messages = $localStorage.messages;
     }]);
\ No newline at end of file
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index 46e932588b924..9227e453276e0 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('web-configuration', ['ngStorage'])
-    .controller('webConfigurationController', ['$scope', '$state', '$localStorage', 'Storage', function ($scope, $state, $localStorage, Storage) {
+    .controller('webConfigurationController', ['$scope', '$state', '$localStorage', function ($scope, $state, $localStorage) {
         $scope.config = {
             address: {
                 web: 'http://www.example.com/',
@@ -36,7 +36,6 @@ angular.module('web-configuration', ['ngStorage'])
 
         $scope.$on('nextState', function () {
             $localStorage.config = $scope.config;
-            Storage.config = $scope.config;
         });
 
         $scope.updateOnExpand = function(obj) {

From 6e1bd1a7d85e73053e6c439ae89207d898d719af Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 4 Dec 2014 17:12:48 -0600
Subject: [PATCH 123/474] MAGETWO-30859: No input validation for HTTPS
 configuration data during installation

- Populating https from http.
---
 .../Magento/Setup/view/magento/setup/web-configuration.phtml | 1 +
 setup/pub/magento/setup/web-configuration.js                 | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 3d02677ca1f51..b1c46c011fa9e 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -35,6 +35,7 @@ $hints = [
         <label class="col-md-3 control-label">Your Store Address&nbsp;<span class="required">*</span></label>
         <div class="col-md-4">
             <input ng-blur="addSlash()"
+                   ng-change="populateHttps()"
                    type="url"
                    name="web"
                    ng-model="config.address.web"
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index 9227e453276e0..3d9310ec1a5e8 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -70,6 +70,11 @@ angular.module('web-configuration', ['ngStorage'])
             }
         };
 
+        $scope.populateHttps = function() {
+            $scope.config.https.text = $scope.config.address.web.replace('http', 'https');
+        };
+
+
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();

From 964a11405203df1c2c160fdb9a06e6ab44aaefbd Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 4 Dec 2014 18:18:02 -0600
Subject: [PATCH 124/474] MAGETWO-30290: Progress bar and log do not work
 properly in IE

- Fixed the bug according to the description.
---
 .../module/Magento/Setup/view/magento/setup/install.phtml | 2 +-
 .../Setup/view/magento/setup/web-configuration.phtml      | 8 ++++----
 setup/pub/magento/setup/install.js                        | 6 +++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/install.phtml b/setup/module/Magento/Setup/view/magento/setup/install.phtml
index 8ae67953bb76d..86d074641bca7 100644
--- a/setup/module/Magento/Setup/view/magento/setup/install.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/install.phtml
@@ -21,7 +21,7 @@
 </div>
 
 <div ng-show="isStarted">
-    <div class="progress"><div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{progress}}" aria-valuemin="0" aria-valuemax="100" style="width: {{progress}}%; min-width: 5em;">{{progressText}}</div></div>
+    <div class="progress"><div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{progress}}" aria-valuemin="0" aria-valuemax="100" ng-style="barStyle(progress)">{{progressText}}</div></div>
     <div ng-show="isFailed" class="error-container">
         <span class="glyphicon glyphicon-remove-sign "></span>
         <span>Installation is incomplete. Check the console log for errors before trying again.</span>
diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 267114255e9d6..b19a87b9c5976 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -21,8 +21,8 @@ $hints = [
 ?>
 
 <div class="step-controls">
-    <a href="#" class="btn btn-primary" ng-click="previousState()">Previous</a>
-    <a href="#" class="btn btn-primary" ng-click="nextState()">Next</a>
+    <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
+    <a href="" class="btn btn-primary" ng-click="nextState()">Next</a>
 </div>
 
 <div class="page-header">
@@ -141,6 +141,6 @@ $hints = [
 </form>
 
 <div class="step-controls">
-    <a href="#" class="btn btn-primary" ng-click="previousState()">Previous</a>
-    <a href="#" class="btn btn-primary" ng-click="nextState()">Next</a>
+    <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
+    <a href="" class="btn btn-primary" ng-click="nextState()">Next</a>
 </div>
diff --git a/setup/pub/magento/setup/install.js b/setup/pub/magento/setup/install.js
index 66111d0f69162..f4d0805ddfeea 100644
--- a/setup/pub/magento/setup/install.js
+++ b/setup/pub/magento/setup/install.js
@@ -16,6 +16,10 @@ angular.module('install', ['ngStorage'])
             $scope.isConsole = $scope.isConsole === false;
         };
 
+        $scope.barStyle = function (value) {
+            return { width: value + '%' };
+        };
+
         $scope.checkProgress = function () {
             if ($scope.isInProgress) {
                 $scope.displayProgress();
@@ -78,7 +82,7 @@ angular.module('install', ['ngStorage'])
     .service('progress', ['$http', function ($http) {
         return {
             get: function (callback) {
-                $http.get('index.php/install/progress').then(callback);
+                $http.post('index.php/install/progress').then(callback);
             },
             post: function (data, callback) {
                 $http.post('index.php/install/start', data).success(callback);

From f0dc5bc1365c9398adda2b760aa7fdc6b743aef3 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Thu, 4 Dec 2014 18:32:12 -0600
Subject: [PATCH 125/474] MAGETWO-29035: Installation fails if cli php is
 different than apache configured

- fixed code style
- added verbosity for cache.php tool
- made setEnable() return changed types instead of enabled only
---
 .../Magento/Test/Integrity/ComposerTest.php   |  3 +-
 .../Framework/App/Cache/ManagerAppTest.php    | 61 +++++++++++++++++--
 .../Framework/App/Cache/ManagerTest.php       |  4 +-
 .../Magento/Framework/App/Cache/Manager.php   | 10 ++-
 .../Framework/App/Cache/ManagerApp.php        | 42 +++++++++----
 .../Framework/App/Console/Response.php        |  9 +++
 setup/module/Magento/Setup/src/Exception.php  |  4 +-
 .../Magento/Setup/src/Model/Installer.php     | 18 ++----
 8 files changed, 107 insertions(+), 44 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index d787c27ce6484..c9f8e19980755 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -303,14 +303,13 @@ private function assertVersionInSync($name, $version)
      * Make sure requirements of components are reflected in root composer.json
      *
      * @param \StdClass $json
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     private function assertRequireInSync(\StdClass $json)
     {
         $name = $json->name;
         if (isset($json->require)) {
             $errors = [];
-            foreach ($json->require as $depName => $depVersion) {
+            foreach (array_keys($json->require) as $depName) {
                 if ($depName == 'magento/magento-composer-installer') {
                     // Magento Composer Installer is not needed for already existing components
                     continue;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php
index a35324186d7d2..cb88812e22170 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerAppTest.php
@@ -37,7 +37,7 @@ public function testLaunchStatus()
         $this->response->expects($this->once())
             ->method('setBody')
             ->with(
-                $this->matches("%aCurrent status:%afoo => enabled%abar => enabled%abaz => disabled%a")
+                $this->matches("Current status:%afoo: 1%abar: 1%abaz: 0")
             );
 
         $model = new ManagerApp($this->cacheManager, $this->response, []);
@@ -57,6 +57,33 @@ public function testLaunchEnable()
         $this->cacheManager->expects($this->once())
             ->method('clean')
             ->with(['baz']);
+        $this->response->expects($this->once())
+            ->method('setBody')
+            ->with(
+                $this->matches("Changed cache status:%abaz: 0 -> 1%aCleaned cache types: baz%a")
+            );
+
+        $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
+        $model->launch();
+    }
+
+    public function testLaunchDisable()
+    {
+        $requestArgs = [
+            ManagerApp::KEY_SET => false,
+            ManagerApp::KEY_TYPES => 'foo,,bar, baz,',
+        ];
+        $this->cacheManager->expects($this->once())
+            ->method('setEnabled')
+            ->with(['foo', 'bar', 'baz'], false)
+            ->will($this->returnValue(['baz']));
+        $this->cacheManager->expects($this->never())
+            ->method('clean');
+        $this->response->expects($this->once())
+            ->method('setBody')
+            ->with(
+                $this->matches("Changed cache status:%abaz: 1 -> 0%a%a")
+            );
 
         $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
         $model->launch();
@@ -75,6 +102,11 @@ public function testLaunchFlush()
             ->with(['foo', 'bar']);
         $this->cacheManager->expects($this->never())
             ->method('clean');
+        $this->response->expects($this->once())
+            ->method('setBody')
+            ->with(
+                $this->matches("Flushed cache types: foo, bar%a")
+            );
 
         $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
         $model->launch();
@@ -93,6 +125,11 @@ public function testLaunchClean()
         $this->cacheManager->expects($this->once())
             ->method('clean')
             ->with(['foo', 'bar']);
+        $this->response->expects($this->once())
+            ->method('setBody')
+            ->with(
+                $this->matches("Cleaned cache types: foo, bar%a")
+            );
 
         $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
         $model->launch();
@@ -107,12 +144,18 @@ public function testLaunchSetAndClean()
         ];
         $this->cacheManager->expects($this->once())
             ->method('setEnabled')
-            ->with(['foo', 'bar'], true);
+            ->with(['foo', 'bar'], true)
+            ->will($this->returnValue(['foo']));
         $this->cacheManager->expects($this->never())
             ->method('flush');
         $this->cacheManager->expects($this->once())
             ->method('clean')
             ->with(['foo', 'bar']);
+        $this->response->expects($this->once())
+            ->method('setBody')
+            ->with(
+                $this->matches("Changed cache status:%afoo: 0 -> 1%aCleaned cache types: foo, bar%a")
+            );
 
         $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
         $model->launch();
@@ -124,16 +167,22 @@ public function testLaunchAll()
             ManagerApp::KEY_SET => true,
             ManagerApp::KEY_FLUSH => true,
             ManagerApp::KEY_CLEAN => true,
-            ManagerApp::KEY_TYPES => 'foo,bar',
+            ManagerApp::KEY_TYPES => 'foo,baz',
         ];
         $this->cacheManager->expects($this->once())
             ->method('setEnabled')
-            ->with(['foo', 'bar'], true);
+            ->with(['foo', 'baz'], true)
+            ->will($this->returnValue(['baz']));
         $this->cacheManager->expects($this->once())
             ->method('flush')
-            ->with(['foo', 'bar']);
+            ->with(['foo', 'baz']);
         $this->cacheManager->expects($this->never())
             ->method('clean');
+        $this->response->expects($this->once())
+            ->method('setBody')
+            ->with(
+                $this->matches("Changed cache status:%abaz: 0 -> 1%aFlushed cache types: foo, baz%a")
+            );
 
         $model = new ManagerApp($this->cacheManager, $this->response, $requestArgs);
         $model->launch();
@@ -141,7 +190,7 @@ public function testLaunchAll()
 
     /**
      * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Following requested cache types are not supported: 'unsupported', 'wrong'
+     * @expectedExceptionMessage The following requested cache types are not supported: 'unsupported', 'wrong'
      */
     public function testLaunchWithUnsupportedCacheTypes()
     {
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php
index 78661a2a3d59a..b67a4905cf10a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php
@@ -69,7 +69,7 @@ public function testSetEnabledTrueAll()
             ->method('setEnabled')
             ->will($this->returnValueMap([['bar', true], ['baz', true]]));
         $this->cacheState->expects($this->once())->method('persist');
-        $this->model->setEnabled($caches, true);
+        $this->assertEquals(['bar', 'baz'], $this->model->setEnabled($caches, true));
     }
 
     /**
@@ -89,7 +89,7 @@ public function testSetEnabledFalseAll()
         $this->cacheState->expects($this->once())->method('setEnabled')->with('foo', false);
         $this->cacheState->expects($this->once())->method('persist');
         $this->frontendPool->expects($this->never())->method('get');
-        $this->model->setEnabled($caches, false);
+        $this->assertEquals(['foo'], $this->model->setEnabled($caches, false));
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Cache/Manager.php b/lib/internal/Magento/Framework/App/Cache/Manager.php
index ad855f2828254..c3c84a02f5e40 100644
--- a/lib/internal/Magento/Framework/App/Cache/Manager.php
+++ b/lib/internal/Magento/Framework/App/Cache/Manager.php
@@ -58,11 +58,11 @@ public function __construct(
      *
      * @param string[] $types
      * @param bool $isEnabled
-     * @return array
+     * @return array List of types with changed status
      */
     public function setEnabled(array $types, $isEnabled)
     {
-        $enabledTypes = [];
+        $changedStatusTypes = [];
         $isUpdated = false;
         foreach ($types as $type) {
             if ($this->cacheState->isEnabled($type) === $isEnabled) { // no need to poke it, if is not going to change
@@ -70,14 +70,12 @@ public function setEnabled(array $types, $isEnabled)
             }
             $this->cacheState->setEnabled($type, $isEnabled);
             $isUpdated = true;
-            if ($isEnabled) {
-                $enabledTypes[] = $type;
-            }
+            $changedStatusTypes[] = $type;
         }
         if ($isUpdated) {
             $this->cacheState->persist();
         }
-        return $enabledTypes;
+        return $changedStatusTypes;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Cache/ManagerApp.php b/lib/internal/Magento/Framework/App/Cache/ManagerApp.php
index 9d79b28a3b1f2..a5e182e094ab6 100644
--- a/lib/internal/Magento/Framework/App/Cache/ManagerApp.php
+++ b/lib/internal/Magento/Framework/App/Cache/ManagerApp.php
@@ -39,7 +39,10 @@ class ManagerApp implements AppInterface
      * @var array
      */
     private $requestArgs;
+
     /**
+     * Cache manager
+     *
      * @var Manager
      */
     private $cacheManager;
@@ -67,28 +70,40 @@ public function __construct(
      */
     public function launch()
     {
+        $output = [];
         $types = $this->getRequestedTypes();
 
         $enabledTypes = [];
         if (isset($this->requestArgs[self::KEY_SET])) {
             $isEnabled = (bool)(int)$this->requestArgs[self::KEY_SET];
-            $enabledTypes = $this->cacheManager->setEnabled($types, $isEnabled);
+            $changedTypes = $this->cacheManager->setEnabled($types, $isEnabled);
+            if ($isEnabled) {
+                $enabledTypes = $changedTypes;
+            }
+            if ($changedTypes) {
+                $output[] = 'Changed cache status:';
+                foreach ($changedTypes as $type) {
+                    $output[] = sprintf('%30s: %d -> %d', $type, !$isEnabled, $isEnabled);
+                }
+            } else {
+                $output[] = 'There is nothing to change in cache status';
+            }
         }
         if (isset($this->requestArgs[self::KEY_FLUSH])) {
             $this->cacheManager->flush($types);
-        } else {
-            // If flush is requested, both enabled and requested cache types have already been cleaned by flush
-            if (isset($this->requestArgs[self::KEY_CLEAN])) {
-                $this->cacheManager->clean($types);
-            } elseif (!empty($enabledTypes)) {
-                $this->cacheManager->clean($enabledTypes);
-            }
+            $output[] = 'Flushed cache types: ' . join(', ', $types);
+        } elseif (isset($this->requestArgs[self::KEY_CLEAN])) {
+            $this->cacheManager->clean($types);
+            $output[] = 'Cleaned cache types: ' . join(', ', $types);
+        } elseif (!empty($enabledTypes)) {
+            $this->cacheManager->clean($enabledTypes);
+            $output[] = 'Cleaned cache types: ' . join(', ', $enabledTypes);
         }
-        $output = "\nCurrent status:\n";
+        $output[] = 'Current status:';
         foreach ($this->cacheManager->getStatus() as $cache => $status) {
-            $output .= "$cache => " . ($status ? 'enabled' : 'disabled') . "\n";
+            $output[] = sprintf('%30s: %d', $cache, $status);
         }
-        $this->response->setBody($output);
+        $this->response->setBody(join("\n", $output));
         return $this->response;
     }
 
@@ -96,6 +111,7 @@ public function launch()
      * Maps requested type from request into the current registry of types
      *
      * @return string[]
+     * @throws \InvalidArgumentException
      */
     private function getRequestedTypes()
     {
@@ -111,8 +127,8 @@ private function getRequestedTypes()
             $unsupportedTypes = array_diff($requestedTypes, $availableTypes);
             if ($unsupportedTypes) {
                 throw new \InvalidArgumentException(
-                    "Following requested cache types are not supported: '" . join("', '", $unsupportedTypes) . "'.\n"
-                    . "Supported types: " . join(", ", $availableTypes) . ""
+                    "The following requested cache types are not supported: '" . join("', '", $unsupportedTypes)
+                    . "'.\nSupported types: " . join(", ", $availableTypes) . ""
                 );
             }
             return array_values(array_intersect($availableTypes, $requestedTypes));
diff --git a/lib/internal/Magento/Framework/App/Console/Response.php b/lib/internal/Magento/Framework/App/Console/Response.php
index 1d2f31e9ba09e..69bb5590def7d 100644
--- a/lib/internal/Magento/Framework/App/Console/Response.php
+++ b/lib/internal/Magento/Framework/App/Console/Response.php
@@ -24,6 +24,8 @@ class Response implements \Magento\Framework\App\ResponseInterface
     protected $code = 0;
 
     /**
+     * Text to output on send response
+     *
      * @var string
      */
     private $body;
@@ -37,6 +39,7 @@ class Response implements \Magento\Framework\App\ResponseInterface
 
     /**
      * Send response to client
+     *
      * @return int
      */
     public function sendResponse()
@@ -51,6 +54,8 @@ public function sendResponse()
     }
 
     /**
+     * Get body
+     *
      * @return string
      */
     public function getBody()
@@ -59,6 +64,8 @@ public function getBody()
     }
 
     /**
+     * Set body
+     *
      * @param string $body
      * @return void
      */
@@ -68,6 +75,8 @@ public function setBody($body)
     }
 
     /**
+     * Set exit code
+     *
      * @param int $code
      * @return void
      */
diff --git a/setup/module/Magento/Setup/src/Exception.php b/setup/module/Magento/Setup/src/Exception.php
index 16d19ffd91cce..c06028781f261 100644
--- a/setup/module/Magento/Setup/src/Exception.php
+++ b/setup/module/Magento/Setup/src/Exception.php
@@ -8,6 +8,6 @@
 
 namespace Magento\Setup;
 
-class Exception extends \Exception {
-
+class Exception extends \Exception
+{
 }
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 5490f1cd50a61..370ad86156224 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -134,13 +134,6 @@ class Installer
      */
     private $connectionFactory;
 
-    /**
-     * Shell executor
-     *
-     * @var Shell
-     */
-    private $shell;
-
     /**
      * Shell command renderer
      *
@@ -181,7 +174,7 @@ class Installer
      *
      * @var string
      */
-    private $execParams;
+    private $initParams;
 
     /**
      * @var \Magento\Framework\ObjectManagerInterface
@@ -238,10 +231,9 @@ public function __construct(
         $this->random = $random;
         $this->connectionFactory = $connectionFactory;
         $this->shellRenderer = new CommandRenderer;
-        $this->shell = new Shell($this->shellRenderer);
         $this->maintenanceMode = $maintenanceMode;
         $this->filesystem = $filesystem;
-        $this->execParams = $serviceManager->get(InitParamListener::BOOTSTRAP_PARAM);
+        $this->initParams = $serviceManager->get(InitParamListener::BOOTSTRAP_PARAM);
         $this->installInfo[self::INFO_MESSAGE] = array();
         $this->deploymentConfig = $deploymentConfig;
     }
@@ -263,7 +255,7 @@ public function install($request)
         }
         $script[] = ['Installing database schema:', 'installSchema', []];
         $script[] = ['Installing user configuration...', 'installUserConfig', [$request]];
-        $script[] = ['Installing data fixtures:', 'installDataFixtures', []];
+        $script[] = ['Installing data fixtures...', 'installDataFixtures', []];
         if (!empty($request[self::SALES_ORDER_INCREMENT_PREFIX])) {
             $script[] = [
                 'Creating sales order increment prefix...',
@@ -798,8 +790,8 @@ private function getObjectManager()
     {
         if (null === $this->objectManager) {
             $this->assertDeploymentConfigExists();
-            $factory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $this->execParams);
-            $this->objectManager = $factory->create($this->execParams);
+            $factory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $this->initParams);
+            $this->objectManager = $factory->create($this->initParams);
         }
         return $this->objectManager;
     }

From 67a21771ef36c93648792401df1663becb33481e Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Thu, 4 Dec 2014 18:49:22 -0600
Subject: [PATCH 126/474] MAGETWO-29035: Installation fails if cli php is
 different than apache configured

- fixed description
---
 setup/module/Magento/Setup/src/Model/PhpExtensions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/PhpExtensions.php b/setup/module/Magento/Setup/src/Model/PhpExtensions.php
index 8ef424fccc60f..94b6530656a23 100644
--- a/setup/module/Magento/Setup/src/Model/PhpExtensions.php
+++ b/setup/module/Magento/Setup/src/Model/PhpExtensions.php
@@ -44,7 +44,7 @@ public function __construct(
     /**
      * Retrieve list of required extensions
      *
-     * Collect required extensions from Magento modules composer.json files
+     * Collect required extensions from composer.lock file
      *
      * @return array
      */

From a23802316d60635289878975412a6078e6a52d0f Mon Sep 17 00:00:00 2001
From: Oleksii Kolesnyk <okolesnyk@ebay.com>
Date: Fri, 5 Dec 2014 12:14:06 +0200
Subject: [PATCH 127/474] MTA-773: Stabilize Catalog module. Products

- fix category selection
---
 .../Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
index 882bb392dcbc8..97372ac460d93 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
@@ -46,6 +46,7 @@ class CategoryIds extends MultisuggestElement
      */
     public function setValue($values)
     {
+        $this->find($this->top, Locator::SELECTOR_XPATH)->click();
         $this->waitInitElement();
         parent::setValue($values);
     }

From 9a8a903138fd04a33aaf6776c1b1206a392a055d Mon Sep 17 00:00:00 2001
From: Oleksii Kolesnyk <okolesnyk@ebay.com>
Date: Fri, 5 Dec 2014 13:28:06 +0200
Subject: [PATCH 128/474] MTA-773: Stabilize Catalog module. Products

- CR changes
---
 .../Edit/Tab/ProductDetails/CategoryIds.php    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
index 97372ac460d93..0860d30c35d18 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Tab/ProductDetails/CategoryIds.php
@@ -12,20 +12,26 @@
 use Mtf\Client\Element\Locator;
 
 /**
- * Class CategoryIds
- * Typified element class for category element
+ * Typified element class for category element.
  */
 class CategoryIds extends MultisuggestElement
 {
     /**
-     * Selector suggest input
+     * Selector suggest input.
      *
      * @var string
      */
     protected $suggest = '#category_ids-suggest';
 
     /**
-     * Selector item of search result
+     * Selector for suggest element.
+     *
+     * @var string
+     */
+    protected $suggestElement = '.mage-suggest.category-select';
+
+    /**
+     * Selector item of search result.
      *
      * @var string
      */
@@ -39,7 +45,7 @@ class CategoryIds extends MultisuggestElement
     protected $top = './ancestor::body//*[@class="page-main-actions"]';
 
     /**
-     * Set value
+     * Set value.
      *
      * @param array|string $values
      * @return void
@@ -60,7 +66,7 @@ public function setValue($values)
     protected function waitInitElement()
     {
         $browser = clone $this;
-        $selector = '.mage-suggest.category-select';
+        $selector = $this->suggestElement;
 
         $browser->waitUntil(
             function () use ($browser, $selector) {

From 3e39bf653aabe7887fd7e137f6ad2392e18c098d Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@ebay.com>
Date: Fri, 5 Dec 2014 14:44:36 +0200
Subject: [PATCH 129/474] MAGETWO-24703: Backend UI issues: improvements

---
 .../Backend/Block/System/Store/Delete.php     |  4 +-
 .../view/adminhtml/web/product/product.css    |  6 ++-
 .../sales/order/create/sidebar/items.phtml    |  2 +-
 .../Magento/Ogone/etc/adminhtml/system.xml    |  8 ++--
 .../system/config/payflowlink/advanced.phtml  |  8 ++--
 .../Paypal/view/adminhtml/web/styles.css      | 14 +++---
 .../Review/Block/Adminhtml/Add/Form.php       |  1 -
 .../Block/Adminhtml/Rating/Edit/Tab/Form.php  | 21 +++------
 .../adminhtml/templates/rating/form.phtml     | 17 +++++++
 .../Adminhtml/Cms/Page/Version/Edit/Form.php  |  2 +-
 .../templates/page/revision/info.phtml        | 47 ++++++++++---------
 .../templates/page/version/form.phtml         | 15 +++---
 .../Magento_Theme/web/css/source/module.less  |  9 ++--
 .../web/css/source/module.less                | 15 ++++++
 .../Magento/backend/web/css/admin.less        | 11 +++--
 .../Magento/backend/web/css/pages.less        |  7 +++
 .../backend/web/less/styles/debug.less        | 27 +++++++++--
 .../backend/web/less/styles/pages.less        |  3 --
 18 files changed, 139 insertions(+), 78 deletions(-)
 create mode 100644 app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
 create mode 100644 app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/module.less

diff --git a/app/code/Magento/Backend/Block/System/Store/Delete.php b/app/code/Magento/Backend/Block/System/Store/Delete.php
index ab97bab7424b3..5c3e9f549d0ca 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete.php
@@ -31,7 +31,7 @@ protected function _construct()
         $this->buttonList->remove('save');
         $this->buttonList->remove('reset');
 
-        $this->buttonList->update('delete', 'region', 'footer');
+        $this->buttonList->update('delete', 'region', 'toolbar');
         $this->buttonList->update('delete', 'onclick', null);
         $this->buttonList->update(
             'delete',
@@ -44,7 +44,7 @@ protected function _construct()
             array('label' => __('Cancel'), 'onclick' => 'setLocation(\'' . $this->getBackUrl() . '\')'),
             2,
             100,
-            'footer'
+            'toolbar'
         );
     }
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css
index cc038854336e3..db2bff1e161f7 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/product/product.css
+++ b/app/code/Magento/Catalog/view/adminhtml/web/product/product.css
@@ -52,7 +52,7 @@
 .product-actions .switcher {
     display: inline-block;
     vertical-align: top;
-    margin: 6px 0 6px 6px;
+    margin: 3px 0 6px 6px;
 }
 
 /* Image Management */
@@ -211,6 +211,10 @@
     content: '';
 }
 
+.gallery .image .action-make-base {
+    width: 70%;
+}
+
 .gallery .image .action-delete {
     top: 5px;
     right: 5px;
diff --git a/app/code/Magento/MultipleWishlist/view/adminhtml/templates/sales/order/create/sidebar/items.phtml b/app/code/Magento/MultipleWishlist/view/adminhtml/templates/sales/order/create/sidebar/items.phtml
index 14a6224cf5d12..143220cfc9ca5 100644
--- a/app/code/Magento/MultipleWishlist/view/adminhtml/templates/sales/order/create/sidebar/items.phtml
+++ b/app/code/Magento/MultipleWishlist/view/adminhtml/templates/sales/order/create/sidebar/items.phtml
@@ -81,7 +81,7 @@
                 <?php endforeach; ?>
             </table>
             <?php else: ?>
-                <?php echo __('No items') ?>
+                <span class="no-items"><?php echo __('No items') ?></span>
             <?php endif ?>
         </div>
         <?php if ($this->getItemCount() && $this->canRemoveItems()): ?>
diff --git a/app/code/Magento/Ogone/etc/adminhtml/system.xml b/app/code/Magento/Ogone/etc/adminhtml/system.xml
index ef1faad5c771a..ee4105ccfb426 100644
--- a/app/code/Magento/Ogone/etc/adminhtml/system.xml
+++ b/app/code/Magento/Ogone/etc/adminhtml/system.xml
@@ -16,10 +16,10 @@
                     <![CDATA[<br />
                     <div class="custom-options">
                     <div class="box">
-                    <p class="grand-total"><br /><b>Signing up with Ogone</b></p>
-                    <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
-                    <p>post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
-                    <p>offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
+                        <p class="grand-total"><br /><b>Signing up with Ogone</b></p>
+                        <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
+                        <p>Post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
+                        <p>Offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
                     </div>
                     </div>
                     ]]>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml
index b244b8a01bbb2..b9eeafb1c9143 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml
@@ -11,9 +11,11 @@
  */
 ?>
 <div class="payflow-settings-notice">
-    <strong class="important-label"><?php echo __('Important: ') ?></strong>
-    <?php echo __('To use PayPal Payments Advanced, you must configure  your PayPal Payments Advanced account on the PayPal website.'); ?>
-    <?php echo __('Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below') ?>
+    <p>
+        <strong class="important-label"><?php echo __('Important: ') ?></strong>
+        <?php echo __('To use PayPal Payments Advanced, you must configure  your PayPal Payments Advanced account on the PayPal website.'); ?>
+        <?php echo __('Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below') ?>
+    </p>
     <ul class="options-list">
         <li><strong>AVS:</strong> No</li>
         <li><strong>CSC:</strong> No</li>
diff --git a/app/code/Magento/Paypal/view/adminhtml/web/styles.css b/app/code/Magento/Paypal/view/adminhtml/web/styles.css
index 3220ad49f9cce..3514fedcbecf8 100644
--- a/app/code/Magento/Paypal/view/adminhtml/web/styles.css
+++ b/app/code/Magento/Paypal/view/adminhtml/web/styles.css
@@ -8,11 +8,11 @@
 .pp-general-uk > .entry-edit-head > .config-heading .heading strong,
 .pp-method-payflow > .entry-edit-head > .config-heading .heading strong,
 .pp-method-express > .entry-edit-head > .config-heading .heading strong,
-.pp-method-general > .entry-edit-head > .config-heading .heading strong { padding-left:90px; background:url(images/paypal-logo.png) no-repeat 0 0px; line-height: 23px; }
-.pp-method-general > .entry-edit-head > .config-heading:before { content:url(images/pp-allinone.png); float:right; }
-.pp-method-express > .entry-edit-head > .config-heading:before { content:url(images/pp-alt.png); float:right; }
-.pp-method-payflow > .entry-edit-head > .config-heading:before { content:url(images/pp-gateways.png); float:right; }
-.pp-general-uk > .entry-edit-head > .config-heading:before { content:url(images/pp-uk.png); float:right; }
-.payflow-settings-notice {padding-bottom: 1em;max-width: 660px;}
-.payflow-settings-notice .important-label {color:red;}
+.pp-method-general > .entry-edit-head > .config-heading .heading strong { padding-left:90px;background:url(images/paypal-logo.png) no-repeat 0 0;line-height: 23px;}
+.pp-method-general > .entry-edit-head > .config-heading:before { content:url(images/pp-allinone.png);float:right;}
+.pp-method-express > .entry-edit-head > .config-heading:before { content:url(images/pp-alt.png);float:right;}
+.pp-method-payflow > .entry-edit-head > .config-heading:before { content:url(images/pp-gateways.png);float:right;}
+.pp-general-uk > .entry-edit-head > .config-heading:before { content:url(images/pp-uk.png);float:right;}
+.payflow-settings-notice { border:1px solid #d1d0ce;padding:0 10px;margin: 0;}
+.payflow-settings-notice .important-label {color:#f00;}
 .payflow-settings-notice ul.options-list {list-style:disc;padding:0 2em;}
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
index 392cfd823413e..cf0027f5da568 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add/Form.php
@@ -137,7 +137,6 @@ protected function _prepareForm()
                 'name' => 'detail',
                 'title' => __('Review'),
                 'label' => __('Review'),
-                'style' => 'height: 600px;',
                 'required' => true
             )
         );
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
index d910a66514466..64c7d7d9ffff2 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
@@ -16,6 +16,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      */
     protected $_systemStore;
 
+    /**
+     * @var string
+     */
+    protected $_template = 'rating/form.phtml';
+
     /**
      * Session
      *
@@ -185,20 +190,6 @@ protected function _setRatingCodes($ratingCodes)
      */
     protected function _toHtml()
     {
-        return $this->_getWarningHtml() . parent::_toHtml();
-    }
-
-    /**
-     * @return string
-     */
-    protected function _getWarningHtml()
-    {
-        return '
-    <div class="message info">
-        <div>' .
-        __(
-            'Please specify a rating title for a store, or we\'ll just use the default value.'
-        ) . '</div>
-    </div>';
+        return parent::_toHtml();
     }
 }
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
new file mode 100644
index 0000000000000..044c507f83330
--- /dev/null
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
@@ -0,0 +1,17 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+/**
+ * @var $this \Magento\Review\Block\Adminhtml\Rating\Edit\Tab\Form
+ */
+?>
+
+<div class="message info">
+    <div><?php echo __('Please specify a rating title for a store, or we\'ll just use the default value.'); ?></div>
+</div>
+
+<?php echo $this->getFormHtml() ?>
diff --git a/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Page/Version/Edit/Form.php b/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Page/Version/Edit/Form.php
index 5e45428debd81..8d7f8bcee39e1 100644
--- a/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Page/Version/Edit/Form.php
+++ b/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Page/Version/Edit/Form.php
@@ -78,7 +78,7 @@ protected function _prepareForm()
 
         $fieldset = $form->addFieldset(
             'version_fieldset',
-            array('legend' => __('Version Information'), 'class' => 'fieldset-wide')
+            array('legend' => __('Version Information'))
         );
 
         $fieldset->addField('version_id', 'hidden', array('name' => 'version_id'));
diff --git a/app/code/Magento/VersionsCms/view/adminhtml/templates/page/revision/info.phtml b/app/code/Magento/VersionsCms/view/adminhtml/templates/page/revision/info.phtml
index af7089c592b04..9f11ef3ceef4b 100644
--- a/app/code/Magento/VersionsCms/view/adminhtml/templates/page/revision/info.phtml
+++ b/app/code/Magento/VersionsCms/view/adminhtml/templates/page/revision/info.phtml
@@ -13,28 +13,29 @@
  */
 ?>
 <div class="cms-revision-info">
-    <table cellspacing="0">
-        <col width="1" />
-        <col />
-        <tr>
-            <?php if ($this->getRevisionNumber()): ?>
-                <th><span class="nobr"><?php echo __('Revision #') ?></span></th>
-                <td><?php echo $this->getRevisionNumber() ?></td>
+    <div class="fieldset-wrapper">
+        <?php if ($this->getRevisionNumber()): ?>
+        <div class="fieldset-wrapper-title">
+            <span class="title">
+                <?php echo __('Revision #') ?> <?php echo $this->getRevisionNumber() ?>
             <?php else: ?>
-                <th colspan="2"><span class="nobr"><?php echo __('New Revision') ?></span></th>
-            <?php endif; ?>
-        </tr>
-        <tr>
-            <th><span class="nobr"><?php echo __('Author:') ?></span></th>
-            <td><?php echo $this->getAuthor() ?></td>
-        </tr>
-        <tr>
-            <th><span class="nobr"><?php echo __('Created:') ?></span></th>
-            <td><?php echo $this->getCreatedAt() ?></td>
-        </tr>
-        <tr>
-            <th><span class="nobr"><?php echo __('Version:') ?></span></th>
-            <td><?php echo $this->escapeHtml($this->getVersionLabel()) ?></td>
-        </tr>
-    </table>
+                <?php echo __('New Revision') ?>
+            </span>
+        </div>
+        <?php endif; ?>
+        <table class="data-table">
+            <tr>
+                <th><?php echo __('Author:') ?></th>
+                <td><?php echo $this->getAuthor() ?></td>
+            </tr>
+            <tr>
+                <th><?php echo __('Created:') ?></th>
+                <td><?php echo $this->getCreatedAt() ?></td>
+            </tr>
+            <tr>
+                <th><?php echo __('Version:') ?></th>
+                <td><?php echo $this->escapeHtml($this->getVersionLabel()) ?></td>
+            </tr>
+        </table>
+    </div>
 </div>
diff --git a/app/code/Magento/VersionsCms/view/adminhtml/templates/page/version/form.phtml b/app/code/Magento/VersionsCms/view/adminhtml/templates/page/version/form.phtml
index aeb0738f37b9a..5de32a424a465 100644
--- a/app/code/Magento/VersionsCms/view/adminhtml/templates/page/version/form.phtml
+++ b/app/code/Magento/VersionsCms/view/adminhtml/templates/page/version/form.phtml
@@ -11,14 +11,15 @@
 /* @var $this \Magento\Cms\Block\Adminhtml\Page\Edit\Form */
 ?>
 
-<div class="entry-edit">
+<div class="form-inline">
     <?php echo $this->getFormHtml() ?>
 </div>
-<div class="entry-edit">
-    <div class="entry-edit-head">
-        <h4 class="icon-head head-edit-form fieldset-legend"><?php echo __('Version Revisions') ?></h4>
-    </div>
-    <div id="version_fieldset" class="fieldset fieldset-wide">
-        <?php echo $this->getParentBlock()->getChildHtml('cms_page_version_edit_revisions_grid') ?>
+
+<div id="version_fieldset" class="fieldset-wrapper version-fieldset">
+    <div class="fieldset-wrapper-title">
+        <span class="title">
+            <?php echo __('Version Revisions') ?>
+        </span>
     </div>
+    <?php echo $this->getParentBlock()->getChildHtml('cms_page_version_edit_revisions_grid') ?>
 </div>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
index 2383cd55cd3e1..6de65ac9d034c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
@@ -303,6 +303,7 @@ body {
             .button-reset();
             color: @color-link;
             line-height: normal;
+            margin-top: 2px;
             vertical-align: middle;
         }
         ul.dropdown-menu {
@@ -485,25 +486,25 @@ button {
 }
 
 .footer-legal {
-    float:right;
+    float: right;
     width: 550px;
     .link-report,
     .magento-version,
     .copyright {
-        font-size:13px;
+        font-size: 13px;
     }
     &:before {
         content:"";
         display: inline-block;
         vertical-align: middle;
-        position:absolute;
+        position: absolute;
         z-index: 1;
         margin-top: 2px;
         margin-left: -35px;
         width: 30px;
         height: 35px;
         background-size: 109px 70px;
-        background: url("@{baseDir}images/logo.svg") no-repeat 0 -35px;
+        background: url("@{baseDir}images/logo.svg") no-repeat 0 -21px;
     }
 }
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/module.less
new file mode 100644
index 0000000000000..3ea599854917a
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/module.less
@@ -0,0 +1,15 @@
+// /**
+//  * {license_notice}
+//  *
+//  * @category    design
+//  * @copyright   {copyright}
+//  * @license     {license_link}
+//  */
+
+.version-fieldset {
+    .grid-actions {
+        border-bottom: 1px solid #f2ebde;
+        margin: 0 0 15px;
+        padding: 0 0 15px;
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/admin.less b/app/design/adminhtml/Magento/backend/web/css/admin.less
index edd595970e2f6..b3aad1667d44a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/admin.less
+++ b/app/design/adminhtml/Magento/backend/web/css/admin.less
@@ -713,6 +713,11 @@ fieldset.field [class^='fields-group-'] .field .control {
     vertical-align: middle;
 }
 
+.form-inline > form > div > .message {
+    margin-left: 18px;
+    margin-right: 18px;
+}
+
 .control > input {
     width: 100%;
 }
@@ -1402,8 +1407,8 @@ address {
     background-image: url(../images/fam_application_form_delete.png);
 }
 
-.x-tree-node-ct {
-    overflow: hidden;
+.x-tree-node {
+    overflow: auto;
 }
 
 /*
@@ -1429,7 +1434,7 @@ address {
     color: #be0a0a;
     font-size: 16px;
     font-weight: 500;
-    margin: 0 0 6px 0;
+    margin: 0 0 6px;
 }
 
 .tipsy-inner .error p {
diff --git a/app/design/adminhtml/Magento/backend/web/css/pages.less b/app/design/adminhtml/Magento/backend/web/css/pages.less
index 4a30ddefa1de3..5041b248ad307 100644
--- a/app/design/adminhtml/Magento/backend/web/css/pages.less
+++ b/app/design/adminhtml/Magento/backend/web/css/pages.less
@@ -730,6 +730,13 @@
     padding: 18px;
 }
 
+.customer-current-activity .action-refresh {
+    float: right;
+    &:hover {
+        text-decoration: none;
+    }
+}
+
 .order-currency {
     padding: 18px;
 }
diff --git a/app/design/adminhtml/Magento/backend/web/less/styles/debug.less b/app/design/adminhtml/Magento/backend/web/less/styles/debug.less
index d1026844959fe..8c03537ecac73 100644
--- a/app/design/adminhtml/Magento/backend/web/less/styles/debug.less
+++ b/app/design/adminhtml/Magento/backend/web/less/styles/debug.less
@@ -304,8 +304,11 @@
     border: 0;
 }
 
-.accordion .config .comment a {
-    .style3();
+.accordion .config {
+    .comment a,
+    .link-more {
+        .style3();
+    }
 }
 
 .accordion .config legend {
@@ -370,7 +373,25 @@
 
 .accordion .config .value {
     width: 50%;
-    padding-right:40px;
+    padding-right: 40px;
+    .checkboxes {
+        list-style: none;
+        padding: 0;
+        margin: -3px 0 0;
+
+        li {
+            margin: 7px 0;
+        }
+
+        input,
+        label {
+            vertical-align: middle;
+        }
+
+        label {
+            margin-left: 5px;
+        }
+    }
 }
 
 .accordion .config .value.with-tooltip {
diff --git a/app/design/adminhtml/Magento/backend/web/less/styles/pages.less b/app/design/adminhtml/Magento/backend/web/less/styles/pages.less
index 0937a36a8b20a..03ada00baeb6c 100644
--- a/app/design/adminhtml/Magento/backend/web/less/styles/pages.less
+++ b/app/design/adminhtml/Magento/backend/web/less/styles/pages.less
@@ -1117,9 +1117,6 @@ tr.row-totals:nth-child(odd) + tr.summary-details ~ tr.summary-total:not(.show-d
         }
     }
 }
-.customer-current-activity .action-refresh {
-    float: right;
-}
 
 .customer-current-activity .action-refresh,
 .customer-current-activity .data-table .icon {

From cd0f29d6711cb554b896e0aac2444d31f73144e3 Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Fri, 5 Dec 2014 15:18:56 +0200
Subject: [PATCH 130/474] MTA-1081: Test Creation for InstallationEntity

- Fix CR Changes
---
 .../functional/config/install_data.yml.dist   |  4 +-
 .../Magento/Backend/Test/Block/Page/Main.php  | 10 +--
 .../Core/Test/Repository/ConfigData.php       |  9 ++
 .../Install/Test/Block/ConfigurationForm.php  | 82 -------------------
 .../Magento/Install/Test/Block/Database.xml   |  4 +-
 .../Install/Test/Block/WebConfiguration.php   |  4 +-
 .../Install/Test/Block/WebConfiguration.xml   |  2 +-
 .../Constraint/AssertCurrencySelected.php     |  2 +-
 .../Test/Constraint/AssertRewritesEnabled.php |  6 +-
 .../Constraint/AssertSecureUrlEnabled.php     | 16 ++--
 .../Test/Constraint/AssertSuccessInstall.php  |  2 +-
 .../Constraint/AssertTablePrefixCreated.php   | 56 -------------
 .../Magento/Install/Test/Fixture/Install.php  | 26 ++++--
 .../Magento/Install/Test/Fixture/Install.xml  |  4 +-
 .../Install/Test/TestCase/InstallTest.php     |  4 +-
 .../Test/TestCase/InstallTest/test.csv        |  4 +-
 .../Magento/Install/Test/etc/constraint.xml   |  3 -
 17 files changed, 66 insertions(+), 172 deletions(-)
 delete mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Block/ConfigurationForm.php
 delete mode 100644 dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertTablePrefixCreated.php

diff --git a/dev/tests/functional/config/install_data.yml.dist b/dev/tests/functional/config/install_data.yml.dist
index 06ab837ed7cd6..6ec29a0c39d1a 100644
--- a/dev/tests/functional/config/install_data.yml.dist
+++ b/dev/tests/functional/config/install_data.yml.dist
@@ -2,7 +2,7 @@ db_credentials:
     dbHost: '127.0.0.1'
     dbUser: 'root'
     dbPassword: '123123q'
-    dbname: 'pr'
+    dbName: 'pr'
 url:
-    base_url: 'http://192.168.56.101/pr/'
+    base_url: 'http://127.0.0.1/magento2/'
     backend_frontname: 'backend'
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
index 16fc7bbc3174c..98c7584fc4f24 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
@@ -16,19 +16,19 @@
 class Main extends Block
 {
     /**
-     * Selector for prices.
+     * Selector for Revenue prices.
      *
      * @var string
      */
-    protected $priceBlock = '.price';
+    protected $revenuePriceBlock = '.dashboard-totals-list li:first-child .price';
 
     /**
-     * Get price block.
+     * Get Revenue price block.
      *
      * @return string
      */
-    public function getPrice()
+    public function getRevenuePrice()
     {
-        return $this->_rootElement->find($this->priceBlock)->getText();
+        return $this->_rootElement->find($this->revenuePriceBlock)->getText();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/ConfigData.php b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/ConfigData.php
index 574a20526ddb4..35b9f595bcfec 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/ConfigData.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/ConfigData.php
@@ -27,6 +27,15 @@ class ConfigData extends AbstractRepository
      */
     public function __construct(array $defaultConfig = [], array $defaultData = [])
     {
+        $this->_data['secure_url'] = [
+            'section' => [
+                'path' => 'web/secure/base_url',
+                'scope' => 'default',
+                'scope_id' => 1,
+                'value' => str_replace('http:', 'https:', $_ENV['app_backend_url']),
+            ]
+        ];
+
         $this->_data['compare_products'] = [
             'section' => [
                 [
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/ConfigurationForm.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/ConfigurationForm.php
deleted file mode 100644
index bfacaad52da98..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/ConfigurationForm.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-namespace Magento\Install\Test\Block;
-
-use Mtf\Client\Element;
-
-/**
- * Is used to replace locator on radio button.
- *
- * @api
- */
-class ConfigurationForm extends \Mtf\Block\Form
-{
-    /**
-     * Fixture mapping.
-     *
-     * @param array|null $fields
-     * @param string|null $parent
-     * @return array
-     */
-    protected function dataMapping(array $fields = null, $parent = null)
-    {
-        $mapping = [];
-        $mappingFields = ($parent !== null) ? $parent : $this->mapping;
-        $data = ($this->mappingMode || null === $fields) ? $mappingFields : $fields;
-        foreach ($data as $key => $value) {
-            if (isset($value['value'])) {
-                $value = $value['value'];
-            }
-            if (!$this->mappingMode && is_array($value) && null !== $fields
-                && isset($mappingFields[$key]['composite'])
-            ) {
-                $mapping[$key] = $this->dataMapping($value, $mappingFields[$key]);
-            } else {
-                $mapping[$key]['selector'] = isset($mappingFields[$key]['selector'])
-                    ? $mappingFields[$key]['selector']
-                    : (($this->wrapper != '') ? "[name='{$this->wrapper}" . "[{$key}]']" : "[name={$key}]");
-                if (isset($fields[$key]) && strpos($mapping[$key]['selector'], '%s') !== false) {
-                    $mapping[$key]['selector'] = sprintf($mapping[$key]['selector'], $fields[$key]);
-                    $fields[$key] = "Yes";
-                    $value = "Yes";
-                }
-                $mapping[$key]['strategy'] = isset($mappingFields[$key]['strategy'])
-                    ? $mappingFields[$key]['strategy']
-                    : Element\Locator::SELECTOR_CSS;
-                $mapping[$key]['input'] = isset($mappingFields[$key]['input'])
-                    ? $mappingFields[$key]['input']
-                    : null;
-                $mapping[$key]['class'] = isset($mappingFields[$key]['class'])
-                    ? $mappingFields[$key]['class']
-                    : null;
-                $mapping[$key]['value'] = $this->mappingMode
-                    ? (isset($fields[$key]['value']) ? $fields[$key]['value'] : $fields[$key])
-                    : $value;
-            }
-        }
-
-        return $mapping;
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
index 420f8128ca14d..53283c70ceb3c 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
@@ -12,7 +12,9 @@
         <dbHost />
         <dbUser />
         <dbPassword />
-        <dbname />
+        <dbName>
+            <selector>[name="dbname"]</selector>
+        </dbName>
         <dbTablePrefix />
     </fields>
 </mapping>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
index 96f881de2b507..30b1cf16abe8c 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
@@ -8,10 +8,12 @@
 
 namespace Magento\Install\Test\Block;
 
+use Mtf\Block\Form;
+
 /**
  * Web configuration block.
  */
-class WebConfiguration extends ConfigurationForm
+class WebConfiguration extends Form
 {
     /**
      * 'Next' button.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
index edd3b4f66b87d..a35c98e1fdd4b 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
@@ -12,7 +12,7 @@
         <web />
         <admin />
         <keyOwn>
-            <selector>[value="%s"]</selector>
+            <selector>[value="user"]</selector>
             <input>checkbox</input>
         </keyOwn>
         <keyValue>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
index fbadf447735e2..610b7c004b4dd 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
@@ -49,7 +49,7 @@ class AssertCurrencySelected extends AbstractConstraint
     public function processAssert($currencySymbol, Dashboard $dashboardPage)
     {
         \PHPUnit_Framework_Assert::assertTrue(
-            strpos($dashboardPage->getMainBlock()->getPrice(), $currencySymbol) !== false,
+            strpos($dashboardPage->getMainBlock()->getRevenuePrice(), $currencySymbol) !== false,
             'Selected currency symbol not displays on dashboard.'
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
index 31c9614b8ffca..74d337e478819 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
@@ -52,12 +52,12 @@ public function processAssert(Browser $browser)
         \PHPUnit_Framework_Assert::assertEquals(
             $frontUrl,
             $browser->getUrl(),
-            'Apache redirect on front page not work.'
+            'Apache redirect on front page does not work.'
         );
 
         $browser->open($frontUrl . 'index.php/backend/');
         $isRedirect = strpos($browser->getUrl(), 'index.php') !== false;
-        \PHPUnit_Framework_Assert::assertTrue($isRedirect, 'Apache redirect on backend not work.');
+        \PHPUnit_Framework_Assert::assertTrue($isRedirect, 'Apache redirect on backend does not work.');
     }
 
     /**
@@ -67,6 +67,6 @@ public function processAssert(Browser $browser)
      */
     public function toString()
     {
-        return 'Apache redirect correct work.';
+        return 'Apache redirect works correct.';
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
index dfaee659177f4..bd52bb35ecc00 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
@@ -25,6 +25,7 @@
 namespace Magento\Install\Test\Constraint;
 
 use Mtf\Client\Browser;
+use Mtf\Fixture\FixtureFactory;
 use Mtf\TestStep\TestStepFactory;
 use Mtf\Constraint\AbstractConstraint;
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
@@ -49,12 +50,18 @@ class AssertSecureUrlEnabled extends AbstractConstraint
      * @param Browser $browser
      * @return void
      */
-    public function processAssert(CatalogProductSimple $productSimple, TestStepFactory $stepFactory, Browser $browser)
-    {
+    public function processAssert(
+        CatalogProductSimple $productSimple,
+        TestStepFactory $stepFactory,
+        Browser $browser,
+        FixtureFactory $fixtureFactory
+    ) {
+        $config = $fixtureFactory->createByCode('configData', ['dataSet' => 'secure_url']);
+        $config->persist();
         $browser->getUrl();
         \PHPUnit_Framework_Assert::assertTrue(
             strpos($browser->getUrl(), 'https://') !== false,
-            'Assert that Secure Urls not displayed on backend.'
+            'Secure Urls not displayed on backend.'
         );
 
         $productSimple->persist();
@@ -65,10 +72,9 @@ public function processAssert(CatalogProductSimple $productSimple, TestStepFacto
         $stepFactory->create('Magento\Catalog\Test\TestStep\ProceedToCheckoutStep')->run();
         \PHPUnit_Framework_Assert::assertTrue(
             strpos($browser->getUrl(), 'https://') !== false,
-            'Assert that Secure Urls not displayed on frontend.'
+            'Secure Urls not displayed on frontend.'
         );
     }
-
     /**
      * Returns a string representation of the object.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
index fc06cda1c7da6..53409ab41fd6a 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
@@ -43,7 +43,7 @@ class AssertSuccessInstall extends AbstractConstraint
      * @var array
      */
     protected $dbFieldsList = [
-        ['pageData' => 'database_name', 'fixture' => 'dbname'],
+        ['pageData' => 'database_name', 'fixture' => 'dbName'],
         ['pageData' => 'username', 'fixture' => 'dbUser']
     ];
 
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertTablePrefixCreated.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertTablePrefixCreated.php
deleted file mode 100644
index e2833d2eb5fef..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertTablePrefixCreated.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
- */
-
-namespace Magento\Install\Test\Constraint;
-
-use Mtf\Constraint\AbstractConstraint;
-
-/**
- * Class AssertTablePrefixCreated
- */
-class AssertTablePrefixCreated extends AbstractConstraint
-{
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
-    /**
-     * @return void
-     */
-    public function processAssert()
-    {
-        //
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        //
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
index f0a80794af760..89b45788fd2c6 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
@@ -1,9 +1,25 @@
 <?php
 /**
- * {license_notice}
+ * Magento
  *
- * @copyright   {copyright}
- * @license     {license_link}
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
 namespace Magento\Install\Test\Fixture;
@@ -43,8 +59,8 @@ class Install extends InjectableFixture
         'backend_type' => 'virtual',
     ];
 
-    protected $dbname = [
-        'attribute_code' => 'dbname',
+    protected $dbName = [
+        'attribute_code' => 'dbName',
         'backend_type' => 'virtual',
     ];
 
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
index b531a34e8126c..0bd709166a26e 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
@@ -28,10 +28,10 @@
             <attribute_code>dbPassword</attribute_code>
             <backend_type>virtual</backend_type>
         </dbPassword>
-        <dbname>
+        <dbName>
             <attribute_code>dbname</attribute_code>
             <backend_type>virtual</backend_type>
-        </dbname>
+        </dbName>
         <web>
             <attribute_code>web</attribute_code>
             <backend_type>virtual</backend_type>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
index 04425ca2f5924..af7c183f0e04b 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
@@ -43,8 +43,8 @@
  * 12. Click "Next" and on the "Step 6: Install" page click "Install Now" button.
  * 13. Perform assertions.
  *
- * @group Installer and Upgrade/Downgrade (PS)
- * @ZephyrId MAGETWO-15081
+ * @group Installer_and_Upgrade/Downgrade_(PS)
+ * @ZephyrId MAGETWO-31431
  */
 class InstallTest extends Injectable
 {
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
index 6fade52fc9a3d..86a042e1e3c44 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
@@ -1,7 +1,7 @@
 "user/dataSet";"install/dbTablePrefix";"install/admin";"install/httpsFront";"install/httpsAdmin";"install/apacheRewrites";"install/keyOwn";"install/keyValue";"install/language";"install/currency";"currencySymbol";"languageTemplate";"constraint";"description";"issue"
 "default";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin";"install with default values";""
 "default";"-";"custom";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin";"install with custom admin path";""
-"default";"-";"-";"-";"-";"-";"user";"123123qa";"German (Germany)";"Euro (EUR)";"€";"Suchbegriffe";"assertSuccessInstall, assertKeyCreated, assertUserSuccessLogin, assertCurrencySelected, assertLanguageSelected";"install with custom encryption key and changed currency and locale";""
-"default";"prefix1_";"-";"-";"-";"-";"-";"-";"Chinese (China)";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin, assertTablePrefixCreated";"install with table prefix";""
+"default";"-";"-";"-";"-";"-";"Yes";"123123qa";"German (Germany)";"Euro (EUR)";"€";"Suchbegriffe";"assertSuccessInstall, assertKeyCreated, assertUserSuccessLogin, assertCurrencySelected, assertLanguageSelected";"install with custom encryption key and changed currency and locale";""
+"default";"prefix1_";"-";"-";"-";"-";"-";"-";"Chinese (China)";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin";"install with table prefix";""
 "default";"-";"-";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin, assertRewritesEnabled";"install with enabled url rewrites";""
 "default";"-";"-";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin, assertSecureUrlEnabled";"install with enabled secure urls";"MAGETWO-31409"
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
index ac612d4de6e77..7d25c97d8584d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
@@ -29,9 +29,6 @@
     <assertCurrencySelected module="Magento_Install">
         <severeness>low</severeness>
     </assertCurrencySelected>
-    <assertTablePrefixCreated module="Magento_Install">
-        <severeness>low</severeness>
-    </assertTablePrefixCreated>
     <assertRewritesEnabled module="Magento_Install">
         <severeness>low</severeness>
     </assertRewritesEnabled>

From 3a78d133a0f90e11cc577e2853ff8ebbdfcc72b2 Mon Sep 17 00:00:00 2001
From: Pavel Stepanov <pstepanov@ebay.com>
Date: Fri, 5 Dec 2014 15:21:38 +0200
Subject: [PATCH 131/474] CICD-1404: fix for BAT error

---
 dev/tests/js/run_js_tests.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev/tests/js/run_js_tests.php b/dev/tests/js/run_js_tests.php
index 02081edbc1abd..5be232d91b17c 100644
--- a/dev/tests/js/run_js_tests.php
+++ b/dev/tests/js/run_js_tests.php
@@ -141,7 +141,12 @@
             kill -9 $LSOF
         fi
 
-        pkill Xvfb
+        DISPLAY_NUM=99
+        ps -ef | egrep "[X]vfb.*:$DISPLAY_NUM"
+        if [ $? -ne 0 ] ; then
+            pkill Xvfb
+        fi
+
         XVFB=`which Xvfb`
         if [ "$?" -eq 1 ];
         then
@@ -149,9 +154,9 @@
             exit 1
         fi
 
-        $XVFB :99 -nolisten inet6 -ac &
+        $XVFB :$DISPLAY_NUM -nolisten inet6 -ac &
         PID_XVFB="$!"        # take the process ID
-        export DISPLAY=:99   # set display to use that of the Xvfb
+        export DISPLAY=:$DISPLAY_NUM   # set display to use that of the Xvfb
         USER=`whoami`
         SUDO=`which sudo`
 

From 48a7549e3310caa1003c1c7abb87f974b2c8dc05 Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@ebay.com>
Date: Fri, 5 Dec 2014 15:54:48 +0200
Subject: [PATCH 132/474] MAGETWO-24703: Backend UI issues: improvements

- CR changes
---
 .../Review/Block/Adminhtml/Rating/Edit/Tab/Form.php       | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
index 64c7d7d9ffff2..c03b3a9a9bdb0 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
@@ -184,12 +184,4 @@ protected function _setRatingCodes($ratingCodes)
             }
         }
     }
-
-    /**
-     * @return string
-     */
-    protected function _toHtml()
-    {
-        return parent::_toHtml();
-    }
 }

From 2627bb7e44468ea8cd93ba734d6dc24fdec80048 Mon Sep 17 00:00:00 2001
From: Pavel Stepanov <pstepanov@ebay.com>
Date: Fri, 5 Dec 2014 16:26:57 +0200
Subject: [PATCH 133/474] CICD-1404: fix for BAT error

---
 dev/tests/js/run_js_tests.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/js/run_js_tests.php b/dev/tests/js/run_js_tests.php
index 5be232d91b17c..58d17a42ffcf0 100644
--- a/dev/tests/js/run_js_tests.php
+++ b/dev/tests/js/run_js_tests.php
@@ -143,7 +143,7 @@
 
         DISPLAY_NUM=99
         ps -ef | egrep "[X]vfb.*:$DISPLAY_NUM"
-        if [ $? -ne 0 ] ; then
+        if [ $? -eq 0 ] ; then
             pkill Xvfb
         fi
 

From 5aaefd1515e69e5b287f0ce1cd25bce4c05e82a5 Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Fri, 5 Dec 2014 18:18:36 +0200
Subject: [PATCH 134/474] MTA-1081: Test Creation for InstallationEntity

- Fix CR Changes
---
 dev/tests/functional/config/install_data.yml.dist            | 2 +-
 .../Install/Test/Constraint/AssertSecureUrlEnabled.php       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev/tests/functional/config/install_data.yml.dist b/dev/tests/functional/config/install_data.yml.dist
index 6ec29a0c39d1a..61248a2f2d0fa 100644
--- a/dev/tests/functional/config/install_data.yml.dist
+++ b/dev/tests/functional/config/install_data.yml.dist
@@ -2,7 +2,7 @@ db_credentials:
     dbHost: '127.0.0.1'
     dbUser: 'root'
     dbPassword: '123123q'
-    dbName: 'pr'
+    dbName: 'default'
 url:
     base_url: 'http://127.0.0.1/magento2/'
     backend_frontname: 'backend'
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
index bd52bb35ecc00..2130de4307ca5 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
@@ -61,7 +61,7 @@ public function processAssert(
         $browser->getUrl();
         \PHPUnit_Framework_Assert::assertTrue(
             strpos($browser->getUrl(), 'https://') !== false,
-            'Secure Urls not displayed on backend.'
+            'Secure Urls are not displayed on backend.'
         );
 
         $productSimple->persist();
@@ -72,9 +72,10 @@ public function processAssert(
         $stepFactory->create('Magento\Catalog\Test\TestStep\ProceedToCheckoutStep')->run();
         \PHPUnit_Framework_Assert::assertTrue(
             strpos($browser->getUrl(), 'https://') !== false,
-            'Secure Urls not displayed on frontend.'
+            'Secure Urls are not displayed on frontend.'
         );
     }
+
     /**
      * Returns a string representation of the object.
      *

From 813a857f94740ffbcde688b23ca6f431f0f56679 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Fri, 5 Dec 2014 10:34:24 -0600
Subject: [PATCH 135/474] MAGETWO-30859: No input validation for HTTPS
 configuration data during installation

- A runtime error is fixed.
---
 .../Magento/Setup/src/Model/UserConfigurationDataMapper.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index 26b24e12ea2b7..ae189a153bb67 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -63,7 +63,8 @@ class UserConfigurationDataMapper
     public function getConfigData($data)
     {
         $configData = [];
-        if (!($data[self::KEY_IS_SECURE] || $data[self::KEY_IS_SECURE_ADMIN])) {
+        if (!((isset($data[self::KEY_IS_SECURE]) && $data[self::KEY_IS_SECURE])
+            || (isset($data[self::KEY_IS_SECURE_ADMIN]) && $data[self::KEY_IS_SECURE_ADMIN]))) {
             unset($data[self::KEY_BASE_URL_SECURE] );
         }
         foreach (self::$pathDataMap as $path => $key) {

From 93a19127f220639d98a7204aeeac1fffe80ace87 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Fri, 5 Dec 2014 10:39:58 -0600
Subject: [PATCH 136/474] MAGETWO-30859: No input validation for HTTPS
 configuration data during installation

- Fixed php exception.
---
 .../Magento/Setup/src/Model/UserConfigurationDataMapper.php  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
index ae189a153bb67..73c19dd9ee56d 100644
--- a/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
+++ b/setup/module/Magento/Setup/src/Model/UserConfigurationDataMapper.php
@@ -64,8 +64,9 @@ public function getConfigData($data)
     {
         $configData = [];
         if (!((isset($data[self::KEY_IS_SECURE]) && $data[self::KEY_IS_SECURE])
-            || (isset($data[self::KEY_IS_SECURE_ADMIN]) && $data[self::KEY_IS_SECURE_ADMIN]))) {
-            unset($data[self::KEY_BASE_URL_SECURE] );
+            || (isset($data[self::KEY_IS_SECURE_ADMIN]) && $data[self::KEY_IS_SECURE_ADMIN]))
+            && isset($data[self::KEY_BASE_URL_SECURE])) {
+            unset($data[self::KEY_BASE_URL_SECURE]);
         }
         foreach (self::$pathDataMap as $path => $key) {
             if (isset($data[$key])) {

From 6d3196c5590755afacf4aac2aa598a2678e40877 Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Fri, 5 Dec 2014 18:48:32 +0200
Subject: [PATCH 137/474] MTA-1081: Test Creation for InstallationEntity

- Fix CR Changes
---
 dev/build/core_dev/functional/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index 4a0dc2a36451b..d0c8e8db0c4d0 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -220,7 +220,7 @@
             <replacefilter token="{{tests_configuration}}" value="${env.bamboo_tests_configuration}" />
         </replace>
 
-        <replace file="${dir.build_directory}/instance-${instanceIndex}/build/core_dev/functional/config/install_data.yml">
+        <replace file="${dir.build_directory}/instance-${instanceIndex}/build/core_dev/functional/config/install_data.yml.dist">
             <replacefilter token="{{db_host}}" value="${env.db_host}"/>
             <replacefilter token="{{db_user}}" value="${env.db_user}"/>
             <replacefilter token="{{db_password}}" value="${env.db_password}"/>

From 8a75f61fe1ae9343aede458cdfa6e6df74ba3b4e Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Fri, 5 Dec 2014 18:58:28 +0200
Subject: [PATCH 138/474] MTA-1081: Test Creation for InstallationEntity

- Fix CR Changes
---
 dev/build/core_dev/functional/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index d0c8e8db0c4d0..e8c2e9b453477 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -220,7 +220,7 @@
             <replacefilter token="{{tests_configuration}}" value="${env.bamboo_tests_configuration}" />
         </replace>
 
-        <replace file="${dir.build_directory}/instance-${instanceIndex}/build/core_dev/functional/config/install_data.yml.dist">
+        <replace file="${dir.build_directory}/instance-${instanceIndex}/dev/tests/functional/config/install_data.yml.dist">
             <replacefilter token="{{db_host}}" value="${env.db_host}"/>
             <replacefilter token="{{db_user}}" value="${env.db_user}"/>
             <replacefilter token="{{db_password}}" value="${env.db_password}"/>

From f4470965e4805fd2dc07c88610be2defc06620ae Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Fri, 5 Dec 2014 11:16:19 -0600
Subject: [PATCH 139/474] MAGETWO-31432: Fatal error in version.php

- Fixed the bug.
---
 dev/tools/Magento/Tools/Composer/version.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tools/Magento/Tools/Composer/version.php b/dev/tools/Magento/Tools/Composer/version.php
index 605140e2502db..90334b01032b8 100644
--- a/dev/tools/Magento/Tools/Composer/version.php
+++ b/dev/tools/Magento/Tools/Composer/version.php
@@ -10,6 +10,7 @@
 
 namespace Magento\Tools\Composer\Package;
 
+require __DIR__ . '/../../../bootstrap.php';
 require __DIR__ . '/Package/Reader.php';
 require __DIR__ . '/Package/Package.php';
 require __DIR__ . '/Package/Collection.php';

From f8c83d293e5bfbc4f8514163132ecbb061eae10d Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 5 Dec 2014 11:24:14 -0600
Subject: [PATCH 140/474] MAGETWO-29035: Installation fails if cli php is
 different than apache configured

- fixed description
---
 setup/module/Magento/Setup/src/Model/Installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 370ad86156224..05d6e06ecc330 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -170,7 +170,7 @@ class Installer
     private $installInfo = array();
 
     /**
-     * A materialized string of initialization parameters to pass on any script that's run externally by this model
+     * Initialization parameters for Magento application bootstrap
      *
      * @var string
      */

From 492e41a456d2ecfe0944c599c7ade721cdddd3f1 Mon Sep 17 00:00:00 2001
From: Paul Lewis <plewis@ebay.com>
Date: Fri, 5 Dec 2014 14:55:56 -0600
Subject: [PATCH 141/474] MAGETWO-29546: DbStatusValidator does not provide
 enough information to perform successful update of the system

 - refactor version detection into its own class
---
 .../Module/DbVersionDetectorTest.php          | 146 +++++++++++++++
 .../Magento/Framework/Module/ManagerTest.php  |  79 ---------
 .../Module/Plugin/DbStatusValidatorTest.php   | 107 +++++------
 .../Magento/Framework/Module/UpdaterTest.php  |  34 ++--
 .../Framework/Module/DbVersionDetector.php    | 167 ++++++++++++++++++
 .../Magento/Framework/Module/Manager.php      |  67 -------
 .../Module/Plugin/DbStatusValidator.php       |  74 ++------
 .../Magento/Framework/Module/Updater.php      |  12 +-
 8 files changed, 383 insertions(+), 303 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php
 create mode 100644 lib/internal/Magento/Framework/Module/DbVersionDetector.php

diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php
new file mode 100644
index 0000000000000..33d14e3099f6d
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Framework\Module;
+
+
+class DbVersionDetectorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var DbVersionDetector
+     */
+    private $dbVersionDetector;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleList;
+
+    /**
+     * @var \Magento\Framework\Module\ResourceInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleResource;
+
+    protected function setUp()
+    {
+        $this->moduleList = $this->getMockForAbstractClass('Magento\Framework\Module\ModuleListInterface');
+        $this->moduleList->expects($this->any())
+            ->method('getModule')
+            ->will($this->returnValueMap([
+                        ['Module_One', ['name' => 'One_Module', 'schema_version' => '1']],
+                        ['Module_Two', ['name' => 'Two_Module', 'schema_version' => '2']],
+                        ['Module_Three', ['name' => 'Two_Three']],
+                    ]));
+        $this->_outputConfig = $this->getMockForAbstractClass('Magento\Framework\Module\Output\ConfigInterface');
+        $this->moduleResource = $this->getMockForAbstractClass('\Magento\Framework\Module\ResourceInterface');
+        $this->dbVersionDetector = new DbVersionDetector(
+            $this->moduleList,
+            $this->moduleResource
+        );
+    }
+
+    /**
+     * @param string $moduleName
+     * @param string|bool $dbVersion
+     * @param bool $expectedResult
+     *
+     * @dataProvider isDbUpToDateDataProvider
+     */
+    public function testIsDbSchemaUpToDate($moduleName, $dbVersion, $expectedResult)
+    {
+        $resourceName = 'resource';
+        $this->moduleResource->expects($this->once())
+            ->method('getDbVersion')
+            ->with($resourceName)
+            ->will($this->returnValue($dbVersion));
+        $this->assertEquals(
+            $expectedResult,
+            $this->dbVersionDetector->isDbSchemaUpToDate($moduleName, $resourceName)
+        );
+    }
+
+    /**
+     * @param string $moduleName
+     * @param string|bool $dbVersion
+     * @param bool $expectedResult
+     *
+     * @dataProvider isDbUpToDateDataProvider
+     */
+    public function testIsDbDataUpToDate($moduleName, $dbVersion, $expectedResult)
+    {
+        $resourceName = 'resource';
+        $this->moduleResource->expects($this->once())
+            ->method('getDataVersion')
+            ->with($resourceName)
+            ->will($this->returnValue($dbVersion));
+        $this->assertEquals(
+            $expectedResult,
+            $this->dbVersionDetector->isDbDataUpToDate($moduleName, $resourceName)
+        );
+    }
+
+
+    /**
+     * @return array
+     */
+    public function isDbUpToDateDataProvider()
+    {
+        return [
+            'version in config == version in db' => ['Module_One', '1', true],
+            'version in config < version in db' =>
+                [
+                    'Module_One',
+                    '2',
+                    false
+                ],
+            'version in config > version in db' =>
+                [
+                    'Module_Two',
+                    '1',
+                    false
+                ],
+            'no version in db' =>
+                [
+                    'Module_One',
+                    false,
+                    false
+                ],
+        ];
+    }
+
+    public function testGetDbVersionErrors()
+    {
+        $this->moduleList->expects($this->any())
+            ->method('getModules')
+            ->will($this->returnValue([
+                        ['name' => 'One_Module', 'schema_version' => '1'],
+                        ['Module_Two', ['name' => 'Two_Module', 'schema_version' => '2']],
+                        ['Module_Three', ['name' => 'Two_Three']],
+                    ]));
+
+        $this->dbVersionDetector->getDbVersionErrors();
+    }
+
+//
+//    /**
+//     * @expectedException \UnexpectedValueException
+//     * @expectedExceptionMessage Schema version for module 'Module_Three' is not specified
+//     */
+//    public function testIsDbSchemaUpToDateException()
+//    {
+//        $this->dbVersionDetector->getDbSchemaVersionError('Module_Three', 'resource');
+//    }
+//
+//    /**
+//     * @expectedException \UnexpectedValueException
+//     * @expectedExceptionMessage Schema version for module 'Module_Three' is not specified
+//     */
+//    public function testIsDbDataUpToDateException()
+//    {
+//        $this->dbVersionDetector->getDbDataVersionError('Module_Three', 'resource');
+//    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
index fb22d0f32e9c6..a58403021803b 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
@@ -117,83 +117,4 @@ public function isOutputEnabledCustomConfigPathDataProvider()
         );
     }
 
-    /**
-     * @param string $moduleName
-     * @param string|bool $dbVersion
-     * @param bool $expectedResult
-     *
-     * @dataProvider isDbUpToDateDataProvider
-     */
-    public function testIsDbSchemaUpToDate($moduleName, $dbVersion, $expectedResult)
-    {
-        $resourceName = 'resource';
-        $this->moduleResource->expects($this->once())
-            ->method('getDbVersion')
-            ->with($resourceName)
-            ->will($this->returnValue($dbVersion));
-        $this->assertEquals($expectedResult, $this->_model->getDbSchemaVersionError($moduleName, $resourceName));
-    }
-
-    /**
-     * @param string $moduleName
-     * @param string|bool $dbVersion
-     * @param bool $expectedResult
-     *
-     * @dataProvider isDbUpToDateDataProvider
-     */
-    public function testIsDbDataUpToDate($moduleName, $dbVersion, $expectedResult)
-    {
-        $resourceName = 'resource';
-        $this->moduleResource->expects($this->once())
-            ->method('getDataVersion')
-            ->with($resourceName)
-            ->will($this->returnValue($dbVersion));
-        $this->assertEquals($expectedResult, $this->_model->getDbDataVersionError($moduleName, $resourceName));
-    }
-
-    /**
-     * @return array
-     */
-    public function isDbUpToDateDataProvider()
-    {
-        return [
-            'version in config == version in db' => ['Module_One', '1', []],
-            'version in config < version in db' =>
-                [
-                    'Module_One',
-                    '2',
-                    [DbStatusValidator::ERROR_KEY_CURRENT => '2', DbStatusValidator::ERROR_KEY_NEEDED => '1']
-                ],
-            'version in config > version in db' =>
-                [
-                    'Module_Two',
-                    '1',
-                    [DbStatusValidator::ERROR_KEY_CURRENT => '1', DbStatusValidator::ERROR_KEY_NEEDED => '2']
-                ],
-            'no version in db' =>
-                [
-                    'Module_One',
-                    false,
-                    [DbStatusValidator::ERROR_KEY_CURRENT => 'none', DbStatusValidator::ERROR_KEY_NEEDED => '1']
-                ],
-        ];
-    }
-
-    /**
-     * @expectedException \UnexpectedValueException
-     * @expectedExceptionMessage Schema version for module 'Module_Three' is not specified
-     */
-    public function testIsDbSchemaUpToDateException()
-    {
-        $this->_model->getDbSchemaVersionError('Module_Three', 'resource');
-    }
-
-    /**
-     * @expectedException \UnexpectedValueException
-     * @expectedExceptionMessage Schema version for module 'Module_Three' is not specified
-     */
-    public function testIsDbDataUpToDateException()
-    {
-        $this->_model->getDbDataVersionError('Module_Three', 'resource');
-    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index 3061da10e21fe..d06041cea8a07 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -7,6 +7,8 @@
  */
 namespace Magento\Framework\Module\Plugin;
 
+use Magento\Framework\Module\DbVersionDetector;
+
 class DbStatusValidatorTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -44,6 +46,11 @@ class DbStatusValidatorTest extends \PHPUnit_Framework_TestCase
      */
     private $moduleManager;
 
+    /**
+     * @var \Magento\Framework\Module\DbVersionDetector|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dbVersionDetectorMock;
+
     protected function setUp()
     {
         $this->_cacheMock = $this->getMock('\Magento\Framework\Cache\FrontendInterface');
@@ -67,11 +74,10 @@ protected function setUp()
                 return ['resource_' . $moduleName];
             }));
         $this->moduleManager = $this->getMock('\Magento\Framework\Module\Manager', [], [], '', false);
+        $this->dbVersionDetectorMock = $this->getMock('\Magento\Framework\Module\DbVersionDetector', [], [], '', false);
         $this->_model = new DbStatusValidator(
             $this->_cacheMock,
-            $moduleList,
-            $resourceResolver,
-            $this->moduleManager
+            $this->dbVersionDetectorMock
         );
     }
 
@@ -117,15 +123,13 @@ public function testAroundDispatchCached()
     }
 
     /**
-     * @param array $schemaValueMap
-     * @param array $dataValueMap
+     * @param array $dbVersionErrors
      *
      * @dataProvider aroundDispatchExceptionDataProvider
      * @expectedException \Magento\Framework\Module\Exception
      * @expectedExceptionMessage Please update your database: first run "composer install" from the Magento
-     * root/ and root/setup directories. Then run "php –f index.php update" from the Magento root/setup directory.
      */
-    public function testAroundDispatchException(array $schemaValueMap, array $dataValueMap)
+    public function testAroundDispatchException(array $dbVersionErrors)
     {
         $this->_cacheMock->expects($this->once())
             ->method('load')
@@ -133,12 +137,11 @@ public function testAroundDispatchException(array $schemaValueMap, array $dataVa
             ->will($this->returnValue(false))
         ;
         $this->_cacheMock->expects($this->never())->method('save');
-        $this->moduleManager->expects($this->any())
-            ->method('getDbSchemaVersionError')
-            ->will($this->returnValueMap($schemaValueMap));
-        $this->moduleManager->expects($this->any())
-            ->method('getDbDataVersionError')
-            ->will($this->returnValueMap($dataValueMap));
+
+        $this->dbVersionDetectorMock->expects($this->any())
+            ->method('getDbVersionErrors')
+            ->will($this->returnValue($dbVersionErrors));
+
         $this->_model->aroundDispatch($this->subjectMock, $this->closureMock, $this->requestMock);
     }
 
@@ -150,74 +153,50 @@ public function aroundDispatchExceptionDataProvider()
         return [
             'schema is outdated' => [
                 [
-                    ['Module_One', 'resource_Module_One',
                      [
-                      DbStatusValidator::ERROR_KEY_MODULE => 'Module_One',
-                      DbStatusValidator::ERROR_KEY_TYPE => 'schema',
-                      DbStatusValidator::ERROR_KEY_CURRENT => 'none',
-                      DbStatusValidator::ERROR_KEY_NEEDED => '1'
+                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
+                         DbVersionDetector::ERROR_KEY_TYPE => 'schema',
+                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
+                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
                      ]
-                    ],
-                    ['Module_Two', 'resource_Module_Two', []],
-                ],
-                [
-                    ['Module_One', 'resource_Module_One', []],
-                    ['Module_Two', 'resource_Module_Two', []],
                 ],
             ],
             'data is outdated' => [
                 [
-                    ['Module_One', 'resource_Module_One', []],
-                    ['Module_Two', 'resource_Module_Two', []],
-                ],
-                [
-                    ['Module_One', 'resource_Module_One', []],
-                    ['Module_Two', 'resource_Module_Two',
                      [
-                         DbStatusValidator::ERROR_KEY_MODULE => 'Module_Two',
-                         DbStatusValidator::ERROR_KEY_TYPE => 'data',
-                         DbStatusValidator::ERROR_KEY_CURRENT => 'none',
-                         DbStatusValidator::ERROR_KEY_NEEDED => '1'
+                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_Two',
+                         DbVersionDetector::ERROR_KEY_TYPE => 'data',
+                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
+                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
                      ]
-                    ],
                 ],
             ],
             'both schema and data are outdated' => [
                 [
-                    ['Module_One', 'resource_Module_One',
                      [
-                         DbStatusValidator::ERROR_KEY_MODULE => 'Module_One',
-                         DbStatusValidator::ERROR_KEY_TYPE => 'schema',
-                         DbStatusValidator::ERROR_KEY_CURRENT => 'none',
-                         DbStatusValidator::ERROR_KEY_NEEDED => '1'
-                     ]
-                    ],
-                    ['Module_Two', 'resource_Module_Two',
+                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
+                         DbVersionDetector::ERROR_KEY_TYPE => 'schema',
+                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
+                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
+                     ],
                      [
-                         DbStatusValidator::ERROR_KEY_MODULE => 'Module_Two',
-                         DbStatusValidator::ERROR_KEY_TYPE => 'schema',
-                         DbStatusValidator::ERROR_KEY_CURRENT => 'none',
-                         DbStatusValidator::ERROR_KEY_NEEDED => '1'
-                     ]
-                    ],
-                ],
-                [
-                    ['Module_One', 'resource_Module_One',
+                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_Two',
+                         DbVersionDetector::ERROR_KEY_TYPE => 'schema',
+                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
+                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
+                     ],
                      [
-                         DbStatusValidator::ERROR_KEY_MODULE => 'Module_One',
-                         DbStatusValidator::ERROR_KEY_TYPE => 'data',
-                         DbStatusValidator::ERROR_KEY_CURRENT => 'none',
-                         DbStatusValidator::ERROR_KEY_NEEDED => '1'
-                     ]
-                    ],
-                    ['Module_Two', 'resource_Module_Two',
+                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
+                         DbVersionDetector::ERROR_KEY_TYPE => 'data',
+                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
+                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
+                     ],
                      [
-                         DbStatusValidator::ERROR_KEY_MODULE => 'Module_Two',
-                         DbStatusValidator::ERROR_KEY_TYPE => 'data',
-                         DbStatusValidator::ERROR_KEY_CURRENT => 'none',
-                         DbStatusValidator::ERROR_KEY_NEEDED => '1'
+                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_Two',
+                         DbVersionDetector::ERROR_KEY_TYPE => 'data',
+                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
+                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
                      ]
-                    ],
                 ],
             ],
         ];
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php
index ba35e8c438833..6d67ba61815d3 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php
@@ -30,9 +30,9 @@ class UpdaterTest extends \PHPUnit_Framework_TestCase
     protected $_resourceSetupMock;
 
     /**
-     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\DbVersionDetector|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $moduleManager;
+    private $_dbVersionDetector;
 
     /**
      * @var \Magento\Framework\Module\Updater
@@ -68,37 +68,23 @@ protected function setUp()
             ->will($this->returnValue($resourceList))
         ;
 
-        $this->moduleManager = $this->getMock('\Magento\Framework\Module\Manager', [], [], '', false);
+        $this->_dbVersionDetector = $this->getMock('Magento\Framework\Module\DbVersionDetector', [], [], '', false);
 
         $this->_model = new \Magento\Framework\Module\Updater(
             $this->_factoryMock,
             $this->_moduleListMock,
             $this->_resourceResolver,
-            $this->moduleManager
+            $this->_dbVersionDetector
         );
     }
 
-    /**
-     * @covers \Magento\Framework\Module\Updater::updateData
-     */
-    public function testUpdateDataNotApplied()
-    {
-        $this->moduleManager->expects($this->once())
-            ->method('getDbDataVersionError')
-            ->with('Test_Module', 'catalog_setup')
-            ->will($this->returnValue([]));
-        $this->_factoryMock->expects($this->never())
-            ->method('create');
-        $this->_model->updateData();
-    }
-
     public function testUpdateData()
     {
-        $this->moduleManager->expects($this->once())
-            ->method('getDbDataVersionError')
+        $this->_dbVersionDetector->expects($this->once())
+            ->method('isDbDataUpToDate')
             ->with('Test_Module', 'catalog_setup')
             ->will(
-                $this->returnValue(['module' => 'Test_Module', 'type' => 'data', 'current' => '1', 'needed' => '2'])
+                $this->returnValue(false)
             );
         $this->_factoryMock->expects($this->any())
             ->method('create')
@@ -113,10 +99,10 @@ public function testUpdateData()
 
     public function testUpdateDataNoUpdates()
     {
-        $this->moduleManager->expects($this->once())
-            ->method('getDbDataVersionError')
+        $this->_dbVersionDetector->expects($this->once())
+            ->method('isDbDataUpToDate')
             ->with('Test_Module', 'catalog_setup')
-            ->will($this->returnValue([]));
+            ->will($this->returnValue(true));
         $this->_factoryMock->expects($this->never())
             ->method('create');
 
diff --git a/lib/internal/Magento/Framework/Module/DbVersionDetector.php b/lib/internal/Magento/Framework/Module/DbVersionDetector.php
new file mode 100644
index 0000000000000..1c9c0c3f8db62
--- /dev/null
+++ b/lib/internal/Magento/Framework/Module/DbVersionDetector.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ *
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Framework\Module;
+
+use Magento\Framework\Module\Updater\SetupInterface;
+
+/**
+ * Class DbVersionDetector
+ *
+ */
+class DbVersionDetector
+{
+    /**#@+
+     * Constants defined for keys of error array
+     */
+    const ERROR_KEY_MODULE = 'module';
+    const ERROR_KEY_TYPE = 'type';
+    const ERROR_KEY_CURRENT = 'current';
+    const ERROR_KEY_NEEDED = 'needed';
+    /**#@-*/
+
+    /**
+     * @var ModuleListInterface
+     */
+    private $moduleList;
+
+    /**
+     * @var ResourceInterface
+     */
+    private $moduleResource;
+
+    /**
+     * @var ResourceResolverInterface
+     */
+    private $resourceResolver;
+
+    /**
+     * @param ModuleListInterface $moduleList
+     * @param ResourceInterface $moduleResource
+     * @param ResourceResolverInterface $resourceResolver
+     */
+    public function __construct(
+        ModuleListInterface $moduleList,
+        ResourceInterface $moduleResource,
+        ResourceResolverInterface $resourceResolver
+    ) {
+        $this->moduleList = $moduleList;
+        $this->moduleResource = $moduleResource;
+        $this->resourceResolver = $resourceResolver;
+    }
+
+    /**
+     * Check if DB schema is up to date
+     *
+     * @param string $moduleName
+     * @param string $resourceName
+     * @return bool
+     */
+    public function isDbSchemaUpToDate($moduleName, $resourceName)
+    {
+        $dbVer = $this->moduleResource->getDbVersion($resourceName);
+        return $this->isModuleVersionEqual($moduleName, $dbVer);
+    }
+
+    /**
+     * @param string $moduleName
+     * @param string $resourceName
+     * @return bool
+     */
+    public function isDbDataUpToDate($moduleName, $resourceName)
+    {
+        $dataVer = $this->moduleResource->getDataVersion($resourceName);
+        return $this->isModuleVersionEqual($moduleName, $dataVer);
+    }
+
+    /**
+     * Get array of errors if DB is out of date, return [] if DB is current
+     *
+     * @return [] Array of errors, each error contains module name, current version, needed version,
+     *              and type (schema or data).  The array will be empty if all schema and data are current.
+     */
+    public function getDbVersionErrors()
+    {
+        $errors = [];
+        foreach (array_keys($this->moduleList->getModules()) as $moduleName) {
+            foreach ($this->resourceResolver->getResourceList($moduleName) as $resourceName) {
+                if (!$this->isDbSchemaUpToDate($moduleName, $resourceName)) {
+                    $errors[] = $this->getDbSchemaVersionError($moduleName, $resourceName);
+                }
+
+                if (!$this->isDbDataUpToDate($moduleName, $resourceName)) {
+                    $errors[] = $this->getDbDataVersionError($moduleName, $resourceName);
+                }
+            }
+        }
+        return $errors;
+    }
+
+    /**
+     * Check if DB schema is up to date, return error data if it is not.
+     *
+     * @param string $moduleName
+     * @param string $resourceName
+     * @return [] Contains current and needed version strings
+     */
+    private function getDbSchemaVersionError($moduleName, $resourceName)
+    {
+
+        $dbVer = $this->moduleResource->getDbVersion($resourceName); // version saved in DB
+        $module = $this->moduleList->getModule($moduleName);
+        $configVer = $module['schema_version'];
+        $dbVer = $dbVer ?: 'none';
+        return [
+            self::ERROR_KEY_CURRENT => $dbVer,
+            self::ERROR_KEY_NEEDED => $configVer,
+            self::ERROR_KEY_MODULE => $moduleName,
+            self::ERROR_KEY_TYPE => 'schema'
+        ];
+    }
+
+    /**
+     * Get error data for an out-of-date schema or data.
+     *
+     * @param string $moduleName
+     * @param string $resourceName
+     * @return []
+     */
+    private function getDbDataVersionError($moduleName, $resourceName)
+    {
+        $dataVer = $this->moduleResource->getDataVersion($resourceName);
+        $module = $this->moduleList->getModule($moduleName);
+        $configVer = $module['schema_version']; //// IS this right?
+        $dataVer = $dataVer ?: 'none';
+        return [
+            self::ERROR_KEY_CURRENT => $dataVer,
+            self::ERROR_KEY_NEEDED => $configVer,
+            self::ERROR_KEY_MODULE => $moduleName,
+            self::ERROR_KEY_TYPE => 'data'
+        ];
+    }
+
+    /**
+     * Check if DB data is up to date
+     *
+     * @param string $moduleName
+     * @param string|bool $version
+     * @return bool
+     * @throws \UnexpectedValueException
+     */
+    private function isModuleVersionEqual($moduleName, $version)
+    {
+        $module = $this->moduleList->getModule($moduleName);
+        if (empty($module['schema_version'])) {
+            throw new \UnexpectedValueException("Schema version for module '$moduleName' is not specified");
+        }
+        $configVer = $module['schema_version'];
+
+        return ($version !== false
+            && version_compare($configVer, $version) === SetupInterface::VERSION_COMPARE_EQUAL);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Module/Manager.php b/lib/internal/Magento/Framework/Module/Manager.php
index 890078e63afca..3c203455f751f 100644
--- a/lib/internal/Magento/Framework/Module/Manager.php
+++ b/lib/internal/Magento/Framework/Module/Manager.php
@@ -103,72 +103,5 @@ protected function _isCustomOutputConfigEnabled($moduleName)
         return true;
     }
 
-    /**
-     * Check if DB schema is up to date, return error data if it is not.
-     *
-     * @param string $moduleName
-     * @param string $resourceName
-     * @return [] Contains current and needed version strings
-     */
-    public function getDbSchemaVersionError($moduleName, $resourceName)
-    {
-        $dbVer = $this->_moduleResource->getDbVersion($resourceName); // version saved in DB
-
-        $configVer = $this->verifyModuleVersion($moduleName, $dbVer);
-
-        if ($configVer === true) {
-            return [];
-        } else {
-            $dbVer = $dbVer ?: 'none';
-            return [DbStatusValidator::ERROR_KEY_CURRENT => $dbVer, DbStatusValidator::ERROR_KEY_NEEDED => $configVer];
-        }
-    }
-
-    /**
-     * Check if DB data is up to date, return error data if it is not.
-     *
-     * @param string $moduleName
-     * @param string $resourceName
-     * @return []
-     */
-    public function getDbDataVersionError($moduleName, $resourceName)
-    {
-        $dataVer = $this->_moduleResource->getDataVersion($resourceName);
-        $configVer = $this->verifyModuleVersion($moduleName, $dataVer);
-        if ($configVer === true) {
-            return [];
-        } else {
-            $dataVer = $dataVer ?: 'none';
-            return [
-                DbStatusValidator::ERROR_KEY_CURRENT => $dataVer,
-                DbStatusValidator::ERROR_KEY_NEEDED => $configVer
-            ];
-        }
-    }
-
-    /**
-     * Check if DB data is up to date
-     *
-     * @param string $moduleName
-     * @param string|bool $version
-     * @return true|string Returns true if up to date, string containing current version if it is not.
-     * @throws \UnexpectedValueException
-     */
-    private function verifyModuleVersion($moduleName, $version)
-    {
-        $module = $this->_moduleList->getModule($moduleName);
-        if (empty($module['schema_version'])) {
-            throw new \UnexpectedValueException("Schema version for module '$moduleName' is not specified");
-        }
-        $configVer = $module['schema_version'];
 
-        $compareResult = ($version !== false
-            && version_compare($configVer, $version) === SetupInterface::VERSION_COMPARE_EQUAL);
-
-        if ($compareResult) {
-            return true;
-        } else {
-            return $configVer;
-        }
-    }
 }
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index 5559eabd9c600..764ad1f31e600 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -10,54 +10,30 @@
 namespace Magento\Framework\Module\Plugin;
 
 use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Module\DbVersionDetector;
 
 class DbStatusValidator
 {
-    /**#@+
-     * Constants defined for keys of error array
-     */
-    const ERROR_KEY_MODULE = 'module';
-    const ERROR_KEY_TYPE = 'type';
-    const ERROR_KEY_CURRENT = 'current';
-    const ERROR_KEY_NEEDED = 'needed';
-    /**#@-*/
-
     /**
      * @var FrontendInterface
      */
     private $cache;
 
     /**
-     * @var \Magento\Framework\Module\ModuleListInterface
-     */
-    private $moduleList;
-
-    /**
-     * @var \Magento\Framework\Module\ResourceResolverInterface
-     */
-    private $resourceResolver;
-
-    /**
-     * @var \Magento\Framework\Module\Manager
+     * @var DbVersionDetector
      */
-    private $moduleManager;
+    private $dbVersionDetector;
 
     /**
      * @param FrontendInterface $cache
-     * @param \Magento\Framework\Module\ModuleListInterface $moduleList
-     * @param \Magento\Framework\Module\ResourceResolverInterface $resourceResolver
-     * @param \Magento\Framework\Module\Manager $moduleManager
+     * @param DbVersionDetector $dbVersionDetector
      */
     public function __construct(
         FrontendInterface $cache,
-        \Magento\Framework\Module\ModuleListInterface $moduleList,
-        \Magento\Framework\Module\ResourceResolverInterface $resourceResolver,
-        \Magento\Framework\Module\Manager $moduleManager
+        DbVersionDetector $dbVersionDetector
     ) {
         $this->cache = $cache;
-        $this->moduleList = $moduleList;
-        $this->resourceResolver = $resourceResolver;
-        $this->moduleManager = $moduleManager;
+        $this->dbVersionDetector = $dbVersionDetector;
     }
 
     /**
@@ -75,7 +51,7 @@ public function aroundDispatch(
         \Magento\Framework\App\RequestInterface $request
     ) {
         if (!$this->cache->load('db_is_up_to_date')) {
-            $errors  = $this->getOutOfDateDbErrors();
+            $errors = $this->dbVersionDetector->getDbVersionErrors();
             if ($errors) {
                 $formattedErrors = $this->formatErrors($errors);
                 throw new \Magento\Framework\Module\Exception(
@@ -100,40 +76,12 @@ private function formatErrors($errorsData)
     {
         $formattedErrors = [];
         foreach ($errorsData as $error) {
-            $formattedErrors[] = $error[self::ERROR_KEY_MODULE] . ' ' . $error[self::ERROR_KEY_TYPE] .
-                ': current version - ' . $error[self::ERROR_KEY_CURRENT ] .
-                ', latest version - ' . $error[self::ERROR_KEY_NEEDED];
+            $formattedErrors[] = $error[DbVersionDetector::ERROR_KEY_MODULE] .
+                ' ' . $error[DbVersionDetector::ERROR_KEY_TYPE] .
+                ': current version - ' . $error[DbVersionDetector::ERROR_KEY_CURRENT ] .
+                ', latest version - ' . $error[DbVersionDetector::ERROR_KEY_NEEDED];
         }
         return $formattedErrors;
     }
 
-    /**
-     * Get array of errors if DB is out of date, return [] if DB is current
-     *
-     * @return [] Array of errors, each error contains module name, current version, needed version,
-     *              and type (schema or data).  The array will be empty if all schema and data are current.
-     */
-    private function getOutOfDateDbErrors()
-    {
-        $errors = [];
-        foreach (array_keys($this->moduleList->getModules()) as $moduleName) {
-            foreach ($this->resourceResolver->getResourceList($moduleName) as $resourceName) {
-                $errorData = $this->moduleManager->getDbSchemaVersionError($moduleName, $resourceName);
-                if ($errorData) {
-                    $errors[] = array_merge(
-                        [self::ERROR_KEY_MODULE => $moduleName, '' . self::ERROR_KEY_TYPE . '' => 'schema'],
-                        $errorData
-                    );
-                }
-                $errorData = $this->moduleManager->getDbDataVersionError($moduleName, $resourceName);
-                if ($errorData) {
-                    $errors[] = array_merge(
-                        [self::ERROR_KEY_MODULE => $moduleName, self::ERROR_KEY_TYPE => 'data'],
-                        $errorData
-                    );
-                }
-            }
-        }
-        return $errors;
-    }
 }
diff --git a/lib/internal/Magento/Framework/Module/Updater.php b/lib/internal/Magento/Framework/Module/Updater.php
index ceb72a867ef6a..a49045dff9b2d 100644
--- a/lib/internal/Magento/Framework/Module/Updater.php
+++ b/lib/internal/Magento/Framework/Module/Updater.php
@@ -27,26 +27,26 @@ class Updater
     protected $_setupFactory;
 
     /**
-     * @var \Magento\Framework\Module\Manager
+     * @var DbVersionDetector
      */
-    private $_moduleManager;
+    private $_dbVersionDetector;
 
     /**
      * @param Updater\SetupFactory $setupFactory
      * @param ModuleListInterface $moduleList
      * @param ResourceResolverInterface $resourceResolver
-     * @param Manager $moduleManager
+     * @param DbVersionDetector $dbVersionDetector
      */
     public function __construct(
         Updater\SetupFactory $setupFactory,
         ModuleListInterface $moduleList,
         ResourceResolverInterface $resourceResolver,
-        \Magento\Framework\Module\Manager $moduleManager
+        DbVersionDetector $dbVersionDetector
     ) {
         $this->_moduleList = $moduleList;
         $this->_resourceResolver = $resourceResolver;
         $this->_setupFactory = $setupFactory;
-        $this->_moduleManager = $moduleManager;
+        $this->_dbVersionDetector = $dbVersionDetector;
     }
 
     /**
@@ -58,7 +58,7 @@ public function updateData()
     {
         foreach (array_keys($this->_moduleList->getModules()) as $moduleName) {
             foreach ($this->_resourceResolver->getResourceList($moduleName) as $resourceName) {
-                if ($this->_moduleManager->getDbDataVersionError($moduleName, $resourceName)) {
+                if (!$this->_dbVersionDetector->isDbDataUpToDate($moduleName, $resourceName)) {
                     $this->_setupFactory->create($resourceName, $moduleName)->applyDataUpdates();
                 }
             }

From 2a15ddb925379130cc4f5b2c0742fadbdaf59603 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Fri, 5 Dec 2014 16:04:34 -0600
Subject: [PATCH 142/474] MAGETWO-21308: [GITHUB] DDL cache should be tagged

- fixed error in @magentoCache "all" docblock annotation in integration tests
- reviewed occurrences where cache isolation was not necessary and removed them
- code style fixes
---
 .../Magento/TestFramework/Annotation/Cache.php       | 12 ++++++------
 .../Framework/Object/Copy/Config/ReaderTest.php      |  3 ---
 .../testsuite/Magento/Framework/TranslateTest.php    |  2 +-
 .../Magento/Logging/Model/Config/ReaderTest.php      |  3 ---
 .../Magento/Widget/Model/Config/DataTest.php         |  2 +-
 .../Magento/Widget/Model/Config/ReaderTest.php       |  3 ---
 lib/internal/Magento/Framework/App/Cache/State.php   |  6 +++++-
 7 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
index 022cecb35aa9c..481a4571c46bd 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
@@ -67,17 +67,18 @@ private function parseValues($annotations, \PHPUnit_Framework_TestCase $test)
         $result = [];
         $typeList = self::getTypeList();
         foreach ($annotations as $subject) {
-            if (!preg_match('/^([a-z_]+)\s([01])$/', $subject, $matches)) {
+            if (!preg_match('/^([a-z_]+)\s(enabled|disabled)$/', $subject, $matches)) {
                 self::fail("Invalid @magentoCache declaration: '{$subject}'", $test);
             }
-            list(, $requestedType, $requestedEnabled) = $matches;
+            list(, $requestedType, $isEnabled) = $matches;
+            $isEnabled = $isEnabled == 'enabled' ? 1 : 0;
             if ('all' === $requestedType) {
                 $result = [];
-                foreach ($typeList->getTypes() as $type => $row) {
-                    $result[$type] = $row['status'];
+                foreach ($typeList->getTypes() as $type) {
+                    $result[$type['id']] = $isEnabled;
                 }
             } else {
-                $result[$requestedType] = $requestedEnabled;
+                $result[$requestedType] = $isEnabled;
             }
         }
         return $result;
@@ -115,7 +116,6 @@ private function setValues($values, \PHPUnit_Framework_TestCase $test)
      */
     private static function getTypeList()
     {
-        /** @var \Magento\Framework\App\Cache\TypeListInterface $typeList */
         return Bootstrap::getInstance()->getObjectManager()->get('Magento\Framework\App\Cache\TypeListInterface');
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php
index 0d7420b8dc20f..427ce747755b4 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Object/Copy/Config/ReaderTest.php
@@ -11,9 +11,6 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 
-/**
- * @magentoCache all 0
- */
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
index 16679bf6764fe..4fa4cbebba3b3 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
@@ -10,7 +10,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * @magentoCache all 0
+ * @magentoCache all disabled
  */
 class TranslateTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php
index 50e6a61c8fbf5..47223a0ab869e 100644
--- a/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Logging/Model/Config/ReaderTest.php
@@ -9,9 +9,6 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 
-/**
- * @magentoCache all 0
- */
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
index 539cac857c809..958ea36e6b66d 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/DataTest.php
@@ -14,7 +14,7 @@
 class DataTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @magentoCache config 0
+     * @magentoCache config disabled
      */
     public function testGet()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
index 50c8e3e670ceb..d1c265a6f93e8 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
@@ -9,9 +9,6 @@
 
 use Magento\TestFramework\Helper\Bootstrap;
 
-/**
- * @magentoCache all 0
- */
 class ReaderTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/App/Cache/State.php b/lib/internal/Magento/Framework/App/Cache/State.php
index 182ee55d657bf..7f8034a16d6bf 100644
--- a/lib/internal/Magento/Framework/App/Cache/State.php
+++ b/lib/internal/Magento/Framework/App/Cache/State.php
@@ -42,14 +42,18 @@ class State implements StateInterface
     private $statuses;
 
     /**
+     * Whether all cache types are forced to be disabled
+     *
      * @var bool
      */
     private $banAll;
 
     /**
+     * Constructor
+     *
      * @param DeploymentConfig $config
      * @param Writer $writer
-     * @param bool $banAll Whether all cache types are forced to be disabled
+     * @param bool $banAll
      */
     public function __construct(DeploymentConfig $config, Writer $writer, $banAll = false)
     {

From 82f4b49e1617cb79a87c0d503584f9e0e17e2bdb Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 5 Dec 2014 17:15:06 -0600
Subject: [PATCH 143/474] MAGETWO-29035: Installation fails if cli php is
 different than apache configured

- handle exception when 'vendor' directory is absent
---
 index.php       |  4 ++--
 pub/index.php   |  4 ++--
 setup/index.php | 19 ++++++++++++++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index a778228199147..8ac47a43234cd 100644
--- a/index.php
+++ b/index.php
@@ -27,9 +27,9 @@
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
     <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
         <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
-        Whoops, it looks like Magento application dependencies are not installed.</h3>
+        Autoload error</h3>
     </div>
-    <p>Please run 'composer install' under application root directory.</p>
+    <p>{$e->getMessage()}</p>
 </div>
 HTML;
     exit(1);
diff --git a/pub/index.php b/pub/index.php
index 8211b7e672bd1..bb3026a2d90e3 100644
--- a/pub/index.php
+++ b/pub/index.php
@@ -18,9 +18,9 @@
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
     <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
         <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
-        Whoops, it looks like Magento application dependencies are not installed.</h3>
+        Autoload error</h3>
     </div>
-    <p>Please run 'composer install' under application root directory.</p>
+    <p>{$e->getMessage()}</p>
 </div>
 HTML;
     exit(1);
diff --git a/setup/index.php b/setup/index.php
index 48333866d4f6a..2278df1d4e4e7 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -6,5 +6,22 @@
  * @license   {license_link}
  */
 
-require __DIR__ . '/../app/bootstrap.php';
+try {
+    require __DIR__ . '/../app/bootstrap.php';
+} catch (\Exception $e) {
+    if (PHP_SAPI == 'cli') {
+        echo 'Autoload error: ' . $e->getMessage();
+    } else {
+        echo <<<HTML
+<div style="font:12px/1.35em arial, helvetica, sans-serif;">
+    <div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
+        <h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
+        Autoload error</h3>
+    </div>
+    <p>{$e->getMessage()}</p>
+</div>
+HTML;
+    }
+    exit(1);
+}
 \Zend\Mvc\Application::init(require __DIR__ . '/config/application.config.php')->run();

From bd059edcc24187603eaca7c44e9cdcf467bf4c22 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 5 Dec 2014 18:08:26 -0600
Subject: [PATCH 144/474] MAGETWO-29035: Installation fails if cli php is
 different than apache configured

- fixed integrity test
---
 .../static/testsuite/Magento/Test/Integrity/ComposerTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index c9f8e19980755..c60cb68da45df 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -309,7 +309,7 @@ private function assertRequireInSync(\StdClass $json)
         $name = $json->name;
         if (isset($json->require)) {
             $errors = [];
-            foreach (array_keys($json->require) as $depName) {
+            foreach (array_keys((array)$json->require) as $depName) {
                 if ($depName == 'magento/magento-composer-installer') {
                     // Magento Composer Installer is not needed for already existing components
                     continue;

From 4352d81a5afc5f1fbb148a2abe40946e1f8660f4 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Fri, 5 Dec 2014 18:18:11 -0600
Subject: [PATCH 145/474] MAGETWO-31432: Fatal error in version.php

- Changes based on CR feedback.
---
 dev/tools/Magento/Tools/Composer/version.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev/tools/Magento/Tools/Composer/version.php b/dev/tools/Magento/Tools/Composer/version.php
index 90334b01032b8..1c23ddc8482df 100644
--- a/dev/tools/Magento/Tools/Composer/version.php
+++ b/dev/tools/Magento/Tools/Composer/version.php
@@ -11,10 +11,6 @@
 namespace Magento\Tools\Composer\Package;
 
 require __DIR__ . '/../../../bootstrap.php';
-require __DIR__ . '/Package/Reader.php';
-require __DIR__ . '/Package/Package.php';
-require __DIR__ . '/Package/Collection.php';
-require __DIR__ . '/Package/Version.php';
 
 $usage = "Usage: php -f version.php -- --version=2.1.3 [--dependent=<exact|wildcard>] [--dir=/path/to/work/dir]
 --version - set the specified version value to all the components. Possible formats:

From 600e2f9308d80b366db0f90d543b1bbd5910d96a Mon Sep 17 00:00:00 2001
From: tpogrebniak <tpogrebniak@ebay.com>
Date: Mon, 8 Dec 2014 14:39:56 +0200
Subject: [PATCH 146/474] MAGETWO-21023: CLONE - CMS Hierarchy: validation
 actions (save, copy, delete) and control buttons for AdminGWS user

---
 .../Magento/AdminGws/Model/Containers.php     | 31 ++++++-
 .../Magento/AdminGws/Model/Controllers.php    | 31 +++++++
 .../AdminGws/etc/adminhtml/admingws.xml       |  4 +-
 .../Adminhtml/Cms/Hierarchy/Edit/Form.php     |  2 +-
 .../AdminGws/Model/ControllersTest.php        | 83 ++++++++++++++++++-
 5 files changed, 145 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/AdminGws/Model/Containers.php b/app/code/Magento/AdminGws/Model/Containers.php
index a9e04b3655bdf..c76b5017a690b 100644
--- a/app/code/Magento/AdminGws/Model/Containers.php
+++ b/app/code/Magento/AdminGws/Model/Containers.php
@@ -36,22 +36,30 @@ class Containers implements CallbackProcessorInterface
      */
     protected $categoryResource;
 
+    /**
+     * @var \Magento\Framework\StoreManagerInterface
+     */
+    protected  $storeManager;
+
     /**
      * @param Role $role
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Cms\Model\Resource\Page $cmsPageResource
      * @param \Magento\Catalog\Model\Resource\Category $categoryResource
+     * @param \Magento\Framework\StoreManagerInterface $storeManager
      */
     public function __construct(
         Role $role,
         \Magento\Framework\Registry $registry,
         \Magento\Cms\Model\Resource\Page $cmsPageResource,
-        \Magento\Catalog\Model\Resource\Category $categoryResource
+        \Magento\Catalog\Model\Resource\Category $categoryResource,
+        \Magento\Framework\StoreManagerInterface $storeManager
     ) {
         $this->_role = $role;
         $this->registry = $registry;
         $this->cmsPageResource = $cmsPageResource;
         $this->categoryResource = $categoryResource;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -370,8 +378,27 @@ public function removeRatingEditButtons(ContainerInterface $container)
      */
     public function removeCmsHierarchyFormButtons(ContainerInterface $container)
     {
+        $websiteId = null;
+        $storeId = null;
+
+        if ($container->getRequest()->getParam('website')) {
+            if ($website = $this->storeManager->getWebsite($container->getRequest()->getParam('website'))) {
+                $websiteId = $website->getId();
+            }
+        }
+        if ($container->getRequest()->getParam('store')) {
+            if ($store = $this->storeManager->getStore($container->getRequest()->getParam('store'))) {
+                $storeId = $store->getId();
+                $websiteId = $store->getWebsite()->getWebsiteId();
+            }
+        }
+
         if (!$this->_role->getIsAll()) {
-            $container->removeButton('save');
+            if (!$this->_role->hasExclusiveAccess(array($websiteId)) || is_null($websiteId)) {
+                if (!$this->_role->hasExclusiveStoreAccess(array($storeId)) || is_null($storeId)) {
+                    $container->removeButton('save');
+                }
+            }
         }
     }
 
diff --git a/app/code/Magento/AdminGws/Model/Controllers.php b/app/code/Magento/AdminGws/Model/Controllers.php
index 358e32f6693ef..429f806dcf496 100644
--- a/app/code/Magento/AdminGws/Model/Controllers.php
+++ b/app/code/Magento/AdminGws/Model/Controllers.php
@@ -1111,6 +1111,37 @@ public function blockIndexAction()
         return false;
     }
 
+    /**
+     * Validates hierarchy actions for all GWS limited users.
+     *
+     * @return bool
+     */
+    public function validateCmsHierarchyAction()
+    {
+        $websiteId = null;
+        $storeId = null;
+        if ($this->_request->getPost('website')) {
+            if ($website = $this->_storeManager->getWebsite($this->_request->getPost('website'))) {
+                $websiteId = $website->getId();
+            }
+        }
+        if ($this->_request->getPost('store')) {
+            if ($store = $this->_storeManager->getStore($this->_request->getPost('store'))) {
+                $storeId = $store->getId();
+                $websiteId = $store->getWebsite()->getWebsiteId();
+            }
+        }
+        if (!$this->_role->getIsAll()) {
+            if (!$this->_role->hasExclusiveAccess(array($websiteId)) || is_null($websiteId)) {
+                if (!$this->_role->hasExclusiveStoreAccess(array($storeId)) || is_null($storeId)) {
+                    $this->_forward();
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
     /**
      * Validate misc Manage Currency Rates requests
      *
diff --git a/app/code/Magento/AdminGws/etc/adminhtml/admingws.xml b/app/code/Magento/AdminGws/etc/adminhtml/admingws.xml
index 8a93e98e7a28e..b28005de4a0be 100644
--- a/app/code/Magento/AdminGws/etc/adminhtml/admingws.xml
+++ b/app/code/Magento/AdminGws/etc/adminhtml/admingws.xml
@@ -207,7 +207,9 @@
         <callback class="adminhtml__process__massReindex" method="blockIndexAction" />
         <callback class="adminhtml__process__reindexProcess" method="blockIndexAction" />
         <callback class="adminhtml__process__reindexAllAction" method="blockIndexAction" />
-        <callback class="adminhtml__cms_hierarchy__save" method="blockIndexAction" />
+        <callback class="adminhtml__cms_hierarchy__save" method="validateCmsHierarchyAction" />
+        <callback class="adminhtml__cms_hierarchy__delete" method="validateCmsHierarchyAction" />
+        <callback class="adminhtml__cms_hierarchy__copy" method="validateCmsHierarchyAction" />
         <callback class="adminhtml__customer_group__save" method="blockCustomerGroupSave" />
         <callback class="adminhtml__tax_rule__save" method="blockTaxChange" />
         <callback class="adminhtml__tax_rule__delete" method="blockTaxChange" />
diff --git a/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Hierarchy/Edit/Form.php b/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Hierarchy/Edit/Form.php
index e02eaf1d8bf4b..824cc0ddc4a41 100644
--- a/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Hierarchy/Edit/Form.php
+++ b/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Hierarchy/Edit/Form.php
@@ -686,7 +686,7 @@ protected function _getStore()
         if (!$store) {
             $store = $this->_storeManager->getDefaultStoreView();
             if (!$store) {
-                foreach ($this->getStores() as $store) {
+                foreach ($this->_storeManager->getStores() as $store) {
                     return $store;
                 }
             }
diff --git a/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php b/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php
index 16b3ec4da1eb4..54616c9e0a2dc 100644
--- a/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php
+++ b/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php
@@ -19,6 +19,11 @@ class ControllersTest extends \PHPUnit_Framework_TestCase
      */
     protected $_roleMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_storeManagerMock;
+
     /**
      * Controller request object
      *
@@ -41,7 +46,7 @@ protected function setUp()
         $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
         $this->_roleMock = $this->getMock('Magento\AdminGws\Model\Role', array(), array(), '', false);
         $this->_objectFactory = $this->getMock('Magento\Framework\ObjectManagerInterface');
-        $storeManager = $this->getMock('Magento\Store\Model\StoreManager', array(), array(), '', false);
+        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManager', array(), array(), '', false);
         $response = $this->getMock('Magento\Framework\App\ResponseInterface', array(), array(), '', false);
 
         $this->_controllerMock = $this->getMock('\Magento\Backend\App\Action', array(), array(), '', false);
@@ -56,7 +61,7 @@ protected function setUp()
                 'role' => $this->_roleMock,
                 'registry' => $coreRegistry,
                 'objectManager' => $this->_objectFactory,
-                'storeManager' => $storeManager,
+                'storeManager' => $this->_storeManagerMock,
                 'response' => $response,
                 'request' => $this->_ctrlRequestMock
             )
@@ -348,6 +353,80 @@ public function testValidateRuleEntityActionDenyActionIfRoleHasNoAccessToAssigne
         $this->assertEmpty($this->_model->validateRuleEntityAction());
     }
 
+    /**
+     * @param array $post
+     * @param boolean $result
+     * @param boolean $isAll
+     *
+     * @dataProvider validateCmsHierarchyActionDataProvider
+     */
+    public function testValidateCmsHierarchyAction(array $post, $isAll, $result)
+    {
+        $this->_ctrlRequestMock->expects($this->any())
+            ->method('getPost')
+            ->will($this->returnValue($post));
+        $this->_ctrlRequestMock->expects($this->any())
+            ->method('setActionName')
+            ->will($this->returnSelf());
+        $websiteId = (isset($post['website']))? $post['website'] : 1;
+        $websiteMock = $this->getMockBuilder('\Magento\Store\Model\Website')
+            ->disableOriginalConstructor()
+            ->setMethods(array('getId'))
+            ->getMock();
+        $websiteMock->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($websiteId));
+
+        $storeId = (isset($post['store']))? $post['store'] : 1;
+        $storeMock = $this->getMockBuilder('\Magento\Store\Model\Store')
+            ->disableOriginalConstructor()
+            ->setMethods(array('getId', 'getWebsite'))
+            ->getMock();
+        $storeMock->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($storeId));
+        $storeMock->expects($this->any())
+            ->method('getWebsite')
+            ->will($this->returnValue($websiteMock));
+
+        $this->_storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->will($this->returnValue($storeMock));
+
+        $hasExclusiveAccess = in_array($websiteMock->getId(), array(1));
+        $hasExclusiveStoreAccess = in_array($storeMock->getId(), array(2));
+
+        $this->_roleMock->expects($this->any())
+            ->method('hasExclusiveAccess')
+            ->will($this->returnValue($hasExclusiveAccess));
+
+        $this->_roleMock->expects($this->any())
+            ->method('hasExclusiveStoreAccess')
+            ->will($this->returnValue($hasExclusiveStoreAccess));
+
+        $this->_roleMock->expects($this->any())
+            ->method('getIsAll')
+            ->will($this->returnValue($isAll));
+
+        $this->assertEquals($result,$this->_model->validateCmsHierarchyAction());
+    }
+
+    /**
+     * Data provider for testValidateCmsHierarchyAction()
+     *
+     * @return array
+     */
+    public function validateCmsHierarchyActionDataProvider()
+    {
+        return array(
+            array(array(), true, true),
+            array(array(), false, false),
+            array(array('website'=>1, 'store'=>1), false, false),
+            array(array('store'=>2), false, true),
+            array(array('store'=>1), false, false),
+        );
+    }
+
     /*
      * Test validate rule entity action with valid params
      */

From 1f1f12c84bd052894d736547636bd4a60f13de8c Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@ebay.com>
Date: Mon, 8 Dec 2014 17:08:28 +0200
Subject: [PATCH 147/474] MAGETWO-31358: [TD] Tax Service coverage issues

---
 .../Model/Calculation/AbstractCalculator.php  |   2 +
 .../Model/Calculation/RateRepositoryTest.php  | 166 ++++++++++++++++++
 2 files changed, 168 insertions(+)

diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
index a76ab98f6ea3d..4b96f8736c915 100644
--- a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
@@ -164,6 +164,7 @@ public function __construct(
     /**
      * Set billing address
      *
+     * @codeCoverageIgnoreStart
      * @param CustomerAddress $billingAddress
      * @return void
      */
@@ -204,6 +205,7 @@ public function setCustomerId($customerId)
     {
         $this->customerId = $customerId;
     }
+    // @codeCoverageIgnoreEnd
 
     /**
      * Calculate tax details for quote item with given quantity
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
index 192073dca677d..3caf5ae9af67e 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
@@ -8,6 +8,8 @@
 namespace Magento\Tax\Model\Calculation;
 
 use Magento\TestFramework\Helper\ObjectManager;
+use Magento\Framework\Model\Exception as ModelException;
+use Magento\Framework\Api\SearchCriteria;
 
 class RateRepositoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -277,4 +279,168 @@ private function getTaxRateMock(array $taxRateData)
 
         return $taxRateMock;
     }
+
+    /**
+     * @param ModelException $expectedException
+     * @param string $exceptionType
+     * @param string $exceptionMessage
+     * @throws ModelException
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\InputException
+     * @dataProvider saveThrowsExceptionIfCannotSaveTitlesDataProvider
+     */
+    public function testSaveThrowsExceptionIfCannotSaveTitles($expectedException, $exceptionType, $exceptionMessage)
+    {
+        $countryCode = 'US';
+        $countryMock = $this->getMock('Magento\Directory\Model\Country', array(), array(), '', false);
+        $countryMock->expects($this->any())->method('getId')->will($this->returnValue(1));
+        $countryMock->expects($this->any())->method('loadByCode')->with($countryCode)->will($this->returnSelf());
+        $this->countryFactoryMock->expects($this->once())->method('create')->will($this->returnValue($countryMock));
+
+        $regionId = 2;
+        $regionMock = $this->getMock('Magento\Directory\Model\Region', array(), array(), '', false);
+        $regionMock->expects($this->any())->method('getId')->will($this->returnValue($regionId));
+        $regionMock->expects($this->any())->method('load')->with($regionId)->will($this->returnSelf());
+        $this->regionFactoryMock->expects($this->once())->method('create')->will($this->returnValue($regionMock));
+
+        $rateTitles = array(
+            'Label 1',
+            'Label 2',
+        );
+        $rateMock = $this->getTaxRateMock(array(
+            'id' => null,
+            'tax_country_id' => $countryCode,
+            'tax_region_id' => $regionId,
+            'region_name' => null,
+            'tax_postcode' => null,
+            'zip_is_range' => true,
+            'zip_from' => 90000,
+            'zip_to' => 90005,
+            'rate' => 7.5,
+            'code' => 'Tax Rate Code',
+            'titles' => $rateTitles,
+        ));
+        $this->rateConverterMock->expects($this->once())->method('createTitleArrayFromServiceObject')
+            ->with($rateMock)->will($this->returnValue($rateTitles));
+        $this->rateResourceMock->expects($this->once())->method('save')->with($rateMock);
+        $rateMock
+            ->expects($this->once())
+            ->method('saveTitles')
+            ->with($rateTitles)
+            ->willThrowException($expectedException);
+        $this->rateRegistryMock->expects($this->never())->method('registerTaxRate')->with($rateMock);
+        $this->setExpectedException($exceptionType, $exceptionMessage);
+        $this->model->save($rateMock);
+    }
+
+    public function saveThrowsExceptionIfCannotSaveTitlesDataProvider()
+    {
+        return [
+            'entity_already_exists' => [
+                new ModelException(
+                    'Cannot save titles',
+                    ModelException::ERROR_CODE_ENTITY_ALREADY_EXISTS
+                ),
+                'Magento\Framework\Exception\InputException',
+                'Cannot save titles'
+            ],
+            'cannot_save_title' => [
+                new ModelException(
+                    'Cannot save titles'
+                ),
+                'Magento\Framework\Model\Exception',
+                'Cannot save titles'
+            ]
+        ];
+    }
+
+    public function testGetListWhenFilterGroupExists()
+    {
+        $searchCriteriaMock = $this->getMock('Magento\Framework\Api\SearchCriteriaInterface');
+        $filterGroupMock = $this->getMock('Magento\Framework\Api\Search\FilterGroup', [], [], '', false);
+        $searchCriteriaMock
+            ->expects($this->any())
+            ->method('getFilterGroups')
+            ->will($this->returnValue([$filterGroupMock]));
+        $filterMock = $this->getMock('Magento\Framework\Api\Filter', [], [], '', false);
+        $filterGroupMock->expects($this->once())->method('getFilters')->willReturn([$filterMock]);
+        $filterMock->expects($this->exactly(2))->method('getConditionType')->willReturn('like');
+        $filterMock->expects($this->once())->method('getField')->willReturn('region_name');
+        $filterMock->expects($this->once())->method('getValue')->willReturn('condition_value');
+        $objectManager = new ObjectManager($this);
+        $rateMock = $this->getTaxRateMock(array());
+        $items = array($rateMock);
+        $collectionMock = $objectManager->getCollectionMock(
+            'Magento\Tax\Model\Resource\Calculation\Rate\Collection',
+            $items
+        );
+        $collectionMock
+            ->expects($this->once())
+            ->method('addFieldToFilter')
+            ->with(['region_table.code'], [['like' => 'condition_value']]);
+        $sortOrderMock = $this->getMock('Magento\Framework\Api\SortOrder', [], [], '', false);
+        $searchCriteriaMock
+            ->expects($this->any())
+            ->method('getSortOrders')
+            ->will($this->returnValue(array($sortOrderMock)));
+        $sortOrderMock->expects($this->once())->method('getField')->willReturn('field_name');
+        $sortOrderMock->expects($this->once())->method('getDirection')->willReturn(SearchCriteria::SORT_ASC);
+        $collectionMock->expects($this->once())->method('addOrder')->with('main_table.field_name', 'ASC');
+        $currentPage = 1;
+        $pageSize = 100;
+        $searchCriteriaMock->expects($this->any())->method('getCurrentPage')->will($this->returnValue($currentPage));
+        $searchCriteriaMock->expects($this->any())->method('getPageSize')->will($this->returnValue($pageSize));
+        $rateMock = $this->getTaxRateMock(array());
+
+
+        $collectionMock->expects($this->once())->method('joinRegionTable');
+        $collectionMock->expects($this->once())->method('setCurPage')->with($currentPage);
+        $collectionMock->expects($this->once())->method('setPageSize')->with($pageSize);
+        $collectionMock->expects($this->once())->method('getSize')->will($this->returnValue(count($items)));
+
+        $this->rateFactoryMock->expects($this->once())->method('create')->will($this->returnValue($rateMock));
+        $rateMock->expects($this->any())->method('getCollection')->will($this->returnValue($collectionMock));
+
+
+
+        $this->searchResultBuilder->expects($this->once())->method('setItems')->with($items)->willReturnSelf();
+        $this->searchResultBuilder->expects($this->once())->method('setTotalCount')->with(count($items))
+            ->willReturnSelf();
+        $this->searchResultBuilder->expects($this->once())->method('setSearchCriteria')->with($searchCriteriaMock)
+            ->willReturnSelf();
+        $this->searchResultBuilder->expects($this->once())->method('create');
+
+        $this->model->getList($searchCriteriaMock);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage One or more input exceptions have occurred.
+     */
+    public function testValidate()
+    {
+        $regionId = 2;
+        $rateTitles = array(
+            'Label 1',
+            'Label 2',
+        );
+        $regionMock = $this->getMock('Magento\Directory\Model\Region', array(), array(), '', false);
+        $regionMock->expects($this->any())->method('getId')->will($this->returnValue(''));
+        $regionMock->expects($this->any())->method('load')->with($regionId)->will($this->returnSelf());
+        $this->regionFactoryMock->expects($this->once())->method('create')->will($this->returnValue($regionMock));
+        $rateMock = $this->getTaxRateMock(array(
+            'id' => null,
+            'tax_country_id' => '',
+            'tax_region_id' => $regionId,
+            'region_name' => null,
+            'tax_postcode' => null,
+            'zip_is_range' => true,
+            'zip_from' => -90000,
+            'zip_to' => '',
+            'rate' => '',
+            'code' => '',
+            'titles' => $rateTitles,
+        ));
+        $this->model->save($rateMock);
+    }
 }

From 012695fef57aa97d24e86eaf9ec3203d87746e74 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Mon, 8 Dec 2014 17:22:37 +0200
Subject: [PATCH 148/474] MAGETWO-31337: Incorrect work of PayPal conflict
 resolution in backend

- js moved from php code to templates
---
 .../Block/System/Config/Form/Fieldset.php     |  29 +-
 .../System/Config/Fieldset/Expanded.php       |  31 +-
 .../Adminhtml/System/Config/Fieldset/Hint.php |  67 +---
 .../System/Config/Fieldset/Location.php       | 379 +-----------------
 .../layout/adminhtml_system_config_edit.xml   |   6 +-
 .../system/config/fieldset/hint.phtml         |  46 +++
 .../system/config/fieldset/location.phtml     | 364 +++++++++++++++++
 7 files changed, 442 insertions(+), 480 deletions(-)
 create mode 100644 app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml

diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Fieldset.php b/app/code/Magento/Backend/Block/System/Config/Form/Fieldset.php
index 1d79dc60ae0c5..42fbd9a9eaf39 100644
--- a/app/code/Magento/Backend/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Backend/Block/System/Config/Form/Fieldset.php
@@ -11,6 +11,8 @@
  */
 namespace Magento\Backend\Block\System\Config\Form;
 
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
 class Fieldset extends \Magento\Backend\Block\AbstractBlock implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
@@ -24,6 +26,13 @@ class Fieldset extends \Magento\Backend\Block\AbstractBlock implements
      */
     protected $_jsHelper;
 
+    /**
+     * Whether is collapsed by default
+     *
+     * @var bool
+     */
+    protected $isCollapsedDefault = false;
+
     /**
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Backend\Model\Auth\Session $authSession
@@ -44,7 +53,7 @@ public function __construct(
     /**
      * Render fieldset html
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
@@ -68,7 +77,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
     /**
      * Return header html for fieldset
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
     protected function _getHeaderHtml($element)
@@ -113,9 +122,8 @@ protected function _getHeaderHtml($element)
     /**
      * Get frontend class
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _getFrontendClass($element)
     {
@@ -127,7 +135,7 @@ protected function _getFrontendClass($element)
     /**
      * Return header title part of html for fieldset
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
     protected function _getHeaderTitleHtml($element)
@@ -147,7 +155,7 @@ protected function _getHeaderTitleHtml($element)
     /**
      * Return header comment part of html for fieldset
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
     protected function _getHeaderCommentHtml($element)
@@ -172,7 +180,7 @@ protected function _getFieldsetCss()
      * Return footer html for fieldset
      * Add extra tooltip comments to elements
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
     protected function _getFooterHtml($element)
@@ -202,7 +210,7 @@ protected function _getFooterHtml($element)
      * - observe fieldset rows;
      * - apply collapse;
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return string
      */
     protected function _getExtraJs($element)
@@ -215,7 +223,7 @@ protected function _getExtraJs($element)
     /**
      * Collapsed or expanded fieldset when page loaded?
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @param AbstractElement $element
      * @return bool
      */
     protected function _isCollapseState($element)
@@ -223,10 +231,11 @@ protected function _isCollapseState($element)
         if ($element->getExpanded()) {
             return true;
         }
+
         $extra = $this->_authSession->getUser()->getExtra();
         if (isset($extra['configState'][$element->getId()])) {
             return $extra['configState'][$element->getId()];
         }
-        return false;
+        return $this->isCollapsedDefault;
     }
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
index e0e41a53a2602..631666c214bf2 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
@@ -7,41 +7,16 @@
  */
 namespace Magento\Paypal\Block\Adminhtml\System\Config\Fieldset;
 
-use Magento\Framework\Data\Form\Element\AbstractElement;
-
 /**
  * Fieldset renderer which expanded by default
  */
 class Expanded extends \Magento\Backend\Block\System\Config\Form\Fieldset
 {
     /**
-     * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Backend\Model\Auth\Session $authSession
-     * @param \Magento\Framework\View\Helper\Js $jsHelper
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Backend\Block\Context $context,
-        \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\Framework\View\Helper\Js $jsHelper,
-        array $data = array()
-    ) {
-        parent::__construct($context, $authSession, $jsHelper, $data);
-    }
-
-    /**
-     * Return collapse state
+     * Whether is collapsed by default
      *
-     * @param AbstractElement $element
-     * @return string|true
+     * @var bool
      */
-    protected function _isCollapseState($element)
-    {
-        $extra = $this->_authSession->getUser()->getExtra();
-        if (isset($extra['configState'][$element->getId()])) {
-            return $extra['configState'][$element->getId()];
-        }
+    protected $isCollapsedDefault = true;
 
-        return true;
-    }
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
index 4c72bcbb69f10..5082d3ac04bc3 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
@@ -18,25 +18,6 @@ class Hint extends \Magento\Backend\Block\Template implements \Magento\Framework
      */
     protected $_template = 'Magento_Paypal::system/config/fieldset/hint.phtml';
 
-    /**
-     * @var \Magento\Framework\View\Helper\Js
-     */
-    protected $_jsHelper;
-
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Framework\View\Helper\Js $jsHelper
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Framework\View\Helper\Js $jsHelper,
-        array $data = array()
-    ) {
-        $this->_jsHelper = $jsHelper;
-        parent::__construct($context, $data);
-    }
-
     /**
      * Render fieldset html
      *
@@ -49,52 +30,6 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
         if (isset($elementOriginalData['help_link'])) {
             $this->setHelpLink($elementOriginalData['help_link']);
         }
-        $js = '
-            paypalToggleSolution = function(id, url) {
-                var doScroll = false;
-                Fieldset.toggleCollapse(id, url);
-                if ($(this).hasClassName("open")) {
-                    $$(".with-button button.button").each(function(anotherButton) {
-                        if (anotherButton != this && $(anotherButton).hasClassName("open")) {
-                            $(anotherButton).click();
-                            doScroll = true;
-                        }
-                    }.bind(this));
-                }
-                if (doScroll) {
-                    var pos = Element.cumulativeOffset($(this));
-                    window.scrollTo(pos[0], pos[1] - 45);
-                }
-            }
-
-            togglePaypalSolutionConfigureButton = function(button, enable) {
-                var $button = $(button);
-                $button.disabled = !enable;
-                if ($button.hasClassName("disabled") && enable) {
-                    $button.removeClassName("disabled");
-                } else if (!$button.hasClassName("disabled") && !enable) {
-                    $button.addClassName("disabled");
-                }
-            }
-
-            // check store-view disabling Express Checkout
-            document.observe("dom:loaded", function() {
-                $$(".pp-method-express button.button").each(function(ecButton){
-                    var ecEnabler = $$(".paypal-ec-enabler")[0];
-                    if (typeof ecButton == "undefined" || typeof ecEnabler != "undefined") {
-                        return;
-                    }
-                    var $ecButton = $(ecButton);
-                    $$(".with-button button.button").each(function(configureButton) {
-                        if (configureButton != ecButton && !configureButton.disabled
-                            && !$(configureButton).hasClassName("paypal-ec-separate")
-                        ) {
-                            togglePaypalSolutionConfigureButton(ecButton, false);
-                        }
-                    });
-                });
-            });
-        ';
-        return $this->toHtml() . $this->_jsHelper->getScript($js);
+        return $this->toHtml();
     }
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php
index c6ad3b477e6cd..dc4fd0de073aa 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php
@@ -13,383 +13,12 @@
  */
 namespace Magento\Paypal\Block\Adminhtml\System\Config\Fieldset;
 
-class Location extends \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded
+class Location extends \Magento\Backend\Block\System\Config\Form\Fieldset
 {
     /**
-     * Render fieldset html
+     * Whether is collapsed by default
      *
-     * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
-     * @return string
+     * @var bool
      */
-    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
-    {
-        $this->setElement($element);
-        $js = '
-            require(["jquery", "prototype"], function(jQuery){
-            jQuery("body").on("adminConfigDefined", function() {
-                $$(".with-button button.button").each(function(configureButton) {
-                    togglePaypalSolutionConfigureButton(configureButton, true);
-                });
-                var paypalConflictsObject = {
-                    "isConflict": false,
-                    "ecMissed": false,
-                    sharePayflowEnabling: function(enabler, isEvent) {
-
-                        var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
-                            isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
-                        var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
-                        if (typeof ecPayflowEnabler == "undefined") {
-                            return;
-                        }
-                        var ecPayflowScopeElement = adminSystemConfig.getScopeElement(ecPayflowEnabler);
-
-                        if (!enabler.enablerObject.ecPayflow) {
-                            if ((!ecPayflowScopeElement || !ecPayflowScopeElement.checked) && isEvent
-                                && enabler.value == 1
-                            ) {
-                                ecPayflowEnabler.value = 0;
-                                fireEvent(ecPayflowEnabler, "change");
-                            }
-                            return;
-                        }
-
-                        var enablerScopeElement = adminSystemConfig.getScopeElement(enabler);
-                        if (enablerScopeElement && ecPayflowScopeElement
-                            && enablerScopeElement.checked != ecPayflowScopeElement.checked
-                            && (isEvent || ecPayflowScopeElement.checked)
-                        ) {
-                            $(ecPayflowScopeElement).click();
-                        }
-
-                        var ecEnabler = $$(".paypal-ec-enabler")[0];
-                        if (ecPayflowEnabler.value != enabler.value
-                            && (isEvent || enabler.value == 1 && !isPayflowLinkEnabled)
-                        ) {
-                            ecPayflowEnabler.value = enabler.value;
-                            paypalConflictsObject.checklessEventAction(ecPayflowEnabler, true);
-                            if (ecPayflowEnabler.value == 1) {
-                                if (typeof ecEnabler != "undefined") {
-                                    var ecEnablerScopeElement = adminSystemConfig.getScopeElement(ecEnabler);
-                                    ecEnabler.value = 0;
-                                    if (ecEnablerScopeElement && ecEnablerScopeElement.checked) {
-                                        paypalConflictsObject.checklessEventAction(ecEnablerScopeElement, false);
-                                    }
-                                    paypalConflictsObject.checklessEventAction(ecEnabler, true);
-                                }
-                            }
-                        }
-                        if (!isEvent && ecPayflowEnabler.value == 1 && typeof ecEnabler != "undefined") {
-                            var ecSolution = $$(".pp-method-express")[0];
-                            if (typeof ecSolution != "undefined" && !$(ecSolution).hasClassName("enabled")) {
-                                ecSolution.addClassName("enabled");
-                            }
-                        }
-                    },
-                    onChangeEnabler: function(event) {
-                        paypalConflictsObject.checkPaymentConflicts($(Event.element(event)), "change");
-                    },
-                    onClickEnablerScope: function(event) {
-                        paypalConflictsObject.checkPaymentConflicts(
-                            $(adminSystemConfig.getUpTr($(Event.element(event))).select(".paypal-enabler")[0]),
-                            "click"
-                        );
-                    },
-                    getSharedElements: function(element) {
-                        var sharedElements = [];
-                        adminSystemConfig.mapClasses(element, true, function(elementClassName) {
-                            $$("." + elementClassName).each(function(sharedElement) {
-                                if (sharedElements.indexOf(sharedElement) == -1) {
-                                    sharedElements.push(sharedElement);
-                                }
-                            });
-                        });
-                        if (sharedElements.length == 0) {
-                            sharedElements.push(element);
-                        }
-                        return sharedElements;
-                    },
-                    checklessEventAction: function(element, isChange) {
-                        var action = isChange ? "change" : "click";
-                        var handler = isChange
-                            ? paypalConflictsObject.onChangeEnabler
-                            : paypalConflictsObject.onClickEnablerScope;
-                        paypalConflictsObject.getSharedElements(element).each(function(sharedElement) {
-                            Event.stopObserving(sharedElement, action, handler);
-                            if (isChange) {
-                                sharedElement.value = element.value;
-                                if ($(sharedElement).requiresObj) {
-                                    $(sharedElement).requiresObj.indicateEnabled();
-                                }
-                            }
-                        });
-                        if (isChange) {
-                            fireEvent(element, "change");
-                        } else {
-                            $(element).click();
-                        }
-                        paypalConflictsObject.getSharedElements(element).each(function(sharedElement) {
-                            Event.observe(sharedElement, action, handler);
-                        });
-                    },
-                    ecCheckAvailability: function() {
-                        $$(".pp-method-express button.button").each(function(ecButton){
-                            if (typeof ecButton == "undefined") {
-                                return;
-                            }
-                            var couldBeConfigured = true;
-                            $$(".paypal-enabler").each(function(enabler) {
-                                if (enabler.enablerObject.ecEnabler || enabler.enablerObject.ecConflicts
-                                    || enabler.enablerObject.ecSeparate
-                                ) {
-                                    return;
-                                }
-                                if (enabler.value == 1) {
-                                    couldBeConfigured = false;
-                                }
-                            });
-                            if (couldBeConfigured) {
-                                togglePaypalSolutionConfigureButton(ecButton, true);
-                            } else {
-                                togglePaypalSolutionConfigureButton(ecButton, false);
-                            }
-                        });
-                    },
-                    // type could be "initial", "change", "click"
-                    checkPaymentConflicts: function(enabler, type) {
-                        if (!enabler.enablerObject) {
-                            return;
-                        }
-                        var isEvent = (type != "initial");
-                        var ecEnabler = $$(".paypal-ec-enabler")[0];
-
-                        if (enabler.value == 0) {
-                            if (!enabler.enablerObject.ecIndependent && type == "change") {
-                                if (typeof ecEnabler != "undefined" && ecEnabler.value == 1) {
-                                    var ecEnablerScopeElement = adminSystemConfig.getScopeElement(ecEnabler);
-                                    if (!ecEnablerScopeElement || !ecEnablerScopeElement.checked) {
-                                        ecEnabler.value = 0;
-                                        paypalConflictsObject.checklessEventAction(ecEnabler, true);
-                                    }
-                                }
-                            }
-                            paypalConflictsObject.ecCheckAvailability();
-                            paypalConflictsObject.sharePayflowEnabling(enabler, isEvent);
-                            return;
-                        }
-
-                        var confirmationApproved = isEvent;
-                        var confirmationShowed = false;
-                        // check other solutions
-                        $$(".paypal-enabler").each(function(anotherEnabler) {
-                            var anotherEnablerScopeElement = adminSystemConfig.getScopeElement(anotherEnabler);
-                            if (!confirmationApproved && isEvent || $(anotherEnabler) == enabler
-                                || anotherEnabler.value == 0
-                                && (!anotherEnablerScopeElement || !anotherEnablerScopeElement.checked)
-                            ) {
-                                return;
-                            }
-                            var conflict = enabler.enablerObject.ecConflicts && anotherEnabler.enablerObject.ecEnabler
-                                || enabler.enablerObject.ecEnabler && anotherEnabler.enablerObject.ecConflicts
-                                || !enabler.enablerObject.ecIndependent && anotherEnabler.enablerObject.ecConflicts
-                                || !enabler.enablerObject.ecEnabler && !anotherEnabler.enablerObject.ecEnabler;
-
-                            if (conflict && !confirmationShowed && anotherEnabler.value == 1) {
-                                if (isEvent) {
-                                    confirmationApproved = confirm(\'' .
-            $this->escapeJsQuote(
-                __('There is already another PayPal solution enabled. Enable this solution instead?')
-            ) .
-            '\');
-                                } else {
-                                    paypalConflictsObject.isConflict = true;
-                                }
-                                confirmationShowed = true;
-                            }
-                            if (conflict && confirmationApproved) {
-                                anotherEnabler.value = 0;
-                                if (anotherEnablerScopeElement && anotherEnablerScopeElement.checked && isEvent) {
-                                    paypalConflictsObject.checklessEventAction(anotherEnablerScopeElement, false);
-                                }
-                                paypalConflictsObject.checklessEventAction(anotherEnabler, true);
-                            }
-                        });
-
-                        if (!enabler.enablerObject.ecIndependent) {
-                            if (!isEvent && (typeof ecEnabler == "undefined" || ecEnabler.value == 0)) {
-                                if (!enabler.enablerObject.ecPayflow) {
-                                    paypalConflictsObject.ecMissed = true;
-                                }
-                            } else if (isEvent && typeof ecEnabler != "undefined" && confirmationApproved) {
-                                var ecEnablerScopeElement = adminSystemConfig.getScopeElement(ecEnabler);
-                                if (ecEnablerScopeElement && ecEnablerScopeElement.checked) {
-                                    paypalConflictsObject.checklessEventAction(ecEnablerScopeElement, false);
-                                }
-                                if (ecEnabler.value == 0 && !enabler.enablerObject.ecPayflow) {
-                                    ecEnabler.value = 1;
-                                    paypalConflictsObject.checklessEventAction(ecEnabler, true);
-                                }
-                            }
-                        }
-
-                        if (!confirmationApproved && isEvent) {
-                            enabler.value = 0;
-                            paypalConflictsObject.checklessEventAction(enabler, true);
-                        }
-                        paypalConflictsObject.ecCheckAvailability();
-                        paypalConflictsObject.sharePayflowEnabling(enabler, isEvent);
-                    },
-                    handleBmlEnabler: function(event) {
-                        required = Event.element(event);
-                        var bml = $(required).bmlEnabler;
-                        if (required.value == "1") {
-                            bml.value = "1";
-                        }
-                        paypalConflictsObject.toggleBmlEnabler(required);
-                    },
-
-                    toggleBmlEnabler: function(required) {
-                        var bml = $(required).bmlEnabler;
-                        if (!bml) {
-                            return;
-                        }
-                        if (required.value != "1") {
-                            bml.value = "0";
-                            $(bml).disable();
-                        }
-                        $(bml).requiresObj.indicateEnabled();
-                    }
-                };
-
-                // fill enablers with conflict data
-                $$(".paypal-enabler").each(function(enablerElement) {
-                    var enablerObj = {
-                        ecIndependent: false,
-                        ecConflicts: false,
-                        ecEnabler: false,
-                        ecSeparate: false,
-                        ecPayflow: false
-                    };
-                    $(enablerElement).classNames().each(function(className) {
-                        switch (className) {
-                            case "paypal-ec-conflicts":
-                                enablerObj.ecConflicts = true;
-                            case "paypal-ec-independent":
-                                enablerObj.ecIndependent = true;
-                                break;
-                            case "paypal-ec-enabler":
-                                enablerObj.ecEnabler = true;
-                                enablerObj.ecIndependent = true;
-                                break;
-                            case "paypal-ec-separate":
-                                enablerObj.ecSeparate = true;
-                                enablerObj.ecIndependent = true;
-                                break;
-                            case "paypal-ec-pe":
-                                enablerObj.ecPayflow = true;
-                                break;
-                        }
-                    });
-                    enablerElement.enablerObject = enablerObj;
-
-                    Event.observe(enablerElement, "change", paypalConflictsObject.onChangeEnabler);
-                    var enablerScopeElement = adminSystemConfig.getScopeElement(enablerElement);
-                    if (enablerScopeElement) {
-                        Event.observe(enablerScopeElement, "click", paypalConflictsObject.onClickEnablerScope);
-                    }
-                });
-
-                // initially uncheck payflow
-                var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
-                    isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
-                var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
-                if (typeof ecPayflowEnabler != "undefined") {
-                    if (ecPayflowEnabler.value == 1 && !isPayflowLinkEnabled) {
-                        ecPayflowEnabler.value = 0;
-                        fireEvent(ecPayflowEnabler, "change");
-                    }
-
-                    var ecPayflowScopeElement = adminSystemConfig.getScopeElement(ecPayflowEnabler);
-                    if (ecPayflowScopeElement && !ecPayflowScopeElement.checked) {
-                        $(ecPayflowScopeElement).click();
-                    }
-                }
-                $$(".paypal-bml").each(function(bmlEnabler) {
-                    $(bmlEnabler).classNames().each(function(className) {
-                        if (className.indexOf("requires-") !== -1) {
-                            var required = $(className.replace("requires-", ""));
-                            required.bmlEnabler = bmlEnabler;
-                            Event.observe(required, "change", paypalConflictsObject.handleBmlEnabler);
-                        }
-                    });
-                });
-
-                $$(".paypal-enabler").each(function(enablerElement) {
-                    paypalConflictsObject.checkPaymentConflicts(enablerElement, "initial");
-                    paypalConflictsObject.toggleBmlEnabler(enablerElement);
-                });
-                if (paypalConflictsObject.isConflict || paypalConflictsObject.ecMissed) {
-                    var notification = \'' .
-            $this->escapeJsQuote(
-                __('The following error(s) occured:')
-            ) .
-            '\';
-                    if (paypalConflictsObject.isConflict) {
-                        notification += "\\n  " + \'' .
-            $this->escapeJsQuote(
-                __('Some PayPal solutions conflict.')
-            ) .
-            '\';
-                    }
-                    if (paypalConflictsObject.ecMissed) {
-                        notification += "\\n  " + \'' .
-            $this->escapeJsQuote(
-                __('PayPal Express Checkout is not enabled.')
-            ) . '\';
-                    }
-                    notification += "\\n" + \'' .
-                    $this->escapeJsQuote(
-                        __('Please re-enable the previously enabled payment solutions.')
-                    ) .
-            '\';
-                    setTimeout(function() {
-                        alert(notification);
-                    }, 1);
-                }
-
-                $$(".requires").each(function(dependent) {
-                    var $dependent = $(dependent);
-                    if ($dependent.hasClassName("paypal-ec-enabler") || $dependent.hasClassName("paypal-ec-payflow-enabler")) {
-                        $dependent.requiresObj.callback = function(required) {
-                            if ($(required).hasClassName("paypal-enabler") && required.value == 0) {
-                                $dependent.disable();
-                            }
-                        }
-                        $dependent.requiresObj.requires.each(function(required) {
-                            $dependent.requiresObj.callback(required);
-                        });
-                    }
-                });
-
-                configForm.on(\'afterValidate\', function() {
-                    var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
-                        isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
-                    var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
-                    if (typeof ecPayflowEnabler == "undefined") {
-                        return;
-                    }
-                    var ecPayflowScopeElement = adminSystemConfig.getScopeElement(ecPayflowEnabler);
-                    if ((typeof ecPayflowScopeElement == "undefined" || !ecPayflowScopeElement.checked)
-                        && ecPayflowEnabler.value == 1
-                    ) {
-                        $$(".paypal-ec-enabler").each(function(ecEnabler) {
-                            ecEnabler.value = 0;
-                        });
-                    }
-                });
-            });
-
-            });
-        ';
-        return parent::render($element) . $this->_jsHelper->getScript($js);
-    }
+    protected $isCollapsedDefault = true;
 }
diff --git a/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_system_config_edit.xml b/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_system_config_edit.xml
index 7cc81558db68f..967efc2989cf1 100644
--- a/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_system_config_edit.xml
+++ b/app/code/Magento/Paypal/view/adminhtml/layout/adminhtml_system_config_edit.xml
@@ -11,5 +11,9 @@
     <head>
         <css src="Magento_Paypal::styles.css"/>
     </head>
-    <body/>
+    <body>
+        <referenceContainer name="js">
+            <block class="Magento\Backend\Block\Template" template="Magento_Paypal::system/config/fieldset/location.phtml"/>
+        </referenceContainer>
+    </body>
 </page>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
index bfb076ab91b40..4ddf54e8453a9 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
@@ -20,3 +20,49 @@
 <?php
     endif;
 ?>
+<script type="text/javascript">
+    paypalToggleSolution = function(id, url) {
+        var doScroll = false;
+        Fieldset.toggleCollapse(id, url);
+        if ($(this).hasClassName("open")) {
+            $$(".with-button button.button").each(function(anotherButton) {
+                if (anotherButton != this && $(anotherButton).hasClassName("open")) {
+                    $(anotherButton).click();
+                    doScroll = true;
+                }
+            }.bind(this));
+        }
+        if (doScroll) {
+            var pos = Element.cumulativeOffset($(this));
+            window.scrollTo(pos[0], pos[1] - 45);
+        }
+    }
+
+    togglePaypalSolutionConfigureButton = function(button, enable) {
+        var $button = $(button);
+        $button.disabled = !enable;
+        if ($button.hasClassName("disabled") && enable) {
+            $button.removeClassName("disabled");
+        } else if (!$button.hasClassName("disabled") && !enable) {
+            $button.addClassName("disabled");
+        }
+    }
+
+    // check store-view disabling Express Checkout
+    document.observe("dom:loaded", function() {
+        $$(".pp-method-express button.button").each(function(ecButton){
+            var ecEnabler = $$(".paypal-ec-enabler")[0];
+            if (typeof ecButton == "undefined" || typeof ecEnabler != "undefined") {
+                return;
+            }
+            var $ecButton = $(ecButton);
+            $$(".with-button button.button").each(function(configureButton) {
+                if (configureButton != ecButton && !configureButton.disabled
+                    && !$(configureButton).hasClassName("paypal-ec-separate")
+                ) {
+                    togglePaypalSolutionConfigureButton(ecButton, false);
+                }
+            });
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
new file mode 100644
index 0000000000000..a64a319764054
--- /dev/null
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
@@ -0,0 +1,364 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+?>
+<?php
+/**
+ * @see \Magento\Paypal\Block\System\Config\Fieldset\Location
+ */
+?>
+<script type="text/javascript">
+require([
+    "jquery",
+    "prototype",
+    "mage/translate"
+], function(jQuery){
+    jQuery("body").on("adminConfigDefined", function() {
+        $$(".with-button button.button").each(function(configureButton) {
+            togglePaypalSolutionConfigureButton(configureButton, true);
+        });
+        var paypalConflictsObject = {
+            "isConflict": false,
+            "ecMissed": false,
+            sharePayflowEnabling: function(enabler, isEvent) {
+
+                var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
+                    isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
+                var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
+                if (typeof ecPayflowEnabler == "undefined") {
+                    return;
+                }
+                var ecPayflowScopeElement = adminSystemConfig.getScopeElement(ecPayflowEnabler);
+
+                if (!enabler.enablerObject.ecPayflow) {
+                    if ((!ecPayflowScopeElement || !ecPayflowScopeElement.checked) && isEvent
+                        && enabler.value == 1
+                    ) {
+                        ecPayflowEnabler.value = 0;
+                        fireEvent(ecPayflowEnabler, "change");
+                    }
+                    return;
+                }
+
+                var enablerScopeElement = adminSystemConfig.getScopeElement(enabler);
+                if (enablerScopeElement && ecPayflowScopeElement
+                    && enablerScopeElement.checked != ecPayflowScopeElement.checked
+                    && (isEvent || ecPayflowScopeElement.checked)
+                ) {
+                    $(ecPayflowScopeElement).click();
+                }
+
+                var ecEnabler = $$(".paypal-ec-enabler")[0];
+                if (ecPayflowEnabler.value != enabler.value
+                    && (isEvent || enabler.value == 1 && !isPayflowLinkEnabled)
+                ) {
+                    ecPayflowEnabler.value = enabler.value;
+                    paypalConflictsObject.checklessEventAction(ecPayflowEnabler, true);
+                    if (ecPayflowEnabler.value == 1) {
+                        if (typeof ecEnabler != "undefined") {
+                            var ecEnablerScopeElement = adminSystemConfig.getScopeElement(ecEnabler);
+                            ecEnabler.value = 0;
+                            if (ecEnablerScopeElement && ecEnablerScopeElement.checked) {
+                                paypalConflictsObject.checklessEventAction(ecEnablerScopeElement, false);
+                            }
+                            paypalConflictsObject.checklessEventAction(ecEnabler, true);
+                        }
+                    }
+                }
+                if (!isEvent && ecPayflowEnabler.value == 1 && typeof ecEnabler != "undefined") {
+                    var ecSolution = $$(".pp-method-express")[0];
+                    if (typeof ecSolution != "undefined" && !$(ecSolution).hasClassName("enabled")) {
+                        ecSolution.addClassName("enabled");
+                    }
+                }
+            },
+            onChangeEnabler: function(event) {
+                paypalConflictsObject.checkPaymentConflicts($(Event.element(event)), "change");
+            },
+            onClickEnablerScope: function(event) {
+                paypalConflictsObject.checkPaymentConflicts(
+                    $(adminSystemConfig.getUpTr($(Event.element(event))).select(".paypal-enabler")[0]),
+                    "click"
+                );
+            },
+            getSharedElements: function(element) {
+                var sharedElements = [];
+                adminSystemConfig.mapClasses(element, true, function(elementClassName) {
+                    $$("." + elementClassName).each(function(sharedElement) {
+                        if (sharedElements.indexOf(sharedElement) == -1) {
+                            sharedElements.push(sharedElement);
+                        }
+                    });
+                });
+                if (sharedElements.length == 0) {
+                    sharedElements.push(element);
+                }
+                return sharedElements;
+            },
+            checklessEventAction: function(element, isChange) {
+                var action = isChange ? "change" : "click";
+                var handler = isChange
+                    ? paypalConflictsObject.onChangeEnabler
+                    : paypalConflictsObject.onClickEnablerScope;
+                paypalConflictsObject.getSharedElements(element).each(function(sharedElement) {
+                    Event.stopObserving(sharedElement, action, handler);
+                    if (isChange) {
+                        sharedElement.value = element.value;
+                        if ($(sharedElement).requiresObj) {
+                            $(sharedElement).requiresObj.indicateEnabled();
+                        }
+                    }
+                });
+                if (isChange) {
+                    fireEvent(element, "change");
+                } else {
+                    $(element).click();
+                }
+                paypalConflictsObject.getSharedElements(element).each(function(sharedElement) {
+                    Event.observe(sharedElement, action, handler);
+                });
+            },
+            ecCheckAvailability: function() {
+                $$(".pp-method-express button.button").each(function(ecButton){
+                    if (typeof ecButton == "undefined") {
+                        return;
+                    }
+                    var couldBeConfigured = true;
+                    $$(".paypal-enabler").each(function(enabler) {
+                        if (enabler.enablerObject.ecEnabler || enabler.enablerObject.ecConflicts
+                            || enabler.enablerObject.ecSeparate
+                        ) {
+                            return;
+                        }
+                        if (enabler.value == 1) {
+                            couldBeConfigured = false;
+                        }
+                    });
+                    if (couldBeConfigured) {
+                        togglePaypalSolutionConfigureButton(ecButton, true);
+                    } else {
+                        togglePaypalSolutionConfigureButton(ecButton, false);
+                    }
+                });
+            },
+            // type could be "initial", "change", "click"
+            checkPaymentConflicts: function(enabler, type) {
+                if (!enabler.enablerObject) {
+                    return;
+                }
+                var isEvent = (type != "initial");
+                var ecEnabler = $$(".paypal-ec-enabler")[0];
+
+                if (enabler.value == 0) {
+                    if (!enabler.enablerObject.ecIndependent && type == "change") {
+                        if (typeof ecEnabler != "undefined" && ecEnabler.value == 1) {
+                            var ecEnablerScopeElement = adminSystemConfig.getScopeElement(ecEnabler);
+                            if (!ecEnablerScopeElement || !ecEnablerScopeElement.checked) {
+                                ecEnabler.value = 0;
+                                paypalConflictsObject.checklessEventAction(ecEnabler, true);
+                            }
+                        }
+                    }
+                    paypalConflictsObject.ecCheckAvailability();
+                    paypalConflictsObject.sharePayflowEnabling(enabler, isEvent);
+                    return;
+                }
+
+                var confirmationApproved = isEvent;
+                var confirmationShowed = false;
+                // check other solutions
+                $$(".paypal-enabler").each(function(anotherEnabler) {
+                    var anotherEnablerScopeElement = adminSystemConfig.getScopeElement(anotherEnabler);
+                    if (!confirmationApproved && isEvent || $(anotherEnabler) == enabler
+                        || anotherEnabler.value == 0
+                        && (!anotherEnablerScopeElement || !anotherEnablerScopeElement.checked)
+                    ) {
+                        return;
+                    }
+                    var conflict = enabler.enablerObject.ecConflicts && anotherEnabler.enablerObject.ecEnabler
+                        || enabler.enablerObject.ecEnabler && anotherEnabler.enablerObject.ecConflicts
+                        || !enabler.enablerObject.ecIndependent && anotherEnabler.enablerObject.ecConflicts
+                        || !enabler.enablerObject.ecEnabler && !anotherEnabler.enablerObject.ecEnabler;
+
+                    if (conflict && !confirmationShowed && anotherEnabler.value == 1) {
+                        if (isEvent) {
+                            confirmationApproved = confirm(
+                                $.mage.__('There is already another PayPal solution enabled. Enable this solution instead?')
+                            );
+                        } else {
+                            paypalConflictsObject.isConflict = true;
+                        }
+                        confirmationShowed = true;
+                    }
+                    if (conflict && confirmationApproved) {
+                        anotherEnabler.value = 0;
+                        if (anotherEnablerScopeElement && anotherEnablerScopeElement.checked && isEvent) {
+                            paypalConflictsObject.checklessEventAction(anotherEnablerScopeElement, false);
+                        }
+                        paypalConflictsObject.checklessEventAction(anotherEnabler, true);
+                    }
+                });
+
+                if (!enabler.enablerObject.ecIndependent) {
+                    if (!isEvent && (typeof ecEnabler == "undefined" || ecEnabler.value == 0)) {
+                        if (!enabler.enablerObject.ecPayflow) {
+                            paypalConflictsObject.ecMissed = true;
+                        }
+                    } else if (isEvent && typeof ecEnabler != "undefined" && confirmationApproved) {
+                        var ecEnablerScopeElement = adminSystemConfig.getScopeElement(ecEnabler);
+                        if (ecEnablerScopeElement && ecEnablerScopeElement.checked) {
+                            paypalConflictsObject.checklessEventAction(ecEnablerScopeElement, false);
+                        }
+                        if (ecEnabler.value == 0 && !enabler.enablerObject.ecPayflow) {
+                            ecEnabler.value = 1;
+                            paypalConflictsObject.checklessEventAction(ecEnabler, true);
+                        }
+                    }
+                }
+
+                if (!confirmationApproved && isEvent) {
+                    enabler.value = 0;
+                    paypalConflictsObject.checklessEventAction(enabler, true);
+                }
+                paypalConflictsObject.ecCheckAvailability();
+                paypalConflictsObject.sharePayflowEnabling(enabler, isEvent);
+            },
+            handleBmlEnabler: function(event) {
+                required = Event.element(event);
+                var bml = $(required).bmlEnabler;
+                if (required.value == "1") {
+                    bml.value = "1";
+                }
+                paypalConflictsObject.toggleBmlEnabler(required);
+            },
+
+            toggleBmlEnabler: function(required) {
+                var bml = $(required).bmlEnabler;
+                if (!bml) {
+                    return;
+                }
+                if (required.value != "1") {
+                    bml.value = "0";
+                    $(bml).disable();
+                }
+                $(bml).requiresObj.indicateEnabled();
+            }
+        };
+
+        // fill enablers with conflict data
+        $$(".paypal-enabler").each(function(enablerElement) {
+            var enablerObj = {
+                ecIndependent: false,
+                ecConflicts: false,
+                ecEnabler: false,
+                ecSeparate: false,
+                ecPayflow: false
+            };
+            $(enablerElement).classNames().each(function(className) {
+                switch (className) {
+                    case "paypal-ec-conflicts":
+                        enablerObj.ecConflicts = true;
+                    case "paypal-ec-independent":
+                        enablerObj.ecIndependent = true;
+                        break;
+                    case "paypal-ec-enabler":
+                        enablerObj.ecEnabler = true;
+                        enablerObj.ecIndependent = true;
+                        break;
+                    case "paypal-ec-separate":
+                        enablerObj.ecSeparate = true;
+                        enablerObj.ecIndependent = true;
+                        break;
+                    case "paypal-ec-pe":
+                        enablerObj.ecPayflow = true;
+                        break;
+                }
+            });
+            enablerElement.enablerObject = enablerObj;
+
+            Event.observe(enablerElement, "change", paypalConflictsObject.onChangeEnabler);
+            var enablerScopeElement = adminSystemConfig.getScopeElement(enablerElement);
+            if (enablerScopeElement) {
+                Event.observe(enablerScopeElement, "click", paypalConflictsObject.onClickEnablerScope);
+            }
+        });
+
+        // initially uncheck payflow
+        var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
+            isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
+        var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
+        if (typeof ecPayflowEnabler != "undefined") {
+            if (ecPayflowEnabler.value == 1 && !isPayflowLinkEnabled) {
+                ecPayflowEnabler.value = 0;
+                fireEvent(ecPayflowEnabler, "change");
+            }
+
+            var ecPayflowScopeElement = adminSystemConfig.getScopeElement(ecPayflowEnabler);
+            if (ecPayflowScopeElement && !ecPayflowScopeElement.checked) {
+                $(ecPayflowScopeElement).click();
+            }
+        }
+        $$(".paypal-bml").each(function(bmlEnabler) {
+            $(bmlEnabler).classNames().each(function(className) {
+                if (className.indexOf("requires-") !== -1) {
+                    var required = $(className.replace("requires-", ""));
+                    required.bmlEnabler = bmlEnabler;
+                    Event.observe(required, "change", paypalConflictsObject.handleBmlEnabler);
+                }
+            });
+        });
+
+        $$(".paypal-enabler").each(function(enablerElement) {
+            paypalConflictsObject.checkPaymentConflicts(enablerElement, "initial");
+            paypalConflictsObject.toggleBmlEnabler(enablerElement);
+        });
+        if (paypalConflictsObject.isConflict || paypalConflictsObject.ecMissed) {
+            var notification = $.mage.__('The following error(s) occured:');
+            if (paypalConflictsObject.isConflict) {
+                notification += "\\n  " + $.mage.__('Some PayPal solutions conflict.');
+            }
+            if (paypalConflictsObject.ecMissed) {
+                notification += "\\n  " + $.mage.__('PayPal Express Checkout is not enabled.');
+            }
+            notification += "\\n" + $.mage.__('Please re-enable the previously enabled payment solutions.');
+            setTimeout(function() {
+                alert(notification);
+            }, 1);
+        }
+
+        $$(".requires").each(function(dependent) {
+            var $dependent = $(dependent);
+            if ($dependent.hasClassName("paypal-ec-enabler") || $dependent.hasClassName("paypal-ec-payflow-enabler")) {
+                $dependent.requiresObj.callback = function(required) {
+                    if ($(required).hasClassName("paypal-enabler") && required.value == 0) {
+                        $dependent.disable();
+                    }
+                }
+                $dependent.requiresObj.requires.each(function(required) {
+                    $dependent.requiresObj.callback(required);
+                });
+            }
+        });
+
+        configForm.on(\'afterValidate\', function() {
+        var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
+            isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
+        var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
+        if (typeof ecPayflowEnabler == "undefined") {
+            return;
+        }
+        var ecPayflowScopeElement = adminSystemConfig.getScopeElement(ecPayflowEnabler);
+        if ((typeof ecPayflowScopeElement == "undefined" || !ecPayflowScopeElement.checked)
+            && ecPayflowEnabler.value == 1
+        ) {
+            $$(".paypal-ec-enabler").each(function(ecEnabler) {
+                ecEnabler.value = 0;
+            });
+        }
+    });
+});
+</script>
\ No newline at end of file

From 343c4bbce8b077457175030a83fbba5a506e3363 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Mon, 8 Dec 2014 18:00:59 +0200
Subject: [PATCH 149/474] MAGETWO-31337: Incorrect work of PayPal conflict
 resolution in backend

- removed unusued code
---
 .../System/Config/Fieldset/Expanded.php       |  1 -
 .../System/Config/Fieldset/Location.php       | 24 -----
 .../Magento/Paypal/etc/adminhtml/system.xml   |  2 +-
 .../system/config/fieldset/location.phtml     | 88 ++++++++++---------
 4 files changed, 46 insertions(+), 69 deletions(-)
 delete mode 100644 app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php

diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
index 631666c214bf2..13c9736142730 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
@@ -18,5 +18,4 @@ class Expanded extends \Magento\Backend\Block\System\Config\Form\Fieldset
      * @var bool
      */
     protected $isCollapsedDefault = true;
-
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php
deleted file mode 100644
index dc4fd0de073aa..0000000000000
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Location.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/**
- * Fieldset renderer for PayPal Merchant Location fieldset
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Paypal\Block\Adminhtml\System\Config\Fieldset;
-
-class Location extends \Magento\Backend\Block\System\Config\Form\Fieldset
-{
-    /**
-     * Whether is collapsed by default
-     *
-     * @var bool
-     */
-    protected $isCollapsedDefault = true;
-}
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
index 96f6a79d48201..927bd9e5b3585 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -16,7 +16,7 @@
             </group>
             <group id="account" translate="label" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Merchant Location</label>
-                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Location</frontend_model>
+                <frontend_model>Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded</frontend_model>
                 <field id="merchant_country" type="select" translate="label comment" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Merchant Country</label>
                     <comment>If not specified, Default Country from General Config will be used</comment>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
index a64a319764054..ad18f6d2ef454 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
@@ -16,15 +16,15 @@ require([
     "jquery",
     "prototype",
     "mage/translate"
-], function(jQuery){
-    jQuery("body").on("adminConfigDefined", function() {
-        $$(".with-button button.button").each(function(configureButton) {
+], function(jQuery) {
+    jQuery("body").on("adminConfigDefined", function () {
+        $$(".with-button button.button").each(function (configureButton) {
             togglePaypalSolutionConfigureButton(configureButton, true);
         });
         var paypalConflictsObject = {
             "isConflict": false,
             "ecMissed": false,
-            sharePayflowEnabling: function(enabler, isEvent) {
+            sharePayflowEnabling: function (enabler, isEvent) {
 
                 var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
                     isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
@@ -76,19 +76,19 @@ require([
                     }
                 }
             },
-            onChangeEnabler: function(event) {
+            onChangeEnabler: function (event) {
                 paypalConflictsObject.checkPaymentConflicts($(Event.element(event)), "change");
             },
-            onClickEnablerScope: function(event) {
+            onClickEnablerScope: function (event) {
                 paypalConflictsObject.checkPaymentConflicts(
                     $(adminSystemConfig.getUpTr($(Event.element(event))).select(".paypal-enabler")[0]),
                     "click"
                 );
             },
-            getSharedElements: function(element) {
+            getSharedElements: function (element) {
                 var sharedElements = [];
-                adminSystemConfig.mapClasses(element, true, function(elementClassName) {
-                    $$("." + elementClassName).each(function(sharedElement) {
+                adminSystemConfig.mapClasses(element, true, function (elementClassName) {
+                    $$("." + elementClassName).each(function (sharedElement) {
                         if (sharedElements.indexOf(sharedElement) == -1) {
                             sharedElements.push(sharedElement);
                         }
@@ -99,12 +99,12 @@ require([
                 }
                 return sharedElements;
             },
-            checklessEventAction: function(element, isChange) {
+            checklessEventAction: function (element, isChange) {
                 var action = isChange ? "change" : "click";
                 var handler = isChange
                     ? paypalConflictsObject.onChangeEnabler
                     : paypalConflictsObject.onClickEnablerScope;
-                paypalConflictsObject.getSharedElements(element).each(function(sharedElement) {
+                paypalConflictsObject.getSharedElements(element).each(function (sharedElement) {
                     Event.stopObserving(sharedElement, action, handler);
                     if (isChange) {
                         sharedElement.value = element.value;
@@ -118,17 +118,17 @@ require([
                 } else {
                     $(element).click();
                 }
-                paypalConflictsObject.getSharedElements(element).each(function(sharedElement) {
+                paypalConflictsObject.getSharedElements(element).each(function (sharedElement) {
                     Event.observe(sharedElement, action, handler);
                 });
             },
-            ecCheckAvailability: function() {
-                $$(".pp-method-express button.button").each(function(ecButton){
+            ecCheckAvailability: function () {
+                $$(".pp-method-express button.button").each(function (ecButton) {
                     if (typeof ecButton == "undefined") {
                         return;
                     }
                     var couldBeConfigured = true;
-                    $$(".paypal-enabler").each(function(enabler) {
+                    $$(".paypal-enabler").each(function (enabler) {
                         if (enabler.enablerObject.ecEnabler || enabler.enablerObject.ecConflicts
                             || enabler.enablerObject.ecSeparate
                         ) {
@@ -146,7 +146,7 @@ require([
                 });
             },
             // type could be "initial", "change", "click"
-            checkPaymentConflicts: function(enabler, type) {
+            checkPaymentConflicts: function (enabler, type) {
                 if (!enabler.enablerObject) {
                     return;
                 }
@@ -171,7 +171,7 @@ require([
                 var confirmationApproved = isEvent;
                 var confirmationShowed = false;
                 // check other solutions
-                $$(".paypal-enabler").each(function(anotherEnabler) {
+                $$(".paypal-enabler").each(function (anotherEnabler) {
                     var anotherEnablerScopeElement = adminSystemConfig.getScopeElement(anotherEnabler);
                     if (!confirmationApproved && isEvent || $(anotherEnabler) == enabler
                         || anotherEnabler.value == 0
@@ -227,7 +227,7 @@ require([
                 paypalConflictsObject.ecCheckAvailability();
                 paypalConflictsObject.sharePayflowEnabling(enabler, isEvent);
             },
-            handleBmlEnabler: function(event) {
+            handleBmlEnabler: function (event) {
                 required = Event.element(event);
                 var bml = $(required).bmlEnabler;
                 if (required.value == "1") {
@@ -236,7 +236,7 @@ require([
                 paypalConflictsObject.toggleBmlEnabler(required);
             },
 
-            toggleBmlEnabler: function(required) {
+            toggleBmlEnabler: function (required) {
                 var bml = $(required).bmlEnabler;
                 if (!bml) {
                     return;
@@ -250,7 +250,7 @@ require([
         };
 
         // fill enablers with conflict data
-        $$(".paypal-enabler").each(function(enablerElement) {
+        $$(".paypal-enabler").each(function (enablerElement) {
             var enablerObj = {
                 ecIndependent: false,
                 ecConflicts: false,
@@ -258,7 +258,7 @@ require([
                 ecSeparate: false,
                 ecPayflow: false
             };
-            $(enablerElement).classNames().each(function(className) {
+            $(enablerElement).classNames().each(function (className) {
                 switch (className) {
                     case "paypal-ec-conflicts":
                         enablerObj.ecConflicts = true;
@@ -302,8 +302,8 @@ require([
                 $(ecPayflowScopeElement).click();
             }
         }
-        $$(".paypal-bml").each(function(bmlEnabler) {
-            $(bmlEnabler).classNames().each(function(className) {
+        $$(".paypal-bml").each(function (bmlEnabler) {
+            $(bmlEnabler).classNames().each(function (className) {
                 if (className.indexOf("requires-") !== -1) {
                     var required = $(className.replace("requires-", ""));
                     required.bmlEnabler = bmlEnabler;
@@ -312,7 +312,7 @@ require([
             });
         });
 
-        $$(".paypal-enabler").each(function(enablerElement) {
+        $$(".paypal-enabler").each(function (enablerElement) {
             paypalConflictsObject.checkPaymentConflicts(enablerElement, "initial");
             paypalConflictsObject.toggleBmlEnabler(enablerElement);
         });
@@ -325,40 +325,42 @@ require([
                 notification += "\\n  " + $.mage.__('PayPal Express Checkout is not enabled.');
             }
             notification += "\\n" + $.mage.__('Please re-enable the previously enabled payment solutions.');
-            setTimeout(function() {
+            setTimeout(function () {
                 alert(notification);
             }, 1);
         }
 
-        $$(".requires").each(function(dependent) {
+        $$(".requires").each(function (dependent) {
             var $dependent = $(dependent);
             if ($dependent.hasClassName("paypal-ec-enabler") || $dependent.hasClassName("paypal-ec-payflow-enabler")) {
-                $dependent.requiresObj.callback = function(required) {
+                $dependent.requiresObj.callback = function (required) {
                     if ($(required).hasClassName("paypal-enabler") && required.value == 0) {
                         $dependent.disable();
                     }
                 }
-                $dependent.requiresObj.requires.each(function(required) {
+                $dependent.requiresObj.requires.each(function (required) {
                     $dependent.requiresObj.callback(required);
                 });
             }
         });
 
-        configForm.on(\'afterValidate\', function() {
-        var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
-            isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
-        var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
-        if (typeof ecPayflowEnabler == "undefined") {
-            return;
-        }
-        var ecPayflowScopeElement = adminSystemConfig.getScopeElement(ecPayflowEnabler);
-        if ((typeof ecPayflowScopeElement == "undefined" || !ecPayflowScopeElement.checked)
-            && ecPayflowEnabler.value == 1
-        ) {
-            $$(".paypal-ec-enabler").each(function(ecEnabler) {
-                ecEnabler.value = 0;
-            });
-        }
+        configForm.on('afterValidate', function () {
+            var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
+                isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
+            var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
+            if (typeof ecPayflowEnabler == "undefined") {
+                return;
+            }
+            var ecPayflowScopeElement = adminSystemConfig.getScopeElement(ecPayflowEnabler);
+            if ((typeof ecPayflowScopeElement == "undefined" || !ecPayflowScopeElement.checked)
+                && ecPayflowEnabler.value == 1
+            ) {
+                $$(".paypal-ec-enabler").each(function (ecEnabler) {
+                    ecEnabler.value = 0;
+                });
+            }
+        });
     });
 });
+
 </script>
\ No newline at end of file

From 528b1642a194298f8f865843665368390fd12546 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Mon, 8 Dec 2014 18:37:26 +0200
Subject: [PATCH 150/474] MAGETWO-15426: 'Privacy Policy' link is missing

---
 .../cms_setup/data-upgrade-1.6.0.0-1.6.0.1.php   | 14 --------------
 .../Magento/Cms/view/frontend/layout/default.xml | 16 +++++++++-------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.0-1.6.0.1.php b/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.0-1.6.0.1.php
index 20ea2a34a7cea..e1f0a5e653ed8 100644
--- a/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.0-1.6.0.1.php
+++ b/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.0-1.6.0.1.php
@@ -229,17 +229,3 @@
 );
 
 $this->createPage()->setData($privacyPageData)->save();
-
-$footerLinksBlock = $this->createPage()->load('footer_links', 'identifier');
-
-if ($footerLinksBlock->getId()) {
-    $content = $footerLinksBlock->getContent();
-    if (preg_match('/<ul>(.*?)<\\/ul>/ims', $content, $matches)) {
-        $content = preg_replace('/<li class="last">/ims', '<li>', $content);
-        $replacment = '<li class="last privacy">' .
-            "<a href=\"{{store direct_url=\"privacy-policy-cookie-restriction-mode\"}}\">" .
-            "Privacy and Cookie Policy</a></li>\r\n</ul>";
-        $content = preg_replace('/<\\/ul>/ims', $replacment, $content);
-        $footerLinksBlock->setContent($content)->save();
-    }
-}
diff --git a/app/code/Magento/Cms/view/frontend/layout/default.xml b/app/code/Magento/Cms/view/frontend/layout/default.xml
index 9ff02c43a84a5..e616b3dc380ef 100644
--- a/app/code/Magento/Cms/view/frontend/layout/default.xml
+++ b/app/code/Magento/Cms/view/frontend/layout/default.xml
@@ -10,13 +10,15 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="footer">
-            <container name="cms_footer_links_container" label="CMS Footer Links" htmlTag="div" htmlClass="links" before="footer_links">
-                <block class="Magento\Cms\Block\Block" name="cms_footer_links">
-                    <arguments>
-                        <argument name="block_id" xsi:type="string">footer_links</argument>
-                    </arguments>
-                </block>
-            </container>
+            <container name="cms_footer_links_container" label="CMS Footer Links" htmlTag="div" htmlClass="links" before="footer_links" />
         </referenceContainer>
+        <referenceBlock name="footer_links">
+            <block class="Magento\Framework\View\Element\Html\Link\Current" name="privacy-policy-link">
+                <arguments>
+                    <argument name="label" xsi:type="string">Privacy and Cookie Policy</argument>
+                    <argument name="path" xsi:type="string">privacy-policy-cookie-restriction-mode</argument>
+                </arguments>
+            </block>
+        </referenceBlock>
     </body>
 </page>

From 38606a56378ad2dccb8ddb7df7163d79404be460 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com>
Date: Mon, 8 Dec 2014 18:56:26 +0200
Subject: [PATCH 151/474] MAGETWO-31358: [TD] Tax Service coverage issues

---
 .../Tax/Model/TaxRateCollectionTest.php       | 104 ++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php

diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
new file mode 100644
index 0000000000000..408a5e38666e3
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Tax\Model;
+
+class TaxRateCollectionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Tax\Model\TaxRateCollection
+     */
+    protected $model;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $taxRateRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $rateConverterMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchCriteriaBuilderMock;
+
+    protected function setUp()
+    {
+        $entityFactoryMock = $this->getMock('\Magento\Core\Model\EntityFactory', [], [], '', false);
+        $filterBuilderMock = $this->getMock('\Magento\Framework\Api\FilterBuilder', [], [], '', false);
+        $sortOrderBuilderMock = $this->getMock('\Magento\Framework\Api\SortOrderBuilder', [], [], '', false);
+        $this->taxRateRepositoryMock = $this->getMock('\Magento\Tax\Api\TaxRateRepositoryInterface', [], [], '', false);
+        $this->rateConverterMock = $this->getMock('\Magento\Tax\Model\Calculation\Rate\Converter', [], [], '', false);
+        $this->searchCriteriaBuilderMock = $this->getMock(
+            '\Magento\Framework\Api\SearchCriteriaBuilder',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->model = new \Magento\Tax\Model\TaxRateCollection(
+            $entityFactoryMock,
+            $filterBuilderMock,
+            $this->searchCriteriaBuilderMock,
+            $sortOrderBuilderMock,
+            $this->taxRateRepositoryMock,
+            $this->rateConverterMock
+        );
+    }
+
+    /**
+     * @dataProvider createTaxRateCollectionItemDataProvider
+     * @param $zipFrom int|null
+     * @param $zipTo int|null
+     */
+    public function testLoadData($zipFrom, $zipTo)
+    {
+        $taxId = 42;
+        $taxCode = 'taxCode';
+        $taxCountryId = 'US';
+        $taxRegionId = 'CA';
+        $taxRegionName = 'California';
+        $taxPostcode = '1235674';
+        $taxRate = 8.375;
+        $taxTitles = ['taxTitle'];
+        $searchCriteriaMock = $this->getMock('\Magento\Framework\Api\SearchCriteria', [], [], '', false);
+        $searchResultsMock = $this->getMock('\Magento\Tax\Api\Data\TaxRateSearchResultsInterface', [], [], '', false);
+        $taxRateMock = $this->getMock('\Magento\Tax\Api\Data\TaxRateInterface', [], [], '', false);
+
+        $this->searchCriteriaBuilderMock->expects($this->once())->method('setCurrentPage')->with(1);
+        $this->searchCriteriaBuilderMock->expects($this->once())->method('setPageSize')->with(false);
+        $this->searchCriteriaBuilderMock->expects($this->once())->method('create')->willReturn($searchCriteriaMock);
+        $this->taxRateRepositoryMock->expects($this->once())->method('getList')->with($searchCriteriaMock)
+            ->willReturn($searchResultsMock);
+        $searchResultsMock->expects($this->once())->method('getTotalCount')->willReturn(42);
+        $searchResultsMock->expects($this->once())->method('getItems')->willReturn([$taxRateMock]);
+        $taxRateMock->expects($this->once())->method('getId')->willReturn($taxId);
+        $taxRateMock->expects($this->once())->method('getCode')->willReturn($taxCode);
+        $taxRateMock->expects($this->once())->method('getTaxCountryId')->willReturn($taxCountryId);
+        $taxRateMock->expects($this->once())->method('getTaxRegionId')->willReturn($taxRegionId);
+        $taxRateMock->expects($this->once())->method('getRegionName')->willReturn($taxRegionName);
+        $taxRateMock->expects($this->once())->method('getTaxPostcode')->willReturn($taxPostcode);
+        $taxRateMock->expects($this->once())->method('getRate')->willReturn($taxRate);
+        $this->rateConverterMock->expects($this->once())->method('createTitleArrayFromServiceObject')
+            ->with($taxRateMock)->willReturn($taxTitles);
+        $taxRateMock->expects($this->atLeastOnce())->method('getZipTo')->willReturn($zipTo);
+        $taxRateMock->expects($this->any())->method('getZipFrom')->willReturn($zipFrom);
+        $this->assertEquals($this->model, $this->model->loadData());
+        $this->assertTrue($this->model->isLoaded());
+    }
+
+    public function createTaxRateCollectionItemDataProvider()
+    {
+        return [
+            [null, null],
+            [100, 200]
+        ];
+    }
+}

From 43fe54aeae1be0603df34c0bcad86251d0d5d369 Mon Sep 17 00:00:00 2001
From: Serhiy Shkolyarenko <sshkolyarenko@ebay.com>
Date: Mon, 8 Dec 2014 20:44:45 +0200
Subject: [PATCH 152/474] MAGETWO-31242: Impossible to rename subcategory on
 storeview level

added store id to form and redirect
---
 .../Catalog/Controller/Adminhtml/Category/Save.php  | 13 +++++++++----
 .../templates/catalog/category/edit/form.phtml      |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index b734339025e4d..a847feaea0369 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -188,12 +188,17 @@ public function execute()
             );
         }
 
+        $redirectParams = [
+            '_current' => true,
+            'id' => $category->getId()
+        ];
+        if ($storeId) {
+            $redirectParams['store'] = $storeId;
+        }
+
         return $resultRedirect->setPath(
             'catalog/*/edit',
-            [
-                '_current' => true,
-                'id' => $category->getId()
-            ]
+            $redirectParams
         );
     }
 }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
index 0bf754b822ead..2a02e8601d38c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
@@ -37,6 +37,7 @@ $categoryId = $this->getCategoryId();
         <input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>"/>
         <input type="hidden" name="category_products" id="in_category_products" value=""/>
         <input type="hidden" name="active_tab_id" id="active_tab_id" value=""/>
+        <input type="hidden" name="store" id="form_store_id" value="<?php echo $this->getStore()->getId()?>"/>
         <?php if ($parentId !== 0): ?>
             <input type="hidden" name="parent" value="<?php echo $parentId; ?>"/>
         <?php endif; ?>

From e6521e243968480e3adb2a9ebc9dcd67450e3a5b Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Mon, 8 Dec 2014 13:04:17 -0600
Subject: [PATCH 153/474] MAGETWO-31447: Incorrect Validation of PHP Version
 During Installation

- remove hardcoding of required PHP version, instead reading from
  composer.json file
- adding validation using composer logic.
---
 .../Setup/src/Controller/Environment.php      | 50 ++++++++++++++++---
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/Environment.php b/setup/module/Magento/Setup/src/Controller/Environment.php
index 2205286607f5d..172b1069365c7 100644
--- a/setup/module/Magento/Setup/src/Controller/Environment.php
+++ b/setup/module/Magento/Setup/src/Controller/Environment.php
@@ -7,6 +7,10 @@
  */
 namespace Magento\Setup\Controller;
 
+use Composer\Json\JsonFile;
+use Composer\Package\LinkConstraint\VersionConstraint;
+use Composer\Package\Version\VersionParser;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\JsonModel;
 use Magento\Setup\Model\PhpExtensions;
@@ -15,39 +19,65 @@
 class Environment extends AbstractActionController
 {
     /**
-     * The minimum required version of PHP
+     * List of required php extensions.
+     *
+     * @var \Magento\Setup\Model\PhpExtensions
      */
-    const PHP_VERSION_MIN = '5.4.0';
+    protected $extensions;
 
     /**
-     * @var \Magento\Setup\Model\PhpExtensions
+     * Directory List to read composer.json
+     *
+     * @var DirectoryList
      */
-    protected $extensions;
+    protected $directoryList;
 
     /**
+     * Version parser
+     *
+     * @var VersionParser
+     */
+    protected $versionParser;
+
+    /**
+     * Constructor
+     *
      * @param PhpExtensions $extensions
      * @param FilePermissions $permissions
+     * @param DirectoryList $directoryList
+     * @param VersionParser $versionParser
      */
-    public function __construct(PhpExtensions $extensions, FilePermissions $permissions)
-    {
+    public function __construct(
+        PhpExtensions $extensions,
+        FilePermissions $permissions,
+        DirectoryList $directoryList,
+        VersionParser $versionParser
+    ) {
         $this->extensions = $extensions;
         $this->permissions = $permissions;
+        $this->directoryList = $directoryList;
+        $this->versionParser = $versionParser;
     }
 
     /**
+     * Verifies php version
+     *
      * @return JsonModel
      */
     public function phpVersionAction()
     {
+        $jsonFile = (new JsonFile($this->directoryList->getRoot() . '/composer.json'))->read();
+        $multipleConstraints = $this->versionParser->parseConstraints($jsonFile['require']['php']);
+        $currentPhpVersion = new VersionConstraint('=', PHP_VERSION);
         $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
-        if (version_compare(PHP_VERSION, self::PHP_VERSION_MIN, '<') === true) {
+        if (!$multipleConstraints->matches($currentPhpVersion)) {
             $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
         }
 
         $data = [
             'responseType' => $responseType,
             'data' => [
-                'required' => self::PHP_VERSION_MIN,
+                'required' => $jsonFile['require']['php'],
                 'current' => PHP_VERSION,
             ],
         ];
@@ -55,6 +85,8 @@ public function phpVersionAction()
     }
 
     /**
+     * Verifies php extensions
+     *
      * @return JsonModel
      */
     public function phpExtensionsAction()
@@ -80,6 +112,8 @@ public function phpExtensionsAction()
     }
 
     /**
+     * Verifies file permissions
+     *
      * @return JsonModel
      */
     public function filePermissionsAction()

From 3a6fb78776191a4222c26d6ca69d2306485675a9 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Mon, 8 Dec 2014 13:28:48 -0600
Subject: [PATCH 154/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Solved the problem of validating input on previous button.
---
 setup/pub/magento/setup/add-database.js | 7 +------
 setup/pub/magento/setup/main.js         | 4 +---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index cef0276073b96..42109528ad8fb 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -25,7 +25,7 @@ angular.module('add-database', ['ngStorage'])
                 });
         }, 500);
 
-        $scope.$on('$destroy', function () { $interval.cancel(intervalPromise); });
+        $scope.$on('$destroy', function () {$interval.cancel(intervalPromise);});
 
         if ($localStorage.db) {
             $scope.db = $localStorage.db;
@@ -43,11 +43,6 @@ angular.module('add-database', ['ngStorage'])
             $interval.cancel(intervalPromise);
         });
 
-        $scope.$on('previousState', function () {
-            $localStorage.db = $scope.db;
-            $interval.cancel(intervalPromise);
-        });
-
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index fbbf5b0bafa75..12f2ea4fe0873 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -32,10 +32,8 @@ main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navi
         };
 
         $scope.previousState = function () {
-            if ($scope.validate()) {
-                $scope.$broadcast('previousState', $state.$current);
+                $scope.valid = true;
                 $state.go(navigationService.getPreviousState().id);
-            }
         };
 
         // Flag indicating the validity of the form

From d3fb0142661cf9c04dc647a3594502418a796454 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Mon, 8 Dec 2014 13:45:55 -0600
Subject: [PATCH 155/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- fixed logical conflict of Luma Sample Data (incoming from mainline) and MAGETWO-29035
- removed sample data installer entry point script and application
- refactored loggers to properly work in Magento Setup environment
- fixed bug of inability to specify CLI parameter for installing sample data
- fixed wrong order of triggering sample data installer (after maintenance mode)
---
 .../Magento/Tools/SampleData/Installer.php    | 162 ------------------
 dev/tools/Magento/Tools/SampleData/Logger.php |  62 ++++++-
 .../Module/Catalog/Setup/Attribute.php        |   5 +-
 .../Module/Catalog/Setup/Category.php         |   5 +-
 .../Module/Catalog/Setup/Product.php          |   5 +-
 .../Module/Catalog/Setup/ProductLink.php      |   5 +-
 .../Module/CatalogRule/Setup/Rule.php         |   5 +-
 .../SampleData/Module/Cms/Setup/Block.php     |   5 +-
 .../SampleData/Module/Cms/Setup/Page.php      |   5 +-
 .../Module/Customer/Setup/Customer.php        |   5 +-
 .../GiftRegistry/Setup/GiftRegistry.php       |   5 +-
 .../MultipleWishlist/Setup/Wishlist.php       |   5 +-
 .../OfflineShipping/Setup/Tablerate.php       |   5 +-
 .../SampleData/Module/Review/Setup/Review.php |   5 +-
 .../SampleData/Module/Sales/Setup/Order.php   |   5 +-
 .../Module/SalesRule/Setup/Rule.php           |   5 +-
 .../Module/TargetRule/Setup/Rule.php          |   5 +-
 .../Tools/SampleData/Module/Tax/Setup/Tax.php |   7 +-
 .../Tools/SampleData/Module/Theme/Setup.php   |   3 +-
 .../Module/Widget/Setup/CmsBlock.php          |   5 +-
 .../Module/Wishlist/Setup/Wishlist.php        |   5 +-
 .../Magento/Tools/SampleData/install.php      |  33 ----
 .../src/Controller/ConsoleController.php      |   6 +-
 .../Magento/Setup/src/Model/ConsoleLogger.php |  42 ++++-
 .../Magento/Setup/src/Model/Installer.php     |  12 +-
 .../Setup/src/Model/LoggerInterface.php       |  11 +-
 .../Magento/Setup/src/Model/SampleData.php    | 104 +++++++++--
 .../Magento/Setup/src/Model/WebLogger.php     |  51 +++++-
 28 files changed, 278 insertions(+), 300 deletions(-)
 delete mode 100644 dev/tools/Magento/Tools/SampleData/Installer.php
 delete mode 100644 dev/tools/Magento/Tools/SampleData/install.php

diff --git a/dev/tools/Magento/Tools/SampleData/Installer.php b/dev/tools/Magento/Tools/SampleData/Installer.php
deleted file mode 100644
index 9d3867e165250..0000000000000
--- a/dev/tools/Magento/Tools/SampleData/Installer.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license {license_link}
- */
-namespace Magento\Tools\SampleData;
-
-use Magento\Framework\App\State;
-use Magento\Framework\Module\ModuleListInterface;
-use Magento\Framework\Event;
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\App\ObjectManager\ConfigLoader;
-use Magento\Framework\App\Bootstrap;
-use Magento\Framework\App\Console;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class Installer implements \Magento\Framework\AppInterface
-{
-    /**
-     * @var State
-     */
-    protected $appState;
-
-    /**
-     * @var SetupFactory
-     */
-    protected $setupFactory;
-
-    /**
-     * @var ModuleListInterface
-     */
-    protected $moduleList;
-
-    /**
-     * @var ObjectManagerInterface
-     */
-    protected $objectManager;
-
-    /**
-     * @var ConfigLoader
-     */
-    protected $configLoader;
-
-    /**
-     * @var Console\Response
-     */
-    protected $response;
-
-    /**
-     * @var Helper\PostInstaller
-     */
-    protected $postInstaller;
-
-    /**
-     * @var Helper\Deploy
-     */
-    protected $deploy;
-
-    /**
-     * @var \Magento\Backend\Model\Auth\Session
-     */
-    protected $session;
-
-    /**
-     * @param State $appState
-     * @param SetupFactory $setupFactory
-     * @param ModuleListInterface $moduleList
-     * @param ObjectManagerInterface $objectManager
-     * @param ConfigLoader $configLoader
-     * @param Console\Response $response
-     * @param Helper\PostInstaller $postInstaller
-     * @param Helper\Deploy $deploy
-     * @param \Magento\User\Model\UserFactory $userFactory
-     * @param \Magento\Backend\Model\Auth\Session $backendAuthSession
-     * @param array $data
-     * @throws \Exception
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     */
-    public function __construct(
-        State $appState,
-        SetupFactory $setupFactory,
-        ModuleListInterface $moduleList,
-        ObjectManagerInterface $objectManager,
-        ConfigLoader $configLoader,
-        Console\Response $response,
-        Helper\PostInstaller $postInstaller,
-        Helper\Deploy $deploy,
-        \Magento\User\Model\UserFactory $userFactory,
-        \Magento\Backend\Model\Auth\Session $backendAuthSession,
-        array $data = []
-    ) {
-        $this->appState = $appState;
-        $this->setupFactory = $setupFactory;
-        $this->moduleList = $moduleList;
-        $this->objectManager = $objectManager;
-        $this->configLoader = $configLoader;
-        $this->response = $response;
-        $this->postInstaller = $postInstaller;
-        $this->deploy = $deploy;
-        $this->session = $backendAuthSession;
-        $user = $userFactory->create()->loadByUsername($data['admin_username']);
-        if (!$user || !$user->getId()) {
-            throw new \Exception('Invalid username provided');
-        }
-        $backendAuthSession->setUser($user);
-    }
-
-    /**
-     * {@inheritdoc}
-     **/
-    public function launch()
-    {
-        $areaCode = 'adminhtml';
-        $this->appState->setAreaCode($areaCode);
-        $this->objectManager->configure($this->configLoader->load($areaCode));
-
-        $this->deploy->run();
-
-        $resources = $this->initResources();
-        foreach ($this->moduleList->getNames() as $moduleName) {
-            if (isset($resources[$moduleName])) {
-                $resourceType = $resources[$moduleName];
-                $this->setupFactory->create($resourceType)->run();
-                $this->postInstaller->addModule($moduleName);
-            }
-        }
-        $this->session->unsUser();
-        $this->postInstaller->run();
-
-        $this->response->setCode(0);
-        return $this->response;
-    }
-
-    /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     **/
-    public function catchException(Bootstrap $bootstrap, \Exception $exception)
-    {
-        return false;
-    }
-
-    /**
-     * Init resources
-     * @return array
-     */
-    private function initResources()
-    {
-        $config = [];
-        foreach (glob(__DIR__ . '/config/*.php') as $filename) {
-            if (is_file($filename)) {
-                $configPart = include $filename;
-                $config = array_merge_recursive($config, $configPart);
-            }
-        }
-        return isset($config['setup_resources']) ? $config['setup_resources'] : [];
-    }
-}
diff --git a/dev/tools/Magento/Tools/SampleData/Logger.php b/dev/tools/Magento/Tools/SampleData/Logger.php
index 25a630cafbc60..5012927307373 100644
--- a/dev/tools/Magento/Tools/SampleData/Logger.php
+++ b/dev/tools/Magento/Tools/SampleData/Logger.php
@@ -7,19 +7,71 @@
  */
 namespace Magento\Tools\SampleData;
 
+use Magento\Setup\Model\LoggerInterface;
+
 /**
- * Class Logger
+ * A dirty proxy for Setup application logger
  */
-class Logger
+class Logger implements LoggerInterface
 {
     /**
-     * Logs a message
+     * Proxy subject
+     *
+     * @var LoggerInterface
+     */
+    private $subject;
+
+    /**
+     * Setter for the proxy subject
+     *
+     * Known issue: a proper way to implement proxy is to inject subject through constructor.
+     * This implementation is a workaround of integration of Magento Setup application and framework object manager
      *
-     * @param string $message
+     * @param LoggerInterface $subject
      * @return void
      */
+    public function setSubject(LoggerInterface $subject)
+    {
+        $this->subject = $subject;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
     public function log($message)
     {
-        echo $message;
+        return $this->subject->log($message);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logInline($message)
+    {
+        return $this->subject->logInline($message);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logError(\Exception $e)
+    {
+        return $this->subject->logError($e);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logMeta($message)
+    {
+        return $this->subject->logMeta($message);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logSuccess($message)
+    {
+        return $this->subject->logSuccess($message);
     }
 }
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Attribute.php b/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Attribute.php
index b6b61cba2e67d..bc1cd5bebf38a 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Attribute.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Attribute.php
@@ -116,7 +116,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing catalog attributes' . PHP_EOL);
+        $this->logger->log('Installing catalog attributes:');
         $attributeCount = 0;
 
         foreach ($this->moduleList->getNames() as $moduleName) {
@@ -176,10 +176,9 @@ public function run()
                     }
                 }
 
-                $this->logger->log('.');
+                $this->logger->logInline('.');
             }
         }
-        $this->logger->log(PHP_EOL);
 
         $this->eavConfig->clear();
     }
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Category.php b/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Category.php
index da99c5f1a684e..454a62cd64c93 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Category.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Category.php
@@ -88,7 +88,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing categories' . PHP_EOL);
+        $this->logger->log('Installing categories:');
 
         foreach ($this->moduleList->getNames() as $moduleName) {
             $fileName = substr($moduleName, strpos($moduleName, "_") + 1) . '/categories.csv';
@@ -117,10 +117,9 @@ public function run()
                     $this->setAdditionalData($row, $category);
                     $category->save();
                 }
-                $this->logger->log('.');
+                $this->logger->logInline('.');
             }
         }
-        $this->logger->log(PHP_EOL);
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Product.php b/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Product.php
index b8a6fa5c9bb96..5029f47cacd89 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Product.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/Product.php
@@ -118,7 +118,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log("Installing {$this->productType} products" . PHP_EOL);
+        $this->logger->log("Installing {$this->productType} products:");
 
         $product = $this->productFactory->create();
 
@@ -152,10 +152,9 @@ public function run()
 
                 $product->save();
                 $this->gallery->install($product);
-                $this->logger->log('.');
+                $this->logger->logInline('.');
             }
         }
-        $this->logger->log(PHP_EOL);
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/ProductLink.php b/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/ProductLink.php
index f415b0b35fe69..54a8a03a48298 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/ProductLink.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Catalog/Setup/ProductLink.php
@@ -75,7 +75,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing product links' . PHP_EOL);
+        $this->logger->log('Installing product links:');
         $entityFileAssociation = [
             'related',
             'upsell',
@@ -108,10 +108,9 @@ public function run()
                     }
                     $this->linksInitializer->initializeLinks($product, $links);
                     $product->getLinkInstance()->saveProductRelations($product);
-                    $this->logger->log('.');
+                    $this->logger->logInline('.');
                 }
             }
         }
-        $this->logger->log(PHP_EOL);
     }
 }
diff --git a/dev/tools/Magento/Tools/SampleData/Module/CatalogRule/Setup/Rule.php b/dev/tools/Magento/Tools/SampleData/Module/CatalogRule/Setup/Rule.php
index 61e1bf78659f7..edff71e38dd4f 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/CatalogRule/Setup/Rule.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/CatalogRule/Setup/Rule.php
@@ -93,7 +93,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing catalog rules' . PHP_EOL);
+        $this->logger->log('Installing catalog rules:');
         $file = 'CatalogRule/catalog_rules.csv';
         $fileName = $this->fixtureHelper->getPath($file);
         $csvReader = $this->csvReaderFactory->create(array('fileName' => $fileName, 'mode' => 'r'));
@@ -105,11 +105,10 @@ public function run()
             $ruleModel = $this->ruleFactory->create();
             $ruleModel->loadPost($row);
             $ruleModel->save();
-            $this->logger->log('.');
+            $this->logger->logInline('.');
         }
         $ruleJob = $this->jobFactory->create();
         $ruleJob->applyAll();
-        $this->logger->log(PHP_EOL);
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Cms/Setup/Block.php b/dev/tools/Magento/Tools/SampleData/Module/Cms/Setup/Block.php
index 0a114c9a345ca..400392428c5d0 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Cms/Setup/Block.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Cms/Setup/Block.php
@@ -86,7 +86,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing CMS blocks' . PHP_EOL);
+        $this->logger->log('Installing CMS blocks:');
         foreach ($this->fixtures as $file) {
             /** @var \Magento\Tools\SampleData\Helper\Csv\Reader */
             $fileName = $this->fixtureHelper->getPath($file);
@@ -95,10 +95,9 @@ public function run()
                 $data = $this->converter->convertRow($row);
                 $cmsBlock = $this->saveCmsBlock($data['block']);
                 $cmsBlock->unsetData();
-                $this->logger->log('.');
+                $this->logger->logInline('.');
             }
         }
-        $this->logger->log(PHP_EOL);
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Cms/Setup/Page.php b/dev/tools/Magento/Tools/SampleData/Module/Cms/Setup/Page.php
index 41cc07055e4f5..7ea5fb3956fff 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Cms/Setup/Page.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Cms/Setup/Page.php
@@ -70,7 +70,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing CMS pages' . PHP_EOL);
+        $this->logger->log('Installing CMS pages:');
 
         foreach ($this->fixtures as $file) {
             /** @var \Magento\Tools\SampleData\Helper\Csv\Reader $csvReader */
@@ -82,9 +82,8 @@ public function run()
                     ->addData($row)
                     ->setStores(array(\Magento\Store\Model\Store::DEFAULT_STORE_ID))
                     ->save();
-                $this->logger->log('.');
+                $this->logger->logInline('.');
             }
         }
-        $this->logger->log(PHP_EOL);
     }
 }
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Customer/Setup/Customer.php b/dev/tools/Magento/Tools/SampleData/Module/Customer/Setup/Customer.php
index a2567d72bf02b..4a6f5fefcc926 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Customer/Setup/Customer.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Customer/Setup/Customer.php
@@ -112,7 +112,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing customers' . PHP_EOL);
+        $this->logger->log('Installing customers:');
         foreach ($this->fixtures as $file) {
             /** @var \Magento\Tools\SampleData\Helper\Csv\Reader $csvReader */
             $fileName = $this->fixtureHelper->getPath($file);
@@ -146,9 +146,8 @@ public function run()
                     ->create();
 
                 $this->accountManagement->createAccount($customer, $row['password']);
-                $this->logger->log('.');
+                $this->logger->logInline('.');
             }
-            $this->logger->log(PHP_EOL);
         }
     }
 
diff --git a/dev/tools/Magento/Tools/SampleData/Module/GiftRegistry/Setup/GiftRegistry.php b/dev/tools/Magento/Tools/SampleData/Module/GiftRegistry/Setup/GiftRegistry.php
index 99544821a1602..7e4f3c9613c1a 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/GiftRegistry/Setup/GiftRegistry.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/GiftRegistry/Setup/GiftRegistry.php
@@ -127,7 +127,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing Gift Registry' . PHP_EOL);
+        $this->logger->log('Installing Gift Registry:');
         $fixtureFile = 'GiftRegistry/gift_registry.csv';
         $fixtureFilePath = $this->fixtureHelper->getPath($fixtureFile);
         /** @var \Magento\Tools\SampleData\Helper\Csv\Reader $csvReader */
@@ -164,9 +164,8 @@ public function run()
                         ->save();
                 }
             }
-            $this->logger->log('.');
+            $this->logger->logInline('.');
         }
-        $this->logger->log(PHP_EOL);
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/Module/MultipleWishlist/Setup/Wishlist.php b/dev/tools/Magento/Tools/SampleData/Module/MultipleWishlist/Setup/Wishlist.php
index ce87a52a1bd41..6273b2c87c723 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/MultipleWishlist/Setup/Wishlist.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/MultipleWishlist/Setup/Wishlist.php
@@ -100,7 +100,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing multiple wishlists' . PHP_EOL);
+        $this->logger->log('Installing multiple wishlists:');
         $multipleEnabledConfig = 'wishlist/general/multiple_enabled';
         if (!$this->config->isSetFlag($multipleEnabledConfig)) {
             $this->configWriter->save($multipleEnabledConfig, 1);
@@ -133,9 +133,8 @@ public function run()
                 }
                 $productSkuList = explode("\n", $row['product_list']);
                 $this->wishlistHelper->addProductsToWishlist($wishlist, $productSkuList);
-                $this->logger->log('.');
+                $this->logger->logInline('.');
             }
         }
-        $this->logger->log(PHP_EOL);
     }
 }
diff --git a/dev/tools/Magento/Tools/SampleData/Module/OfflineShipping/Setup/Tablerate.php b/dev/tools/Magento/Tools/SampleData/Module/OfflineShipping/Setup/Tablerate.php
index 5eec5dbc7181d..fa6eba2406109 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/OfflineShipping/Setup/Tablerate.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/OfflineShipping/Setup/Tablerate.php
@@ -103,7 +103,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing Tablerate' . PHP_EOL);
+        $this->logger->log('Installing Tablerate:');
         /** @var \Magento\Framework\DB\Adapter\AdapterInterface $adapter */
         $adapter = $this->resource->getConnection('core_write');
         $fixtureFile = 'OfflineShipping/tablerate.csv';
@@ -128,12 +128,11 @@ public function run()
                     'cost' => 0,
                 ]
             );
-            $this->logger->log('.');
+            $this->logger->logInline('.');
         }
         $this->configWriter->save('carriers/tablerate/active', 1);
         $this->configWriter->save('carriers/tablerate/condition_name', 'package_value');
         $this->cacheTypeList->cleanType('config');
-        $this->logger->log(PHP_EOL);
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Review/Setup/Review.php b/dev/tools/Magento/Tools/SampleData/Module/Review/Setup/Review.php
index 2f5e16018b4ab..d75b2333cb6b7 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Review/Setup/Review.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Review/Setup/Review.php
@@ -116,7 +116,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing product reviews' . PHP_EOL);
+        $this->logger->log('Installing product reviews:');
         $fixtureFile = 'Review/products_reviews.csv';
         $fixtureFilePath = $this->fixtureHelper->getPath($fixtureFile);
         /** @var \Magento\Tools\SampleData\Helper\Csv\Reader $csvReader */
@@ -133,9 +133,8 @@ public function run()
             }
             $review->save();
             $this->setReviewRating($review, $row);
-            $this->logger->log('.');
+            $this->logger->logInline('.');
         }
-        $this->logger->log(PHP_EOL);
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order.php b/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order.php
index 0eb6b07aaef84..deb4ea5ce56bc 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order.php
@@ -70,16 +70,15 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing orders' . PHP_EOL);
+        $this->logger->log('Installing orders:');
         foreach ($this->fixtures as $file) {
             $fileName = $this->fixtureHelper->getPath($file);
             $csvReader = $this->csvReaderFactory->create(array('fileName' => $fileName, 'mode' => 'r'));
             foreach ($csvReader as $row) {
                 $orderData = $this->converter->convertRow($row);
                 $this->orderProcessor->createOrder($orderData);
-                $this->logger->log('.');
+                $this->logger->logInline('.');
             }
         }
-        $this->logger->log(PHP_EOL);
     }
 }
diff --git a/dev/tools/Magento/Tools/SampleData/Module/SalesRule/Setup/Rule.php b/dev/tools/Magento/Tools/SampleData/Module/SalesRule/Setup/Rule.php
index b78fe0c385284..322359f93a0ee 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/SalesRule/Setup/Rule.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/SalesRule/Setup/Rule.php
@@ -78,7 +78,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing sales rules' . PHP_EOL);
+        $this->logger->log('Installing sales rules:');
         $file = 'SalesRule/sales_rules.csv';
         $fileName = $this->fixtureHelper->getPath($file);
         $csvReader = $this->csvReaderFactory->create(array('fileName' => $fileName, 'mode' => 'r'));
@@ -94,8 +94,7 @@ public function run()
             $rule = $this->ruleFactory->create();
             $rule->loadPost($row);
             $rule->save();
-            $this->logger->log('.');
+            $this->logger->logInline('.');
         }
-        $this->logger->log(PHP_EOL);
     }
 }
diff --git a/dev/tools/Magento/Tools/SampleData/Module/TargetRule/Setup/Rule.php b/dev/tools/Magento/Tools/SampleData/Module/TargetRule/Setup/Rule.php
index c73f1c0ffb0d1..ad8e665cbb7d4 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/TargetRule/Setup/Rule.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/TargetRule/Setup/Rule.php
@@ -117,7 +117,7 @@ protected function getConditionFromCategory($categoryPath, $ruleType = 'Rule')
      */
     public function run()
     {
-        $this->logger->log('Installing related product rules' . PHP_EOL);
+        $this->logger->log('Installing related product rules:');
         $this->postInstaller->removeSetupResourceType('Magento\Tools\SampleData\Module\Catalog\Setup\ProductLink');
         $entityFileAssociation = [
             \Magento\TargetRule\Model\Rule::RELATED_PRODUCTS => 'related',
@@ -162,10 +162,9 @@ public function run()
                     ->setPositionsLimit(empty($row['limit']) ? 0 : $row['limit']);
                 $rule->loadPost($ruleConditions);
                 $rule->save();
-                $this->logger->log('.');
+                $this->logger->logInline('.');
             }
         }
-        $this->logger->log(PHP_EOL);
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Tax/Setup/Tax.php b/dev/tools/Magento/Tools/SampleData/Module/Tax/Setup/Tax.php
index 10fdab82fa3a0..241f3885db5c1 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Tax/Setup/Tax.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Tax/Setup/Tax.php
@@ -91,7 +91,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing taxes' . PHP_EOL);
+        $this->logger->log('Installing taxes:');
         $fixtureFile = 'Tax/tax_rate.csv';
         $fixtureFilePath = $this->fixtureHelper->getPath($fixtureFile);
         /** @var \Magento\Tools\SampleData\Helper\Csv\Reader $csvReader */
@@ -104,7 +104,7 @@ public function run()
                 ->setRate($data['rate']);
             $taxData = $this->taxRateBuilder->create();
             $this->taxRateRepository->save($taxData);
-            $this->logger->log('.');
+            $this->logger->logInline('.');
         }
 
         $fixtureFile = 'Tax/tax_rule.csv';
@@ -122,8 +122,7 @@ public function run()
                 ->setPosition($data['position']);
             $taxRule = $this->ruleBuilder->create();
             $this->taxRuleRepository->save($taxRule);
-            $this->logger->log('.');
+            $this->logger->logInline('.');
         }
-        $this->logger->log(PHP_EOL);
     }
 }
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php b/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php
index 31622c9b64caa..86f3107a559ff 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php
@@ -115,10 +115,9 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing theme' . PHP_EOL);
+        $this->logger->log('Installing theme...');
         $this->assignTheme();
         $this->addHeadInclude();
-        $this->logger->log('.' . PHP_EOL);
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Widget/Setup/CmsBlock.php b/dev/tools/Magento/Tools/SampleData/Module/Widget/Setup/CmsBlock.php
index af1257153b74e..c35a55cf8d408 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Widget/Setup/CmsBlock.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Widget/Setup/CmsBlock.php
@@ -95,7 +95,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing Widgets' . PHP_EOL);
+        $this->logger->log('Installing Widgets:');
         $pageGroupConfig = array(
             'pages' => array(
                 'block' => '',
@@ -153,10 +153,9 @@ public function run()
                     ->setWidgetParameters(array('block_id' => $block->getId()))
                     ->setPageGroups(array($pageGroup));
                 $widgetInstance->save();
-                $this->logger->log('.');
+                $this->logger->logInline('.');
             }
         }
-        $this->logger->log(PHP_EOL);
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Wishlist/Setup/Wishlist.php b/dev/tools/Magento/Tools/SampleData/Module/Wishlist/Setup/Wishlist.php
index 846f3b80bcfd8..9120cdfecea93 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Wishlist/Setup/Wishlist.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Wishlist/Setup/Wishlist.php
@@ -68,7 +68,7 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing wishlists' . PHP_EOL);
+        $this->logger->log('Installing wishlists:');
 
         $fixtureFile = 'Wishlist/wishlist.csv';
         $fixtureFilePath = $this->fixtureHelper->getPath($fixtureFile);
@@ -89,8 +89,7 @@ public function run()
             }
             $productSkuList = explode("\n", $row['product_list']);
             $this->wishlistHelper->addProductsToWishlist($wishlist, $productSkuList);
-            $this->logger->log('.');
+            $this->logger->logInline('.');
         }
-        $this->logger->log(PHP_EOL);
     }
 }
diff --git a/dev/tools/Magento/Tools/SampleData/install.php b/dev/tools/Magento/Tools/SampleData/install.php
deleted file mode 100644
index 9f79c4a1ad98c..0000000000000
--- a/dev/tools/Magento/Tools/SampleData/install.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-use \Magento\Framework\App\State;
-use \Magento\Framework\App\Bootstrap;
-use \Magento\Framework\Shell\ComplexParameter;
-
-require_once __DIR__ . '/../../../../../app/bootstrap.php';
-
-$usage = 'Usage: php -f install.php -- --admin_username= [--bootstrap=]
-    --admin_username - store\'s admin username. Required for installation.
-    [--bootstrap] - add or override parameters of the bootstrap' . PHP_EOL;
-
-
-$data = getopt('', ['admin_username:', 'bootstrap::']);
-if (!isset($data['admin_username']) || empty($data['admin_username'])) {
-    echo $usage;
-    exit(1);
-}
-
-$bootstrapParam = new ComplexParameter('bootstrap');
-$params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
-$params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
-$params[State::PARAM_MODE] = State::MODE_DEVELOPER;
-
-$bootstrap = Bootstrap::create(BP, $params);
-$app = $bootstrap->createApplication('Magento\Tools\SampleData\Installer', ['data' => $data]);
-$bootstrap->run($app);
diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index ef8241bcf43a5..c43d6e6fe11eb 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -163,8 +163,7 @@ private static function getCliConfig()
             . ' [--' . UserConfig::KEY_IS_SECURE . '=]'
             . ' [--' . UserConfig::KEY_BASE_URL_SECURE . '=]'
             . ' [--' . UserConfig::KEY_IS_SECURE_ADMIN . '=]'
-            . ' [--' . UserConfig::KEY_ADMIN_USE_SECURITY_KEY . '=]'
-            . ' [--' . Installer::USE_SAMPLE_DATA . ']';
+            . ' [--' . UserConfig::KEY_ADMIN_USE_SECURITY_KEY . '=]';
         $adminUser = '--' . AdminAccount::KEY_USERNAME . '='
             . ' --' . AdminAccount::KEY_PASSWORD . '='
             . ' --' . AdminAccount::KEY_EMAIL . '='
@@ -175,7 +174,8 @@ private static function getCliConfig()
             self::CMD_INSTALL => [
                 'route' => self::CMD_INSTALL
                     . " {$deployConfig} {$userConfig} {$adminUser} {$salesConfig}"
-                    . ' [--' . Installer::CLEANUP_DB . ']',
+                    . ' [--' . Installer::CLEANUP_DB . ']'
+                    . ' [--' . Installer::USE_SAMPLE_DATA . '=]',
                 'usage' => "{$deployConfig} {$userConfig} {$adminUser} {$salesConfig}"
                     . ' [--' . Installer::CLEANUP_DB . ']',
                 'usage_short' => self::CMD_INSTALL . ' <options>',
diff --git a/setup/module/Magento/Setup/src/Model/ConsoleLogger.php b/setup/module/Magento/Setup/src/Model/ConsoleLogger.php
index 619fea917eb03..63fd78c269977 100644
--- a/setup/module/Magento/Setup/src/Model/ConsoleLogger.php
+++ b/setup/module/Magento/Setup/src/Model/ConsoleLogger.php
@@ -18,6 +18,12 @@
  */
 class ConsoleLogger implements LoggerInterface
 {
+    /**
+     * Indicator of whether inline output is started
+     *
+     * @var bool
+     */
+    private $isInline = false;
 
     /**
      * Console
@@ -27,7 +33,7 @@ class ConsoleLogger implements LoggerInterface
     protected $console;
 
     /**
-     * Default Constructor
+     * Constructor
      */
     public function __construct()
     {
@@ -39,6 +45,7 @@ public function __construct()
      */
     public function logSuccess($message)
     {
+        $this->terminateLine();
         $this->console->writeLine("[SUCCESS]" . ($message ? ": $message" : ''), ColorInterface::LIGHT_GREEN);
     }
 
@@ -47,19 +54,26 @@ public function logSuccess($message)
      */
     public function logError(\Exception $e)
     {
+        $this->terminateLine();
         $this->console->writeLine("[ERROR]: " . $e, ColorInterface::LIGHT_RED);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function log($message, $addEol = true)
+    public function log($message)
     {
-        if ($addEol) {
-            $this->console->writeLine($message, ColorInterface::LIGHT_BLUE);
-        } else {
-            $this->console->write($message, ColorInterface::LIGHT_BLUE);
-        }
+        $this->terminateLine();
+        $this->console->writeLine($message, ColorInterface::LIGHT_BLUE);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logInline($message)
+    {
+        $this->isInline = true;
+        $this->console->write($message, ColorInterface::LIGHT_BLUE);
     }
 
     /**
@@ -67,6 +81,20 @@ public function log($message, $addEol = true)
      */
     public function logMeta($message)
     {
+        $this->terminateLine();
         $this->console->writeLine($message, ColorInterface::GRAY);
     }
+
+    /**
+     * Terminates line if the inline logging is started
+     *
+     * @return void
+     */
+    private function terminateLine()
+    {
+        if ($this->isInline) {
+            $this->isInline = false;
+            $this->console->writeLine('');
+        }
+    }
 }
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index fce1e4acac87d..fdbf511caf68b 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -268,7 +268,7 @@ public function install($request)
         }
         $script[] = ['Installing database schema:', 'installSchema', []];
         $script[] = ['Installing user configuration...', 'installUserConfig', [$request]];
-        $script[] = ['Installing data fixtures...', 'installDataFixtures', []];
+        $script[] = ['Installing data...', 'installDataFixtures', []];
         if (!empty($request[self::SALES_ORDER_INCREMENT_PREFIX])) {
             $script[] = [
                 'Creating sales order increment prefix...',
@@ -278,11 +278,11 @@ public function install($request)
         }
         $script[] = ['Installing admin user...', 'installAdminUser', [$request]];
         $script[] = ['Enabling caches:', 'enableCaches', []];
-        $script[] = ['Disabling Maintenance Mode:', 'setMaintenanceMode', [0]];
-        $script[] = ['Post installation file permissions check...', 'checkApplicationFilePermissions', []];
         if (!empty($request[Installer::USE_SAMPLE_DATA]) && $this->sampleData->isDeployed()) {
-            $script[] = ['Installing Sample Data...', 'installSampleData', [$request]];
+            $script[] = ['Installing Luma sample data:', 'installSampleData', [$request]];
         }
+        $script[] = ['Disabling Maintenance Mode:', 'setMaintenanceMode', [0]];
+        $script[] = ['Post installation file permissions check...', 'checkApplicationFilePermissions', []];
 
         $estimatedModules = $this->createModulesConfig($request);
         $total = count($script) + count(array_filter($estimatedModules->getData()));
@@ -828,9 +828,11 @@ private function assertDeploymentConfigExists()
      * Run installation process for Sample Data
      *
      * @param array $request
+     * @return void
      */
     private function installSampleData($request)
     {
-        $this->exec($this->sampleData->getRunCommand($request), [$this->execParams]);
+        $userName = isset($request[AdminAccount::KEY_USERNAME]) ? $request[AdminAccount::KEY_USERNAME] : '';
+        $this->sampleData->install($this->getObjectManager(), $this->log, $userName);
     }
 }
diff --git a/setup/module/Magento/Setup/src/Model/LoggerInterface.php b/setup/module/Magento/Setup/src/Model/LoggerInterface.php
index f4b0fcd9ff2e4..779e9ba1d6042 100644
--- a/setup/module/Magento/Setup/src/Model/LoggerInterface.php
+++ b/setup/module/Magento/Setup/src/Model/LoggerInterface.php
@@ -10,8 +10,6 @@
 
 /**
  * Interface to Log Message in Setup
- *
- * @package Magento\Setup\Model
  */
 interface LoggerInterface
 {
@@ -31,7 +29,6 @@ public function logSuccess($message);
      */
     public function logError(\Exception $e);
 
-
     /**
      * Logs a message
      *
@@ -40,6 +37,14 @@ public function logError(\Exception $e);
      */
     public function log($message);
 
+    /**
+     * Logs a message in the current line
+     *
+     * @param string $message
+     * @return void
+     */
+    public function logInline($message);
+
     /**
      * Logs meta information
      *
diff --git a/setup/module/Magento/Setup/src/Model/SampleData.php b/setup/module/Magento/Setup/src/Model/SampleData.php
index 794fc320a15b4..2bc76b4b063ee 100644
--- a/setup/module/Magento/Setup/src/Model/SampleData.php
+++ b/setup/module/Magento/Setup/src/Model/SampleData.php
@@ -9,49 +9,119 @@
 namespace Magento\Setup\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Symfony\Component\Process\PhpExecutableFinder;
+use Magento\Framework\Filesystem;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
- * Class SampleData
+ * Sample data installer
+ *
+ * Serves as an integration point between Magento Setup application and Luma sample data component
  */
 class SampleData
 {
-    const INSTALLER_PATH = 'dev/tools/Magento/Tools/SampleData/install.php';
+    /**
+     * Path to the sample data application
+     */
+    const PATH = 'dev/tools/Magento/Tools/SampleData';
 
     /**
-     * @var DirectoryList
+     * @var \Magento\Framework\Filesystem\Directory\ReadInterface
      */
-    private $directoryList;
+    private $rootDir;
 
     /**
-     * @param DirectoryList $directoryList
+     * @param Filesystem $filesystem
      */
-    public function __construct(DirectoryList $directoryList)
+    public function __construct(Filesystem $filesystem)
     {
-        $this->directoryList = $directoryList;
+        $this->rootDir = $filesystem->getDirectoryRead(DirectoryList::ROOT);
     }
 
     /**
      * Check if Sample Data was deployed
      *
      * @return bool
-     * @throws \Magento\Framework\Exception
      */
     public function isDeployed()
     {
-        return is_file($this->directoryList->getRoot() . DIRECTORY_SEPARATOR . self::INSTALLER_PATH);
+        return $this->rootDir->isExist(self::PATH);
+    }
+
+    /**
+     * Installation routine for creating sample data
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param LoggerInterface $logger
+     * @param $adminUserName
+     * @throws \Exception
+     */
+    public function install(ObjectManagerInterface $objectManager, LoggerInterface $logger, $adminUserName)
+    {
+        /** @var \Magento\Tools\SampleData\Logger $sampleDataLogger */
+        $sampleDataLogger = $objectManager->get('Magento\Tools\SampleData\Logger');
+        $sampleDataLogger->setSubject($logger);
+
+        /** @var \Magento\User\Model\UserFactory $userFactory */
+        $userFactory = $objectManager->get('Magento\User\Model\UserFactory');
+        $user = $userFactory->create()->loadByUsername($adminUserName);
+        if (!$user || !$user->getId()) {
+            throw new \Exception('Invalid username provided');
+        }
+        /** @var \Magento\Backend\Model\Auth\Session $session */
+        $session = $objectManager->get('Magento\Backend\Model\Auth\Session');
+        $session->setUser($user);
+
+        $areaCode = 'adminhtml';
+        /** @var \Magento\Framework\App\State $appState */
+        $appState = $objectManager->get('Magento\Framework\App\State');
+        $appState->setAreaCode($areaCode);
+        /** @var \Magento\Framework\App\ObjectManager\ConfigLoader $configLoader */
+        $configLoader = $objectManager->get('Magento\Framework\App\ObjectManager\ConfigLoader');
+        $objectManager->configure($configLoader->load($areaCode));
+
+        /** @var \Magento\Tools\SampleData\Helper\Deploy $helper */
+        $helper = $objectManager->get('Magento\Tools\SampleData\Helper\Deploy');
+        $helper->run();
+
+        /** @var \Magento\Framework\Module\ModuleListInterface $moduleList */
+        $moduleList = $objectManager->get('Magento\Framework\Module\ModuleListInterface');
+
+        /** @var \Magento\Tools\SampleData\SetupFactory $setupFactory */
+        $setupFactory = $objectManager->get('Magento\Tools\SampleData\SetupFactory');
+
+        /** @var \Magento\Tools\SampleData\Helper\PostInstaller $postInstaller */
+        $postInstaller = $objectManager->get('Magento\Tools\SampleData\Helper\PostInstaller');
+
+        $resources = $this->getSetupResourceModels();
+        foreach ($moduleList->getNames() as $moduleName) {
+            if (isset($resources[$moduleName])) {
+                $class = $resources[$moduleName];
+                $setupFactory->create($class)->run();
+                $postInstaller->addModule($moduleName);
+            }
+        }
+
+        $session->unsUser();
+
+        /** @var \Magento\Tools\SampleData\Helper\PostInstaller $postInstaller */
+        $postInstaller = $objectManager->get('Magento\Tools\SampleData\Helper\PostInstaller');
+        $postInstaller->run();
     }
 
     /**
-     * Returns command to be executed for Sample Data installation
+     * Determines which resource models to run during setup
      *
-     * @param \ArrayObject|array $request
-     * @return string
+     * @return array
      */
-    public function getRunCommand($request)
+    private function getSetupResourceModels()
     {
-        $userName = isset($request[AdminAccount::KEY_USERNAME]) ? $request[AdminAccount::KEY_USERNAME] : '';
-        return $command = ' -f ' . $this->directoryList->getRoot() . DIRECTORY_SEPARATOR . self::INSTALLER_PATH .
-            ' -- --admin_username=' . $userName . ' --bootstrap=%s';
+        $config = [];
+        foreach ($this->rootDir->search(self::PATH . '/config/*.php') as $filename) {
+            if ($this->rootDir->isFile($filename)) {
+                $configPart = include $this->rootDir->getAbsolutePath($filename);
+                $config = array_merge_recursive($config, $configPart);
+            }
+        }
+        return isset($config['setup_resources']) ? $config['setup_resources'] : [];
     }
 }
diff --git a/setup/module/Magento/Setup/src/Model/WebLogger.php b/setup/module/Magento/Setup/src/Model/WebLogger.php
index 9067561619a2f..73be4240ac04b 100644
--- a/setup/module/Magento/Setup/src/Model/WebLogger.php
+++ b/setup/module/Magento/Setup/src/Model/WebLogger.php
@@ -36,6 +36,16 @@ class WebLogger implements LoggerInterface
      */
     protected $hasError = false;
 
+    /**
+     * Indicator of whether inline output is started
+     *
+     * @var bool
+     */
+    private $isInline = false;
+
+    /**
+     * Constructor
+     */
     public function __construct()
     {
         $this->logFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $this->logFile;
@@ -67,7 +77,8 @@ private function close()
      */
     public function logSuccess($message)
     {
-        $this->writeToFile('<span class="text-success">[SUCCESS] ' . $message . '</span>');
+        $this->terminateLine();
+        $this->writeToFile('<span class="text-success">[SUCCESS] ' . $message . '</span><br/>');
     }
 
     /**
@@ -75,15 +86,26 @@ public function logSuccess($message)
      */
     public function logError(\Exception $e)
     {
-        $this->writeToFile('<span class="text-danger">[ERROR] ' . $e . '<span>');
+        $this->terminateLine();
+        $this->writeToFile('<span class="text-danger">[ERROR] ' . $e . '<span><br/>');
     }
 
     /**
      * {@inheritdoc}
      */
-    public function log($message, $addEol = true)
+    public function log($message)
     {
-        $this->writeToFile('<span class="text-info">' . $message . '</span>', $addEol);
+        $this->terminateLine();
+        $this->writeToFile('<span class="text-info">' . $message . '</span><br/>');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logInline($message)
+    {
+        $this->isInline = true;
+        $this->writeToFile('<span class="text-info">' . $message . '</span>');
     }
 
     /**
@@ -91,20 +113,20 @@ public function log($message, $addEol = true)
      */
     public function logMeta($message)
     {
-        $this->writeToFile('<span class="hidden">' . $message . '</span>');
+        $this->terminateLine();
+        $this->writeToFile('<span class="hidden">' . $message . '</span><br/>');
     }
 
     /**
      * Write the message to file
      *
      * @param string $message
-     * @param bool $addEol
      * @return void
      */
-    private function writeToFile($message, $addEol = true)
+    private function writeToFile($message)
     {
         $this->open('a+');
-        fwrite($this->resource, $message . ($addEol ? PHP_EOL : ''));
+        fwrite($this->resource, $message);
         $this->close();
     }
 
@@ -147,4 +169,17 @@ public function clear()
     {
         unlink($this->logFile);
     }
+
+    /**
+     * Terminates line if the inline logging is started
+     *
+     * @return void
+     */
+    private function terminateLine()
+    {
+        if ($this->isInline) {
+            $this->isInline = false;
+            $this->writeToFile('</br>');
+        }
+    }
 }

From c6fa0cfcb9581158d59a9ebd565d7130e38ad7d0 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Mon, 8 Dec 2014 14:00:57 -0600
Subject: [PATCH 156/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- fix for console help of install command (install sample data)
---
 .../module/Magento/Setup/src/Controller/ConsoleController.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index c43d6e6fe11eb..d03592bd50fc6 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -177,7 +177,8 @@ private static function getCliConfig()
                     . ' [--' . Installer::CLEANUP_DB . ']'
                     . ' [--' . Installer::USE_SAMPLE_DATA . '=]',
                 'usage' => "{$deployConfig} {$userConfig} {$adminUser} {$salesConfig}"
-                    . ' [--' . Installer::CLEANUP_DB . ']',
+                    . ' [--' . Installer::CLEANUP_DB . ']'
+                    . ' [--' . Installer::USE_SAMPLE_DATA . '=]',
                 'usage_short' => self::CMD_INSTALL . ' <options>',
                 'usage_desc' => 'Install Magento application',
             ],

From 88fbdeeabfd563dbb4bd29678392b3df4303b46a Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Mon, 8 Dec 2014 14:41:26 -0600
Subject: [PATCH 157/474] MAGETWO-30852: Old encryption key did not saved after
 update

- fixed PHP notice
---
 setup/module/Magento/Setup/src/Model/Installer.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index ecc73b4da6ddd..baf7e4f3ed342 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -368,7 +368,9 @@ private function createEncryptConfig($data)
         $cryptConfigData =
             array(ConfigMapper::$paramMap[ConfigMapper::KEY_ENCRYPTION_KEY] => $key);
 
-        $this->installInfo[EncryptConfig::KEY_ENCRYPTION_KEY] = array_pop(explode("\n", $key));
+        // find the latest key to display
+        $keys = explode("\n", $key);
+        $this->installInfo[EncryptConfig::KEY_ENCRYPTION_KEY] = array_pop($keys);
         return new EncryptConfig($cryptConfigData);
     }
 

From 55ebe86bd07d4f3cd5cc97f3f45e95d26de255a5 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Mon, 8 Dec 2014 15:17:25 -0600
Subject: [PATCH 158/474] MAGETWO-31004: Validation of CLI

- changed validation message
---
 setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
index 8737827ae4781..2c56e63a3ec4c 100644
--- a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
@@ -53,7 +53,7 @@ public function validate(array $data, array $config)
             $validationMessages = PHP_EOL;
 
             if (!empty($missingParams)) {
-                $validationMessages .= 'Missing parameters:' . PHP_EOL;
+                $validationMessages .= 'Missing required parameters:' . PHP_EOL;
                 foreach ($missingParams as $missingParam) {
                     $validationMessages .= $missingParam . PHP_EOL;
                 }

From 76843e37f08f576e998dea522b2827acd8df59e2 Mon Sep 17 00:00:00 2001
From: Paul Lewis <plewis@ebay.com>
Date: Mon, 8 Dec 2014 18:12:26 -0600
Subject: [PATCH 159/474] MAGETWO-29546: DbStatusValidator does not provide
 enough information to perform successful update of the system

 - fix unit and integration tests
 - change 'needed' to 'required'
---
 .../Module/Plugin/DbStatusValidatorTest.php   | 46 ++++------
 .../Module/DbVersionDetectorTest.php          | 91 ++++++++++++-------
 .../Magento/Framework/Module/ManagerTest.php  |  8 --
 .../Module/Plugin/DbStatusValidatorTest.php   | 12 +--
 .../Framework/Module/DbVersionDetector.php    | 16 ++--
 .../Magento/Framework/Module/Manager.php      |  8 --
 .../Module/Plugin/DbStatusValidator.php       | 11 +--
 7 files changed, 95 insertions(+), 97 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index 4667e4e4d190d..9efe467876f6a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -14,6 +14,9 @@ public function testValidationUpToDateDb()
         $this->dispatch('index/index');
     }
 
+    /**
+     * @magentoDbIsolation enabled
+     */
     public function testValidationOutdatedDb()
     {
         $resourceName = 'adminnotification_setup';
@@ -22,39 +25,22 @@ public function testValidationOutdatedDb()
         $resource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Framework\Module\ResourceInterface'
         );
-        $dbVersion = $resource->getDbVersion($resourceName);
-        $dbDataVersion = $resource->getDataVersion($resourceName);
-        try {
-            $resource->setDbVersion($resourceName, '0.1');
-            $resource->setDataVersion($resourceName, '0.1');
-            /** @var \Magento\Framework\Cache\FrontendInterface $cache */
-            $cache = $this->_objectManager->get('Magento\Framework\App\Cache\Type\Config');
-            $cache->clean();
 
-            try {
-                /* This triggers plugin to be executed */
-                $this->dispatch('index/index');
-            } catch (\Magento\Framework\Module\Exception $e) {
-                if ($e->getMessage() != 'Please update your database: first run "composer install" from the Magento ' .
-                    'root/ and root/setup directories. Then run "php –f index.php update" from the Magento ' .
-                    'root/setup directory.' . PHP_EOL .
-                    'Error details: database is out of date.' . PHP_EOL .
-                    'Magento_AdminNotification schema: current version - 0.1, latest version - 2.0.0.0' . PHP_EOL .
-                    'Magento_AdminNotification data: current version - 0.1, latest version - 2.0.0.0'
-                ) {
-                    $failureMessage = "DB status validation doesn't work properly. Caught exception message is '"
-                        . $e->getMessage() ."'";
-                }
-            }
-        } catch (\Exception $e) {
-            $failureMessage = "Impossible to continue other tests, because database is broken: {$e}";
-        }
+        $resource->setDbVersion($resourceName, '0.1');
+        $resource->setDataVersion($resourceName, '0.1');
 
-        $resource->setDbVersion($resourceName, $dbVersion);
-        $resource->setDataVersion($resourceName, $dbDataVersion);
+        /** @var \Magento\Framework\Cache\FrontendInterface $cache */
+        $cache = $this->_objectManager->get('Magento\Framework\App\Cache\Type\Config');
+        $cache->clean();
 
-        if (isset($failureMessage)) {
-            $this->fail($failureMessage);
+        try {
+            /* This triggers plugin to be executed */
+            $this->dispatch('index/index');
+            $this->fail('Did not throw expected \Magento\Framework\Module\Exception.');
+        } catch (\Magento\Framework\Module\Exception $e) {
+            $this->assertStringStartsWith('Please update your database:', $e->getMessage());
+            $this->assertContains('Magento_AdminNotification schema:', $e->getMessage());
+            $this->assertContains('Magento_AdminNotification data:', $e->getMessage());
         }
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php
index 33d14e3099f6d..1b67b52ed1896 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php
@@ -25,21 +25,33 @@ class DbVersionDetectorTest extends \PHPUnit_Framework_TestCase
      */
     private $moduleResource;
 
+    /**
+     * @var Magento\Framework\Module\ResourceResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceResolver;
+
     protected function setUp()
     {
         $this->moduleList = $this->getMockForAbstractClass('Magento\Framework\Module\ModuleListInterface');
         $this->moduleList->expects($this->any())
-            ->method('getModule')
+            ->method('getOne')
             ->will($this->returnValueMap([
-                        ['Module_One', ['name' => 'One_Module', 'schema_version' => '1']],
-                        ['Module_Two', ['name' => 'Two_Module', 'schema_version' => '2']],
-                        ['Module_Three', ['name' => 'Two_Three']],
+                        ['Module_One', ['name' => 'Module_One', 'schema_version' => '1']],
+                        ['Module_Two', ['name' => 'Module_Two', 'schema_version' => '2']],
+                        ['Module_No_Schema', []],
                     ]));
+        $this->moduleList->expects($this->any())
+            ->method('getNames')
+            ->will($this->returnValue(['Module_One', 'Module_Two']));
+
         $this->_outputConfig = $this->getMockForAbstractClass('Magento\Framework\Module\Output\ConfigInterface');
         $this->moduleResource = $this->getMockForAbstractClass('\Magento\Framework\Module\ResourceInterface');
+        $this->resourceResolver = $this->getMockForAbstractClass('\Magento\Framework\Module\ResourceResolverInterface');
+
         $this->dbVersionDetector = new DbVersionDetector(
             $this->moduleList,
-            $this->moduleResource
+            $this->moduleResource,
+            $this->resourceResolver
         );
     }
 
@@ -114,33 +126,50 @@ public function isDbUpToDateDataProvider()
 
     public function testGetDbVersionErrors()
     {
-        $this->moduleList->expects($this->any())
-            ->method('getModules')
-            ->will($this->returnValue([
-                        ['name' => 'One_Module', 'schema_version' => '1'],
-                        ['Module_Two', ['name' => 'Two_Module', 'schema_version' => '2']],
-                        ['Module_Three', ['name' => 'Two_Three']],
-                    ]));
+        $this->moduleResource->expects($this->any())
+            ->method('getDataVersion')
+            ->will($this->returnValue(2));
+        $this->moduleResource->expects($this->any())
+            ->method('getDbVersion')
+            ->will($this->returnValue(2));
+
+        $this->resourceResolver->expects($this->any())->method('getResourceList')->will($this->returnValueMap([
+                    ['Module_One', ['resource_one']],
+                    ['Module_Two', ['resource_two']],
+                ]));
 
-        $this->dbVersionDetector->getDbVersionErrors();
+        $expectedErrors = [
+            [
+                DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
+                DbVersionDetector::ERROR_KEY_CURRENT => '2',
+                DbVersionDetector::ERROR_KEY_REQUIRED => '1',
+                DbVersionDetector::ERROR_KEY_TYPE => 'schema',
+            ],
+            [
+                DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
+                DbVersionDetector::ERROR_KEY_CURRENT => '2',
+                DbVersionDetector::ERROR_KEY_REQUIRED => '1',
+                DbVersionDetector::ERROR_KEY_TYPE => 'data',
+            ]
+        ];
+        $this->assertEquals($expectedErrors, $this->dbVersionDetector->getDbVersionErrors());
+    }
+
+    /**
+     * @expectedException \UnexpectedValueException
+     * @expectedExceptionMessage Schema version for module 'Module_No_Schema' is not specified
+     */
+    public function testIsDbSchemaUpToDateException()
+    {
+        $this->dbVersionDetector->isDbSchemaUpToDate('Module_No_Schema', 'resource_name');
     }
 
-//
-//    /**
-//     * @expectedException \UnexpectedValueException
-//     * @expectedExceptionMessage Schema version for module 'Module_Three' is not specified
-//     */
-//    public function testIsDbSchemaUpToDateException()
-//    {
-//        $this->dbVersionDetector->getDbSchemaVersionError('Module_Three', 'resource');
-//    }
-//
-//    /**
-//     * @expectedException \UnexpectedValueException
-//     * @expectedExceptionMessage Schema version for module 'Module_Three' is not specified
-//     */
-//    public function testIsDbDataUpToDateException()
-//    {
-//        $this->dbVersionDetector->getDbDataVersionError('Module_Three', 'resource');
-//    }
+    /**
+     * @expectedException \UnexpectedValueException
+     * @expectedExceptionMessage Schema version for module 'Module_No_Schema' is not specified
+     */
+    public function testIsDbDataUpToDateException()
+    {
+        $this->dbVersionDetector->isDbDataUpToDate('Module_No_Schema', 'resource_name');
+    }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
index d1c325c2015c8..04cb6cb330e1a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
@@ -31,11 +31,6 @@ class ManagerTest extends \PHPUnit_Framework_TestCase
      */
     private $_outputConfig;
 
-    /**
-     * @var \Magento\Framework\Module\ResourceInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $moduleResource;
-
     protected function setUp()
     {
         $this->_moduleList = $this->getMockForAbstractClass('Magento\Framework\Module\ModuleListInterface');
@@ -47,11 +42,9 @@ protected function setUp()
                 ['Module_Three', ['name' => 'Two_Three']],
             ]));
         $this->_outputConfig = $this->getMockForAbstractClass('Magento\Framework\Module\Output\ConfigInterface');
-        $this->moduleResource = $this->getMockForAbstractClass('\Magento\Framework\Module\ResourceInterface');
         $this->_model = new \Magento\Framework\Module\Manager(
             $this->_outputConfig,
             $this->_moduleList,
-            $this->moduleResource,
             array(
                 'Module_Two' => self::XML_PATH_OUTPUT_ENABLED,
             )
@@ -118,5 +111,4 @@ public function isOutputEnabledCustomConfigPathDataProvider()
             'path literal, output enabled'  => array(true, true),
         );
     }
-
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index 230f6beb0a6ec..7357904e1c2b6 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -154,7 +154,7 @@ public function aroundDispatchExceptionDataProvider()
                          DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
                          DbVersionDetector::ERROR_KEY_TYPE => 'schema',
                          DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
+                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
                      ]
                 ],
             ],
@@ -164,7 +164,7 @@ public function aroundDispatchExceptionDataProvider()
                          DbVersionDetector::ERROR_KEY_MODULE => 'Module_Two',
                          DbVersionDetector::ERROR_KEY_TYPE => 'data',
                          DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
+                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
                      ]
                 ],
             ],
@@ -174,25 +174,25 @@ public function aroundDispatchExceptionDataProvider()
                          DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
                          DbVersionDetector::ERROR_KEY_TYPE => 'schema',
                          DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
+                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
                      ],
                      [
                          DbVersionDetector::ERROR_KEY_MODULE => 'Module_Two',
                          DbVersionDetector::ERROR_KEY_TYPE => 'schema',
                          DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
+                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
                      ],
                      [
                          DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
                          DbVersionDetector::ERROR_KEY_TYPE => 'data',
                          DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
+                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
                      ],
                      [
                          DbVersionDetector::ERROR_KEY_MODULE => 'Module_Two',
                          DbVersionDetector::ERROR_KEY_TYPE => 'data',
                          DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_NEEDED => '1'
+                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
                      ]
                 ],
             ],
diff --git a/lib/internal/Magento/Framework/Module/DbVersionDetector.php b/lib/internal/Magento/Framework/Module/DbVersionDetector.php
index 1c9c0c3f8db62..4f60dc37bb939 100644
--- a/lib/internal/Magento/Framework/Module/DbVersionDetector.php
+++ b/lib/internal/Magento/Framework/Module/DbVersionDetector.php
@@ -22,7 +22,7 @@ class DbVersionDetector
     const ERROR_KEY_MODULE = 'module';
     const ERROR_KEY_TYPE = 'type';
     const ERROR_KEY_CURRENT = 'current';
-    const ERROR_KEY_NEEDED = 'needed';
+    const ERROR_KEY_REQUIRED = 'required';
     /**#@-*/
 
     /**
@@ -88,7 +88,7 @@ public function isDbDataUpToDate($moduleName, $resourceName)
     public function getDbVersionErrors()
     {
         $errors = [];
-        foreach (array_keys($this->moduleList->getModules()) as $moduleName) {
+        foreach ($this->moduleList->getNames() as $moduleName) {
             foreach ($this->resourceResolver->getResourceList($moduleName) as $resourceName) {
                 if (!$this->isDbSchemaUpToDate($moduleName, $resourceName)) {
                     $errors[] = $this->getDbSchemaVersionError($moduleName, $resourceName);
@@ -113,12 +113,12 @@ private function getDbSchemaVersionError($moduleName, $resourceName)
     {
 
         $dbVer = $this->moduleResource->getDbVersion($resourceName); // version saved in DB
-        $module = $this->moduleList->getModule($moduleName);
+        $module = $this->moduleList->getOne($moduleName);
         $configVer = $module['schema_version'];
         $dbVer = $dbVer ?: 'none';
         return [
             self::ERROR_KEY_CURRENT => $dbVer,
-            self::ERROR_KEY_NEEDED => $configVer,
+            self::ERROR_KEY_REQUIRED => $configVer,
             self::ERROR_KEY_MODULE => $moduleName,
             self::ERROR_KEY_TYPE => 'schema'
         ];
@@ -134,12 +134,12 @@ private function getDbSchemaVersionError($moduleName, $resourceName)
     private function getDbDataVersionError($moduleName, $resourceName)
     {
         $dataVer = $this->moduleResource->getDataVersion($resourceName);
-        $module = $this->moduleList->getModule($moduleName);
-        $configVer = $module['schema_version']; //// IS this right?
+        $module = $this->moduleList->getOne($moduleName);
+        $configVer = $module['schema_version'];
         $dataVer = $dataVer ?: 'none';
         return [
             self::ERROR_KEY_CURRENT => $dataVer,
-            self::ERROR_KEY_NEEDED => $configVer,
+            self::ERROR_KEY_REQUIRED => $configVer,
             self::ERROR_KEY_MODULE => $moduleName,
             self::ERROR_KEY_TYPE => 'data'
         ];
@@ -155,7 +155,7 @@ private function getDbDataVersionError($moduleName, $resourceName)
      */
     private function isModuleVersionEqual($moduleName, $version)
     {
-        $module = $this->moduleList->getModule($moduleName);
+        $module = $this->moduleList->getOne($moduleName);
         if (empty($module['schema_version'])) {
             throw new \UnexpectedValueException("Schema version for module '$moduleName' is not specified");
         }
diff --git a/lib/internal/Magento/Framework/Module/Manager.php b/lib/internal/Magento/Framework/Module/Manager.php
index b74eb4b2f2e01..1f827919f5771 100644
--- a/lib/internal/Magento/Framework/Module/Manager.php
+++ b/lib/internal/Magento/Framework/Module/Manager.php
@@ -31,27 +31,19 @@ class Manager
      */
     private $_outputConfigPaths;
 
-    /**
-     * @var ResourceInterface
-     */
-    private $_moduleResource;
-
     /**
      * @param Output\ConfigInterface $outputConfig
      * @param ModuleListInterface $moduleList
-     * @param ResourceInterface $moduleResource
      * @param array $outputConfigPaths
      */
     public function __construct(
         Output\ConfigInterface $outputConfig,
         ModuleListInterface $moduleList,
-        ResourceInterface $moduleResource,
         array $outputConfigPaths = array()
     ) {
         $this->_outputConfig = $outputConfig;
         $this->_moduleList = $moduleList;
         $this->_outputConfigPaths = $outputConfigPaths;
-        $this->_moduleResource = $moduleResource;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index 764ad1f31e600..48e1823573884 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -55,9 +55,9 @@ public function aroundDispatch(
             if ($errors) {
                 $formattedErrors = $this->formatErrors($errors);
                 throw new \Magento\Framework\Module\Exception(
-                    'Please update your database: first run "composer install" from the Magento root/ and root/setup '.
-                    'directories. Then run "php –f index.php update" from the Magento root/setup directory.'. PHP_EOL .
-                    'Error details: database is out of date.' . PHP_EOL . implode(PHP_EOL, $formattedErrors)
+                    'Please update your database: first run "composer install" from the Magento root/ '.
+                    'directory. Then run "php –f index.php update" from the Magento root/setup directory.'. PHP_EOL .
+                    'The following modules are outdated:' . PHP_EOL . implode(PHP_EOL, $formattedErrors)
                 );
             } else {
                 $this->cache->save('true', 'db_is_up_to_date');
@@ -69,7 +69,7 @@ public function aroundDispatch(
     /**
      * Format each error in the error data from getOutOfDataDbErrors into a single message
      *
-     * @param $errorsData array of error data from getOutOfDateDbErrors
+     * @param array $errorsData array of error data from getOutOfDateDbErrors
      * @return array Messages that can be used to log the error
      */
     private function formatErrors($errorsData)
@@ -79,9 +79,8 @@ private function formatErrors($errorsData)
             $formattedErrors[] = $error[DbVersionDetector::ERROR_KEY_MODULE] .
                 ' ' . $error[DbVersionDetector::ERROR_KEY_TYPE] .
                 ': current version - ' . $error[DbVersionDetector::ERROR_KEY_CURRENT ] .
-                ', latest version - ' . $error[DbVersionDetector::ERROR_KEY_NEEDED];
+                ', required version - ' . $error[DbVersionDetector::ERROR_KEY_REQUIRED];
         }
         return $formattedErrors;
     }
-
 }

From 3af7c9330e84bf7887faeda5d0604dd2bcf0fa94 Mon Sep 17 00:00:00 2001
From: Oleksandr Manchenko <omanchenko@ebay.com>
Date: Tue, 9 Dec 2014 11:51:43 +0200
Subject: [PATCH 160/474] MTA-1161: Update Magento to folloow new tagging
 mechanism

---
 .../AssertMaxRequestedQtyFailMessage.php           |  9 +++------
 .../AssertMinRequestedQtyFailMessage.php           |  9 +++------
 .../Test/Constraint/AssertMsrpNotice.php           |  9 +++------
 ...ertProductConfiguringFromRequiringAttention.php |  9 +++------
 .../AssertProductIsOutOfStockFailMessage.php       |  9 +++------
 .../AssertProductRequiredAttentionFailMessage.php  |  9 +++------
 .../Constraint/AssertProductTierPriceMessage.php   |  9 +++------
 ...roductWithPaymentAgreementsOrderFailMessage.php |  9 +++------
 .../AssertProductsAbsentInRequiringAttention.php   |  9 +++------
 .../AssertProductsAddBySkuSuccessMessage.php       |  9 +++------
 .../Constraint/AssertQtyIncrementsFailMessage.php  |  9 +++------
 .../Constraint/AssertQtyIsNotEnoughFailMessage.php |  9 +++------
 ...quiringAttentionProductSuccessDeleteMessage.php |  9 +++------
 .../Constraint/AssertSkuNotFoundFailMessage.php    |  9 +++------
 .../Constraint/AssertSpecifyProductOptionsLink.php |  9 +++------
 .../AssertWidgetOrderBySkuOnCategoryPage.php       |  9 +++------
 .../Constraint/AssertGlobalSearchCustomerName.php  |  9 +++------
 .../AssertGlobalSearchNoRecordsFound.php           |  9 +++------
 .../Test/Constraint/AssertGlobalSearchOrderId.php  |  9 +++------
 .../Constraint/AssertGlobalSearchProductName.php   |  9 +++------
 .../Backup/Test/Constraint/AssertBackupInGrid.php  |  9 +++------
 .../Test/Constraint/AssertBannerDeleteMessage.php  |  9 +++------
 .../Banner/Test/Constraint/AssertBannerInGrid.php  |  9 +++------
 .../Test/Constraint/AssertBannerInShoppingCart.php |  9 +++------
 .../Constraint/AssertBannerMassDeleteMessage.php   |  9 +++------
 .../Test/Constraint/AssertBannerNotInCartRule.php  |  9 +++------
 .../Constraint/AssertBannerNotInCatalogRule.php    |  9 +++------
 .../Test/Constraint/AssertBannerNotInGrid.php      |  9 +++------
 .../Constraint/AssertBannerNotInShoppingCart.php   |  9 +++------
 .../Constraint/AssertBannerNotInWidgetOptions.php  |  9 +++------
 .../Constraint/AssertBannerNotOnCategoryPage.php   |  9 +++------
 .../Test/Constraint/AssertBannerOnCategoryPage.php |  9 +++------
 .../Constraint/AssertBannerSuccessSaveMessage.php  |  9 +++------
 .../Test/Constraint/AssertWidgetBannerRotator.php  |  9 +++------
 .../AssertWidgetBannerRotatorOnProductPage.php     |  9 +++------
 .../Test/Constraint/AssertBundleInCategory.php     |  9 +++------
 .../Constraint/AssertBundleItemsOnProductPage.php  |  9 +++------
 .../Test/Constraint/AssertBundlePriceType.php      |  9 +++------
 .../Test/Constraint/AssertBundlePriceView.php      |  9 +++------
 .../Test/Constraint/AssertBundleProductForm.php    |  9 +++------
 .../AssertTierPriceOnBundleProductPage.php         |  9 +++------
 .../AssertAbsenceDeleteAttributeButton.php         |  9 +++------
 .../Constraint/AssertAddToCartButtonAbsent.php     |  9 +++------
 .../Constraint/AssertAddToCartButtonPresent.php    |  9 +++------
 .../AssertAddedProductAttributeOnProductForm.php   |  9 +++------
 .../Test/Constraint/AssertAttributeForm.php        |  9 +++------
 .../AssertAttributeOptionsOnProductForm.php        |  9 +++------
 .../AssertAttributeSearchableByLabel.php           |  9 +++------
 .../Constraint/AssertCategoryAbsenceOnBackend.php  |  9 +++------
 .../Constraint/AssertCategoryAbsenceOnFrontend.php |  9 +++------
 .../AssertCategoryForAssignedProducts.php          |  9 +++------
 .../Catalog/Test/Constraint/AssertCategoryForm.php |  9 +++------
 .../Test/Constraint/AssertCategoryIsNotActive.php  |  9 +++------
 .../AssertCategoryIsNotIncludeInMenu.php           |  9 +++------
 .../Catalog/Test/Constraint/AssertCategoryPage.php |  9 +++------
 .../Test/Constraint/AssertCategoryRedirect.php     |  9 +++------
 .../Test/Constraint/AssertCategorySaveMessage.php  |  9 +++------
 .../AssertCategorySuccessDeleteMessage.php         |  9 +++------
 .../Constraint/AssertCrossSellsProductsSection.php |  9 +++------
 .../AssertNoCrossSellsProductsSection.php          |  9 +++------
 .../Constraint/AssertNoRelatedProductsSection.php  |  9 +++------
 .../Constraint/AssertNoUpSellsProductsSection.php  |  9 +++------
 .../AssertProductAttributeAbsenceInGrid.php        |  9 +++------
 ...roductAttributeAbsenceInSearchOnProductForm.php |  9 +++------
 ...sertProductAttributeAbsenceInTemplateGroups.php |  9 +++------
 ...oductAttributeAbsenceInUnassignedAttributes.php |  9 +++------
 .../AssertProductAttributeDisplayingOnFrontend.php |  9 +++------
 ...ssertProductAttributeDisplayingOnSearchForm.php |  9 +++------
 .../Constraint/AssertProductAttributeInGrid.php    |  9 +++------
 .../AssertProductAttributeIsComparable.php         |  9 +++------
 .../AssertProductAttributeIsFilterable.php         |  9 +++------
 .../AssertProductAttributeIsFilterableInSearch.php |  9 +++------
 .../Constraint/AssertProductAttributeIsGlobal.php  |  9 +++------
 .../AssertProductAttributeIsHtmlAllowed.php        |  9 +++------
 .../AssertProductAttributeIsRequired.php           |  9 +++------
 .../Constraint/AssertProductAttributeIsUnique.php  |  9 +++------
 ...ssertProductAttributeIsUsedInSortOnFrontend.php |  9 +++------
 .../AssertProductAttributeIsUsedPromoRules.php     |  9 +++------
 .../AssertProductAttributeSaveMessage.php          |  9 +++------
 .../AssertProductAttributeSuccessDeleteMessage.php |  9 +++------
 .../AssertProductCompareBlockOnCmsPage.php         |  9 +++------
 .../Constraint/AssertProductCompareItemsLink.php   |  9 +++------
 .../AssertProductCompareItemsLinkIsAbsent.php      |  9 +++------
 .../Test/Constraint/AssertProductComparePage.php   |  9 +++------
 ...ssertProductCompareRemoveLastProductMessage.php |  9 +++------
 .../AssertProductCompareSuccessAddMessage.php      |  9 +++------
 ...oductCompareSuccessRemoveAllProductsMessage.php |  9 +++------
 .../AssertProductCompareSuccessRemoveMessage.php   |  9 +++------
 .../AssertProductCustomOptionsOnProductPage.php    |  9 +++------
 ...rtProductDuplicateIsNotDisplayingOnFrontend.php |  9 +++------
 .../Constraint/AssertProductDuplicateMessage.php   |  9 +++------
 .../Constraint/AssertProductDuplicatedInGrid.php   |  9 +++------
 .../Catalog/Test/Constraint/AssertProductForm.php  |  9 +++------
 .../AssertProductGroupedPriceOnProductPage.php     |  9 +++------
 .../Test/Constraint/AssertProductInCart.php        |  9 +++------
 .../Test/Constraint/AssertProductInCategory.php    |  9 +++------
 .../Test/Constraint/AssertProductInGrid.php        |  9 +++------
 .../Test/Constraint/AssertProductInStock.php       |  9 +++------
 .../AssertProductIsNotDisplayingOnFrontend.php     |  9 +++------
 .../AssertProductIsNotVisibleInCompareBlock.php    |  9 +++------
 .../AssertProductIsNotVisibleInComparePage.php     |  9 +++------
 .../Test/Constraint/AssertProductNotInGrid.php     |  9 +++------
 .../Constraint/AssertProductNotSearchableBySku.php |  9 +++------
 .../AssertProductNotVisibleInCategory.php          |  9 +++------
 .../Test/Constraint/AssertProductOutOfStock.php    |  9 +++------
 .../Catalog/Test/Constraint/AssertProductPage.php  |  9 +++------
 .../Test/Constraint/AssertProductSaveMessage.php   |  9 +++------
 .../Constraint/AssertProductSearchableBySku.php    |  9 +++------
 .../AssertProductSimpleDuplicateForm.php           |  9 +++------
 .../Constraint/AssertProductSkuAutoGenerated.php   |  9 +++------
 .../AssertProductSpecialPriceOnProductPage.php     |  9 +++------
 .../AssertProductSuccessDeleteMessage.php          |  9 +++------
 .../Test/Constraint/AssertProductTemplateForm.php  |  9 +++------
 .../AssertProductTemplateGroupOnProductForm.php    |  9 +++------
 .../Constraint/AssertProductTemplateInGrid.php     |  9 +++------
 .../Constraint/AssertProductTemplateNotInGrid.php  |  9 +++------
 .../AssertProductTemplateOnProductForm.php         |  9 +++------
 .../AssertProductTemplateSuccessDeleteMessage.php  |  9 +++------
 .../AssertProductTemplateSuccessSaveMessage.php    |  9 +++------
 .../AssertProductTierPriceOnProductPage.php        |  9 +++------
 .../Catalog/Test/Constraint/AssertProductView.php  |  9 +++------
 .../Constraint/AssertProductVisibleInCategory.php  |  9 +++------
 .../Constraint/AssertRelatedProductsSection.php    |  9 +++------
 .../Constraint/AssertUpSellsProductsSection.php    |  9 +++------
 ...tUsedSuperAttributeImpossibleDeleteMessages.php |  9 +++------
 .../Constraint/AssertCatalogEventBlockAbsent.php   |  9 +++------
 .../Constraint/AssertCatalogEventBlockVisible.php  |  9 +++------
 .../Test/Constraint/AssertCatalogEventInGrid.php   |  9 +++------
 .../Test/Constraint/AssertCatalogEventIsClosed.php |  9 +++------
 .../Test/Constraint/AssertCatalogEventIsOpen.php   |  9 +++------
 .../Constraint/AssertCatalogEventIsUpcoming.php    |  9 +++------
 .../Test/Constraint/AssertCatalogEventStatus.php   |  9 +++------
 .../AssertCatalogEventSuccessCreateMessage.php     |  9 +++------
 .../AssertCatalogEventSuccessDeleteMessage.php     |  9 +++------
 .../Test/Constraint/AssertWidgetCatalogEvent.php   |  9 +++------
 .../AssertCatalogPriceRuleAppliedCatalogPage.php   |  9 +++------
 .../AssertCatalogPriceRuleAppliedProductPage.php   |  9 +++------
 .../AssertCatalogPriceRuleAppliedShoppingCart.php  |  9 +++------
 .../Test/Constraint/AssertCatalogPriceRuleForm.php |  9 +++------
 .../Constraint/AssertCatalogPriceRuleInGrid.php    |  9 +++------
 .../Constraint/AssertCatalogPriceRuleNotInGrid.php |  9 +++------
 .../AssertCatalogPriceRuleNoticeMessage.php        |  9 +++------
 .../AssertCatalogPriceRuleSuccessDeleteMessage.php |  9 +++------
 .../AssertCatalogPriceRuleSuccessSaveMessage.php   |  9 +++------
 .../AssertAdvancedSearchProductsResult.php         |  9 +++------
 .../Test/Constraint/AssertCatalogSearchResult.php  |  9 +++------
 .../AssertSearchSynonymMassActionNotOnFrontend.php |  9 +++------
 .../AssertSearchSynonymNotOnFrontend.php           |  9 +++------
 .../Test/Constraint/AssertSearchTermForm.php       |  9 +++------
 .../Test/Constraint/AssertSearchTermInGrid.php     |  9 +++------
 .../AssertSearchTermMassActionNotOnFrontend.php    |  9 +++------
 .../AssertSearchTermMassActionsNotInGrid.php       |  9 +++------
 .../Test/Constraint/AssertSearchTermNotInGrid.php  |  9 +++------
 .../Constraint/AssertSearchTermNotOnFrontend.php   |  9 +++------
 .../Test/Constraint/AssertSearchTermOnFrontend.php |  9 +++------
 .../AssertSearchTermSuccessDeleteMessage.php       |  9 +++------
 .../AssertSearchTermSuccessMassDeleteMessage.php   |  9 +++------
 .../AssertSearchTermSuccessSaveMessage.php         |  9 +++------
 .../AssertSearchTermSynonymOnFrontend.php          |  9 +++------
 .../Constraint/AssertSuggestSearchingResult.php    |  9 +++------
 .../AssertAddedProductToCartSuccessMessage.php     |  9 +++------
 .../Checkout/Test/Constraint/AssertCartIsEmpty.php |  9 +++------
 .../Test/Constraint/AssertCartItemsOptions.php     |  9 +++------
 .../Constraint/AssertGrandTotalInShoppingCart.php  |  9 +++------
 .../Constraint/AssertOrderSuccessPlacedMessage.php |  9 +++------
 .../Constraint/AssertOrderTotalOnReviewPage.php    |  9 +++------
 .../Test/Constraint/AssertPriceInShoppingCart.php  |  9 +++------
 .../AssertProductAbsentInMiniShoppingCart.php      |  9 +++------
 .../Test/Constraint/AssertProductIsNotEditable.php |  9 +++------
 .../AssertProductPresentInMiniShoppingCart.php     |  9 +++------
 .../AssertProductPresentInShoppingCart.php         |  9 +++------
 .../AssertProductQtyInMiniShoppingCart.php         |  9 +++------
 .../Constraint/AssertProductQtyInShoppingCart.php  |  9 +++------
 .../Constraint/AssertSubtotalInShoppingCart.php    |  9 +++------
 .../Test/Constraint/AssertTermAbsentInGrid.php     |  9 +++------
 .../Test/Constraint/AssertTermAbsentOnCheckout.php |  9 +++------
 .../Test/Constraint/AssertTermInGrid.php           |  9 +++------
 .../Test/Constraint/AssertTermOnCheckout.php       |  9 +++------
 .../Constraint/AssertTermSuccessDeleteMessage.php  |  9 +++------
 .../Constraint/AssertTermSuccessSaveMessage.php    |  9 +++------
 .../Constraint/AssertCmsBlockDeleteMessage.php     |  9 +++------
 .../Cms/Test/Constraint/AssertCmsBlockInGrid.php   |  9 +++------
 .../Test/Constraint/AssertCmsBlockNotInGrid.php    |  9 +++------
 .../Constraint/AssertCmsBlockNotOnCategoryPage.php |  9 +++------
 .../Constraint/AssertCmsBlockOnCategoryPage.php    |  9 +++------
 .../AssertCmsBlockSuccessSaveMessage.php           |  9 +++------
 .../Test/Constraint/AssertCmsPageDeleteMessage.php |  9 +++------
 .../Constraint/AssertCmsPageDisabledOnFrontend.php |  9 +++------
 .../AssertCmsPageDuplicateErrorMessage.php         |  9 +++------
 .../Cms/Test/Constraint/AssertCmsPageForm.php      |  9 +++------
 .../Cms/Test/Constraint/AssertCmsPageInGrid.php    |  9 +++------
 .../Cms/Test/Constraint/AssertCmsPageNotInGrid.php |  9 +++------
 .../Cms/Test/Constraint/AssertCmsPagePreview.php   |  9 +++------
 .../Constraint/AssertCmsPageSuccessSaveMessage.php |  9 +++------
 .../Constraint/AssertUrlRewriteCmsPageRedirect.php |  9 +++------
 .../AssertChildProductIsNotDisplayedSeparately.php |  9 +++------
 .../Test/Constraint/AssertChildProductsInGrid.php  |  9 +++------
 .../Constraint/AssertConfigurableProductForm.php   |  9 +++------
 ...rtProductAttributeAbsenceInVariationsSearch.php |  9 +++------
 .../AssertProductAttributeIsConfigurable.php       |  9 +++------
 .../Test/Constraint/AssertCustomVariableForm.php   |  9 +++------
 .../Test/Constraint/AssertCustomVariableInGrid.php |  9 +++------
 .../Test/Constraint/AssertCustomVariableInPage.php |  9 +++------
 .../AssertCustomVariableNotInCmsPageForm.php       |  9 +++------
 .../Constraint/AssertCustomVariableNotInGrid.php   |  9 +++------
 .../AssertCustomVariableSuccessDeleteMessage.php   |  9 +++------
 .../AssertCustomVariableSuccessSaveMessage.php     |  9 +++------
 .../AssertCurrencySymbolOnCatalogPage.php          |  9 +++------
 .../AssertCurrencySymbolSuccessSaveMessage.php     |  9 +++------
 .../Constraint/AssertAddressDeletedBackend.php     |  9 +++------
 .../Constraint/AssertAddressDeletedFrontend.php    |  9 +++------
 .../Constraint/AssertChangePasswordFailMessage.php |  9 +++------
 .../AssertCustomerAddressSuccessSaveMessage.php    |  9 +++------
 .../Constraint/AssertCustomerDefaultAddresses.php  |  9 +++------
 .../AssertCustomerFailRegisterMessage.php          |  9 +++------
 .../Test/Constraint/AssertCustomerForm.php         |  9 +++------
 .../AssertCustomerGroupAlreadyExists.php           |  9 +++------
 .../Test/Constraint/AssertCustomerGroupForm.php    |  9 +++------
 .../Test/Constraint/AssertCustomerGroupInGrid.php  |  9 +++------
 .../Constraint/AssertCustomerGroupNotInGrid.php    |  9 +++------
 .../AssertCustomerGroupOnCustomerForm.php          |  9 +++------
 .../AssertCustomerGroupSuccessDeleteMessage.php    |  9 +++------
 .../AssertCustomerGroupSuccessSaveMessage.php      |  9 +++------
 .../Test/Constraint/AssertCustomerInGrid.php       |  9 +++------
 .../AssertCustomerInfoSuccessSavedMessage.php      |  9 +++------
 .../Test/Constraint/AssertCustomerInvalidEmail.php |  9 +++------
 .../Constraint/AssertCustomerMassDeleteInGrid.php  |  9 +++------
 .../AssertCustomerMassDeleteNotInGrid.php          |  9 +++------
 .../AssertCustomerMassDeleteSuccessMessage.php     |  9 +++------
 .../Test/Constraint/AssertCustomerNotInGrid.php    |  9 +++------
 .../AssertCustomerSuccessDeleteMessage.php         |  9 +++------
 .../AssertCustomerSuccessRegisterMessage.php       |  9 +++------
 .../AssertCustomerSuccessSaveMessage.php           |  9 +++------
 .../AssertMassActionSuccessUpdateMessage.php       |  9 +++------
 .../Constraint/AssertCustomerBalanceAmount.php     |  9 +++------
 .../Constraint/AssertCustomerBalanceHistory.php    |  9 +++------
 .../AssertRemoveStoreCreditSuccessMessage.php      |  9 +++------
 ...ustomerCustomAttributeErrorDuplicateMessage.php |  9 +++------
 ...ertCustomerCustomAttributeInCustomerSegment.php |  9 +++------
 .../AssertCustomerCustomAttributeInGrid.php        |  9 +++------
 ...CustomerCustomAttributeNotInCustomerSegment.php |  9 +++------
 .../AssertCustomerCustomAttributeNotInGrid.php     |  9 +++------
 ...ustomerCustomAttributeNotOnCheckoutRegister.php |  9 +++------
 ...tomerCustomAttributeNotOnCreateOrderBackend.php |  9 +++------
 ...ustomerCustomAttributeNotOnCustomerEditPage.php |  9 +++------
 ...ustomerCustomAttributeNotOnCustomerRegister.php |  9 +++------
 ...rtCustomerCustomAttributeOnCheckoutRegister.php |  9 +++------
 ...CustomerCustomAttributeOnCreateOrderBackend.php |  9 +++------
 ...rtCustomerCustomAttributeOnCustomerEditPage.php |  9 +++------
 ...rtCustomerCustomAttributeOnCustomerRegister.php |  9 +++------
 ...CustomerCustomAttributeSuccessDeleteMessage.php |  9 +++------
 ...rtCustomerCustomAttributeSuccessSaveMessage.php |  9 +++------
 .../AssertCustomerSegmentAvailableInBannerForm.php |  9 +++------
 .../Test/Constraint/AssertCustomerSegmentForm.php  |  9 +++------
 ...ertCustomerSegmentInCartPriceRuleIsApplying.php |  9 +++------
 ...CustomerSegmentInCartPriceRuleIsNotApplying.php |  9 +++------
 .../Constraint/AssertCustomerSegmentInGrid.php     |  9 +++------
 .../AssertCustomerSegmentMatchedCustomer.php       |  9 +++------
 ...ssertCustomerSegmentMatchedCustomerWithCart.php |  9 +++------
 ...AssertCustomerSegmentMatchedCustomersInGrid.php |  9 +++------
 .../AssertCustomerSegmentNotApplicableToBanner.php |  9 +++------
 .../Constraint/AssertCustomerSegmentNotInGrid.php  |  9 +++------
 .../AssertCustomerSegmentReportInGrid.php          |  9 +++------
 .../AssertCustomerSegmentReportMessage.php         |  9 +++------
 .../AssertCustomerSegmentReportNotInGrid.php       |  9 +++------
 .../AssertCustomerSegmentSuccessDeleteMessage.php  |  9 +++------
 .../AssertCustomerSegmentSuccessSaveMessage.php    |  9 +++------
 .../Constraint/AssertDownloadableDuplicateForm.php |  9 +++------
 .../Constraint/AssertDownloadableLinksData.php     |  9 +++------
 .../Constraint/AssertDownloadableSamplesData.php   |  9 +++------
 .../Constraint/AssertGiftCardDuplicatedInGrid.php  |  9 +++------
 .../AssertGiftCardProductAddToCartForm.php         |  9 +++------
 .../Test/Constraint/AssertGiftCardProductForm.php  |  9 +++------
 .../Test/Constraint/AssertGiftCardAccountForm.php  |  9 +++------
 ...tGiftCardAccountIsNotUsableInCartOnFrontend.php |  9 +++------
 .../Constraint/AssertGiftCardAccountNotInGrid.php  |  9 +++------
 ...ssertGiftCardAccountNotRedeemableOnFrontend.php |  9 +++------
 .../AssertGiftCardAccountRedeemableOnFrontend.php  |  9 +++------
 .../AssertGiftCardAccountSaveMessage.php           |  9 +++------
 ...ssertGiftCardAccountStatusInCustomerAccount.php |  9 +++------
 .../AssertGiftCardAccountStatusInShoppingCart.php  |  9 +++------
 .../AssertGiftCardAccountSuccessDeleteMessage.php  |  9 +++------
 ...AssertGiftCardAccountUsableInCartOnFrontend.php |  9 +++------
 .../Test/Constraint/AssertGiftCardDiscount.php     |  9 +++------
 .../Constraint/AssertGiftCardSuccessAddMessage.php |  9 +++------
 .../AssertGiftMessageInFrontendOrder.php           |  9 +++------
 .../AssertGiftMessageInFrontendOrderItems.php      |  9 +++------
 .../AssertGiftRegistryActiveInShoppingCart.php     |  9 +++------
 .../AssertGiftRegistryActiveInWishlist.php         |  9 +++------
 .../Test/Constraint/AssertGiftRegistryForm.php     |  9 +++------
 .../Test/Constraint/AssertGiftRegistryInGrid.php   |  9 +++------
 .../AssertGiftRegistryInactiveNotInWishlist.php    |  9 +++------
 .../AssertGiftRegistryIsEmptyMessage.php           |  9 +++------
 .../Constraint/AssertGiftRegistryItemsForm.php     |  9 +++------
 ...tRegistryItemsUpdatedFrontendSuccessMessage.php |  9 +++------
 ...ssertGiftRegistryItemsUpdatedSuccessMessage.php |  9 +++------
 .../AssertGiftRegistryManageItemsTab.php           |  9 +++------
 .../Constraint/AssertGiftRegistryNotInGrid.php     |  9 +++------
 .../AssertGiftRegistrySuccessAddedItemsMessage.php |  9 +++------
 ...rtGiftRegistrySuccessDeleteMessageOnBackend.php |  9 +++------
 .../AssertGiftRegistrySuccessSaveMessage.php       |  9 +++------
 ...ertGiftRegistrySuccessShareMessageOnBackend.php |  9 +++------
 ...rtGiftRegistrySuccessShareMessageOnFrontend.php |  9 +++------
 .../Test/Constraint/AssertGiftRegistryTypeForm.php |  9 +++------
 .../Constraint/AssertGiftRegistryTypeInGrid.php    |  9 +++------
 .../Constraint/AssertGiftRegistryTypeNotInGrid.php |  9 +++------
 .../AssertGiftRegistryTypeNotOnFrontend.php        |  9 +++------
 .../AssertGiftRegistryTypeOnFrontend.php           |  9 +++------
 .../AssertGiftRegistryTypeSuccessDeleteMessage.php |  9 +++------
 .../AssertGiftRegistryTypeSuccessSaveMessage.php   |  9 +++------
 .../Test/Constraint/AssertGiftWrappingForm.php     |  9 +++------
 .../Test/Constraint/AssertGiftWrappingInGrid.php   |  9 +++------
 .../AssertGiftWrappingMassActionForm.php           |  9 +++------
 .../AssertGiftWrappingMassActionInGrid.php         |  9 +++------
 .../AssertGiftWrappingMassActionNotInGrid.php      |  9 +++------
 ...tGiftWrappingMassActionSuccessDeleteMessage.php |  9 +++------
 .../Constraint/AssertGiftWrappingNotInGrid.php     |  9 +++------
 .../AssertGiftWrappingNotOnFrontendCheckout.php    |  9 +++------
 .../AssertGiftWrappingNotOnOrderCreationPage.php   |  9 +++------
 .../AssertGiftWrappingOnFrontendCheckout.php       |  9 +++------
 .../AssertGiftWrappingSuccessDeleteMessage.php     |  9 +++------
 .../AssertGiftWrappingSuccessSaveMessage.php       |  9 +++------
 .../AssertGiftWrappingSuccessUpdateMessage.php     |  9 +++------
 ...tProductAttributeAbsenceForAttributeMapping.php |  9 +++------
 .../AssertGroupedPriceOnGroupedProductPage.php     |  9 +++------
 .../Test/Constraint/AssertGroupedProductForm.php   |  9 +++------
 .../AssertGroupedProductInItemsOrderedGrid.php     |  9 +++------
 .../Constraint/AssertGroupedProductsDefaultQty.php |  9 +++------
 .../AssertSpecialPriceOnGroupedProductPage.php     |  9 +++------
 .../AssertTierPriceOnGroupedProductPage.php        |  9 +++------
 .../AssertProductAttributeAbsenceForExport.php     |  9 +++------
 .../Test/Constraint/AssertIntegrationForm.php      |  9 +++------
 .../Test/Constraint/AssertIntegrationInGrid.php    |  9 +++------
 .../Test/Constraint/AssertIntegrationNotInGrid.php |  9 +++------
 .../Constraint/AssertIntegrationResourcesPopup.php |  9 +++------
 .../AssertIntegrationSuccessActivationMessage.php  |  9 +++------
 .../AssertIntegrationSuccessDeleteMessage.php      |  9 +++------
 .../AssertIntegrationSuccessSaveMessage.php        |  9 +++------
 .../Constraint/AssertIntegrationTokensPopup.php    |  9 +++------
 .../AssertInvitationErrorSentMessage.php           |  9 +++------
 ...InvitationFrontendErrorSendDuplicateMessage.php |  9 +++------
 .../AssertInvitationFrontendSuccessSentMessage.php |  9 +++------
 .../AssertInvitationInGridOnFrontend.php           |  9 +++------
 .../Test/Constraint/AssertInvitationOneEntry.php   |  9 +++------
 .../Test/Constraint/AssertAdminUserDataBlock.php   |  9 +++------
 .../AbstractAssertMultipleWishlistState.php        |  9 +++------
 ...bstractAssertMultipleWishlistSuccessMessage.php |  9 +++------
 ...ssertBundleProductDetailsInMultipleWishlist.php |  9 +++------
 .../AssertDeleteMultipleWishlistButtonIsAbsent.php |  9 +++------
 .../AssertMultipleWishlistAbsentInMyAccount.php    |  9 +++------
 .../AssertMultipleWishlistPresentInMyAccount.php   |  9 +++------
 .../AssertProductAbsentInDefaultWishlist.php       |  9 +++------
 .../Constraint/AssertProductInCustomWishlist.php   |  9 +++------
 .../Constraint/AssertProductInDefaultWishlist.php  |  9 +++------
 .../Test/Constraint/AssertWishlistReportGrid.php   |  9 +++------
 .../AssertCustomerIsSubscribedToNewsletter.php     |  9 +++------
 .../Test/Constraint/AssertNewsletterForm.php       |  9 +++------
 .../Test/Constraint/AssertNewsletterInGrid.php     |  9 +++------
 .../Test/Constraint/AssertNewsletterPreview.php    |  9 +++------
 .../Test/Constraint/AssertNewsletterQueue.php      |  9 +++------
 .../AssertNewsletterSuccessCreateMessage.php       |  9 +++------
 .../AbstractAssertCustomerOrderReportResult.php    |  9 +++------
 .../AssertAbandonedCartCustomerInfoResult.php      |  9 +++------
 .../Test/Constraint/AssertCouponReportResult.php   |  9 +++------
 .../AssertCustomerOrderCountReportResult.php       |  9 +++------
 .../AssertCustomerOrderTotalReportResult.php       |  9 +++------
 .../Constraint/AssertDownloadsReportResult.php     |  9 +++------
 .../AssertInvoiceReportIntervalResult.php          |  9 +++------
 .../Constraint/AssertInvoiceReportTotalResult.php  |  9 +++------
 .../Constraint/AssertLowStockProductInGrid.php     |  9 +++------
 .../AssertNewAccountsReportTotalResult.php         |  9 +++------
 .../Test/Constraint/AssertOrderedProductResult.php |  9 +++------
 .../Test/Constraint/AssertProductInCartResult.php  |  9 +++------
 .../AssertProductReportByCustomerInGrid.php        |  9 +++------
 .../AssertProductReportByCustomerNotInGrid.php     |  9 +++------
 .../AssertProductReviewIsAvailableForProduct.php   |  9 +++------
 .../AssertProductReviewReportIsVisibleInGrid.php   |  9 +++------
 .../AssertProductReviewsQtyByCustomer.php          |  9 +++------
 .../AssertProductViewsReportTotalResult.php        |  9 +++------
 .../AssertRefundReportIntervalResult.php           |  9 +++------
 .../Constraint/AssertSalesReportIntervalResult.php |  9 +++------
 .../Constraint/AssertSalesReportTotalResult.php    |  9 +++------
 .../Test/Constraint/AssertSearchTermReportForm.php |  9 +++------
 .../Test/Constraint/AssertSearchTermsInGrid.php    |  9 +++------
 .../Test/Constraint/AssertTaxReportInGrid.php      |  9 +++------
 .../Test/Constraint/AssertTaxReportNotInGrid.php   |  9 +++------
 .../Test/Constraint/AssertProductRatingInGrid.php  |  9 +++------
 .../AssertProductRatingInProductPage.php           |  9 +++------
 .../Constraint/AssertProductRatingNotInGrid.php    |  9 +++------
 .../AssertProductRatingNotInProductPage.php        |  9 +++------
 .../Constraint/AssertProductRatingOnReviewPage.php |  9 +++------
 .../AssertProductRatingSuccessDeleteMessage.php    |  9 +++------
 .../AssertProductRatingSuccessSaveMessage.php      |  9 +++------
 ...ssertProductReviewBackendSuccessSaveMessage.php |  9 +++------
 .../Test/Constraint/AssertProductReviewInGrid.php  |  9 +++------
 .../AssertProductReviewInGridOnCustomerPage.php    |  9 +++------
 ...ProductReviewMassActionSuccessDeleteMessage.php |  9 +++------
 ...AssertProductReviewMassActionSuccessMessage.php |  9 +++------
 .../Constraint/AssertProductReviewNotInGrid.php    |  9 +++------
 .../AssertProductReviewNotOnProductPage.php        |  9 +++------
 .../AssertProductReviewOnProductPage.php           |  9 +++------
 .../AssertReviewCreationSuccessMessage.php         |  9 +++------
 .../Constraint/AssertReviewSuccessSaveMessage.php  |  9 +++------
 .../Constraint/AssertRateSuccessSaveMessage.php    |  9 +++------
 .../Test/Constraint/AssertRewardInHistoryGrid.php  |  9 +++------
 ...tRewardNoExchangeMessageForCurrencyToPoints.php |  9 +++------
 ...tRewardNoExchangeMessageForPointsToCurrency.php |  9 +++------
 .../Test/Constraint/AssertRewardPointsBalance.php  |  9 +++------
 ...rtRewardPointsMessageOnCustomerRegistration.php |  9 +++------
 .../AssertRewardPointsMessageOnShoppingCart.php    |  9 +++------
 .../AssertRewardPointsSuccessDeleteMessage.php     |  9 +++------
 .../AssertRewardPointsSuccessRemoveMessage.php     |  9 +++------
 .../AssertRewardSubscriptionOnBackend.php          |  9 +++------
 .../AssertRewardSubscriptionSaveMessage.php        |  9 +++------
 .../Test/Constraint/AssertCreditMemoButton.php     |  9 +++------
 .../Test/Constraint/AssertCreditMemoItems.php      |  9 +++------
 .../Constraint/AssertInvoiceInInvoicesGrid.php     |  9 +++------
 .../Test/Constraint/AssertInvoiceInInvoicesTab.php |  9 +++------
 .../Sales/Test/Constraint/AssertInvoiceItems.php   |  9 +++------
 .../AssertInvoiceSuccessCreateMessage.php          |  9 +++------
 .../AssertInvoiceWithShipmentSuccessMessage.php    |  9 +++------
 .../Constraint/AssertInvoicedAmountOnFrontend.php  |  9 +++------
 .../Test/Constraint/AssertNoCreditMemoButton.php   |  9 +++------
 .../Test/Constraint/AssertNoInvoiceButton.php      |  9 +++------
 .../Constraint/AssertOrderButtonsAvailable.php     |  9 +++------
 .../Constraint/AssertOrderButtonsUnavailable.php   |  9 +++------
 .../AssertOrderCancelMassActionFailMessage.php     |  9 +++------
 .../AssertOrderCancelMassActionSuccessMessage.php  |  9 +++------
 .../Constraint/AssertOrderCancelSuccessMessage.php |  9 +++------
 .../Test/Constraint/AssertOrderGrandTotal.php      |  9 +++------
 .../Test/Constraint/AssertOrderInOrdersGrid.php    |  9 +++------
 .../AssertOrderInOrdersGridOnFrontend.php          |  9 +++------
 .../AssertOrderMassOnHoldSuccessMessage.php        |  9 +++------
 .../Test/Constraint/AssertOrderNotInOrdersGrid.php |  9 +++------
 .../AssertOrderNotVisibleOnMyAccount.php           |  9 +++------
 .../Constraint/AssertOrderOnHoldFailMessage.php    |  9 +++------
 .../Constraint/AssertOrderOnHoldSuccessMessage.php |  9 +++------
 .../Constraint/AssertOrderReleaseFailMessage.php   |  9 +++------
 .../AssertOrderReleaseSuccessMessage.php           |  9 +++------
 .../AssertOrderStatusDuplicateStatus.php           |  9 +++------
 .../Test/Constraint/AssertOrderStatusInGrid.php    |  9 +++------
 .../Test/Constraint/AssertOrderStatusIsCorrect.php |  9 +++------
 .../Constraint/AssertOrderStatusNotAssigned.php    |  9 +++------
 .../AssertOrderStatusSuccessAssignMessage.php      |  9 +++------
 .../AssertOrderStatusSuccessCreateMessage.php      |  9 +++------
 .../AssertOrderStatusSuccessUnassignMessage.php    |  9 +++------
 .../Constraint/AssertOrderSuccessCreateMessage.php |  9 +++------
 .../Test/Constraint/AssertOrdersInOrdersGrid.php   |  9 +++------
 .../Constraint/AssertRefundInCreditMemoTab.php     |  9 +++------
 .../Test/Constraint/AssertRefundInRefundsGrid.php  |  9 +++------
 .../AssertRefundSuccessCreateMessage.php           |  9 +++------
 .../AssertRefundedGrandTotalOnFrontend.php         |  9 +++------
 .../Constraint/AssertReorderStatusIsCorrect.php    |  9 +++------
 .../Sales/Test/Constraint/AssertUnholdButton.php   |  9 +++------
 .../Constraint/AssertArchiveCreditMemoInGrid.php   |  9 +++------
 .../Constraint/AssertArchiveCreditMemoItems.php    |  9 +++------
 .../Test/Constraint/AssertArchiveInvoiceInGrid.php |  9 +++------
 .../Test/Constraint/AssertArchiveInvoiceItems.php  |  9 +++------
 .../AssertArchiveOrderAvailableButtons.php         |  9 +++------
 ...ertArchiveOrderCancelMassActionErrorMessage.php |  9 +++------
 ...tArchiveOrderCancelMassActionSuccessMessage.php |  9 +++------
 .../Test/Constraint/AssertArchiveOrderInGrid.php   |  9 +++------
 .../Constraint/AssertArchiveOrderNotInGrid.php     |  9 +++------
 .../AssertArchiveOrderOnHoldErrorMessage.php       |  9 +++------
 .../AssertArchiveOrderOnHoldSuccessMessage.php     |  9 +++------
 .../AssertArchiveOrderReleaseErrorMessage.php      |  9 +++------
 .../AssertArchiveOrderReleaseSuccessMessage.php    |  9 +++------
 .../Constraint/AssertArchiveOrderStatusInGrid.php  |  9 +++------
 .../AssertArchiveOrderSuccessMessage.php           |  9 +++------
 .../AssertArchiveOrderSuccessRemoveMessage.php     |  9 +++------
 .../AssertArchiveOrderWarningMessage.php           |  9 +++------
 ...ssertArchiveOrdersCancelMassActionsMessages.php |  9 +++------
 .../Test/Constraint/AssertArchiveOrdersInGrid.php  |  9 +++------
 .../Constraint/AssertArchiveShipmentInGrid.php     |  9 +++------
 .../Test/Constraint/AssertArchiveShipmentItems.php |  9 +++------
 .../AssertCartPriceRuleConditionIsApplied.php      |  9 +++------
 .../AssertCartPriceRuleConditionIsNotApplied.php   |  9 +++------
 .../Test/Constraint/AssertCartPriceRuleForm.php    |  9 +++------
 .../AssertCartPriceRuleFreeShippingIsApplied.php   |  9 +++------
 .../AssertCartPriceRuleIsNotPresentedInGrid.php    |  9 +++------
 .../AssertCartPriceRuleSuccessDeleteMessage.php    |  9 +++------
 .../AssertCartPriceRuleSuccessSaveMessage.php      |  9 +++------
 .../Test/Constraint/AssertNoShipButton.php         |  9 +++------
 .../Test/Constraint/AssertShipTotalQuantity.php    |  9 +++------
 .../Constraint/AssertShipmentInShipmentsGrid.php   |  9 +++------
 .../Constraint/AssertShipmentInShipmentsTab.php    |  9 +++------
 .../Test/Constraint/AssertShipmentItems.php        |  9 +++------
 .../AssertShipmentSuccessCreateMessage.php         |  9 +++------
 .../Test/Constraint/AssertSitemapContent.php       |  9 +++------
 .../AssertSitemapFailFolderSaveMessage.php         |  9 +++------
 .../AssertSitemapFailPathSaveMessage.php           |  9 +++------
 .../Test/Constraint/AssertSitemapInGrid.php        |  9 +++------
 .../Test/Constraint/AssertSitemapNotInGrid.php     |  9 +++------
 .../AssertSitemapSuccessDeleteMessage.php          |  9 +++------
 .../AssertSitemapSuccessGenerateMessage.php        |  9 +++------
 ...AssertSitemapSuccessSaveAndGenerateMessages.php |  9 +++------
 .../Constraint/AssertSitemapSuccessSaveMessage.php |  9 +++------
 .../Store/Test/Constraint/AssertStoreBackend.php   |  9 +++------
 .../Store/Test/Constraint/AssertStoreForm.php      |  9 +++------
 .../Store/Test/Constraint/AssertStoreFrontend.php  |  9 +++------
 .../Store/Test/Constraint/AssertStoreGroupForm.php |  9 +++------
 .../Test/Constraint/AssertStoreGroupInGrid.php     |  9 +++------
 .../Test/Constraint/AssertStoreGroupNotInGrid.php  |  9 +++------
 .../Constraint/AssertStoreGroupOnStoreViewForm.php |  9 +++------
 ...ertStoreGroupSuccessDeleteAndBackupMessages.php |  9 +++------
 .../AssertStoreGroupSuccessDeleteMessage.php       |  9 +++------
 .../AssertStoreGroupSuccessSaveMessage.php         |  9 +++------
 .../Store/Test/Constraint/AssertStoreInGrid.php    |  9 +++------
 .../Store/Test/Constraint/AssertStoreNotInGrid.php |  9 +++------
 .../Test/Constraint/AssertStoreNotOnFrontend.php   |  9 +++------
 .../AssertStoreSuccessDeleteAndBackupMessages.php  |  9 +++------
 .../Constraint/AssertStoreSuccessDeleteMessage.php |  9 +++------
 .../Constraint/AssertStoreSuccessSaveMessage.php   |  9 +++------
 .../Store/Test/Constraint/AssertWebsiteForm.php    |  9 +++------
 .../Store/Test/Constraint/AssertWebsiteInGrid.php  |  9 +++------
 .../Test/Constraint/AssertWebsiteNotInGrid.php     |  9 +++------
 .../Test/Constraint/AssertWebsiteOnStoreForm.php   |  9 +++------
 ...AssertWebsiteSuccessDeleteAndBackupMessages.php |  9 +++------
 .../AssertWebsiteSuccessDeleteMessage.php          |  9 +++------
 .../Constraint/AssertWebsiteSuccessSaveMessage.php |  9 +++------
 ...CrossSellsProductsSectionForCustomerSegment.php |  9 +++------
 .../Test/Constraint/AssertTargetRuleForm.php       |  9 +++------
 .../Test/Constraint/AssertTargetRuleInGrid.php     |  9 +++------
 .../AssertTargetRuleIsNotPresentedInGrid.php       |  9 +++------
 .../AssertTargetRuleSuccessDeleteMessage.php       |  9 +++------
 .../AssertTargetRuleSuccessSaveMessage.php         |  9 +++------
 .../Tax/Test/Constraint/AssertTaxRateForm.php      |  9 +++------
 .../Tax/Test/Constraint/AssertTaxRateInGrid.php    |  9 +++------
 .../Tax/Test/Constraint/AssertTaxRateInTaxRule.php |  9 +++------
 .../Constraint/AssertTaxRateIsInCorrectRange.php   |  9 +++------
 .../Tax/Test/Constraint/AssertTaxRateNotInGrid.php |  9 +++------
 .../Test/Constraint/AssertTaxRateNotInTaxRule.php  |  9 +++------
 .../AssertTaxRateSuccessDeleteMessage.php          |  9 +++------
 .../Constraint/AssertTaxRateSuccessSaveMessage.php |  9 +++------
 .../Tax/Test/Constraint/AssertTaxRuleForm.php      |  9 +++------
 .../Tax/Test/Constraint/AssertTaxRuleInGrid.php    |  9 +++------
 .../Tax/Test/Constraint/AssertTaxRuleIsApplied.php |  9 +++------
 .../AssertTaxRuleIsAppliedToAllPrices.php          |  9 +++------
 .../Test/Constraint/AssertTaxRuleIsNotApplied.php  |  9 +++------
 .../Tax/Test/Constraint/AssertTaxRuleNotInGrid.php |  9 +++------
 .../AssertTaxRuleSuccessDeleteMessage.php          |  9 +++------
 .../Constraint/AssertTaxRuleSuccessSaveMessage.php |  9 +++------
 .../Constraint/AssertTaxWithCrossBorderApplied.php |  9 +++------
 .../AssertTaxWithCrossBorderNotApplied.php         |  9 +++------
 .../AssertPageByUrlRewriteIsNotFound.php           |  9 +++------
 .../Constraint/AssertUrlRewriteCategoryInGrid.php  |  9 +++------
 .../AssertUrlRewriteCategoryNotInGrid.php          |  9 +++------
 .../AssertUrlRewriteCategoryRedirect.php           |  9 +++------
 .../Constraint/AssertUrlRewriteCustomRedirect.php  |  9 +++------
 .../AssertUrlRewriteCustomSearchRedirect.php       |  9 +++------
 .../Constraint/AssertUrlRewriteDeletedMessage.php  |  9 +++------
 .../Test/Constraint/AssertUrlRewriteInGrid.php     |  9 +++------
 .../Test/Constraint/AssertUrlRewriteNotInGrid.php  |  9 +++------
 .../Constraint/AssertUrlRewriteProductRedirect.php |  9 +++------
 .../Constraint/AssertUrlRewriteSaveMessage.php     |  9 +++------
 .../AssertUrlRewriteSuccessOutsideRedirect.php     |  9 +++------
 .../AssertImpossibleDeleteYourOwnAccount.php       |  9 +++------
 .../AssertImpossibleDeleteYourOwnRole.php          |  9 +++------
 .../User/Test/Constraint/AssertRoleInGrid.php      |  9 +++------
 .../User/Test/Constraint/AssertRoleNotInGrid.php   |  9 +++------
 .../Constraint/AssertRoleSuccessDeleteMessage.php  |  9 +++------
 .../Constraint/AssertRoleSuccessSaveMessage.php    |  9 +++------
 .../Test/Constraint/AssertUserDuplicateMessage.php |  9 +++------
 .../User/Test/Constraint/AssertUserInGrid.php      |  9 +++------
 .../Constraint/AssertUserInvalidEmailMessage.php   |  9 +++------
 .../User/Test/Constraint/AssertUserNotInGrid.php   |  9 +++------
 .../AssertUserRoleSalesRestrictedAccess.php        |  9 +++------
 .../Constraint/AssertUserSuccessDeleteMessage.php  |  9 +++------
 .../Test/Constraint/AssertUserSuccessLogOut.php    |  9 +++------
 .../Test/Constraint/AssertUserSuccessLogin.php     |  9 +++------
 .../Constraint/AssertUserSuccessSaveMessage.php    |  9 +++------
 .../AssertUserWrongCredentialsMessage.php          |  9 +++------
 .../AssertCmsPageCurrentlyPublishedRevision.php    |  9 +++------
 .../AssertCmsPageInitialVersionInGrid.php          |  9 +++------
 .../AssertCmsPageNewVersionSuccessSaveMessage.php  |  9 +++------
 .../AssertCmsPageRevisionErrorDeleteMessage.php    |  9 +++------
 .../Constraint/AssertCmsPageRevisionInGrid.php     |  9 +++------
 .../Constraint/AssertCmsPageRevisionNotInGrid.php  |  9 +++------
 .../Constraint/AssertCmsPageRevisionPreview.php    |  9 +++------
 ...sertCmsPageRevisionSuccessMassDeleteMessage.php |  9 +++------
 .../AssertCmsPageRevisionSuccessPublishMessage.php |  9 +++------
 .../AssertCmsPageRevisionSuccessSaveMessage.php    |  9 +++------
 .../AssertCmsPageVersionErrorDeleteMessage.php     |  9 +++------
 .../AssertCmsPageVersionErrorSaveMessage.php       |  9 +++------
 .../Test/Constraint/AssertCmsPageVersionInGrid.php |  9 +++------
 .../Constraint/AssertCmsPageVersionNotInGrid.php   |  9 +++------
 .../AssertCmsPageVersionSuccessDeleteMessage.php   |  9 +++------
 ...ssertCmsPageVersionSuccessMassDeleteMessage.php |  9 +++------
 .../AssertCmsPageVersionSuccessSaveMessage.php     |  9 +++------
 .../AssertWidgetHierarchyNodeLinkOnHomePage.php    |  9 +++------
 .../AssertWidgetAbsentOnFrontendHome.php           |  9 +++------
 .../Constraint/AssertWidgetCatalogCategoryLink.php |  9 +++------
 .../Test/Constraint/AssertWidgetCmsPageLink.php    |  9 +++------
 .../Widget/Test/Constraint/AssertWidgetInGrid.php  |  9 +++------
 .../Constraint/AssertWidgetOnFrontendInCatalog.php |  9 +++------
 .../Test/Constraint/AssertWidgetOnProductPage.php  |  9 +++------
 .../Test/Constraint/AssertWidgetProductLink.php    |  9 +++------
 .../AssertWidgetRecentlyViewedProducts.php         |  9 +++------
 .../AssertWidgetSuccessDeleteMessage.php           |  9 +++------
 .../Constraint/AssertWidgetSuccessSaveMessage.php  |  9 +++------
 .../AssertAddProductToWishlistSuccessMessage.php   |  9 +++------
 .../AssertMoveProductToWishlistSuccessMessage.php  |  9 +++------
 .../Constraint/AssertProductDetailsInWishlist.php  |  9 +++------
 ...ssertProductInCustomerWishlistOnBackendGrid.php |  9 +++------
 ...rtProductIsPresentInCustomerBackendWishlist.php |  9 +++------
 .../AssertProductIsPresentInWishlist.php           |  9 +++------
 .../AssertProductsIsAbsentInWishlist.php           |  9 +++------
 .../Test/Constraint/AssertWishlistIsEmpty.php      |  9 +++------
 .../Test/Constraint/AssertWishlistShareMessage.php |  9 +++------
 .../testsuites/Mtf/TestSuite/InjectableTests.php   | 14 +++++++-------
 .../Mtf/TestSuite/InjectableTests/basic.xml        |  8 ++++----
 611 files changed, 1838 insertions(+), 3665 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMaxRequestedQtyFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMaxRequestedQtyFailMessage.php
index 7c596bf1c1988..2996a4cd985b9 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMaxRequestedQtyFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMaxRequestedQtyFailMessage.php
@@ -27,12 +27,9 @@ class AssertMaxRequestedQtyFailMessage extends AbstractConstraint
      */
     const ERROR_MAXIMUM_QUANTITY_MESSAGE = 'The maximum quantity allowed for purchase is %d.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that requested quantity is more than allowed error message is displayed after adding products to cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMinRequestedQtyFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMinRequestedQtyFailMessage.php
index c03d07436431e..62297f4c5edc6 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMinRequestedQtyFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMinRequestedQtyFailMessage.php
@@ -27,12 +27,9 @@ class AssertMinRequestedQtyFailMessage extends AbstractConstraint
      */
     const ERROR_MINIMUM_QUANTITY_MESSAGE = 'The minimum quantity allowed for purchase is %d.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that requested quantity is less than allowed error message is displayed after adding products to cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMsrpNotice.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMsrpNotice.php
index b23c4811d222b..af04083944f72 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMsrpNotice.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMsrpNotice.php
@@ -17,12 +17,9 @@
  */
 class AssertMsrpNotice extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that notice is present that product with enabled MAP
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductConfiguringFromRequiringAttention.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductConfiguringFromRequiringAttention.php
index e19aaae967e49..9722b195ae86d 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductConfiguringFromRequiringAttention.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductConfiguringFromRequiringAttention.php
@@ -23,12 +23,9 @@ class AssertProductConfiguringFromRequiringAttention extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You added %s to your shopping cart.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product can be configured and added to cart after added this product to cart by sku
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductIsOutOfStockFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductIsOutOfStockFailMessage.php
index f69eaf2bf9dd6..ab2c8955848f2 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductIsOutOfStockFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductIsOutOfStockFailMessage.php
@@ -22,12 +22,9 @@ class AssertProductIsOutOfStockFailMessage extends AbstractConstraint
      */
     const ERROR_MESSAGE = 'Availability: Out of stock.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that out of stock error message is displayed after adding products to cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductRequiredAttentionFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductRequiredAttentionFailMessage.php
index 177b06cd6cbbf..f574ce336bcee 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductRequiredAttentionFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductRequiredAttentionFailMessage.php
@@ -22,12 +22,9 @@ class AssertProductRequiredAttentionFailMessage extends AbstractConstraint
      */
     const ERROR_MESSAGE = '%d %s requires your attention.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product requires attention error message is displayed after adding products by sku to shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductTierPriceMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductTierPriceMessage.php
index ae3c456852cce..d564b0f7dcd06 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductTierPriceMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductTierPriceMessage.php
@@ -17,12 +17,9 @@
  */
 class AssertProductTierPriceMessage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product has tier price message appears after adding products by sku to shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductWithPaymentAgreementsOrderFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductWithPaymentAgreementsOrderFailMessage.php
index b8c3e9b2f50ff..c82e66bfbac97 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductWithPaymentAgreementsOrderFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductWithPaymentAgreementsOrderFailMessage.php
@@ -24,12 +24,9 @@ class AssertProductWithPaymentAgreementsOrderFailMessage extends AbstractConstra
     const ERROR_MESSAGE = 'Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself.';
     // @codingStandardsIgnoreEnd
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that error message that product with payment agreements can't be ordered with other items is displayed
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAbsentInRequiringAttention.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAbsentInRequiringAttention.php
index 9038064d28dd2..f4ae9e635c95e 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAbsentInRequiringAttention.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAbsentInRequiringAttention.php
@@ -16,12 +16,9 @@
  */
 class AssertProductsAbsentInRequiringAttention extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that products are absent in requiring attention block.
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAddBySkuSuccessMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAddBySkuSuccessMessage.php
index ec4fa36a0fea1..a63343a7a95a6 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAddBySkuSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAddBySkuSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertProductsAddBySkuSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You added %d %s to your shopping cart.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after adding products by sku to shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIncrementsFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIncrementsFailMessage.php
index 030e020a15513..4508d9e3423e0 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIncrementsFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIncrementsFailMessage.php
@@ -22,12 +22,9 @@ class AssertQtyIncrementsFailMessage extends AbstractConstraint
      */
     const QTY_INCREMENTS_ERROR_MESSAGE = 'You can buy this product only in quantities of %d at a time.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that requested qty does not meet the increments error message is displayed after adding products to cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIsNotEnoughFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIsNotEnoughFailMessage.php
index 7ae8f1a9de1b0..38b4e06312a56 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIsNotEnoughFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIsNotEnoughFailMessage.php
@@ -27,12 +27,9 @@ class AssertQtyIsNotEnoughFailMessage extends AbstractConstraint
      */
     const LEFT_IN_STOCK_ERROR_MESSAGE = 'Only %d left in stock';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that requested quantity is not available error message is displayed after adding products by sku to cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertRequiringAttentionProductSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertRequiringAttentionProductSuccessDeleteMessage.php
index 8e46d3e9959c6..cfaac09de7a7c 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertRequiringAttentionProductSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertRequiringAttentionProductSuccessDeleteMessage.php
@@ -21,12 +21,9 @@ class AssertRequiringAttentionProductSuccessDeleteMessage extends AbstractConstr
      */
     const SUCCESS_MESSAGE = 'You removed the item.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is present after requiring attention product has been deleted from cart.
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSkuNotFoundFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSkuNotFoundFailMessage.php
index 0faea9f39c651..539e180355d34 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSkuNotFoundFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSkuNotFoundFailMessage.php
@@ -22,12 +22,9 @@ class AssertSkuNotFoundFailMessage extends AbstractConstraint
      */
     const ERROR_MESSAGE = 'SKU not found in catalog.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that sku not found error message is displayed after adding products by sku to shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSpecifyProductOptionsLink.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSpecifyProductOptionsLink.php
index 08ebf8b728eaa..0b959b8ce2a5d 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSpecifyProductOptionsLink.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSpecifyProductOptionsLink.php
@@ -17,12 +17,9 @@
  */
 class AssertSpecifyProductOptionsLink extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that specify products options link is displayed after adding products to cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertWidgetOrderBySkuOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertWidgetOrderBySkuOnCategoryPage.php
index 826f3a0977afa..1bb0ae1cb2102 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertWidgetOrderBySkuOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertWidgetOrderBySkuOnCategoryPage.php
@@ -19,12 +19,9 @@
  */
 class AssertWidgetOrderBySkuOnCategoryPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Order By Sku widget displayed on frontend in Catalog
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
index 88298fd4d79f6..9230d949fc9b5 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
@@ -18,12 +18,9 @@
  */
 class AssertGlobalSearchCustomerName extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that customer name is present in search results
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
index 79f4de1a4bce2..8e4eb022a8fe8 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
@@ -22,12 +22,9 @@ class AssertGlobalSearchNoRecordsFound extends AbstractConstraint
      */
     const EXPECTED_RESULT = 'No records found.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that search result contains expected text
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
index abbacf9e7ae3d..6ab3d9dd20258 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
@@ -18,12 +18,9 @@
  */
 class AssertGlobalSearchOrderId extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that order Id is present in search results
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
index bd3a2a99b83c9..46c3b53f542d4 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
@@ -19,12 +19,9 @@
  */
 class AssertGlobalSearchProductName extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product name is present in search results
diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php b/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
index 49c3a1194587e..c55d8b2ed113b 100644
--- a/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertBackupInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that one backup row is present in Backups grid
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerDeleteMessage.php
index c25aad43aefea..074852210bc04 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerDeleteMessage.php
@@ -19,12 +19,9 @@ class AssertBannerDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'The banner has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success delete message is appeared after banner has been deleted
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInGrid.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInGrid.php
index 9ef430aae8976..4951371ea50ee 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertBannerInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created banner is found by name and has correct banner types, visibility, status
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInShoppingCart.php
index 328217c26249b..4f77933f59f6a 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInShoppingCart.php
@@ -23,12 +23,9 @@
  */
 class AssertBannerInShoppingCart extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that banner presents on Shopping Cart page
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerMassDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerMassDeleteMessage.php
index 2ba54bfb36ecd..e30b840474589 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerMassDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerMassDeleteMessage.php
@@ -23,12 +23,9 @@ class AssertBannerMassDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted %d record(s).';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success delete message is appeared after banner has been deleted
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCartRule.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCartRule.php
index 74e58cc4d43ee..8fc8efefb975e 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCartRule.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCartRule.php
@@ -19,12 +19,9 @@
  */
 class AssertBannerNotInCartRule extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted banner is absent on shopping cart rule creation page and can't be found by name
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCatalogRule.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCatalogRule.php
index 54277ef5b5c79..e37640b20375f 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCatalogRule.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCatalogRule.php
@@ -19,12 +19,9 @@
  */
 class AssertBannerNotInCatalogRule extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted banner is absent on catalog rule creation page and can't be found by name
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInGrid.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInGrid.php
index dd1c5d7eb2a04..fc3a55f8bade7 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertBannerNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted banner is absent in grid and can't be found by name
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInShoppingCart.php
index 7866d8146636b..eede1e1b2575b 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInShoppingCart.php
@@ -23,12 +23,9 @@
  */
 class AssertBannerNotInShoppingCart extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that banner is absent on Shopping Cart page
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInWidgetOptions.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInWidgetOptions.php
index 2aecad07694e9..e00979651b832 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInWidgetOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInWidgetOptions.php
@@ -20,12 +20,9 @@
  */
 class AssertBannerNotInWidgetOptions extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted banner is absent in Widget options bunnerGrid and can't be found by name
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotOnCategoryPage.php
index 2bd9d281db0ad..b9a9f67028847 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotOnCategoryPage.php
@@ -21,12 +21,9 @@
  */
 class AssertBannerNotOnCategoryPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that banner is absent on specific category page
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerOnCategoryPage.php
index 03fd8e54a5d01..49b1b2fdb573b 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerOnCategoryPage.php
@@ -21,12 +21,9 @@
  */
 class AssertBannerOnCategoryPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that banner presents on specific category page
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerSuccessSaveMessage.php
index 0282fd66010bb..3bea9ec322297 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerSuccessSaveMessage.php
@@ -20,12 +20,9 @@ class AssertBannerSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_SAVE_MESSAGE = 'You saved the banner.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after banner save "You saved the banner." successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotator.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotator.php
index f252bbde29896..4d8dab2a72c59 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotator.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotator.php
@@ -19,12 +19,9 @@
  */
 class AssertWidgetBannerRotator extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Banner Rotator widget displayed on frontent on Home page and on Advanced Search
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotatorOnProductPage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotatorOnProductPage.php
index 39f6dddca2098..73eead1a72fa0 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotatorOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotatorOnProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertWidgetBannerRotatorOnProductPage extends AssertWidgetOnProductPage
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Banner Rotator widget displayed on frontend on Product page
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
index 660289c96568c..18476bc018bb6 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
@@ -19,12 +19,9 @@
  */
 class AssertBundleInCategory extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check bundle product on the category page
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
index cb6d656925a82..d93b603f2c295 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertBundleItemsOnProductPage extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that displayed product bundle items data on product page equals passed from fixture preset
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
index 2f757d40b2945..0bb2e389959e3 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
@@ -19,12 +19,9 @@
  */
 class AssertBundlePriceType extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Product price type
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
index b35372d062941..68b9ca3ea5dea 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
@@ -18,12 +18,9 @@
  */
 class AssertBundlePriceView extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that displayed price view for bundle product on product page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductForm.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductForm.php
index 5fae622d170df..2be65c4d9c447 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductForm.php
@@ -15,12 +15,9 @@
  */
 class AssertBundleProductForm extends AssertProductForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Formatting options for array values
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
index 26adb5a3aa608..1d7c570f4a253 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
@@ -18,12 +18,9 @@
  */
 class AssertTierPriceOnBundleProductPage extends AssertProductTierPriceOnProductPage
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Tier price block
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
index 0260f2f35750d..8fa8bb9c0da75 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
@@ -17,12 +17,9 @@
  */
 class AssertAbsenceDeleteAttributeButton extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that Delete Attribute button is absent for system attribute on attribute edit page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
index 36d027489d8ff..bfbc806a3d3f2 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
@@ -20,12 +20,9 @@
  */
 class AssertAddToCartButtonAbsent extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Category Page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
index 5859c9fd20094..f3e33616771dc 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
@@ -20,12 +20,9 @@
  */
 class AssertAddToCartButtonPresent extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Category Page on Frontend
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
index 29c3bca20d57d..8b8df5b7276f2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
@@ -19,12 +19,9 @@
  */
 class AssertAddedProductAttributeOnProductForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Add this attribute to Default attribute Template. Create product and Assert that created attribute
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
index b0d4aa51823d8..acfb5aa0acc0d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
@@ -18,12 +18,9 @@
  */
 class AssertAttributeForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that displayed attribute data on edit page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
index 88a5d4a193863..7b4490b43ac21 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
@@ -15,12 +15,9 @@
  */
 class AssertAttributeOptionsOnProductForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php
index e808a5674d09c..cf4da661ad2df 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php
@@ -15,12 +15,9 @@
  */
 class AssertAttributeSearchableByLabel extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
index a9bb5ca000c13..6f8b02420c727 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
@@ -18,12 +18,9 @@
  */
 class AssertCategoryAbsenceOnBackend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that not displayed category in backend catalog category tree
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
index 1528a7edcccb1..4e0e88b04e87c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
@@ -24,12 +24,9 @@ class AssertCategoryAbsenceOnFrontend extends AbstractConstraint
      */
     const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that not displayed category in frontend main menu
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
index a19eb00453a98..54731c72293f3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
@@ -19,12 +19,9 @@
  */
 class AssertCategoryForAssignedProducts extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that displayed assigned products on category page equals passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
index 26679e954a728..3734f284491c6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
@@ -15,12 +15,9 @@
  */
 class AssertCategoryForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
index 748a1e7a2a543..578a994774d50 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
@@ -21,12 +21,9 @@ class AssertCategoryIsNotActive extends AbstractConstraint
 {
     const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that the category cannot be accessed from the navigation bar in the frontend
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
index 98294784645a8..152a6f42a8972 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
@@ -20,12 +20,9 @@
  */
 class AssertCategoryIsNotIncludeInMenu extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that the category is no longer available on the top menu bar
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
index c4f8b2f1f9819..c1da7f9815648 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
@@ -20,12 +20,9 @@
  */
 class AssertCategoryPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that displayed category data on category page equals to passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
index 1639e88adebc1..0947e5b0fed7b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
@@ -18,12 +18,9 @@
  */
 class AssertCategoryRedirect extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that old Category URL lead to appropriate Category in frontend
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
index f3341ca6d383a..f186ee50e3aeb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
@@ -22,12 +22,9 @@ class AssertCategorySaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You saved the category.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after category save
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
index b31b03e4c2146..e7247a5055181 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertCategorySuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the category.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after delete a category "You deleted the category." successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
index a39e10d9bf044..a6838d254170b 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
@@ -21,12 +21,9 @@
  */
 class AssertCrossSellsProductsSection extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product is displayed in cross-sell section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
index f96c512803761..12ba03682e9ab 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
@@ -21,12 +21,9 @@
  */
 class AssertNoCrossSellsProductsSection extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product is not displayed in cross-sell section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
index 50530a3c93983..390e3062422c0 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
@@ -20,12 +20,9 @@
  */
 class AssertNoRelatedProductsSection extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product is not displayed in related products section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
index 489041d142574..42b48bbdc25c2 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
@@ -20,12 +20,9 @@
  */
 class AssertNoUpSellsProductsSection extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product is not displayed in up-sell section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
index f98bed1c6f7ca..50c77bf0d6fea 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertProductAttributeAbsenceInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after deleted product attribute cannot be found by attribute code.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
index 2697887103674..332b9c364b089 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
@@ -19,12 +19,9 @@
  */
 class AssertProductAttributeAbsenceInSearchOnProductForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that deleted attribute can't be added to product template on Product Page via Add Attribute control
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
index beca53dc1199a..7206ae64be3ae 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
@@ -19,12 +19,9 @@
  */
 class AssertProductAttributeAbsenceInTemplateGroups extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted attribute isn't displayed in Product template's Groups section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
index b6263ce11525e..5b18eb83021cd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
@@ -19,12 +19,9 @@
  */
 class AssertProductAttributeAbsenceInUnassignedAttributes extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted attribute isn't displayed in Product template's Unassigned Attributes section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
index 60fed3b193f3b..1b78df9632176 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
@@ -19,12 +19,9 @@
  */
 class AssertProductAttributeDisplayingOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check whether the attribute is visible on the frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
index 70de39f6c2dd5..e5553b73d747a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
@@ -17,12 +17,9 @@
  */
 class AssertProductAttributeDisplayingOnSearchForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check whether attribute is displayed in the advanced search form on the frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
index 76a8fc3ab6eaf..50f8a0714b061 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertProductAttributeInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created product attribute is found in grid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
index ac3bc79717093..79d7f510154ca 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
@@ -20,12 +20,9 @@
  */
 class AssertProductAttributeIsComparable extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check whether there is an opportunity to compare products using given attribute.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
index de7f7279fd83f..694bac5e96dcf 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
@@ -19,12 +19,9 @@
  */
 class AssertProductAttributeIsFilterable extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check whether the attribute filter is displayed on the frontend in Layered navigation.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
index 239d3d009eef0..cec8b4da2e340 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
@@ -19,12 +19,9 @@
  */
 class AssertProductAttributeIsFilterableInSearch extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check out if the attribute in the navigation bar on the search results page in Layered navigation.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
index 733eac366d3de..ab1a5c31d5da9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
@@ -17,12 +17,9 @@
  */
 class AssertProductAttributeIsGlobal extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Look on the scope of product attribute in the grid.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
index 3e1f2845982d9..a39f0956f3fdd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
@@ -19,12 +19,9 @@
  */
 class AssertProductAttributeIsHtmlAllowed extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check whether html tags are using in attribute value.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
index 2962bd89d0ad9..7fbc9b1edddb6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
@@ -24,12 +24,9 @@ class AssertProductAttributeIsRequired extends AbstractConstraint
      */
     const REQUIRE_MESSAGE = 'This is a required field.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check whether the attribute is mandatory.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
index 7dac3dda454ce..3db2761494474 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
@@ -25,12 +25,9 @@ class AssertProductAttributeIsUnique extends AbstractConstraint
      */
     const UNIQUE_MESSAGE = 'The value of attribute "%s" must be unique';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check whether the attribute is unique.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
index 3d89ded325787..f2179b88dc044 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
@@ -19,12 +19,9 @@
  */
 class AssertProductAttributeIsUsedInSortOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that attribute present in sort dropdown on search results page on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
index e3115ddb1fd67..fa1f5a6629999 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
@@ -15,12 +15,9 @@
  */
 class AssertProductAttributeIsUsedPromoRules extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
index 2282510de43a3..9dbabf2585555 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
@@ -18,12 +18,9 @@ class AssertProductAttributeSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You saved the product attribute.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that message "You saved the product attribute." is present on Attribute page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
index 16a2e8d91e481..ef33451fffda2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
@@ -19,12 +19,9 @@ class AssertProductAttributeSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The product attribute has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that message "The product attribute has been deleted." is present on Attribute page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
index 06121e5187cf7..32ada5406e362 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
@@ -18,12 +18,9 @@
  */
 class AssertProductCompareBlockOnCmsPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Compare Products block is presented on CMS pages.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
index cccf6bbb2cf54..4371bcb265c2f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
@@ -16,12 +16,9 @@
  */
 class AssertProductCompareItemsLink extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that link "Compare Products..." on top menu of page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
index 050b9c7e46c8e..300030b22f7d7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
@@ -16,12 +16,9 @@
  */
 class AssertProductCompareItemsLinkIsAbsent extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert compare products link is NOT visible at the top of page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
index e37b09a435879..e30c305c21ab0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
@@ -18,12 +18,9 @@
  */
 class AssertProductComparePage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Product attribute on compare product page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
index 02e3cebd3c9f6..923985f4f1f55 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
@@ -19,12 +19,9 @@ class AssertProductCompareRemoveLastProductMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You have no items to compare.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * After removing last product message is appeared on "Compare Products" page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
index b84416ff72a93..ccad8eeccaa9d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
@@ -19,12 +19,9 @@ class AssertProductCompareSuccessAddMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You added product %s to the comparison list.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert success message is presented on page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
index e38a4ef350450..c678036d9fc34 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
@@ -18,12 +18,9 @@ class AssertProductCompareSuccessRemoveAllProductsMessage extends AbstractConstr
 {
     const SUCCESS_MESSAGE = 'You cleared the comparison list.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert message is appeared on "Compare Products" page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
index 4061e8128bfb4..9616fe1f312c0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
@@ -20,12 +20,9 @@ class AssertProductCompareSuccessRemoveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You removed product %s from the comparison list.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert message is appeared on "Compare Products" block on myAccount page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
index 6e46a0712ec4f..d40ab5c73c3b6 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertProductCustomOptionsOnProductPage extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Skipped field for custom options
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php
index 8db99688a152b..01abb27bf6f58 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php
@@ -15,12 +15,9 @@
  */
 class AssertProductDuplicateIsNotDisplayingOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that product duplicate is not displayed on front-end
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
index ff2bbb9ff5843..38b7766a94017 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
@@ -21,12 +21,9 @@ class AssertProductDuplicateMessage extends AbstractConstraint
      */
     const DUPLICATE_MESSAGE = 'You duplicated the product.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Checking the output message successful product duplication
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
index b1c182e2a31d7..9f832af675316 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertProductDuplicatedInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that duplicated product is found by sku and has correct product type, product template,
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
index d9c5bcf186a62..179ae602aae54 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
@@ -47,12 +47,9 @@ class AssertProductForm extends AbstractAssertForm
      */
     protected $specialArray = [];
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert form data equals fixture data
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
index 2c521ef2b2b47..300444f9c5789 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertProductGroupedPriceOnProductPage extends AbstractConstraint implements AssertPriceOnProductPageInterface
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Error message
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
index f28731656d41c..860b50afaa272 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
@@ -21,12 +21,9 @@
  */
 class AssertProductInCart extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assertion that the product is correctly displayed in cart
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
index 4478bf071f909..4ad261bdb7b33 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
@@ -19,12 +19,9 @@
  */
 class AssertProductInCategory extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Checking the product in the page of its price
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
index 34c39fc8facca..b424ac6520ae6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertProductInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Product fixture
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
index 8d1a2b2cf8091..fa09690b08e12 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
@@ -18,12 +18,9 @@
  */
 class AssertProductInStock extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Text value for checking Stock Availability
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
index 589c2cc88aba2..cb84eba7cfe55 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
@@ -27,12 +27,9 @@ class AssertProductIsNotDisplayingOnFrontend extends AbstractConstraint
      */
     const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Product view page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
index a3fd4fe1930b3..e7cd4b75e57c3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
@@ -21,12 +21,9 @@ class AssertProductIsNotVisibleInCompareBlock extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You have no items to compare.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert the product is not displayed on Compare Products block on my account page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
index 99253d2f3e125..e150e574b4957 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
@@ -20,12 +20,9 @@ class AssertProductIsNotVisibleInComparePage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You have no items to compare.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert the product is not displayed on Compare Products page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
index fa202eb56e36b..f46222edbb87c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertProductNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product cannot be found by name and sku
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
index a584bc57f7dd8..9854b09e799ba 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
@@ -19,12 +19,9 @@
  */
 class AssertProductNotSearchableBySku extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product cannot be found via Quick Search using searchable product attributes.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
index 2f88ed35a9d49..f8b3ee54e0a1f 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
@@ -19,12 +19,9 @@
  */
 class AssertProductNotVisibleInCategory extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product is not visible in the assigned category
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
index 55eb3f1f07548..c96f80b1b7b58 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
@@ -18,12 +18,9 @@
  */
 class AssertProductOutOfStock extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Text value for checking Stock Availability
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
index 632719772ad11..2de4c1a970b6a 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
@@ -35,12 +35,9 @@ class AssertProductPage extends AbstractAssertForm
      */
     protected $product;
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that displayed product data on product page(front-end) equals passed from fixture:
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
index a8ef003e66d91..982108c546e82 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
@@ -21,12 +21,9 @@ class AssertProductSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You saved the product.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after product save
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
index 4c40f67127a30..b338aa050ad9d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
@@ -18,12 +18,9 @@
  */
 class AssertProductSearchableBySku extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Displays an error message
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSimpleDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSimpleDuplicateForm.php
index c6d6b9d0b8e23..a71ad6396f8b3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSimpleDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSimpleDuplicateForm.php
@@ -14,10 +14,7 @@
  */
 class AssertProductSimpleDuplicateForm extends AssertProductDuplicateForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
index ef051a23ecd70..069b77fbbeccd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
@@ -17,12 +17,9 @@
  */
 class AssertProductSkuAutoGenerated extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that SKU successfully generated
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
index bfaab3a452d2c..5337189b04c7b 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertProductSpecialPriceOnProductPage extends AbstractConstraint implements AssertPriceOnProductPageInterface
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Error message
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
index 531cba64f41ca..1df91d15cf8f6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertProductSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'A total of %d record(s) have been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after deleting product success message.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
index 1db6cd645ffea..057114b7d20fc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
@@ -20,12 +20,9 @@
  */
 class AssertProductTemplateForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after save a product template on edit product set page displays:
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
index 0c087b8bbc411..c20569a064b98 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
@@ -24,12 +24,9 @@
  */
 class AssertProductTemplateGroupOnProductForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that created product template:
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
index c6bfc68176d67..5cb58e4f837a4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertProductTemplateInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that new product template displays in Product Templates grid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php
index 82bda2e76914d..9b1eee9449961 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertProductTemplateNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product template is not displayed in Product Templates grid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
index 5ee1f093955d2..d8dde28e22292 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
@@ -23,12 +23,9 @@
  */
 class AssertProductTemplateOnProductForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that created product template:
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php
index ec1e28971e985..88ae4b940f3ac 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertProductTemplateSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The attribute set has been removed.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after deleting product template success delete message appears
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
index baa2efe68612b..5e48fd4b1e438 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertProductTemplateSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You saved the attribute set.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after save a product template "You saved the attribute set." successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
index 9117edd504120..6072e792dfaba 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertProductTierPriceOnProductPage extends AbstractConstraint implements AssertPriceOnProductPageInterface
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Error message
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
index c2378e1f13d3c..ee0a12a3231ae 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
@@ -20,12 +20,9 @@
  */
 class AssertProductView extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * @param CatalogProductView $catalogProductView
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
index 701e272d4c8d9..936a6f9e8ce88 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
@@ -19,12 +19,9 @@
  */
 class AssertProductVisibleInCategory extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Displays an error message
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
index 8d9d4cbbe23d1..9e939a5fd3b9f 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
@@ -20,12 +20,9 @@
  */
 class AssertRelatedProductsSection extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product is displayed in related products section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
index 3926ef857aa84..418ad5b363d3d 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
@@ -20,12 +20,9 @@
  */
 class AssertUpSellsProductsSection extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product is displayed in up-sell section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
index 5a7b36bb7e5c2..922eb32d0f7d4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
@@ -22,12 +22,9 @@ class AssertUsedSuperAttributeImpossibleDeleteMessages extends AbstractConstrain
      */
     const ERROR_DELETE_MESSAGE = 'This attribute is used in configurable products.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that it's impossible to delete configurable attribute that is used in created configurable product
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockAbsent.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockAbsent.php
index edc3f8c1a9ca2..7c2a3bffe6606 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockAbsent.php
@@ -20,12 +20,9 @@
  */
 class AssertCatalogEventBlockAbsent extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Category Page on Frontend
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockVisible.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockVisible.php
index 42e377e88537b..01f51e6b5a87a 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockVisible.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockVisible.php
@@ -21,12 +21,9 @@
  */
 class AssertCatalogEventBlockVisible extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Category Page on Frontend
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php
index b9989afc688f3..11182211ab297 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertCatalogEventInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Catalog Event fixture
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsClosed.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsClosed.php
index 2a1db81e2288a..352dd50d1386e 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsClosed.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsClosed.php
@@ -14,12 +14,9 @@
  */
 class AssertCatalogEventIsClosed extends AssertCatalogEventStatus
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Event status 'Closed' on category/product pages
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsOpen.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsOpen.php
index 69f2d42a97432..1675bc6d63ca3 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsOpen.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsOpen.php
@@ -14,12 +14,9 @@
  */
 class AssertCatalogEventIsOpen extends AssertCatalogEventStatus
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Event status 'Sale Ends In' on category/product pages
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsUpcoming.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsUpcoming.php
index be3bf78de2cfb..ec9dbaccd2adf 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsUpcoming.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsUpcoming.php
@@ -14,12 +14,9 @@
  */
 class AssertCatalogEventIsUpcoming extends AssertCatalogEventStatus
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Event status 'Coming Soon' on category/product pages
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventStatus.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventStatus.php
index 11e54dab94e9b..93d21be44a026 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventStatus.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventStatus.php
@@ -21,12 +21,9 @@
  */
 abstract class AssertCatalogEventStatus extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Catalog Event status
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessCreateMessage.php
index a5e0571f60de6..b0444e5af1b25 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessCreateMessage.php
@@ -19,12 +19,9 @@ class AssertCatalogEventSuccessCreateMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You saved the event.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that message "You saved the event." is present on Event page
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessDeleteMessage.php
index 2258df09bdd96..dc9f4082dcbf8 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessDeleteMessage.php
@@ -19,12 +19,9 @@ class AssertCatalogEventSuccessDeleteMessage extends AbstractConstraint
 {
     const DELETE_MESSAGE = 'You deleted the event.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that message "You deleted the event." is present on Event page
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertWidgetCatalogEvent.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertWidgetCatalogEvent.php
index d80b25c63f35f..14bacb29eeb3f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertWidgetCatalogEvent.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertWidgetCatalogEvent.php
@@ -21,12 +21,9 @@
  */
 class AssertWidgetCatalogEvent extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that widget catalog event carousel is present on category page and link "Go To Sale" on widget redirects
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
index bdada9cd001ed..e5a4eaf6f9800 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
@@ -18,12 +18,9 @@
  */
 class AssertCatalogPriceRuleAppliedCatalogPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that Catalog Price Rule is applied for product(s) in Catalog
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
index 67b0627edb021..8bc4c8d814427 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertCatalogPriceRuleAppliedProductPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that Catalog Price Rule is applied & it impacts on product's discount price on Product page
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
index 46bb978d758da..daf59878f2141 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
@@ -20,12 +20,9 @@
  */
 class AssertCatalogPriceRuleAppliedShoppingCart extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that Catalog Price Rule is applied for product(s) in Shopping Cart
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
index ee80019f4e67b..66d71eea9dd2e 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
@@ -18,12 +18,9 @@
  */
 class AssertCatalogPriceRuleForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that displayed Catalog Price Rule data on edit page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
index f5e29b7758893..21ea726e51e93 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertCatalogPriceRuleInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that data in grid on Catalog Price Rules page according to fixture
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
index c3c29f7eab7d5..57d7caf17b339 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertCatalogPriceRuleNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Catalog Price Rule is not presented in grid and cannot be found using ID, Rule name
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
index 9d86a23fce77d..d8e8a0b39dfc7 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
@@ -19,12 +19,9 @@ class AssertCatalogPriceRuleNoticeMessage extends AbstractConstraint
     const NOTICE_MESSAGE_RULES = 'There are rules that have been changed but were not applied.';
     const NOTICE_MESSAGE_APPLY = ' Please, click Apply Rules in order to see immediate effect in the catalog.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that message "There are rules that have been changed but were not applied..."
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
index 948839f31b50d..9110f8207185a 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertCatalogPriceRuleSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'The rule has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that message "The rule has been deleted." is appeared on Catalog Price Rules page.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
index f54b2c8b65105..54f65e29794a6 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertCatalogPriceRuleSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The rule has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after Catalog Price Rule saved
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
index 9b9be4993393b..eddbd39029c69 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
@@ -27,12 +27,9 @@ class AssertAdvancedSearchProductsResult extends AbstractConstraint
      */
     const ERROR_MESSAGE = 'No items were found using the following search criteria.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Search results page
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
index f4c21604ebea6..cbf5cce957c10 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
@@ -17,12 +17,9 @@
  */
 class AssertCatalogSearchResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that result page contains all products, according to search request, from fixture
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
index c98b3b2f04166..4c700eb651fcd 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
@@ -19,12 +19,9 @@
  */
 class AssertSearchSynonymMassActionNotOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that you will be not redirected to url from dataset after mass delete search term
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
index 586ab2f6c81ea..3f57d051da8f6 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
@@ -19,12 +19,9 @@
  */
 class AssertSearchSynonymNotOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that you will be not redirected to url from dataset
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
index f030ab97579a6..aa8b3e10d0c7a 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
@@ -19,12 +19,9 @@
  */
 class AssertSearchTermForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after save a search term on edit term search page displays:
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
index b4d35a350b4a8..ed133eb2bfd7d 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertSearchTermInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after save a term search on edit term search page displays:
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
index 80e4caeaea581..d0752d3e906da 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
@@ -19,12 +19,9 @@
  */
 class AssertSearchTermMassActionNotOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after mass delete a search term not redirect to url in dataset
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php
index a74c07a784fdd..b4692e636cd02 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertSearchTermMassActionsNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after mass delete search terms on grid page are not displayed
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
index 8a7d11464610c..0f47c08d440c8 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertSearchTermNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after delete a search term on grid page not displayed
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
index 7be4072dbeceb..cab31841b9471 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
@@ -19,12 +19,9 @@
  */
 class AssertSearchTermNotOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after delete a search term not redirect to url in dataset
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
index 69cf72f060f32..540a79ed6f908 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
@@ -20,12 +20,9 @@
  */
 class AssertSearchTermOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Search block on CMS index page
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
index 551ee0eb5b42f..8d379973ee7b5 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertSearchTermSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the search.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after search term deleted
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
index 326ce6d5dc49b..db15c5b747d78 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertSearchTermSuccessMassDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'Total of %d record(s) were deleted';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after search terms were mass deleted
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
index 8bb3d9bf4a8ee..6d9cc7d516300 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertSearchTermSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You saved the search term.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after search term save
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
index c6b049b00abf3..07d33a085e384 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
@@ -19,12 +19,9 @@
  */
 class AssertSearchTermSynonymOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that you will be redirected to url from dataset
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
index 5110e62d5c245..a7646cbc0a79b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
@@ -17,12 +17,9 @@
  */
 class AssertSuggestSearchingResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Check that after input some text(e.g. product name) into search field, drop-down window is appeared.
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
index 9ab939aa7590d..849b3b53d5e77 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
@@ -23,12 +23,9 @@ class AssertAddedProductToCartSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You added %s to your shopping cart.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert success message is appeared on Shopping Cart page
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
index f21c4185d33c7..c5e7345c59c78 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
@@ -25,12 +25,9 @@ class AssertCartIsEmpty extends AbstractConstraint
      */
     const TEXT_EMPTY_CART = 'You have no items in your shopping cart. Click here to continue shopping.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Check that Shopping Cart is empty, opened page contains text "You have no items in your shopping cart.
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
index fb5b372295967..f9ba401fe6302 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
@@ -23,12 +23,9 @@
  */
 class AssertCartItemsOptions extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Error message for verify options
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
index 28d05206938ef..fc16fd227e811 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
@@ -19,12 +19,9 @@
  */
 class AssertGrandTotalInShoppingCart extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that grand total is equal to expected
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
index 9b4bc2035c13d..9467f492ffa8b 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
@@ -22,12 +22,9 @@ class AssertOrderSuccessPlacedMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'Thank you for your purchase!';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is correct
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php
index 23b007cf932a7..61e42bca91a23 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php
@@ -17,12 +17,9 @@
  */
 class AssertOrderTotalOnReviewPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that Order Grand Total is correct on checkoutOnePage
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
index 9a126c10ea5b7..a678809e48852 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
@@ -21,12 +21,9 @@
  */
 class AssertPriceInShoppingCart extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that price in the shopping cart equals to expected price from data set
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
index 125598d5eed99..8af7d261e428c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
@@ -18,12 +18,9 @@
  */
 class AssertProductAbsentInMiniShoppingCart extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert product is absent on mini shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
index 62b6983afb0e1..cb587c2f6da90 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
@@ -17,12 +17,9 @@
  */
 class AssertProductIsNotEditable extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after adding products by sku to shopping cart products are not editable
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
index 9e4e490dc152d..00e01c12b2266 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
@@ -17,12 +17,9 @@
  */
 class AssertProductPresentInMiniShoppingCart extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert product is present on mini shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
index 794ae8855a85b..14a3e48c1a56c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
@@ -17,12 +17,9 @@
  */
 class AssertProductPresentInShoppingCart extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that products are present in shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php
index a1bfe7a717be0..d783bfb6be281 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php
@@ -21,12 +21,9 @@
  */
 class AssertProductQtyInMiniShoppingCart extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product quantity in the mini shopping cart is equals to expected quantity from data set
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
index 0493a45f982b9..8a1f8d902b3f5 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
@@ -21,12 +21,9 @@
  */
 class AssertProductQtyInShoppingCart extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that quantity in the shopping cart is equals to expected quantity from data set
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
index 9d71041756d37..edb280e0a15e4 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
@@ -21,12 +21,9 @@
  */
 class AssertSubtotalInShoppingCart extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that subtotal total in the shopping cart is equals to expected total from data set
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php
index 6d4e2a2d1be11..878b6aed38add 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertTermAbsentInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that checkout agreement is absent in agreement grid.
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php
index b9a5f19d689ee..0c69dda739bb6 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php
@@ -25,12 +25,9 @@
  */
 class AssertTermAbsentOnCheckout extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Place order and verify there is no checkbox Terms and Conditions.
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php
index c8bce9eafe385..7809bb49e7e51 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertTermInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that checkout agreement is present in agreement grid.
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php
index 84ae794d2cb7e..faa9044f675af 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php
@@ -31,12 +31,9 @@ class AssertTermOnCheckout extends AbstractConstraint
      */
     const NOTIFICATION_MESSAGE = 'This is a required field.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check that checkbox is present on the last checkout step - Order Review.
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php
index 74c1797da0404..6d83220b732d9 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertTermSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The condition has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after deleting Term successful delete message appears.
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php
index c850c930a5701..aa1d21c758474 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertTermSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_SAVE_MESSAGE = 'The condition has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after save block successful message appears.
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php
index d006819951af5..8207d9b173531 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php
@@ -19,12 +19,9 @@ class AssertCmsBlockDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'The block has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after delete CMS block successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php
index 0ecb0f9823818..236660f64f6b7 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCmsBlockInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created CMS block can be found in grid via:
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php
index 2d91d6afce1d7..28530d678b223 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCmsBlockNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created CMS block can't be found in grid via:
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php
index 3d3534c051f41..09242f23ad8e8 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php
@@ -20,12 +20,9 @@
  */
 class AssertCmsBlockNotOnCategoryPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that created CMS block non visible on frontend category page
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php
index 63150462a81c4..e11b0b6cd36c4 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php
@@ -20,12 +20,9 @@
  */
 class AssertCmsBlockOnCategoryPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that created CMS block displayed on frontend category page (in order to assign block to category:
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php
index 1fda72290bb41..fab3793dfecd4 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php
@@ -19,12 +19,9 @@ class AssertCmsBlockSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_SAVE_MESSAGE = 'The block has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after save block successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php
index bbd5ce9258cc6..ec44c7543c0e3 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertCmsPageDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'The page has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after Cms page delete
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php
index 5dd0976cd250f..5ac65a80d0d28 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php
@@ -22,12 +22,9 @@ class AssertCmsPageDisabledOnFrontend extends AbstractConstraint
 {
     const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created CMS page with 'Status' - Disabled displays with '404 Not Found' message on Frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php
index 1cbac2887d2e2..c1df704828d12 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php
@@ -19,12 +19,9 @@ class AssertCmsPageDuplicateErrorMessage extends AbstractConstraint
 {
     const ERROR_SAVE_MESSAGE = 'A page URL key for specified store already exists.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Verify that page has not been created
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php
index ef091443d2e39..4504bce2499fe 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php
@@ -19,12 +19,9 @@
  */
 class AssertCmsPageForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php
index 089861a3bcfa3..8df4d5c1d3899 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCmsPageInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that cms page is present in pages grid
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php
index b054b15a28128..2fb1e1c3ca1c7 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertCmsPageNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Cms page is not present in pages grid
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php
index 1b5bb1237b8f3..a7303697bbbda 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php
@@ -21,12 +21,9 @@
  */
 class AssertCmsPagePreview extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that content of created cms page displayed in section 'maincontent' and equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php
index c1d8c45d381e3..8c79a37dc0268 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php
@@ -19,12 +19,9 @@ class AssertCmsPageSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_SAVE_MESSAGE = 'The page has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after save a CMS page "The page has been saved." successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php
index 981c742b45f84..cf9a6e9e21786 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php
@@ -20,12 +20,9 @@
  */
 class AssertUrlRewriteCmsPageRedirect extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created CMS Page URL Rewrite lead to appropriate page in frontend
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
index 2b6800eeb1755..5831181c0d178 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
@@ -19,12 +19,9 @@
  */
 class AssertChildProductIsNotDisplayedSeparately extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that products generated during configurable product creation - are not visible on frontend(by default).
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
index d3d904b5a62ea..8a1241a64162e 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
@@ -23,12 +23,9 @@ class AssertChildProductsInGrid extends AbstractConstraint
      */
     const NOT_VISIBLE_INDIVIDUALLY = 'Not Visible Individually';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that child products generated during configurable product are present in products grid
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductForm.php
index 6d24f1b2b9a84..b6f6ec40faf9e 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductForm.php
@@ -59,12 +59,9 @@ class AssertConfigurableProductForm extends AssertProductForm
         'configurable_attribute'
     ];
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Prepares fixture data for comparison
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
index e20f4edcbf3da..c3cbaeddacf3e 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
@@ -26,12 +26,9 @@ class AssertProductAttributeAbsenceInVariationsSearch extends AbstractConstraint
      */
     const TAB_VARIATIONS = 'variations';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted attribute can't be added to product template on Product Page via Add Attribute control
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
index f799a6bc03579..d2443903ad13f 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
@@ -19,12 +19,9 @@
  */
 class AssertProductAttributeIsConfigurable extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert check whether the attribute is used to create a configurable products.
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php
index 463b3b5e51f1a..35412504605f4 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php
@@ -20,12 +20,9 @@
  */
 class AssertCustomVariableForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php
index 9ec85a407bd89..023003bfe02e1 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertCustomVariableInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert custom variable is displayed on backend in custom variable grid
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
index 699e281d6117c..07cdc90ad3d00 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
@@ -20,12 +20,9 @@
  */
 class AssertCustomVariableInPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Add created variable to page and assert that Custom Variable is displayed on frontend page and has
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
index 1604a524db7d7..b9a31b882addc 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
@@ -17,12 +17,9 @@
  */
 class AssertCustomVariableNotInCmsPageForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that custom system variable not in cms page form
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php
index 556a331c52dec..67977e7ad8ec3 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertCustomVariableNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert Custom System Variable not available in System Variable grid
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
index 796c0976bc786..7a0c16af5a0ce 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertCustomVariableSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'You deleted the custom variable.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success delete message is correct after Custom System Variable deleted
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
index d8f1de70497d8..979691998fe74 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
@@ -19,12 +19,9 @@ class AssertCustomVariableSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_SAVE_MESSAGE = 'You saved the custom variable.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success delete message is correct after Custom System Variable deleted
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php
index 69270554d8dba..314ac2044acd4 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php
@@ -20,12 +20,9 @@
  */
 class AssertCurrencySymbolOnCatalogPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after applying changes, currency symbol changed on Catalog page
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php
index ffae5f742c195..e99a3bdbb22a8 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php
@@ -19,12 +19,9 @@ class AssertCurrencySymbolSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_SAVE_MESSAGE = 'The custom currency symbols were applied.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after clicking on 'Save Currency Symbols' button success message appears.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
index 8da7e4a6c8ddc..aa930b75d554a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
@@ -20,12 +20,9 @@
  */
 class AssertAddressDeletedBackend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted customers address is not displayed on backend during order creation
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
index f0a1eec3ddc72..9a0ff7a048e02 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
@@ -22,12 +22,9 @@ class AssertAddressDeletedFrontend extends AbstractConstraint
      */
     const EXPECTED_MESSAGE = 'You have no additional address entries in your address book.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that Asserts that 'Additional Address Entries' contains expected message
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
index 0f1df2195e782..22236d8c69857 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
@@ -22,12 +22,9 @@ class AssertChangePasswordFailMessage extends AbstractConstraint
      */
     const FAIL_MESSAGE = "Password doesn't match for this account.";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that fail message is present
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
index 1e41470413f9c..f1d71cd31841a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertCustomerAddressSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The address has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that success message equals to expected message
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
index 582d2559026cc..fd2750213b941 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
@@ -17,12 +17,9 @@
  */
 class AssertCustomerDefaultAddresses extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that Default Billing Address and Default Shipping Address equal to data from fixture
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
index 384ff30dabd48..f7cef94d0d4be 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
@@ -16,12 +16,9 @@
  */
 class AssertCustomerFailRegisterMessage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that error message is displayed on "Create New Customer Account" page(frontend)
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
index 9138e5c46c6de..14f055c080131 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
@@ -20,12 +20,9 @@
  */
 class AssertCustomerForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
index d040e11640bff..5e3fb56c2dd33 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
@@ -18,12 +18,9 @@ class AssertCustomerGroupAlreadyExists extends AbstractConstraint
 {
     const ERROR_MESSAGE = 'Customer Group already exists.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that customer group already exist
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
index 4aa5ff05410ff..77ad834d40ea5 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerGroupForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Skipped fields while verifying
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
index 41f254382519a..f29e84432c40d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertCustomerGroupInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that customer group in grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
index f197e394e4874..cfd64c1e437fc 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertCustomerGroupNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that customer group not in grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
index d2866bcf5efd8..7f86da4de2224 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
@@ -20,12 +20,9 @@
  */
 class AssertCustomerGroupOnCustomerForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that customer group find on account information page
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
index b812279864ce3..9bfb22e009326 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertCustomerGroupSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE= "The customer group has been deleted.";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that message "The customer group has been deleted." is displayed on Customer Group page.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
index e09823f2aaf83..4f666d2b4cdf6 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertCustomerGroupSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The customer group has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after customer group save
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
index 36d0ac9cf9580..b3af527bb9c2e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert customer availability in Customer Grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
index 96296afc2232e..a757b35338c2f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
@@ -18,12 +18,9 @@ class AssertCustomerInfoSuccessSavedMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The account information has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that success message equals to expected message
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
index 434fba1841b3b..65183ccea14f1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
@@ -20,12 +20,9 @@ class AssertCustomerInvalidEmail extends AbstractConstraint
 {
     const ERROR_EMAIL_MESSAGE = 'Please correct this email address: "%email%".';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that error message "Please correct this email address: "%email%"." is displayed
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php
index 870c5f84b8e56..8162974624ca9 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerMassDeleteInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that customers which haven't been deleted are present in customer grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php
index ee2faeb512e79..6466b7fdd042b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerMassDeleteNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that mass deleted customers are not in customer's grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
index 72462fae91a36..935532ca68d61 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertCustomerMassDeleteSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'A total of %d record(s) were deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that message "A total of "x" record(s) were deleted."
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
index 61660b38e3d33..80df8b36f4d5b 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Asserts that customer is not in customer's grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
index efcecc7e68a73..ba85c4184b52a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertCustomerSuccessDeleteMessage extends AbstractConstraint
 {
     const DELETE_MESSAGE = 'You deleted the customer.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that actual delete message equals expected
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
index b14d045d397d5..92211e8d1a351 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
@@ -19,12 +19,9 @@ class AssertCustomerSuccessRegisterMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'Thank you for registering with Main Website Store.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after customer registered on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
index 2c68e24a173f7..eb07aab1ce3f7 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
@@ -19,12 +19,9 @@ class AssertCustomerSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You saved the customer.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after customer save
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
index 37369f59270f3..624c23ac21a6e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
@@ -23,12 +23,9 @@ class AssertMassActionSuccessUpdateMessage extends AbstractConstraint
      */
     const UPDATE_MESSAGE = 'A total of %d record(s) were updated.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert update message is appears on customer grid (Customers > All Customers)
diff --git a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceAmount.php b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceAmount.php
index 65065ca7db7b9..92b5c3be38bee 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceAmount.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceAmount.php
@@ -20,12 +20,9 @@
  */
 class AssertCustomerBalanceAmount extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that customer balance amount is changed
diff --git a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceHistory.php b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceHistory.php
index 9cc70033cebec..7d1d45ebe5cd1 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceHistory.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceHistory.php
@@ -20,12 +20,9 @@
  */
 class AssertCustomerBalanceHistory extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that customer balance history is changed
diff --git a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertRemoveStoreCreditSuccessMessage.php b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertRemoveStoreCreditSuccessMessage.php
index d64b7ce7f4e7c..44dddfcc56b29 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertRemoveStoreCreditSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertRemoveStoreCreditSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertRemoveStoreCreditSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_REMOVE_MESSAGE = 'The store credit payment has been removed from shopping cart.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after remove store credit successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php
index d99e513e6a18d..38e755b14b910 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php
@@ -21,12 +21,9 @@ class AssertCustomerCustomAttributeErrorDuplicateMessage extends AbstractConstra
      */
     const ERROR_DUPLICATE_MESSAGE = 'An attribute with this code already exists.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after customer attribute error duplicate message appears
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInCustomerSegment.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInCustomerSegment.php
index 7e45f5171f9f4..38d4c2f893fc5 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInCustomerSegment.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInCustomerSegment.php
@@ -20,12 +20,9 @@
  */
 class AssertCustomerCustomAttributeInCustomerSegment extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer attribute is available during creation of customer segments
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInGrid.php
index c2a5f4a850b63..a036b1f8e0142 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerCustomAttributeInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Customer Attribute can be found in grid via:
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInCustomerSegment.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInCustomerSegment.php
index 7f698fbba3338..0e38befdae424 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInCustomerSegment.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInCustomerSegment.php
@@ -20,12 +20,9 @@
  */
 class AssertCustomerCustomAttributeNotInCustomerSegment extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted customer attribute is not available during creation of customer segments
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInGrid.php
index 32bf07981138c..e2db515529587 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerCustomAttributeNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted customer attribute cannot be found in grid
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCheckoutRegister.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCheckoutRegister.php
index e9750fcfaa0bb..9c3feb154bcc7 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCheckoutRegister.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCheckoutRegister.php
@@ -22,12 +22,9 @@
  */
 class AssertCustomerCustomAttributeNotOnCheckoutRegister extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted customer attribute is not available during register customer on checkout
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCreateOrderBackend.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCreateOrderBackend.php
index f4326eee93ce5..8503117ead525 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCreateOrderBackend.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCreateOrderBackend.php
@@ -20,12 +20,9 @@
  */
 class AssertCustomerCustomAttributeNotOnCreateOrderBackend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer attribute is absent during creating order on backend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerEditPage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerEditPage.php
index c3cfcf492deba..7db5c266390d3 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerEditPage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerEditPage.php
@@ -22,12 +22,9 @@
  */
 class AssertCustomerCustomAttributeNotOnCustomerEditPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer attribute is absent during edit customer account on frontend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerRegister.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerRegister.php
index 6433ecfb2d414..34eb4fa9bdf79 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerRegister.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerRegister.php
@@ -19,12 +19,9 @@
  */
 class AssertCustomerCustomAttributeNotOnCustomerRegister extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer attribute is absent during register customer on frontend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCheckoutRegister.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCheckoutRegister.php
index f3502f81218d3..90969be9236ab 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCheckoutRegister.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCheckoutRegister.php
@@ -23,12 +23,9 @@
  */
 class AssertCustomerCustomAttributeOnCheckoutRegister extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer attribute is available during register customer on checkout
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCreateOrderBackend.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCreateOrderBackend.php
index d1fb8d17a58f3..2c53d92805ff5 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCreateOrderBackend.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCreateOrderBackend.php
@@ -20,12 +20,9 @@
  */
 class AssertCustomerCustomAttributeOnCreateOrderBackend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer attribute is available during creating order on backend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerEditPage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerEditPage.php
index 0b64f4ab611cb..15a77c9784a87 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerEditPage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerEditPage.php
@@ -21,12 +21,9 @@
  */
 class AssertCustomerCustomAttributeOnCustomerEditPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer attribute is available during edit customer account on frontend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerRegister.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerRegister.php
index a930f0192fdaa..65c59c34bb2e8 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerRegister.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerRegister.php
@@ -19,12 +19,9 @@
  */
 class AssertCustomerCustomAttributeOnCustomerRegister extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer attribute is available during register customer on frontend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessDeleteMessage.php
index 7ce52f81ee873..93e04cdc0145a 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertCustomerCustomAttributeSuccessDeleteMessage extends AbstractConstrai
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the customer attribute.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after delete customer attribute successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessSaveMessage.php
index 5d4361ef08979..b7d6cf51f7575 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertCustomerCustomAttributeSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_SAVE_MESSAGE = 'You saved the customer attribute.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after customer attribute save successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentAvailableInBannerForm.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentAvailableInBannerForm.php
index d6e399f261016..d9241e996e7ca 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentAvailableInBannerForm.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentAvailableInBannerForm.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerSegmentAvailableInBannerForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer segment is available in Banner edit page
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentForm.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentForm.php
index 09c59a6f548f6..16a253356e105 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentForm.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentForm.php
@@ -26,12 +26,9 @@ class AssertCustomerSegmentForm extends AbstractAssertForm
      */
     protected $skippedFields = ['conditions_serialized', 'segment_id'];
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that displayed segment data on edit page is equals passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsApplying.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsApplying.php
index 42163c4cbc108..3aebe23ea9ebd 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsApplying.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsApplying.php
@@ -14,12 +14,9 @@
  */
 class AssertCustomerSegmentInCartPriceRuleIsApplying extends AbstractAssertCustomerSegmentPriceRuleApplying
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Catalog Price Rule is applied on product(s) in shopping cart according to rule condition has been
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsNotApplying.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsNotApplying.php
index cd00546b4a216..a3a434afa4876 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsNotApplying.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsNotApplying.php
@@ -14,12 +14,9 @@
  */
 class AssertCustomerSegmentInCartPriceRuleIsNotApplying extends AbstractAssertCustomerSegmentPriceRuleApplying
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that shopping cart subtotal equals with grand total
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInGrid.php
index 3b374c3c057d3..953886a92b319 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerSegmentInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer segment presents in grid and has correct 'Segment','Status','Website'
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomer.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomer.php
index 3dbd513e93746..e78cbcb2b485e 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomer.php
@@ -21,12 +21,9 @@
  */
 class AssertCustomerSegmentMatchedCustomer extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that grid on 'Matched Customer' tab contains customer according to conditions
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomerWithCart.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomerWithCart.php
index 323089b5b7127..3c4c303c7f0da 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomerWithCart.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomerWithCart.php
@@ -14,12 +14,9 @@
  */
 class AssertCustomerSegmentMatchedCustomerWithCart extends AbstractAssertCustomerSegmentPriceRuleApplying
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that grid on 'Matched Customer' tab contains customer according to conditions(it need save condition
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomersInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomersInGrid.php
index a1ac12a15617b..5b37baf29085c 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomersInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomersInGrid.php
@@ -21,12 +21,9 @@
  */
 class AssertCustomerSegmentMatchedCustomersInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that the customer according to search criteria presents in the grid and have correct values for
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotApplicableToBanner.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotApplicableToBanner.php
index 785041370884e..e9b7ff54d77dd 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotApplicableToBanner.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotApplicableToBanner.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerSegmentNotApplicableToBanner extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer segment is not available in Banner edit page
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotInGrid.php
index 83ce5c511b7e3..fc73489b788ac 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerSegmentNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created customer segment not presents in grid
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportInGrid.php
index b8695ffddf6f3..1ebb0b3854958 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertCustomerSegmentReportInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that created customer segment report presents in the grid and customer from it has correct values
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportMessage.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportMessage.php
index be71716c4c367..0358f2449b42d 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportMessage.php
@@ -23,12 +23,9 @@ class AssertCustomerSegmentReportMessage extends AbstractConstraint
      */
     const REPORT_MESSAGES = 'Viewing combined "%s" report from segments: %s.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that message is displayed on the customer segment report detail page
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportNotInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportNotInGrid.php
index 003c3b4696d0e..935c59815e865 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportNotInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertCustomerSegmentReportNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that created customer is absent in a customer segment grid
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessDeleteMessage.php
index 14f01475f2311..3f8ad8566b932 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertCustomerSegmentSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the segment.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success delete message is displayed after Customer Segments has been deleted
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessSaveMessage.php
index 5770e22bebd58..be60bd1636731 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessSaveMessage.php
@@ -19,12 +19,9 @@ class AssertCustomerSegmentSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You saved the segment.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after Customer Segments saved
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
index ee5346b520fde..6124834034d5c 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
@@ -18,12 +18,9 @@
  */
 class AssertDownloadableDuplicateForm extends AssertProductDuplicateForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert form data equals duplicate product downloadable data
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
index aa84e4c5f8ac8..fa01c1d8dec79 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
@@ -41,12 +41,9 @@ class AssertDownloadableLinksData extends AbstractAssertForm
         'price'
     ];
     
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert Link block for downloadable product on front-end
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
index 8809bada21de7..4020f6a536856 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
@@ -39,12 +39,9 @@ class AssertDownloadableSamplesData extends AbstractAssertForm
         'title',
     ];
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert Sample block for downloadable product on front-end
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicatedInGrid.php b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicatedInGrid.php
index e9277933974c5..0e7bd3e35179e 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicatedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicatedInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertGiftCardDuplicatedInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that duplicated product is found by sku and has correct product type, product template,
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductAddToCartForm.php b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductAddToCartForm.php
index f67763a308aa2..dcdda973d4295 100755
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductAddToCartForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductAddToCartForm.php
@@ -25,12 +25,9 @@ class AssertGiftCardProductAddToCartForm extends AbstractAssertForm
      */
     const CUSTOM_OPTION = 'custom';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that displayed amount, "Sender Name", "Sender Email", "Recipient Name", "Recipient Email", "Message" data
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductForm.php b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductForm.php
index 7dd9fcef5814a..3e57b7124f682 100755
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductForm.php
@@ -24,10 +24,7 @@ class AssertGiftCardProductForm extends AssertProductForm
         'giftcard_amounts::price'
     ];
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 }
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountForm.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountForm.php
index ecce9ec816290..a2366682fcd82 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountForm.php
@@ -26,12 +26,9 @@ class AssertGiftCardAccountForm extends AbstractAssertForm
      */
     protected $skippedFields = ['code'];
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that gift card account equals to passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountIsNotUsableInCartOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountIsNotUsableInCartOnFrontend.php
index f26934b5f56f9..322029fc3d7da 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountIsNotUsableInCartOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountIsNotUsableInCartOnFrontend.php
@@ -20,12 +20,9 @@
  */
 class AssertGiftCardAccountIsNotUsableInCartOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that gift card is not usable in cart on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotInGrid.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotInGrid.php
index 6ebba7849de04..2258c989a5bea 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertGiftCardAccountNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that gift card account not in grid
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotRedeemableOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotRedeemableOnFrontend.php
index d72816235b744..431296447a3c7 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotRedeemableOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotRedeemableOnFrontend.php
@@ -18,12 +18,9 @@
  */
 class AssertGiftCardAccountNotRedeemableOnFrontend extends AbstractAssertGiftCardAccountOnFrontend
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that gift card is not redeemable on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountRedeemableOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountRedeemableOnFrontend.php
index 1b537d617ea9b..39f8f695c9fd4 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountRedeemableOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountRedeemableOnFrontend.php
@@ -24,12 +24,9 @@ class AssertGiftCardAccountRedeemableOnFrontend extends AbstractAssertGiftCardAc
      */
     const SUCCESS_MESSAGE = 'Gift Card "%s" was redeemed.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that gift card is redeemable on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSaveMessage.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSaveMessage.php
index 57d2ba3e72b5a..4cc5007630b15 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSaveMessage.php
@@ -22,12 +22,9 @@ class AssertGiftCardAccountSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You saved the gift card account.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      *  Assert that success message is displayed after gift card account save
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInCustomerAccount.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInCustomerAccount.php
index 848d8fc898b3d..56c9b1dc25831 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInCustomerAccount.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInCustomerAccount.php
@@ -19,12 +19,9 @@
  */
 class AssertGiftCardAccountStatusInCustomerAccount extends AbstractAssertGiftCardAccountOnFrontend
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created gift card account can be verified on the frontend on My Account page
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInShoppingCart.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInShoppingCart.php
index bec811a5ad2ba..5d7ad3f4a46d3 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInShoppingCart.php
@@ -21,12 +21,9 @@
  */
 class AssertGiftCardAccountStatusInShoppingCart extends AbstractAssertGiftCardAccountOnFrontend
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created gift card account can be verified on the frontend in Shopping Cart
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSuccessDeleteMessage.php
index 18990def777bd..62e3ca3110b4c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertGiftCardAccountSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'This gift card account has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that gift card account delete success message is present
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountUsableInCartOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountUsableInCartOnFrontend.php
index c30f718f5cdc8..c3de9d6dfbed4 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountUsableInCartOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountUsableInCartOnFrontend.php
@@ -20,12 +20,9 @@
  */
 class AssertGiftCardAccountUsableInCartOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that gift card usable in frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardDiscount.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardDiscount.php
index 132b2eafeab76..e666752b4b3f1 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardDiscount.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardDiscount.php
@@ -17,12 +17,9 @@
  */
 class AssertGiftCardDiscount extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that sum of gift card discount is equal to passed from dataSet in shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardSuccessAddMessage.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardSuccessAddMessage.php
index 82af5aa9fc4b3..9d5827dc33587 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardSuccessAddMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardSuccessAddMessage.php
@@ -23,12 +23,9 @@ class AssertGiftCardSuccessAddMessage extends AbstractConstraint
      */
     const SUCCESS_APPLY_MESSAGE = 'Gift Card "%s" was added.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success apply message is displayed on "Shopping Cart" frontend page
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
index b7767c0ede1ef..08da73c356f47 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
@@ -21,12 +21,9 @@
  */
 class AssertGiftMessageInFrontendOrder extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that message from dataSet is displayed on order(s) view page on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
index b2a286d6494e7..98686640c8fe0 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
@@ -21,12 +21,9 @@
  */
 class AssertGiftMessageInFrontendOrderItems extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that message from dataSet is displayed for each items on order(s) view page on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInShoppingCart.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInShoppingCart.php
index c0253c87bd4e2..8ed2b0baadac8 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInShoppingCart.php
@@ -22,12 +22,9 @@
  */
 class AssertGiftRegistryActiveInShoppingCart extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product can be added to active gift registry from Shopping Cart
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInWishlist.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInWishlist.php
index 49efcb0370795..d3ea3221b4a7f 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInWishlist.php
@@ -28,12 +28,9 @@ class AssertGiftRegistryActiveInWishlist extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'The wish list item has been added to this gift registry.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product can be added to active gift registry from Wishlist
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryForm.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryForm.php
index 6b66441b6eb3c..07f715da68bdf 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryForm.php
@@ -19,12 +19,9 @@
  */
 class AssertGiftRegistryForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInGrid.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInGrid.php
index 0e34a75e0c256..242d79a2f8622 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertGiftRegistryInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Gift Registry can be found at Gift Registry grid by title
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInactiveNotInWishlist.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInactiveNotInWishlist.php
index 1cb126953f751..6217d5a56955c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInactiveNotInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInactiveNotInWishlist.php
@@ -21,12 +21,9 @@
  */
 class AssertGiftRegistryInactiveNotInWishlist extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product can not be added to inactive gift registry from Wishlist
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryIsEmptyMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryIsEmptyMessage.php
index 1ad382436b300..367de89a4e12d 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryIsEmptyMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryIsEmptyMessage.php
@@ -22,12 +22,9 @@ class AssertGiftRegistryIsEmptyMessage extends AbstractConstraint
      */
     const INFO_MESSAGE = 'This gift registry has no items.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that notice message appears if Gift Registry doesn't have any items after delete
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsForm.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsForm.php
index 698318292e3bf..aa4a6a6489fc1 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsForm.php
@@ -22,12 +22,9 @@
  */
 class AssertGiftRegistryItemsForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that displayed Gift Registry items data on edit page equals passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedFrontendSuccessMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedFrontendSuccessMessage.php
index 15a4d4db2bde3..29db77492c2c4 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedFrontendSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedFrontendSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertGiftRegistryItemsUpdatedFrontendSuccessMessage extends AbstractConst
      */
     const SUCCESS_MESSAGE = 'You updated the gift registry items.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after gift registry items has been updated
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedSuccessMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedSuccessMessage.php
index f96c15f59944a..3fba05cd1f539 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertGiftRegistryItemsUpdatedSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You updated this gift registry.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success update message is displayed after gift registry items updating on backend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryManageItemsTab.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryManageItemsTab.php
index ac15a890d406c..68c0011244c2c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryManageItemsTab.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryManageItemsTab.php
@@ -22,12 +22,9 @@
  */
 class AssertGiftRegistryManageItemsTab extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Manage Items page on frontend contains correct product name and quantity
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryNotInGrid.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryNotInGrid.php
index 7922b2cd56f26..8013041826ead 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertGiftRegistryNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Gift Registry can not be found at Gift Registry grid by title
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessAddedItemsMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessAddedItemsMessage.php
index 6e8e87f1dcff0..74b1143b73fa8 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessAddedItemsMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessAddedItemsMessage.php
@@ -22,12 +22,9 @@ class AssertGiftRegistrySuccessAddedItemsMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'Shopping cart items have been added to gift registry.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after adding products to gift registry on backend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessDeleteMessageOnBackend.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessDeleteMessageOnBackend.php
index 665bdb75e46bd..445f383592f64 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessDeleteMessageOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessDeleteMessageOnBackend.php
@@ -22,12 +22,9 @@ class AssertGiftRegistrySuccessDeleteMessageOnBackend extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted this gift registry entity.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert message appears after delete gift registry on backend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessSaveMessage.php
index a5a6efc32a165..2611c9055d629 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertGiftRegistrySuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You saved this gift registry.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after gift registry has been created
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnBackend.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnBackend.php
index 634173c2ede11..4af3ca48e8d2c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnBackend.php
@@ -22,12 +22,9 @@ class AssertGiftRegistrySuccessShareMessageOnBackend extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = '%d email(s) were sent.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after gift registry has been share on backend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnFrontend.php
index 1d3a3d1fb2cac..2944b097964a5 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnFrontend.php
@@ -22,12 +22,9 @@ class AssertGiftRegistrySuccessShareMessageOnFrontend extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You shared the gift registry for %d emails.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after gift registry has been shared on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeForm.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeForm.php
index 9f81173a20ed6..23bf6fe992da2 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeForm.php
@@ -19,12 +19,9 @@
  */
 class AssertGiftRegistryTypeForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that GiftRegistryType form filled correctly
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeInGrid.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeInGrid.php
index dfbfb8618daf3..247fa22f95b54 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertGiftRegistryTypeInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Gift Registry type can be found at Stores > Gift Registry grid in backend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotInGrid.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotInGrid.php
index 25d6092c0c907..94fde9f1e5bee 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertGiftRegistryTypeNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted Gift Registry type is absent in Stores > Gift Registry grid in backend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotOnFrontend.php
index bcfafd976ccb5..e52d8ad283889 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotOnFrontend.php
@@ -23,12 +23,9 @@
  */
 class AssertGiftRegistryTypeNotOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted Gift Registry type is absent on creation new gift registry form on my account on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeOnFrontend.php
index 5bc9a8d0fc48d..360bf4a5b9e5c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeOnFrontend.php
@@ -21,12 +21,9 @@
  */
 class AssertGiftRegistryTypeOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Gift Registry type can be found at Customer Account > Gift Registry
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessDeleteMessage.php
index 4a62cd48888e2..e4c954b86af7e 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertGiftRegistryTypeSuccessDeleteMessage extends AbstractConstraint
      */
     const DELETE_MESSAGE = 'You deleted the gift registry type.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success delete message is displayed after gift registry has been deleted
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessSaveMessage.php
index 96f04b3ea9013..460903e7fb6fe 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertGiftRegistryTypeSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You saved the gift registry type.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after save a Gift Registry type success message appears
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingForm.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingForm.php
index 5035816da40f4..9ffd668056830 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingForm.php
@@ -18,12 +18,9 @@
  */
 class AssertGiftWrappingForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Skipped fields while verifying
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingInGrid.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingInGrid.php
index 02f2e83a7568f..b1ef33ed5744f 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertGiftWrappingInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert Gift Wrapping availability in Gift Wrapping grid
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionForm.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionForm.php
index fdadb849e67fc..de1b784fbcdff 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionForm.php
@@ -19,12 +19,9 @@
  */
 class AssertGiftWrappingMassActionForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * @param GiftWrappingIndex $giftWrappingIndexPage
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionInGrid.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionInGrid.php
index b8d1afaa6817a..a2d51b87db764 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertGiftWrappingMassActionInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert Gift Wrapping availability in Gift Wrapping grid after mass action
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionNotInGrid.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionNotInGrid.php
index 442955b96af72..9ce2bd4506b80 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertGiftWrappingMassActionNotInGrid extends AssertGiftWrappingNotInGrid
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted Gift Wrapping can not be found in grid via: id, design, website_id, status, price
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionSuccessDeleteMessage.php
index acb9cf8a60e44..2c1bae36d5143 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertGiftWrappingMassActionSuccessDeleteMessage extends AbstractConstrain
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted a total of %d records.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after mass delete Gift Wrapping successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotInGrid.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotInGrid.php
index a1e212e754d5f..ab8d48fc87f29 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertGiftWrappingNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted Gift Wrapping can not be found in grid via: id, design, website_id, status, price
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnFrontendCheckout.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnFrontendCheckout.php
index 6cae46ec41ce3..2872fb9dd40ea 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnFrontendCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnFrontendCheckout.php
@@ -25,12 +25,9 @@
  */
 class AssertGiftWrappingNotOnFrontendCheckout extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted Gift Wrapping can not be found during one page checkout on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnOrderCreationPage.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnOrderCreationPage.php
index e09b2ac6bf5a7..4244a91eb0d36 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnOrderCreationPage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnOrderCreationPage.php
@@ -19,12 +19,9 @@
  */
 class AssertGiftWrappingNotOnOrderCreationPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted Gift Wrapping can not be found on order creation page in backend
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingOnFrontendCheckout.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingOnFrontendCheckout.php
index 373fa229898fc..3a32e7be8eeff 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingOnFrontendCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingOnFrontendCheckout.php
@@ -25,12 +25,9 @@
  */
 class AssertGiftWrappingOnFrontendCheckout extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Gift Wrapping can be found during one page checkout on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessDeleteMessage.php
index 235fcbd5dd7ac..b31a9f5c6992c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertGiftWrappingSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the gift wrapping.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after delete Gift Wrapping successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessSaveMessage.php
index 6a0c3a0853251..e4b5a116bd860 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertGiftWrappingSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_SAVE_MESSAGE = 'You saved the gift wrapping.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after Gift Wrapping saved
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessUpdateMessage.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessUpdateMessage.php
index 4ab12b4d0fb1e..1182cf787040d 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessUpdateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessUpdateMessage.php
@@ -22,12 +22,9 @@ class AssertGiftWrappingSuccessUpdateMessage extends AbstractConstraint
      */
     const SUCCESS_UPDATE_MESSAGE = 'You updated a total of %d records.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after update Gift Wrapping successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php
index 5597a2dbef88d..feb8f6073152f 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php
@@ -20,12 +20,9 @@
  */
 class AssertProductAttributeAbsenceForAttributeMapping extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that deleted attribute can't be mapped to Google Attribute (attribute doesn't appear in Attributes
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
index 32328c92ee00e..18cd326bebae7 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertGroupedPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupedProductPage
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Format error message
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
index 1b63b236430c4..fc221a71b8627 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
@@ -18,12 +18,9 @@
  */
 class AssertGroupedProductForm extends AssertProductForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert form data equals fixture data
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
index 78bf7f1d6eea4..cee23471442d9 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertGroupedProductInItemsOrderedGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Fields for assert
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
index 3322215923cb4..0e1ba65cc3342 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
@@ -19,12 +19,9 @@
  */
 class AssertGroupedProductsDefaultQty extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that default qty for sub products in grouped product displays according to dataset on product page
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
index cb385a48a81d7..248b8c63ba4ba 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
@@ -18,12 +18,9 @@
  */
 class AssertSpecialPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupedProductPage
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Format error message
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
index 0c58f475c1731..1850446b52aa4 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertTierPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupedProductPage
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Format error message
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
index ab2c1065558b8..d332a71c16c02 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
@@ -19,12 +19,9 @@
  */
 class AssertProductAttributeAbsenceForExport extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that deleted attribute can't be used for Products' Export
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
index 1b5f97a5fd860..810f89b1c3868 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
@@ -19,12 +19,9 @@
  */
 class AssertIntegrationForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Skipped fields while verifying
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
index 2bcbe49ac6340..773b8a173e741 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertIntegrationInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that data in grid on Integrations page according to fixture by name field
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
index c41d0fbf82138..2ebdcec57e9cd 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertIntegrationNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that Integration is not presented in grid and cannot be found using name
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
index 1b38fa7f4430e..20fe3054e9317 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
@@ -18,12 +18,9 @@
  */
 class AssertIntegrationResourcesPopup extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that pop-up with resources, that were specified for integration are shown
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
index deddb149c58ad..2f82af3ab1b5b 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
@@ -20,12 +20,9 @@ class AssertIntegrationSuccessActivationMessage extends AbstractConstraint
 {
     const SUCCESS_ACTIVATION_MESSAGE = "The integration '%s' has been activated.";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success activation message is appeared on the Integrations page
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
index 727b769016e7d..53a4d999f2d67 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
@@ -20,12 +20,9 @@ class AssertIntegrationSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = "The integration '%s' has been deleted.";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success delete message is appeared on the Integrations page
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
index 56b56f7a44555..3bbd95dad5841 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
@@ -20,12 +20,9 @@ class AssertIntegrationSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_SAVE_MESSAGE = "The integration '%s' has been saved.";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success save message is appeared on the Integrations page
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
index 4aef72b3e374f..66fb6497e3834 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
@@ -17,12 +17,9 @@
  */
 class AssertIntegrationTokensPopup extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Fields to be checked
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationErrorSentMessage.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationErrorSentMessage.php
index fc1b7ecdc13a0..e6dfe3f15861a 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationErrorSentMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationErrorSentMessage.php
@@ -22,12 +22,9 @@ class AssertInvitationErrorSentMessage extends AbstractConstraint
      */
     const ERROR_MESSAGE = "Something went wrong sending %d of %d invitations.";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that error message appears after sending invitation on backend.
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendErrorSendDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendErrorSendDuplicateMessage.php
index 42044e242e3e4..6279bd17bb0cc 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendErrorSendDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendErrorSendDuplicateMessage.php
@@ -22,12 +22,9 @@ class AssertInvitationFrontendErrorSendDuplicateMessage extends AbstractConstrai
      */
     const ERROR_MESSAGE = "Invitation for same email address already exists.";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that error message appears after sent invitation to the same email address
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendSuccessSentMessage.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendSuccessSentMessage.php
index 1451bcea639bc..afdb610572a7e 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendSuccessSentMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendSuccessSentMessage.php
@@ -23,12 +23,9 @@ class AssertInvitationFrontendSuccessSentMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = "You sent the invitation for %s.";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message appears after sent invitation on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGridOnFrontend.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGridOnFrontend.php
index dc5b3ccb59c50..6eae286839407 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGridOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGridOnFrontend.php
@@ -20,12 +20,9 @@
  */
 class AssertInvitationInGridOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert Invitation appears on frontend in My Invitations grid
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationOneEntry.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationOneEntry.php
index ec932c75dad38..497462183bcce 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationOneEntry.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationOneEntry.php
@@ -20,12 +20,9 @@
  */
 class AssertInvitationOneEntry extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert only one invitation was sent to unique email on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Logging/Test/Constraint/AssertAdminUserDataBlock.php b/dev/tests/functional/tests/app/Magento/Logging/Test/Constraint/AssertAdminUserDataBlock.php
index 8190f268448c9..8f4c8432d3b4b 100644
--- a/dev/tests/functional/tests/app/Magento/Logging/Test/Constraint/AssertAdminUserDataBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Logging/Test/Constraint/AssertAdminUserDataBlock.php
@@ -17,12 +17,9 @@
  */
 class AssertAdminUserDataBlock extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Admin User Data block with data according action is presented on page
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistState.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistState.php
index 180db87a7d4b5..2e8426937b444 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistState.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistState.php
@@ -28,12 +28,9 @@
  */
 abstract class AbstractAssertMultipleWishlistState extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'Medium';
+    /* tags */
+     const SEVERITY = 'Medium';
+     /* end tags */
 
     /**
      * Notice type
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistSuccessMessage.php
index 85a5b6e5d22dc..21234f323f171 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistSuccessMessage.php
@@ -25,12 +25,9 @@ abstract class AbstractAssertMultipleWishlistSuccessMessage extends AbstractCons
      */
     protected $message;
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert success message is displayed
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertBundleProductDetailsInMultipleWishlist.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertBundleProductDetailsInMultipleWishlist.php
index 5d41f5ed74485..2926fc4e4e5cc 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertBundleProductDetailsInMultipleWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertBundleProductDetailsInMultipleWishlist.php
@@ -24,12 +24,9 @@
  */
 class AssertBundleProductDetailsInMultipleWishlist extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that the correct option details are displayed on the "View Details" tool tip.
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertDeleteMultipleWishlistButtonIsAbsent.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertDeleteMultipleWishlistButtonIsAbsent.php
index 46ba44f9603cc..66fc95319a0ce 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertDeleteMultipleWishlistButtonIsAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertDeleteMultipleWishlistButtonIsAbsent.php
@@ -17,12 +17,9 @@
  */
 class AssertDeleteMultipleWishlistButtonIsAbsent extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'Medium';
+    /* tags */
+     const SEVERITY = 'Medium';
+     /* end tags */
 
     /**
      * Assert that there is no "Delete Wishlist" button for Customer
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistAbsentInMyAccount.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistAbsentInMyAccount.php
index 9a824c2fb5de6..76d217b06c73b 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistAbsentInMyAccount.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistAbsentInMyAccount.php
@@ -14,12 +14,9 @@
  */
 class AssertMultipleWishlistAbsentInMyAccount extends AbstractAssertMultipleWishlistExist
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert wish list is absent
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistPresentInMyAccount.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistPresentInMyAccount.php
index f267ef1cb0107..090b3017a7456 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistPresentInMyAccount.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistPresentInMyAccount.php
@@ -14,12 +14,9 @@
  */
 class AssertMultipleWishlistPresentInMyAccount extends AbstractAssertMultipleWishlistExist
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert wish list is present
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductAbsentInDefaultWishlist.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductAbsentInDefaultWishlist.php
index 86a2133582a5c..b8fadf8445213 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductAbsentInDefaultWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductAbsentInDefaultWishlist.php
@@ -20,12 +20,9 @@
  */
 class AssertProductAbsentInDefaultWishlist extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product is absent in default wishlist
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInCustomWishlist.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInCustomWishlist.php
index 09d544fa59daf..b021d86ccfc29 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInCustomWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInCustomWishlist.php
@@ -22,12 +22,9 @@
  */
 class AssertProductInCustomWishlist extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product is present in custom wishlist
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInDefaultWishlist.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInDefaultWishlist.php
index 6790069c49137..272187990e182 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInDefaultWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInDefaultWishlist.php
@@ -20,12 +20,9 @@
  */
 class AssertProductInDefaultWishlist extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product and quantity is present in default wishlist
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertWishlistReportGrid.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertWishlistReportGrid.php
index e91ea61ee65fe..876800190f75b 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertWishlistReportGrid.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertWishlistReportGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertWishlistReportGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that added to the customer wish list products present in the grid and products have correct values
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
index f60fb9bce6e4a..6c3bfdc12e525 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerIsSubscribedToNewsletter extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert customer is subscribed to newsletter
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
index 156f081882e15..daa4fca483651 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
@@ -19,12 +19,9 @@
  */
 class AssertNewsletterForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that newsletter template form data equals to data passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
index 93ce535f94c07..9320545c871bb 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertNewsletterInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      *  Assert that newsletter template is present in grid
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
index ecb7d61159c8a..8a6d7ab52e885 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
@@ -19,12 +19,9 @@
  */
 class AssertNewsletterPreview extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that newsletter preview opened in new window and template content correct
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
index e47485c38be3d..c8b3f5c57e9f5 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
@@ -25,12 +25,9 @@ class AssertNewsletterQueue extends AbstractAssertForm
      */
     protected $skippedFields = ['code'];
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that "Edit Queue" page opened and subject, sender name, sender email and template content correct
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
index 14aa99d69cea5..416fe0d0ac57e 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
@@ -20,12 +20,9 @@ class AssertNewsletterSuccessCreateMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The newsletter template has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after newsletter template save
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php
index 7ed9d4a83aae8..bc1ddabc1705d 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php
@@ -17,12 +17,9 @@
  */
 abstract class AbstractAssertCustomerOrderReportResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Prepare filter
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
index 9fe15f4069d31..eaa6f307c11ca 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
@@ -19,12 +19,9 @@
  */
 class AssertAbandonedCartCustomerInfoResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert customer info in Abandoned Carts report (Reports > Abandoned carts):
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
index 60530f9efe1fe..e06dd79b57a48 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
@@ -18,12 +18,9 @@
  */
 class AssertCouponReportResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert coupon info in report: code, rule name, subtotal, discount on coupons report page
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php
index 7ae0a765d25e9..65a5778749258 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php
@@ -17,12 +17,9 @@
  */
 class AssertCustomerOrderCountReportResult extends AbstractAssertCustomerOrderReportResult
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert OrderCountReport grid for all params
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php
index 89294a4c437d4..c7b9926846e21 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php
@@ -17,12 +17,9 @@
  */
 class AssertCustomerOrderTotalReportResult extends AbstractAssertCustomerOrderReportResult
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert OrderTotalReport grid for all params
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
index 323a31bacd817..8c3fcb7317741 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
@@ -18,12 +18,9 @@
  */
 class AssertDownloadsReportResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert product info in report: product name, link title, sku, downloads number (Reports > Products > Downloads)
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php
index 8ee8a5b6d83fa..1d5547381e2f8 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php
@@ -16,12 +16,9 @@
  */
 class AssertInvoiceReportIntervalResult extends AbstractAssertInvoiceReportResult
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that sales info in report grid is actual
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php
index 10642da962794..7cd6adb737541 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php
@@ -16,12 +16,9 @@
  */
 class AssertInvoiceReportTotalResult extends AbstractAssertInvoiceReportResult
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that total invoice info in report grid is actual
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
index dd9d1f47ca57a..69e8adfeecbb1 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertLowStockProductInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product with Low Stock is present in Low Stock grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
index 8644e0b1f1292..29c7a6a8f8ba0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
@@ -17,12 +17,9 @@
  */
 class AssertNewAccountsReportTotalResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that new account total result is equals to data from dataSet
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
index 915b55a201203..19fbe563617fa 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
@@ -21,12 +21,9 @@
  */
 class AssertOrderedProductResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert product name and qty in Ordered Products report
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
index 53f172f048d20..88e7caf30361a 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
@@ -18,12 +18,9 @@
  */
 class AssertProductInCartResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product is present in Products in Carts report grid by name, price, carts
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
index 71ec16e96b7bd..81a3e5b780cdb 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
@@ -22,12 +22,9 @@
  */
 class AssertProductReportByCustomerInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Customer review is displayed in grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
index 5d58559ae17a5..f2ae4a48cc577 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
@@ -22,12 +22,9 @@
  */
 class AssertProductReportByCustomerNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts Customer Product Review not available in grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
index 16c11ff6df852..e2ec20425af2d 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
@@ -20,12 +20,9 @@
  */
 class AssertProductReviewIsAvailableForProduct extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that review is visible in review grid for select product
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
index f45ed34a5733e..57a4cd7a89f62 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertProductReviewReportIsVisibleInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Product Review Report is visible in reports grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
index 4012479cc17aa..670e94ed9d812 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
@@ -18,12 +18,9 @@
  */
 class AssertProductReviewsQtyByCustomer extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert product reviews qty column in Review Report by Customer grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
index 3f3268399eabb..79535567fadd0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
@@ -17,12 +17,9 @@
  */
 class AssertProductViewsReportTotalResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert product info in report: product name, price and views
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php
index f9a8178dfb9d2..03fafdf520ded 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php
@@ -17,12 +17,9 @@
  */
 class AssertRefundReportIntervalResult extends AbstractAssertSalesReportResult
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert Credit Memo info in report: Refunds Orders, Total Refunded
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
index 117b18a8de9b3..b0261c0cef40c 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
@@ -17,12 +17,9 @@
  */
 class AssertSalesReportIntervalResult extends AbstractAssertSalesReportResult
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that sales info in report grid is actual
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
index 9c95a379d93f8..113dba55abf76 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
@@ -17,12 +17,9 @@
  */
 class AssertSalesReportTotalResult extends AbstractAssertSalesReportResult
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that total sales info in report grid is actual
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
index 330ed1c5edc03..f0204c2c39ed4 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
@@ -18,12 +18,9 @@
  */
 class AssertSearchTermReportForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Search Term Report form data equals to passed from dataSet
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
index a1cdf87b83349..d89d0e3d2cbf5 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertSearchTermsInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Search Terms report in grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
index 8442f5f4d847c..5e03d8ebdf7c2 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertTaxReportInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert sales info in report: Tax, Rate, Orders, Tax Amount on tax report page
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
index ecc5ffdee0adf..2e516ecfd9136 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertTaxReportNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert Tax report is absent on tax report page
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
index 601b507d118dd..77135c683c0f7 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertProductRatingInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert product Rating availability in product Rating grid
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
index 7ddbd02c960ad..783fb30ae3ddd 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
@@ -21,12 +21,9 @@
  */
 class AssertProductRatingInProductPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product rating is displayed on product review(frontend)
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
index 40ab571ee4aac..736cb92f18a2c 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertProductRatingNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert product Rating is absent on product Rating grid
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
index 191eb2dad2620..5086b553949b6 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertProductRatingNotInProductPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product rating is not displayed on frontend on product review
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
index d1b28ee081949..cddc7cdb31875 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
@@ -18,12 +18,9 @@
  */
 class AssertProductRatingOnReviewPage extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product rating is displayed on product review(backend)
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
index 24059790bf199..8bdb0d05d380a 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertProductRatingSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'You deleted the rating.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after rating delete
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
index 1c7a5d78105d6..dd24dcf03b415 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertProductRatingSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You saved the rating.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after rating save
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
index 81ddbf9c055c1..37b4dffa5474d 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertProductReviewBackendSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You saved the review.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after review created
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
index feff3a1f23cf3..71f3fa412db54 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertProductReviewInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Filter params
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
index 3a8da8bac36e2..f773523c17b32 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
@@ -21,12 +21,9 @@
  */
 class AssertProductReviewInGridOnCustomerPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts all Product Review variables in the reviews grid on customer page
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
index 6361de073cf3c..0356608d2abc9 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
@@ -23,12 +23,9 @@ class AssertProductReviewMassActionSuccessDeleteMessage extends AbstractConstrai
      */
     const SUCCESS_DELETE_MESSAGE = 'A total of %d record(s) have been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after deletion via mass actions
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
index d037e18d241b0..304f1d6886fdf 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
@@ -23,12 +23,9 @@ class AssertProductReviewMassActionSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'A total of %d record(s) have been updated.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after updated via mass actions
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
index f0221dae624e6..6a14a1f17e127 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertProductReviewNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Filter params
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
index d6f201621a8ef..b5f763c5a39ce 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
@@ -20,12 +20,9 @@
  */
 class AssertProductReviewNotOnProductPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product review Not available on product page
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
index deaaf57c32f34..753d235607a0d 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
@@ -22,12 +22,9 @@
  */
 class AssertProductReviewOnProductPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that product review available on product page
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
index 2b46e2e43927f..ab97adc226e1d 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
@@ -21,12 +21,9 @@ class AssertReviewCreationSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'Your review has been accepted for moderation.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after review created
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
index 7c07d9eeeb560..a15d1859555e8 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertReviewSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You saved the review.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after review save
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRateSuccessSaveMessage.php
index 3561079c892e5..3ef6ecd86b21a 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRateSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertRateSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_SAVE_MESSAGE = 'You saved the rate.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that specified message is present on page
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardInHistoryGrid.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardInHistoryGrid.php
index 81482595e9415..7c81496556fec 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardInHistoryGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardInHistoryGrid.php
@@ -21,12 +21,9 @@
  */
 class AssertRewardInHistoryGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after updating reward balance - it reflects in history grid: check Points, Website, Comment
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForCurrencyToPoints.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForCurrencyToPoints.php
index 1449fb8020b8e..1dff9447fe373 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForCurrencyToPoints.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForCurrencyToPoints.php
@@ -23,12 +23,9 @@
  */
 class AssertRewardNoExchangeMessageForCurrencyToPoints extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that "Each $X spent will earn X Reward points" message is not displayed on the RewardCustomerInfo page.
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForPointsToCurrency.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForPointsToCurrency.php
index 126c6c4bdcada..942c81c2242b6 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForPointsToCurrency.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForPointsToCurrency.php
@@ -22,12 +22,9 @@
  */
 class AssertRewardNoExchangeMessageForPointsToCurrency extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Each X Reward points can be redeemed for $X message is not displayed on the RewardCustomerInfo page.
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php
index a96c37cd49888..2456c13c0538a 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php
@@ -32,12 +32,9 @@ class AssertRewardPointsBalance extends AbstractConstraint
      */
     const REWARD_POINTS_EXCHANGE_RATE = 'Current exchange rates: Each %d Reward points can be redeemed for $%.2f.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that "Your balance is X Reward points ($X.00)." and current exchange message are appeared
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnCustomerRegistration.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnCustomerRegistration.php
index f473696c06565..0c0c5012698ba 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnCustomerRegistration.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnCustomerRegistration.php
@@ -23,12 +23,9 @@ class AssertRewardPointsMessageOnCustomerRegistration extends AbstractConstraint
      */
     const REGISTRATION_REWARD_MESSAGE = 'Register on our site now and earn %d Reward points.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that reward points message is appeared on the Create New Customer Account page
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnShoppingCart.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnShoppingCart.php
index d3d95cc34427f..c15f76fbda6b8 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnShoppingCart.php
@@ -25,12 +25,9 @@ class AssertRewardPointsMessageOnShoppingCart extends AbstractConstraint
      */
     const CHECKOUT_REWARD_MESSAGE = 'Check out now and earn %d Reward points for this order.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that reward points message is displayed on shopping cart page
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessDeleteMessage.php
index 55c97e7e8be8a..6581cdd945165 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertRewardPointsSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the rate.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that success delete message equals to expected message
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessRemoveMessage.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessRemoveMessage.php
index 845317daf3b1e..2e7bf9a94c6cd 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessRemoveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessRemoveMessage.php
@@ -22,12 +22,9 @@ class AssertRewardPointsSuccessRemoveMessage extends AbstractConstraint
      */
     const SUCCESS_REMOVE_MESSAGE = 'You removed the reward points from this order.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after remove reward points successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionOnBackend.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionOnBackend.php
index bc94e7f93f795..d8533a89835a9 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionOnBackend.php
@@ -20,12 +20,9 @@
  */
 class AssertRewardSubscriptionOnBackend extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that customer reward subscriptions checkboxes are empty
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionSaveMessage.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionSaveMessage.php
index de2916eb29265..e3faebc435ef4 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionSaveMessage.php
@@ -19,12 +19,9 @@ class AssertRewardSubscriptionSaveMessage extends AbstractConstraint
 {
     const SUCCESS_SAVE_MESSAGE = 'You saved the settings.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that reward points subscription settings success save message is present on page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
index ff4c2f7479c5f..c4b963a228126 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
@@ -19,12 +19,9 @@
  */
 class AssertCreditMemoButton extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that 'Credit Memo' button is present on order's page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php
index dd27fd4714360..42379aa4d2734 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php
@@ -19,12 +19,9 @@
  */
 class AssertCreditMemoItems extends AbstractAssertItems
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert credit memo items on credit memo view page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
index c5daa32e1bff0..44528e6bba5c5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertInvoiceInInvoicesGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert invoice with corresponding order ID is present in the invoices grid with corresponding amount
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
index f1cc3ffddae9d..dca4abfbc7136 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
@@ -20,12 +20,9 @@
  */
 class AssertInvoiceInInvoicesTab extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that invoice is present in the invoices tab of the order with corresponding amount(Grand Total)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php
index 63b4bf7bbbf68..4893c91fbf13a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php
@@ -19,12 +19,9 @@
  */
 class AssertInvoiceItems extends AbstractAssertItems
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert invoice items on invoice view page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
index 82730c1d5f1a0..7e3e3a1a47d72 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
@@ -22,12 +22,9 @@ class AssertInvoiceSuccessCreateMessage extends AbstractConstraint
      */
     const SUCCESS_CREATE_MESSAGE = 'The invoice has been created.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message present after create invoice
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
index b768aa1d40d85..5fb28681a63df 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertInvoiceWithShipmentSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You created the invoice and shipment.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert success message presents
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php
index c4bf54665a59d..751f29f207042 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php
@@ -19,12 +19,9 @@
  */
 class AssertInvoicedAmountOnFrontend extends AbstractAssertOrderOnFrontend
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that invoiced Grand Total amount is equal to placed order Grand total amount on invoice page (frontend)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
index b7ab7b3ffed85..692bb35e48edf 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
@@ -19,12 +19,9 @@
  */
 class AssertNoCreditMemoButton extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after refunding full amount 'Credit Memo' is not available any more
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
index 1498257b36c99..07d81c86ec2f1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
@@ -19,12 +19,9 @@
  */
 class AssertNoInvoiceButton extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert no Invoice button the order grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
index f61f147a12a1d..4b095652698c6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
@@ -17,12 +17,9 @@
  */
 class AssertOrderButtonsAvailable extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that specified in data set buttons exist on order page in backend
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
index 9135cb0df7ce6..c42726e575059 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
@@ -19,12 +19,9 @@
  */
 class AssertOrderButtonsUnavailable extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that buttons from dataSet are not present on page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
index da63de4edd960..04350a67c302d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
@@ -22,12 +22,9 @@ class AssertOrderCancelMassActionFailMessage extends AbstractConstraint
      */
     const FAIL_CANCEL_MESSAGE = 'You cannot cancel the order(s).';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert cancel fail message is displayed on order index page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
index de51ac372ebc0..ba995850447d6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertOrderCancelMassActionSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_CANCEL_MESSAGE = 'We canceled %d order(s).';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert cancel success message is displayed on order index page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
index c5ad5bb81fdc0..3e2f2755bbc9d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertOrderCancelSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_CANCEL_MESSAGE = 'You canceled the order.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after cancel sales order successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
index 940a224d29b53..29b2f599c68f9 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
@@ -17,12 +17,9 @@
  */
 class AssertOrderGrandTotal extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that Order Grand Total is correct on order page in backend
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
index 7076efdcedc6b..b1febde8a3135 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertOrderInOrdersGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that order with fixture data is present in Sales -> Orders Grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
index 245ad814a0fdb..25d2881968428 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
@@ -21,12 +21,9 @@
  */
 class AssertOrderInOrdersGridOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that order is present in Orders grid on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
index 9cbe191448c5e..de3de5f341fa4 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertOrderMassOnHoldSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_ON_HOLD_MESSAGE = 'You have put %d order(s) on hold.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert on hold success message is displayed on order index page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
index cd20c2e453f9b..62ed4fef7a087 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertOrderNotInOrdersGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that order with fixture data in not more in the Orders grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
index fc88fb73fcbdf..798e2f608268f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
@@ -21,12 +21,9 @@
  */
 class AssertOrderNotVisibleOnMyAccount extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert order is not visible in customer account on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
index fa2f154187e01..afdeda99ed80e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
@@ -22,12 +22,9 @@ class AssertOrderOnHoldFailMessage extends AbstractConstraint
      */
     const FAIL_ON_HOLD_MESSAGE = 'No order(s) were put on hold.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert on hold fail message is displayed on order index page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
index fd68d3adea504..b0bb3181554c0 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
@@ -27,12 +27,9 @@ class AssertOrderOnHoldSuccessMessage extends AbstractConstraint
      */
     const MULTIPLE_SUCCESS_ON_HOLD_MESSAGE = 'You have put %d order(s) on hold.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert on hold success message is displayed on order index page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
index a00ce5d2ac14b..6c9ccdfc77ec9 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
@@ -22,12 +22,9 @@ class AssertOrderReleaseFailMessage extends AbstractConstraint
      */
     const FAIL_RELEASE_MESSAGE = 'No order(s) were released from on hold status.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert release fail message is displayed on order index page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
index 10e2627946c23..bae785dd84315 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertOrderReleaseSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_RELEASE_MESSAGE = '%d order(s) have been released from on hold status.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert release success message is displayed on order index page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
index 82b84b7a2642c..409ecdfd174cb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
@@ -19,12 +19,9 @@ class AssertOrderStatusDuplicateStatus extends AbstractConstraint
 {
     const DUPLICATE_MESSAGE = 'We found another order status with the same order status code.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that duplicate message is displayed
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
index 116930d3c9b57..fbf07801470bb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertOrderStatusInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Order status state data mapping
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
index 479582f784fb2..856c670c1d77c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
@@ -18,12 +18,9 @@
  */
 class AssertOrderStatusIsCorrect extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that status is correct on order page in backend (same with value of orderStatus variable)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
index eb9ee247316bd..c3ec5077814cb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
@@ -18,12 +18,9 @@
  */
 class AssertOrderStatusNotAssigned extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that order status with status code from fixture have empty "State Code and Title" value
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
index 580fce1cd457b..493ab1025806a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
@@ -22,12 +22,9 @@ class AssertOrderStatusSuccessAssignMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You have assigned the order status.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after order status assigning
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
index c81e43da7777b..c027c83d29d1c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
@@ -19,12 +19,9 @@ class AssertOrderStatusSuccessCreateMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You have saved the order status.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after order status saved.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
index ed8d1fd007c48..5098ba3229de7 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
@@ -22,12 +22,9 @@ class AssertOrderStatusSuccessUnassignMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You have unassigned the order status.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after order status unassign
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
index 47b2347294e7f..dbc048002f4a3 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
@@ -22,12 +22,9 @@ class AssertOrderSuccessCreateMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = "You created the order.";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that after create sales order successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php
index 7d2673619b78a..da10ed3a263ce 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertOrdersInOrdersGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that orders are present in Sales -> Orders Grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
index d5751281257b8..53cbac717d0c2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
@@ -20,12 +20,9 @@
  */
 class AssertRefundInCreditMemoTab extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that refund is present in the tab with ID and refunded amount(depending on full/partial refund)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
index 09f824da00eb7..5e8d06c31ca48 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertRefundInRefundsGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that refund is present in the 'Refunds' grid with correct ID, order ID, refunded amount
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
index 8cb23858408c7..5bbe598774e08 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
@@ -22,12 +22,9 @@ class AssertRefundSuccessCreateMessage extends AbstractConstraint
      */
     const SUCCESS_CREATE_MESSAGE = 'You created the credit memo.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success create credit memo message is present on order view page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
index 5a5b86989f0f0..17c066b485162 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
@@ -19,12 +19,9 @@
  */
 class AssertRefundedGrandTotalOnFrontend extends AbstractAssertOrderOnFrontend
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that refunded grand total is equal to data from fixture on My Account page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
index fa1ec4370f66b..9597e04d2305a 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
@@ -19,12 +19,9 @@
  */
 class AssertReorderStatusIsCorrect extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that status is correct on order page in backend (same with value of orderStatus variable)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
index a5a36b262a97d..1e787c85dc599 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
@@ -19,12 +19,9 @@
  */
 class AssertUnholdButton extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that 'Unhold' button present on order page
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoInGrid.php
index b0b98620318d7..c69e8d40925c0 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertArchiveCreditMemoInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Refund with corresponding fixture data is present in Archive Credit Memos grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoItems.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoItems.php
index 1614c399240c8..a6a2e1d5b176d 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoItems.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoItems.php
@@ -20,12 +20,9 @@
  */
 class AssertArchiveCreditMemoItems extends AbstractAssertItems
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'medium';
+    /* tags */
+     const SEVERITY = 'medium';
+     /* end tags */
 
     /**
      * Assert returned product represented on Credit memo page:
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceInGrid.php
index 65826732051b2..c2a806e3c4377 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertArchiveInvoiceInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Invoice with corresponding data is present in Sales Archive Invoices grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceItems.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceItems.php
index 11e88467ae53e..90a0890a184a6 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceItems.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceItems.php
@@ -20,12 +20,9 @@
  */
 class AssertArchiveInvoiceItems extends AbstractAssertItems
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'medium';
+    /* tags */
+     const SEVERITY = 'medium';
+     /* end tags */
 
     /**
      * Assert invoiced product represented in invoice archive:
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderAvailableButtons.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderAvailableButtons.php
index 6722ae1bb0b2c..6e5db87a42b35 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderAvailableButtons.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderAvailableButtons.php
@@ -19,12 +19,9 @@
  */
 class AssertArchiveOrderAvailableButtons extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that specified in data set buttons exist on order page in backend
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionErrorMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionErrorMessage.php
index 9b1d91f53164a..76076f1bb1b6b 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionErrorMessage.php
@@ -22,12 +22,9 @@ class AssertArchiveOrderCancelMassActionErrorMessage extends AbstractConstraint
      */
     const ERROR_MESSAGE = 'You cannot cancel the order(s).';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that error message is displayed on "Archived Orders Grid" page
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionSuccessMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionSuccessMessage.php
index ea1a6ea792965..b7a12e7e64c94 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertArchiveOrderCancelMassActionSuccessMessage extends AbstractConstrain
      */
     const SUCCESS_MESSAGE = 'We canceled %d order(s).';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed on "Archived Orders Grid" page
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderInGrid.php
index cadf7023c553c..d0ee100fed8b4 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertArchiveOrderInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that order with fixture data is in archive orders grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderNotInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderNotInGrid.php
index c6c9aa299ab43..1d91e542fee28 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertArchiveOrderNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that order is absent in archive orders grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldErrorMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldErrorMessage.php
index 61f1f88af20a7..7546e08172550 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldErrorMessage.php
@@ -22,12 +22,9 @@ class AssertArchiveOrderOnHoldErrorMessage extends AbstractConstraint
      */
     const ERROR_MESSAGE = 'No order(s) were put on hold.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert on hold fail message is displayed on archive order index page
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldSuccessMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldSuccessMessage.php
index ae400595772f9..a3b3858fd622f 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertArchiveOrderOnHoldSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'You have put %d order(s) on hold.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert on hold success message is displayed on archived order index page
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseErrorMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseErrorMessage.php
index 4626a19966dd3..96b68c0305ab7 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseErrorMessage.php
@@ -22,12 +22,9 @@ class AssertArchiveOrderReleaseErrorMessage extends AbstractConstraint
      */
     const ERROR_MESSAGE = 'No order(s) were released from on hold status.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert release error message is displayed on archived order index page
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseSuccessMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseSuccessMessage.php
index a4ca97ae2b05f..4ae17771fa158 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertArchiveOrderReleaseSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = '%d order(s) have been released from on hold status.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert release success message is displayed on archive order index page
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderStatusInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderStatusInGrid.php
index 34bec7dd4a0bc..53cee1597bf11 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderStatusInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderStatusInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertArchiveOrderStatusInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that status is correct on order page in backend (same with value of orderStatus variable)
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessMessage.php
index 423fddf98ce1c..a8d8b0bdb6052 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessMessage.php
@@ -22,12 +22,9 @@ class AssertArchiveOrderSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'We archived %d order(s).';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed on "Orders Grid" page
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessRemoveMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessRemoveMessage.php
index cb607c013609f..734c139da04a7 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessRemoveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessRemoveMessage.php
@@ -22,12 +22,9 @@ class AssertArchiveOrderSuccessRemoveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'We removed %d order(s) from the archive.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after removed orders success message presents
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderWarningMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderWarningMessage.php
index ffa7eb43c05ca..7038bcc253286 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderWarningMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderWarningMessage.php
@@ -22,12 +22,9 @@ class AssertArchiveOrderWarningMessage extends AbstractConstraint
      */
     const WARNING_MESSAGE = "We can't archive the selected order(s).";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that warning message present on order grid page
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersCancelMassActionsMessages.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersCancelMassActionsMessages.php
index b7ce8f1220937..1d688fd48e9c2 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersCancelMassActionsMessages.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersCancelMassActionsMessages.php
@@ -27,12 +27,9 @@ class AssertArchiveOrdersCancelMassActionsMessages extends AbstractConstraint
      */
     const ERROR_MESSAGE = '%d order(s) cannot be canceled.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that error and success messages are displayed on "Archived Orders Grid" page
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersInGrid.php
index 2429a94865199..9afe4420a24e6 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertArchiveOrdersInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that orders with specified id and status is in archive orders grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentInGrid.php
index 5818b420e4867..2dc6c6c1c57c7 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertArchiveShipmentInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Shipment with corresponding fixture data is present in Sales Archive Shipments grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentItems.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentItems.php
index ef20168055bd2..058ae031f40c4 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentItems.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentItems.php
@@ -20,12 +20,9 @@
  */
 class AssertArchiveShipmentItems extends AssertShipmentItems
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * @constructor
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php
index 06025bc3cd4ef..edfe925187f65 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php
@@ -14,12 +14,9 @@
  */
 class AssertCartPriceRuleConditionIsApplied extends AssertCartPriceRuleApplying
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that shopping cart subtotal not equals with grand total
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php
index 06340c13338d0..f195aeb2c8f65 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php
@@ -14,12 +14,9 @@
  */
 class AssertCartPriceRuleConditionIsNotApplied extends AssertCartPriceRuleApplying
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that shopping cart subtotal equals with grand total
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
index 631a497c0ce99..b50fee2e35205 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
@@ -18,12 +18,9 @@
  */
 class AssertCartPriceRuleForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php
index 5623a2c0f756e..1f2f2d17d3333 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php
@@ -16,12 +16,9 @@ class AssertCartPriceRuleFreeShippingIsApplied extends AssertCartPriceRuleApplyi
 {
     const FREE_SHIPPING_PRICE = '0.00';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that free shipping is applied in shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php
index e4ad806e6c61d..ef731290f4d84 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertCartPriceRuleIsNotPresentedInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that sales rule is not present in cart price rules grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php
index 0f5ba730644bb..db78779674a4e 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertCartPriceRuleSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'The rule has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after sales rule delete
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php
index 1391471d6161b..ad3a9f7cd91f3 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertCartPriceRuleSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The rule has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after sales rule save
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
index 8fc9c9a22ecd1..4e31bb049be0b 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
@@ -19,12 +19,9 @@
  */
 class AssertNoShipButton extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert no Ship button in the order grid
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php
index db767c7be6c8f..e7537b56714b5 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php
@@ -20,12 +20,9 @@
  */
 class AssertShipTotalQuantity extends AbstractAssertOrderOnFrontend
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that shipped items quantity in 'Total Quantity' is equal to data from fixture on My Account page
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
index 757fe6def89eb..6e44a1b9a0573 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertShipmentInShipmentsGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert shipment with corresponding shipment/order ID is present in 'Shipments' with correct total qty field
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
index f50f17377621f..08ef9aa9067d5 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
@@ -19,12 +19,9 @@
  */
 class AssertShipmentInShipmentsTab extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that shipment is present in the Shipments tab with correct shipped items quantity
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
index 872aab9a94c5b..3d2a8604a8d22 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
@@ -20,12 +20,9 @@
  */
 class AssertShipmentItems extends AbstractAssertItems
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Shipment index page
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
index af68b5f2d7c3a..6a0d620808457 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
@@ -22,12 +22,9 @@ class AssertShipmentSuccessCreateMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'The shipment has been created.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert success message presents
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
index 03b8edfd86b76..9b70578b9fd4a 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
@@ -21,12 +21,9 @@
  */
 class AssertSitemapContent extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that sitemap.xml file contains correct content according to dataset:
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
index d0c4ab09a39cb..a9fa84807497b 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
@@ -19,12 +19,9 @@ class AssertSitemapFailFolderSaveMessage extends AbstractConstraint
 {
     const FAIL_FOLDER_MESSAGE = 'Please create the specified folder "%s" before saving the sitemap.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that error message is displayed after creating sitemap with wrong folder
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
index 2b428c612f897..40255a43ceded 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
@@ -19,12 +19,9 @@ class AssertSitemapFailPathSaveMessage extends AbstractConstraint
 {
     const FAIL_PATH_MESSAGE = 'Path "/%s" is not available and cannot be used.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that error message is displayed after creating sitemap with wrong path
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
index 68ad3e6dfc93f..6fbb4dbf8c4f1 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertSitemapInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that sitemap availability in sitemap grid
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
index 62bbf65d7d9ad..fc829945074f3 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertSitemapNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that sitemap not availability in sitemap grid
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
index 587a07a5c964f..0eed9dc8da64f 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertSitemapSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'The sitemap has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after sitemap delete
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
index 06c324462ad8a..fed04d0b449b4 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
@@ -19,12 +19,9 @@ class AssertSitemapSuccessGenerateMessage extends AbstractConstraint
 {
     const SUCCESS_GENERATE_MESSAGE = 'The sitemap "%s" has been generated.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after sitemap generate
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
index dae1873207a71..b7a508fa9c8e7 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
@@ -21,12 +21,9 @@ class AssertSitemapSuccessSaveAndGenerateMessages extends AbstractConstraint
 
     const SUCCESS_SAVE_MESSAGE = 'The sitemap has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success messages is displayed after sitemap generate
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
index 37b013e333cec..5800d27712810 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertSitemapSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The sitemap has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after sitemap save
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
index 1eb7251dd14ac..7be71dce68633 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
@@ -18,12 +18,9 @@
  */
 class AssertStoreBackend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created store view displays in backend configuration (Stores > Configuration > "Scope" dropdown)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
index 31842f0e06998..47d263e13f8bf 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
@@ -19,12 +19,9 @@
  */
 class AssertStoreForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that displayed Store View data on edit page equals passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
index 91905fb031c82..399a02a53aebd 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
@@ -18,12 +18,9 @@
  */
 class AssertStoreFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created store view available on frontend (store view selector on page top)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
index 2d64f0feb9da2..75dd27132fba0 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
@@ -19,12 +19,9 @@
  */
 class AssertStoreGroupForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
index 577f01b637815..46173fb0af354 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertStoreGroupInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Store Group can be found in Stores grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
index 224cdcfc771a4..2c502b449baf9 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertStoreGroupNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Store Group can not be found in Stores grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
index d84c4fa2f71e7..eb6cbf745afa1 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
@@ -19,12 +19,9 @@
  */
 class AssertStoreGroupOnStoreViewForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that New Store Group visible on StoreView Form in Store dropdown
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
index 6c26370926ee8..18fc32f33b228 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
@@ -27,12 +27,9 @@ class AssertStoreGroupSuccessDeleteAndBackupMessages extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The store has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success messages is displayed after deleting store group
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
index 3481fa50225de..5fd01fb2c69b4 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertStoreGroupSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The store has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after deleting store group
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
index 2833c4ede8795..bf8f87586f8ad 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertStoreGroupSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'The store has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after Store Group has been created
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
index f0323f8edf643..87c9f6bab4b1e 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertStoreInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Store View can be found in Stores grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
index c71d457a8aae4..3133071f20d00 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertStoreNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Store can not be found in Stores grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
index 5b212422e0f21..09f1732b9cccd 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
@@ -18,12 +18,9 @@
  */
 class AssertStoreNotOnFrontend extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created store view is not available on frontend (store view selector on page top)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
index 24f9512a1c003..ce58c1bf77c54 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
@@ -27,12 +27,9 @@ class AssertStoreSuccessDeleteAndBackupMessages extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The store view has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that store success delete and backup messages are present
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
index 4f1a9c123cee6..68d6b781505f1 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertStoreSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The store view has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after store delete successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
index de25db02d8710..bd3df002224e9 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertStoreSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'The store view has been saved';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after Store View has been created
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
index 8f1128c591674..ffda86d8bff61 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
@@ -19,12 +19,9 @@
  */
 class AssertWebsiteForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
index 23e6c978dca31..d2d374fbb2dce 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertWebsiteInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Website can be found in Stores grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
index e77caa2c258d1..3c2bbc075d868 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertWebsiteNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created Website can't be found in grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
index f83e1c788833d..9bc97635b6fb4 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
@@ -19,12 +19,9 @@
  */
 class AssertWebsiteOnStoreForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Website visible on Store Group Form in Website dropdown
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
index 26df9d8f684be..bc98883b684d1 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
@@ -27,12 +27,9 @@ class AssertWebsiteSuccessDeleteAndBackupMessages extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The website has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success messages is displayed after deleting website
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
index 8d31c90abd647..07fc6624757e1 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertWebsiteSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The website has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after deleting website
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
index 098c6d62cf4b7..d23c9679854ff 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertWebsiteSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'The website has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after Website has been created
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertCrossSellsProductsSectionForCustomerSegment.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertCrossSellsProductsSectionForCustomerSegment.php
index 727557f8fb020..ac8cfb9e4f6d8 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertCrossSellsProductsSectionForCustomerSegment.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertCrossSellsProductsSectionForCustomerSegment.php
@@ -23,12 +23,9 @@
  */
 class AssertCrossSellsProductsSectionForCustomerSegment extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'medium';
+    /* tags */
+     const SEVERITY = 'medium';
+     /* end tags */
 
     /**
      * Assert that product is displayed in cross-sell section for customer segment
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleForm.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleForm.php
index 607e97ac9ff02..5d5c8b05e5c9d 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleForm.php
@@ -19,12 +19,9 @@
  */
 class AssertTargetRuleForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleInGrid.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleInGrid.php
index 954b5d10597f4..1a6e3096d47af 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleInGrid.php
@@ -22,12 +22,9 @@ class AssertTargetRuleInGrid extends AbstractConstraint
      */
     const DAY = 86400;
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert target rule availability in Target Rule Grid
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleIsNotPresentedInGrid.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleIsNotPresentedInGrid.php
index 71b2361761c23..56e7828227444 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleIsNotPresentedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleIsNotPresentedInGrid.php
@@ -22,12 +22,9 @@ class AssertTargetRuleIsNotPresentedInGrid extends AbstractConstraint
      */
     const DAY = 86400;
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+     const SEVERITY = 'middle';
+     /* end tags */
 
     /**
      * Assert that Target Rule is not presented in grid
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessDeleteMessage.php
index 491976995376b..6534e2d7d7dfc 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertTargetRuleSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'You deleted the rule.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after target rule delete
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessSaveMessage.php
index e7a8761478e99..11873a8ade709 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertTargetRuleSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You saved the rule.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after target rule save
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
index 5614d9595e559..c2c63ca7eaa1f 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
@@ -18,12 +18,9 @@
  */
 class AssertTaxRateForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that tax rate form filled correctly
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
index 79c8bdbba6b3a..4ff987767762a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertTaxRateInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert tax rule availability in Tax Rate grid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
index eda9e27113fc4..2306d918c1617 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
@@ -15,12 +15,9 @@
  */
 class AssertTaxRateInTaxRule extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php
index 25e206bea65d0..d0af6526510ad 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php
@@ -15,12 +15,9 @@
  */
 class AssertTaxRateIsInCorrectRange extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
index f551b7cfeeb9f..46ae57ece839a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertTaxRateNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that tax rate not available in Tax Rate grid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
index 524c7cd4ddda6..3f6c91b112f15 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
@@ -17,12 +17,9 @@
  */
 class AssertTaxRateNotInTaxRule extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that tax rate is absent in tax rule form
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
index 0662b04aa017d..a8d62ddee4420 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertTaxRateSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'The tax rate has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success delete message is displayed after tax rate deleted
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
index 519ff27ed08d1..2a6768ebd40ae 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertTaxRateSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The tax rate has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after tax rate saved
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
index 1e027c3f5ce77..2c5b5fba75ffc 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
@@ -18,12 +18,9 @@
  */
 class AssertTaxRuleForm extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that tax rule form filled right
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
index 9c773768bfa56..40e08bf94b044 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertTaxRuleInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert tax rule availability in Tax Rule grid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php
index 63659536db251..f77dc794adf74 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php
@@ -13,12 +13,9 @@
  */
 class AssertTaxRuleIsApplied extends AssertTaxRuleApplying
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that tax rule is applied on product in shopping cart.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
index 874781fe79387..de8d33c9c0b65 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
@@ -51,12 +51,9 @@ class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
      */
     protected $checkoutCart;
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that specified prices are actual on category, product and cart pages
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php
index 29b2000b95c0e..01cce58996ff7 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php
@@ -13,12 +13,9 @@
  */
 class AssertTaxRuleIsNotApplied extends AssertTaxRuleApplying
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that tax rule is not applied on product in shopping cart.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
index ec4b1c03a0abe..4f59caba9dd8c 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertTaxRuleNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that tax rule not available in Tax Rule grid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
index 5591fae4f482b..f81b5cbb1a42a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertTaxRuleSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'The tax rule has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success delete message is displayed after tax rule deleted
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
index b226e0f20bc07..570ca49923d9c 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertTaxRuleSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The tax rule has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after tax rule saved
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php
index 2424f166e5d6d..ca554e41091ff 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php
@@ -14,12 +14,9 @@
  */
 class AssertTaxWithCrossBorderApplied extends AbstractAssertTaxWithCrossBorderApplying
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert prices on category, product and cart pages are equal for both customers
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php
index 7fbcf4750a465..b708f987e6a9e 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php
@@ -14,12 +14,9 @@
  */
 class AssertTaxWithCrossBorderNotApplied extends AbstractAssertTaxWithCrossBorderApplying
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert prices on category, product and cart pages are different for each customer
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
index a0fd3ada35b57..5e27f27369dc6 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
@@ -24,12 +24,9 @@ class AssertPageByUrlRewriteIsNotFound extends AbstractConstraint
      */
     const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Checking the server response 404 page on frontend
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
index a9f78cd74b41f..9b0110198d179 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertUrlRewriteCategoryInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that url rewrite category in grid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
index 91b917e38f324..f2e60dc686765 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertUrlRewriteCategoryNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that category url rewrite not in grid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
index 8db339573a5e3..7a93b39cf0c12 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
@@ -19,12 +19,9 @@
  */
 class AssertUrlRewriteCategoryRedirect extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert check URL rewrite category redirect
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
index cacf1db6dd2a6..a77a433c1ddba 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
@@ -19,12 +19,9 @@
  */
 class AssertUrlRewriteCustomRedirect extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert check URL rewrite custom redirect
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
index 93cc238203c2d..2ac74cc26bbf9 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
@@ -19,12 +19,9 @@
  */
 class AssertUrlRewriteCustomSearchRedirect extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created entity was found on search page
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
index 9c500b090fe15..c8be961c1d456 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
@@ -22,12 +22,9 @@ class AssertUrlRewriteDeletedMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The URL Rewrite has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that delete message is displayed
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
index dccbd4a00c2ed..1b9db85cbb16a 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertUrlRewriteInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that url rewrite category in grid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
index 940912994df74..bfc912077f059 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertUrlRewriteNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that url rewrite not in grid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
index 2c1d41e0f340b..bc7b04310747f 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
@@ -20,12 +20,9 @@
  */
 class AssertUrlRewriteProductRedirect extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Check that product available by new URL on the front
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
index 0bb218a5a6e5c..ccf8fbeb7d835 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
@@ -19,12 +19,9 @@ class AssertUrlRewriteSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'The URL Rewrite has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that url rewrite success message is displayed
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
index 9b87d84ed91d4..115c75ae9d9af 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
@@ -18,12 +18,9 @@
  */
 class AssertUrlRewriteSuccessOutsideRedirect extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that outside redirect was success
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
index 816aa3e4527a1..2e7abee1e9e2b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
@@ -18,12 +18,9 @@ class AssertImpossibleDeleteYourOwnAccount extends AbstractConstraint
 {
     const ERROR_MESSAGE = 'You cannot delete your own account.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that error message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
index ddcc4a425335e..bf9ee5c587e9e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
@@ -18,12 +18,9 @@ class AssertImpossibleDeleteYourOwnRole extends AbstractConstraint
 {
     const ERROR_MESSAGE = 'You cannot delete self-assigned roles.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that error message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
index 81f7b50b3856e..f2caf10577ca3 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertRoleInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that saved role is present in Role Grid.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
index 3de3c5d3dca04..653d59024c09a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertRoleNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that role is not present in Role Grid.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
index 25234eeb73d97..a95359b28383b 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertRoleSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_DELETE_MESSAGE = 'You deleted the role.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that success delete message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
index 35c450ca66242..d9c0836466d06 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
@@ -19,12 +19,9 @@ class AssertRoleSuccessSaveMessage extends AbstractConstraint
 
     const SUCCESS_MESSAGE = 'You saved the role.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that success message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
index de206dea1da14..33e9b24a5387a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
@@ -18,12 +18,9 @@ class AssertUserDuplicateMessage extends AbstractConstraint
 {
     const ERROR_MESSAGE = 'A user with the same user name or email already exists.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that error message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
index ceefc5670f3fe..d881adef7e29a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertUserInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that user is present in User Grid.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
index 66828d2582b4e..4961cfb109eb2 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
@@ -19,12 +19,9 @@ class AssertUserInvalidEmailMessage extends AbstractConstraint
 {
     const ERROR_MESSAGE = 'Please correct this email address: "%s".';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that error message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
index e66de97a54c4f..dc70177372c1d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertUserNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that User is not present in User Grid.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
index d42aefba88d6a..24df646ecee8e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
@@ -20,12 +20,9 @@ class AssertUserRoleSalesRestrictedAccess extends AbstractConstraint
     const ROLE_RESOURCE = 'sales';
     const DENIED_ACCESS = 'Access denied';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that user has only Sales-related permissions
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
index 698e267127a44..f79ffef0a37a9 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
@@ -18,12 +18,9 @@ class AssertUserSuccessDeleteMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You deleted the user.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that success delete message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
index a7637d598135d..c00992ab986f6 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
@@ -17,12 +17,9 @@
  */
 class AssertUserSuccessLogOut extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that 'You have logged out.' message is present on page
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
index 5fdaa694c48bd..9b8d79ecc7b8a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
@@ -18,12 +18,9 @@
  */
 class AssertUserSuccessLogin extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Verify whether customer has logged in to the Backend
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
index 731bb66985691..2a7c88b68fe89 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
@@ -18,12 +18,9 @@ class AssertUserSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_MESSAGE = 'You saved the user.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Asserts that success message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
index dfcdccc8bd55b..07e3997e975cb 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
@@ -19,12 +19,9 @@ class AssertUserWrongCredentialsMessage extends AbstractConstraint
 {
     const INVALID_CREDENTIALS_MESSAGE = 'Please correct the user name or password.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Verify incorrect credentials message while login to admin
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageCurrentlyPublishedRevision.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageCurrentlyPublishedRevision.php
index 796089950df5c..5e0dcd85c1488 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageCurrentlyPublishedRevision.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageCurrentlyPublishedRevision.php
@@ -20,12 +20,9 @@
  */
 class AssertCmsPageCurrentlyPublishedRevision extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that link to Currently Published Revision on CMS Page Information Form is available
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageInitialVersionInGrid.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageInitialVersionInGrid.php
index 17d5464cb45e7..d0d9d7b2d4d82 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageInitialVersionInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageInitialVersionInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertCmsPageInitialVersionInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * CmsNew Page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageNewVersionSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageNewVersionSuccessSaveMessage.php
index f98b6f5c80733..f34c6bc96ad21 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageNewVersionSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageNewVersionSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertCmsPageNewVersionSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_SAVE_MESSAGE = 'You have created the new version.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after new CMS page version save successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionErrorDeleteMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionErrorDeleteMessage.php
index 36e77adb0b071..2bc28ea4705f6 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionErrorDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionErrorDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertCmsPageRevisionErrorDeleteMessage extends AbstractConstraint
      */
     const ERROR_DELETE_MESSAGE = 'Revision #%d could not be removed because it is published.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that error delete message is displayed on the page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionInGrid.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionInGrid.php
index b520e12e66fbf..ec6cbbf1a9ed9 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionInGrid.php
@@ -20,12 +20,9 @@
  */
 class AssertCmsPageRevisionInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created CMS page revision can be found in CMS page Version Revisions grid
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionNotInGrid.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionNotInGrid.php
index 9ae2527d6e333..b7748ed7ed156 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionNotInGrid.php
@@ -20,12 +20,9 @@
  */
 class AssertCmsPageRevisionNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created CMS page revision can not be found in CMS page Version Revisions grid
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionPreview.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionPreview.php
index 0c1e197944e83..0540cdf88c5b1 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionPreview.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionPreview.php
@@ -23,12 +23,9 @@
  */
 class AssertCmsPageRevisionPreview extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created CMS page revision content can be found in CMS page revisions preview
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessMassDeleteMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessMassDeleteMessage.php
index 54cc19bf36a01..7ec3e226b39f1 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessMassDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessMassDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertCmsPageRevisionSuccessMassDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_MASS_DELETE_MESSAGE = 'A total of %d record(s) have been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'medium';
+    /* tags */
+     const SEVERITY = 'medium';
+     /* end tags */
 
     /**
      * Assert that success mass delete message is displayed on the page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessPublishMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessPublishMessage.php
index 1c8f671cd7be9..f0b17bbfb26ba 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessPublishMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessPublishMessage.php
@@ -22,12 +22,9 @@ class AssertCmsPageRevisionSuccessPublishMessage extends AbstractConstraint
      */
     const SUCCESS_PUBLISH_MESSAGE = 'You have published the revision.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert success publish message is displayed on the page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessSaveMessage.php
index 6f438e29ed60e..b6e30d3ce5518 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessSaveMessage.php
@@ -22,12 +22,9 @@ class AssertCmsPageRevisionSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_SAVE_MESSAGE = 'You have saved the revision.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success save message is displayed on the CmsVersionEdit page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorDeleteMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorDeleteMessage.php
index 594986f36a126..7b860b26b3c8d 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertCmsPageVersionErrorDeleteMessage extends AbstractConstraint
      */
     const ERROR_DELETE_MESSAGE = 'Version "%s" cannot be removed because its revision is published.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'medium';
+    /* tags */
+     const SEVERITY = 'medium';
+     /* end tags */
 
     /**
      * Assert that error delete message is displayed on the page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorSaveMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorSaveMessage.php
index 71ecdca70004f..5829616606bf1 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorSaveMessage.php
@@ -22,12 +22,9 @@ class AssertCmsPageVersionErrorSaveMessage extends AbstractConstraint
      */
     const ERROR_SAVE_MESSAGE = 'Cannot change version access level because it is the last public version for its page.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after change access level of last public version to private error message appears
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionInGrid.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionInGrid.php
index 5b1e5e6f1cabf..57e89942d3e15 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertCmsPageVersionInGrid extends AssertCmsPageInitialVersionInGrid
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'medium';
+    /* tags */
+     const SEVERITY = 'medium';
+     /* end tags */
 
     /**
      * Assert that created CMS page version can be found on CMS page Versions tab in grid via:
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionNotInGrid.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionNotInGrid.php
index 40506e1c36800..4a485a108395f 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionNotInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertCmsPageVersionNotInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created CMS page version can not be found on CMS page Versions tab in grid
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessDeleteMessage.php
index 8ac69e5c1e081..5870ce440de91 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertCmsPageVersionSuccessDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'You have deleted the version.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'medium';
+    /* tags */
+     const SEVERITY = 'medium';
+     /* end tags */
 
     /**
      * Assert that success delete message is displayed on the page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessMassDeleteMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessMassDeleteMessage.php
index 2641fddea5a1d..a30c5328a65e2 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessMassDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessMassDeleteMessage.php
@@ -22,12 +22,9 @@ class AssertCmsPageVersionSuccessMassDeleteMessage extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'A total of %d record(s) have been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'medium';
+    /* tags */
+     const SEVERITY = 'medium';
+     /* end tags */
 
     /**
      * Assert that success delete message is displayed on the page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessSaveMessage.php
index 60c648a0a4473..2ba4e0f8066db 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessSaveMessage.php
@@ -19,12 +19,9 @@ class AssertCmsPageVersionSuccessSaveMessage extends AbstractConstraint
 {
     const SUCCESS_SAVE_MESSAGE = 'You have saved the version.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert that success save message is displayed on the page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertWidgetHierarchyNodeLinkOnHomePage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertWidgetHierarchyNodeLinkOnHomePage.php
index 9b36401c0a8b7..60e7ff8a489e4 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertWidgetHierarchyNodeLinkOnHomePage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertWidgetHierarchyNodeLinkOnHomePage.php
@@ -19,12 +19,9 @@
  */
 class AssertWidgetHierarchyNodeLinkOnHomePage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that widget hierarchy node link is present on Home page and after click to link widget redirects to page
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php
index 0a55ec8bbfd63..7c596000aff2d 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php
@@ -18,12 +18,9 @@
  */
 class AssertWidgetAbsentOnFrontendHome extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created widget is absent on frontend on Home page
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php
index a6e0db364d609..5e8441a25170b 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php
@@ -20,12 +20,9 @@
  */
 class AssertWidgetCatalogCategoryLink extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created widget displayed on frontend on Home page and on Advanced Search and
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
index 5c5547f43e5fe..c4f4d742c6635 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
@@ -19,12 +19,9 @@
  */
 class AssertWidgetCmsPageLink extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created widget displayed on frontent on Home page and on Advanced Search and
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
index 74e6b114c847b..7b20340b32e3f 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertWidgetInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+     const SEVERITY = 'high';
+     /* end tags */
 
     /**
      * Assert widget availability in widget grid
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php
index 6261c39128107..18f5ba340254c 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php
@@ -19,12 +19,9 @@
  */
 class AssertWidgetOnFrontendInCatalog extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created widget displayed on frontent in Catalog
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php
index 3a976ba9f9b94..796a20372f700 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertWidgetOnProductPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that created widget displayed on frontend on Product page
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php
index f7c5c59cb782f..c776393e9f058 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php
@@ -19,12 +19,9 @@
  */
 class AssertWidgetProductLink extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that after click on widget link on frontend system redirects you to Product page defined in widget
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
index 8c512a56495da..3e12e3b95d00f 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
@@ -43,12 +43,9 @@ class AssertWidgetRecentlyViewedProducts extends AbstractConstraint
      */
     protected $catalogCategoryView;
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that widget with type Recently Viewed Products is present on category page
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php
index 765cf6c65b9c0..4c22c63f938a1 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php
@@ -21,12 +21,9 @@ class AssertWidgetSuccessDeleteMessage extends AbstractConstraint
      */
     const DELETE_MESSAGE = 'The widget instance has been deleted.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that Widget success delete message is present
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php
index 44c4231674581..37b848608d6af 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php
@@ -21,12 +21,9 @@ class AssertWidgetSuccessSaveMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'The widget instance has been saved.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after widget saved
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
index 152090e1ec2c9..b9eb4b4d37c44 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
@@ -23,12 +23,9 @@ class AssertAddProductToWishlistSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = "%s has been added to your wishlist. Click here to continue shopping.";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message appears on My Wish List page after adding product to wishlist.
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
index 212ae07ed4a42..0a155c2c44daa 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
@@ -23,12 +23,9 @@ class AssertMoveProductToWishlistSuccessMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = "%s has been moved to wish list Wish List";
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message appears on My Wish List page after moving product to wishlist.
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
index 73a04a7450d1e..a8c2f0d00067e 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
@@ -20,12 +20,9 @@
  */
 class AssertProductDetailsInWishlist extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that the correct option details are displayed on the "View Details" tool tip
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
index dee7f8443ed4f..83c22aff49e3a 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertProductInCustomerWishlistOnBackendGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product is present in grid on customer's wish list tab with configure option and qty
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
index 15aeac1029751..c8746d224220e 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
@@ -21,12 +21,9 @@
  */
 class AssertProductIsPresentInCustomerBackendWishlist extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that products added to wishlist are present on Customers account on backend.
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
index 1a9ae08678e52..8f34b21759079 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
@@ -20,12 +20,9 @@
  */
 class AssertProductIsPresentInWishlist extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product is present in default wishlist
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
index 9c80ee8bd5dd0..a24af5ce37493 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
@@ -23,12 +23,9 @@
  */
 class AssertProductsIsAbsentInWishlist extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that product is not present in Wishlist on Frontend
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
index ddcf35850d640..279644683610c 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
@@ -18,12 +18,9 @@
  */
 class AssertWishlistIsEmpty extends AbstractConstraint
 {
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert wish list is empty
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
index b9cd28dac4e78..611ae53a2a6d9 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
@@ -22,12 +22,9 @@ class AssertWishlistShareMessage extends AbstractConstraint
      */
     const SUCCESS_MESSAGE = 'Your wish list has been shared.';
 
-    /**
-     * Constraint severeness
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+     const SEVERITY = 'low';
+     /* end tags */
 
     /**
      * Assert that success message is displayed after wishlist has been shared
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php b/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php
index 7a46599a3db2c..4dab01b079b31 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php
+++ b/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php
@@ -8,8 +8,8 @@
 
 namespace Mtf\TestSuite;
 
-use Mtf\ObjectManagerFactory;
 use Mtf\ObjectManager;
+use Mtf\ObjectManagerFactory;
 use Mtf\TestRunner\Configuration;
 
 /**
@@ -98,13 +98,13 @@ private function initObjectManager()
             $configurationFileName = isset($_ENV['configuration:Mtf/TestSuite/InjectableTests'])
                 ? $_ENV['configuration:Mtf/TestSuite/InjectableTests']
                 : 'basic';
-            $confFilePath = __DIR__ . '/InjectableTests/' . $configurationFileName . '.xml';
-            $testRunnerConfiguration = new Configuration();
-            $testRunnerConfiguration->load($confFilePath);
+            $confDirPath = __DIR__ . '/InjectableTests/';
+            /** @var \Mtf\TestRunner\Configuration $testRunnerConfiguration */
+            $testRunnerConfiguration = $objectManagerFactory->getObjectManager()->get('\Mtf\TestRunner\Configuration');
+            $testRunnerConfiguration->load($confDirPath);
+            $testRunnerConfiguration->loadEnvConfig();
 
-            $shared = array(
-                'Mtf\TestRunner\Configuration' => $testRunnerConfiguration
-            );
+            $shared = ['Mtf\TestRunner\Configuration' => $testRunnerConfiguration];
             $this->objectManager = $objectManagerFactory->create($shared);
         }
     }
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/basic.xml b/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/basic.xml
index 965b7af6ed913..2badd99e91988 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/basic.xml
+++ b/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/basic.xml
@@ -9,10 +9,10 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
-    <suiteRule>
+    <rule scope="testsuite">
         <allow>
-            <namespace>Magento</namespace>
-            <type>injectable</type>
+            <namespace value="Magento" />
+            <type value="injectable" />
         </allow>
-    </suiteRule>
+    </rule>
 </config>

From 701e179bb033d73dcf6f8c4245dd16811caf89df Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com>
Date: Tue, 9 Dec 2014 12:58:13 +0200
Subject: [PATCH 161/474] MAGETWO-31358: [TD] Tax Service coverage issues

---
 .../Tax/Model/TaxClass/RepositoryTest.php     | 118 +++++++++++++++++-
 1 file changed, 113 insertions(+), 5 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php
index caa5eefa4fe44..6556f109842a0 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxClass/RepositoryTest.php
@@ -9,6 +9,8 @@
 namespace Magento\Tax\Model\TaxClass;
 
 use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Model\Exception as ModelException;
+use Magento\Framework\Api\SearchCriteria;
 
 class RepositoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -152,15 +154,26 @@ public function testGetList()
         $taxClassOne = $this->getMock('\Magento\Tax\Api\Data\TaxClassInterface');
         $taxClassTwo = $this->getMock('\Magento\Tax\Api\Data\TaxClassInterface');
         $searchCriteria = $this->getMock('\Magento\Framework\Api\SearchCriteriaInterface');
-        $searchCriteria->expects($this->once())->method('getFilterGroups')->willReturn([]);
+        $filterGroup = $this->getMock('\Magento\Framework\Api\Search\FilterGroup', [], [], '', false);
+        $filter = $this->getMock('\Magento\Framework\Api\Filter', [], [], '', false);
+        $collection = $this->getMock('\Magento\Tax\Model\Resource\TaxClass\Collection', [], [], '', false);
+        $sortOrder = $this->getMock('\Magento\Framework\Api\SortOrder', [], [], '', false);
+
+        $searchCriteria->expects($this->once())->method('getFilterGroups')->willReturn([$filterGroup]);
+        $filterGroup->expects($this->once())->method('getFilters')->willReturn([$filter]);
+        $filter->expects($this->atLeastOnce())->method('getConditionType')->willReturn('eq');
+        $filter->expects($this->once())->method('getField')->willReturn('field');
+        $filter->expects($this->once())->method('getValue')->willReturn('value');
+        $collection->expects($this->once())->method('addFieldToFilter')->with(['field'], [['eq' => 'value']]);
+
+        $searchCriteria->expects($this->exactly(2))->method('getSortOrders')->willReturn([$sortOrder]);
+        $sortOrder->expects($this->once())->method('getField')->willReturn('field');
+        $sortOrder->expects($this->once())->method('getDirection')->willReturn(SearchCriteria::SORT_ASC);
+        $collection->expects($this->once())->method('addOrder')->with('field', 'ASC');
         $searchCriteria->expects($this->once())->method('getPageSize')->willReturn(20);
         $searchCriteria->expects($this->once())->method('getCurrentPage')->willReturn(0);
 
         $result = $this->getMock('\Magento\Tax\Api\Data\TaxRateSearchResultsInterface');
-        $collection = $this->objectManager->getCollectionMock(
-            '\Magento\Tax\Model\Resource\TaxClass\Collection',
-            [$taxClassOne, $taxClassTwo]
-        );
         $collection->expects($this->any())->method('getSize')->willReturn(2);
         $collection->expects($this->any())->method('setItems')->with([$taxClassOne, $taxClassTwo]);
         $collection->expects($this->once())->method('setCurPage')->with(0);
@@ -195,4 +208,99 @@ public function testSave()
         $this->assertEquals(10, $this->model->save($taxClass));
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Updating classType is not allowed.
+     */
+    public function testSaveWithInputException()
+    {
+        $taxClass = $this->getMock('\Magento\Tax\Model\ClassModel', [], [], '', false);
+        $originalTax = $this->getMock('\Magento\Tax\Model\ClassModel', [], [], '', false);
+        $taxClass->expects($this->exactly(2))->method('getClassId')->willReturn(10);
+        $this->classModelRegistryMock->expects($this->once())->method('retrieve')->with(10)->willReturn($originalTax);
+        $originalTax->expects($this->once())->method('getClassType')->willReturn('PRODUCT');
+        $taxClass->expects($this->once())->method('getClassType')->willReturn('PRODUCT2');
+        $this->model->save($taxClass);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Model\Exception
+     * @expectedExceptionMessage Something went wrong
+     */
+    public function testSaveWithModelException()
+    {
+        $taxClass = $this->getMock('\Magento\Tax\Model\ClassModel', [], [], '', false);
+        $taxClass->expects($this->any())->method('getClassName')->willReturn('Class Name');
+        $taxClass->expects($this->atLeastOnce())->method('getClassType')->willReturn('PRODUCT');
+        $taxClass->expects($this->any())->method('getClassId')->willReturn(10);
+
+        $originTaxClass = $this->getMock('\Magento\Tax\Model\ClassModel', [], [], '', false);
+        $originTaxClass->expects($this->once())->method('getClassType')->willReturn('PRODUCT');
+
+        $this->classModelRegistryMock
+            ->expects($this->once())
+            ->method('retrieve')
+            ->with(10)
+            ->willReturn($originTaxClass);
+
+        $this->taxClassResourceMock->expects($this->once())->method('save')->with($taxClass)
+            ->willThrowException(new ModelException("Something went wrong"));
+        $this->model->save($taxClass);
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage A class with the same name already exists for ClassType PRODUCT.
+     */
+    public function testSaveWithSameClassException()
+    {
+        $taxClass = $this->getMock('\Magento\Tax\Model\ClassModel', [], [], '', false);
+        $taxClass->expects($this->any())->method('getClassName')->willReturn('Class Name');
+        $taxClass->expects($this->atLeastOnce())->method('getClassType')->willReturn('PRODUCT');
+        $taxClass->expects($this->any())->method('getClassId')->willReturn(10);
+
+        $originTaxClass = $this->getMock('\Magento\Tax\Model\ClassModel', [], [], '', false);
+        $originTaxClass->expects($this->once())->method('getClassType')->willReturn('PRODUCT');
+
+        $this->classModelRegistryMock
+            ->expects($this->once())
+            ->method('retrieve')
+            ->with(10)
+            ->willReturn($originTaxClass);
+
+        $this->taxClassResourceMock->expects($this->once())->method('save')->with($taxClass)
+            ->willThrowException(new ModelException(\Magento\Tax\Model\Resource\TaxClass::UNIQUE_TAX_CLASS_MSG));
+        $this->model->save($taxClass);
+    }
+
+    /**
+     * @dataProvider validateTaxClassDataProvider
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage One or more input exceptions have occurred.
+     */
+    public function testSaveWithValidateTaxClassDataException($classType)
+    {
+        $taxClass = $this->getMock('\Magento\Tax\Model\ClassModel', [], [], '', false);
+        $taxClass->expects($this->any())->method('getClassName')->willReturn('');
+        $taxClass->expects($this->atLeastOnce())->method('getClassType')->willReturn($classType);
+        $taxClass->expects($this->any())->method('getClassId')->willReturn(10);
+
+        $originTaxClass = $this->getMock('\Magento\Tax\Model\ClassModel', [], [], '', false);
+        $originTaxClass->expects($this->once())->method('getClassType')->willReturn($classType);
+
+        $this->classModelRegistryMock
+            ->expects($this->once())
+            ->method('retrieve')
+            ->with(10)
+            ->willReturn($originTaxClass);
+        $this->model->save($taxClass);
+    }
+
+    public function validateTaxClassDataProvider()
+    {
+        return [
+            [''],
+            ['ERROR']
+        ];
+    }
 }

From 890edcd8b7a78a75048ec2dc75ed16e8f14b4858 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@ebay.com>
Date: Tue, 9 Dec 2014 15:05:32 +0200
Subject: [PATCH 162/474] MAGETWO-31440: Zend_Date_Exception and
 Zend_Locale_Exception after placing order

---
 app/code/Magento/Sales/Model/Resource/Order.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Sales/Model/Resource/Order.php b/app/code/Magento/Sales/Model/Resource/Order.php
index 8803033be932a..dc412b53f89fd 100644
--- a/app/code/Magento/Sales/Model/Resource/Order.php
+++ b/app/code/Magento/Sales/Model/Resource/Order.php
@@ -196,6 +196,8 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
         foreach ($object->getRelatedObjects() as $relatedObject) {
             $relatedObject->save();
         }
+
+        $object->load($object->getId());
         return parent::_afterSave($object);
     }
 }

From 382c1707153588733e47f0011d20cbc20e6d0dac Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@ebay.com>
Date: Tue, 9 Dec 2014 12:46:21 +0200
Subject: [PATCH 163/474] MAGETWO-31489: Fatal error while entering a new
 address on multi address checkout

---
 .../Checkout/Address/EditAddress.php          |   2 +-
 .../Checkout/Address/EditBilling.php          |   7 +-
 .../Checkout/Address/EditShipping.php         |   2 +-
 .../Checkout/Address/NewBilling.php           |   2 +-
 .../Checkout/Address/NewShipping.php          |   2 +-
 .../Checkout/Address/EditAddressTest.php      | 146 ++++++++++++++
 .../Checkout/Address/EditBillingTest.php      | 177 ++++++++++++++++
 .../Checkout/Address/EditShippingTest.php     | 180 +++++++++++++++++
 .../Checkout/Address/NewBillingTest.php       | 138 +++++++++++++
 .../Checkout/Address/NewShippingTest.php      | 189 ++++++++++++++++++
 10 files changed, 838 insertions(+), 7 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditBillingTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditShippingTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewBillingTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewShippingTest.php

diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php
index 4869cd4c7e8b4..ac324eb05cdc0 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditAddress.php
@@ -28,7 +28,7 @@ public function execute()
                 $this->_url->getUrl('*/*/selectBilling')
             );
             $this->_view->getPage()->getConfig()->getTitle()->set(
-                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getDefaultTitle()
+                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getTitle()->getDefault()
             );
         }
         $this->_view->renderLayout();
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php
index 17e39c9fa9ffd..56e31d3d4a343 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditBilling.php
@@ -21,17 +21,18 @@ public function execute()
         $this->_view->loadLayout();
         $this->_view->getLayout()->initMessages();
         if ($addressForm = $this->_view->getLayout()->getBlock('customer_address_edit')) {
+            $id = $this->getRequest()->getParam('id');
             $addressForm->setTitle(
                 __('Edit Billing Address')
             )->setSuccessUrl(
-                $this->_url->getUrl('*/*/saveBilling', array('id' => $this->getRequest()->getParam('id')))
+                $this->_url->getUrl('*/*/saveBilling', array('id' => $id))
             )->setErrorUrl(
-                $this->_url->getUrl('*/*/*', array('id' => $this->getRequest()->getParam('id')))
+                $this->_url->getUrl('*/*/*', array('id' => $id))
             )->setBackUrl(
                 $this->_url->getUrl('*/checkout/overview')
             );
             $this->_view->getPage()->getConfig()->getTitle()->set(
-                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getDefaultTitle()
+                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getTitle()->getDefault()
             );
         }
         $this->_view->renderLayout();
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php
index 91d2d9755bff5..846f38a42ce71 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/EditShipping.php
@@ -30,7 +30,7 @@ public function execute()
             );
 
             $this->_view->getPage()->getConfig()->getTitle()->set(
-                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getDefaultTitle()
+                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getTitle()->getDefault()
             );
 
             if ($this->_getCheckout()->getCustomerDefaultShippingAddress()) {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php
index 8a8fd52a2440e..49ae2a91eb497 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewBilling.php
@@ -29,7 +29,7 @@ public function execute()
             );
 
             $this->_view->getPage()->getConfig()->getTitle()->set(
-                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getDefaultTitle()
+                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getTitle()->getDefault()
             );
         }
         $this->_view->renderLayout();
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
index 9ec628bc1dfe6..b7f98ff24e08d 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/NewShipping.php
@@ -32,7 +32,7 @@ public function execute()
             );
 
             $this->_view->getPage()->getConfig()->getTitle()->set(
-                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getDefaultTitle()
+                $addressForm->getTitle() . ' - ' . $this->_view->getPage()->getConfig()->getTitle()->getDefault()
             );
 
             if ($this->_getCheckout()->getCustomerDefaultShippingAddress()) {
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php
new file mode 100644
index 0000000000000..b8a9bfcb95bd7
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ *
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Multishipping\Controller\Checkout\Address;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class EditAddressTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Multishipping\Controller\Checkout\Address\EditAddress
+     */
+    protected $controller;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $configMock;
+
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $viewMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $layoutMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressFormMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $titleMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $request;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->configMock = $this->getMock('Magento\Framework\View\Page\Config', [], [], '', false);
+        $this->checkoutMock =
+            $this->getMock('Magento\Multishipping\Model\Checkout\Type\Multishipping', [], [], '', false);
+        $this->titleMock = $this->getMock('Magento\Framework\View\Page\Title', [], [], '', false);
+        $this->layoutMock = $this->getMock('Magento\Framework\View\Layout', [], [], '', false);
+        $this->viewMock = $this->getMock('Magento\Framework\App\ViewInterface');
+        $this->request = $this->getMockBuilder('\Magento\Framework\App\RequestInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $response = $this->getMockBuilder('\Magento\Framework\App\ResponseInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $contextMock = $this->getMock('\Magento\Framework\App\Action\Context', [], [], '', false);
+        $contextMock->expects($this->atLeastOnce())
+            ->method('getRequest')
+            ->will($this->returnValue($this->request));
+        $contextMock->expects($this->atLeastOnce())
+            ->method('getResponse')
+            ->will($this->returnValue($response));
+        $contextMock->expects($this->any())->method('getView')->willReturn($this->viewMock);
+        $methods = ['setTitle', 'getTitle', 'setSuccessUrl', 'setBackUrl', 'setErrorUrl', '__wakeUp'];
+        $this->addressFormMock =
+            $this->getMock('Magento\Customer\Block\Address\Edit', $methods, [], '', false);
+        $this->urlMock = $this->getMock('Magento\Framework\UrlInterface');
+        $contextMock->expects($this->any())->method('getUrl')->willReturn($this->urlMock);
+        $this->pageMock = $this->getMock('Magento\Framework\View\Result\Page', [], [], '', false);
+        $this->pageMock->expects($this->any())->method('getConfig')->willReturn($this->configMock);
+        $this->configMock->expects($this->any())->method('getTitle')->willReturn($this->titleMock);
+        $this->viewMock->expects($this->any())->method('getPage')->willReturn($this->pageMock);
+        $this->controller = $objectManager->getObject('\Magento\Multishipping\Controller\Checkout\Address\EditAddress',
+            ['context' => $contextMock]);
+    }
+
+    public function testExecute()
+    {
+        $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
+        $this->request->expects($this->once())->method('getParam')->with('id')->willReturn(1);
+        $this->viewMock->expects($this->any())->method('getLayout')->willReturn($this->layoutMock);
+        $this->layoutMock
+            ->expects($this->once())
+            ->method('getBlock')
+            ->with('customer_address_edit')
+            ->willReturn($this->addressFormMock);
+        $this->addressFormMock
+            ->expects($this->once())
+            ->method('setTitle')
+            ->with('Edit Address')
+            ->willReturnSelf();
+        $helperMock = $this->getMock('Magento\Multishipping\Helper\Data', [], [], '', false);
+        $helperMock->expects($this->any())->method('__')->willReturn('Edit Address');
+        $valueMap = [
+            ['*/*/selectBilling', null, 'success/url'],
+            ['*/*/*', ['id' => 1], 'error/url'],
+        ];
+        $this->urlMock->expects($this->any())->method('getUrl')->willReturnMap($valueMap);
+        $this->addressFormMock->expects($this->once())->method('setSuccessUrl')->with('success/url')->willReturnSelf();
+        $this->addressFormMock->expects($this->once())->method('setErrorUrl')->with('error/url')->willReturnSelf();
+
+        $this->titleMock->expects($this->once())->method('getDefault')->willReturn('default_title');
+        $this->addressFormMock->expects($this->once())->method('getTitle')->willReturn('Address title');
+        $this->titleMock->expects($this->once())->method('set')->with('Address title - default_title');
+        $this->addressFormMock->expects($this->once())->method('setBackUrl')->with('success/url');
+        $this->viewMock->expects($this->once())->method('renderLayout');
+        $this->controller->execute();
+    }
+
+
+    public function testExecuteWhenCustomerAddressBlockNotExist()
+    {
+        $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
+        $this->viewMock->expects($this->any())->method('getLayout')->willReturn($this->layoutMock);
+        $this->layoutMock
+            ->expects($this->once())
+            ->method('getBlock')
+            ->with('customer_address_edit');
+        $this->urlMock->expects($this->never())->method('getUrl');
+        $this->viewMock->expects($this->once())->method('renderLayout');
+        $this->controller->execute();
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditBillingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditBillingTest.php
new file mode 100644
index 0000000000000..446e4288b7231
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditBillingTest.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ *
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Multishipping\Controller\Checkout\Address;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class EditBillingTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Multishipping\Controller\Checkout\Address\EditBilling
+     */
+    protected $controller;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $configMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $stateMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $viewMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $layoutMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressFormMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $titleMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $checkoutMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $request;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->configMock = $this->getMock('Magento\Framework\View\Page\Config', [], [], '', false);
+        $this->checkoutMock =
+            $this->getMock('Magento\Multishipping\Model\Checkout\Type\Multishipping', [], [], '', false);
+        $this->titleMock = $this->getMock('Magento\Framework\View\Page\Title', [], [], '', false);
+        $this->layoutMock = $this->getMock('Magento\Framework\View\Layout', [], [], '', false);
+        $this->viewMock = $this->getMock('Magento\Framework\App\ViewInterface');
+        $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->stateMock =
+            $this->getMock('Magento\Multishipping\Model\Checkout\Type\Multishipping\State', [], [], '', false);
+        $valueMap = [
+            ['Magento\Multishipping\Model\Checkout\Type\Multishipping\State', $this->stateMock],
+            ['Magento\Multishipping\Model\Checkout\Type\Multishipping', $this->checkoutMock]
+        ];
+        $this->objectManagerMock->expects($this->any())->method('get')->willReturnMap($valueMap);
+        $this->request = $this->getMockBuilder('\Magento\Framework\App\RequestInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $response = $this->getMockBuilder('\Magento\Framework\App\ResponseInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $contextMock = $this->getMock('\Magento\Framework\App\Action\Context', [], [], '', false);
+        $contextMock->expects($this->atLeastOnce())
+            ->method('getRequest')
+            ->will($this->returnValue($this->request));
+        $contextMock->expects($this->atLeastOnce())
+            ->method('getResponse')
+            ->will($this->returnValue($response));
+        $contextMock->expects($this->any())->method('getView')->willReturn($this->viewMock);
+        $contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock);
+        $methods = ['setTitle', 'getTitle', 'setSuccessUrl', 'setBackUrl', 'setErrorUrl', '__wakeUp'];
+        $this->addressFormMock =
+            $this->getMock('Magento\Customer\Block\Address\Edit', $methods, [], '', false);
+        $this->urlMock = $this->getMock('Magento\Framework\UrlInterface');
+        $contextMock->expects($this->any())->method('getUrl')->willReturn($this->urlMock);
+        $this->pageMock = $this->getMock('Magento\Framework\View\Result\Page', [], [], '', false);
+        $this->pageMock->expects($this->any())->method('getConfig')->willReturn($this->configMock);
+        $this->configMock->expects($this->any())->method('getTitle')->willReturn($this->titleMock);
+        $this->viewMock->expects($this->any())->method('getPage')->willReturn($this->pageMock);
+        $this->controller = $objectManager->getObject('Magento\Multishipping\Controller\Checkout\Address\EditBilling',
+            ['context' => $contextMock]);
+    }
+
+    public function testExecute()
+    {
+        $this->stateMock
+            ->expects($this->once())
+            ->method('setActiveStep')
+            ->with( \Magento\Multishipping\Model\Checkout\Type\Multishipping\State::STEP_BILLING);
+        $this->request->expects($this->once())->method('getParam')->with('id')->willReturn(1);
+        $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
+        $this->viewMock->expects($this->any())->method('getLayout')->willReturn($this->layoutMock);
+        $this->layoutMock
+            ->expects($this->once())
+            ->method('getBlock')
+            ->with('customer_address_edit')
+            ->willReturn($this->addressFormMock);
+        $this->addressFormMock
+            ->expects($this->once())
+            ->method('setTitle')
+            ->with('Edit Billing Address')
+            ->willReturnSelf();
+        $helperMock = $this->getMock('Magento\Multishipping\Helper\Data', [], [], '', false);
+        $helperMock->expects($this->any())->method('__')->willReturn('Edit Billing Address');
+        $this->addressFormMock->expects($this->once())->method('setSuccessUrl')->with('success/url')->willReturnSelf();
+        $this->addressFormMock->expects($this->once())->method('setErrorUrl')->with('error/url')->willReturnSelf();
+        $valueMap = [
+            ['*/*/saveBilling', ['id' => 1], 'success/url'],
+            ['*/*/*', ['id' => 1], 'error/url'],
+            ['*/checkout/overview', null, 'back/address']
+        ];
+        $this->urlMock->expects($this->any())->method('getUrl')->willReturnMap($valueMap);
+        $this->titleMock->expects($this->once())->method('getDefault')->willReturn('default_title');
+        $this->addressFormMock->expects($this->once())->method('getTitle')->willReturn('Address title');
+        $this->titleMock->expects($this->once())->method('set')->with('Address title - default_title');
+        $this->addressFormMock->expects($this->once())->method('setBackUrl')->with('back/address');
+        $this->viewMock->expects($this->once())->method('renderLayout');
+        $this->controller->execute();
+    }
+
+    public function testExecuteWhenCustomerAddressBlockNotExist()
+    {
+        $this->stateMock
+            ->expects($this->once())
+            ->method('setActiveStep')
+            ->with(\Magento\Multishipping\Model\Checkout\Type\Multishipping\State::STEP_BILLING);
+        $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
+        $this->viewMock->expects($this->any())->method('getLayout')->willReturn($this->layoutMock);
+        $this->layoutMock
+            ->expects($this->once())
+            ->method('getBlock')
+            ->with('customer_address_edit');
+        $this->urlMock->expects($this->never())->method('getUrl');
+        $this->viewMock->expects($this->once())->method('renderLayout');
+        $this->controller->execute();
+    }
+
+}
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditShippingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditShippingTest.php
new file mode 100644
index 0000000000000..7640963e91831
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditShippingTest.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ *
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Multishipping\Controller\Checkout\Address;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class EditShippingTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Multishipping\Controller\Checkout\Address\EditShipping
+     */
+    protected $controller;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $configMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $stateMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $viewMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $layoutMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressFormMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $titleMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $checkoutMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $request;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->configMock = $this->getMock('Magento\Framework\View\Page\Config', [], [], '', false);
+        $this->checkoutMock =
+            $this->getMock('Magento\Multishipping\Model\Checkout\Type\Multishipping', [], [], '', false);
+        $this->titleMock = $this->getMock('Magento\Framework\View\Page\Title', [], [], '', false);
+        $this->layoutMock = $this->getMock('Magento\Framework\View\Layout', [], [], '', false);
+        $this->viewMock = $this->getMock('Magento\Framework\App\ViewInterface');
+        $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->stateMock =
+            $this->getMock('Magento\Multishipping\Model\Checkout\Type\Multishipping\State', [], [], '', false);
+        $valueMap = [
+            ['Magento\Multishipping\Model\Checkout\Type\Multishipping\State', $this->stateMock],
+            ['Magento\Multishipping\Model\Checkout\Type\Multishipping', $this->checkoutMock]
+        ];
+        $this->objectManagerMock->expects($this->any())->method('get')->willReturnMap($valueMap);
+        $this->request = $this->getMockBuilder('\Magento\Framework\App\RequestInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $response = $this->getMockBuilder('\Magento\Framework\App\ResponseInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $contextMock = $this->getMock('\Magento\Framework\App\Action\Context', [], [], '', false);
+        $contextMock->expects($this->atLeastOnce())
+            ->method('getRequest')
+            ->will($this->returnValue($this->request));
+        $contextMock->expects($this->atLeastOnce())
+            ->method('getResponse')
+            ->will($this->returnValue($response));
+        $contextMock->expects($this->any())->method('getView')->willReturn($this->viewMock);
+        $contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock);
+        $methods = ['setTitle', 'getTitle', 'setSuccessUrl', 'setBackUrl', 'setErrorUrl', '__wakeUp'];
+        $this->addressFormMock =
+            $this->getMock('Magento\Customer\Block\Address\Edit', $methods, [], '', false);
+        $this->urlMock = $this->getMock('Magento\Framework\UrlInterface');
+        $contextMock->expects($this->any())->method('getUrl')->willReturn($this->urlMock);
+        $this->pageMock = $this->getMock('Magento\Framework\View\Result\Page', [], [], '', false);
+        $this->pageMock->expects($this->any())->method('getConfig')->willReturn($this->configMock);
+        $this->configMock->expects($this->any())->method('getTitle')->willReturn($this->titleMock);
+        $this->viewMock->expects($this->any())->method('getPage')->willReturn($this->pageMock);
+        $this->controller = $objectManager->getObject('Magento\Multishipping\Controller\Checkout\Address\EditShipping',
+            ['context' => $contextMock]);
+    }
+
+    public function testExecute()
+    {
+        $this->stateMock
+            ->expects($this->once())
+            ->method('setActiveStep')
+            ->with(\Magento\Multishipping\Model\Checkout\Type\Multishipping\State::STEP_SHIPPING);
+        $this->request->expects($this->once())->method('getParam')->with('id')->willReturn(1);
+        $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
+        $this->viewMock->expects($this->any())->method('getLayout')->willReturn($this->layoutMock);
+        $this->layoutMock
+            ->expects($this->once())
+            ->method('getBlock')
+            ->with('customer_address_edit')
+            ->willReturn($this->addressFormMock);
+        $this->addressFormMock
+            ->expects($this->once())
+            ->method('setTitle')
+            ->with('Edit Shipping Address')
+            ->willReturnSelf();
+        $helperMock = $this->getMock('Magento\Multishipping\Helper\Data', [], [], '', false);
+        $helperMock->expects($this->any())->method('__')->willReturn('Edit Shipping Address');
+        $this->addressFormMock->expects($this->once())->method('setSuccessUrl')->with('success/url')->willReturnSelf();
+        $this->addressFormMock->expects($this->once())->method('setErrorUrl')->with('error/url')->willReturnSelf();
+        $valueMap = [
+            ['*/*/editShippingPost', ['id' => 1], 'success/url'],
+            ['*/*/*', null, 'error/url'],
+            ['*/checkout/shipping', null, 'back/address']
+        ];
+        $this->urlMock->expects($this->any())->method('getUrl')->willReturnMap($valueMap);
+        $this->titleMock->expects($this->once())->method('getDefault')->willReturn('default_title');
+        $this->addressFormMock->expects($this->once())->method('getTitle')->willReturn('Address title');
+        $this->titleMock->expects($this->once())->method('set')->with('Address title - default_title');
+        $this->checkoutMock
+            ->expects($this->once())
+            ->method('getCustomerDefaultShippingAddress')
+            ->willReturn('shipping_addres');
+        $this->addressFormMock->expects($this->once())->method('setBackUrl')->with('back/address');
+        $this->viewMock->expects($this->once())->method('renderLayout');
+        $this->controller->execute();
+    }
+
+    public function testExecuteWhenCustomerAddressBlockNotExist()
+    {
+        $this->stateMock
+            ->expects($this->once())
+            ->method('setActiveStep')
+            ->with(\Magento\Multishipping\Model\Checkout\Type\Multishipping\State::STEP_SHIPPING);
+        $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
+        $this->viewMock->expects($this->any())->method('getLayout')->willReturn($this->layoutMock);
+        $this->layoutMock
+            ->expects($this->once())
+            ->method('getBlock')
+            ->with('customer_address_edit');
+        $this->urlMock->expects($this->never())->method('getUrl');
+        $this->viewMock->expects($this->once())->method('renderLayout');
+        $this->controller->execute();
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewBillingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewBillingTest.php
new file mode 100644
index 0000000000000..270442e2e309f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewBillingTest.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ *
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Multishipping\Controller\Checkout\Address;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class NewBillingTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Multishipping\Controller\Checkout\Address\NewBilling
+     */
+    protected $controller;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $configMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $viewMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $layoutMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressFormMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $titleMock;
+
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->configMock = $this->getMock('Magento\Framework\View\Page\Config', [], [], '', false);
+        $this->titleMock = $this->getMock('Magento\Framework\View\Page\Title', [], [], '', false);
+        $this->layoutMock = $this->getMock('Magento\Framework\View\Layout', [], [], '', false);
+        $this->viewMock = $this->getMock('Magento\Framework\App\ViewInterface');
+        $request = $this->getMockBuilder('\Magento\Framework\App\RequestInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $response = $this->getMockBuilder('\Magento\Framework\App\ResponseInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $contextMock = $this->getMock('\Magento\Framework\App\Action\Context', [], [], '', false);
+        $contextMock->expects($this->atLeastOnce())
+            ->method('getRequest')
+            ->will($this->returnValue($request));
+        $contextMock->expects($this->atLeastOnce())
+            ->method('getResponse')
+            ->will($this->returnValue($response));
+        $contextMock->expects($this->any())->method('getView')->willReturn($this->viewMock);
+        $methods = ['setTitle', 'getTitle', 'setSuccessUrl', 'setErrorUrl', 'setBackUrl', '__wakeUp'];
+        $this->addressFormMock =
+            $this->getMock('Magento\Customer\Block\Address\Edit', $methods, [], '', false);
+        $this->urlMock = $this->getMock('Magento\Framework\UrlInterface');
+        $contextMock->expects($this->any())->method('getUrl')->willReturn($this->urlMock);
+        $this->pageMock = $this->getMock('Magento\Framework\View\Result\Page', [], [], '', false);
+        $this->pageMock->expects($this->any())->method('getConfig')->willReturn($this->configMock);
+        $this->configMock->expects($this->any())->method('getTitle')->willReturn($this->titleMock);
+        $this->viewMock->expects($this->any())->method('getPage')->willReturn($this->pageMock);
+        $this->controller = $objectManager->getObject('Magento\Multishipping\Controller\Checkout\Address\NewBilling',
+            ['context' => $contextMock]);
+    }
+
+    public function testExecute()
+    {
+        $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
+        $this->viewMock->expects($this->any())->method('getLayout')->willReturn($this->layoutMock);
+        $this->layoutMock
+            ->expects($this->once())
+            ->method('getBlock')
+            ->with('customer_address_edit')
+            ->willReturn($this->addressFormMock);
+        $this->addressFormMock
+            ->expects($this->once())
+            ->method('setTitle')
+            ->with('Create Billing Address')
+            ->willReturnSelf();
+        $helperMock = $this->getMock('Magento\Multishipping\Helper\Data', [], [], '', false);
+        $helperMock->expects($this->any())->method('__')->willReturn('Create Billing Address');
+        $valueMap = [
+            ['*/*/selectBilling', null, 'success/url'],
+            ['*/*/*', null, 'error/url'],
+        ];
+        $this->urlMock->expects($this->any())->method('getUrl')->willReturnMap($valueMap);
+        $this->addressFormMock->expects($this->once())->method('setSuccessUrl')->with('success/url')->willReturnSelf();
+        $this->addressFormMock->expects($this->once())->method('setErrorUrl')->with('error/url')->willReturnSelf();
+
+        $this->titleMock->expects($this->once())->method('getDefault')->willReturn('default_title');
+        $this->addressFormMock->expects($this->once())->method('getTitle')->willReturn('Address title');
+        $this->titleMock->expects($this->once())->method('set')->with('Address title - default_title');
+        $this->addressFormMock->expects($this->once())->method('setBackUrl')->with('success/url');
+        $this->viewMock->expects($this->once())->method('renderLayout');
+        $this->controller->execute();
+    }
+
+
+    public function testExecuteWhenCustomerAddressBlockNotExist()
+    {
+        $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
+        $this->viewMock->expects($this->any())->method('getLayout')->willReturn($this->layoutMock);
+        $this->layoutMock
+            ->expects($this->once())
+            ->method('getBlock')
+            ->with('customer_address_edit');
+        $this->urlMock->expects($this->never())->method('getUrl');
+        $this->viewMock->expects($this->once())->method('renderLayout');
+        $this->controller->execute();
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewShippingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewShippingTest.php
new file mode 100644
index 0000000000000..3177165b1ba00
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewShippingTest.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ *
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Multishipping\Controller\Checkout\Address;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class NewShippingTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Multishipping\Controller\Checkout\Address\NewShipping
+     */
+    protected $controller;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $configMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $stateMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $viewMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $layoutMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressFormMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $pageMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $titleMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $checkoutMock;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->configMock = $this->getMock('Magento\Framework\View\Page\Config', [], [], '', false);
+        $this->checkoutMock =
+            $this->getMock('Magento\Multishipping\Model\Checkout\Type\Multishipping', [], [], '', false);
+        $this->titleMock = $this->getMock('Magento\Framework\View\Page\Title', [], [], '', false);
+        $this->layoutMock = $this->getMock('Magento\Framework\View\Layout', [], [], '', false);
+        $this->viewMock = $this->getMock('Magento\Framework\App\ViewInterface');
+        $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->stateMock =
+            $this->getMock('Magento\Multishipping\Model\Checkout\Type\Multishipping\State', [], [], '', false);
+        $valueMap = [
+            ['Magento\Multishipping\Model\Checkout\Type\Multishipping\State', $this->stateMock],
+            ['Magento\Multishipping\Model\Checkout\Type\Multishipping', $this->checkoutMock]
+        ];
+        $this->objectManagerMock->expects($this->any())->method('get')->willReturnMap($valueMap);
+        $request = $this->getMockBuilder('\Magento\Framework\App\RequestInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $response = $this->getMockBuilder('\Magento\Framework\App\ResponseInterface')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMockForAbstractClass();
+        $contextMock = $this->getMock('\Magento\Framework\App\Action\Context', [], [], '', false);
+        $contextMock->expects($this->atLeastOnce())
+            ->method('getRequest')
+            ->will($this->returnValue($request));
+        $contextMock->expects($this->atLeastOnce())
+            ->method('getResponse')
+            ->will($this->returnValue($response));
+        $contextMock->expects($this->any())->method('getView')->willReturn($this->viewMock);
+        $contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock);
+        $methods = ['setTitle', 'getTitle', 'setSuccessUrl', 'setBackUrl', 'setErrorUrl', '__wakeUp'];
+        $this->addressFormMock =
+            $this->getMock('Magento\Customer\Block\Address\Edit', $methods, [], '', false);
+        $this->urlMock = $this->getMock('Magento\Framework\UrlInterface');
+        $contextMock->expects($this->any())->method('getUrl')->willReturn($this->urlMock);
+        $this->pageMock = $this->getMock('Magento\Framework\View\Result\Page', [], [], '', false);
+        $this->pageMock->expects($this->any())->method('getConfig')->willReturn($this->configMock);
+        $this->configMock->expects($this->any())->method('getTitle')->willReturn($this->titleMock);
+        $this->viewMock->expects($this->any())->method('getPage')->willReturn($this->pageMock);
+        $this->controller = $objectManager->getObject('Magento\Multishipping\Controller\Checkout\Address\NewShipping',
+            ['context' => $contextMock]);
+    }
+
+    /**
+     * @param string $backUrl
+     * @param string $shippingAddress
+     * @param string $url
+     * @dataProvider executeDataProvider
+     */
+    public function testExecute($backUrl, $shippingAddress, $url)
+    {
+        $this->stateMock
+            ->expects($this->once())
+            ->method('setActiveStep')
+            ->with(\Magento\Multishipping\Model\Checkout\Type\Multishipping\State::STEP_SELECT_ADDRESSES);
+        $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
+        $this->viewMock->expects($this->any())->method('getLayout')->willReturn($this->layoutMock);
+        $this->layoutMock
+            ->expects($this->once())
+            ->method('getBlock')
+            ->with('customer_address_edit')
+            ->willReturn($this->addressFormMock);
+        $this->addressFormMock
+            ->expects($this->once())
+            ->method('setTitle')
+            ->with('Create Shipping Address')
+            ->willReturnSelf();
+        $helperMock = $this->getMock('Magento\Multishipping\Helper\Data', [], [], '', false);
+        $helperMock->expects($this->any())->method('__')->willReturn('Create Shipping Address');
+        $this->addressFormMock->expects($this->once())->method('setSuccessUrl')->with('success/url')->willReturnSelf();
+        $this->addressFormMock->expects($this->once())->method('setErrorUrl')->with('error/url')->willReturnSelf();
+        $valueMap = [
+            ['*/*/shippingSaved', null, 'success/url'],
+            ['*/*/*', null, 'error/url'],
+            [$backUrl, null, $url]
+        ];
+        $this->urlMock->expects($this->any())->method('getUrl')->willReturnMap($valueMap);
+        $this->titleMock->expects($this->once())->method('getDefault')->willReturn('default_title');
+        $this->addressFormMock->expects($this->once())->method('getTitle')->willReturn('Address title');
+        $this->titleMock->expects($this->once())->method('set')->with('Address title - default_title');
+        $this->checkoutMock
+            ->expects($this->once())
+            ->method('getCustomerDefaultShippingAddress')
+            ->willReturn($shippingAddress);
+        $this->addressFormMock->expects($this->once())->method('setBackUrl')->with($url);
+        $this->viewMock->expects($this->once())->method('renderLayout');
+        $this->controller->execute();
+    }
+
+    public function executeDataProvider()
+    {
+        return [
+            'shipping_address_exists' => ['*/checkout/addresses', 'shipping_address', 'back/address'],
+            'shipping_address_not_exist' => ['*/cart/', null, 'back/cart']
+        ];
+    }
+
+
+    public function testExecuteWhenCustomerAddressBlockNotExist()
+    {
+        $this->stateMock
+            ->expects($this->once())
+            ->method('setActiveStep')
+            ->with(\Magento\Multishipping\Model\Checkout\Type\Multishipping\State::STEP_SELECT_ADDRESSES);
+        $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
+        $this->viewMock->expects($this->any())->method('getLayout')->willReturn($this->layoutMock);
+        $this->layoutMock
+            ->expects($this->once())
+            ->method('getBlock')
+            ->with('customer_address_edit');
+        $this->urlMock->expects($this->never())->method('getUrl');
+        $this->viewMock->expects($this->once())->method('renderLayout');
+        $this->controller->execute();
+    }
+}

From 5082db158575bdb841f39c62de6def9dba3a351b Mon Sep 17 00:00:00 2001
From: Serhii Dzhepa <sdzhepa@ebay.com>
Date: Tue, 9 Dec 2014 16:28:50 +0200
Subject: [PATCH 164/474] MAGETWO-31000: [TD] Insufficient unit test coverage
 of changes in scope of Catalog Service Layer refactoring

---
 .../Magento/Tax/Model/TaxRateCollection.php   |   2 +-
 .../Magento/Tax/Model/TaxRuleCollection.php   |   2 +-
 .../Tax/Model/TaxRateCollectionTest.php       | 190 ++++++++++++------
 .../Tax/Model/TaxRuleCollectionTest.php       | 116 +++++++++++
 4 files changed, 248 insertions(+), 62 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php

diff --git a/app/code/Magento/Tax/Model/TaxRateCollection.php b/app/code/Magento/Tax/Model/TaxRateCollection.php
index ac0bd71b94c40..beff7bfcabb32 100644
--- a/app/code/Magento/Tax/Model/TaxRateCollection.php
+++ b/app/code/Magento/Tax/Model/TaxRateCollection.php
@@ -38,9 +38,9 @@ class TaxRateCollection extends AbstractServiceCollection
      * @param EntityFactory $entityFactory
      * @param FilterBuilder $filterBuilder
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param SortOrderBuilder $sortOrderBuilder
      * @param TaxRateRepositoryInterface $rateService
      * @param \Magento\Tax\Model\Calculation\Rate\Converter $rateConverter
-     * @param SortOrderBuilder $sortOrderBuilder
      */
     public function __construct(
         EntityFactory $entityFactory,
diff --git a/app/code/Magento/Tax/Model/TaxRuleCollection.php b/app/code/Magento/Tax/Model/TaxRuleCollection.php
index 89e438fa651f6..7ad15270d4da8 100644
--- a/app/code/Magento/Tax/Model/TaxRuleCollection.php
+++ b/app/code/Magento/Tax/Model/TaxRuleCollection.php
@@ -32,8 +32,8 @@ class TaxRuleCollection extends AbstractServiceCollection
      * @param EntityFactory $entityFactory
      * @param FilterBuilder $filterBuilder
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
-     * @param TaxRuleRepositoryInterface $ruleService
      * @param SortOrderBuilder $sortOrderBuilder
+     * @param TaxRuleRepositoryInterface $ruleService
      */
     public function __construct(
         EntityFactory $entityFactory,
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
index 408a5e38666e3..fffc4348a6fa8 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
@@ -1,23 +1,45 @@
 <?php
-/**
+/** 
+ * 
  * {license_notice}
  *
  * @copyright   {copyright}
  * @license     {license_link}
  */
-namespace Magento\Tax\Model;
 
+namespace Magento\Tax\Model;
+ 
 class TaxRateCollectionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Tax\Model\TaxRateCollection
+     * @var TaxRateCollection
      */
     protected $model;
+    
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $entityFactoryMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $taxRateRepositoryMock;
+    protected $filterBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchCriteriaBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $sortOrderBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $rateServiceMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -27,78 +49,126 @@ class TaxRateCollectionTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $searchCriteriaBuilderMock;
+    protected $searchCriteriaMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchResultsMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $taxRateMock;
 
     protected function setUp()
     {
-        $entityFactoryMock = $this->getMock('\Magento\Core\Model\EntityFactory', [], [], '', false);
-        $filterBuilderMock = $this->getMock('\Magento\Framework\Api\FilterBuilder', [], [], '', false);
-        $sortOrderBuilderMock = $this->getMock('\Magento\Framework\Api\SortOrderBuilder', [], [], '', false);
-        $this->taxRateRepositoryMock = $this->getMock('\Magento\Tax\Api\TaxRateRepositoryInterface', [], [], '', false);
-        $this->rateConverterMock = $this->getMock('\Magento\Tax\Model\Calculation\Rate\Converter', [], [], '', false);
-        $this->searchCriteriaBuilderMock = $this->getMock(
-            '\Magento\Framework\Api\SearchCriteriaBuilder',
+        $this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+        $this->filterBuilderMock = $this->getMock('Magento\Framework\Api\FilterBuilder', [], [], '', false);
+        $this->searchCriteriaBuilderMock =
+            $this->getMock('Magento\Framework\Api\SearchCriteriaBuilder', [], [], '', false);
+        $this->sortOrderBuilderMock = $this->getMock('Magento\Framework\Api\SortOrderBuilder', [], [], '', false);
+        $this->rateServiceMock = $this->getMock(
+            'Magento\Tax\Api\TaxRateRepositoryInterface',
+            [
+                'save',
+                'get',
+                'deleteById',
+                'getList',
+                'delete',
+                '__wakeup'
+            ],
+            [],
+            '',
+            false
+        );
+        $this->rateConverterMock = $this->getMock(
+            'Magento\Tax\Model\Calculation\Rate\Converter',
             [],
             [],
             '',
             false
         );
-        $this->model = new \Magento\Tax\Model\TaxRateCollection(
-            $entityFactoryMock,
-            $filterBuilderMock,
+        $this->searchCriteriaMock = $this->getMock(
+            'Magento\Framework\Api\SearchCriteriaInterface',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->searchResultsMock = $this->getMock(
+            'Magento\Tax\Api\Data\TaxRateSearchResultsInterface',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->taxRateMock = $this->getMock('Magento\Tax\Model\Calculation\Rate', [], [], '', false);
+
+        $this->searchCriteriaBuilderMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->searchCriteriaMock);
+
+        $this->model = new TaxRateCollection(
+            $this->entityFactoryMock,
+            $this->filterBuilderMock,
             $this->searchCriteriaBuilderMock,
-            $sortOrderBuilderMock,
-            $this->taxRateRepositoryMock,
+            $this->sortOrderBuilderMock,
+            $this->rateServiceMock,
             $this->rateConverterMock
         );
     }
 
-    /**
-     * @dataProvider createTaxRateCollectionItemDataProvider
-     * @param $zipFrom int|null
-     * @param $zipTo int|null
-     */
-    public function testLoadData($zipFrom, $zipTo)
+    public function testLoadData()
     {
-        $taxId = 42;
-        $taxCode = 'taxCode';
-        $taxCountryId = 'US';
-        $taxRegionId = 'CA';
-        $taxRegionName = 'California';
-        $taxPostcode = '1235674';
-        $taxRate = 8.375;
-        $taxTitles = ['taxTitle'];
-        $searchCriteriaMock = $this->getMock('\Magento\Framework\Api\SearchCriteria', [], [], '', false);
-        $searchResultsMock = $this->getMock('\Magento\Tax\Api\Data\TaxRateSearchResultsInterface', [], [], '', false);
-        $taxRateMock = $this->getMock('\Magento\Tax\Api\Data\TaxRateInterface', [], [], '', false);
-
-        $this->searchCriteriaBuilderMock->expects($this->once())->method('setCurrentPage')->with(1);
-        $this->searchCriteriaBuilderMock->expects($this->once())->method('setPageSize')->with(false);
-        $this->searchCriteriaBuilderMock->expects($this->once())->method('create')->willReturn($searchCriteriaMock);
-        $this->taxRateRepositoryMock->expects($this->once())->method('getList')->with($searchCriteriaMock)
-            ->willReturn($searchResultsMock);
-        $searchResultsMock->expects($this->once())->method('getTotalCount')->willReturn(42);
-        $searchResultsMock->expects($this->once())->method('getItems')->willReturn([$taxRateMock]);
-        $taxRateMock->expects($this->once())->method('getId')->willReturn($taxId);
-        $taxRateMock->expects($this->once())->method('getCode')->willReturn($taxCode);
-        $taxRateMock->expects($this->once())->method('getTaxCountryId')->willReturn($taxCountryId);
-        $taxRateMock->expects($this->once())->method('getTaxRegionId')->willReturn($taxRegionId);
-        $taxRateMock->expects($this->once())->method('getRegionName')->willReturn($taxRegionName);
-        $taxRateMock->expects($this->once())->method('getTaxPostcode')->willReturn($taxPostcode);
-        $taxRateMock->expects($this->once())->method('getRate')->willReturn($taxRate);
-        $this->rateConverterMock->expects($this->once())->method('createTitleArrayFromServiceObject')
-            ->with($taxRateMock)->willReturn($taxTitles);
-        $taxRateMock->expects($this->atLeastOnce())->method('getZipTo')->willReturn($zipTo);
-        $taxRateMock->expects($this->any())->method('getZipFrom')->willReturn($zipFrom);
-        $this->assertEquals($this->model, $this->model->loadData());
-        $this->assertTrue($this->model->isLoaded());
+        $this->rateServiceMock->expects($this->once())
+            ->method('getList')
+            ->with($this->searchCriteriaMock)
+            ->willReturn($this->searchResultsMock);
+
+        $this->searchResultsMock->expects($this->once())->method('getTotalCount')->willReturn(123);
+
+        $this->searchResultsMock->expects($this->once())->method('getItems')->willReturn([$this->taxRateMock]);
+        $this->taxRateMock->expects($this->once())->method('getId')->willReturn(33);
+        $this->taxRateMock->expects($this->once())->method('getCode')->willReturn(44);
+        $this->taxRateMock->expects($this->once())->method('getTaxCountryId')->willReturn('CountryId');
+        $this->taxRateMock->expects($this->once())->method('getTaxRegionId')->willReturn(55);
+        $this->taxRateMock->expects($this->once())->method('getRegionName')->willReturn('Region Name');
+        $this->taxRateMock->expects($this->once())->method('getTaxPostcode')->willReturn('Post Code');
+        $this->taxRateMock->expects($this->once())->method('getRate')->willReturn(1.85);
+        $this->rateConverterMock->expects($this->once())
+            ->method('createTitleArrayFromServiceObject')
+            ->with($this->taxRateMock)
+            ->willReturn([]);
+        $this->taxRateMock->expects($this->once())->method('getZipTo')->willReturn(null);
+        $this->taxRateMock->expects($this->never())->method('getZipFrom');
+
+        $this->model->loadData();
     }
 
-    public function createTaxRateCollectionItemDataProvider()
+    public function testCreateTaxRateCollectionItem()
     {
-        return [
-            [null, null],
-            [100, 200]
-        ];
+        $this->rateServiceMock->expects($this->once())
+            ->method('getList')
+            ->with($this->searchCriteriaMock)
+            ->willReturn($this->searchResultsMock);
+
+        $this->searchResultsMock->expects($this->once())->method('getTotalCount')->willReturn(123);
+        $this->searchResultsMock->expects($this->once())->method('getItems')->willReturn([$this->taxRateMock]);
+        $this->taxRateMock->expects($this->once())->method('getId')->willReturn(33);
+        $this->taxRateMock->expects($this->once())->method('getCode')->willReturn(44);
+        $this->taxRateMock->expects($this->once())->method('getTaxCountryId')->willReturn('CountryId');
+        $this->taxRateMock->expects($this->once())->method('getTaxRegionId')->willReturn(55);
+        $this->taxRateMock->expects($this->once())->method('getRegionName')->willReturn('Region Name');
+        $this->taxRateMock->expects($this->once())->method('getTaxPostcode')->willReturn('Post Code');
+        $this->taxRateMock->expects($this->once())->method('getRate')->willReturn(1.85);
+        $this->rateConverterMock->expects($this->once())
+            ->method('createTitleArrayFromServiceObject')
+            ->with($this->taxRateMock)
+            ->willReturn([]);
+        $this->taxRateMock->expects($this->exactly(2))->method('getZipTo')->willReturn(1);
+        $this->taxRateMock->expects($this->exactly(2))->method('getZipFrom')->willReturn(200);
+
+        $this->model->loadData();
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php
new file mode 100644
index 0000000000000..e516deef46316
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php
@@ -0,0 +1,116 @@
+<?php
+/** 
+ * 
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Tax\Model;
+ 
+class TaxRuleCollectionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var TaxRuleCollection
+     */
+    protected $model;
+    
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $ruleServiceMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $entityFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filterBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchCriteriaBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $sortOrderBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchCriteriaMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchResultsMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $taxRuleMock;
+    
+    protected function setUp()
+    {
+        $this->entityFactoryMock = $this->getMock('Magento\Core\Model\EntityFactory', [], [], '', false);
+        $this->filterBuilderMock = $this->getMock('Magento\Framework\Api\FilterBuilder', [], [], '', false);
+        $this->searchCriteriaBuilderMock =
+            $this->getMock('Magento\Framework\Api\SearchCriteriaBuilder', [], [], '', false);
+        $this->sortOrderBuilderMock = $this->getMock('Magento\Framework\Api\SortOrderBuilder', [], [], '', false);
+        $this->ruleServiceMock = $this->getMock('Magento\Tax\Api\TaxRuleRepositoryInterface', [], [], '', false);
+        $this->searchCriteriaMock = $this->getMock(
+            'Magento\Framework\Api\SearchCriteria',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->searchResultsMock = $this->getMock(
+            'Magento\Tax\Api\Data\TaxRateSearchResultsInterface',
+            [],
+            [],
+            '',
+            false
+        );
+
+        $this->taxRuleMock = $this->getMock('Magento\Tax\Model\Calculation\Rule', [], [], '', false);
+        $this->searchCriteriaBuilderMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->searchCriteriaMock);
+
+        $this->model = new TaxRuleCollection(
+            $this->entityFactoryMock,
+            $this->filterBuilderMock,
+            $this->searchCriteriaBuilderMock,
+            $this->sortOrderBuilderMock,
+            $this->ruleServiceMock
+        );
+    }
+
+    public function testLoadData()
+    {
+        $this->ruleServiceMock->expects($this->once())
+            ->method('getList')
+            ->with($this->searchCriteriaMock)
+            ->willReturn($this->searchResultsMock);
+
+        $this->searchResultsMock->expects($this->once())->method('getTotalCount')->willReturn(568);
+        $this->searchResultsMock->expects($this->once())->method('getItems')->willReturn([$this->taxRuleMock]);
+        $this->taxRuleMock->expects($this->once())->method('getId')->willReturn(33);
+        $this->taxRuleMock->expects($this->once())->method('getCode')->willReturn(44);
+        $this->taxRuleMock->expects($this->once())->method('getPriority')->willReturn('some priority');
+        $this->taxRuleMock->expects($this->once())->method('getPosition')->willReturn('position');
+        $this->taxRuleMock->expects($this->once())->method('getCalculateSubtotal')->willReturn(null);
+        $this->taxRuleMock->expects($this->once())->method('getCustomerTaxClassIds')->willReturn('Post Code');
+        $this->taxRuleMock->expects($this->once())->method('getProductTaxClassIds')->willReturn([12]);
+        $this->taxRuleMock->expects($this->once())->method('getTaxRateIds')->willReturn([66]);
+
+        $this->model->loadData();
+    }
+}

From 4ac46e78bd58e010904abbc56f7f0c8785560b19 Mon Sep 17 00:00:00 2001
From: Paul Lewis <plewis@ebay.com>
Date: Tue, 9 Dec 2014 08:53:29 -0600
Subject: [PATCH 165/474] MAGETWO-29546: DbStatusValidator does not provide
 enough information to perform successful update of the system

 - remove unneeded newlines found by static test
---
 lib/internal/Magento/Framework/Module/Manager.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Module/Manager.php b/lib/internal/Magento/Framework/Module/Manager.php
index 1f827919f5771..dc6b653c72649 100644
--- a/lib/internal/Magento/Framework/Module/Manager.php
+++ b/lib/internal/Magento/Framework/Module/Manager.php
@@ -94,6 +94,4 @@ protected function _isCustomOutputConfigEnabled($moduleName)
         }
         return true;
     }
-
-
 }

From 2b199e437c67ef43f49f2f335ea64ceb2bf51839 Mon Sep 17 00:00:00 2001
From: Arkadii Chyzhov <achyzhov@ebay.com>
Date: Tue, 9 Dec 2014 17:18:43 +0200
Subject: [PATCH 166/474] MAGETWO-31541: Remove @deprecated methods from
 AdminGws

---
 .../Magento/AdminGws/Model/Collections.php    | 24 -------------
 app/code/Magento/AdminGws/Model/Models.php    | 36 -------------------
 .../Test/Legacy/_files/obsolete_methods.php   |  5 +++
 3 files changed, 5 insertions(+), 60 deletions(-)

diff --git a/app/code/Magento/AdminGws/Model/Collections.php b/app/code/Magento/AdminGws/Model/Collections.php
index 2a270a987adaa..12979ea9e20cd 100644
--- a/app/code/Magento/AdminGws/Model/Collections.php
+++ b/app/code/Magento/AdminGws/Model/Collections.php
@@ -455,28 +455,4 @@ public function limitRuleEntityCollection($collection)
     {
         $collection->addWebsiteFilter($this->_role->getRelevantWebsiteIds());
     }
-
-    /**
-     * Limit customer segment collection
-     *
-     * @param \Magento\CustomerSegment\Model\Resource\Segment\Collection $collection
-     * @return void
-     * @deprecated after 1.12.0.0 use $this->limitRuleEntityCollection() for any rule based collection
-     */
-    public function limitCustomerSegments($collection)
-    {
-        $this->limitRuleEntityCollection($collection);
-    }
-
-    /**
-     * Limit price rules collection
-     *
-     * @param \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection $collection
-     * @return void
-     * @deprecated after 1.12.0.0 use $this->limitRuleEntityCollection() for any rule based collection
-     */
-    public function limitPriceRules($collection)
-    {
-        $this->limitRuleEntityCollection($collection);
-    }
 }
diff --git a/app/code/Magento/AdminGws/Model/Models.php b/app/code/Magento/AdminGws/Model/Models.php
index 818175959b744..22d5bbb78a700 100644
--- a/app/code/Magento/AdminGws/Model/Models.php
+++ b/app/code/Magento/AdminGws/Model/Models.php
@@ -1332,40 +1332,4 @@ public function giftRegistryTypeDeleteBefore($model)
     {
         $this->_throwDelete();
     }
-
-    /**
-     * Limit customer segment save
-     *
-     * @param \Magento\CustomerSegment\Model\Segment $model
-     * @return void
-     * @deprecated after 1.12.0.0 use $this->ruleSaveBefore() instead
-     */
-    public function customerSegmentSaveBefore($model)
-    {
-        $this->ruleSaveBefore($model);
-    }
-
-    /**
-     * Validate customer segment before delete
-     *
-     * @param \Magento\CustomerSegment\Model\Segment $model
-     * @return void
-     * @deprecated after 1.12.0.0 use $this->ruleDeleteBefore() instead
-     */
-    public function customerSegmentDeleteBefore($model)
-    {
-        $this->ruleDeleteBefore($model);
-    }
-
-    /**
-     * Limit customer segment model on after load
-     *
-     * @param \Magento\CustomerSegment\Model\Segment $model
-     * @return void
-     * @deprecated after 1.12.0.0 use $this->ruleLoadAfter() instead
-     */
-    public function customerSegmentLoadAfter($model)
-    {
-        $this->ruleLoadAfter($model);
-    }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 6ebab21e06aca..99fc87c6fa218 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -1867,6 +1867,11 @@
         'Magento\CatalogInventory\Helper\Minsaleqty',
         'Magento\CatalogInventory\Helper\Minsaleqty::decodeArrayFieldValue'
     ],
+    ['limitCustomerSegments', 'Magento\AdminGws\Model\Collections'],
+    ['limitPriceRules', 'Magento\AdminGws\Model\Collections'],
+    ['customerSegmentSaveBefore', 'Magento\AdminGws\Model\Models'],
+    ['customerSegmentDeleteBefore', 'Magento\AdminGws\Model\Models'],
+    ['customerSegmentLoadAfter', 'Magento\AdminGws\Model\Models'],
     ['updateOrderAction', 'Magento\Paypal\Controller\Express\AbstractExpress'],
     ['updateOrder', 'Magento\Paypal\Model\Express\Checkout'],
     ['_matchBnCountryCode', 'Magento\Paypal\Model\Config'],

From 2aa60de69faf5b980fddde5011def48245cc7f6c Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Tue, 9 Dec 2014 09:58:19 -0600
Subject: [PATCH 167/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- resolved conflicts
---
 .../Setup/view/magento/setup/web-configuration.phtml  | 11 ++++++-----
 setup/pub/magento/setup/web-configuration.js          |  8 ++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 1fd383ea229e4..9f858bfdc3e3a 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -33,7 +33,7 @@ $hints = [
     <div class="form-group" ng-class="{'has-error': webconfig.base_url.$invalid && webconfig.submitted}">
         <label class="col-md-3 control-label">Base URL</label>
         <div class="col-md-4">
-            <input type="text"
+            <input type="url"
                    name="base_url"
                    ng-model="config.address.base_url"
                    ng-init="config.address.auto_base_url = '<?php echo $this->autoBaseUrl ?>'; config.address.base_url = config.address.auto_base_url;"
@@ -45,15 +45,16 @@ $hints = [
                    tooltip-trigger="focus"
                    tooltip-append-to-body="true"
                 />
-            <div class="error-container" ng-show="webconfig.base_url.$invalid && webconfig.submitted">
-                <span>Please enter a valid Base URL (ex: http://www.example.com/)</span>
+            <div class="col-md-offset-3 col-md-4" ng-show="webconfig.base_url.$invalid && webconfig.submitted">
+                <div class="error-container">
+                    <span ng-show="webconfig.base_url.$error.required || webconfig.base_url.$error.url">Please enter a valid Base URL (ex: http://www.example.com/)</span>
+                </div>
             </div>
         </div>
-    </div>
 
     <div class="form-group" ng-class="{'has-error': webconfig.admin.$invalid && webconfig.submitted}">
         <label class="col-md-3 control-label">Magento Admin Address&nbsp;<span class="required">*</span></label>
-        <div class="input-group" style="padding-left: 15px; padding-right: 15px;">
+        <div class="col-md-4 input-group" style="padding-left: 15px; padding-right: 15px;">
             <span class="input-group-addon">{{config.address.base_url}}</span>
             <input type="text"
                    name="admin"
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index dcbbe3255ee13..4eb7f4ae6da18 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -67,21 +67,21 @@ angular.module('web-configuration', ['ngStorage'])
         }
 
         $scope.addSlash = function() {
-            if (angular.isUndefined($scope.config.address.web)) {
+            if (angular.isUndefined($scope.config.address.base_url)) {
                 return;
             }
 
-            var p = $scope.config.address.web;
+            var p = $scope.config.address.base_url;
             if (p.length > 1) {
                 var lastChar = p.substr(-1);
                 if (lastChar != '/') {
-                    $scope.config.address.web = p + '/';
+                    $scope.config.address.base_url = p + '/';
                 }
             }
         };
 
         $scope.populateHttps = function() {
-            $scope.config.https.text = $scope.config.address.web.replace('http', 'https');
+            $scope.config.https.text = $scope.config.address.base_url.replace('http', 'https');
         };
 
 

From 9896f7a50073700d02190556ca2bfa6183711856 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Tue, 9 Dec 2014 10:07:17 -0600
Subject: [PATCH 168/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- resolved web-configuration.phtml
---
 .../Setup/view/magento/setup/web-configuration.phtml     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 9f858bfdc3e3a..7d5d00bb7c4d0 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -45,12 +45,13 @@ $hints = [
                    tooltip-trigger="focus"
                    tooltip-append-to-body="true"
                 />
-            <div class="col-md-offset-3 col-md-4" ng-show="webconfig.base_url.$invalid && webconfig.submitted">
-                <div class="error-container">
-                    <span ng-show="webconfig.base_url.$error.required || webconfig.base_url.$error.url">Please enter a valid Base URL (ex: http://www.example.com/)</span>
-                </div>
+        </div>
+        <div class="col-md-offset-3 col-md-4" ng-show="webconfig.base_url.$invalid && webconfig.submitted">
+            <div class="error-container">
+                <span ng-show="webconfig.base_url.$error.required || webconfig.base_url.$error.url">Please enter a valid Base URL (ex: http://www.example.com/)</span>
             </div>
         </div>
+    </div>
 
     <div class="form-group" ng-class="{'has-error': webconfig.admin.$invalid && webconfig.submitted}">
         <label class="col-md-3 control-label">Magento Admin Address&nbsp;<span class="required">*</span></label>

From 70cb32278d5e3441392e3646c6a636053a380155 Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Tue, 9 Dec 2014 18:10:53 +0200
Subject: [PATCH 169/474] MAGETWO-31513: Custom Customer & Customer Address
 attributes of Multiple Select type are present on "Create / Edit Customer"
 backend form

- move template settings to layout (known issue with params extending)
---
 .../Magento/Ui/view/base/layout/ui_components.xml     | 11 +++++++++++
 .../Ui/view/base/web/js/form/element/multiselect.js   |  3 +--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/layout/ui_components.xml b/app/code/Magento/Ui/view/base/layout/ui_components.xml
index 5805009f72661..9d096881505fd 100644
--- a/app/code/Magento/Ui/view/base/layout/ui_components.xml
+++ b/app/code/Magento/Ui/view/base/layout/ui_components.xml
@@ -95,6 +95,17 @@
             </argument>
         </arguments>
     </block>
+    <block class="Magento\Ui\Component\Form\Element\Select" name="multiselect">
+        <arguments>
+            <argument name="js_config" xsi:type="array">
+                <item name="component" xsi:type="string">Magento_Ui/js/form/element/multiselect</item>
+                <item name="config" xsi:type="array">
+                    <item name="input_type" xsi:type="string">multiselect</item>
+                    <item name="template" xsi:type="string">ui/form/element/multiselect</item>
+                </item>
+            </argument>
+        </arguments>
+    </block>
     <block class="Magento\Ui\Component\Form\Element\Textarea" name="textarea">
         <arguments>
             <argument name="js_config" xsi:type="array">
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js b/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
index e97182936306c..e76556b9a4c5f 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
@@ -12,8 +12,7 @@ define([
     'use strict';
 
     var defaults = {
-        size: 5,
-        template: 'ui/form/element/multiselect'
+        size: 5
     };
 
     var __super__ = Select.prototype;

From 1f1bafd292de8d9b4e0323a12b1ccc6f4c51e56f Mon Sep 17 00:00:00 2001
From: Oleksandr Manchenko <omanchenko@ebay.com>
Date: Tue, 9 Dec 2014 18:10:08 +0200
Subject: [PATCH 170/474] MTA-1161: Update Magento to follow new tagging
 mechanism

- Fixed replace property "severeness" to constant "SEVERITY"
- Replaced tag "severeness" to "severity" in constraint configuration
  files
---
 .../AssertMaxRequestedQtyFailMessage.php      |   8 +-
 .../AssertMinRequestedQtyFailMessage.php      |   8 +-
 .../Test/Constraint/AssertMsrpNotice.php      |   4 +-
 ...oductConfiguringFromRequiringAttention.php |   8 +-
 .../AssertProductIsOutOfStockFailMessage.php  |   8 +-
 ...ertProductRequiredAttentionFailMessage.php |   8 +-
 .../AssertProductTierPriceMessage.php         |   4 +-
 ...tWithPaymentAgreementsOrderFailMessage.php |   8 +-
 ...sertProductsAbsentInRequiringAttention.php |   4 +-
 .../AssertProductsAddBySkuSuccessMessage.php  |   8 +-
 .../AssertQtyIncrementsFailMessage.php        |   8 +-
 .../AssertQtyIsNotEnoughFailMessage.php       |   8 +-
 ...ngAttentionProductSuccessDeleteMessage.php |   8 +-
 .../AssertSkuNotFoundFailMessage.php          |   8 +-
 .../AssertSpecifyProductOptionsLink.php       |   4 +-
 .../AssertWidgetOrderBySkuOnCategoryPage.php  |   4 +-
 .../AdvancedCheckout/Test/etc/constraint.xml  |  32 ++--
 .../AssertGlobalSearchCustomerName.php        |   4 +-
 .../AssertGlobalSearchNoRecordsFound.php      |   8 +-
 .../Constraint/AssertGlobalSearchOrderId.php  |   4 +-
 .../AssertGlobalSearchProductName.php         |   4 +-
 .../Magento/Backend/Test/etc/constraint.xml   |   8 +-
 .../Test/Constraint/AssertBackupInGrid.php    |   4 +-
 .../Magento/Backup/Test/etc/constraint.xml    |   2 +-
 .../Constraint/AssertBannerDeleteMessage.php  |   8 +-
 .../Test/Constraint/AssertBannerInGrid.php    |   4 +-
 .../Constraint/AssertBannerInShoppingCart.php |   4 +-
 .../AssertBannerMassDeleteMessage.php         |   8 +-
 .../Constraint/AssertBannerNotInCartRule.php  |   4 +-
 .../AssertBannerNotInCatalogRule.php          |   4 +-
 .../Test/Constraint/AssertBannerNotInGrid.php |   4 +-
 .../AssertBannerNotInShoppingCart.php         |   4 +-
 .../AssertBannerNotInWidgetOptions.php        |   4 +-
 .../AssertBannerNotOnCategoryPage.php         |   4 +-
 .../Constraint/AssertBannerOnCategoryPage.php |   4 +-
 .../AssertBannerSuccessSaveMessage.php        |   8 +-
 .../Constraint/AssertWidgetBannerRotator.php  |   4 +-
 ...AssertWidgetBannerRotatorOnProductPage.php |   4 +-
 .../Magento/Banner/Test/etc/constraint.xml    |  28 +--
 .../Constraint/AssertBundleInCategory.php     |   4 +-
 .../AssertBundleItemsOnProductPage.php        |   4 +-
 .../Test/Constraint/AssertBundlePriceType.php |   4 +-
 .../Test/Constraint/AssertBundlePriceView.php |   4 +-
 .../Constraint/AssertBundleProductForm.php    |   4 +-
 .../AssertTierPriceOnBundleProductPage.php    |   4 +-
 .../Magento/Bundle/Test/etc/constraint.xml    |  20 +-
 .../AssertAbsenceDeleteAttributeButton.php    |   4 +-
 .../AssertAddToCartButtonAbsent.php           |   4 +-
 .../AssertAddToCartButtonPresent.php          |   4 +-
 ...sertAddedProductAttributeOnProductForm.php |   4 +-
 .../Test/Constraint/AssertAttributeForm.php   |   4 +-
 .../AssertAttributeOptionsOnProductForm.php   |   4 +-
 .../AssertAttributeSearchableByLabel.php      |   4 +-
 .../AssertCategoryAbsenceOnBackend.php        |   4 +-
 .../AssertCategoryAbsenceOnFrontend.php       |   8 +-
 .../AssertCategoryForAssignedProducts.php     |   4 +-
 .../Test/Constraint/AssertCategoryForm.php    |   4 +-
 .../Constraint/AssertCategoryIsNotActive.php  |   8 +-
 .../AssertCategoryIsNotIncludeInMenu.php      |   4 +-
 .../Test/Constraint/AssertCategoryPage.php    |   4 +-
 .../Constraint/AssertCategoryRedirect.php     |   4 +-
 .../Constraint/AssertCategorySaveMessage.php  |   8 +-
 .../AssertCategorySuccessDeleteMessage.php    |   8 +-
 .../AssertCrossSellsProductsSection.php       |   4 +-
 .../AssertNoCrossSellsProductsSection.php     |   4 +-
 .../AssertNoRelatedProductsSection.php        |   4 +-
 .../AssertNoUpSellsProductsSection.php        |   4 +-
 .../AssertProductAttributeAbsenceInGrid.php   |   4 +-
 ...tAttributeAbsenceInSearchOnProductForm.php |   4 +-
 ...roductAttributeAbsenceInTemplateGroups.php |   4 +-
 ...AttributeAbsenceInUnassignedAttributes.php |   4 +-
 ...rtProductAttributeDisplayingOnFrontend.php |   4 +-
 ...ProductAttributeDisplayingOnSearchForm.php |   4 +-
 .../AssertProductAttributeInGrid.php          |   4 +-
 .../AssertProductAttributeIsComparable.php    |   4 +-
 .../AssertProductAttributeIsFilterable.php    |   4 +-
 ...rtProductAttributeIsFilterableInSearch.php |   4 +-
 .../AssertProductAttributeIsGlobal.php        |   4 +-
 .../AssertProductAttributeIsHtmlAllowed.php   |   4 +-
 .../AssertProductAttributeIsRequired.php      |   8 +-
 .../AssertProductAttributeIsUnique.php        |   8 +-
 ...ProductAttributeIsUsedInSortOnFrontend.php |   4 +-
 ...AssertProductAttributeIsUsedPromoRules.php |   4 +-
 .../AssertProductAttributeSaveMessage.php     |   8 +-
 ...rtProductAttributeSuccessDeleteMessage.php |   8 +-
 .../AssertProductCompareBlockOnCmsPage.php    |   4 +-
 .../AssertProductCompareItemsLink.php         |   4 +-
 .../AssertProductCompareItemsLinkIsAbsent.php |   4 +-
 .../Constraint/AssertProductComparePage.php   |   4 +-
 ...ProductCompareRemoveLastProductMessage.php |   8 +-
 .../AssertProductCompareSuccessAddMessage.php |   8 +-
 ...CompareSuccessRemoveAllProductsMessage.php |   8 +-
 ...sertProductCompareSuccessRemoveMessage.php |   8 +-
 ...ssertProductCustomOptionsOnProductPage.php |   4 +-
 .../Constraint/AssertProductDuplicateForm.php |  11 +-
 ...ductDuplicateIsNotDisplayingOnFrontend.php |   4 +-
 .../AssertProductDuplicateMessage.php         |   8 +-
 .../AssertProductDuplicatedInGrid.php         |   4 +-
 .../Test/Constraint/AssertProductForm.php     |   8 +-
 ...AssertProductGroupedPriceOnProductPage.php |   4 +-
 .../Test/Constraint/AssertProductInCart.php   |   4 +-
 .../Constraint/AssertProductInCategory.php    |   4 +-
 .../Test/Constraint/AssertProductInGrid.php   |   4 +-
 .../Test/Constraint/AssertProductInStock.php  |   4 +-
 ...AssertProductIsNotDisplayingOnFrontend.php |   8 +-
 ...ssertProductIsNotVisibleInCompareBlock.php |   8 +-
 ...AssertProductIsNotVisibleInComparePage.php |   8 +-
 .../Constraint/AssertProductNotInGrid.php     |   4 +-
 .../AssertProductNotSearchableBySku.php       |   4 +-
 .../AssertProductNotVisibleInCategory.php     |   4 +-
 .../Constraint/AssertProductOutOfStock.php    |   4 +-
 .../Test/Constraint/AssertProductPage.php     |   8 +-
 .../Constraint/AssertProductSaveMessage.php   |   8 +-
 .../AssertProductSearchableBySku.php          |   4 +-
 .../AssertProductSimpleDuplicateForm.php      |   4 +-
 .../AssertProductSkuAutoGenerated.php         |   4 +-
 ...AssertProductSpecialPriceOnProductPage.php |   4 +-
 .../AssertProductSuccessDeleteMessage.php     |   8 +-
 .../Constraint/AssertProductTemplateForm.php  |   4 +-
 ...ssertProductTemplateGroupOnProductForm.php |   4 +-
 .../AssertProductTemplateInGrid.php           |   4 +-
 .../AssertProductTemplateNotInGrid.php        |   4 +-
 .../AssertProductTemplateOnProductForm.php    |   4 +-
 ...ertProductTemplateSuccessDeleteMessage.php |   8 +-
 ...ssertProductTemplateSuccessSaveMessage.php |   8 +-
 .../AssertProductTierPriceOnProductPage.php   |   4 +-
 .../Test/Constraint/AssertProductView.php     |   4 +-
 .../AssertProductVisibleInCategory.php        |   4 +-
 .../AssertRelatedProductsSection.php          |   4 +-
 .../AssertUpSellsProductsSection.php          |   4 +-
 ...SuperAttributeImpossibleDeleteMessages.php |   8 +-
 .../Magento/Catalog/Test/etc/constraint.xml   | 180 +++++++++---------
 .../AssertCatalogEventBlockAbsent.php         |   4 +-
 .../AssertCatalogEventBlockVisible.php        |   4 +-
 .../Constraint/AssertCatalogEventInGrid.php   |   4 +-
 .../Constraint/AssertCatalogEventIsClosed.php |   4 +-
 .../Constraint/AssertCatalogEventIsOpen.php   |   4 +-
 .../AssertCatalogEventIsUpcoming.php          |   4 +-
 .../Constraint/AssertCatalogEventStatus.php   |   4 +-
 ...AssertCatalogEventSuccessCreateMessage.php |   8 +-
 ...AssertCatalogEventSuccessDeleteMessage.php |   8 +-
 .../Constraint/AssertWidgetCatalogEvent.php   |   4 +-
 .../CatalogEvent/Test/etc/constraint.xml      |  20 +-
 ...sertCatalogPriceRuleAppliedCatalogPage.php |   4 +-
 ...sertCatalogPriceRuleAppliedProductPage.php |   4 +-
 ...ertCatalogPriceRuleAppliedShoppingCart.php |   4 +-
 .../Constraint/AssertCatalogPriceRuleForm.php |   4 +-
 .../AssertCatalogPriceRuleInGrid.php          |   4 +-
 .../AssertCatalogPriceRuleNotInGrid.php       |   4 +-
 .../AssertCatalogPriceRuleNoticeMessage.php   |   8 +-
 ...rtCatalogPriceRuleSuccessDeleteMessage.php |   8 +-
 ...sertCatalogPriceRuleSuccessSaveMessage.php |   8 +-
 .../CatalogRule/Test/etc/constraint.xml       |  18 +-
 .../AssertAdvancedSearchProductsResult.php    |   8 +-
 .../Constraint/AssertCatalogSearchResult.php  |   4 +-
 ...rtSearchSynonymMassActionNotOnFrontend.php |   4 +-
 .../AssertSearchSynonymNotOnFrontend.php      |   4 +-
 .../Test/Constraint/AssertSearchTermForm.php  |   4 +-
 .../Constraint/AssertSearchTermInGrid.php     |   4 +-
 ...ssertSearchTermMassActionNotOnFrontend.php |   4 +-
 .../AssertSearchTermMassActionsNotInGrid.php  |   4 +-
 .../Constraint/AssertSearchTermNotInGrid.php  |   4 +-
 .../AssertSearchTermNotOnFrontend.php         |   4 +-
 .../Constraint/AssertSearchTermOnFrontend.php |   4 +-
 .../AssertSearchTermSuccessDeleteMessage.php  |   8 +-
 ...sertSearchTermSuccessMassDeleteMessage.php |   8 +-
 .../AssertSearchTermSuccessSaveMessage.php    |   8 +-
 .../AssertSearchTermSynonymOnFrontend.php     |   4 +-
 .../AssertSuggestSearchingResult.php          |   4 +-
 .../CatalogSearch/Test/etc/constraint.xml     |  32 ++--
 ...AssertAddedProductToCartSuccessMessage.php |   8 +-
 .../Test/Constraint/AssertCartIsEmpty.php     |   8 +-
 .../Constraint/AssertCartItemsOptions.php     |   4 +-
 .../AssertGrandTotalInShoppingCart.php        |   4 +-
 .../AssertOrderSuccessPlacedMessage.php       |   8 +-
 .../AssertOrderTotalOnReviewPage.php          |   4 +-
 .../Constraint/AssertPriceInShoppingCart.php  |   4 +-
 .../AssertProductAbsentInMiniShoppingCart.php |   4 +-
 .../Constraint/AssertProductIsNotEditable.php |   4 +-
 ...AssertProductPresentInMiniShoppingCart.php |   4 +-
 .../AssertProductPresentInShoppingCart.php    |   4 +-
 .../AssertProductQtyInMiniShoppingCart.php    |   4 +-
 .../AssertProductQtyInShoppingCart.php        |   4 +-
 .../AssertProductsAbsentInShoppingCart.php    |   9 +-
 .../AssertSubtotalInShoppingCart.php          |   4 +-
 .../Magento/Checkout/Test/etc/constraint.xml  |  32 ++--
 .../Constraint/AssertTermAbsentInGrid.php     |   4 +-
 .../Constraint/AssertTermAbsentOnCheckout.php |   4 +-
 .../Test/Constraint/AssertTermInGrid.php      |   4 +-
 .../Test/Constraint/AssertTermOnCheckout.php  |   8 +-
 .../AssertTermSuccessDeleteMessage.php        |   8 +-
 .../AssertTermSuccessSaveMessage.php          |   8 +-
 .../Test/etc/constraint.xml                   |  12 +-
 .../AssertCmsBlockDeleteMessage.php           |   8 +-
 .../Test/Constraint/AssertCmsBlockInGrid.php  |   4 +-
 .../Constraint/AssertCmsBlockNotInGrid.php    |   4 +-
 .../AssertCmsBlockNotOnCategoryPage.php       |   4 +-
 .../AssertCmsBlockOnCategoryPage.php          |   4 +-
 .../AssertCmsBlockSuccessSaveMessage.php      |   8 +-
 .../Constraint/AssertCmsPageDeleteMessage.php |   8 +-
 .../AssertCmsPageDisabledOnFrontend.php       |   8 +-
 .../AssertCmsPageDuplicateErrorMessage.php    |   8 +-
 .../Cms/Test/Constraint/AssertCmsPageForm.php |   4 +-
 .../Test/Constraint/AssertCmsPageInGrid.php   |   4 +-
 .../Constraint/AssertCmsPageNotInGrid.php     |   4 +-
 .../Test/Constraint/AssertCmsPagePreview.php  |   4 +-
 .../AssertCmsPageSuccessSaveMessage.php       |   8 +-
 .../AssertUrlRewriteCmsPageRedirect.php       |   4 +-
 .../app/Magento/Cms/Test/etc/constraint.xml   |  30 +--
 ...rtChildProductIsNotDisplayedSeparately.php |   4 +-
 .../Constraint/AssertChildProductsInGrid.php  |   8 +-
 ...figurableAttributesAbsentOnProductPage.php |   9 +-
 ...leAttributesBlockIsAbsentOnProductPage.php |   9 +-
 ...AssertConfigurableProductDuplicateForm.php |   9 +-
 .../AssertConfigurableProductForm.php         |   8 +-
 ...ductAttributeAbsenceInVariationsSearch.php |   8 +-
 .../AssertProductAttributeIsConfigurable.php  |   4 +-
 .../Test/etc/constraint.xml                   |  24 +--
 .../Constraint/AssertCustomVariableForm.php   |   4 +-
 .../Constraint/AssertCustomVariableInGrid.php |   4 +-
 .../Constraint/AssertCustomVariableInPage.php |   4 +-
 .../AssertCustomVariableNotInCmsPageForm.php  |   4 +-
 .../AssertCustomVariableNotInGrid.php         |   4 +-
 ...sertCustomVariableSuccessDeleteMessage.php |   8 +-
 ...AssertCustomVariableSuccessSaveMessage.php |   8 +-
 .../app/Magento/Core/Test/etc/constraint.xml  |  16 +-
 .../AssertCurrencySymbolOnCatalogPage.php     |   4 +-
 .../AssertCurrencySymbolOnProductPage.php     |   9 +-
 ...AssertCurrencySymbolSuccessSaveMessage.php |   8 +-
 .../CurrencySymbol/Test/etc/constraint.xml    |   6 +-
 .../AssertAddressDeletedBackend.php           |   4 +-
 .../AssertAddressDeletedFrontend.php          |   8 +-
 .../AssertChangePasswordFailMessage.php       |   8 +-
 ...ssertCustomerAddressSuccessSaveMessage.php |   8 +-
 .../AssertCustomerDefaultAddresses.php        |   4 +-
 .../AssertCustomerFailRegisterMessage.php     |   4 +-
 .../Test/Constraint/AssertCustomerForm.php    |   4 +-
 .../AssertCustomerGroupAlreadyExists.php      |   8 +-
 .../Constraint/AssertCustomerGroupForm.php    |   4 +-
 .../Constraint/AssertCustomerGroupInGrid.php  |   4 +-
 .../AssertCustomerGroupNotInGrid.php          |   4 +-
 .../AssertCustomerGroupOnCustomerForm.php     |   4 +-
 ...ssertCustomerGroupSuccessDeleteMessage.php |   8 +-
 .../AssertCustomerGroupSuccessSaveMessage.php |   8 +-
 .../Test/Constraint/AssertCustomerInGrid.php  |   4 +-
 .../AssertCustomerInfoSuccessSavedMessage.php |   8 +-
 .../Constraint/AssertCustomerInvalidEmail.php |   8 +-
 .../AssertCustomerMassDeleteInGrid.php        |   4 +-
 .../AssertCustomerMassDeleteNotInGrid.php     |   4 +-
 ...AssertCustomerMassDeleteSuccessMessage.php |   8 +-
 .../Constraint/AssertCustomerNotInGrid.php    |   4 +-
 .../AssertCustomerPasswordChanged.php         |   9 +-
 .../AssertCustomerSuccessDeleteMessage.php    |   8 +-
 .../AssertCustomerSuccessRegisterMessage.php  |   8 +-
 .../AssertCustomerSuccessSaveMessage.php      |   8 +-
 .../AssertMassActionSuccessUpdateMessage.php  |   8 +-
 .../AssertWrongPassConfirmationMessage.php    |  11 +-
 .../Magento/Customer/Test/etc/constraint.xml  |  54 +++---
 .../AssertCustomerBalanceAmount.php           |   4 +-
 .../AssertCustomerBalanceHistory.php          |   4 +-
 .../AssertRemoveStoreCreditSuccessMessage.php |   8 +-
 .../CustomerBalance/Test/etc/constraint.xml   |   6 +-
 ...erCustomAttributeErrorDuplicateMessage.php |   8 +-
 ...stomerCustomAttributeInCustomerSegment.php |   4 +-
 .../AssertCustomerCustomAttributeInGrid.php   |   4 +-
 ...merCustomAttributeNotInCustomerSegment.php |   4 +-
 ...AssertCustomerCustomAttributeNotInGrid.php |   4 +-
 ...erCustomAttributeNotOnCheckoutRegister.php |   4 +-
 ...CustomAttributeNotOnCreateOrderBackend.php |   4 +-
 ...erCustomAttributeNotOnCustomerEditPage.php |   4 +-
 ...erCustomAttributeNotOnCustomerRegister.php |   4 +-
 ...tomerCustomAttributeOnCheckoutRegister.php |   4 +-
 ...merCustomAttributeOnCreateOrderBackend.php |   4 +-
 ...tomerCustomAttributeOnCustomerEditPage.php |   4 +-
 ...tomerCustomAttributeOnCustomerRegister.php |   4 +-
 ...merCustomAttributeSuccessDeleteMessage.php |   8 +-
 ...tomerCustomAttributeSuccessSaveMessage.php |   8 +-
 .../Test/etc/constraint.xml                   |  30 +--
 ...rtCustomerSegmentAvailableInBannerForm.php |   4 +-
 .../Constraint/AssertCustomerSegmentForm.php  |   8 +-
 ...stomerSegmentInCartPriceRuleIsApplying.php |   4 +-
 ...merSegmentInCartPriceRuleIsNotApplying.php |   4 +-
 .../AssertCustomerSegmentInGrid.php           |   4 +-
 .../AssertCustomerSegmentMatchedCustomer.php  |   4 +-
 ...CustomerSegmentMatchedCustomerWithCart.php |   4 +-
 ...tCustomerSegmentMatchedCustomersInGrid.php |   4 +-
 ...rtCustomerSegmentNotApplicableToBanner.php |   4 +-
 .../AssertCustomerSegmentNotInGrid.php        |   4 +-
 .../AssertCustomerSegmentReportInGrid.php     |   4 +-
 .../AssertCustomerSegmentReportMessage.php    |   8 +-
 .../AssertCustomerSegmentReportNotInGrid.php  |   4 +-
 ...ertCustomerSegmentSuccessDeleteMessage.php |   8 +-
 ...ssertCustomerSegmentSuccessSaveMessage.php |   8 +-
 .../CustomerSegment/Test/etc/constraint.xml   |  30 +--
 .../AssertDownloadableDuplicateForm.php       |   4 +-
 .../AssertDownloadableLinksData.php           |   8 +-
 .../AssertDownloadableSamplesData.php         |   8 +-
 .../Downloadable/Test/etc/constraint.xml      |  10 +-
 .../AssertGiftCardDuplicateForm.php           |   9 +-
 .../AssertGiftCardDuplicatedInGrid.php        |   4 +-
 .../AssertGiftCardProductAddToCartForm.php    |   8 +-
 .../Constraint/AssertGiftCardProductForm.php  |   8 +-
 .../Magento/GiftCard/Test/etc/constraint.xml  |  14 +-
 .../Constraint/AssertGiftCardAccountForm.php  |   8 +-
 .../AssertGiftCardAccountInGrid.php           |   9 +-
 ...CardAccountIsNotUsableInCartOnFrontend.php |   4 +-
 .../AssertGiftCardAccountNotInGrid.php        |   4 +-
 ...GiftCardAccountNotRedeemableOnFrontend.php |   4 +-
 .../AssertGiftCardAccountOnPrintOrder.php     |   9 +-
 ...ertGiftCardAccountRedeemableOnFrontend.php |   8 +-
 .../AssertGiftCardAccountSaveMessage.php      |   8 +-
 ...GiftCardAccountStatusInCustomerAccount.php |   4 +-
 ...ertGiftCardAccountStatusInShoppingCart.php |   4 +-
 ...ertGiftCardAccountSuccessDeleteMessage.php |   8 +-
 ...tGiftCardAccountUsableInCartOnFrontend.php |   4 +-
 .../Constraint/AssertGiftCardDiscount.php     |   4 +-
 .../AssertGiftCardSuccessAddMessage.php       |   8 +-
 .../GiftCardAccount/Test/etc/constraint.xml   |  28 +--
 .../AssertGiftMessageInBackendOrder.php       |   9 +-
 .../AssertGiftMessageInFrontendOrder.php      |   4 +-
 .../AssertGiftMessageInFrontendOrderItems.php |   4 +-
 .../GiftMessage/Test/etc/constraint.xml       |   6 +-
 ...AssertGiftRegistryActiveInShoppingCart.php |   4 +-
 .../AssertGiftRegistryActiveInWishlist.php    |   8 +-
 .../Constraint/AssertGiftRegistryForm.php     |   4 +-
 .../Constraint/AssertGiftRegistryInGrid.php   |   4 +-
 ...ssertGiftRegistryInactiveNotInWishlist.php |   4 +-
 .../AssertGiftRegistryIsEmptyMessage.php      |   8 +-
 .../AssertGiftRegistryItemsForm.php           |   4 +-
 ...stryItemsUpdatedFrontendSuccessMessage.php |   8 +-
 ...GiftRegistryItemsUpdatedSuccessMessage.php |   8 +-
 .../AssertGiftRegistryManageItemsTab.php      |   4 +-
 .../AssertGiftRegistryNotInGrid.php           |   4 +-
 ...rtGiftRegistrySuccessAddedItemsMessage.php |   8 +-
 ...tRegistrySuccessDeleteMessageOnBackend.php |   8 +-
 .../AssertGiftRegistrySuccessSaveMessage.php  |   8 +-
 ...ftRegistrySuccessShareMessageOnBackend.php |   8 +-
 ...tRegistrySuccessShareMessageOnFrontend.php |   8 +-
 .../Constraint/AssertGiftRegistryTypeForm.php |   4 +-
 .../AssertGiftRegistryTypeInGrid.php          |   4 +-
 .../AssertGiftRegistryTypeNotInGrid.php       |   4 +-
 .../AssertGiftRegistryTypeNotOnFrontend.php   |   4 +-
 .../AssertGiftRegistryTypeOnFrontend.php      |   4 +-
 ...rtGiftRegistryTypeSuccessDeleteMessage.php |   8 +-
 ...sertGiftRegistryTypeSuccessSaveMessage.php |   8 +-
 .../GiftRegistry/Test/etc/constraint.xml      |  48 ++---
 .../Constraint/AssertGiftWrappingForm.php     |   4 +-
 .../Constraint/AssertGiftWrappingInGrid.php   |   4 +-
 .../AssertGiftWrappingMassActionForm.php      |   4 +-
 .../AssertGiftWrappingMassActionInGrid.php    |   4 +-
 .../AssertGiftWrappingMassActionNotInGrid.php |   4 +-
 ...WrappingMassActionSuccessDeleteMessage.php |   8 +-
 .../AssertGiftWrappingNotInGrid.php           |   4 +-
 ...ssertGiftWrappingNotOnFrontendCheckout.php |   4 +-
 ...sertGiftWrappingNotOnOrderCreationPage.php |   4 +-
 .../AssertGiftWrappingOnFrontendCheckout.php  |   4 +-
 ...AssertGiftWrappingSuccessDeleteMessage.php |   8 +-
 .../AssertGiftWrappingSuccessSaveMessage.php  |   8 +-
 ...AssertGiftWrappingSuccessUpdateMessage.php |   8 +-
 .../GiftWrapping/Test/etc/constraint.xml      |  26 +--
 ...uctAttributeAbsenceForAttributeMapping.php |   4 +-
 .../GoogleShopping/Test/etc/constraint.xml    |   2 +-
 ...AssertGroupedPriceOnGroupedProductPage.php |   4 +-
 .../Constraint/AssertGroupedProductForm.php   |   4 +-
 ...AssertGroupedProductInItemsOrderedGrid.php |   4 +-
 .../AssertGroupedProductsDefaultQty.php       |   4 +-
 ...AssertSpecialPriceOnGroupedProductPage.php |   4 +-
 .../AssertTierPriceOnGroupedProductPage.php   |   4 +-
 .../GroupedProduct/Test/etc/constraint.xml    |  14 +-
 ...AssertProductAttributeAbsenceForExport.php |   4 +-
 .../ImportExport/Test/etc/constraint.xml      |   2 +-
 .../Test/Constraint/AssertIntegrationForm.php |   4 +-
 .../Constraint/AssertIntegrationInGrid.php    |   4 +-
 .../Constraint/AssertIntegrationNotInGrid.php |   4 +-
 .../AssertIntegrationResourcesPopup.php       |   4 +-
 ...ertIntegrationSuccessActivationMessage.php |   8 +-
 .../AssertIntegrationSuccessDeleteMessage.php |   8 +-
 ...rtIntegrationSuccessReauthorizeMessage.php |  11 +-
 .../AssertIntegrationSuccessSaveMessage.php   |   8 +-
 ...ssertIntegrationTokensAfterReauthorize.php |   9 +-
 .../AssertIntegrationTokensPopup.php          |   4 +-
 .../Integration/Test/etc/constraint.xml       |  20 +-
 .../AssertInvitationErrorSentMessage.php      |   8 +-
 .../Test/Constraint/AssertInvitationForm.php  |   9 +-
 ...ationFrontendErrorSendDuplicateMessage.php |   8 +-
 ...rtInvitationFrontendSuccessSentMessage.php |   8 +-
 .../Constraint/AssertInvitationInGrid.php     |   9 +-
 .../AssertInvitationInGridOnFrontend.php      |   4 +-
 .../AssertInvitationNoticeMessage.php         |  11 +-
 .../Constraint/AssertInvitationOneEntry.php   |   4 +-
 .../AssertInvitationSuccessDiscardMessage.php |  11 +-
 .../AssertInvitationSuccessSentMessage.php    |  11 +-
 ...tInvitationSuccessSentMessageOnBackend.php |  11 +-
 .../Invitation/Test/etc/constraint.xml        |  22 +--
 .../Constraint/AssertAdminUserDataBlock.php   |   4 +-
 .../Magento/Logging/Test/etc/constraint.xml   |   2 +-
 .../AbstractAssertMultipleWishlistState.php   |   4 +-
 ...ctAssertMultipleWishlistSuccessMessage.php |   8 +-
 ...BundleProductDetailsInMultipleWishlist.php |   4 +-
 ...rtDeleteMultipleWishlistButtonIsAbsent.php |   4 +-
 ...ssertMultipleWishlistAbsentInMyAccount.php |   4 +-
 ...sertMultipleWishlistPresentInMyAccount.php |   4 +-
 .../AssertProductAbsentInDefaultWishlist.php  |   4 +-
 .../AssertProductInCustomWishlist.php         |   4 +-
 .../AssertProductInDefaultWishlist.php        |   4 +-
 .../Constraint/AssertWishlistReportGrid.php   |   4 +-
 .../MultipleWishlist/Test/etc/constraint.xml  |  24 +--
 ...AssertCustomerIsSubscribedToNewsletter.php |   4 +-
 .../Test/Constraint/AssertNewsletterForm.php  |   4 +-
 .../Constraint/AssertNewsletterInGrid.php     |   4 +-
 .../Constraint/AssertNewsletterPreview.php    |   4 +-
 .../Test/Constraint/AssertNewsletterQueue.php |   8 +-
 .../AssertNewsletterSuccessCreateMessage.php  |   8 +-
 .../Newsletter/Test/etc/constraint.xml        |  12 +-
 .../Test/Constraint/AssertReminderForm.php    |   9 +-
 .../Test/Constraint/AssertReminderInGrid.php  |   9 +-
 .../AssertReminderMatchedCustomers.php        |   9 +-
 .../AssertReminderSuccessSaveMessage.php      |  11 +-
 .../Magento/Reminder/Test/etc/constraint.xml  |   8 +-
 ...bstractAssertCustomerOrderReportResult.php |   4 +-
 .../AssertAbandonedCartCustomerInfoResult.php |   4 +-
 .../AssertBestsellerReportResult.php          |   9 +-
 .../Constraint/AssertCouponReportResult.php   |   4 +-
 .../AssertCustomerOrderCountReportResult.php  |   4 +-
 .../AssertCustomerOrderTotalReportResult.php  |   4 +-
 .../AssertDownloadsReportResult.php           |   4 +-
 .../AssertInvoiceReportIntervalResult.php     |   4 +-
 .../AssertInvoiceReportTotalResult.php        |   4 +-
 .../AssertLowStockProductInGrid.php           |   4 +-
 .../AssertNewAccountsReportTotalResult.php    |   4 +-
 .../Constraint/AssertOrderedProductResult.php |   4 +-
 .../Constraint/AssertProductInCartResult.php  |   4 +-
 .../AssertProductReportByCustomerInGrid.php   |   4 +-
 ...AssertProductReportByCustomerNotInGrid.php |   4 +-
 ...sertProductReviewIsAvailableForProduct.php |   4 +-
 ...sertProductReviewReportIsVisibleInGrid.php |   4 +-
 .../AssertProductReviewsQtyByCustomer.php     |   4 +-
 .../AssertProductViewsReportTotalResult.php   |   4 +-
 .../AssertRefundReportIntervalResult.php      |   4 +-
 .../AssertSalesReportIntervalResult.php       |   4 +-
 .../AssertSalesReportTotalResult.php          |   4 +-
 .../Constraint/AssertSearchTermReportForm.php |   4 +-
 .../Constraint/AssertSearchTermsInGrid.php    |   4 +-
 .../Test/Constraint/AssertTaxReportInGrid.php |   4 +-
 .../Constraint/AssertTaxReportNotInGrid.php   |   4 +-
 .../Magento/Reports/Test/etc/constraint.xml   |  50 ++---
 .../Constraint/AssertProductRatingInGrid.php  |   4 +-
 .../AssertProductRatingInProductPage.php      |   4 +-
 .../AssertProductRatingNotInGrid.php          |   4 +-
 .../AssertProductRatingNotInProductPage.php   |   4 +-
 .../AssertProductRatingOnReviewPage.php       |   4 +-
 ...ssertProductRatingSuccessDeleteMessage.php |   8 +-
 .../AssertProductRatingSuccessSaveMessage.php |   8 +-
 ...ProductReviewBackendSuccessSaveMessage.php |   8 +-
 .../Constraint/AssertProductReviewInGrid.php  |   4 +-
 ...ssertProductReviewInGridOnCustomerPage.php |   4 +-
 ...ctReviewMassActionSuccessDeleteMessage.php |   8 +-
 ...tProductReviewMassActionSuccessMessage.php |   8 +-
 .../AssertProductReviewNotInGrid.php          |   4 +-
 .../AssertProductReviewNotOnProductPage.php   |   4 +-
 .../AssertProductReviewOnProductPage.php      |   4 +-
 .../AssertReviewCreationSuccessMessage.php    |   8 +-
 .../AssertReviewSuccessSaveMessage.php        |   8 +-
 .../Magento/Review/Test/etc/constraint.xml    |  36 ++--
 .../AssertRateSuccessSaveMessage.php          |   8 +-
 .../Constraint/AssertRewardInHistoryGrid.php  |   4 +-
 ...rdNoExchangeMessageForCurrencyToPoints.php |   4 +-
 ...rdNoExchangeMessageForPointsToCurrency.php |   4 +-
 .../Constraint/AssertRewardPointsBalance.php  |   8 +-
 ...ardPointsMessageOnCustomerRegistration.php |   8 +-
 ...ssertRewardPointsMessageOnShoppingCart.php |   8 +-
 ...AssertRewardPointsSuccessDeleteMessage.php |   8 +-
 ...AssertRewardPointsSuccessRemoveMessage.php |   8 +-
 .../AssertRewardSubscriptionOnBackend.php     |   4 +-
 .../AssertRewardSubscriptionSaveMessage.php   |   8 +-
 .../Magento/Reward/Test/etc/constraint.xml    |  22 +--
 .../Rma/Test/Constraint/AssertRmaForm.php     |   9 +-
 .../Rma/Test/Constraint/AssertRmaInGrid.php   |   9 +-
 .../AssertRmaOnFrontendForCustomer.php        |   9 +-
 .../AssertRmaOnFrontendForGuest.php           |   9 +-
 .../AssertRmaSuccessSaveMessage.php           |  11 +-
 .../app/Magento/Rma/Test/etc/constraint.xml   |  16 +-
 .../Constraint/AssertCreditMemoButton.php     |   4 +-
 .../Test/Constraint/AssertCreditMemoItems.php |   4 +-
 .../AssertInvoiceInInvoicesGrid.php           |   4 +-
 .../Constraint/AssertInvoiceInInvoicesTab.php |   4 +-
 .../Test/Constraint/AssertInvoiceItems.php    |   4 +-
 .../AssertInvoiceSuccessCreateMessage.php     |   8 +-
 ...ssertInvoiceWithShipmentSuccessMessage.php |   8 +-
 .../AssertInvoicedAmountOnFrontend.php        |   4 +-
 .../Constraint/AssertNoCreditMemoButton.php   |   4 +-
 .../Test/Constraint/AssertNoInvoiceButton.php |   4 +-
 .../AssertOrderButtonsAvailable.php           |   4 +-
 .../AssertOrderButtonsUnavailable.php         |   4 +-
 ...AssertOrderCancelMassActionFailMessage.php |   8 +-
 ...ertOrderCancelMassActionSuccessMessage.php |   8 +-
 .../AssertOrderCancelSuccessMessage.php       |   8 +-
 .../Test/Constraint/AssertOrderGrandTotal.php |   4 +-
 .../Constraint/AssertOrderInOrdersGrid.php    |   4 +-
 .../AssertOrderInOrdersGridOnFrontend.php     |   4 +-
 .../AssertOrderMassOnHoldSuccessMessage.php   |   8 +-
 .../Constraint/AssertOrderNotInOrdersGrid.php |   4 +-
 .../AssertOrderNotVisibleOnMyAccount.php      |   4 +-
 .../AssertOrderOnHoldFailMessage.php          |   8 +-
 .../AssertOrderOnHoldSuccessMessage.php       |   8 +-
 .../AssertOrderReleaseFailMessage.php         |   8 +-
 .../AssertOrderReleaseSuccessMessage.php      |   8 +-
 .../AssertOrderStatusDuplicateStatus.php      |   8 +-
 .../Constraint/AssertOrderStatusInGrid.php    |   4 +-
 .../Constraint/AssertOrderStatusIsCorrect.php |   4 +-
 .../AssertOrderStatusNotAssigned.php          |   4 +-
 .../AssertOrderStatusSuccessAssignMessage.php |   8 +-
 .../AssertOrderStatusSuccessCreateMessage.php |   8 +-
 ...ssertOrderStatusSuccessUnassignMessage.php |   8 +-
 .../AssertOrderSuccessCreateMessage.php       |   8 +-
 .../Constraint/AssertOrdersInOrdersGrid.php   |   4 +-
 .../AssertProductInItemsOrderedGrid.php       |   9 +-
 .../AssertRefundInCreditMemoTab.php           |   4 +-
 .../Constraint/AssertRefundInRefundsGrid.php  |   4 +-
 .../AssertRefundSuccessCreateMessage.php      |   8 +-
 .../AssertRefundedGrandTotalOnFrontend.php    |   4 +-
 .../AssertReorderStatusIsCorrect.php          |   4 +-
 .../AssertSalesPrintOrderBillingAddress.php   |   9 +-
 .../AssertSalesPrintOrderGrandTotal.php       |   9 +-
 .../AssertSalesPrintOrderPaymentMethod.php    |   9 +-
 .../AssertSalesPrintOrderProducts.php         |  11 +-
 .../Test/Constraint/AssertUnholdButton.php    |   4 +-
 .../app/Magento/Sales/Test/etc/constraint.xml |  94 ++++-----
 .../AssertArchiveCreditMemoInGrid.php         |   4 +-
 .../AssertArchiveCreditMemoItems.php          |   4 +-
 .../Constraint/AssertArchiveInvoiceInGrid.php |   4 +-
 .../Constraint/AssertArchiveInvoiceItems.php  |   4 +-
 .../AssertArchiveOrderAvailableButtons.php    |   4 +-
 ...chiveOrderCancelMassActionErrorMessage.php |   8 +-
 ...iveOrderCancelMassActionSuccessMessage.php |   8 +-
 .../Constraint/AssertArchiveOrderInGrid.php   |   4 +-
 .../AssertArchiveOrderNotInGrid.php           |   4 +-
 .../AssertArchiveOrderOnHoldErrorMessage.php  |   8 +-
 ...AssertArchiveOrderOnHoldSuccessMessage.php |   8 +-
 .../AssertArchiveOrderReleaseErrorMessage.php |   8 +-
 ...ssertArchiveOrderReleaseSuccessMessage.php |   8 +-
 .../AssertArchiveOrderStatusInGrid.php        |   4 +-
 .../AssertArchiveOrderSuccessMessage.php      |   8 +-
 ...AssertArchiveOrderSuccessRemoveMessage.php |   8 +-
 .../AssertArchiveOrderWarningMessage.php      |   8 +-
 ...ArchiveOrdersCancelMassActionsMessages.php |   8 +-
 .../Constraint/AssertArchiveOrdersInGrid.php  |   4 +-
 .../AssertArchiveShipmentInGrid.php           |   4 +-
 .../Constraint/AssertArchiveShipmentItems.php |   4 +-
 .../SalesArchive/Test/etc/constraint.xml      |  42 ++--
 .../AssertCartPriceRuleConditionIsApplied.php |   4 +-
 ...sertCartPriceRuleConditionIsNotApplied.php |   4 +-
 .../Constraint/AssertCartPriceRuleForm.php    |   4 +-
 ...sertCartPriceRuleFreeShippingIsApplied.php |   8 +-
 ...ssertCartPriceRuleIsNotPresentedInGrid.php |   4 +-
 ...ssertCartPriceRuleSuccessDeleteMessage.php |   8 +-
 .../AssertCartPriceRuleSuccessSaveMessage.php |   8 +-
 .../AssertSalesRuleOnPrintOrder.php           |   9 +-
 .../Magento/SalesRule/Test/etc/constraint.xml |  16 +-
 .../Test/Constraint/AssertNoShipButton.php    |   4 +-
 .../Constraint/AssertShipTotalQuantity.php    |   4 +-
 .../AssertShipmentInShipmentsGrid.php         |   4 +-
 .../AssertShipmentInShipmentsTab.php          |   4 +-
 .../Test/Constraint/AssertShipmentItems.php   |   4 +-
 .../AssertShipmentSuccessCreateMessage.php    |   8 +-
 .../AssertShippingMethodOnPrintOrder.php      |  11 +-
 .../Magento/Shipping/Test/etc/constraint.xml  |  14 +-
 .../Test/Constraint/AssertSitemapContent.php  |   4 +-
 .../AssertSitemapFailFolderSaveMessage.php    |   8 +-
 .../AssertSitemapFailPathSaveMessage.php      |   8 +-
 .../Test/Constraint/AssertSitemapInGrid.php   |   4 +-
 .../Constraint/AssertSitemapNotInGrid.php     |   4 +-
 .../AssertSitemapSuccessDeleteMessage.php     |   8 +-
 .../AssertSitemapSuccessGenerateMessage.php   |   8 +-
 ...tSitemapSuccessSaveAndGenerateMessages.php |   8 +-
 .../AssertSitemapSuccessSaveMessage.php       |   8 +-
 .../Magento/Sitemap/Test/etc/constraint.xml   |  18 +-
 .../Test/Constraint/AssertStoreBackend.php    |   4 +-
 .../Store/Test/Constraint/AssertStoreForm.php |   4 +-
 .../Test/Constraint/AssertStoreFrontend.php   |   4 +-
 .../Test/Constraint/AssertStoreGroupForm.php  |   4 +-
 .../Constraint/AssertStoreGroupInGrid.php     |   4 +-
 .../Constraint/AssertStoreGroupNotInGrid.php  |   4 +-
 .../AssertStoreGroupOnStoreViewForm.php       |   4 +-
 ...oreGroupSuccessDeleteAndBackupMessages.php |   8 +-
 .../AssertStoreGroupSuccessDeleteMessage.php  |   8 +-
 .../AssertStoreGroupSuccessSaveMessage.php    |   8 +-
 .../Test/Constraint/AssertStoreInGrid.php     |   4 +-
 .../Test/Constraint/AssertStoreNotInGrid.php  |   4 +-
 .../Constraint/AssertStoreNotOnFrontend.php   |   4 +-
 ...ertStoreSuccessDeleteAndBackupMessages.php |   8 +-
 .../AssertStoreSuccessDeleteMessage.php       |   8 +-
 .../AssertStoreSuccessSaveMessage.php         |   8 +-
 .../Test/Constraint/AssertWebsiteForm.php     |   4 +-
 .../Test/Constraint/AssertWebsiteInGrid.php   |   4 +-
 .../Constraint/AssertWebsiteNotInGrid.php     |   4 +-
 .../Constraint/AssertWebsiteOnStoreForm.php   |   4 +-
 ...tWebsiteSuccessDeleteAndBackupMessages.php |   8 +-
 .../AssertWebsiteSuccessDeleteMessage.php     |   8 +-
 .../AssertWebsiteSuccessSaveMessage.php       |   8 +-
 .../app/Magento/Store/Test/etc/constraint.xml |  50 ++---
 ...SellsProductsSectionForCustomerSegment.php |   4 +-
 .../Test/Constraint/AssertTargetRuleForm.php  |   4 +-
 .../Constraint/AssertTargetRuleInGrid.php     |   8 +-
 .../AssertTargetRuleIsNotPresentedInGrid.php  |   8 +-
 .../AssertTargetRuleSuccessDeleteMessage.php  |   8 +-
 .../AssertTargetRuleSuccessSaveMessage.php    |   8 +-
 .../TargetRule/Test/etc/constraint.xml        |  12 +-
 .../Tax/Test/Constraint/AssertTaxRateForm.php |   4 +-
 .../Test/Constraint/AssertTaxRateInGrid.php   |   4 +-
 .../Constraint/AssertTaxRateInTaxRule.php     |   4 +-
 .../AssertTaxRateIsInCorrectRange.php         |   4 +-
 .../Constraint/AssertTaxRateNotInGrid.php     |   4 +-
 .../Constraint/AssertTaxRateNotInTaxRule.php  |   4 +-
 .../AssertTaxRateSuccessDeleteMessage.php     |   8 +-
 .../AssertTaxRateSuccessSaveMessage.php       |   8 +-
 .../Tax/Test/Constraint/AssertTaxRuleForm.php |   4 +-
 .../Test/Constraint/AssertTaxRuleInGrid.php   |   4 +-
 .../Constraint/AssertTaxRuleIsApplied.php     |   4 +-
 .../AssertTaxRuleIsAppliedToAllPrices.php     |   8 +-
 .../Constraint/AssertTaxRuleIsNotApplied.php  |   4 +-
 .../Constraint/AssertTaxRuleNotInGrid.php     |   4 +-
 .../AssertTaxRuleSuccessDeleteMessage.php     |   8 +-
 .../AssertTaxRuleSuccessSaveMessage.php       |   8 +-
 .../AssertTaxWithCrossBorderApplied.php       |   4 +-
 .../AssertTaxWithCrossBorderNotApplied.php    |   4 +-
 .../app/Magento/Tax/Test/etc/constraint.xml   |  36 ++--
 .../AssertPageByUrlRewriteIsNotFound.php      |   8 +-
 .../AssertUrlRewriteCategoryInGrid.php        |   4 +-
 .../AssertUrlRewriteCategoryNotInGrid.php     |   4 +-
 .../AssertUrlRewriteCategoryRedirect.php      |   4 +-
 .../AssertUrlRewriteCustomRedirect.php        |   4 +-
 .../AssertUrlRewriteCustomSearchRedirect.php  |   4 +-
 .../AssertUrlRewriteDeletedMessage.php        |   8 +-
 .../Constraint/AssertUrlRewriteInGrid.php     |   4 +-
 .../Constraint/AssertUrlRewriteNotInGrid.php  |   4 +-
 .../AssertUrlRewriteProductRedirect.php       |   4 +-
 .../AssertUrlRewriteSaveMessage.php           |   8 +-
 ...AssertUrlRewriteSuccessOutsideRedirect.php |   4 +-
 .../AssertUrlRewriteUpdatedProductInGrid.php  |   9 +-
 .../UrlRewrite/Test/etc/constraint.xml        |  26 +--
 .../AssertAccessTokensErrorRevokeMessage.php  |  11 +-
 .../AssertImpossibleDeleteYourOwnAccount.php  |   8 +-
 .../AssertImpossibleDeleteYourOwnRole.php     |   8 +-
 .../User/Test/Constraint/AssertRoleInGrid.php |   4 +-
 .../Test/Constraint/AssertRoleNotInGrid.php   |   4 +-
 .../AssertRoleSuccessDeleteMessage.php        |   8 +-
 .../AssertRoleSuccessSaveMessage.php          |   7 +-
 .../Constraint/AssertUserDuplicateMessage.php |   8 +-
 .../User/Test/Constraint/AssertUserInGrid.php |   4 +-
 .../AssertUserInvalidEmailMessage.php         |   8 +-
 .../Test/Constraint/AssertUserNotInGrid.php   |   4 +-
 .../AssertUserRoleSalesRestrictedAccess.php   |   8 +-
 .../AssertUserSuccessDeleteMessage.php        |   8 +-
 .../Constraint/AssertUserSuccessLogOut.php    |   4 +-
 .../Constraint/AssertUserSuccessLogin.php     |   4 +-
 .../AssertUserSuccessSaveMessage.php          |   8 +-
 .../AssertUserWrongCredentialsMessage.php     |   8 +-
 .../app/Magento/User/Test/etc/constraint.xml  |  34 ++--
 ...ssertCmsPageCurrentlyPublishedRevision.php |   4 +-
 .../AssertCmsPageInitialVersionInGrid.php     |   4 +-
 ...ertCmsPageNewVersionSuccessSaveMessage.php |   8 +-
 ...ssertCmsPageRevisionErrorDeleteMessage.php |   8 +-
 .../AssertCmsPageRevisionInGrid.php           |   4 +-
 .../AssertCmsPageRevisionNotInGrid.php        |   4 +-
 .../AssertCmsPageRevisionPreview.php          |   4 +-
 ...msPageRevisionSuccessMassDeleteMessage.php |   8 +-
 ...rtCmsPageRevisionSuccessPublishMessage.php |   8 +-
 ...ssertCmsPageRevisionSuccessSaveMessage.php |   8 +-
 ...AssertCmsPageVersionErrorDeleteMessage.php |   8 +-
 .../AssertCmsPageVersionErrorSaveMessage.php  |   8 +-
 .../Constraint/AssertCmsPageVersionInGrid.php |   4 +-
 .../AssertCmsPageVersionNotInGrid.php         |   4 +-
 ...sertCmsPageVersionSuccessDeleteMessage.php |   8 +-
 ...CmsPageVersionSuccessMassDeleteMessage.php |   8 +-
 ...AssertCmsPageVersionSuccessSaveMessage.php |   8 +-
 ...ssertWidgetHierarchyNodeLinkOnHomePage.php |   4 +-
 .../VersionsCms/Test/etc/constraint.xml       |  38 ++--
 .../app/Magento/Weee/Test/etc/constraint.xml  |   2 +-
 .../AssertWidgetAbsentOnFrontendHome.php      |   4 +-
 .../AssertWidgetCatalogCategoryLink.php       |   4 +-
 .../Constraint/AssertWidgetCmsPageLink.php    |   4 +-
 .../Test/Constraint/AssertWidgetInGrid.php    |   4 +-
 .../AssertWidgetOnFrontendInCatalog.php       |   4 +-
 .../Constraint/AssertWidgetOnProductPage.php  |   4 +-
 .../Constraint/AssertWidgetProductLink.php    |   4 +-
 .../AssertWidgetRecentlyViewedProducts.php    |   8 +-
 .../AssertWidgetSuccessDeleteMessage.php      |   8 +-
 .../AssertWidgetSuccessSaveMessage.php        |   8 +-
 .../Magento/Widget/Test/etc/constraint.xml    |  22 +--
 ...sertAddProductToWishlistSuccessMessage.php |   8 +-
 ...ertMoveProductToWishlistSuccessMessage.php |   8 +-
 .../AssertProductDetailsInWishlist.php        |   4 +-
 ...ProductInCustomerWishlistOnBackendGrid.php |   4 +-
 ...ductIsPresentInCustomerBackendWishlist.php |   4 +-
 .../AssertProductIsPresentInWishlist.php      |   4 +-
 .../AssertProductsIsAbsentInWishlist.php      |   4 +-
 .../Test/Constraint/AssertWishlistIsEmpty.php |   4 +-
 .../Constraint/AssertWishlistShareMessage.php |   8 +-
 .../Magento/Wishlist/Test/etc/constraint.xml  |  18 +-
 700 files changed, 2460 insertions(+), 2578 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMaxRequestedQtyFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMaxRequestedQtyFailMessage.php
index 2996a4cd985b9..e414c487ff46c 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMaxRequestedQtyFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMaxRequestedQtyFailMessage.php
@@ -17,6 +17,10 @@
  */
 class AssertMaxRequestedQtyFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Error requested quantity message
      */
@@ -27,10 +31,6 @@ class AssertMaxRequestedQtyFailMessage extends AbstractConstraint
      */
     const ERROR_MAXIMUM_QUANTITY_MESSAGE = 'The maximum quantity allowed for purchase is %d.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that requested quantity is more than allowed error message is displayed after adding products to cart
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMinRequestedQtyFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMinRequestedQtyFailMessage.php
index 62297f4c5edc6..b5c419f4f5412 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMinRequestedQtyFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMinRequestedQtyFailMessage.php
@@ -17,6 +17,10 @@
  */
 class AssertMinRequestedQtyFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Error requested quantity message
      */
@@ -27,10 +31,6 @@ class AssertMinRequestedQtyFailMessage extends AbstractConstraint
      */
     const ERROR_MINIMUM_QUANTITY_MESSAGE = 'The minimum quantity allowed for purchase is %d.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that requested quantity is less than allowed error message is displayed after adding products to cart
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMsrpNotice.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMsrpNotice.php
index af04083944f72..f9403d330bc83 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMsrpNotice.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertMsrpNotice.php
@@ -18,8 +18,8 @@
 class AssertMsrpNotice extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that notice is present that product with enabled MAP
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductConfiguringFromRequiringAttention.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductConfiguringFromRequiringAttention.php
index 9722b195ae86d..45e2ce59f00b5 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductConfiguringFromRequiringAttention.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductConfiguringFromRequiringAttention.php
@@ -18,15 +18,15 @@
  */
 class AssertProductConfiguringFromRequiringAttention extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success adding product to cart message
      */
     const SUCCESS_MESSAGE = 'You added %s to your shopping cart.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that product can be configured and added to cart after added this product to cart by sku
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductIsOutOfStockFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductIsOutOfStockFailMessage.php
index ab2c8955848f2..4ac827d53cde8 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductIsOutOfStockFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductIsOutOfStockFailMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertProductIsOutOfStockFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Out of stock error message
      */
     const ERROR_MESSAGE = 'Availability: Out of stock.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that out of stock error message is displayed after adding products to cart
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductRequiredAttentionFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductRequiredAttentionFailMessage.php
index f574ce336bcee..62f7546862a60 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductRequiredAttentionFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductRequiredAttentionFailMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertProductRequiredAttentionFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Product requires attention error message
      */
     const ERROR_MESSAGE = '%d %s requires your attention.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that product requires attention error message is displayed after adding products by sku to shopping cart
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductTierPriceMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductTierPriceMessage.php
index d564b0f7dcd06..f3eb491f72d6e 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductTierPriceMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductTierPriceMessage.php
@@ -18,8 +18,8 @@
 class AssertProductTierPriceMessage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product has tier price message appears after adding products by sku to shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductWithPaymentAgreementsOrderFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductWithPaymentAgreementsOrderFailMessage.php
index c82e66bfbac97..752846a99fe5b 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductWithPaymentAgreementsOrderFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductWithPaymentAgreementsOrderFailMessage.php
@@ -17,6 +17,10 @@
  */
 class AssertProductWithPaymentAgreementsOrderFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     // @codingStandardsIgnoreStart
     /**
      * Product with payment agreements can't be ordered with other items error message
@@ -24,10 +28,6 @@ class AssertProductWithPaymentAgreementsOrderFailMessage extends AbstractConstra
     const ERROR_MESSAGE = 'Sorry, but items with payment agreements must be ordered one at a time To continue, please remove or buy the other items in your cart, then order this item by itself.';
     // @codingStandardsIgnoreEnd
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that error message that product with payment agreements can't be ordered with other items is displayed
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAbsentInRequiringAttention.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAbsentInRequiringAttention.php
index f4ae9e635c95e..0014ef4ba7861 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAbsentInRequiringAttention.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAbsentInRequiringAttention.php
@@ -17,8 +17,8 @@
 class AssertProductsAbsentInRequiringAttention extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that products are absent in requiring attention block.
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAddBySkuSuccessMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAddBySkuSuccessMessage.php
index a63343a7a95a6..2cecc2570dea3 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAddBySkuSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertProductsAddBySkuSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertProductsAddBySkuSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success adding products to shopping cart message
      */
     const SUCCESS_MESSAGE = 'You added %d %s to your shopping cart.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after adding products by sku to shopping cart
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIncrementsFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIncrementsFailMessage.php
index 4508d9e3423e0..358b88949a360 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIncrementsFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIncrementsFailMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertQtyIncrementsFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Qty increments error message
      */
     const QTY_INCREMENTS_ERROR_MESSAGE = 'You can buy this product only in quantities of %d at a time.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that requested qty does not meet the increments error message is displayed after adding products to cart
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIsNotEnoughFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIsNotEnoughFailMessage.php
index 38b4e06312a56..31370228b81ee 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIsNotEnoughFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertQtyIsNotEnoughFailMessage.php
@@ -17,6 +17,10 @@
  */
 class AssertQtyIsNotEnoughFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Requested quantity is not available error message
      */
@@ -27,10 +31,6 @@ class AssertQtyIsNotEnoughFailMessage extends AbstractConstraint
      */
     const LEFT_IN_STOCK_ERROR_MESSAGE = 'Only %d left in stock';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that requested quantity is not available error message is displayed after adding products by sku to cart
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertRequiringAttentionProductSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertRequiringAttentionProductSuccessDeleteMessage.php
index cfaac09de7a7c..fc452a49fa3d2 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertRequiringAttentionProductSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertRequiringAttentionProductSuccessDeleteMessage.php
@@ -16,15 +16,15 @@
  */
 class AssertRequiringAttentionProductSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success delete message.
      */
     const SUCCESS_MESSAGE = 'You removed the item.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is present after requiring attention product has been deleted from cart.
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSkuNotFoundFailMessage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSkuNotFoundFailMessage.php
index 539e180355d34..0f44fb665bda9 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSkuNotFoundFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSkuNotFoundFailMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertSkuNotFoundFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Sku not found error message
      */
     const ERROR_MESSAGE = 'SKU not found in catalog.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that sku not found error message is displayed after adding products by sku to shopping cart
      *
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSpecifyProductOptionsLink.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSpecifyProductOptionsLink.php
index 0b959b8ce2a5d..759931eafe2eb 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSpecifyProductOptionsLink.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertSpecifyProductOptionsLink.php
@@ -18,8 +18,8 @@
 class AssertSpecifyProductOptionsLink extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that specify products options link is displayed after adding products to cart
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertWidgetOrderBySkuOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertWidgetOrderBySkuOnCategoryPage.php
index 1bb0ae1cb2102..6a206690009db 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertWidgetOrderBySkuOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/Constraint/AssertWidgetOrderBySkuOnCategoryPage.php
@@ -20,8 +20,8 @@
 class AssertWidgetOrderBySkuOnCategoryPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Order By Sku widget displayed on frontend in Catalog
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/etc/constraint.xml
index 7eca8f18f9233..f21f06b42203d 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/etc/constraint.xml
@@ -9,51 +9,51 @@
 -->
 <constraint>
     <assertProductsAddBySkuSuccessMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductsAddBySkuSuccessMessage>
     <assertProductRequiredAttentionFailMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductRequiredAttentionFailMessage>
     <assertProductIsOutOfStockFailMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductIsOutOfStockFailMessage>
     <assertQtyIsNotEnoughFailMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertQtyIsNotEnoughFailMessage>
     <assertSkuNotFoundFailMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSkuNotFoundFailMessage>
     <assertMinRequestedQtyFailMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertMinRequestedQtyFailMessage>
     <assertMaxRequestedQtyFailMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertMaxRequestedQtyFailMessage>
     <assertSpecifyProductOptionsLink module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSpecifyProductOptionsLink>
     <assertProductConfiguringFromRequiringAttention module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductConfiguringFromRequiringAttention>
     <assertQtyIncrementsFailMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertQtyIncrementsFailMessage>
     <assertProductTierPriceMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductTierPriceMessage>
     <assertProductWithPaymentAgreementsOrderFailMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductWithPaymentAgreementsOrderFailMessage>
     <assertMsrpNotice module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertMsrpNotice>
     <assertProductsAbsentInRequiringAttention module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductsAbsentInRequiringAttention>
     <assertRequiringAttentionProductSuccessDeleteMessage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertRequiringAttentionProductSuccessDeleteMessage>
     <assertWidgetOrderBySkuOnCategoryPage module="Magento_AdvancedCheckout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetOrderBySkuOnCategoryPage>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
index 9230d949fc9b5..d1bb7ff0fe1ee 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
@@ -19,8 +19,8 @@
 class AssertGlobalSearchCustomerName extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that customer name is present in search results
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
index 8e4eb022a8fe8..114417ef16499 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchNoRecordsFound.php
@@ -17,15 +17,15 @@
  */
 class AssertGlobalSearchNoRecordsFound extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Expected search result text
      */
     const EXPECTED_RESULT = 'No records found.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that search result contains expected text
      *
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
index 6ab3d9dd20258..b622d8d37e484 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchOrderId.php
@@ -19,8 +19,8 @@
 class AssertGlobalSearchOrderId extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that order Id is present in search results
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
index 46c3b53f542d4..a3546c92e72e1 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchProductName.php
@@ -20,8 +20,8 @@
 class AssertGlobalSearchProductName extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product name is present in search results
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml
index 89d3b70b678fd..6526043ef3667 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml
@@ -9,15 +9,15 @@
 -->
 <constraint>
     <assertGlobalSearchProductName module="Magento_Backend">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGlobalSearchProductName>
     <assertGlobalSearchOrderId module="Magento_Backend">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGlobalSearchOrderId>
     <assertGlobalSearchNoRecordsFound module="Magento_Backend">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGlobalSearchNoRecordsFound>
     <assertGlobalSearchCustomerName module="Magento_Backend">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGlobalSearchCustomerName>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php b/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
index c55d8b2ed113b..0c7bea588ea92 100644
--- a/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Backup/Test/Constraint/AssertBackupInGrid.php
@@ -18,8 +18,8 @@
 class AssertBackupInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that one backup row is present in Backups grid
diff --git a/dev/tests/functional/tests/app/Magento/Backup/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Backup/Test/etc/constraint.xml
index 43fb455c59434..037547a630803 100644
--- a/dev/tests/functional/tests/app/Magento/Backup/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Backup/Test/etc/constraint.xml
@@ -9,6 +9,6 @@
 -->
 <constraint>
     <assertBackupInGrid module="Magento_Backup">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBackupInGrid>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerDeleteMessage.php
index 074852210bc04..bec5d62affc06 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerDeleteMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertBannerDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'The banner has been deleted.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'The banner has been deleted.';
 
     /**
      * Assert that success delete message is appeared after banner has been deleted
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInGrid.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInGrid.php
index 4951371ea50ee..bae2cb59e9204 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInGrid.php
@@ -19,8 +19,8 @@
 class AssertBannerInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created banner is found by name and has correct banner types, visibility, status
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInShoppingCart.php
index 4f77933f59f6a..09d812184a9bb 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerInShoppingCart.php
@@ -24,8 +24,8 @@
 class AssertBannerInShoppingCart extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that banner presents on Shopping Cart page
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerMassDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerMassDeleteMessage.php
index e30b840474589..02d0e52cb7873 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerMassDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerMassDeleteMessage.php
@@ -18,15 +18,15 @@
  */
 class AssertBannerMassDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message that appears after deletion via mass actions
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted %d record(s).';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success delete message is appeared after banner has been deleted
      *
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCartRule.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCartRule.php
index 8fc8efefb975e..ac71e9a9cab4e 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCartRule.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCartRule.php
@@ -20,8 +20,8 @@
 class AssertBannerNotInCartRule extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted banner is absent on shopping cart rule creation page and can't be found by name
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCatalogRule.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCatalogRule.php
index e37640b20375f..55d83fdbb859a 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCatalogRule.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInCatalogRule.php
@@ -20,8 +20,8 @@
 class AssertBannerNotInCatalogRule extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted banner is absent on catalog rule creation page and can't be found by name
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInGrid.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInGrid.php
index fc3a55f8bade7..fe9877c591d01 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertBannerNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted banner is absent in grid and can't be found by name
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInShoppingCart.php
index eede1e1b2575b..5d767869d85c7 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInShoppingCart.php
@@ -24,8 +24,8 @@
 class AssertBannerNotInShoppingCart extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that banner is absent on Shopping Cart page
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInWidgetOptions.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInWidgetOptions.php
index e00979651b832..35239d79b369d 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInWidgetOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotInWidgetOptions.php
@@ -21,8 +21,8 @@
 class AssertBannerNotInWidgetOptions extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted banner is absent in Widget options bunnerGrid and can't be found by name
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotOnCategoryPage.php
index b9a9f67028847..35c0e3034532e 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerNotOnCategoryPage.php
@@ -22,8 +22,8 @@
 class AssertBannerNotOnCategoryPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that banner is absent on specific category page
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerOnCategoryPage.php
index 49b1b2fdb573b..a2dadafeb3e25 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerOnCategoryPage.php
@@ -22,8 +22,8 @@
 class AssertBannerOnCategoryPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that banner presents on specific category page
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerSuccessSaveMessage.php
index 3bea9ec322297..c2fb4d57118bd 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertBannerSuccessSaveMessage.php
@@ -18,11 +18,11 @@
  */
 class AssertBannerSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_SAVE_MESSAGE = 'You saved the banner.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_SAVE_MESSAGE = 'You saved the banner.';
 
     /**
      * Assert that after banner save "You saved the banner." successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotator.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotator.php
index 4d8dab2a72c59..ede40d7368659 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotator.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotator.php
@@ -20,8 +20,8 @@
 class AssertWidgetBannerRotator extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Banner Rotator widget displayed on frontent on Home page and on Advanced Search
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotatorOnProductPage.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotatorOnProductPage.php
index 73eead1a72fa0..a2c04e5c3e695 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotatorOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Constraint/AssertWidgetBannerRotatorOnProductPage.php
@@ -20,8 +20,8 @@
 class AssertWidgetBannerRotatorOnProductPage extends AssertWidgetOnProductPage
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Banner Rotator widget displayed on frontend on Product page
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Banner/Test/etc/constraint.xml
index ad823ade02280..5b2f98515ac5c 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/etc/constraint.xml
@@ -9,45 +9,45 @@
 -->
 <constraint>
     <assertBannerSuccessSaveMessage module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerSuccessSaveMessage>
     <assertBannerInGrid module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerInGrid>
     <assertBannerDeleteMessage module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerDeleteMessage>
     <assertBannerNotInGrid module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerNotInGrid>
     <assertBannerNotInCatalogRule module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerNotInCatalogRule>
     <assertBannerNotInCartRule module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerNotInCartRule>
     <assertBannerMassDeleteMessage module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerMassDeleteMessage>
     <assertBannerInShoppingCart module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerInShoppingCart>
     <assertBannerNotOnCategoryPage module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerNotOnCategoryPage>
     <assertBannerNotInShoppingCart module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerNotInShoppingCart>
     <assertBannerOnCategoryPage module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerOnCategoryPage>
     <assertBannerNotInWidgetOptions module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBannerNotInWidgetOptions>
     <assertWidgetBannerRotatorOnProductPage module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetBannerRotatorOnProductPage>
     <assertWidgetBannerRotator module="Magento_Banner">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetBannerRotator>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
index 18476bc018bb6..3defb36947dac 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleInCategory.php
@@ -20,8 +20,8 @@
 class AssertBundleInCategory extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Check bundle product on the category page
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
index d93b603f2c295..cd871b84bd908 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleItemsOnProductPage.php
@@ -20,8 +20,8 @@
 class AssertBundleItemsOnProductPage extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that displayed product bundle items data on product page equals passed from fixture preset
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
index 0bb2e389959e3..824f618b4bc85 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceType.php
@@ -20,8 +20,8 @@
 class AssertBundlePriceType extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Product price type
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
index 68b9ca3ea5dea..a716e162e1b5d 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundlePriceView.php
@@ -19,8 +19,8 @@
 class AssertBundlePriceView extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that displayed price view for bundle product on product page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductForm.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductForm.php
index 2be65c4d9c447..c1687d1e45941 100755
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertBundleProductForm.php
@@ -16,8 +16,8 @@
 class AssertBundleProductForm extends AssertProductForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Formatting options for array values
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
index 1d7c570f4a253..67d1eba2bc294 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Constraint/AssertTierPriceOnBundleProductPage.php
@@ -19,8 +19,8 @@
 class AssertTierPriceOnBundleProductPage extends AssertProductTierPriceOnProductPage
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Tier price block
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/constraint.xml
index b76886aa44ea6..f883658a4b948 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/etc/constraint.xml
@@ -9,7 +9,7 @@
 -->
 <constraint>
     <assertBundleInCategory module="Magento_Bundle">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -18,30 +18,30 @@
         </require>
     </assertBundleInCategory>
     <assertBundleItemsOnProductPage module="Magento_Bundle">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBundleItemsOnProductPage>
     <assertBundlePriceView module="Magento_Bundle">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBundlePriceView>
     <assertBundlePriceType module="Magento_Bundle">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBundlePriceType>
     <assertBundleProductForm module="Magento_Bundle">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBundleProductForm>
     <assertTierPriceOnBundleProductPage module="Magento_Bundle">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTierPriceOnBundleProductPage>
     <assertBundleProductPage module="Magento_Bundle">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBundleProductPage>
     <assertGroupedPriceOnBundleProductPage module="Magento_Bundle">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGroupedPriceOnBundleProductPage>
     <assertProductCustomOptionsOnBundleProductPage module="Magento_Bundle">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductCustomOptionsOnBundleProductPage>
     <assertBundleProductInCustomerWishlistOnBackendGrid module="Magento_Bundle">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBundleProductInCustomerWishlistOnBackendGrid>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
index 8fa8bb9c0da75..b3a6ebf173313 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAbsenceDeleteAttributeButton.php
@@ -18,8 +18,8 @@
 class AssertAbsenceDeleteAttributeButton extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that Delete Attribute button is absent for system attribute on attribute edit page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
index bfbc806a3d3f2..fe8c356afc2a4 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonAbsent.php
@@ -21,8 +21,8 @@
 class AssertAddToCartButtonAbsent extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Category Page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
index f3e33616771dc..3edcbf0702599 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddToCartButtonPresent.php
@@ -21,8 +21,8 @@
 class AssertAddToCartButtonPresent extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Category Page on Frontend
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
index 8b8df5b7276f2..3177be040d297 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
@@ -20,8 +20,8 @@
 class AssertAddedProductAttributeOnProductForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Add this attribute to Default attribute Template. Create product and Assert that created attribute
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
index acfb5aa0acc0d..cab14c7f0b00f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeForm.php
@@ -19,8 +19,8 @@
 class AssertAttributeForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that displayed attribute data on edit page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
index 7b4490b43ac21..20bc571282471 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeOptionsOnProductForm.php
@@ -16,8 +16,8 @@
 class AssertAttributeOptionsOnProductForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php
index cf4da661ad2df..6956277c5d265 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAttributeSearchableByLabel.php
@@ -16,8 +16,8 @@
 class AssertAttributeSearchableByLabel extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
index 6f8b02420c727..b8c2b8e18bc79 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnBackend.php
@@ -19,8 +19,8 @@
 class AssertCategoryAbsenceOnBackend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that not displayed category in backend catalog category tree
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
index 4e0e88b04e87c..3883a613914e5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryAbsenceOnFrontend.php
@@ -19,15 +19,15 @@
  */
 class AssertCategoryAbsenceOnFrontend extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message on the product page 404
      */
     const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that not displayed category in frontend main menu
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
index 54731c72293f3..df9c270fa3147 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForAssignedProducts.php
@@ -20,8 +20,8 @@
 class AssertCategoryForAssignedProducts extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that displayed assigned products on category page equals passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
index 3734f284491c6..db9fad07a25c8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryForm.php
@@ -16,8 +16,8 @@
 class AssertCategoryForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
index 578a994774d50..f786cdc821bd8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
@@ -19,11 +19,11 @@
  */
 class AssertCategoryIsNotActive extends AbstractConstraint
 {
-    const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
 
     /**
      * Assert that the category cannot be accessed from the navigation bar in the frontend
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
index 152a6f42a8972..3ff6632311aa0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotIncludeInMenu.php
@@ -21,8 +21,8 @@
 class AssertCategoryIsNotIncludeInMenu extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that the category is no longer available on the top menu bar
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
index c1da7f9815648..20c1bec63ca1e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
@@ -21,8 +21,8 @@
 class AssertCategoryPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that displayed category data on category page equals to passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
index 0947e5b0fed7b..b12bd86a61cf1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryRedirect.php
@@ -19,8 +19,8 @@
 class AssertCategoryRedirect extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that old Category URL lead to appropriate Category in frontend
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
index f186ee50e3aeb..b7e5a9c039209 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCategorySaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success category save message
      */
     const SUCCESS_MESSAGE = 'You saved the category.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after category save
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
index e7247a5055181..84603ded82eff 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategorySuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCategorySuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message that displayed after delete url rewrite
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the category.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that after delete a category "You deleted the category." successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
index a6838d254170b..02b1a8f450c90 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCrossSellsProductsSection.php
@@ -22,8 +22,8 @@
 class AssertCrossSellsProductsSection extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product is displayed in cross-sell section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
index 12ba03682e9ab..4506055be5dde 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoCrossSellsProductsSection.php
@@ -22,8 +22,8 @@
 class AssertNoCrossSellsProductsSection extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product is not displayed in cross-sell section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
index 390e3062422c0..26a6a5b8f06aa 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoRelatedProductsSection.php
@@ -21,8 +21,8 @@
 class AssertNoRelatedProductsSection extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product is not displayed in related products section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
index 42b48bbdc25c2..13b82dd752451 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertNoUpSellsProductsSection.php
@@ -21,8 +21,8 @@
 class AssertNoUpSellsProductsSection extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product is not displayed in up-sell section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
index 50c77bf0d6fea..92ef21f6a008b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInGrid.php
@@ -19,8 +19,8 @@
 class AssertProductAttributeAbsenceInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that after deleted product attribute cannot be found by attribute code.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
index 332b9c364b089..928573ed6bd35 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInSearchOnProductForm.php
@@ -20,8 +20,8 @@
 class AssertProductAttributeAbsenceInSearchOnProductForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that deleted attribute can't be added to product template on Product Page via Add Attribute control
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
index 7206ae64be3ae..020630f6e760e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInTemplateGroups.php
@@ -20,8 +20,8 @@
 class AssertProductAttributeAbsenceInTemplateGroups extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted attribute isn't displayed in Product template's Groups section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
index 5b18eb83021cd..46c696db27c62 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeAbsenceInUnassignedAttributes.php
@@ -20,8 +20,8 @@
 class AssertProductAttributeAbsenceInUnassignedAttributes extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted attribute isn't displayed in Product template's Unassigned Attributes section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
index 1b78df9632176..8a86c1cf6566c 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnFrontend.php
@@ -20,8 +20,8 @@
 class AssertProductAttributeDisplayingOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Check whether the attribute is visible on the frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
index e5553b73d747a..011688c966201 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeDisplayingOnSearchForm.php
@@ -18,8 +18,8 @@
 class AssertProductAttributeDisplayingOnSearchForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Check whether attribute is displayed in the advanced search form on the frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
index 50f8a0714b061..5cf1635b716e4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeInGrid.php
@@ -19,8 +19,8 @@
 class AssertProductAttributeInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created product attribute is found in grid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
index 79d7f510154ca..b396db5a207fa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsComparable.php
@@ -21,8 +21,8 @@
 class AssertProductAttributeIsComparable extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Check whether there is an opportunity to compare products using given attribute.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
index 694bac5e96dcf..a1ac4911b6f14 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
@@ -20,8 +20,8 @@
 class AssertProductAttributeIsFilterable extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Check whether the attribute filter is displayed on the frontend in Layered navigation.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
index cec8b4da2e340..1627731bbd7df 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterableInSearch.php
@@ -20,8 +20,8 @@
 class AssertProductAttributeIsFilterableInSearch extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Check out if the attribute in the navigation bar on the search results page in Layered navigation.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
index ab1a5c31d5da9..8823e1f34b124 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsGlobal.php
@@ -18,8 +18,8 @@
 class AssertProductAttributeIsGlobal extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Look on the scope of product attribute in the grid.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
index a39f0956f3fdd..d002230c55fea 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsHtmlAllowed.php
@@ -20,8 +20,8 @@
 class AssertProductAttributeIsHtmlAllowed extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Check whether html tags are using in attribute value.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
index 7fbc9b1edddb6..ff46ec99eb9f0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php
@@ -19,15 +19,15 @@
  */
 class AssertProductAttributeIsRequired extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Expected message.
      */
     const REQUIRE_MESSAGE = 'This is a required field.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Check whether the attribute is mandatory.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
index 3db2761494474..cf538bb64822b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
@@ -20,15 +20,15 @@
  */
 class AssertProductAttributeIsUnique extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Expected message.
      */
     const UNIQUE_MESSAGE = 'The value of attribute "%s" must be unique';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Check whether the attribute is unique.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
index f2179b88dc044..e378a0abfc2ef 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedInSortOnFrontend.php
@@ -20,8 +20,8 @@
 class AssertProductAttributeIsUsedInSortOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that attribute present in sort dropdown on search results page on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
index fa1f5a6629999..ccf523448faaa 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUsedPromoRules.php
@@ -16,8 +16,8 @@
 class AssertProductAttributeIsUsedPromoRules extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
index 9dbabf2585555..45210ac4b4db5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertProductAttributeSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You saved the product attribute.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You saved the product attribute.';
 
     /**
      * Assert that message "You saved the product attribute." is present on Attribute page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
index ef33451fffda2..642defdfe9f7e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeSuccessDeleteMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertProductAttributeSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The product attribute has been deleted.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The product attribute has been deleted.';
 
     /**
      * Assert that message "The product attribute has been deleted." is present on Attribute page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
index 32ada5406e362..67a6f98da3017 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareBlockOnCmsPage.php
@@ -19,8 +19,8 @@
 class AssertProductCompareBlockOnCmsPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Compare Products block is presented on CMS pages.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
index 4371bcb265c2f..8a0b711f2cee3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLink.php
@@ -17,8 +17,8 @@
 class AssertProductCompareItemsLink extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that link "Compare Products..." on top menu of page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
index 300030b22f7d7..049538f81ec5a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareItemsLinkIsAbsent.php
@@ -17,8 +17,8 @@
 class AssertProductCompareItemsLinkIsAbsent extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert compare products link is NOT visible at the top of page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
index e30c305c21ab0..78398d201fe91 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductComparePage.php
@@ -19,8 +19,8 @@
 class AssertProductComparePage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Product attribute on compare product page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
index 923985f4f1f55..d011f2a4b8ddc 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareRemoveLastProductMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertProductCompareRemoveLastProductMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You have no items to compare.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You have no items to compare.';
 
     /**
      * After removing last product message is appeared on "Compare Products" page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
index ccad8eeccaa9d..064a532f9c7d1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessAddMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertProductCompareSuccessAddMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You added product %s to the comparison list.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You added product %s to the comparison list.';
 
     /**
      * Assert success message is presented on page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
index c678036d9fc34..59be99201558d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveAllProductsMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertProductCompareSuccessRemoveAllProductsMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You cleared the comparison list.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You cleared the comparison list.';
 
     /**
      * Assert message is appeared on "Compare Products" page.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
index 9616fe1f312c0..51fc19e571822 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCompareSuccessRemoveMessage.php
@@ -18,11 +18,11 @@
  */
 class AssertProductCompareSuccessRemoveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You removed product %s from the comparison list.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You removed product %s from the comparison list.';
 
     /**
      * Assert message is appeared on "Compare Products" block on myAccount page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
index d40ab5c73c3b6..d238063fb6cac 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductCustomOptionsOnProductPage.php
@@ -20,8 +20,8 @@
 class AssertProductCustomOptionsOnProductPage extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Skipped field for custom options
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
index 714c311265ebb..79d041427608d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateForm.php
@@ -17,6 +17,10 @@
  */
 class AssertProductDuplicateForm extends AssertProductForm
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Formatting options for numeric values.
      *
@@ -40,13 +44,6 @@ class AssertProductDuplicateForm extends AssertProductForm
         ]
     ];
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert form data equals fixture data.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php
index 01abb27bf6f58..3892ef0557dd8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateIsNotDisplayingOnFrontend.php
@@ -16,8 +16,8 @@
 class AssertProductDuplicateIsNotDisplayingOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that product duplicate is not displayed on front-end
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
index 38b7766a94017..b3809aa12c1fd 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicateMessage.php
@@ -16,15 +16,15 @@
  */
 class AssertProductDuplicateMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const DUPLICATE_MESSAGE = 'You duplicated the product.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Checking the output message successful product duplication
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
index 9f832af675316..b37458903df5b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductDuplicatedInGrid.php
@@ -18,8 +18,8 @@
 class AssertProductDuplicatedInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that duplicated product is found by sku and has correct product type, product template,
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
index 179ae602aae54..f92f3ec6033d3 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductForm.php
@@ -18,6 +18,10 @@
  */
 class AssertProductForm extends AbstractAssertForm
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * List skipped fixture fields in verify
      *
@@ -47,10 +51,6 @@ class AssertProductForm extends AbstractAssertForm
      */
     protected $specialArray = [];
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert form data equals fixture data
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
index 300444f9c5789..44737d1638077 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductGroupedPriceOnProductPage.php
@@ -20,8 +20,8 @@
 class AssertProductGroupedPriceOnProductPage extends AbstractConstraint implements AssertPriceOnProductPageInterface
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Error message
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
index 860b50afaa272..3b158ed18723c 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCart.php
@@ -22,8 +22,8 @@
 class AssertProductInCart extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assertion that the product is correctly displayed in cart
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
index 4ad261bdb7b33..b372bb83320a9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInCategory.php
@@ -20,8 +20,8 @@
 class AssertProductInCategory extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Checking the product in the page of its price
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
index b424ac6520ae6..f1515ea0263eb 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInGrid.php
@@ -19,8 +19,8 @@
 class AssertProductInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Product fixture
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
index fa09690b08e12..f6be4eac690f5 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductInStock.php
@@ -19,8 +19,8 @@
 class AssertProductInStock extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Text value for checking Stock Availability
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
index cb84eba7cfe55..86f3a3d30c5a0 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotDisplayingOnFrontend.php
@@ -22,15 +22,15 @@
  */
 class AssertProductIsNotDisplayingOnFrontend extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message on the product page 404
      */
     const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Product view page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
index e7cd4b75e57c3..5c900e2b61b11 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInCompareBlock.php
@@ -19,11 +19,11 @@
  */
 class AssertProductIsNotVisibleInCompareBlock extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You have no items to compare.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You have no items to compare.';
 
     /**
      * Assert the product is not displayed on Compare Products block on my account page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
index e150e574b4957..3c74fd1872f15 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductIsNotVisibleInComparePage.php
@@ -18,11 +18,11 @@
  */
 class AssertProductIsNotVisibleInComparePage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You have no items to compare.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You have no items to compare.';
 
     /**
      * Assert the product is not displayed on Compare Products page
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
index f46222edbb87c..18ddc83a3cb4f 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertProductNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product cannot be found by name and sku
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
index 9854b09e799ba..e73338027d7b3 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotSearchableBySku.php
@@ -20,8 +20,8 @@
 class AssertProductNotSearchableBySku extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product cannot be found via Quick Search using searchable product attributes.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
index f8b3ee54e0a1f..0a2e9db38fcf6 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNotVisibleInCategory.php
@@ -20,8 +20,8 @@
 class AssertProductNotVisibleInCategory extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product is not visible in the assigned category
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
index c96f80b1b7b58..e21e8588591e0 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductOutOfStock.php
@@ -19,8 +19,8 @@
 class AssertProductOutOfStock extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Text value for checking Stock Availability
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
index 2de4c1a970b6a..64a4b5518b631 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductPage.php
@@ -21,6 +21,10 @@
  */
 class AssertProductPage extends AbstractAssertForm
 {
+    /* tags */
+    const SEVERITY = 'middle';
+    /* end tags */
+
     /**
      * Product view block on frontend page
      *
@@ -35,10 +39,6 @@ class AssertProductPage extends AbstractAssertForm
      */
     protected $product;
 
-    /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
-
     /**
      * Assert that displayed product data on product page(front-end) equals passed from fixture:
      * 1. Product Name
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
index 982108c546e82..668b4ca0958bf 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSaveMessage.php
@@ -16,15 +16,15 @@
  */
 class AssertProductSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = 'You saved the product.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after product save
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
index b338aa050ad9d..7670379dda1b2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSearchableBySku.php
@@ -19,8 +19,8 @@
 class AssertProductSearchableBySku extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Displays an error message
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSimpleDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSimpleDuplicateForm.php
index a71ad6396f8b3..119ec0e0c252d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSimpleDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSimpleDuplicateForm.php
@@ -15,6 +15,6 @@
 class AssertProductSimpleDuplicateForm extends AssertProductDuplicateForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
index 069b77fbbeccd..466e9d9ffa250 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSkuAutoGenerated.php
@@ -18,8 +18,8 @@
 class AssertProductSkuAutoGenerated extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Asserts that SKU successfully generated
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
index 5337189b04c7b..414557ca46221 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSpecialPriceOnProductPage.php
@@ -20,8 +20,8 @@
 class AssertProductSpecialPriceOnProductPage extends AbstractConstraint implements AssertPriceOnProductPageInterface
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Error message
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
index 1df91d15cf8f6..fce177c760ef5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertProductSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_DELETE_MESSAGE = 'A total of %d record(s) have been deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that after deleting product success message.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
index 057114b7d20fc..bede8ecb8132e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateForm.php
@@ -21,8 +21,8 @@
 class AssertProductTemplateForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that after save a product template on edit product set page displays:
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
index c20569a064b98..6ec41ad93d6ab 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
@@ -25,8 +25,8 @@
 class AssertProductTemplateGroupOnProductForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that created product template:
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
index 5cb58e4f837a4..7d62684c4e69c 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateInGrid.php
@@ -19,8 +19,8 @@
 class AssertProductTemplateInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that new product template displays in Product Templates grid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php
index 9b1eee9449961..2b747313fb8b0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertProductTemplateNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product template is not displayed in Product Templates grid
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
index d8dde28e22292..0511561825a24 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateOnProductForm.php
@@ -24,8 +24,8 @@
 class AssertProductTemplateOnProductForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that created product template:
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php
index 88ae4b940f3ac..144b7e30369d0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertProductTemplateSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_DELETE_MESSAGE = 'The attribute set has been removed.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after deleting product template success delete message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
index 5e48fd4b1e438..730290b0ade0b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertProductTemplateSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = 'You saved the attribute set.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after save a product template "You saved the attribute set." successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
index 6072e792dfaba..ca9c0fa511a77 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceOnProductPage.php
@@ -20,8 +20,8 @@
 class AssertProductTierPriceOnProductPage extends AbstractConstraint implements AssertPriceOnProductPageInterface
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Error message
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
index ee0a12a3231ae..fb09b611d26df 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductView.php
@@ -21,8 +21,8 @@
 class AssertProductView extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * @param CatalogProductView $catalogProductView
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
index 936a6f9e8ce88..d2ffb7f65526a 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductVisibleInCategory.php
@@ -20,8 +20,8 @@
 class AssertProductVisibleInCategory extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Displays an error message
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
index 9e939a5fd3b9f..ce01254b46494 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertRelatedProductsSection.php
@@ -21,8 +21,8 @@
 class AssertRelatedProductsSection extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product is displayed in related products section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
index 418ad5b363d3d..bf53a9c41f431 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUpSellsProductsSection.php
@@ -21,8 +21,8 @@
 class AssertUpSellsProductsSection extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product is displayed in up-sell section
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
index 922eb32d0f7d4..0fb5ffb32a4db 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertUsedSuperAttributeImpossibleDeleteMessages.php
@@ -17,15 +17,15 @@
  */
 class AssertUsedSuperAttributeImpossibleDeleteMessages extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Impossible to delete message
      */
     const ERROR_DELETE_MESSAGE = 'This attribute is used in configurable products.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that it's impossible to delete configurable attribute that is used in created configurable product
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml
index a917ae777dfd7..6a533ef793b55 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml
@@ -9,34 +9,34 @@
 -->
 <constraint>
     <assertProductInGrid module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductInGrid>
     <assertProductSaveMessage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <productPage class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit" />
         </require>
     </assertProductSaveMessage>
     <assertProductOutOfStock module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductOutOfStock>
     <assertProductInStock module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductInStock>
     <assertProductVisibleInCategory module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -45,7 +45,7 @@
         </require>
     </assertProductVisibleInCategory>
     <assertProductNotVisibleInCategory module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -54,7 +54,7 @@
         </require>
     </assertProductNotVisibleInCategory>
     <assertProductSearchableBySku module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogSearchResult class="Magento\CatalogSearch\Test\Page\CatalogsearchResult" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -62,7 +62,7 @@
         </require>
     </assertProductSearchableBySku>
     <assertProductInCategory module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -71,7 +71,7 @@
         </require>
     </assertProductInCategory>
     <assertProductInCart module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
             <product class="Mtf\Fixture\FixtureInterface" />
@@ -79,55 +79,55 @@
         </require>
     </assertProductInCart>
     <assertProductPage module="Magento_Catalog">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductPage>
     <assertProductGroupedPriceOnProductPage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductGroupedPriceOnProductPage>
     <assertProductSpecialPriceOnProductPage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductSpecialPriceOnProductPage>
     <assertProductTierPriceOnProductPage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductTierPriceOnProductPage>
     <assertProductCustomOptionsOnProductPage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductCustomOptionsOnProductPage>
     <assertProductForm module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductForm>
     <assertAddToCartButtonAbsent module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAddToCartButtonAbsent>
     <assertAddToCartButtonPresent module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAddToCartButtonPresent>
     <assertProductIsNotDisplayingOnFrontend module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -138,33 +138,33 @@
         </require>
     </assertProductIsNotDisplayingOnFrontend>
     <assertProductSkuAutoGenerated module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductSkuAutoGenerated>
     <assertProductGroupedPriceOnProductPage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView"  />
             <product class="Mtf\Fixture\FixtureInterface" />
         </require>
     </assertProductGroupedPriceOnProductPage>
     <assertProductAttributeSaveMessage module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <attributeIndex class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeIndex" />
         </require>
     </assertProductAttributeSaveMessage>
     <assertProductAttributeInGrid module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeInGrid>
     <assertAttributeForm module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAttributeForm>
     <assertAddedProductAttributeOnProductForm module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <productTemplate class="Magento\Catalog\Test\Fixture\CatalogProductTemplate" />
             <attribute class="Magento\Catalog\Test\Fixture\CatalogProductAttribute" />
@@ -177,46 +177,46 @@
         </require>
     </assertAddedProductAttributeOnProductForm>
     <assertProductAttributeIsRequired module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeIsRequired>
     <assertAttributeSearchableByLabel module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAttributeSearchableByLabel>
     <assertProductAttributeIsUnique module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeIsUnique>
     <assertProductAttributeDisplayingOnSearchForm module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeDisplayingOnSearchForm>
     <assertProductAttributeIsComparable module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeIsComparable>
     <assertProductAttributeDisplayingOnFrontend module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeDisplayingOnFrontend>
     <assertProductAttributeIsHtmlAllowed module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeIsHtmlAllowed>
     <assertProductAttributeIsFilterable module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeIsFilterable>
     <assertProductAttributeIsFilterableInSearch module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeIsFilterableInSearch>
     <assertAttributeOptionsOnProductForm module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAttributeOptionsOnProductForm>
     <assertProductAttributeIsUsedPromoRules module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeIsUsedPromoRules>
     <assertProductAttributeIsUsedInSortOnFrontend module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeIsUsedInSortOnFrontend>
     <assertProductAttributeIsGlobal module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeIsGlobal>
     <assertCrossSellsProductsSection module="Magento_Catalog">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
         <require>
             <product1 class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
             <product2 class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
@@ -227,13 +227,13 @@
         </require>
     </assertCrossSellsProductsSection>
     <assertProductAttributeSuccessDeleteMessage module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductAttributeSuccessDeleteMessage>
     <assertNoCrossSellsProductsSection module="Magento_Catalog">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertNoCrossSellsProductsSection>
     <assertRelatedProductsSection module="Magento_Catalog">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
         <require>
             <product1 class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
             <product2 class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
@@ -243,13 +243,13 @@
         </require>
     </assertRelatedProductsSection>
     <assertProductAttributeAbsenceInGrid module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductAttributeAbsenceInGrid>
     <assertNoRelatedProductsSection module="Magento_Catalog">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertNoRelatedProductsSection>
     <assertUpSellsProductsSection module="Magento_Catalog">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
         <require>
             <product1 class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
             <product2 class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
@@ -259,37 +259,37 @@
         </require>
     </assertUpSellsProductsSection>
     <assertProductAttributeAbsenceInSearchOnProductForm module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductAttributeAbsenceInSearchOnProductForm>
     <assertNoUpSellsProductsSection module="Magento_Catalog">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertNoUpSellsProductsSection>
     <assertCategorySaveMessage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCategorySaveMessage>
     <assertCategoryForm module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCategoryForm>
     <assertCategoryPage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCategoryPage>
     <assertCategoryForAssignedProducts module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCategoryForAssignedProducts>
     <assertCategoryIsNotActive module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCategoryIsNotActive>
     <assertCategoryIsNotIncludeInMenu module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCategoryIsNotIncludeInMenu>
     <assertCategorySuccessDeleteMessage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <categoryEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit" />
         </require>
     </assertCategorySuccessDeleteMessage>
     <assertCategoryAbsenceOnFrontend module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <browser class="Mtf\Client\Browser" />
             <categoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
@@ -297,20 +297,20 @@
         </require>
     </assertCategoryAbsenceOnFrontend>
     <assertCategoryAbsenceOnBackend module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <category class="Magento\Catalog\Test\Fixture\CatalogCategory" />
             <catalogCategoryIndex class="Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex" />
         </require>
     </assertCategoryAbsenceOnBackend>
     <assertProductTemplateSuccessSaveMessage module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <productSetIndex class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex" />
         </require>
     </assertProductTemplateSuccessSaveMessage>
     <assertProductTemplateForm module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <productSet class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex" />
             <productSetEdit class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetEdit" />
@@ -319,14 +319,14 @@
         </require>
     </assertProductTemplateForm>
     <assertProductTemplateInGrid module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <productSet class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductSetIndex" />
             <attributeSet class="Magento\Catalog\Test\Fixture\CatalogAttributeSet" />
         </require>
     </assertProductTemplateInGrid>
     <assertProductTemplateOnProductForm module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <fixtureFactory class="Mtf\Fixture\FixtureFactory" />
             <attributeSet class="Magento\Catalog\Test\Fixture\CatalogAttributeSet" />
@@ -337,109 +337,109 @@
         </require>
     </assertProductTemplateOnProductForm>
     <assertAbsenceDeleteAttributeButton module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <attributeNew class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew" />
         </require>
     </assertAbsenceDeleteAttributeButton>
     <assertProductSuccessDeleteMessage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductSuccessDeleteMessage>
     <assertProductNotInGrid module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductNotInGrid>
     <assertProductCompareItemsLink module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductCompareItemsLink>
     <assertProductComparePage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductComparePage>
     <assertProductCompareBlockOnCmsPage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductCompareBlockOnCmsPage>
     <assertProductCompareSuccessAddMessage module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductCompareSuccessAddMessage>
     <assertProductCompareSuccessRemoveMessage module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductCompareSuccessRemoveMessage>
     <assertProductCompareSuccessRemoveAllProductsMessage module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductCompareSuccessRemoveAllProductsMessage>
     <assertProductCompareItemsLinkIsAbsent module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductCompareItemsLinkIsAbsent>
     <assertProductCompareRemoveLastProductMessage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductCompareRemoveLastProductMessage>
     <assertProductIsNotVisibleInCompareBlock module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductIsNotVisibleInCompareBlock>
     <assertProductCompareSuccessRemoveMessage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductCompareSuccessRemoveMessage>
     <assertProductIsNotVisibleInComparePage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductIsNotVisibleInComparePage>
     <assertProductAttributeAbsenceInTemplateGroups module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeAbsenceInTemplateGroups>
     <assertProductAttributeAbsenceInUnassignedAttributes module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeAbsenceInUnassignedAttributes>
     <assertProductDuplicateMessage module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <productPage class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit" />
         </require>
     </assertProductDuplicateMessage>
     <assertProductDuplicatedInGrid module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <product class="Mtf\Fixture\FixtureInterface" />
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
         </require>
     </assertProductDuplicatedInGrid>
     <assertProductDuplicateIsNotDisplayingOnFrontend module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductDuplicateIsNotDisplayingOnFrontend>
     <assertProductDuplicateForm module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductDuplicateForm>
     <assertProductForm module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductForm>
     <assertProductTemplateGroupOnProductForm module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductTemplateGroupOnProductForm>
     <assertProductCompareSuccessRemoveAllProductsMessage module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductCompareSuccessRemoveAllProductsMessage>
     <assertProductCompareItemsLinkIsAbsent module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductCompareItemsLinkIsAbsent>
     <assertProductCompareRemoveLastProductMessage module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductCompareRemoveLastProductMessage>
     <assertProductIsNotVisibleInCompareBlock module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductIsNotVisibleInCompareBlock>
     <assertUsedSuperAttributeImpossibleDeleteMessages module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <newPage class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductAttributeNew" />
         </require>
     </assertUsedSuperAttributeImpossibleDeleteMessages>
     <assertProductTemplateSuccessDeleteMessage module="Magento_Catalog">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductTemplateSuccessDeleteMessage>
     <assertProductTemplateNotInGrid module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductTemplateNotInGrid>
     <assertProductNotSearchableBySku module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductNotSearchableBySku>
     <assertCategoryRedirect module="Magento_Catalog">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCategoryRedirect>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockAbsent.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockAbsent.php
index 7c2a3bffe6606..44b0000432795 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockAbsent.php
@@ -21,8 +21,8 @@
 class AssertCatalogEventBlockAbsent extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Category Page on Frontend
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockVisible.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockVisible.php
index 01f51e6b5a87a..c7247b0e83eaa 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockVisible.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventBlockVisible.php
@@ -22,8 +22,8 @@
 class AssertCatalogEventBlockVisible extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Category Page on Frontend
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php
index 11182211ab297..508969a7559b2 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php
@@ -20,8 +20,8 @@
 class AssertCatalogEventInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Catalog Event fixture
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsClosed.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsClosed.php
index 352dd50d1386e..54caa8eac9d14 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsClosed.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsClosed.php
@@ -15,8 +15,8 @@
 class AssertCatalogEventIsClosed extends AssertCatalogEventStatus
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Event status 'Closed' on category/product pages
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsOpen.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsOpen.php
index 1675bc6d63ca3..3146370907cb2 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsOpen.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsOpen.php
@@ -15,8 +15,8 @@
 class AssertCatalogEventIsOpen extends AssertCatalogEventStatus
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Event status 'Sale Ends In' on category/product pages
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsUpcoming.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsUpcoming.php
index ec9dbaccd2adf..83c65d5b9779f 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsUpcoming.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventIsUpcoming.php
@@ -15,8 +15,8 @@
 class AssertCatalogEventIsUpcoming extends AssertCatalogEventStatus
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Event status 'Coming Soon' on category/product pages
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventStatus.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventStatus.php
index 93d21be44a026..2714499e60ca2 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventStatus.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventStatus.php
@@ -22,8 +22,8 @@
 abstract class AssertCatalogEventStatus extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Catalog Event status
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessCreateMessage.php
index b0444e5af1b25..6eb19ff08420e 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessCreateMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCatalogEventSuccessCreateMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You saved the event.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You saved the event.';
 
     /**
      * Assert that message "You saved the event." is present on Event page
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessDeleteMessage.php
index dc9f4082dcbf8..b2f2d31eb44c7 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventSuccessDeleteMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCatalogEventSuccessDeleteMessage extends AbstractConstraint
 {
-    const DELETE_MESSAGE = 'You deleted the event.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const DELETE_MESSAGE = 'You deleted the event.';
 
     /**
      * Assert that message "You deleted the event." is present on Event page
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertWidgetCatalogEvent.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertWidgetCatalogEvent.php
index 14bacb29eeb3f..3cf0cbd08f84c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertWidgetCatalogEvent.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertWidgetCatalogEvent.php
@@ -22,8 +22,8 @@
 class AssertWidgetCatalogEvent extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that widget catalog event carousel is present on category page and link "Go To Sale" on widget redirects
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/etc/constraint.xml
index f4c95b81e6ff1..02a169403e611 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/etc/constraint.xml
@@ -11,20 +11,20 @@
 
 <constraint>
     <assertCatalogEventSuccessCreateMessage module="Magento_CatalogEvent">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <adminCatalogEventIndex class="Magento\CatalogEvent\Test\Page\Adminhtml\CatalogEventIndex" />
         </require>
     </assertCatalogEventSuccessCreateMessage>
     <assertCatalogEventInGrid module="Magento_CatalogEvent">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductSimple class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
             <catalogEventEntity class="Magento\CatalogEvent\Test\Fixture\CatalogEventEntity" />
         </require>
     </assertCatalogEventInGrid>
     <assertCatalogEventIsClosed module="Magento_CatalogEvent">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
@@ -34,7 +34,7 @@
         </require>
     </assertCatalogEventIsClosed>
     <assertCatalogEventBlockVisible module="Magento_CatalogEvent">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
@@ -44,7 +44,7 @@
         </require>
     </assertCatalogEventBlockVisible>
     <assertCatalogEventIsUpcoming module="Magento_CatalogEvent">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
@@ -54,7 +54,7 @@
         </require>
     </assertCatalogEventIsUpcoming>
     <assertCatalogEventIsOpen module="Magento_CatalogEvent">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
@@ -64,19 +64,19 @@
         </require>
     </assertCatalogEventIsOpen>
     <assertCatalogEventSuccessDeleteMessage module="Magento_CatalogEvent">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <adminCatalogEventIndex class="Magento\CatalogEvent\Test\Page\Adminhtml\CatalogEventIndex" />
         </require>
     </assertCatalogEventSuccessDeleteMessage>
     <assertCatalogEventSuccessDeleteMessage module="Magento_CatalogEvent">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <adminCatalogEventIndex class="Magento\CatalogEvent\Test\Page\Adminhtml\CatalogEventIndex" />
         </require>
     </assertCatalogEventSuccessDeleteMessage>
     <assertCatalogEventBlockAbsent module="Magento_CatalogEvent">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
@@ -85,6 +85,6 @@
         </require>
     </assertCatalogEventBlockAbsent>
     <assertWidgetCatalogEvent module="Magento_CatalogEvent">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetCatalogEvent>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
index e5a4eaf6f9800..35dc192b9dbaf 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedCatalogPage.php
@@ -19,8 +19,8 @@
 class AssertCatalogPriceRuleAppliedCatalogPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that Catalog Price Rule is applied for product(s) in Catalog
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
index 8bc4c8d814427..41fb9f9dcd634 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedProductPage.php
@@ -20,8 +20,8 @@
 class AssertCatalogPriceRuleAppliedProductPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that Catalog Price Rule is applied & it impacts on product's discount price on Product page
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
index daf59878f2141..90670ae10e7f4 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleAppliedShoppingCart.php
@@ -21,8 +21,8 @@
 class AssertCatalogPriceRuleAppliedShoppingCart extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that Catalog Price Rule is applied for product(s) in Shopping Cart
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
index 66d71eea9dd2e..568e209b26582 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleForm.php
@@ -19,8 +19,8 @@
 class AssertCatalogPriceRuleForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that displayed Catalog Price Rule data on edit page equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
index 21ea726e51e93..ee6a9260782f4 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleInGrid.php
@@ -18,8 +18,8 @@
 class AssertCatalogPriceRuleInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that data in grid on Catalog Price Rules page according to fixture
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
index 57d7caf17b339..49031295028be 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertCatalogPriceRuleNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Catalog Price Rule is not presented in grid and cannot be found using ID, Rule name
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
index d8e8a0b39dfc7..5461032a4d92a 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleNoticeMessage.php
@@ -16,13 +16,13 @@
  */
 class AssertCatalogPriceRuleNoticeMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     const NOTICE_MESSAGE_RULES = 'There are rules that have been changed but were not applied.';
     const NOTICE_MESSAGE_APPLY = ' Please, click Apply Rules in order to see immediate effect in the catalog.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that message "There are rules that have been changed but were not applied..."
      * is present on page after Save (without applying Rule)
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
index 9110f8207185a..1cde801599281 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCatalogPriceRuleSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'The rule has been deleted.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'The rule has been deleted.';
 
     /**
      * Assert that message "The rule has been deleted." is appeared on Catalog Price Rules page.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
index 54f65e29794a6..416deb217a022 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Constraint/AssertCatalogPriceRuleSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCatalogPriceRuleSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The rule has been saved.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The rule has been saved.';
 
     /**
      * Assert that success message is displayed after Catalog Price Rule saved
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/constraint.xml
index 8d689e94dddfd..9452cb18956ec 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/etc/constraint.xml
@@ -9,13 +9,13 @@
 -->
 <constraint>
     <assertCatalogPriceRuleSuccessSaveMessage module="Magento_CatalogRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <pageCatalogRuleIndex class="Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex"/>
         </require>
     </assertCatalogPriceRuleSuccessSaveMessage>
     <assertCatalogPriceRuleForm module="Magento_CatalogRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogPriceRule class="Magento\CatalogRule\Test\Fixture\CatalogRule"/>
             <pageCatalogRuleIndex class="Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex"/>
@@ -23,20 +23,20 @@
         </require>
     </assertCatalogPriceRuleForm>
     <assertCatalogPriceRuleInGrid module="Magento_CatalogRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogPriceRule class="Magento\CatalogRule\Test\Fixture\CatalogRule"/>
             <pageCatalogRuleIndex class="Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex"/>
         </require>
     </assertCatalogPriceRuleInGrid>
     <assertCatalogPriceRuleNoticeMessage module="Magento_CatalogRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <pageCatalogRuleIndex class="Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex"/>
         </require>
     </assertCatalogPriceRuleNoticeMessage>
     <assertCatalogPriceRuleAppliedProductPage module="Magento_CatalogRule">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex"/>
             <product class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
@@ -45,20 +45,20 @@
         </require>
     </assertCatalogPriceRuleAppliedProductPage>
     <assertCatalogPriceRuleSuccessDeleteMessage module="Magento_CatalogRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <pageCatalogRuleIndex class="Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex"/>
         </require>
     </assertCatalogPriceRuleSuccessDeleteMessage>
     <assertCatalogPriceRuleNotInGrid module="Magento_CatalogRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogPriceRule class="Magento\CatalogRule\Test\Fixture\CatalogRule"/>
             <pageCatalogRuleIndex class="Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex"/>
         </require>
     </assertCatalogPriceRuleNotInGrid>
     <assertCatalogPriceRuleAppliedCatalogPage module="Magento_CatalogRule">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex"/>
             <product class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
@@ -66,7 +66,7 @@
         </require>
     </assertCatalogPriceRuleAppliedCatalogPage>
     <assertCatalogPriceRuleAppliedShoppingCart module="Magento_CatalogRule">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex"/>
             <product class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
index eddbd39029c69..c8fa10182857e 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertAdvancedSearchProductsResult.php
@@ -17,6 +17,10 @@
  */
 class AssertAdvancedSearchProductsResult extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text for notice messages
      */
@@ -27,10 +31,6 @@ class AssertAdvancedSearchProductsResult extends AbstractConstraint
      */
     const ERROR_MESSAGE = 'No items were found using the following search criteria.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Search results page
      *
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
index cbf5cce957c10..d2093ef2587af 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResult.php
@@ -18,8 +18,8 @@
 class AssertCatalogSearchResult extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that result page contains all products, according to search request, from fixture
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
index 4c700eb651fcd..8438484f01c7d 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymMassActionNotOnFrontend.php
@@ -20,8 +20,8 @@
 class AssertSearchSynonymMassActionNotOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that you will be not redirected to url from dataset after mass delete search term
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
index 3f57d051da8f6..c8829adbecef8 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchSynonymNotOnFrontend.php
@@ -20,8 +20,8 @@
 class AssertSearchSynonymNotOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that you will be not redirected to url from dataset
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
index aa8b3e10d0c7a..d6452ca3fcc68 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermForm.php
@@ -20,8 +20,8 @@
 class AssertSearchTermForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that after save a search term on edit term search page displays:
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
index ed133eb2bfd7d..0c92261cb9206 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermInGrid.php
@@ -19,8 +19,8 @@
 class AssertSearchTermInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that after save a term search on edit term search page displays:
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
index d0752d3e906da..fede4347e46d2 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionNotOnFrontend.php
@@ -20,8 +20,8 @@
 class AssertSearchTermMassActionNotOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that after mass delete a search term not redirect to url in dataset
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php
index b4692e636cd02..b9200f8b0a2ed 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermMassActionsNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertSearchTermMassActionsNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that after mass delete search terms on grid page are not displayed
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
index 0f47c08d440c8..1f6d8c2d0cc3b 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertSearchTermNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that after delete a search term on grid page not displayed
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
index cab31841b9471..357c24036b081 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermNotOnFrontend.php
@@ -20,8 +20,8 @@
 class AssertSearchTermNotOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that after delete a search term not redirect to url in dataset
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
index 540a79ed6f908..6429977070fd0 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermOnFrontend.php
@@ -21,8 +21,8 @@
 class AssertSearchTermOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Search block on CMS index page
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
index 8d379973ee7b5..dc6ac0b8437f1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertSearchTermSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the search.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after search term deleted
      *
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
index db15c5b747d78..075ff0722d9ff 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessMassDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertSearchTermSuccessMassDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = 'Total of %d record(s) were deleted';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after search terms were mass deleted
      *
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
index 6d9cc7d516300..6c50980e7b06a 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertSearchTermSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = 'You saved the search term.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after search term save
      *
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
index 07d33a085e384..f74a38de002d3 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSearchTermSynonymOnFrontend.php
@@ -20,8 +20,8 @@
 class AssertSearchTermSynonymOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that you will be redirected to url from dataset
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
index a7646cbc0a79b..01cf0555de904 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertSuggestSearchingResult.php
@@ -18,8 +18,8 @@
 class AssertSuggestSearchingResult extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Check that after input some text(e.g. product name) into search field, drop-down window is appeared.
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml
index 317f077aeb0f2..c56ee7ac5a90a 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/etc/constraint.xml
@@ -9,21 +9,21 @@
 -->
 <constraint>
     <assertSuggestSearchingResult module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <catalogSearch class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
         </require>
     </assertSuggestSearchingResult>
     <assertAdvancedSearchProductsResult module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <resultPage class="Magento\CatalogSearch\Test\Page\Advanced\Result" />
             <productSearch class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
         </require>
     </assertAdvancedSearchProductsResult>
     <assertCatalogSearchResult module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <catalogSearch class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
@@ -31,7 +31,7 @@
         </require>
     </assertCatalogSearchResult>
     <assertSearchTermForm module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
@@ -39,14 +39,14 @@
         </require>
     </assertSearchTermForm>
     <assertSearchTermInGrid module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <indexPage class="Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex" />
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
         </require>
     </assertSearchTermInGrid>
     <assertSearchTermOnFrontend module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -54,13 +54,13 @@
         </require>
     </assertSearchTermOnFrontend>
     <assertSearchTermSuccessSaveMessage  module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <indexPage class="Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex" />
         </require>
     </assertSearchTermSuccessSaveMessage>
     <assertSearchTermSynonymOnFrontend  module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -68,20 +68,20 @@
         </require>
     </assertSearchTermSynonymOnFrontend>
     <assertSearchTermSuccessDeleteMessage module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <indexPage class="Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex" />
         </require>
     </assertSearchTermSuccessDeleteMessage>
     <assertSearchTermNotInGrid module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <indexPage class="Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex" />
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
         </require>
     </assertSearchTermNotInGrid>
     <assertSearchTermNotOnFrontend module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -89,7 +89,7 @@
         </require>
     </assertSearchTermNotOnFrontend>
     <assertSearchSynonymNotOnFrontend module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <searchTerm class="Magento\CatalogSearch\Test\Fixture\CatalogSearchQuery" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -97,26 +97,26 @@
         </require>
     </assertSearchSynonymNotOnFrontend>
     <assertSearchTermSuccessMassDeleteMessage module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <indexPage class="Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex" />
         </require>
     </assertSearchTermSuccessMassDeleteMessage>
     <assertSearchTermMassActionsNotInGrid module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <indexPage class="Magento\CatalogSearch\Test\Page\Adminhtml\CatalogSearchIndex" />
         </require>
     </assertSearchTermMassActionsNotInGrid>
     <assertSearchTermMassActionNotOnFrontend module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <browser class="Mtf\Client\Browser" />
         </require>
     </assertSearchTermMassActionNotOnFrontend>
     <assertSearchSynonymMassActionNotOnFrontend module="Magento_CatalogSearch">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <browser class="Mtf\Client\Browser" />
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
index 849b3b53d5e77..830a4909c589a 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertAddedProductToCartSuccessMessage.php
@@ -18,15 +18,15 @@
  */
 class AssertAddedProductToCartSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success add to cart message
      */
     const SUCCESS_MESSAGE = 'You added %s to your shopping cart.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert success message is appeared on Shopping Cart page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
index c5e7345c59c78..62043264e9c87 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartIsEmpty.php
@@ -20,15 +20,15 @@
  */
 class AssertCartIsEmpty extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'middle';
+    /* end tags */
+
     /**
      * Text of empty cart.
      */
     const TEXT_EMPTY_CART = 'You have no items in your shopping cart. Click here to continue shopping.';
 
-    /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
-
     /**
      * Check that Shopping Cart is empty, opened page contains text "You have no items in your shopping cart.
      * Click here to continue shopping." where 'here' is link that leads to index page
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
index f9ba401fe6302..f3e7ba2bafbab 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertCartItemsOptions.php
@@ -24,8 +24,8 @@
 class AssertCartItemsOptions extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Error message for verify options
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
index fc16fd227e811..9b32c229092b6 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertGrandTotalInShoppingCart.php
@@ -20,8 +20,8 @@
 class AssertGrandTotalInShoppingCart extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that grand total is equal to expected
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
index 9467f492ffa8b..1b8cc7060cdc4 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderSuccessPlacedMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderSuccessPlacedMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message of success checkout
      */
     const SUCCESS_MESSAGE = 'Thank you for your purchase!';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that success message is correct
      *
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php
index 61e42bca91a23..c631d5048a70e 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertOrderTotalOnReviewPage.php
@@ -18,8 +18,8 @@
 class AssertOrderTotalOnReviewPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that Order Grand Total is correct on checkoutOnePage
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
index a678809e48852..25430c82fce7b 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPriceInShoppingCart.php
@@ -22,8 +22,8 @@
 class AssertPriceInShoppingCart extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that price in the shopping cart equals to expected price from data set
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
index 8af7d261e428c..82b0b55d136f9 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductAbsentInMiniShoppingCart.php
@@ -19,8 +19,8 @@
 class AssertProductAbsentInMiniShoppingCart extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert product is absent on mini shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
index cb587c2f6da90..a8a7d72a50681 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductIsNotEditable.php
@@ -18,8 +18,8 @@
 class AssertProductIsNotEditable extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that after adding products by sku to shopping cart products are not editable
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
index 00e01c12b2266..6c3215501870c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInMiniShoppingCart.php
@@ -18,8 +18,8 @@
 class AssertProductPresentInMiniShoppingCart extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert product is present on mini shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
index 14a3e48c1a56c..ca974ed809c9d 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductPresentInShoppingCart.php
@@ -18,8 +18,8 @@
 class AssertProductPresentInShoppingCart extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that products are present in shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php
index d783bfb6be281..ffb0d33fa41ee 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInMiniShoppingCart.php
@@ -22,8 +22,8 @@
 class AssertProductQtyInMiniShoppingCart extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product quantity in the mini shopping cart is equals to expected quantity from data set
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
index 8a1f8d902b3f5..f672d6e347ec2 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductQtyInShoppingCart.php
@@ -22,8 +22,8 @@
 class AssertProductQtyInShoppingCart extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that quantity in the shopping cart is equals to expected quantity from data set
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php
index 82177f157683f..f835b07691dc2 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertProductsAbsentInShoppingCart.php
@@ -16,12 +16,9 @@
  */
 class AssertProductsAbsentInShoppingCart extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that products are absent in shopping cart.
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
index edb280e0a15e4..34e45d4e5b425 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertSubtotalInShoppingCart.php
@@ -22,8 +22,8 @@
 class AssertSubtotalInShoppingCart extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that subtotal total in the shopping cart is equals to expected total from data set
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml
index dd198e77bed47..ddb2fd899f0f6 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/etc/constraint.xml
@@ -9,51 +9,51 @@
 -->
 <constraint>
     <assertCartIsEmpty module="Magento_Checkout">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertCartIsEmpty>
     <assertPriceInShoppingCart module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertPriceInShoppingCart>
     <assertProductQtyInShoppingCart module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductQtyInShoppingCart>
     <assertProductQtyInMiniShoppingCart module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductQtyInMiniShoppingCart>
     <assertSubtotalInShoppingCart module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSubtotalInShoppingCart>
     <assertOrderSuccessPlacedMessage module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderSuccessPlacedMessage>
     <assertOrderTotalOnReviewPage module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderTotalOnReviewPage>
     <assertGrandTotalInShoppingCart module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGrandTotalInShoppingCart>
     <assertCartItemsOptions module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCartItemsOptions>
     <assertProductAbsentInMiniShoppingCart module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAbsentInMiniShoppingCart>
     <assertProductPresentInMiniShoppingCart module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductPresentInMiniShoppingCart>
     <assertAddedProductToCartSuccessMessage module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAddedProductToCartSuccessMessage>
     <assertProductPresentInShoppingCart module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductPresentInShoppingCart>
     <assertProductIsNotEditable module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductIsNotEditable>
     <assertProductsAbsentInShoppingCart module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductsAbsentInShoppingCart>
     <assertProductOptionsAbsentInShoppingCart module="Magento_Checkout">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductOptionsAbsentInShoppingCart>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php
index 878b6aed38add..8874db57e36d9 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentInGrid.php
@@ -19,8 +19,8 @@
 class AssertTermAbsentInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that checkout agreement is absent in agreement grid.
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php
index 0c69dda739bb6..252133a518dc7 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php
@@ -26,8 +26,8 @@
 class AssertTermAbsentOnCheckout extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Place order and verify there is no checkbox Terms and Conditions.
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php
index 7809bb49e7e51..99eb585b5845b 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermInGrid.php
@@ -19,8 +19,8 @@
 class AssertTermInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that checkout agreement is present in agreement grid.
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php
index faa9044f675af..f002329bf6538 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php
@@ -26,15 +26,15 @@
  */
 class AssertTermOnCheckout extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Notification message
      */
     const NOTIFICATION_MESSAGE = 'This is a required field.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Check that checkbox is present on the last checkout step - Order Review.
      * Check that after Place order without click on checkbox "Terms and Conditions" order was not successfully placed.
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php
index 6d83220b732d9..bc23011c8020a 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertTermSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Success terms and conditions delete message
      */
     const SUCCESS_DELETE_MESSAGE = 'The condition has been deleted.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after deleting Term successful delete message appears.
      *
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php
index aa1d21c758474..d6e379085a9c4 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertTermSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Success terms and conditions save message
      */
     const SUCCESS_SAVE_MESSAGE = 'The condition has been saved.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after save block successful message appears.
      *
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/constraint.xml
index 9b0174bf45cb5..0263ab26b4dad 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/etc/constraint.xml
@@ -9,21 +9,21 @@
 -->
 <constraint>
     <assertTermSuccessSaveMessage module="Magento_CheckoutAgreements">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTermSuccessSaveMessage>
     <assertTermOnCheckout module="Magento_CheckoutAgreements">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTermOnCheckout>
     <assertTermAbsentOnCheckout module="Magento_CheckoutAgreements">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTermAbsentOnCheckout>
     <assertTermInGrid module="Magento_CheckoutAgreements">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTermInGrid>
     <assertTermSuccessDeleteMessage module="Magento_CheckoutAgreements">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTermSuccessDeleteMessage>
     <assertTermAbsentInGrid module="Magento_CheckoutAgreements">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTermAbsentInGrid>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php
index 8207d9b173531..9598419c7d1a8 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockDeleteMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCmsBlockDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'The block has been deleted.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'The block has been deleted.';
 
     /**
      * Assert that after delete CMS block successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php
index 236660f64f6b7..425fcc4f1dd01 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockInGrid.php
@@ -19,8 +19,8 @@
 class AssertCmsBlockInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created CMS block can be found in grid via:
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php
index 28530d678b223..bb9aa884b219b 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertCmsBlockNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created CMS block can't be found in grid via:
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php
index 09242f23ad8e8..83aa1d68e9175 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockNotOnCategoryPage.php
@@ -21,8 +21,8 @@
 class AssertCmsBlockNotOnCategoryPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that created CMS block non visible on frontend category page
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php
index e11b0b6cd36c4..03b3789086912 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockOnCategoryPage.php
@@ -21,8 +21,8 @@
 class AssertCmsBlockOnCategoryPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that created CMS block displayed on frontend category page (in order to assign block to category:
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php
index fab3793dfecd4..b8b47870e94d9 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsBlockSuccessSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCmsBlockSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_SAVE_MESSAGE = 'The block has been saved.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_SAVE_MESSAGE = 'The block has been saved.';
 
     /**
      * Assert that after save block successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php
index ec44c7543c0e3..4ffaae7af3970 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCmsPageDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'The page has been deleted.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'The page has been deleted.';
 
     /**
      * Assert that success message is displayed after Cms page delete
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php
index 5ac65a80d0d28..013bf71624b05 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDisabledOnFrontend.php
@@ -20,11 +20,11 @@
  */
 class AssertCmsPageDisabledOnFrontend extends AbstractConstraint
 {
-    const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
 
     /**
      * Assert that created CMS page with 'Status' - Disabled displays with '404 Not Found' message on Frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php
index c1df704828d12..e578690e465f7 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageDuplicateErrorMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCmsPageDuplicateErrorMessage extends AbstractConstraint
 {
-    const ERROR_SAVE_MESSAGE = 'A page URL key for specified store already exists.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const ERROR_SAVE_MESSAGE = 'A page URL key for specified store already exists.';
 
     /**
      * Verify that page has not been created
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php
index 4504bce2499fe..d20239f931f38 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageForm.php
@@ -20,8 +20,8 @@
 class AssertCmsPageForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php
index 8df4d5c1d3899..977a0b6dd6e9a 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageInGrid.php
@@ -19,8 +19,8 @@
 class AssertCmsPageInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that cms page is present in pages grid
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php
index 2fb1e1c3ca1c7..dc0a583909b31 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertCmsPageNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Cms page is not present in pages grid
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php
index a7303697bbbda..b5f1f93488f5e 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPagePreview.php
@@ -22,8 +22,8 @@
 class AssertCmsPagePreview extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that content of created cms page displayed in section 'maincontent' and equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php
index 8c79a37dc0268..ab5c02c558590 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertCmsPageSuccessSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCmsPageSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_SAVE_MESSAGE = 'The page has been saved.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_SAVE_MESSAGE = 'The page has been saved.';
 
     /**
      * Assert that after save a CMS page "The page has been saved." successful message appears
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php
index cf9a6e9e21786..c438dccb329f2 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/Constraint/AssertUrlRewriteCmsPageRedirect.php
@@ -21,8 +21,8 @@
 class AssertUrlRewriteCmsPageRedirect extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created CMS Page URL Rewrite lead to appropriate page in frontend
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/etc/constraint.xml
index f9a4435cfeb8f..3e79d6bf3b9e7 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/etc/constraint.xml
@@ -9,32 +9,32 @@
 -->
 <constraint>
     <assertCmsPageDuplicateErrorMessage module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsPageGrid class="Magento\Cms\Test\Page\Adminhtml\CmsPageGrid" />
         </require>
     </assertCmsPageDuplicateErrorMessage>
     <assertCmsPageSuccessSaveMessage module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\Adminhtml\CmsIndex" />
         </require>
     </assertCmsPageSuccessSaveMessage>
     <assertCmsBlockSuccessSaveMessage module="Magento_Cms">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsBlockIndex class="Magento\Cms\Test\Page\Adminhtml\CmsBlockIndex" />
         </require>
     </assertCmsBlockSuccessSaveMessage>
     <assertCmsBlockInGrid module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsBlock class="Magento\Cms\Test\Fixture\CmsBlock" />
             <cmsBlockIndex class="Magento\Cms\Test\Page\Adminhtml\CmsBlockIndex" />
         </require>
     </assertCmsBlockInGrid>
     <assertCmsBlockOnCategoryPage module="Magento_Cms">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex"/>
             <fixtureFactory class="Mtf\Fixture\FixtureFactory" />
@@ -43,7 +43,7 @@
         </require>
     </assertCmsBlockOnCategoryPage>
     <assertCmsBlockNotOnCategoryPage module="Magento_Cms">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex"/>
             <fixtureFactory class="Mtf\Fixture\FixtureFactory" />
@@ -52,7 +52,7 @@
         </require>
     </assertCmsBlockNotOnCategoryPage>
     <assertCmsPageDisabledOnFrontend module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cms class="Magento\Cms\Test\Fixture\CmsPage" />
             <browser class="Mtf\Client\Driver\Selenium\Browser" />
@@ -61,7 +61,7 @@
         </require>
     </assertCmsPageDisabledOnFrontend>
     <assertCmsPageForm module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\Adminhtml\CmsIndex" />
             <cmsNew class="Magento\Cms\Test\Page\Adminhtml\CmsNew" />
@@ -69,7 +69,7 @@
         </require>
     </assertCmsPageForm>
     <assertCmsPagePreview module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\Adminhtml\CmsIndex" />
             <browser class="Mtf\Client\Driver\Selenium\Browser" />
@@ -79,26 +79,26 @@
         </require>
     </assertCmsPagePreview>
     <assertCmsBlockDeleteMessage module="Magento_Cms">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsBlockIndex class="Magento\Cms\Test\Page\Adminhtml\CmsBlockIndex" />
         </require>
     </assertCmsBlockDeleteMessage>
     <assertCmsBlockNotInGrid module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsBlock class="Magento\Cms\Test\Fixture\CmsBlock" />
             <cmsBlockIndex class="Magento\Cms\Test\Page\Adminhtml\CmsBlockIndex" />
         </require>
     </assertCmsBlockNotInGrid>
     <assertCmsPageDeleteMessage module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCmsPageDeleteMessage>
     <assertCmsPageNotInGrid module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCmsPageNotInGrid>
     <assertUrlRewriteCmsPageRedirect module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsPage class="Magento\Cms\Test\Fixture\CmsPage"/>
             <urlRewrite class="Magento\Cms\Test\Fixture\UrlRewrite"/>
@@ -106,6 +106,6 @@
         </require>
     </assertUrlRewriteCmsPageRedirect>
     <assertCmsPageInGrid module="Magento_Cms">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCmsPageInGrid>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
index 5831181c0d178..99854d1e70c21 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductIsNotDisplayedSeparately.php
@@ -20,8 +20,8 @@
 class AssertChildProductIsNotDisplayedSeparately extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that products generated during configurable product creation - are not visible on frontend(by default).
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
index 8a1241a64162e..8da654dbc0f3f 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertChildProductsInGrid.php
@@ -18,15 +18,15 @@
  */
 class AssertChildProductsInGrid extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Default status visibility on child products
      */
     const NOT_VISIBLE_INDIVIDUALLY = 'Not Visible Individually';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that child products generated during configurable product are present in products grid
      *
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
index 05fbfc19526f9..f5ac79dab2298 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesAbsentOnProductPage.php
@@ -19,12 +19,9 @@
  */
 class AssertConfigurableAttributesAbsentOnProductPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted configurable attributes are absent on product page on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
index 45b5631280c43..55198662efb64 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableAttributesBlockIsAbsentOnProductPage.php
@@ -18,12 +18,9 @@
  */
 class AssertConfigurableAttributesBlockIsAbsentOnProductPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that all configurable attributes is absent on product page on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
index 63e26773c81db..fa15736e29275 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductDuplicateForm.php
@@ -17,12 +17,9 @@
  */
 class AssertConfigurableProductDuplicateForm extends AssertConfigurableProductForm
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert form data equals duplicate product configurable data.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductForm.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductForm.php
index b6f6ec40faf9e..175b628de59bc 100755
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductForm.php
@@ -16,6 +16,10 @@
  */
 class AssertConfigurableProductForm extends AssertProductForm
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * List skipped fixture fields in verify
      *
@@ -59,10 +63,6 @@ class AssertConfigurableProductForm extends AssertProductForm
         'configurable_attribute'
     ];
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Prepares fixture data for comparison
      *
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
index c3cbaeddacf3e..1ef2ba4c42a04 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeAbsenceInVariationsSearch.php
@@ -21,15 +21,15 @@
  */
 class AssertProductAttributeAbsenceInVariationsSearch extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Label "Variations" tab
      */
     const TAB_VARIATIONS = 'variations';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that deleted attribute can't be added to product template on Product Page via Add Attribute control
      *
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
index d2443903ad13f..4491280ad2c1d 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertProductAttributeIsConfigurable.php
@@ -20,8 +20,8 @@
 class AssertProductAttributeIsConfigurable extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert check whether the attribute is used to create a configurable products.
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/constraint.xml
index eec33b1b0d2ed..b34533394e697 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/etc/constraint.xml
@@ -9,39 +9,39 @@
 -->
 <constraint>
     <assertConfigurableProductInCart module="Magento_ConfigurableProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertConfigurableProductInCart>
     <assertConfigurableProductDuplicateForm module="Magento_ConfigurableProduct">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertConfigurableProductDuplicateForm>
     <assertChildProductIsNotDisplayedSeparately module="Magento_ConfigurableProduct">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertChildProductIsNotDisplayedSeparately>
     <assertChildProductsInGrid module="Magento_ConfigurableProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertChildProductsInGrid>
     <assertConfigurableProductForm module="Magento_ConfigurableProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertConfigurableProductForm>
     <assertConfigurableProductInItemsOrderedGrid module="Magento_ConfigurableProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertConfigurableProductInItemsOrderedGrid>
     <assertConfigurableProductPage module="Magento_ConfigurableProduct">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertConfigurableProductPage>
     <assertProductAttributeAbsenceInVariationsSearch module="Magento_ConfigurableProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeAbsenceInVariationsSearch>
     <assertProductAttributeIsConfigurable module="Magento_ConfigurableProduct">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductAttributeIsConfigurable>
     <assertConfigurableProductInCustomerWishlistOnBackendGrid module="Magento_ConfigurableProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertConfigurableProductInCustomerWishlistOnBackendGrid>
     <assertConfigurableAttributesAbsentOnProductPage module="Magento_ConfigurableProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertConfigurableAttributesAbsentOnProductPage>
     <assertConfigurableAttributesBlockIsAbsentOnProductPage module="Magento_ConfigurableProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertConfigurableAttributesBlockIsAbsentOnProductPage>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php
index 35412504605f4..83c150b96df94 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php
@@ -21,8 +21,8 @@
 class AssertCustomVariableForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php
index 023003bfe02e1..cade21ebfebf0 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInGrid.php
@@ -20,8 +20,8 @@
 class AssertCustomVariableInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert custom variable is displayed on backend in custom variable grid
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
index 07cdc90ad3d00..53a251335b914 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableInPage.php
@@ -21,8 +21,8 @@
 class AssertCustomVariableInPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Add created variable to page and assert that Custom Variable is displayed on frontend page and has
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
index b9a31b882addc..556a0df450f6e 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php
@@ -18,8 +18,8 @@
 class AssertCustomVariableNotInCmsPageForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that custom system variable not in cms page form
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php
index 67977e7ad8ec3..3e5cbb6aeadfb 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertCustomVariableNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert Custom System Variable not available in System Variable grid
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
index 7a0c16af5a0ce..3193ed56ea0b3 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCustomVariableSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'You deleted the custom variable.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'You deleted the custom variable.';
 
     /**
      * Assert that success delete message is correct after Custom System Variable deleted
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
index 979691998fe74..4e19fd5e01239 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableSuccessSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCustomVariableSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_SAVE_MESSAGE = 'You saved the custom variable.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_SAVE_MESSAGE = 'You saved the custom variable.';
 
     /**
      * Assert that success delete message is correct after Custom System Variable deleted
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Core/Test/etc/constraint.xml
index fbcd9049e4f32..16a167e1be795 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/etc/constraint.xml
@@ -9,27 +9,27 @@
 -->
 <constraint>
     <assertCustomVariableSuccessDeleteMessage module="Magento_Core">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomVariableSuccessDeleteMessage>
     <assertCustomVariableNotInGrid module="Magento_Core">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomVariableNotInGrid>
     <assertCustomVariableNotInCmsPageForm module="Magento_Core">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomVariableNotInCmsPageForm>
     <assertCustomVariableSuccessSaveMessage module="Magento_Core">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomVariableSuccessSaveMessage>
     <assertCustomVariableInGrid module="Magento_Core">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomVariableInGrid>
     <assertCustomVariableNotInCmsPageForm module="Magento_Core">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomVariableNotInCmsPageForm>
     <assertCustomVariableForm module="Magento_Core">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomVariableForm>
     <assertCustomVariableInPage module="Magento_Core">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomVariableInPage>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php
index 314ac2044acd4..47516a2e7ad48 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnCatalogPage.php
@@ -21,8 +21,8 @@
 class AssertCurrencySymbolOnCatalogPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that after applying changes, currency symbol changed on Catalog page
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php
index 970dc772e1acd..602ee2b610018 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolOnProductPage.php
@@ -20,12 +20,9 @@
  */
 class AssertCurrencySymbolOnProductPage extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that after applying changes, currency symbol changed on Product Details Page.
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php
index e99a3bdbb22a8..61ba0a57de5d0 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/Constraint/AssertCurrencySymbolSuccessSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCurrencySymbolSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_SAVE_MESSAGE = 'The custom currency symbols were applied.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_SAVE_MESSAGE = 'The custom currency symbols were applied.';
 
     /**
      * Assert that after clicking on 'Save Currency Symbols' button success message appears.
diff --git a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/constraint.xml
index 51a0998cd0454..ee464afb9419d 100644
--- a/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/etc/constraint.xml
@@ -9,13 +9,13 @@
 -->
 <constraint>
     <assertCurrencySymbolSuccessSaveMessage module="Magento_CurrencySymbol">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <currencySymbolIndex class="Magento\CurrencySymbol\Test\Page\Adminhtml\SystemCurrencySymbolIndex" />
         </require>
     </assertCurrencySymbolSuccessSaveMessage>
     <assertCurrencySymbolOnProductPage module="Magento_CurrencySymbol">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
@@ -25,7 +25,7 @@
         </require>
     </assertCurrencySymbolOnProductPage>
     <assertCurrencySymbolOnCatalogPage module="Magento_CurrencySymbol">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <catalogCategoryView class="Magento\Catalog\Test\Page\Category\CatalogCategoryView" />
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
index aa930b75d554a..c9b2c3683060a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedBackend.php
@@ -21,8 +21,8 @@
 class AssertAddressDeletedBackend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted customers address is not displayed on backend during order creation
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
index 9a0ff7a048e02..a996d1ac162ff 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php
@@ -17,15 +17,15 @@
  */
 class AssertAddressDeletedFrontend extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Expected message
      */
     const EXPECTED_MESSAGE = 'You have no additional address entries in your address book.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Asserts that Asserts that 'Additional Address Entries' contains expected message
      *
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
index 22236d8c69857..5a1d8333b0c95 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertChangePasswordFailMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertChangePasswordFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Fail message
      */
     const FAIL_MESSAGE = "Password doesn't match for this account.";
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that fail message is present
      *
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
index f1d71cd31841a..225115b517780 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerAddressSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCustomerAddressSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The address has been saved.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The address has been saved.';
 
     /**
      * Asserts that success message equals to expected message
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
index fd2750213b941..89c4f8f409637 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerDefaultAddresses.php
@@ -18,8 +18,8 @@
 class AssertCustomerDefaultAddresses extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Asserts that Default Billing Address and Default Shipping Address equal to data from fixture
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
index f7cef94d0d4be..1770e1995420f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerFailRegisterMessage.php
@@ -17,8 +17,8 @@
 class AssertCustomerFailRegisterMessage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that error message is displayed on "Create New Customer Account" page(frontend)
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
index 14f055c080131..eaac1c0348c2a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerForm.php
@@ -21,8 +21,8 @@
 class AssertCustomerForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
index 5e3fb56c2dd33..9c0731af39206 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupAlreadyExists.php
@@ -16,11 +16,11 @@
  */
 class AssertCustomerGroupAlreadyExists extends AbstractConstraint
 {
-    const ERROR_MESSAGE = 'Customer Group already exists.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const ERROR_MESSAGE = 'Customer Group already exists.';
 
     /**
      * Assert that customer group already exist
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
index 77ad834d40ea5..42cf728e0cce2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupForm.php
@@ -19,8 +19,8 @@
 class AssertCustomerGroupForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Skipped fields while verifying
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
index f29e84432c40d..99235dabe6b45 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupInGrid.php
@@ -18,8 +18,8 @@
 class AssertCustomerGroupInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that customer group in grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
index cfd64c1e437fc..f8e478c55c9c1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertCustomerGroupNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that customer group not in grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
index 7f86da4de2224..9cb77931c7b20 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupOnCustomerForm.php
@@ -21,8 +21,8 @@
 class AssertCustomerGroupOnCustomerForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that customer group find on account information page
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
index 9bfb22e009326..e48000d09eb4e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCustomerGroupSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE= "The customer group has been deleted.";
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE= "The customer group has been deleted.";
 
     /**
      * Assert that message "The customer group has been deleted." is displayed on Customer Group page.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
index 4f666d2b4cdf6..0d6a46c6525bc 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCustomerGroupSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The customer group has been saved.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The customer group has been saved.';
 
     /**
      * Assert that success message is displayed after customer group save
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
index b3af527bb9c2e..b7c275cdcf85a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInGrid.php
@@ -19,8 +19,8 @@
 class AssertCustomerInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert customer availability in Customer Grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
index a757b35338c2f..9b2de33fd4d4d 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInfoSuccessSavedMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCustomerInfoSuccessSavedMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The account information has been saved.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The account information has been saved.';
 
     /**
      * Asserts that success message equals to expected message
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
index 65183ccea14f1..bf5e752cc20f1 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerInvalidEmail.php
@@ -18,11 +18,11 @@
  */
 class AssertCustomerInvalidEmail extends AbstractConstraint
 {
-    const ERROR_EMAIL_MESSAGE = 'Please correct this email address: "%email%".';
-
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
+
+    const ERROR_EMAIL_MESSAGE = 'Please correct this email address: "%email%".';
 
     /**
      * Assert that error message "Please correct this email address: "%email%"." is displayed
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php
index 8162974624ca9..c5a21e7ce8bb2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteInGrid.php
@@ -19,8 +19,8 @@
 class AssertCustomerMassDeleteInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that customers which haven't been deleted are present in customer grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php
index 6466b7fdd042b..e62cf3a2c57df 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertCustomerMassDeleteNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Asserts that mass deleted customers are not in customer's grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
index 935532ca68d61..a1fe12842edbc 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerMassDeleteSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCustomerMassDeleteSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message that appears after deletion via mass actions
      */
     const SUCCESS_DELETE_MESSAGE = 'A total of %d record(s) were deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that message "A total of "x" record(s) were deleted."
      *
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
index 80df8b36f4d5b..a527d3dd9cc3a 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertCustomerNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Asserts that customer is not in customer's grid
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
index bce622084b4c3..15f3813d2b4e2 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerPasswordChanged.php
@@ -18,12 +18,9 @@
  */
 class AssertCustomerPasswordChanged extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that login again to frontend with new password was success.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
index ba85c4184b52a..418ecacf99656 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCustomerSuccessDeleteMessage extends AbstractConstraint
 {
-    const DELETE_MESSAGE = 'You deleted the customer.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const DELETE_MESSAGE = 'You deleted the customer.';
 
     /**
      * Asserts that actual delete message equals expected
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
index 92211e8d1a351..4ca9ab7e6e2e6 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessRegisterMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCustomerSuccessRegisterMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'Thank you for registering with Main Website Store.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'Thank you for registering with Main Website Store.';
 
     /**
      * Assert that success message is displayed after customer registered on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
index eb07aab1ce3f7..887dce4f39a8f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerSuccessSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCustomerSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You saved the customer.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You saved the customer.';
 
     /**
      * Assert that success message is displayed after customer save
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
index 624c23ac21a6e..ddcf6b479a4fb 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertMassActionSuccessUpdateMessage.php
@@ -18,15 +18,15 @@
  */
 class AssertMassActionSuccessUpdateMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const UPDATE_MESSAGE = 'A total of %d record(s) were updated.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert update message is appears on customer grid (Customers > All Customers)
      *
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
index d5cc652f1fdc2..c01d25a367a45 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertWrongPassConfirmationMessage.php
@@ -17,18 +17,15 @@
  */
 class AssertWrongPassConfirmationMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Conformation message
      */
     const CONFIRMATION_MESSAGE = 'Please enter the same value again.';
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that conformation message is present.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml
index c37ff1d4f70d8..e621dfa1e2983 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml
@@ -9,39 +9,39 @@
 -->
 <constraint>
     <assertCustomerSuccessSaveMessage module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <pageCustomerIndex class="Magento\Customer\Test\Page\Adminhtml\CustomerIndex" />
         </require>
     </assertCustomerSuccessSaveMessage>
     <assertCustomerSuccessDeleteMessage module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <pageCustomerIndex class="Magento\Customer\Test\Page\Adminhtml\CustomerIndex" />
         </require>
     </assertCustomerSuccessDeleteMessage>
     <assertCustomerSuccessRegisterMessage module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <registerPage class="Magento\Customer\Test\Page\CustomerAccountCreate" />
         </require>
     </assertCustomerSuccessRegisterMessage>
     <assertCustomerInGrid module="Magento_Customer">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
         <require>
             <customer class="Magento\Customer\Test\Fixture\CustomerInjectable" />
             <pageCustomerIndex class="Magento\Customer\Test\Page\Adminhtml\CustomerIndex" />
         </require>
     </assertCustomerInGrid>
     <assertCustomerNotInGrid module="Magento_Customer">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
         <require>
             <customer class="Magento\Customer\Test\Fixture\CustomerInjectable" />
             <customerIndexPage class="Magento\Customer\Test\Page\Adminhtml\CustomerIndex" />
         </require>
     </assertCustomerNotInGrid>
     <assertCustomerForm module="Magento_Customer">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
         <require>
             <customer class="Magento\Customer\Test\Fixture\CustomerInjectable" />
             <pageCustomerIndex class="Magento\Customer\Test\Page\Adminhtml\CustomerIndex" />
@@ -49,7 +49,7 @@
         </require>
     </assertCustomerForm>
     <assertCustomerInvalidEmail module="Magento_Customer">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
         <require>
             <customer class="Magento\Customer\Test\Fixture\CustomerInjectable" />
             <addresses class="Magento\Customer\Test\Fixture\AddressInjectable" />
@@ -57,79 +57,79 @@
         </require>
     </assertCustomerInvalidEmail>
     <assertCustomerGroupSuccessSaveMessage module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerGroupSuccessSaveMessage>
     <assertCustomerGroupInGrid module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerGroupInGrid>
     <assertCustomerGroupOnCustomerForm module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerGroupOnCustomerForm>
     <assertCustomerGroupAlreadyExists module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerGroupAlreadyExists>
     <assertCustomerGroupNotInGrid module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerGroupNotInGrid>
     <assertCustomerFailRegisterMessage module="Magento_Customer">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <registerPage class="Magento\Customer\Test\Page\CustomerAccountCreate" />
         </require>
     </assertCustomerFailRegisterMessage>
     <assertCustomerGroupSuccessDeleteMessage module="Magento_Customer">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <customerGroupIndex class="Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex" />
         </require>
     </assertCustomerGroupSuccessDeleteMessage>
     <assertCustomerGroupForm module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerGroupForm>
     <assertCustomerInfoSuccessSavedMessage module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerAccountIndex class="Magento\Customer\Test\Page\CustomerAccountIndex" />
         </require>
     </assertCustomerInfoSuccessSavedMessage>
     <assertCustomerAddressSuccessSaveMessage module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerAccountIndex class="Magento\Customer\Test\Page\CustomerAccountIndex" />
         </require>
     </assertCustomerAddressSuccessSaveMessage>
     <assertCustomerDefaultAddresses module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerAccountIndex class="Magento\Customer\Test\Page\CustomerAccountIndex" />
             <address class="Magento\Customer\Test\Fixture\AddressInjectable" />
         </require>
     </assertCustomerDefaultAddresses>
     <assertCustomerMassDeleteSuccessMessage module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerMassDeleteSuccessMessage>
     <assertCustomerMassDeleteNotInGrid module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerMassDeleteNotInGrid>
     <assertCustomerMassDeleteInGrid module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerMassDeleteInGrid>
     <assertMassActionSuccessUpdateMessage module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertMassActionSuccessUpdateMessage>
     <assertAddressDeletedFrontend module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAddressDeletedFrontend>
     <assertAddressDeletedBackend module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAddressDeletedBackend>
     <assertCustomerPasswordChanged module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerPasswordChanged>
     <assertChangePasswordFailMessage module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertChangePasswordFailMessage>
     <assertWrongPassConfirmationMessage module="Magento_Customer">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWrongPassConfirmationMessage>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceAmount.php b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceAmount.php
index 92b5c3be38bee..dbc4b6f7f24a1 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceAmount.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceAmount.php
@@ -21,8 +21,8 @@
 class AssertCustomerBalanceAmount extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that customer balance amount is changed
diff --git a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceHistory.php b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceHistory.php
index 7d1d45ebe5cd1..5d5fadba9d67b 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceHistory.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertCustomerBalanceHistory.php
@@ -21,8 +21,8 @@
 class AssertCustomerBalanceHistory extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that customer balance history is changed
diff --git a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertRemoveStoreCreditSuccessMessage.php b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertRemoveStoreCreditSuccessMessage.php
index 44dddfcc56b29..1cbb051bd572b 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertRemoveStoreCreditSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/Constraint/AssertRemoveStoreCreditSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertRemoveStoreCreditSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message displayed after remove store credit
      */
     const SUCCESS_REMOVE_MESSAGE = 'The store credit payment has been removed from shopping cart.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after remove store credit successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/etc/constraint.xml
index 76817636868a8..6185a45208908 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/etc/constraint.xml
@@ -9,12 +9,12 @@
 -->
 <constraint>
     <assertCustomerBalanceAmount module="Magento_CustomerBalance">
-    <severeness>low</severeness>
+    <severity>low</severity>
     </assertCustomerBalanceAmount>
     <assertCustomerBalanceHistory module="Magento_CustomerBalance">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerBalanceHistory>
     <assertRemoveStoreCreditSuccessMessage module="Magento_CustomerBalance">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertRemoveStoreCreditSuccessMessage>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php
index 38e755b14b910..5baa2bcdb5693 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php
@@ -16,15 +16,15 @@
  */
 class AssertCustomerCustomAttributeErrorDuplicateMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text of error duplicate message
      */
     const ERROR_DUPLICATE_MESSAGE = 'An attribute with this code already exists.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after customer attribute error duplicate message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInCustomerSegment.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInCustomerSegment.php
index 38d4c2f893fc5..3dfaf4d5bbca7 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInCustomerSegment.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInCustomerSegment.php
@@ -21,8 +21,8 @@
 class AssertCustomerCustomAttributeInCustomerSegment extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer attribute is available during creation of customer segments
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInGrid.php
index a036b1f8e0142..c63d45ea5b115 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeInGrid.php
@@ -19,8 +19,8 @@
 class AssertCustomerCustomAttributeInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Customer Attribute can be found in grid via:
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInCustomerSegment.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInCustomerSegment.php
index 0e38befdae424..b688c56ba4fcf 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInCustomerSegment.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInCustomerSegment.php
@@ -21,8 +21,8 @@
 class AssertCustomerCustomAttributeNotInCustomerSegment extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted customer attribute is not available during creation of customer segments
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInGrid.php
index e2db515529587..57ac4e74e697d 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertCustomerCustomAttributeNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted customer attribute cannot be found in grid
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCheckoutRegister.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCheckoutRegister.php
index 9c3feb154bcc7..7beca3201c00c 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCheckoutRegister.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCheckoutRegister.php
@@ -23,8 +23,8 @@
 class AssertCustomerCustomAttributeNotOnCheckoutRegister extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted customer attribute is not available during register customer on checkout
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCreateOrderBackend.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCreateOrderBackend.php
index 8503117ead525..737212a2d5e8b 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCreateOrderBackend.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCreateOrderBackend.php
@@ -21,8 +21,8 @@
 class AssertCustomerCustomAttributeNotOnCreateOrderBackend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer attribute is absent during creating order on backend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerEditPage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerEditPage.php
index 7db5c266390d3..5ea93197c56c0 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerEditPage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerEditPage.php
@@ -23,8 +23,8 @@
 class AssertCustomerCustomAttributeNotOnCustomerEditPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer attribute is absent during edit customer account on frontend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerRegister.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerRegister.php
index 34eb4fa9bdf79..3f3060e2804a6 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerRegister.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeNotOnCustomerRegister.php
@@ -20,8 +20,8 @@
 class AssertCustomerCustomAttributeNotOnCustomerRegister extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer attribute is absent during register customer on frontend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCheckoutRegister.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCheckoutRegister.php
index 90969be9236ab..14787df3041cd 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCheckoutRegister.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCheckoutRegister.php
@@ -24,8 +24,8 @@
 class AssertCustomerCustomAttributeOnCheckoutRegister extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer attribute is available during register customer on checkout
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCreateOrderBackend.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCreateOrderBackend.php
index 2c53d92805ff5..38ce1689b5bcd 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCreateOrderBackend.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCreateOrderBackend.php
@@ -21,8 +21,8 @@
 class AssertCustomerCustomAttributeOnCreateOrderBackend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer attribute is available during creating order on backend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerEditPage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerEditPage.php
index 15a77c9784a87..9e9fdfd88d9ff 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerEditPage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerEditPage.php
@@ -22,8 +22,8 @@
 class AssertCustomerCustomAttributeOnCustomerEditPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer attribute is available during edit customer account on frontend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerRegister.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerRegister.php
index 65c59c34bb2e8..ede1854b50c2b 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerRegister.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeOnCustomerRegister.php
@@ -20,8 +20,8 @@
 class AssertCustomerCustomAttributeOnCustomerRegister extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer attribute is available during register customer on frontend
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessDeleteMessage.php
index 93e04cdc0145a..a87b364451216 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCustomerCustomAttributeSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text of delete success message
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the customer attribute.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after delete customer attribute successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessSaveMessage.php
index b7d6cf51f7575..c33c1cd35cf6a 100755
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCustomerCustomAttributeSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text of save success message
      */
     const SUCCESS_SAVE_MESSAGE = 'You saved the customer attribute.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after customer attribute save successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/etc/constraint.xml
index 8adceda14a2e4..d17a0a56d5646 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/etc/constraint.xml
@@ -9,33 +9,33 @@
 -->
 <constraint>
     <assertCustomerCustomAttributeSuccessSaveMessage module="Magento_CustomerCustomAttributes">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <customerAttributeIndex class="Magento\CustomerCustomAttributes\Test\Page\Adminhtml\CustomerAttributeIndex"/>
         </require>
     </assertCustomerCustomAttributeSuccessSaveMessage>
     <assertCustomerCustomAttributeSuccessDeleteMessage module="Magento_CustomerCustomAttributes">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <customerAttributeIndex class="Magento\CustomerCustomAttributes\Test\Page\Adminhtml\CustomerAttributeIndex"/>
         </require>
     </assertCustomerCustomAttributeSuccessDeleteMessage>
     <assertCustomerCustomAttributeInGrid module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerAttribute class="Magento\CustomerCustomAttributes\Test\Fixture\CustomerCustomAttribute"/>
             <customerAttributeIndex class="Magento\CustomerCustomAttributes\Test\Page\Adminhtml\CustomerAttributeIndex"/>
         </require>
     </assertCustomerCustomAttributeInGrid>
     <assertCustomerCustomAttributeNotInGrid module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerAttribute class="Magento\CustomerCustomAttributes\Test\Fixture\CustomerCustomAttribute"/>
             <customerAttributeIndex class="Magento\CustomerCustomAttributes\Test\Page\Adminhtml\CustomerAttributeIndex"/>
         </require>
     </assertCustomerCustomAttributeNotInGrid>
     <assertCustomerCustomAttributeOnCheckoutRegister module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <fixtureFactory class="Mtf\Fixture\FixtureFactory" />
@@ -46,7 +46,7 @@
         </require>
     </assertCustomerCustomAttributeOnCheckoutRegister>
     <assertCustomerCustomAttributeNotOnCheckoutRegister module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <productSimple class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
@@ -57,7 +57,7 @@
         </require>
     </assertCustomerCustomAttributeNotOnCheckoutRegister>
     <assertCustomerCustomAttributeOnCustomerRegister module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <pageCustomerAccountCreate class="Magento\Customer\Test\Page\CustomerAccountCreate" />
@@ -66,7 +66,7 @@
         </require>
     </assertCustomerCustomAttributeOnCustomerRegister>
     <assertCustomerCustomAttributeOnCustomerEditPage module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerAccountLogin class="Magento\Customer\Test\Page\CustomerAccountLogin" />
             <customerAccountIndex class="Magento\Customer\Test\Page\CustomerAccountIndex" />
@@ -77,7 +77,7 @@
         </require>
     </assertCustomerCustomAttributeOnCustomerEditPage>
     <assertCustomerCustomAttributeOnCreateOrderBackend module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customer class="Magento\Customer\Test\Fixture\CustomerInjectable" />
             <salesOrder class="Magento\Sales\Test\Page\SalesOrder" />
@@ -86,7 +86,7 @@
         </require>
     </assertCustomerCustomAttributeOnCreateOrderBackend>
     <assertCustomerCustomAttributeInCustomerSegment module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerSegment class="Magento\CustomerSegment\Test\Fixture\CustomerSegment" />
             <customerSegmentNew class="Magento\CustomerSegment\Test\Page\Adminhtml\CustomerSegmentNew" />
@@ -95,7 +95,7 @@
         </require>
     </assertCustomerCustomAttributeInCustomerSegment>
     <assertCustomerCustomAttributeNotInCustomerSegment module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerSegment class="Magento\CustomerSegment\Test\Fixture\CustomerSegment" />
             <customerSegmentNew class="Magento\CustomerSegment\Test\Page\Adminhtml\CustomerSegmentNew" />
@@ -104,7 +104,7 @@
         </require>
     </assertCustomerCustomAttributeNotInCustomerSegment>
     <assertCustomerCustomAttributeNotOnCustomerRegister module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
             <pageCustomerAccountCreate class="Magento\Customer\Test\Page\CustomerAccountCreate" />
@@ -112,7 +112,7 @@
         </require>
     </assertCustomerCustomAttributeNotOnCustomerRegister>
     <assertCustomerCustomAttributeNotOnCreateOrderBackend module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <salesOrder class="Magento\Sales\Test\Page\SalesOrder" />
             <orderCreateIndex class="Magento\Sales\Test\Page\Adminhtml\OrderCreateIndex" />
@@ -121,7 +121,7 @@
         </require>
     </assertCustomerCustomAttributeNotOnCreateOrderBackend>
     <assertCustomerCustomAttributeNotOnCustomerEditPage module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerAccountLogin class="Magento\Customer\Test\Page\CustomerAccountLogin" />
             <customerAccountIndex class="Magento\Customer\Test\Page\CustomerAccountIndex" />
@@ -131,6 +131,6 @@
         </require>
     </assertCustomerCustomAttributeNotOnCustomerEditPage>
     <assertCustomerCustomAttributeErrorDuplicateMessage module="Magento_CustomerCustomAttributes">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerCustomAttributeErrorDuplicateMessage>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentAvailableInBannerForm.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentAvailableInBannerForm.php
index d9241e996e7ca..2437ee2d5ded2 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentAvailableInBannerForm.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentAvailableInBannerForm.php
@@ -19,8 +19,8 @@
 class AssertCustomerSegmentAvailableInBannerForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer segment is available in Banner edit page
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentForm.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentForm.php
index 16a253356e105..4eef58f828127 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentForm.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentForm.php
@@ -19,6 +19,10 @@
  */
 class AssertCustomerSegmentForm extends AbstractAssertForm
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Skipped fields for verify data
      *
@@ -26,10 +30,6 @@ class AssertCustomerSegmentForm extends AbstractAssertForm
      */
     protected $skippedFields = ['conditions_serialized', 'segment_id'];
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that displayed segment data on edit page is equals passed from fixture
      *
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsApplying.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsApplying.php
index 3aebe23ea9ebd..e6abcb112ecc8 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsApplying.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsApplying.php
@@ -15,8 +15,8 @@
 class AssertCustomerSegmentInCartPriceRuleIsApplying extends AbstractAssertCustomerSegmentPriceRuleApplying
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Catalog Price Rule is applied on product(s) in shopping cart according to rule condition has been
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsNotApplying.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsNotApplying.php
index a3a434afa4876..41a20990ed118 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsNotApplying.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInCartPriceRuleIsNotApplying.php
@@ -15,8 +15,8 @@
 class AssertCustomerSegmentInCartPriceRuleIsNotApplying extends AbstractAssertCustomerSegmentPriceRuleApplying
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that shopping cart subtotal equals with grand total
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInGrid.php
index 953886a92b319..bc1638e572298 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentInGrid.php
@@ -19,8 +19,8 @@
 class AssertCustomerSegmentInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer segment presents in grid and has correct 'Segment','Status','Website'
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomer.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomer.php
index e78cbcb2b485e..d0fc0f979a99e 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomer.php
@@ -22,8 +22,8 @@
 class AssertCustomerSegmentMatchedCustomer extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that grid on 'Matched Customer' tab contains customer according to conditions
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomerWithCart.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomerWithCart.php
index 3c4c303c7f0da..6d0673a7d7e94 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomerWithCart.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomerWithCart.php
@@ -15,8 +15,8 @@
 class AssertCustomerSegmentMatchedCustomerWithCart extends AbstractAssertCustomerSegmentPriceRuleApplying
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that grid on 'Matched Customer' tab contains customer according to conditions(it need save condition
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomersInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomersInGrid.php
index 5b37baf29085c..f10a780a6f1be 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomersInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentMatchedCustomersInGrid.php
@@ -22,8 +22,8 @@
 class AssertCustomerSegmentMatchedCustomersInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that the customer according to search criteria presents in the grid and have correct values for
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotApplicableToBanner.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotApplicableToBanner.php
index e9b7ff54d77dd..569568d62d36a 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotApplicableToBanner.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotApplicableToBanner.php
@@ -19,8 +19,8 @@
 class AssertCustomerSegmentNotApplicableToBanner extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer segment is not available in Banner edit page
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotInGrid.php
index fc73489b788ac..4b86bbacdd90f 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertCustomerSegmentNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created customer segment not presents in grid
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportInGrid.php
index 1ebb0b3854958..f9a930bfe8e78 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportInGrid.php
@@ -20,8 +20,8 @@
 class AssertCustomerSegmentReportInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that created customer segment report presents in the grid and customer from it has correct values
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportMessage.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportMessage.php
index 0358f2449b42d..2e83f3aac0881 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportMessage.php
@@ -18,15 +18,15 @@
  */
 class AssertCustomerSegmentReportMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Customer segments report messages
      */
     const REPORT_MESSAGES = 'Viewing combined "%s" report from segments: %s.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that message is displayed on the customer segment report detail page
      *
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportNotInGrid.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportNotInGrid.php
index 935c59815e865..a5a0914bbf471 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentReportNotInGrid.php
@@ -20,8 +20,8 @@
 class AssertCustomerSegmentReportNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that created customer is absent in a customer segment grid
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessDeleteMessage.php
index 3f8ad8566b932..14c229ee2727e 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCustomerSegmentSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success delete message
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the segment.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success delete message is displayed after Customer Segments has been deleted
      *
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessSaveMessage.php
index be60bd1636731..41f7d0b30fa8a 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/Constraint/AssertCustomerSegmentSuccessSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCustomerSegmentSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You saved the segment.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You saved the segment.';
 
     /**
      * Assert that success message is displayed after Customer Segments saved
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/etc/constraint.xml
index 688cd791c3efd..e0c5ca9faaa05 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/etc/constraint.xml
@@ -9,48 +9,48 @@
 -->
 <constraint>
     <assertCustomerSegmentSuccessSaveMessage module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentSuccessSaveMessage>
     <assertCustomerSegmentInGrid module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentInGrid>
     <assertCustomerSegmentForm module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentForm>
     <assertCustomerSegmentMatchedCustomer module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentMatchedCustomer>
     <assertCustomerSegmentMatchedCustomerWithCart module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentMatchedCustomerWithCart>
     <assertCustomerSegmentInCartPriceRuleIsApplying module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentInCartPriceRuleIsApplying>
     <assertCustomerSegmentInCartPriceRuleIsNotApplying module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentInCartPriceRuleIsNotApplying>
     <assertCustomerSegmentAvailableInBannerForm module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentAvailableInBannerForm>
     <assertCustomerSegmentMatchedCustomersInGrid module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentMatchedCustomersInGrid>
     <assertCustomerSegmentNotInGrid module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentNotInGrid>
     <assertCustomerSegmentNotApplicableToBanner module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentNotApplicableToBanner>
     <assertCustomerSegmentSuccessDeleteMessage module="Magento_CustomerSegment">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerSegmentSuccessDeleteMessage>
     <assertCustomerSegmentReportMessage module="Magento_CustomerSegment">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertCustomerSegmentReportMessage>
     <assertCustomerSegmentReportInGrid module="Magento_CustomerSegment">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertCustomerSegmentReportInGrid>
     <assertCustomerSegmentReportNotInGrid module="Magento_CustomerSegment">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertCustomerSegmentReportNotInGrid>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
index 6124834034d5c..9ce65b4096041 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableDuplicateForm.php
@@ -19,8 +19,8 @@
 class AssertDownloadableDuplicateForm extends AssertProductDuplicateForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert form data equals duplicate product downloadable data
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
index fa01c1d8dec79..db96015977102 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableLinksData.php
@@ -20,6 +20,10 @@
  */
 class AssertDownloadableLinksData extends AbstractAssertForm
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * List downloadable link fields for verify
      *
@@ -40,10 +44,6 @@ class AssertDownloadableLinksData extends AbstractAssertForm
         'links_purchased_separately',
         'price'
     ];
-    
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
 
     /**
      * Assert Link block for downloadable product on front-end
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
index 4020f6a536856..30577cbaeac77 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertDownloadableSamplesData.php
@@ -20,6 +20,10 @@
  */
 class AssertDownloadableSamplesData extends AbstractAssertForm
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * List downloadable sample links fields for verify
      *
@@ -39,10 +43,6 @@ class AssertDownloadableSamplesData extends AbstractAssertForm
         'title',
     ];
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert Sample block for downloadable product on front-end
      *
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml
index 94559bbac7115..cf59bfbfa1751 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/etc/constraint.xml
@@ -9,16 +9,16 @@
 -->
 <constraint>
     <assertDownloadableSamplesData module="Magento_Downloadable">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertDownloadableSamplesData>
     <assertDownloadableLinksData module="Magento_Downloadable">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertDownloadableLinksData>
     <assertDownloadableProductForm module="Magento_Downloadable">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertDownloadableProductForm>
     <assertDownloadableDuplicateForm module="Magento_Downloadable">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
             <productPage class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit" />
@@ -26,6 +26,6 @@
         </require>
     </assertDownloadableDuplicateForm>
     <assertDownloadableProductInCustomerWishlistOnBackendGrid module="Magento_Downloadable">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertDownloadableProductInCustomerWishlistOnBackendGrid>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicateForm.php b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicateForm.php
index 036d87736b984..a766a2e4d29df 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicateForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicateForm.php
@@ -18,12 +18,9 @@
  */
 class AssertGiftCardDuplicateForm extends AssertProductDuplicateForm
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert form data equals duplicate gift card data.
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicatedInGrid.php b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicatedInGrid.php
index 0e7bd3e35179e..2a31fe9ec963f 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicatedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardDuplicatedInGrid.php
@@ -18,8 +18,8 @@
 class AssertGiftCardDuplicatedInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that duplicated product is found by sku and has correct product type, product template,
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductAddToCartForm.php b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductAddToCartForm.php
index dcdda973d4295..b59e8bfe9d0a2 100755
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductAddToCartForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductAddToCartForm.php
@@ -20,15 +20,15 @@
  */
 class AssertGiftCardProductAddToCartForm extends AbstractAssertForm
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Value for choose custom option
      */
     const CUSTOM_OPTION = 'custom';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that displayed amount, "Sender Name", "Sender Email", "Recipient Name", "Recipient Email", "Message" data
      * on product page(front-end) equals passed from fixture.
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductForm.php b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductForm.php
index 3e57b7124f682..be150b864cfd7 100755
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Constraint/AssertGiftCardProductForm.php
@@ -15,6 +15,10 @@
  */
 class AssertGiftCardProductForm extends AssertProductForm
 {
+    /* tags */
+    const SEVERITY = 'middle';
+    /* end tags */
+
     /**
      * Sort fields for fixture and form data
      *
@@ -23,8 +27,4 @@ class AssertGiftCardProductForm extends AssertProductForm
     protected $sortFields = [
         'giftcard_amounts::price'
     ];
-
-    /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
 }
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GiftCard/Test/etc/constraint.xml
index 25194e6a1882f..28c4d4b186cdf 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/etc/constraint.xml
@@ -9,16 +9,16 @@
 -->
 <constraint>
     <assertGiftCardProductAddToCartForm module="Magento_GiftCard">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertGiftCardProductAddToCartForm>
     <assertGiftCardProductForm module="Magento_GiftCard">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertGiftCardProductForm>
     <assertGiftCardProductPage module="Magento_GiftCard">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertGiftCardProductPage>
     <assertGiftCardDuplicatedInGrid module="Magento_GiftCard">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
             <productPage class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit" />
@@ -26,16 +26,16 @@
         </require>
     </assertGiftCardDuplicatedInGrid>
     <assertGiftCardDuplicateForm module="Magento_GiftCard">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <product class="Mtf\Fixture\FixtureInterface" />
             <productGrid class="Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex" />
         </require>
     </assertGiftCardDuplicateForm>
     <assertGiftCardProductInCustomerWishlistOnBackendGrid module="Magento_GiftCard">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardProductInCustomerWishlistOnBackendGrid>
     <assertGiftCardInGrid module="Magento_GiftCard">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardInGrid>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountForm.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountForm.php
index a2366682fcd82..683324990bcfa 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountForm.php
@@ -19,6 +19,10 @@
  */
 class AssertGiftCardAccountForm extends AbstractAssertForm
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Skipped fields for verify data
      *
@@ -26,10 +30,6 @@ class AssertGiftCardAccountForm extends AbstractAssertForm
      */
     protected $skippedFields = ['code'];
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that gift card account equals to passed from fixture
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountInGrid.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountInGrid.php
index 0dfee95ea7978..7e95048bd8732 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertGiftCardAccountInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that gift card account in grid.
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountIsNotUsableInCartOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountIsNotUsableInCartOnFrontend.php
index 322029fc3d7da..b67ee558eca69 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountIsNotUsableInCartOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountIsNotUsableInCartOnFrontend.php
@@ -21,8 +21,8 @@
 class AssertGiftCardAccountIsNotUsableInCartOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that gift card is not usable in cart on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotInGrid.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotInGrid.php
index 2258c989a5bea..d220f8f343621 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertGiftCardAccountNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that gift card account not in grid
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotRedeemableOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotRedeemableOnFrontend.php
index 431296447a3c7..c32b5458303fd 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotRedeemableOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountNotRedeemableOnFrontend.php
@@ -19,8 +19,8 @@
 class AssertGiftCardAccountNotRedeemableOnFrontend extends AbstractAssertGiftCardAccountOnFrontend
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that gift card is not redeemable on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountOnPrintOrder.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountOnPrintOrder.php
index d5440aebb134a..37c38d7411626 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountOnPrintOrder.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountOnPrintOrder.php
@@ -17,12 +17,9 @@
  */
 class AssertGiftCardAccountOnPrintOrder extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that gift card amount printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountRedeemableOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountRedeemableOnFrontend.php
index 39f8f695c9fd4..18b39f52cf412 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountRedeemableOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountRedeemableOnFrontend.php
@@ -19,15 +19,15 @@
  */
 class AssertGiftCardAccountRedeemableOnFrontend extends AbstractAssertGiftCardAccountOnFrontend
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = 'Gift Card "%s" was redeemed.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that gift card is redeemable on frontend
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSaveMessage.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSaveMessage.php
index 4cc5007630b15..d669ccbff288f 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftCardAccountSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = 'You saved the gift card account.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      *  Assert that success message is displayed after gift card account save
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInCustomerAccount.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInCustomerAccount.php
index 56c9b1dc25831..855dde7b19344 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInCustomerAccount.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInCustomerAccount.php
@@ -20,8 +20,8 @@
 class AssertGiftCardAccountStatusInCustomerAccount extends AbstractAssertGiftCardAccountOnFrontend
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created gift card account can be verified on the frontend on My Account page
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInShoppingCart.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInShoppingCart.php
index 5d7ad3f4a46d3..a60d737501c6c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountStatusInShoppingCart.php
@@ -22,8 +22,8 @@
 class AssertGiftCardAccountStatusInShoppingCart extends AbstractAssertGiftCardAccountOnFrontend
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created gift card account can be verified on the frontend in Shopping Cart
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSuccessDeleteMessage.php
index 62e3ca3110b4c..6f039ada2420f 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftCardAccountSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_DELETE_MESSAGE = 'This gift card account has been deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that gift card account delete success message is present
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountUsableInCartOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountUsableInCartOnFrontend.php
index c3de9d6dfbed4..15eb9cbb62a53 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountUsableInCartOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardAccountUsableInCartOnFrontend.php
@@ -21,8 +21,8 @@
 class AssertGiftCardAccountUsableInCartOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that gift card usable in frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardDiscount.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardDiscount.php
index e666752b4b3f1..adcf019b174bb 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardDiscount.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardDiscount.php
@@ -18,8 +18,8 @@
 class AssertGiftCardDiscount extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that sum of gift card discount is equal to passed from dataSet in shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardSuccessAddMessage.php b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardSuccessAddMessage.php
index 9d5827dc33587..94d9815860e8f 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardSuccessAddMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/Constraint/AssertGiftCardSuccessAddMessage.php
@@ -18,15 +18,15 @@
  */
 class AssertGiftCardSuccessAddMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_APPLY_MESSAGE = 'Gift Card "%s" was added.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success apply message is displayed on "Shopping Cart" frontend page
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/etc/constraint.xml
index 26cdeccdd4ed1..4ed9109a8bd52 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftCardAccount/Test/etc/constraint.xml
@@ -9,45 +9,45 @@
 -->
 <constraint>
     <assertGiftCardAccountSaveMessage module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountSaveMessage>
     <assertGiftCardAccountInGrid module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountInGrid>
     <assertGiftCardAccountForm module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountForm>
     <assertGiftCardAccountUsableInCartOnFrontend module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountUsableInCartOnFrontend>
     <assertGiftCardAccountRedeemableOnFrontend module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountRedeemableOnFrontend>
     <assertGiftCardAccountIsNotUsableInCartOnFrontend module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountIsNotUsableInCartOnFrontend>
     <assertGiftCardAccountNotRedeemableOnFrontend module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountNotRedeemableOnFrontend>
     <assertGiftCardAccountSuccessDeleteMessage module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountSuccessDeleteMessage>
     <assertGiftCardAccountNotInGrid module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountNotInGrid>
     <assertGiftCardAccountStatusInCustomerAccount module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountStatusInCustomerAccount>
     <assertGiftCardAccountStatusInShoppingCart module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountStatusInShoppingCart>
     <assertGiftCardSuccessAddMessage module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardSuccessAddMessage>
     <assertGiftCardDiscount module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardDiscount>
     <assertGiftCardAccountOnPrintOrder module="Magento_GiftCardAccount">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftCardAccountOnPrintOrder>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
index 629abc547b4b0..3c6f5e833c579 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
@@ -19,12 +19,9 @@
  */
 class AssertGiftMessageInBackendOrder extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Skipped fields for verify data.
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
index 08da73c356f47..8fae2904f669a 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php
@@ -22,8 +22,8 @@
 class AssertGiftMessageInFrontendOrder extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that message from dataSet is displayed on order(s) view page on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
index 98686640c8fe0..3362f79e5361d 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrderItems.php
@@ -22,8 +22,8 @@
 class AssertGiftMessageInFrontendOrderItems extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that message from dataSet is displayed for each items on order(s) view page on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml
index 71c2430143a99..4e769e659b05a 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/etc/constraint.xml
@@ -9,12 +9,12 @@
 -->
 <constraint>
     <assertGiftMessageInFrontendOrderItems module="Magento_GiftMessage">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertGiftMessageInFrontendOrderItems>
     <assertGiftMessageInFrontendOrder module="Magento_GiftMessage">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertGiftMessageInFrontendOrder>
     <assertGiftMessageInBackendOrder module="Magento_GiftMessage">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertGiftMessageInBackendOrder>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInShoppingCart.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInShoppingCart.php
index 8ed2b0baadac8..3f787bad197b3 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInShoppingCart.php
@@ -23,8 +23,8 @@
 class AssertGiftRegistryActiveInShoppingCart extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product can be added to active gift registry from Shopping Cart
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInWishlist.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInWishlist.php
index d3ea3221b4a7f..d1f28998cebfc 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryActiveInWishlist.php
@@ -23,15 +23,15 @@
  */
 class AssertGiftRegistryActiveInWishlist extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success message after gift registry has been added
      */
     const SUCCESS_MESSAGE = 'The wish list item has been added to this gift registry.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that product can be added to active gift registry from Wishlist
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryForm.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryForm.php
index 07f715da68bdf..de3c68735646a 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryForm.php
@@ -20,8 +20,8 @@
 class AssertGiftRegistryForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInGrid.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInGrid.php
index 242d79a2f8622..545a7cb9361a0 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInGrid.php
@@ -19,8 +19,8 @@
 class AssertGiftRegistryInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Gift Registry can be found at Gift Registry grid by title
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInactiveNotInWishlist.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInactiveNotInWishlist.php
index 6217d5a56955c..4ac32370d9e2c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInactiveNotInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryInactiveNotInWishlist.php
@@ -22,8 +22,8 @@
 class AssertGiftRegistryInactiveNotInWishlist extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product can not be added to inactive gift registry from Wishlist
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryIsEmptyMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryIsEmptyMessage.php
index 367de89a4e12d..a750d4a21cd88 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryIsEmptyMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryIsEmptyMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftRegistryIsEmptyMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Gift registry info message
      */
     const INFO_MESSAGE = 'This gift registry has no items.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that notice message appears if Gift Registry doesn't have any items after delete
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsForm.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsForm.php
index aa4a6a6489fc1..9c7f4b67677ac 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsForm.php
@@ -23,8 +23,8 @@
 class AssertGiftRegistryItemsForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that displayed Gift Registry items data on edit page equals passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedFrontendSuccessMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedFrontendSuccessMessage.php
index 29db77492c2c4..150edc0d1e135 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedFrontendSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedFrontendSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftRegistryItemsUpdatedFrontendSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success gift registry items update message
      */
     const SUCCESS_MESSAGE = 'You updated the gift registry items.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after gift registry items has been updated
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedSuccessMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedSuccessMessage.php
index 3fba05cd1f539..005997bbd67fb 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryItemsUpdatedSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftRegistryItemsUpdatedSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success gift registry update message
      */
     const SUCCESS_MESSAGE = 'You updated this gift registry.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success update message is displayed after gift registry items updating on backend
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryManageItemsTab.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryManageItemsTab.php
index 68c0011244c2c..566ff20f62672 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryManageItemsTab.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryManageItemsTab.php
@@ -23,8 +23,8 @@
 class AssertGiftRegistryManageItemsTab extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Manage Items page on frontend contains correct product name and quantity
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryNotInGrid.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryNotInGrid.php
index 8013041826ead..d667d7c64be47 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertGiftRegistryNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Gift Registry can not be found at Gift Registry grid by title
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessAddedItemsMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessAddedItemsMessage.php
index 74b1143b73fa8..13c0da213ce4c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessAddedItemsMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessAddedItemsMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftRegistrySuccessAddedItemsMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success added to gift registry message
      */
     const SUCCESS_MESSAGE = 'Shopping cart items have been added to gift registry.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after adding products to gift registry on backend
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessDeleteMessageOnBackend.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessDeleteMessageOnBackend.php
index 445f383592f64..6eda8e4d96781 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessDeleteMessageOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessDeleteMessageOnBackend.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftRegistrySuccessDeleteMessageOnBackend extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success gift registry delete message
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted this gift registry entity.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert message appears after delete gift registry on backend
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessSaveMessage.php
index 2611c9055d629..196180b42b20f 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftRegistrySuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success gift registry save message
      */
     const SUCCESS_MESSAGE = 'You saved this gift registry.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after gift registry has been created
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnBackend.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnBackend.php
index 4af3ca48e8d2c..4ed0804b3531b 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnBackend.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftRegistrySuccessShareMessageOnBackend extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success gift registry share message on backend
      */
     const SUCCESS_MESSAGE = '%d email(s) were sent.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after gift registry has been share on backend
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnFrontend.php
index 2944b097964a5..be00b43f89574 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistrySuccessShareMessageOnFrontend.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftRegistrySuccessShareMessageOnFrontend extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success gift registry share message on frontend
      */
     const SUCCESS_MESSAGE = 'You shared the gift registry for %d emails.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after gift registry has been shared on frontend
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeForm.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeForm.php
index 23bf6fe992da2..9c07ac1d7d6b2 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeForm.php
@@ -20,8 +20,8 @@
 class AssertGiftRegistryTypeForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that GiftRegistryType form filled correctly
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeInGrid.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeInGrid.php
index 247fa22f95b54..e11f693e7da4c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeInGrid.php
@@ -19,8 +19,8 @@
 class AssertGiftRegistryTypeInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Gift Registry type can be found at Stores > Gift Registry grid in backend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotInGrid.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotInGrid.php
index 94fde9f1e5bee..e0859f95c906b 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertGiftRegistryTypeNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted Gift Registry type is absent in Stores > Gift Registry grid in backend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotOnFrontend.php
index e52d8ad283889..dd57b86b7b8c7 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeNotOnFrontend.php
@@ -24,8 +24,8 @@
 class AssertGiftRegistryTypeNotOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted Gift Registry type is absent on creation new gift registry form on my account on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeOnFrontend.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeOnFrontend.php
index 360bf4a5b9e5c..aa5fd753a7061 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeOnFrontend.php
@@ -22,8 +22,8 @@
 class AssertGiftRegistryTypeOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Gift Registry type can be found at Customer Account > Gift Registry
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessDeleteMessage.php
index e4c954b86af7e..c22cf107cc0ee 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftRegistryTypeSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success gift registry delete message
      */
     const DELETE_MESSAGE = 'You deleted the gift registry type.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success delete message is displayed after gift registry has been deleted
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessSaveMessage.php
index 460903e7fb6fe..d3dd3f2303cf4 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/Constraint/AssertGiftRegistryTypeSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftRegistryTypeSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success gift registry type save message
      */
     const SUCCESS_MESSAGE = 'You saved the gift registry type.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that after save a Gift Registry type success message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/etc/constraint.xml
index 35564a6e43a64..94b9a26b40816 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/etc/constraint.xml
@@ -9,75 +9,75 @@
 -->
 <constraint>
     <assertGiftRegistrySuccessSaveMessage module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistrySuccessSaveMessage>
     <assertGiftRegistryInGrid module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryInGrid>
     <assertGiftRegistryForm module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryForm>
     <assertGiftRegistryActiveInShoppingCart module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryActiveInShoppingCart>
     <assertGiftRegistryInactiveNotInShoppingCart module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryInactiveNotInShoppingCart>
     <assertGiftRegistryActiveInWishlist module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryActiveInWishlist>
     <assertGiftRegistryInactiveNotInWishlist module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryInactiveNotInWishlist>
     <assertGiftRegistryNotInGrid module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryNotInGrid>
     <assertGiftRegistrySuccessDeleteMessageOnBackend module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistrySuccessDeleteMessageOnBackend>
     <assertGiftRegistrySuccessShareMessageOnFrontend module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistrySuccessShareMessageOnFrontend>
     <assertGiftRegistryTypeSuccessSaveMessage module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryTypeSuccessSaveMessage>
     <assertGiftRegistryTypeInGrid module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryTypeInGrid>
     <assertGiftRegistryTypeOnFrontend module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryTypeOnFrontend>
     <assertGiftRegistryTypeForm module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryTypeForm>
     <assertGiftRegistrySuccessShareMessageOnBackend module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistrySuccessShareMessageOnBackend>
     <assertGiftRegistryTypeSuccessDeleteMessage module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryTypeSuccessDeleteMessage>
     <assertGiftRegistryTypeNotInGrid module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryTypeNotInGrid>
     <assertGiftRegistryTypeNotOnFrontend module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryTypeNotOnFrontend>
     <assertGiftRegistryItemsUpdatedSuccessMessage module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryItemsUpdatedSuccessMessage>
     <assertGiftRegistryManageItemsTab module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryManageItemsTab>
     <assertGiftRegistrySuccessAddedItemsMessage module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistrySuccessAddedItemsMessage>
     <assertGiftRegistryItemsUpdatedFrontendSuccessMessage module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryItemsUpdatedFrontendSuccessMessage>
     <assertGiftRegistryItemsForm module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryItemsForm>
     <assertGiftRegistryIsEmptyMessage module="Magento_GiftRegistry">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftRegistryIsEmptyMessage>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingForm.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingForm.php
index 9ffd668056830..837f4919b134c 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingForm.php
@@ -19,8 +19,8 @@
 class AssertGiftWrappingForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Skipped fields while verifying
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingInGrid.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingInGrid.php
index b1ef33ed5744f..e2c3d6f00b90e 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingInGrid.php
@@ -18,8 +18,8 @@
 class AssertGiftWrappingInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert Gift Wrapping availability in Gift Wrapping grid
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionForm.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionForm.php
index de1b784fbcdff..957eb94ef3c70 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionForm.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionForm.php
@@ -20,8 +20,8 @@
 class AssertGiftWrappingMassActionForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * @param GiftWrappingIndex $giftWrappingIndexPage
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionInGrid.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionInGrid.php
index a2d51b87db764..38b7bd8ad9779 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionInGrid.php
@@ -19,8 +19,8 @@
 class AssertGiftWrappingMassActionInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert Gift Wrapping availability in Gift Wrapping grid after mass action
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionNotInGrid.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionNotInGrid.php
index 9ce2bd4506b80..45adbad6568d6 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertGiftWrappingMassActionNotInGrid extends AssertGiftWrappingNotInGrid
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted Gift Wrapping can not be found in grid via: id, design, website_id, status, price
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionSuccessDeleteMessage.php
index 2c1bae36d5143..5175f5f179b2e 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingMassActionSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftWrappingMassActionSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message displayed after delete gift wrapping
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted a total of %d records.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after mass delete Gift Wrapping successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotInGrid.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotInGrid.php
index ab8d48fc87f29..3347babda00b2 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertGiftWrappingNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted Gift Wrapping can not be found in grid via: id, design, website_id, status, price
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnFrontendCheckout.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnFrontendCheckout.php
index 2872fb9dd40ea..033989c50be09 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnFrontendCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnFrontendCheckout.php
@@ -26,8 +26,8 @@
 class AssertGiftWrappingNotOnFrontendCheckout extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted Gift Wrapping can not be found during one page checkout on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnOrderCreationPage.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnOrderCreationPage.php
index 4244a91eb0d36..21bbae07f2c09 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnOrderCreationPage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingNotOnOrderCreationPage.php
@@ -20,8 +20,8 @@
 class AssertGiftWrappingNotOnOrderCreationPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted Gift Wrapping can not be found on order creation page in backend
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingOnFrontendCheckout.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingOnFrontendCheckout.php
index 3a32e7be8eeff..9276c64409b72 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingOnFrontendCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingOnFrontendCheckout.php
@@ -26,8 +26,8 @@
 class AssertGiftWrappingOnFrontendCheckout extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Gift Wrapping can be found during one page checkout on frontend
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessDeleteMessage.php
index b31a9f5c6992c..aae0ca3c2e8a4 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftWrappingSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message displayed after delete gift wrapping
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the gift wrapping.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after delete Gift Wrapping successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessSaveMessage.php
index e4b5a116bd860..10c61b49ce1fe 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertGiftWrappingSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_SAVE_MESSAGE = 'You saved the gift wrapping.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_SAVE_MESSAGE = 'You saved the gift wrapping.';
 
     /**
      * Assert that success message is displayed after Gift Wrapping saved
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessUpdateMessage.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessUpdateMessage.php
index 1182cf787040d..b87a54b7aadf0 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessUpdateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/Constraint/AssertGiftWrappingSuccessUpdateMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertGiftWrappingSuccessUpdateMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message displayed after update gift wrapping
      */
     const SUCCESS_UPDATE_MESSAGE = 'You updated a total of %d records.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that after update Gift Wrapping successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/etc/constraint.xml
index c679c87005372..8b441a616dced 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/etc/constraint.xml
@@ -9,42 +9,42 @@
 -->
 <constraint>
     <assertGiftWrappingSuccessSaveMessage module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingSuccessSaveMessage>
     <assertGiftWrappingForm module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingForm>
     <assertGiftWrappingInGrid module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingInGrid>
     <assertGiftWrappingSuccessDeleteMessage module="Magento_GiftWrapping">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertGiftWrappingSuccessDeleteMessage>
     <assertGiftWrappingNotInGrid module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingNotInGrid>
     <assertGiftWrappingNotOnOrderCreationPage module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingNotOnOrderCreationPage>
     <assertGiftWrappingNotOnFrontendCheckout module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingNotOnFrontendCheckout>
     <assertGiftWrappingMassActionSuccessDeleteMessage module="Magento_GiftWrapping">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertGiftWrappingMassActionSuccessDeleteMessage>
     <assertGiftWrappingMassActionInGrid module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingMassActionInGrid>
     <assertGiftWrappingOnFrontendCheckout module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingOnFrontendCheckout>
     <assertGiftWrappingSuccessUpdateMessage module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingSuccessUpdateMessage>
     <assertGiftWrappingMassActionForm module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingMassActionForm>
     <assertGiftWrappingMassActionNotInGrid module="Magento_GiftWrapping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGiftWrappingMassActionNotInGrid>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php
index feb8f6073152f..513bb1f2f32ed 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Constraint/AssertProductAttributeAbsenceForAttributeMapping.php
@@ -21,8 +21,8 @@
 class AssertProductAttributeAbsenceForAttributeMapping extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that deleted attribute can't be mapped to Google Attribute (attribute doesn't appear in Attributes
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/constraint.xml
index 365a75b9bf1b9..1bd1fdc992b7f 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/etc/constraint.xml
@@ -9,6 +9,6 @@
 -->
 <constraint>
     <assertProductAttributeAbsenceForAttributeMapping module="Magento_GoogleShopping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAttributeAbsenceForAttributeMapping>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
index 18cd326bebae7..9eca7a990d56e 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
@@ -20,8 +20,8 @@
 class AssertGroupedPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupedProductPage
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Format error message
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
index fc221a71b8627..5669a089a7d04 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductForm.php
@@ -19,8 +19,8 @@
 class AssertGroupedProductForm extends AssertProductForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert form data equals fixture data
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
index cee23471442d9..fe4d0acd3c15e 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductInItemsOrderedGrid.php
@@ -19,8 +19,8 @@
 class AssertGroupedProductInItemsOrderedGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Fields for assert
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
index 0e1ba65cc3342..528dde70c6a6b 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedProductsDefaultQty.php
@@ -20,8 +20,8 @@
 class AssertGroupedProductsDefaultQty extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that default qty for sub products in grouped product displays according to dataset on product page
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
index 248b8c63ba4ba..b833b71252849 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertSpecialPriceOnGroupedProductPage.php
@@ -19,8 +19,8 @@
 class AssertSpecialPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupedProductPage
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Format error message
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
index 1850446b52aa4..b0d78618bd67b 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertTierPriceOnGroupedProductPage.php
@@ -20,8 +20,8 @@
 class AssertTierPriceOnGroupedProductPage extends AbstractAssertPriceOnGroupedProductPage
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Format error message
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/constraint.xml
index e561e168dc9d7..3fc3c8492c934 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/etc/constraint.xml
@@ -9,24 +9,24 @@
 -->
 <constraint>
     <assertGroupedProductsDefaultQty module="Magento_GroupedProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGroupedProductsDefaultQty>
     <assertGroupedProductForm module="Magento_GroupedProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGroupedProductForm>
     <assertTierPriceOnGroupedProductPage module="Magento_GroupedProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTierPriceOnGroupedProductPage>
     <assertSpecialPriceOnGroupedProductPage module="Magento_GroupedProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSpecialPriceOnGroupedProductPage>
     <assertGroupedPriceOnGroupedProductPage module="Magento_GroupedProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGroupedPriceOnGroupedProductPage>
     <assertGroupedProductInCustomerWishlistOnBackendGrid module="Magento_GroupedProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGroupedProductInCustomerWishlistOnBackendGrid>
     <assertGroupedProductInItemsOrderedGrid module="Magento_GroupedProduct">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertGroupedProductInItemsOrderedGrid>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
index d332a71c16c02..8b79251b850f5 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/Constraint/AssertProductAttributeAbsenceForExport.php
@@ -20,8 +20,8 @@
 class AssertProductAttributeAbsenceForExport extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that deleted attribute can't be used for Products' Export
diff --git a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/constraint.xml
index 86550a12fbdc3..96752395f2347 100644
--- a/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/ImportExport/Test/etc/constraint.xml
@@ -9,6 +9,6 @@
 -->
 <constraint>
     <assertProductAttributeAbsenceForExport module="Magento_ImportExport">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductAttributeAbsenceForExport>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
index 810f89b1c3868..3ebf0bd3d4332 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationForm.php
@@ -20,8 +20,8 @@
 class AssertIntegrationForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Skipped fields while verifying
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
index 773b8a173e741..1e01459a228df 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationInGrid.php
@@ -19,8 +19,8 @@
 class AssertIntegrationInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that data in grid on Integrations page according to fixture by name field
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
index 2ebdcec57e9cd..839a3c804ac72 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertIntegrationNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that Integration is not presented in grid and cannot be found using name
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
index 20fe3054e9317..f6035b0663de4 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationResourcesPopup.php
@@ -19,8 +19,8 @@
 class AssertIntegrationResourcesPopup extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that pop-up with resources, that were specified for integration are shown
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
index 2f82af3ab1b5b..13fc13f857094 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessActivationMessage.php
@@ -18,11 +18,11 @@
  */
 class AssertIntegrationSuccessActivationMessage extends AbstractConstraint
 {
-    const SUCCESS_ACTIVATION_MESSAGE = "The integration '%s' has been activated.";
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_ACTIVATION_MESSAGE = "The integration '%s' has been activated.";
 
     /**
      * Assert that success activation message is appeared on the Integrations page
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
index 53a4d999f2d67..239ad4ade1353 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessDeleteMessage.php
@@ -18,11 +18,11 @@
  */
 class AssertIntegrationSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = "The integration '%s' has been deleted.";
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = "The integration '%s' has been deleted.";
 
     /**
      * Assert that success delete message is appeared on the Integrations page
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php
index 997cd9e988dcb..851e197be0a97 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessReauthorizeMessage.php
@@ -18,18 +18,15 @@
  */
 class AssertIntegrationSuccessReauthorizeMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Integration success reauthorize message.
      */
     const SUCCESS_REAUTHORIZE_MESSAGE = "The integration '%s' has been re-authorized.";
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
-
     /**
      * Assert that success reauthorize message is appeared on the Integrations page.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
index 3bbd95dad5841..bfd23e26473ca 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationSuccessSaveMessage.php
@@ -18,11 +18,11 @@
  */
 class AssertIntegrationSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_SAVE_MESSAGE = "The integration '%s' has been saved.";
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_SAVE_MESSAGE = "The integration '%s' has been saved.";
 
     /**
      * Assert that success save message is appeared on the Integrations page
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php
index 93e2f2c6b7d7e..e5ca5f5831fd0 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensAfterReauthorize.php
@@ -19,12 +19,9 @@
  */
 class AssertIntegrationTokensAfterReauthorize extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Fields don't have to change.
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
index 66fb6497e3834..a3e56781d4ce8 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/Constraint/AssertIntegrationTokensPopup.php
@@ -18,8 +18,8 @@
 class AssertIntegrationTokensPopup extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Fields to be checked
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Integration/Test/etc/constraint.xml
index cdc012e29f32c..ffc57da4d3099 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/etc/constraint.xml
@@ -9,21 +9,21 @@
 -->
 <constraint>
     <assertIntegrationSuccessSaveMessage module="Magento_Integration">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <integrationIndex class="Magento\Integration\Test\Page\Adminhtml\IntegrationIndex" />
             <integration class="Magento\Integration\Test\Fixture\Integration" />
         </require>
     </assertIntegrationSuccessSaveMessage>
     <assertIntegrationInGrid module="Magento_Integration">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <integrationIndex class="Magento\Integration\Test\Page\Adminhtml\IntegrationIndex" />
             <integration class="Magento\Integration\Test\Fixture\Integration" />
         </require>
     </assertIntegrationInGrid>
     <assertIntegrationForm module="Magento_Integration">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <integrationIndex class="Magento\Integration\Test\Page\Adminhtml\IntegrationIndex" />
             <integrationNew class="Magento\Integration\Test\Page\Adminhtml\IntegrationNew" />
@@ -31,48 +31,48 @@
         </require>
     </assertIntegrationForm>
     <assertIntegrationSuccessDeleteMessage module="Magento_Integration">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <integrationIndex class="Magento\Integration\Test\Page\Adminhtml\IntegrationIndex" />
             <integration class="Magento\Integration\Test\Fixture\Integration" />
         </require>
     </assertIntegrationSuccessDeleteMessage>
     <assertIntegrationNotInGrid module="Magento_Integration">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <integrationIndex class="Magento\Integration\Test\Page\Adminhtml\IntegrationIndex" />
             <integration class="Magento\Integration\Test\Fixture\Integration" />
         </require>
     </assertIntegrationNotInGrid>
     <assertIntegrationResourcesPopup module="Magento_Integration">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <integrationIndex class="Magento\Integration\Test\Page\Adminhtml\IntegrationIndex" />
             <integration class="Magento\Integration\Test\Fixture\Integration" />
         </require>
     </assertIntegrationResourcesPopup>
     <assertIntegrationTokensPopup module="Magento_Integration">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <integrationIndex class="Magento\Integration\Test\Page\Adminhtml\IntegrationIndex" />
         </require>
     </assertIntegrationTokensPopup>
     <assertIntegrationSuccessActivationMessage module="Magento_Integration">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <integrationIndex class="Magento\Integration\Test\Page\Adminhtml\IntegrationIndex" />
             <integration class="Magento\Integration\Test\Fixture\Integration" />
         </require>
     </assertIntegrationSuccessActivationMessage>
     <assertIntegrationSuccessReauthorizeMessage module="Magento_Integration">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <integrationIndex class="Magento\Integration\Test\Page\Adminhtml\IntegrationIndex" />
             <integration class="Magento\Integration\Test\Fixture\Integration" />
         </require>
     </assertIntegrationSuccessReauthorizeMessage>
     <assertIntegrationTokensAfterReauthorize module="Magento_Integration">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <integrationIndex class="Magento\Integration\Test\Page\Adminhtml\IntegrationIndex" />
             <integrationNew class="Magento\Integration\Test\Page\Adminhtml\IntegrationNew" />
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationErrorSentMessage.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationErrorSentMessage.php
index e6dfe3f15861a..682f5ce2ce15d 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationErrorSentMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationErrorSentMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertInvitationErrorSentMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Error send message.
      */
     const ERROR_MESSAGE = "Something went wrong sending %d of %d invitations.";
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that error message appears after sending invitation on backend.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationForm.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationForm.php
index 8923c5d6c51da..4eda36dc0ba02 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationForm.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationForm.php
@@ -18,12 +18,9 @@
  */
 class AssertInvitationForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Invitation form was filled correctly: email, message, status.
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendErrorSendDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendErrorSendDuplicateMessage.php
index 6279bd17bb0cc..44bc24db98bd9 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendErrorSendDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendErrorSendDuplicateMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertInvitationFrontendErrorSendDuplicateMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Error duplicate message
      */
     const ERROR_MESSAGE = "Invitation for same email address already exists.";
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that error message appears after sent invitation to the same email address
      *
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendSuccessSentMessage.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendSuccessSentMessage.php
index afdb610572a7e..f0676199a345a 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendSuccessSentMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationFrontendSuccessSentMessage.php
@@ -18,15 +18,15 @@
  */
 class AssertInvitationFrontendSuccessSentMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success sent message
      */
     const SUCCESS_MESSAGE = "You sent the invitation for %s.";
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message appears after sent invitation on frontend
      *
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGrid.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGrid.php
index 9d869057f2980..7dbf818db95f4 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertInvitationInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert created invitation appears in Invitation grid on backend: email, status, Invitee.
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGridOnFrontend.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGridOnFrontend.php
index 6eae286839407..11bb8820e49d1 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGridOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationInGridOnFrontend.php
@@ -21,8 +21,8 @@
 class AssertInvitationInGridOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert Invitation appears on frontend in My Invitations grid
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationNoticeMessage.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationNoticeMessage.php
index 9f69576f9532e..47be98c486a5e 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationNoticeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationNoticeMessage.php
@@ -17,6 +17,10 @@
  */
 class AssertInvitationNoticeMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     // @codingStandardsIgnoreStart
     /**
      * Notice message.
@@ -24,13 +28,6 @@ class AssertInvitationNoticeMessage extends AbstractConstraint
     const NOTICE_MESSAGE = "%d invitation(s) were not sent, because customer accounts already exist for specified email addresses.";
     // @codingStandardsIgnoreEnd
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that notice message appears after sending invitation on backend.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationOneEntry.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationOneEntry.php
index 497462183bcce..2a924367a3c7e 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationOneEntry.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationOneEntry.php
@@ -21,8 +21,8 @@
 class AssertInvitationOneEntry extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert only one invitation was sent to unique email on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessDiscardMessage.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessDiscardMessage.php
index 41a9ca47a1e64..6a82fc817bddb 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessDiscardMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessDiscardMessage.php
@@ -18,18 +18,15 @@
  */
 class AssertInvitationSuccessDiscardMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success discard message.
      */
     const SUCCESS_MESSAGE = "We discarded %d of %d invitations.";
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that success message appears after discard invitation on backend.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessSentMessage.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessSentMessage.php
index cb6cb0cd92b66..a0a8de8c747b3 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessSentMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessSentMessage.php
@@ -18,18 +18,15 @@
  */
 class AssertInvitationSuccessSentMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success sent message.
      */
     const SUCCESS_MESSAGE = "We sent %d of %d invitations.";
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that success message appears after sent invitation on frontend.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessSentMessageOnBackend.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessSentMessageOnBackend.php
index b38f254625eea..5612508c51228 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessSentMessageOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Constraint/AssertInvitationSuccessSentMessageOnBackend.php
@@ -16,18 +16,15 @@
  */
 class AssertInvitationSuccessSentMessageOnBackend extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success sent message.
      */
     const SUCCESS_MESSAGE = "We sent %d invitation(s).";
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that success message appears after sent invitation on frontend.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Invitation/Test/etc/constraint.xml
index 5faece0208b6c..a26cf20a99179 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/etc/constraint.xml
@@ -9,36 +9,36 @@
 -->
 <constraint>
     <assertInvitationFrontendSuccessSentMessage module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationFrontendSuccessSentMessage>
     <assertInvitationInGridOnFrontend module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationInGridOnFrontend>
     <assertInvitationInGrid module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationInGrid>
     <assertInvitationFrontendErrorSendDuplicateMessage module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationFrontendErrorSendDuplicateMessage>
     <assertInvitationOneEntry module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationOneEntry>
     <assertInvitationSuccessSentMessage module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationSuccessSentMessage>
     <assertInvitationForm module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationForm>
     <assertInvitationSuccessDiscardMessage module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationSuccessDiscardMessage>
     <assertInvitationSuccessSentMessageOnBackend module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationSuccessSentMessageOnBackend>
     <assertInvitationNoticeMessage module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationNoticeMessage>
     <assertInvitationErrorSentMessage module="Magento_Invitation">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvitationErrorSentMessage>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Logging/Test/Constraint/AssertAdminUserDataBlock.php b/dev/tests/functional/tests/app/Magento/Logging/Test/Constraint/AssertAdminUserDataBlock.php
index 8f4c8432d3b4b..dc36abb648c73 100644
--- a/dev/tests/functional/tests/app/Magento/Logging/Test/Constraint/AssertAdminUserDataBlock.php
+++ b/dev/tests/functional/tests/app/Magento/Logging/Test/Constraint/AssertAdminUserDataBlock.php
@@ -18,8 +18,8 @@
 class AssertAdminUserDataBlock extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Admin User Data block with data according action is presented on page
diff --git a/dev/tests/functional/tests/app/Magento/Logging/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Logging/Test/etc/constraint.xml
index 8ebb7c37a3bf6..852ef9227c320 100644
--- a/dev/tests/functional/tests/app/Magento/Logging/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Logging/Test/etc/constraint.xml
@@ -9,7 +9,7 @@
 -->
 <constraint>
     <assertAdminUserDataBlock module="Magento_Logging">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <pageDetails class="Magento\Logging\Test\Page\Adminhtml\Details" />
             <logging class="Magento\Logging\Test\Fixture\Logging" />
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistState.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistState.php
index 2e8426937b444..7cbb9f799367b 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistState.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistState.php
@@ -29,8 +29,8 @@
 abstract class AbstractAssertMultipleWishlistState extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'Medium';
-     /* end tags */
+    const SEVERITY = 'Medium';
+    /* end tags */
 
     /**
      * Notice type
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistSuccessMessage.php
index 21234f323f171..d38bd9aed7710 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AbstractAssertMultipleWishlistSuccessMessage.php
@@ -18,6 +18,10 @@
  */
 abstract class AbstractAssertMultipleWishlistSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success message
      *
@@ -25,10 +29,6 @@ abstract class AbstractAssertMultipleWishlistSuccessMessage extends AbstractCons
      */
     protected $message;
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert success message is displayed
      *
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertBundleProductDetailsInMultipleWishlist.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertBundleProductDetailsInMultipleWishlist.php
index 2926fc4e4e5cc..4d91c08d01294 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertBundleProductDetailsInMultipleWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertBundleProductDetailsInMultipleWishlist.php
@@ -25,8 +25,8 @@
 class AssertBundleProductDetailsInMultipleWishlist extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that the correct option details are displayed on the "View Details" tool tip.
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertDeleteMultipleWishlistButtonIsAbsent.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertDeleteMultipleWishlistButtonIsAbsent.php
index 66fc95319a0ce..b4bd132b414aa 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertDeleteMultipleWishlistButtonIsAbsent.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertDeleteMultipleWishlistButtonIsAbsent.php
@@ -18,8 +18,8 @@
 class AssertDeleteMultipleWishlistButtonIsAbsent extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'Medium';
-     /* end tags */
+    const SEVERITY = 'Medium';
+    /* end tags */
 
     /**
      * Assert that there is no "Delete Wishlist" button for Customer
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistAbsentInMyAccount.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistAbsentInMyAccount.php
index 76d217b06c73b..a22e03595db73 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistAbsentInMyAccount.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistAbsentInMyAccount.php
@@ -15,8 +15,8 @@
 class AssertMultipleWishlistAbsentInMyAccount extends AbstractAssertMultipleWishlistExist
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert wish list is absent
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistPresentInMyAccount.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistPresentInMyAccount.php
index 090b3017a7456..55b662a8075fc 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistPresentInMyAccount.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertMultipleWishlistPresentInMyAccount.php
@@ -15,8 +15,8 @@
 class AssertMultipleWishlistPresentInMyAccount extends AbstractAssertMultipleWishlistExist
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert wish list is present
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductAbsentInDefaultWishlist.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductAbsentInDefaultWishlist.php
index b8fadf8445213..10a80305df790 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductAbsentInDefaultWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductAbsentInDefaultWishlist.php
@@ -21,8 +21,8 @@
 class AssertProductAbsentInDefaultWishlist extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product is absent in default wishlist
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInCustomWishlist.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInCustomWishlist.php
index b021d86ccfc29..b42f9d9f5a574 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInCustomWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInCustomWishlist.php
@@ -23,8 +23,8 @@
 class AssertProductInCustomWishlist extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product is present in custom wishlist
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInDefaultWishlist.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInDefaultWishlist.php
index 272187990e182..09f146acd4a7c 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInDefaultWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertProductInDefaultWishlist.php
@@ -21,8 +21,8 @@
 class AssertProductInDefaultWishlist extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product and quantity is present in default wishlist
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertWishlistReportGrid.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertWishlistReportGrid.php
index 876800190f75b..ec5f04e40d66b 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertWishlistReportGrid.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Constraint/AssertWishlistReportGrid.php
@@ -20,8 +20,8 @@
 class AssertWishlistReportGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that added to the customer wish list products present in the grid and products have correct values
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/etc/constraint.xml
index 1f4686b019b78..93d27bfa8ba05 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/etc/constraint.xml
@@ -9,39 +9,39 @@
 -->
 <constraint>
     <assertMultipleWishlistSuccessSaveMessage module="Magento_MultipleWishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertMultipleWishlistSuccessSaveMessage>
     <assertMultipleWishlistPresentInMyAccount module="Magento_MultipleWishlist">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertMultipleWishlistPresentInMyAccount>
     <assertMultipleWishlistIsPublic module="Magento_MultipleWishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertMultipleWishlistIsPublic>
     <assertMultipleWishlistIsPrivate module="Magento_MultipleWishlist">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
     </assertMultipleWishlistIsPrivate>
     <assertMultipleWishlistSuccessDeleteMessage module="Magento_MultipleWishlist">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
     </assertMultipleWishlistSuccessDeleteMessage>
     <assertMultipleWishlistAbsentInMyAccount module="Magento_MultipleWishlist">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
     </assertMultipleWishlistAbsentInMyAccount>
     <assertDeleteMultipleWishlistButtonIsAbsent module="Magento_MultipleWishlist">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
     </assertDeleteMultipleWishlistButtonIsAbsent>
     <assertWishlistReportGrid module="Magento_MultipleWishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWishlistReportGrid>
     <assertProductInCustomWishlist module="Magento_MultipleWishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductInCustomWishlist>
     <assertProductInDefaultWishlist module="Magento_MultipleWishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductInDefaultWishlist>
     <assertProductAbsentInDefaultWishlist module="Magento_MultipleWishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductAbsentInDefaultWishlist>
     <assertBundleProductDetailsInMultipleWishlist module="Magento_MultipleWishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBundleProductDetailsInMultipleWishlist>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
index 6c3bfdc12e525..9147b56cd2e06 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertCustomerIsSubscribedToNewsletter.php
@@ -19,8 +19,8 @@
 class AssertCustomerIsSubscribedToNewsletter extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert customer is subscribed to newsletter
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
index daa4fca483651..1226aaebdde66 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterForm.php
@@ -20,8 +20,8 @@
 class AssertNewsletterForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that newsletter template form data equals to data passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
index 9320545c871bb..46ffa7cd2d6b8 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterInGrid.php
@@ -20,8 +20,8 @@
 class AssertNewsletterInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      *  Assert that newsletter template is present in grid
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
index 8a6d7ab52e885..a1a462b7ec488 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterPreview.php
@@ -20,8 +20,8 @@
 class AssertNewsletterPreview extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that newsletter preview opened in new window and template content correct
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
index c8b3f5c57e9f5..7a25f46efd490 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterQueue.php
@@ -18,6 +18,10 @@
  */
 class AssertNewsletterQueue extends AbstractAssertForm
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Skipped fields for verify data
      *
@@ -25,10 +29,6 @@ class AssertNewsletterQueue extends AbstractAssertForm
      */
     protected $skippedFields = ['code'];
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that "Edit Queue" page opened and subject, sender name, sender email and template content correct
      *
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
index 416fe0d0ac57e..6ff1b88987169 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/Constraint/AssertNewsletterSuccessCreateMessage.php
@@ -18,11 +18,11 @@
  */
 class AssertNewsletterSuccessCreateMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The newsletter template has been saved.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The newsletter template has been saved.';
 
     /**
      * Assert that success message is displayed after newsletter template save
diff --git a/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml
index 169c16bf4e52b..3bf4d05ba0696 100644
--- a/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Newsletter/Test/etc/constraint.xml
@@ -9,21 +9,21 @@
 -->
 <constraint>
     <assertNewsletterSuccessCreateMessage module="Magento_Newsletter">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertNewsletterSuccessCreateMessage>
     <assertNewsletterInGrid module="Magento_Newsletter">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertNewsletterInGrid>
     <assertNewsletterPreview module="Magento_Newsletter">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertNewsletterPreview>
     <assertNewsletterQueue module="Magento_Newsletter">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertNewsletterQueue>
     <assertCustomerIsSubscribedToNewsletter module="Magento_Newsletter">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerIsSubscribedToNewsletter>
     <assertNewsletterForm module="Magento_Newsletter">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertNewsletterForm>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderForm.php b/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderForm.php
index 0cdbdfe5d9054..e091d3091ec6e 100644
--- a/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderForm.php
+++ b/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderForm.php
@@ -18,12 +18,9 @@
  */
 class AssertReminderForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'medium';
+    /* tags */
+    const SEVERITY = 'medium';
+    /* end tags */
 
     /**
      * Skipped fields for verify data.
diff --git a/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderInGrid.php b/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderInGrid.php
index 149e15be7f12b..820edaa74b7ca 100644
--- a/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderInGrid.php
@@ -17,12 +17,9 @@
  */
 class AssertReminderInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert reminder with following fields is present in grid:
diff --git a/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderMatchedCustomers.php b/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderMatchedCustomers.php
index e004df8361390..9d3e0f47dc02e 100644
--- a/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderMatchedCustomers.php
+++ b/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderMatchedCustomers.php
@@ -26,12 +26,9 @@
  */
 class AssertReminderMatchedCustomers extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Browser.
diff --git a/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderSuccessSaveMessage.php
index 618fd3558d88c..d6b77fdbcf80c 100644
--- a/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reminder/Test/Constraint/AssertReminderSuccessSaveMessage.php
@@ -16,18 +16,15 @@
  */
 class AssertReminderSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text success save reminder message.
      */
     const SUCCESS_SAVE_MESSAGE = 'You saved the reminder rule.';
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that success message is present.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Reminder/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Reminder/Test/etc/constraint.xml
index 35be1fa698833..42d17dd2b6b6c 100644
--- a/dev/tests/functional/tests/app/Magento/Reminder/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Reminder/Test/etc/constraint.xml
@@ -9,15 +9,15 @@
 -->
 <constraint>
     <assertReminderSuccessSaveMessage module="Magento_Reminder">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertReminderSuccessSaveMessage>
     <assertReminderInGrid module="Magento_Reminder">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertReminderInGrid>
     <assertReminderForm module="Magento_Reminder">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
     </assertReminderForm>
     <assertReminderMatchedCustomers module="Magento_Reminder">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertReminderMatchedCustomers>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php
index bc1ddabc1705d..2d2b2af89566b 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AbstractAssertCustomerOrderReportResult.php
@@ -18,8 +18,8 @@
 abstract class AbstractAssertCustomerOrderReportResult extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Prepare filter
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
index eaa6f307c11ca..84df5a2c31f4c 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertAbandonedCartCustomerInfoResult.php
@@ -20,8 +20,8 @@
 class AssertAbandonedCartCustomerInfoResult extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert customer info in Abandoned Carts report (Reports > Abandoned carts):
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php
index 609e7c16ae5fb..f6c5c89fcbea2 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertBestsellerReportResult.php
@@ -18,12 +18,9 @@
  */
 class AssertBestsellerReportResult extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert bestseller info in report: date, product name and qty.
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
index e06dd79b57a48..4d88516fab521 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCouponReportResult.php
@@ -19,8 +19,8 @@
 class AssertCouponReportResult extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert coupon info in report: code, rule name, subtotal, discount on coupons report page
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php
index 65a5778749258..6d5d64935857d 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderCountReportResult.php
@@ -18,8 +18,8 @@
 class AssertCustomerOrderCountReportResult extends AbstractAssertCustomerOrderReportResult
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert OrderCountReport grid for all params
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php
index c7b9926846e21..b54b393152af2 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertCustomerOrderTotalReportResult.php
@@ -18,8 +18,8 @@
 class AssertCustomerOrderTotalReportResult extends AbstractAssertCustomerOrderReportResult
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert OrderTotalReport grid for all params
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
index 8c3fcb7317741..16c6e7a5ac5a9 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertDownloadsReportResult.php
@@ -19,8 +19,8 @@
 class AssertDownloadsReportResult extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert product info in report: product name, link title, sku, downloads number (Reports > Products > Downloads)
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php
index 1d5547381e2f8..a89b3872f669c 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportIntervalResult.php
@@ -17,8 +17,8 @@
 class AssertInvoiceReportIntervalResult extends AbstractAssertInvoiceReportResult
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that sales info in report grid is actual
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php
index 7cd6adb737541..b80aa782c094c 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertInvoiceReportTotalResult.php
@@ -17,8 +17,8 @@
 class AssertInvoiceReportTotalResult extends AbstractAssertInvoiceReportResult
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that total invoice info in report grid is actual
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
index 69e8adfeecbb1..4d28e25259652 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertLowStockProductInGrid.php
@@ -19,8 +19,8 @@
 class AssertLowStockProductInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product with Low Stock is present in Low Stock grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
index 29c7a6a8f8ba0..2a5a55f1f98d9 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertNewAccountsReportTotalResult.php
@@ -18,8 +18,8 @@
 class AssertNewAccountsReportTotalResult extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that new account total result is equals to data from dataSet
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
index 19fbe563617fa..9ce07289080a4 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertOrderedProductResult.php
@@ -22,8 +22,8 @@
 class AssertOrderedProductResult extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert product name and qty in Ordered Products report
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
index 88e7caf30361a..4fe7b02d37df3 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductInCartResult.php
@@ -19,8 +19,8 @@
 class AssertProductInCartResult extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product is present in Products in Carts report grid by name, price, carts
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
index 81a3e5b780cdb..bbf4e9bc9973d 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerInGrid.php
@@ -23,8 +23,8 @@
 class AssertProductReportByCustomerInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Customer review is displayed in grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
index f2ae4a48cc577..7fc2b505b0b56 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReportByCustomerNotInGrid.php
@@ -23,8 +23,8 @@
 class AssertProductReportByCustomerNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Asserts Customer Product Review not available in grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
index e2ec20425af2d..85bb201467a69 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewIsAvailableForProduct.php
@@ -21,8 +21,8 @@
 class AssertProductReviewIsAvailableForProduct extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that review is visible in review grid for select product
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
index 57a4cd7a89f62..118e966d84890 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewReportIsVisibleInGrid.php
@@ -19,8 +19,8 @@
 class AssertProductReviewReportIsVisibleInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Product Review Report is visible in reports grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
index 670e94ed9d812..50722a1a42c61 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductReviewsQtyByCustomer.php
@@ -19,8 +19,8 @@
 class AssertProductReviewsQtyByCustomer extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert product reviews qty column in Review Report by Customer grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
index 79535567fadd0..aa1092e293f42 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertProductViewsReportTotalResult.php
@@ -18,8 +18,8 @@
 class AssertProductViewsReportTotalResult extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert product info in report: product name, price and views
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php
index 03fafdf520ded..9aacb596cdd21 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertRefundReportIntervalResult.php
@@ -18,8 +18,8 @@
 class AssertRefundReportIntervalResult extends AbstractAssertSalesReportResult
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert Credit Memo info in report: Refunds Orders, Total Refunded
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
index b0261c0cef40c..2b991117cfb14 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php
@@ -18,8 +18,8 @@
 class AssertSalesReportIntervalResult extends AbstractAssertSalesReportResult
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that sales info in report grid is actual
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
index 113dba55abf76..058262ace7e43 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php
@@ -18,8 +18,8 @@
 class AssertSalesReportTotalResult extends AbstractAssertSalesReportResult
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that total sales info in report grid is actual
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
index f0204c2c39ed4..6f3dcd4b90a59 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermReportForm.php
@@ -19,8 +19,8 @@
 class AssertSearchTermReportForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Search Term Report form data equals to passed from dataSet
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
index d89d0e3d2cbf5..eee0bb16b369e 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSearchTermsInGrid.php
@@ -18,8 +18,8 @@
 class AssertSearchTermsInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Search Terms report in grid
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
index 5e03d8ebdf7c2..673da8cd62833 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportInGrid.php
@@ -20,8 +20,8 @@
 class AssertTaxReportInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert sales info in report: Tax, Rate, Orders, Tax Amount on tax report page
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
index 2e516ecfd9136..e8c2d36930250 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertTaxReportNotInGrid.php
@@ -20,8 +20,8 @@
 class AssertTaxReportNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert Tax report is absent on tax report page
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml
index 7227ffe464b3c..ba2ff1954c02c 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/etc/constraint.xml
@@ -9,78 +9,78 @@
 -->
 <constraint>
     <assertSearchTermsInGrid module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSearchTermsInGrid>
     <assertSearchTermReportForm module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSearchTermReportForm>
     <assertLowStockProductInGrid module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertLowStockProductInGrid>
     <assertProductReviewReportIsVisibleInGrid module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductReviewReportIsVisibleInGrid>
     <assertProductReviewIsAvailableForProduct module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductReviewIsAvailableForProduct>
     <assertNewAccountsReportTotalResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertNewAccountsReportTotalResult>
     <assertProductReviewsQtyByCustomer module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductReviewsQtyByCustomer>
     <assertProductReportByCustomerInGrid module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductReportByCustomerInGrid>
     <assertProductReportByCustomerNotInGrid module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductReportByCustomerNotInGrid>
     <assertProductViewsReportTotalResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductViewsReportTotalResult>
     <assertProductInCartResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductInCartResult>
     <assertOrderedProductResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderedProductResult>
     <assertBestsellerReportResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertBestsellerReportResult>
     <assertCouponReportResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCouponReportResult>
     <assertCustomerOrderTotalReportResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerOrderTotalReportResult>
     <assertAbandonedCartCustomerInfoResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAbandonedCartCustomerInfoResult>
     <assertCustomerOrderCountReportResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCustomerOrderCountReportResult>
     <assertTaxReportInGrid module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTaxReportInGrid>
     <assertTaxReportNotInGrid module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTaxReportNotInGrid>
     <assertDownloadsReportResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertDownloadsReportResult>
     <assertSalesReportIntervalResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSalesReportIntervalResult>
     <assertSalesReportTotalResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSalesReportTotalResult>
     <assertInvoiceReportIntervalResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvoiceReportIntervalResult>
     <assertInvoiceReportTotalResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvoiceReportTotalResult>
     <assertRefundReportIntervalResult module="Magento_Reports">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertRefundReportIntervalResult>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
index 77135c683c0f7..78f7561f9d9e3 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInGrid.php
@@ -18,8 +18,8 @@
 class AssertProductRatingInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert product Rating availability in product Rating grid
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
index 783fb30ae3ddd..5135fb62f91aa 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingInProductPage.php
@@ -22,8 +22,8 @@
 class AssertProductRatingInProductPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product rating is displayed on product review(frontend)
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
index 736cb92f18a2c..3ba8a814b3c8f 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertProductRatingNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert product Rating is absent on product Rating grid
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
index 5086b553949b6..e3b52b57a537b 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingNotInProductPage.php
@@ -20,8 +20,8 @@
 class AssertProductRatingNotInProductPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product rating is not displayed on frontend on product review
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
index cddc7cdb31875..e87d4c7252291 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingOnReviewPage.php
@@ -19,8 +19,8 @@
 class AssertProductRatingOnReviewPage extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product rating is displayed on product review(backend)
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
index 8bdb0d05d380a..eaa62e367e571 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertProductRatingSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'You deleted the rating.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'You deleted the rating.';
 
     /**
      * Assert that success message is displayed after rating delete
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
index dd24dcf03b415..2b3aae7e3c90b 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductRatingSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertProductRatingSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You saved the rating.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You saved the rating.';
 
     /**
      * Assert that success message is displayed after rating save
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
index 37b4dffa5474d..3793b5824c40b 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewBackendSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertProductReviewBackendSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'middle';
+    /* end tags */
+
     /**
      * Text of success message after review created
      */
     const SUCCESS_MESSAGE = 'You saved the review.';
 
-    /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after review created
      *
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
index 71f3fa412db54..5e0a17666d54b 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGrid.php
@@ -20,8 +20,8 @@
 class AssertProductReviewInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Filter params
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
index f773523c17b32..9da8ae23f5ee3 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewInGridOnCustomerPage.php
@@ -22,8 +22,8 @@
 class AssertProductReviewInGridOnCustomerPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Asserts all Product Review variables in the reviews grid on customer page
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
index 0356608d2abc9..92f1a45a9157f 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessDeleteMessage.php
@@ -18,15 +18,15 @@
  */
 class AssertProductReviewMassActionSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message that appears after deletion via mass actions
      */
     const SUCCESS_DELETE_MESSAGE = 'A total of %d record(s) have been deleted.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after deletion via mass actions
      *
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
index 304f1d6886fdf..14d2c2379ae31 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewMassActionSuccessMessage.php
@@ -18,15 +18,15 @@
  */
 class AssertProductReviewMassActionSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message that appears after updates via mass actions
      */
     const SUCCESS_MESSAGE = 'A total of %d record(s) have been updated.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after updated via mass actions
      *
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
index 6a14a1f17e127..c3a9e231c584c 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotInGrid.php
@@ -20,8 +20,8 @@
 class AssertProductReviewNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Filter params
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
index b5f763c5a39ce..f1e4c8c296721 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewNotOnProductPage.php
@@ -21,8 +21,8 @@
 class AssertProductReviewNotOnProductPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product review Not available on product page
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
index 753d235607a0d..39588da517966 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertProductReviewOnProductPage.php
@@ -23,8 +23,8 @@
 class AssertProductReviewOnProductPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that product review available on product page
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
index ab97adc226e1d..b7cb5e83476ee 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewCreationSuccessMessage.php
@@ -16,15 +16,15 @@
  */
 class AssertReviewCreationSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text of success message after review created
      */
     const SUCCESS_MESSAGE = 'Your review has been accepted for moderation.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after review created
      *
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
index a15d1859555e8..99326fef898c5 100755
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Constraint/AssertReviewSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertReviewSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You saved the review.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You saved the review.';
 
     /**
      * Assert that success message is displayed after review save
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Review/Test/etc/constraint.xml
index 2e294cf89b26d..4b116618aaa4f 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/etc/constraint.xml
@@ -9,63 +9,63 @@
 -->
 <constraint>
     <assertProductRatingSuccessSaveMessage module="Magento_Review">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductRatingSuccessSaveMessage>
     <assertProductRatingSuccessDeleteMessage module="Magento_Review">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertProductRatingSuccessDeleteMessage>
     <assertProductRatingInGrid module="Magento_Review">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertProductRatingInGrid>
     <assertProductRatingNotInGrid module="Magento_Review">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertProductRatingNotInGrid>
     <assertProductRatingInProductPage module="Magento_Review">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertProductRatingInProductPage>
     <assertProductRatingNotInProductPage module="Magento_Review">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertProductRatingNotInProductPage>
     <assertReviewSuccessSaveMessage module="Magento_Review">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertReviewSuccessSaveMessage>
     <assertReviewCreationSuccessMessage module="Magento_Review">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertReviewCreationSuccessMessage>
     <assertProductReviewInGrid module="Magento_Review">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductReviewInGrid>
     <assertProductRatingOnReviewPage module="Magento_Review">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertProductRatingOnReviewPage>
     <assertProductRatingInProductPage module="Magento_Review">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertProductRatingInProductPage>
     <assertProductReviewMassActionSuccessMessage module="Magento_Review">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <reviewIndex class="Magento\Review\Test\Page\Adminhtml\ReviewIndex"/>
         </require>
     </assertProductReviewMassActionSuccessMessage>
     <assertProductReviewMassActionSuccessDeleteMessage module="Magento_Review">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <reviewIndex class="Magento\Review\Test\Page\Adminhtml\ReviewIndex"/>
         </require>
     </assertProductReviewMassActionSuccessDeleteMessage>
     <assertProductReviewBackendSuccessSaveMessage module="Magento_Review">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertProductReviewBackendSuccessSaveMessage>
     <assertProductReviewNotOnProductPage module="Magento_Review">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertProductReviewNotOnProductPage>
     <assertProductReviewOnProductPage module="Magento_Review">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertProductReviewOnProductPage>
     <assertProductReviewNotInGrid module="Magento_Review">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductReviewNotInGrid>
     <assertProductReviewInGridOnCustomerPage module="Magento_Review">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductReviewInGridOnCustomerPage>
 </constraint>
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRateSuccessSaveMessage.php
index 3ef6ecd86b21a..76396c89ccb17 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRateSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertRateSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message after success saved Exchange Rate
      */
     const SUCCESS_SAVE_MESSAGE = 'You saved the rate.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that specified message is present on page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardInHistoryGrid.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardInHistoryGrid.php
index 7c81496556fec..6e2be3851fb6e 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardInHistoryGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardInHistoryGrid.php
@@ -22,8 +22,8 @@
 class AssertRewardInHistoryGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that after updating reward balance - it reflects in history grid: check Points, Website, Comment
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForCurrencyToPoints.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForCurrencyToPoints.php
index 1dff9447fe373..7a4a2390eb3dd 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForCurrencyToPoints.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForCurrencyToPoints.php
@@ -24,8 +24,8 @@
 class AssertRewardNoExchangeMessageForCurrencyToPoints extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that "Each $X spent will earn X Reward points" message is not displayed on the RewardCustomerInfo page.
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForPointsToCurrency.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForPointsToCurrency.php
index 942c81c2242b6..d58a10c33957f 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForPointsToCurrency.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardNoExchangeMessageForPointsToCurrency.php
@@ -23,8 +23,8 @@
 class AssertRewardNoExchangeMessageForPointsToCurrency extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Each X Reward points can be redeemed for $X message is not displayed on the RewardCustomerInfo page.
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php
index 2456c13c0538a..caeb64f6c1bdf 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php
@@ -22,6 +22,10 @@
  */
 class AssertRewardPointsBalance extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Messages about reward points balance
      */
@@ -32,10 +36,6 @@ class AssertRewardPointsBalance extends AbstractConstraint
      */
     const REWARD_POINTS_EXCHANGE_RATE = 'Current exchange rates: Each %d Reward points can be redeemed for $%.2f.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that "Your balance is X Reward points ($X.00)." and current exchange message are appeared
      * on the Customer Dashboard page on Reward point tab.
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnCustomerRegistration.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnCustomerRegistration.php
index 0c0c5012698ba..e8ae93ce5a102 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnCustomerRegistration.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnCustomerRegistration.php
@@ -18,15 +18,15 @@
  */
 class AssertRewardPointsMessageOnCustomerRegistration extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message about reward points on registration page
      */
     const REGISTRATION_REWARD_MESSAGE = 'Register on our site now and earn %d Reward points.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that reward points message is appeared on the Create New Customer Account page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnShoppingCart.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnShoppingCart.php
index c15f76fbda6b8..ed2c1315d55ad 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnShoppingCart.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsMessageOnShoppingCart.php
@@ -20,15 +20,15 @@
  */
 class AssertRewardPointsMessageOnShoppingCart extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message about reward points on checkout page
      */
     const CHECKOUT_REWARD_MESSAGE = 'Check out now and earn %d Reward points for this order.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that reward points message is displayed on shopping cart page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessDeleteMessage.php
index 6581cdd945165..e148b0375a009 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertRewardPointsSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message about successful deletion reward exchange rate
      */
     const SUCCESS_DELETE_MESSAGE = 'You deleted the rate.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Asserts that success delete message equals to expected message
      *
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessRemoveMessage.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessRemoveMessage.php
index 2e7bf9a94c6cd..82f4a81c2e1c3 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessRemoveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsSuccessRemoveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertRewardPointsSuccessRemoveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message displayed after remove reward points
      */
     const SUCCESS_REMOVE_MESSAGE = 'You removed the reward points from this order.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after remove reward points successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionOnBackend.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionOnBackend.php
index d8533a89835a9..e9b9627f36eb8 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionOnBackend.php
@@ -21,8 +21,8 @@
 class AssertRewardSubscriptionOnBackend extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that customer reward subscriptions checkboxes are empty
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionSaveMessage.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionSaveMessage.php
index e3faebc435ef4..d49dfd2e34fda 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardSubscriptionSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertRewardSubscriptionSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_SAVE_MESSAGE = 'You saved the settings.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_SAVE_MESSAGE = 'You saved the settings.';
 
     /**
      * Assert that reward points subscription settings success save message is present on page
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Reward/Test/etc/constraint.xml
index 69f7227957fae..21f99ed7b4a8e 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/etc/constraint.xml
@@ -9,13 +9,13 @@
 -->
 <constraint>
     <assertRewardPointsSuccessDeleteMessage module="Magento_Reward">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <exchangeRateIndex class="Magento\Reward\Test\Page\Adminhtml\ExchangeRateIndex" />
         </require>
     </assertRewardPointsSuccessDeleteMessage>
     <assertRewardNoExchangeMessageForPointsToCurrency module="Magento_Reward">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customer class="Magento\Customer\Test\Fixture\CustomerInjectable" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -26,7 +26,7 @@
         </require>
     </assertRewardNoExchangeMessageForPointsToCurrency>
     <assertRewardNoExchangeMessageForCurrencyToPoints module="Magento_Reward">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customer class="Magento\Customer\Test\Fixture\CustomerInjectable" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
@@ -37,13 +37,13 @@
         </require>
     </assertRewardNoExchangeMessageForCurrencyToPoints>
     <assertRewardSubscriptionSaveMessage module="Magento_Reward">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerAccountIndex class="Magento\Reward\Test\Page\RewardCustomerInfo" />
         </require>
     </assertRewardSubscriptionSaveMessage>
     <assertRewardSubscriptionOnBackend module="Magento_Reward">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerInjectable class="Magento\Customer\Test\Fixture\CustomerInjectable" />
             <customerIndex class="Magento\Customer\Test\Page\Adminhtml\CustomerIndex" />
@@ -52,20 +52,20 @@
         </require>
     </assertRewardSubscriptionOnBackend>
     <assertRateSuccessSaveMessage module="Magento_Reward">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <gridPage class="Magento\Reward\Test\Page\Adminhtml\RewardRateIndex" />
         </require>
     </assertRateSuccessSaveMessage>
     <assertRewardPointsMessageOnCustomerRegistration module="Magento_Reward">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <customerAccountCreate class="Magento\Customer\Test\Page\CustomerAccountCreate" />
             <cmsIndex class="Magento\Cms\Test\Page\CmsIndex" />
         </require>
     </assertRewardPointsMessageOnCustomerRegistration>
     <assertRewardPointsBalance module="Magento_Reward">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerInjectable class="Magento\Customer\Test\Fixture\CustomerInjectable" />
             <customerIndex class="Magento\Customer\Test\Page\Adminhtml\CustomerIndex" />
@@ -76,7 +76,7 @@
         </require>
     </assertRewardPointsBalance>
     <assertRewardPointsMessageOnShoppingCart module="Magento_Reward">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductSimple class="Magento\Catalog\Test\Fixture\CatalogProductSimple" />
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView" />
@@ -84,7 +84,7 @@
         </require>
     </assertRewardPointsMessageOnShoppingCart>
     <assertRewardInHistoryGrid module="Magento_Reward">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <customerIndexEdit class="Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit" />
             <customerIndex class="Magento\Customer\Test\Page\Adminhtml\CustomerIndex" />
@@ -93,7 +93,7 @@
         </require>
     </assertRewardInHistoryGrid>
     <assertRewardPointsSuccessRemoveMessage module="Magento_Reward">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <checkoutCart class="Magento\Checkout\Test\Page\CheckoutCart" />
         </require>
diff --git a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaForm.php b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaForm.php
index 1d55dc9ddadb5..df58361fe5b8b 100644
--- a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaForm.php
+++ b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaForm.php
@@ -21,12 +21,9 @@
  */
 class AssertRmaForm extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Array skipped fields.
diff --git a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaInGrid.php b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaInGrid.php
index cf448df976237..8f52fd2034485 100644
--- a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaInGrid.php
@@ -19,12 +19,9 @@
  */
 class AssertRmaInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that return request displayed in Returns grid:
diff --git a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForCustomer.php b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForCustomer.php
index b77d2ebcc01b6..a809a934343d8 100644
--- a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForCustomer.php
+++ b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForCustomer.php
@@ -21,12 +21,9 @@
  */
 class AssertRmaOnFrontendForCustomer extends AbstractAssertRmaOnFrontend
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that rma is correct display on frontend (MyAccount - My Returns):
diff --git a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForGuest.php b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForGuest.php
index 4317f1e97bb5e..58cd68fc6ec13 100644
--- a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForGuest.php
+++ b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForGuest.php
@@ -19,12 +19,9 @@
  */
 class AssertRmaOnFrontendForGuest extends AbstractAssertRmaOnFrontend
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
+    /* tags */
+    const SEVERITY = 'middle';
+    /* end tags */
 
     /**
      * Assert that rma is correct display for guest on frontend (Orders and Returns):
diff --git a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaSuccessSaveMessage.php
index bb70c4214453d..399772e42d92a 100644
--- a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaSuccessSaveMessage.php
@@ -16,18 +16,15 @@
  */
 class AssertRmaSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'middle';
+    /* end tags */
+
     /**
      * Rma success save message.
      */
     const SUCCESS_SAVE_MESSAGE = 'You submitted the RMA request.';
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'middle';
-
     /**
      * Assert success message appears after submitting new return request.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Rma/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Rma/Test/etc/constraint.xml
index f2700031806aa..da4273e21d52a 100644
--- a/dev/tests/functional/tests/app/Magento/Rma/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Rma/Test/etc/constraint.xml
@@ -9,27 +9,27 @@
 -->
 <constraint>
     <assertRmaSuccessSaveMessage module="Magento_Rma">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertRmaSuccessSaveMessage>
     <assertRmaInGrid module="Magento_Rma">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertRmaInGrid>
     <assertRmaForm module="Magento_Rma">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertRmaForm>
     <assertRmaConfigurableForm module="Magento_Rma">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertRmaConfigurableForm>
     <assertRmaOnFrontendForCustomer module="Magento_Rma">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertRmaOnFrontendForCustomer>
     <assertRmaBundleOnFrontendForCustomer module="Magento_Rma">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertRmaBundleOnFrontendForCustomer>
     <assertRmaConfigurableOnFrontendForCustomer module="Magento_Rma">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
     </assertRmaConfigurableOnFrontendForCustomer>
     <assertRmaOnFrontendForGuest module="Magento_Rma">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertRmaOnFrontendForGuest>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
index c4b963a228126..9e92863df8323 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoButton.php
@@ -20,8 +20,8 @@
 class AssertCreditMemoButton extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that 'Credit Memo' button is present on order's page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php
index 42379aa4d2734..02ecba2be96ca 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertCreditMemoItems.php
@@ -20,8 +20,8 @@
 class AssertCreditMemoItems extends AbstractAssertItems
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert credit memo items on credit memo view page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
index 44528e6bba5c5..901e3c3aef7ec 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesGrid.php
@@ -19,8 +19,8 @@
 class AssertInvoiceInInvoicesGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert invoice with corresponding order ID is present in the invoices grid with corresponding amount
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
index dca4abfbc7136..c8132d69e8a6b 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceInInvoicesTab.php
@@ -21,8 +21,8 @@
 class AssertInvoiceInInvoicesTab extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that invoice is present in the invoices tab of the order with corresponding amount(Grand Total)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php
index 4893c91fbf13a..46877e9bf8daa 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceItems.php
@@ -20,8 +20,8 @@
 class AssertInvoiceItems extends AbstractAssertItems
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert invoice items on invoice view page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
index 7e3e3a1a47d72..13df312eec6c1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceSuccessCreateMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertInvoiceSuccessCreateMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_CREATE_MESSAGE = 'The invoice has been created.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message present after create invoice
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
index 5fb28681a63df..9d84b6315a2c2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoiceWithShipmentSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertInvoiceWithShipmentSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = 'You created the invoice and shipment.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert success message presents
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php
index 751f29f207042..f7f267d67dd70 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertInvoicedAmountOnFrontend.php
@@ -20,8 +20,8 @@
 class AssertInvoicedAmountOnFrontend extends AbstractAssertOrderOnFrontend
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that invoiced Grand Total amount is equal to placed order Grand total amount on invoice page (frontend)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
index 692bb35e48edf..18883dc2b3132 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoCreditMemoButton.php
@@ -20,8 +20,8 @@
 class AssertNoCreditMemoButton extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that after refunding full amount 'Credit Memo' is not available any more
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
index 07d81c86ec2f1..5e2d269f685f6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertNoInvoiceButton.php
@@ -20,8 +20,8 @@
 class AssertNoInvoiceButton extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert no Invoice button the order grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
index 4b095652698c6..151f72f7a2dcc 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsAvailable.php
@@ -18,8 +18,8 @@
 class AssertOrderButtonsAvailable extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that specified in data set buttons exist on order page in backend
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
index c42726e575059..7d9a0b55e5752 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderButtonsUnavailable.php
@@ -20,8 +20,8 @@
 class AssertOrderButtonsUnavailable extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that buttons from dataSet are not present on page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
index 04350a67c302d..3bb3cdd7dae11 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionFailMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderCancelMassActionFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const FAIL_CANCEL_MESSAGE = 'You cannot cancel the order(s).';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert cancel fail message is displayed on order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
index ba995850447d6..aa3bb82848d20 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderCancelMassActionSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_CANCEL_MESSAGE = 'We canceled %d order(s).';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert cancel success message is displayed on order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
index 3e2f2755bbc9d..fb80e1a0bf8e0 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderCancelSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message displayed after cancel sales order
      */
     const SUCCESS_CANCEL_MESSAGE = 'You canceled the order.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after cancel sales order successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
index 29b2f599c68f9..aa72ac5d1bd1d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderGrandTotal.php
@@ -18,8 +18,8 @@
 class AssertOrderGrandTotal extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that Order Grand Total is correct on order page in backend
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
index b1febde8a3135..146da3b5f4844 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGrid.php
@@ -19,8 +19,8 @@
 class AssertOrderInOrdersGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that order with fixture data is present in Sales -> Orders Grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
index 25d2881968428..124101b1cb227 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php
@@ -22,8 +22,8 @@
 class AssertOrderInOrdersGridOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that order is present in Orders grid on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
index de3de5f341fa4..f3035fbfd54d0 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderMassOnHoldSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderMassOnHoldSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_ON_HOLD_MESSAGE = 'You have put %d order(s) on hold.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert on hold success message is displayed on order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
index 62ed4fef7a087..dcb585d9f693e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotInOrdersGrid.php
@@ -19,8 +19,8 @@
 class AssertOrderNotInOrdersGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that order with fixture data in not more in the Orders grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
index 798e2f608268f..b0fd728ff74a1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderNotVisibleOnMyAccount.php
@@ -22,8 +22,8 @@
 class AssertOrderNotVisibleOnMyAccount extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert order is not visible in customer account on frontend
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
index afdeda99ed80e..b27a5f1d482e6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldFailMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderOnHoldFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const FAIL_ON_HOLD_MESSAGE = 'No order(s) were put on hold.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert on hold fail message is displayed on order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
index b0bb3181554c0..dd5027caf8c26 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderOnHoldSuccessMessage.php
@@ -17,6 +17,10 @@
  */
 class AssertOrderOnHoldSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked for single order on hold
      */
@@ -27,10 +31,6 @@ class AssertOrderOnHoldSuccessMessage extends AbstractConstraint
      */
     const MULTIPLE_SUCCESS_ON_HOLD_MESSAGE = 'You have put %d order(s) on hold.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert on hold success message is displayed on order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
index 6c9ccdfc77ec9..658e21cc2e558 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseFailMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderReleaseFailMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const FAIL_RELEASE_MESSAGE = 'No order(s) were released from on hold status.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert release fail message is displayed on order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
index bae785dd84315..66d36e36046bd 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderReleaseSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderReleaseSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_RELEASE_MESSAGE = '%d order(s) have been released from on hold status.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert release success message is displayed on order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
index 409ecdfd174cb..81d667f9c8ae6 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusDuplicateStatus.php
@@ -17,11 +17,11 @@
  */
 class AssertOrderStatusDuplicateStatus extends AbstractConstraint
 {
-    const DUPLICATE_MESSAGE = 'We found another order status with the same order status code.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const DUPLICATE_MESSAGE = 'We found another order status with the same order status code.';
 
     /**
      * Assert that duplicate message is displayed
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
index fbf07801470bb..18b2b9f781997 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusInGrid.php
@@ -19,8 +19,8 @@
 class AssertOrderStatusInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Order status state data mapping
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
index 856c670c1d77c..06e91d8c2c8a1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusIsCorrect.php
@@ -19,8 +19,8 @@
 class AssertOrderStatusIsCorrect extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that status is correct on order page in backend (same with value of orderStatus variable)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
index c3ec5077814cb..71c5887a300aa 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusNotAssigned.php
@@ -19,8 +19,8 @@
 class AssertOrderStatusNotAssigned extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that order status with status code from fixture have empty "State Code and Title" value
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
index 493ab1025806a..bab15797d1efb 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessAssignMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderStatusSuccessAssignMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * OrderStatus assigning success message
      */
     const SUCCESS_MESSAGE = 'You have assigned the order status.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after order status assigning
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
index c027c83d29d1c..6ac74b70c5c55 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessCreateMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertOrderStatusSuccessCreateMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You have saved the order status.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You have saved the order status.';
 
     /**
      * Assert that success message is displayed after order status saved.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
index 5098ba3229de7..947b920812b8c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderStatusSuccessUnassignMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderStatusSuccessUnassignMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * OrderStatus unassign success message
      */
     const SUCCESS_MESSAGE = 'You have unassigned the order status.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after order status unassign
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
index dbc048002f4a3..670cee9d7b943 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderSuccessCreateMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertOrderSuccessCreateMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message displayed after created sales order
      */
     const SUCCESS_MESSAGE = "You created the order.";
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that after create sales order successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php
index da10ed3a263ce..7747ab778db0e 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrdersInOrdersGrid.php
@@ -19,8 +19,8 @@
 class AssertOrdersInOrdersGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that orders are present in Sales -> Orders Grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php
index c950f99f29248..fdc53e64eff9c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertProductInItemsOrderedGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertProductInItemsOrderedGrid extends AbstractAssertForm
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Fields for assert.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
index 53cbac717d0c2..a6cb02af18dc5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInCreditMemoTab.php
@@ -21,8 +21,8 @@
 class AssertRefundInCreditMemoTab extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that refund is present in the tab with ID and refunded amount(depending on full/partial refund)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
index 5e8d06c31ca48..8541605057609 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundInRefundsGrid.php
@@ -19,8 +19,8 @@
 class AssertRefundInRefundsGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that refund is present in the 'Refunds' grid with correct ID, order ID, refunded amount
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
index 5bbe598774e08..b3c85a68a7a61 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundSuccessCreateMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertRefundSuccessCreateMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_CREATE_MESSAGE = 'You created the credit memo.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success create credit memo message is present on order view page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
index 17c066b485162..283073ff7ba4d 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertRefundedGrandTotalOnFrontend.php
@@ -20,8 +20,8 @@
 class AssertRefundedGrandTotalOnFrontend extends AbstractAssertOrderOnFrontend
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that refunded grand total is equal to data from fixture on My Account page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
index 9597e04d2305a..d7b626a09dea2 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertReorderStatusIsCorrect.php
@@ -20,8 +20,8 @@
 class AssertReorderStatusIsCorrect extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that status is correct on order page in backend (same with value of orderStatus variable)
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php
index cf5fc8193b475..bc65787bbccd0 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderBillingAddress.php
@@ -17,12 +17,9 @@
  */
 class AssertSalesPrintOrderBillingAddress extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that BillingAddress printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php
index d3d75b4f64607..b969a9bc756c7 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderGrandTotal.php
@@ -16,12 +16,9 @@
  */
 class AssertSalesPrintOrderGrandTotal extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Grand Total price was printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php
index dbbb940273613..b66c1fcb7bf76 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderPaymentMethod.php
@@ -16,12 +16,9 @@
  */
 class AssertSalesPrintOrderPaymentMethod extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that payment method was printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php
index e680b7ef26ab2..d90f0c7205db7 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertSalesPrintOrderProducts.php
@@ -17,18 +17,15 @@
  */
 class AssertSalesPrintOrderProducts extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Template for error message.
      */
     const ERROR_MESSAGE = "Product with name: '%s' was not found on sales guest print page.\n";
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that products printed correctly on sales guest print page.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
index 1e787c85dc599..245465dcb4495 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertUnholdButton.php
@@ -20,8 +20,8 @@
 class AssertUnholdButton extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that 'Unhold' button present on order page
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/constraint.xml
index 0b3a70432c3f5..0f9895008ec96 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/etc/constraint.xml
@@ -9,154 +9,154 @@
 -->
 <constraint>
     <assertOrderStatusSuccessCreateMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <orderStatusIndex class="Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex" />
         </require>
     </assertOrderStatusSuccessCreateMessage>
     <assertOrderStatusInGrid module="Magento_Sales">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <orderStatusIndex class="Magento\Sales\Test\Page\Adminhtml\OrderStatusIndex" />
             <orderStatus class="Magento\Sales\Test\Fixture\OrderStatus" />
         </require>
     </assertOrderStatusInGrid>
     <assertOrderStatusIsCorrect module="Magento_Sales">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertOrderStatusIsCorrect>
     <assertOrderStatusDuplicateStatus module="Magento_Sales">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <orderStatusNew class="Magento\Sales\Test\Page\Adminhtml\OrderStatusNew" />
         </require>
     </assertOrderStatusDuplicateStatus>
     <assertOrderButtonsAvailable module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderButtonsAvailable>
     <assertOrderGrandTotal module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderGrandTotal>
     <assertOrderStatusIsCorrect module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderStatusIsCorrect>
     <assertProductInItemsOrderedGrid module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductInItemsOrderedGrid>
     <assertOrderCancelSuccessMessage module="Magento_Sales">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertOrderCancelSuccessMessage>
     <assertOrderInOrdersGrid module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderInOrdersGrid>
     <assertOrdersInOrdersGrid module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrdersInOrdersGrid>
     <assertOrderInOrdersGridOnFrontend module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderInOrdersGridOnFrontend>
     <assertOrderOnHoldSuccessMessage module="Magento_Sales">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertOrderOnHoldSuccessMessage>
     <assertOrderMassOnHoldSuccessMessage module="Magento_Sales">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertOrderMassOnHoldSuccessMessage>
     <assertUnholdButton module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertUnholdButton>
     <assertOrderButtonsUnavailable module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderButtonsUnavailable>
     <assertOrderSuccessCreateMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderSuccessCreateMessage>
     <assertNoInvoiceButton module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertNoInvoiceButton>
     <assertInvoiceInInvoicesTab module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvoiceInInvoicesTab>
     <assertInvoiceInInvoicesGrid module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvoiceInInvoicesGrid>
     <assertInvoicedAmountOnFrontend module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvoicedAmountOnFrontend>
     <assertInvoiceSuccessCreateMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvoiceSuccessCreateMessage>
     <assertInvoiceWithShipmentSuccessMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvoiceWithShipmentSuccessMessage>
     <assertOrderNotInOrdersGrid module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderNotInOrdersGrid>
     <assertOrderCancelMassActionSuccessMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderCancelMassActionSuccessMessage>
     <assertOrderCancelMassActionFailMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderCancelMassActionFailMessage>
     <assertOrderOnHoldSuccessMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderOnHoldSuccessMessage>
     <assertOrderOnHoldFailMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderOnHoldFailMessage>
     <assertOrderReleaseSuccessMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderReleaseSuccessMessage>
     <assertOrderReleaseFailMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderReleaseFailMessage>
     <assertReorderStatusIsCorrect module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertReorderStatusIsCorrect>
     <assertRefundSuccessCreateMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertRefundSuccessCreateMessage>
     <assertCreditMemoButton module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCreditMemoButton>
     <assertRefundInCreditMemoTab module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertRefundInCreditMemoTab>
     <assertRefundInRefundsGrid module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertRefundInRefundsGrid>
     <assertRefundedGrandTotalOnFrontend module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertRefundedGrandTotalOnFrontend>
     <assertNoCreditMemoButton module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertNoCreditMemoButton>
     <assertCreditMemoItems module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCreditMemoItems>
     <assertInvoiceItems module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertInvoiceItems>
     <assertOrderStatusSuccessAssignMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderStatusSuccessAssignMessage>
     <assertOrderNotVisibleOnMyAccount module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderNotVisibleOnMyAccount>
     <assertOrderStatusSuccessUnassignMessage module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderStatusSuccessUnassignMessage>
     <assertOrderStatusNotAssigned module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertOrderStatusNotAssigned>
     <assertSalesPrintOrderBillingAddress module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSalesPrintOrderBillingAddress>
     <assertSalesPrintOrderGrandTotal module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSalesPrintOrderGrandTotal>
     <assertSalesPrintOrderPaymentMethod module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSalesPrintOrderPaymentMethod>
     <assertSalesPrintOrderProducts module="Magento_Sales">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSalesPrintOrderProducts>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoInGrid.php
index c69e8d40925c0..7c7bde8bec634 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoInGrid.php
@@ -19,8 +19,8 @@
 class AssertArchiveCreditMemoInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Refund with corresponding fixture data is present in Archive Credit Memos grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoItems.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoItems.php
index a6a2e1d5b176d..e97055e6d5423 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoItems.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveCreditMemoItems.php
@@ -21,8 +21,8 @@
 class AssertArchiveCreditMemoItems extends AbstractAssertItems
 {
     /* tags */
-     const SEVERITY = 'medium';
-     /* end tags */
+    const SEVERITY = 'medium';
+    /* end tags */
 
     /**
      * Assert returned product represented on Credit memo page:
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceInGrid.php
index c2a806e3c4377..13d125a743268 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceInGrid.php
@@ -19,8 +19,8 @@
 class AssertArchiveInvoiceInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Invoice with corresponding data is present in Sales Archive Invoices grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceItems.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceItems.php
index 90a0890a184a6..25ff8b41e6bce 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceItems.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveInvoiceItems.php
@@ -21,8 +21,8 @@
 class AssertArchiveInvoiceItems extends AbstractAssertItems
 {
     /* tags */
-     const SEVERITY = 'medium';
-     /* end tags */
+    const SEVERITY = 'medium';
+    /* end tags */
 
     /**
      * Assert invoiced product represented in invoice archive:
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderAvailableButtons.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderAvailableButtons.php
index 6e5db87a42b35..9fe23ac170adf 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderAvailableButtons.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderAvailableButtons.php
@@ -20,8 +20,8 @@
 class AssertArchiveOrderAvailableButtons extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that specified in data set buttons exist on order page in backend
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionErrorMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionErrorMessage.php
index 76076f1bb1b6b..919e568a95495 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionErrorMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertArchiveOrderCancelMassActionErrorMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message displayed after unsuccessful orders canceling
      */
     const ERROR_MESSAGE = 'You cannot cancel the order(s).';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that error message is displayed on "Archived Orders Grid" page
      *
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionSuccessMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionSuccessMessage.php
index b7a12e7e64c94..943831a5897f6 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderCancelMassActionSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertArchiveOrderCancelMassActionSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message displayed after cancel order from archive
      */
     const SUCCESS_MESSAGE = 'We canceled %d order(s).';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed on "Archived Orders Grid" page
      *
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderInGrid.php
index d0ee100fed8b4..b1f754e51fb3c 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderInGrid.php
@@ -19,8 +19,8 @@
 class AssertArchiveOrderInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that order with fixture data is in archive orders grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderNotInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderNotInGrid.php
index 1d91e542fee28..133300aab64a0 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertArchiveOrderNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that order is absent in archive orders grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldErrorMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldErrorMessage.php
index 7546e08172550..3ee1ae41041ab 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldErrorMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertArchiveOrderOnHoldErrorMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const ERROR_MESSAGE = 'No order(s) were put on hold.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert on hold fail message is displayed on archive order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldSuccessMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldSuccessMessage.php
index a3b3858fd622f..6c9f1bd64e95b 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderOnHoldSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertArchiveOrderOnHoldSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = 'You have put %d order(s) on hold.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert on hold success message is displayed on archived order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseErrorMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseErrorMessage.php
index 96b68c0305ab7..92fce7ca33d90 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseErrorMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseErrorMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertArchiveOrderReleaseErrorMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const ERROR_MESSAGE = 'No order(s) were released from on hold status.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert release error message is displayed on archived order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseSuccessMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseSuccessMessage.php
index 4ae17771fa158..4311a34e34799 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderReleaseSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertArchiveOrderReleaseSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = '%d order(s) have been released from on hold status.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert release success message is displayed on archive order index page
      *
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderStatusInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderStatusInGrid.php
index 53cee1597bf11..6dfd61dfdbc79 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderStatusInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderStatusInGrid.php
@@ -20,8 +20,8 @@
 class AssertArchiveOrderStatusInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that status is correct on order page in backend (same with value of orderStatus variable)
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessMessage.php
index a8d8b0bdb6052..adaa3edeb7e42 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertArchiveOrderSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message displayed after moving order to archive
      */
     const SUCCESS_MESSAGE = 'We archived %d order(s).';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed on "Orders Grid" page
      *
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessRemoveMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessRemoveMessage.php
index 734c139da04a7..f8004dc950f58 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessRemoveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderSuccessRemoveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertArchiveOrderSuccessRemoveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = 'We removed %d order(s) from the archive.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that after removed orders success message presents
      *
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderWarningMessage.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderWarningMessage.php
index 7038bcc253286..c487e5fa31694 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderWarningMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrderWarningMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertArchiveOrderWarningMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Message displayed after cancel sales order
      */
     const WARNING_MESSAGE = "We can't archive the selected order(s).";
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that warning message present on order grid page
      *
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersCancelMassActionsMessages.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersCancelMassActionsMessages.php
index 1d688fd48e9c2..808cbdea03cd9 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersCancelMassActionsMessages.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersCancelMassActionsMessages.php
@@ -17,6 +17,10 @@
  */
 class AssertArchiveOrdersCancelMassActionsMessages extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message displayed after cancel order from archive
      */
@@ -27,10 +31,6 @@ class AssertArchiveOrdersCancelMassActionsMessages extends AbstractConstraint
      */
     const ERROR_MESSAGE = '%d order(s) cannot be canceled.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that error and success messages are displayed on "Archived Orders Grid" page
      *
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersInGrid.php
index 9afe4420a24e6..be8c4c1dd9904 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveOrdersInGrid.php
@@ -18,8 +18,8 @@
 class AssertArchiveOrdersInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that orders with specified id and status is in archive orders grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentInGrid.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentInGrid.php
index 2dc6c6c1c57c7..bf8de8ddcfe02 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentInGrid.php
@@ -19,8 +19,8 @@
 class AssertArchiveShipmentInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Shipment with corresponding fixture data is present in Sales Archive Shipments grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentItems.php b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentItems.php
index 058ae031f40c4..be2d04cb7cf40 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentItems.php
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/Constraint/AssertArchiveShipmentItems.php
@@ -21,8 +21,8 @@
 class AssertArchiveShipmentItems extends AssertShipmentItems
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * @constructor
diff --git a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/etc/constraint.xml
index 53c4e8469f444..44280a6407f97 100644
--- a/dev/tests/functional/tests/app/Magento/SalesArchive/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesArchive/Test/etc/constraint.xml
@@ -9,66 +9,66 @@
 -->
 <constraint>
     <assertArchiveOrderSuccessMessage module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderSuccessMessage>
     <assertArchiveOrderInGrid module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderInGrid>
     <assertArchiveOrderWarningMessage module="Magento_SalesArchive">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertArchiveOrderWarningMessage>
     <assertArchiveOrderNotInGrid module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderNotInGrid>
     <assertArchiveInvoiceInGrid module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveInvoiceInGrid>
     <assertArchiveShipmentInGrid module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveShipmentInGrid>
     <assertArchiveCreditMemoInGrid module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveCreditMemoInGrid>
     <assertArchiveOrderStatusInGrid module="Magento_SalesArchive">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertArchiveOrderStatusInGrid>
     <assertArchiveOrderAvailableButtons module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderAvailableButtons>
     <assertArchiveCreditMemoItems module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveCreditMemoItems>
     <assertArchiveInvoiceItems module="Magento_SalesArchive">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
     </assertArchiveInvoiceItems>
     <assertArchiveShipmentItems module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveShipmentItems>
     <assertArchiveOrdersInGrid module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrdersInGrid>
     <assertArchiveOrderCancelMassActionSuccessMessage module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderCancelMassActionSuccessMessage>
     <assertArchiveOrderCancelMassActionErrorMessage module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderCancelMassActionErrorMessage>
     <assertArchiveOrderOnHoldSuccessMessage module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderOnHoldSuccessMessage>
     <assertArchiveOrderOnHoldErrorMessage module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderOnHoldErrorMessage>
     <assertArchiveOrderReleaseSuccessMessage module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderReleaseSuccessMessage>
     <assertArchiveOrderReleaseErrorMessage module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderReleaseErrorMessage>
     <assertArchiveOrderSuccessRemoveMessage module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrderSuccessRemoveMessage>
     <assertArchiveOrdersCancelMassActionsMessages module="Magento_SalesArchive">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertArchiveOrdersCancelMassActionsMessages>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php
index edfe925187f65..42820bdbe5771 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsApplied.php
@@ -15,8 +15,8 @@
 class AssertCartPriceRuleConditionIsApplied extends AssertCartPriceRuleApplying
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that shopping cart subtotal not equals with grand total
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php
index f195aeb2c8f65..b0c0d0f14ef85 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleConditionIsNotApplied.php
@@ -15,8 +15,8 @@
 class AssertCartPriceRuleConditionIsNotApplied extends AssertCartPriceRuleApplying
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that shopping cart subtotal equals with grand total
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
index b50fee2e35205..a5e681d23f4f6 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleForm.php
@@ -19,8 +19,8 @@
 class AssertCartPriceRuleForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php
index 1f2f2d17d3333..8a72776fda997 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleFreeShippingIsApplied.php
@@ -14,11 +14,11 @@
  */
 class AssertCartPriceRuleFreeShippingIsApplied extends AssertCartPriceRuleApplying
 {
-    const FREE_SHIPPING_PRICE = '0.00';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const FREE_SHIPPING_PRICE = '0.00';
 
     /**
      * Assert that free shipping is applied in shopping cart
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php
index ef731290f4d84..ab89a79138d1a 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleIsNotPresentedInGrid.php
@@ -18,8 +18,8 @@
 class AssertCartPriceRuleIsNotPresentedInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that sales rule is not present in cart price rules grid
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php
index db78779674a4e..09edbc00ac466 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCartPriceRuleSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'The rule has been deleted.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'The rule has been deleted.';
 
     /**
      * Assert that success message is displayed after sales rule delete
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php
index ad3a9f7cd91f3..fef335f3911c8 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertCartPriceRuleSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The rule has been saved.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The rule has been saved.';
 
     /**
      * Assert that success message is displayed after sales rule save
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertSalesRuleOnPrintOrder.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertSalesRuleOnPrintOrder.php
index 68586f531e010..10bc783406c3a 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertSalesRuleOnPrintOrder.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertSalesRuleOnPrintOrder.php
@@ -16,12 +16,9 @@
  */
 class AssertSalesRuleOnPrintOrder extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that sales rule amount printed correctly on sales guest print page.
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/constraint.xml
index 38d5afa6613d8..213e00b2c39ef 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/etc/constraint.xml
@@ -9,27 +9,27 @@
 -->
 <constraint>
     <assertCartPriceRuleForm module="Magento_SalesRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCartPriceRuleForm>
     <assertCartPriceRuleConditionIsApplied module="Magento_SalesRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCartPriceRuleConditionIsApplied>
     <assertCartPriceRuleConditionIsNotApplied module="Magento_SalesRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCartPriceRuleConditionIsNotApplied>
     <assertCartPriceRuleFreeShippingIsApplied module="Magento_SalesRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCartPriceRuleFreeShippingIsApplied>
     <assertCartPriceRuleSuccessSaveMessage module="Magento_SalesRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCartPriceRuleSuccessSaveMessage>
     <assertCartPriceRuleSuccessDeleteMessage module="Magento_SalesRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCartPriceRuleSuccessDeleteMessage>
     <assertCartPriceRuleIsNotPresentedInGrid module="Magento_SalesRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCartPriceRuleIsNotPresentedInGrid>
     <assertSalesRuleOnPrintOrder module="Magento_SalesRule">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSalesRuleOnPrintOrder>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
index 4e31bb049be0b..8dbe44824e0a5 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertNoShipButton.php
@@ -20,8 +20,8 @@
 class AssertNoShipButton extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert no Ship button in the order grid
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php
index e7537b56714b5..75fbed3a6e762 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipTotalQuantity.php
@@ -21,8 +21,8 @@
 class AssertShipTotalQuantity extends AbstractAssertOrderOnFrontend
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that shipped items quantity in 'Total Quantity' is equal to data from fixture on My Account page
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
index 6e44a1b9a0573..1d0f47d81138e 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsGrid.php
@@ -19,8 +19,8 @@
 class AssertShipmentInShipmentsGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert shipment with corresponding shipment/order ID is present in 'Shipments' with correct total qty field
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
index 08ef9aa9067d5..8862afd403d79 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentInShipmentsTab.php
@@ -20,8 +20,8 @@
 class AssertShipmentInShipmentsTab extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that shipment is present in the Shipments tab with correct shipped items quantity
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
index 3d2a8604a8d22..3a693a3f87ad7 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentItems.php
@@ -21,8 +21,8 @@
 class AssertShipmentItems extends AbstractAssertItems
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Shipment index page
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
index 6a0d620808457..7fbceb754f4fd 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShipmentSuccessCreateMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertShipmentSuccessCreateMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Shipment created success message
      */
     const SUCCESS_MESSAGE = 'The shipment has been created.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert success message presents
      *
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php
index 996d7772bb04d..b12ea7121c523 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/Constraint/AssertShippingMethodOnPrintOrder.php
@@ -16,18 +16,15 @@
  */
 class AssertShippingMethodOnPrintOrder extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Shipping method and carrier template.
      */
     const SHIPPING_TEMPLATE = "%s - %s";
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that shipping method was printed correctly on sales guest print page.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/constraint.xml
index 7cf0cd89dd1a7..d072f5e595d7b 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/etc/constraint.xml
@@ -9,24 +9,24 @@
 -->
 <constraint>
     <assertNoShipButton module="Magento_Shipping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertNoShipButton>
     <assertShipmentInShipmentsTab module="Magento_Shipping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertShipmentInShipmentsTab>
     <assertShipmentSuccessCreateMessage module="Magento_Shipping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertShipmentSuccessCreateMessage>
     <assertShipmentInShipmentsGrid module="Magento_Shipping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertShipmentInShipmentsGrid>
     <assertShipTotalQuantity module="Magento_Shipping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertShipTotalQuantity>
     <assertShipmentItems module="Magento_Shipping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertShipmentItems>
     <assertShippingMethodOnPrintOrder module="Magento_Shipping">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertShippingMethodOnPrintOrder>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
index 9b70578b9fd4a..85a3a9fcd4a84 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapContent.php
@@ -22,8 +22,8 @@
 class AssertSitemapContent extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that sitemap.xml file contains correct content according to dataset:
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
index a9fa84807497b..e443bbbf1eb11 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailFolderSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertSitemapFailFolderSaveMessage extends AbstractConstraint
 {
-    const FAIL_FOLDER_MESSAGE = 'Please create the specified folder "%s" before saving the sitemap.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const FAIL_FOLDER_MESSAGE = 'Please create the specified folder "%s" before saving the sitemap.';
 
     /**
      * Assert that error message is displayed after creating sitemap with wrong folder
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
index 40255a43ceded..b523d4a5c90f5 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapFailPathSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertSitemapFailPathSaveMessage extends AbstractConstraint
 {
-    const FAIL_PATH_MESSAGE = 'Path "/%s" is not available and cannot be used.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const FAIL_PATH_MESSAGE = 'Path "/%s" is not available and cannot be used.';
 
     /**
      * Assert that error message is displayed after creating sitemap with wrong path
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
index 6fbb4dbf8c4f1..dafae18e10605 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapInGrid.php
@@ -18,8 +18,8 @@
 class AssertSitemapInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that sitemap availability in sitemap grid
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
index fc829945074f3..68dab24f28775 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertSitemapNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that sitemap not availability in sitemap grid
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
index 0eed9dc8da64f..2e905a6751557 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertSitemapSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'The sitemap has been deleted.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'The sitemap has been deleted.';
 
     /**
      * Assert that success message is displayed after sitemap delete
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
index fed04d0b449b4..00e73b15ed948 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessGenerateMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertSitemapSuccessGenerateMessage extends AbstractConstraint
 {
-    const SUCCESS_GENERATE_MESSAGE = 'The sitemap "%s" has been generated.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_GENERATE_MESSAGE = 'The sitemap "%s" has been generated.';
 
     /**
      * Assert that success message is displayed after sitemap generate
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
index b7a508fa9c8e7..825c50d0361e1 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveAndGenerateMessages.php
@@ -17,14 +17,14 @@
  */
 class AssertSitemapSuccessSaveAndGenerateMessages extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     const SUCCESS_GENERATE_MESSAGE = 'The sitemap "%s" has been generated.';
 
     const SUCCESS_SAVE_MESSAGE = 'The sitemap has been saved.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success messages is displayed after sitemap generate
      *
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
index 5800d27712810..02f1f1b70bb9a 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/Constraint/AssertSitemapSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertSitemapSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The sitemap has been saved.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The sitemap has been saved.';
 
     /**
      * Assert that success message is displayed after sitemap save
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/constraint.xml
index 0bf7a222f516a..0c14235bdc645 100644
--- a/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Sitemap/Test/etc/constraint.xml
@@ -9,30 +9,30 @@
 -->
 <constraint>
     <assertSitemapSuccessSaveMessage module="Magento_Sitemap">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSitemapSuccessSaveMessage>
     <assertSitemapInGrid module="Magento_Sitemap">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSitemapInGrid>
     <assertSitemapFailPathSaveMessage module="Magento_Sitemap">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSitemapFailPathSaveMessage>
     <assertSitemapFailFolderSaveMessage module="Magento_Sitemap">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSitemapFailFolderSaveMessage>
     <assertSitemapSuccessDeleteMessage module="Magento_Sitemap">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSitemapSuccessDeleteMessage>
     <assertSitemapNotInGrid module="Magento_Sitemap">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSitemapNotInGrid>
     <assertSitemapSuccessSaveAndGenerateMessages module="Magento_Sitemap">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSitemapSuccessSaveAndGenerateMessages>
     <assertSitemapContent module="Magento_Sitemap">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSitemapContent>
     <assertSitemapSuccessGenerateMessage module="Magento_Sitemap">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSitemapSuccessGenerateMessage>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
index 7be71dce68633..202f13c7039af 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreBackend.php
@@ -19,8 +19,8 @@
 class AssertStoreBackend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created store view displays in backend configuration (Stores > Configuration > "Scope" dropdown)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
index 47d263e13f8bf..c330dbb5d3fb9 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreForm.php
@@ -20,8 +20,8 @@
 class AssertStoreForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that displayed Store View data on edit page equals passed from fixture
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
index 399a02a53aebd..4161407c77687 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreFrontend.php
@@ -19,8 +19,8 @@
 class AssertStoreFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created store view available on frontend (store view selector on page top)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
index 75dd27132fba0..ec38018793af2 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupForm.php
@@ -20,8 +20,8 @@
 class AssertStoreGroupForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
index 46173fb0af354..3bc11f25068c5 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupInGrid.php
@@ -19,8 +19,8 @@
 class AssertStoreGroupInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Store Group can be found in Stores grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
index 2c502b449baf9..2fa6743244fc8 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertStoreGroupNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Store Group can not be found in Stores grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
index eb6cbf745afa1..15dde17f8e189 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupOnStoreViewForm.php
@@ -20,8 +20,8 @@
 class AssertStoreGroupOnStoreViewForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that New Store Group visible on StoreView Form in Store dropdown
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
index 18fc32f33b228..c67f9a245440c 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteAndBackupMessages.php
@@ -17,6 +17,10 @@
  */
 class AssertStoreGroupSuccessDeleteAndBackupMessages extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success backup message
      */
@@ -27,10 +31,6 @@ class AssertStoreGroupSuccessDeleteAndBackupMessages extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The store has been deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success messages is displayed after deleting store group
      *
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
index 5fd01fb2c69b4..23c615e28d97e 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertStoreGroupSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success store group delete message
      */
     const SUCCESS_DELETE_MESSAGE = 'The store has been deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after deleting store group
      *
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
index bf8f87586f8ad..c2d046ad638d7 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreGroupSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertStoreGroupSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success store create message
      */
     const SUCCESS_MESSAGE = 'The store has been saved.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after Store Group has been created
      *
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
index 87c9f6bab4b1e..ea2fc294e952a 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreInGrid.php
@@ -19,8 +19,8 @@
 class AssertStoreInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Store View can be found in Stores grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
index 3133071f20d00..640199ba84e1d 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertStoreNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Store can not be found in Stores grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
index 09f1732b9cccd..ab01c4c54fdd9 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreNotOnFrontend.php
@@ -19,8 +19,8 @@
 class AssertStoreNotOnFrontend extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created store view is not available on frontend (store view selector on page top)
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
index ce58c1bf77c54..c05b992d631de 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteAndBackupMessages.php
@@ -17,6 +17,10 @@
  */
 class AssertStoreSuccessDeleteAndBackupMessages extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success backup message
      */
@@ -27,10 +31,6 @@ class AssertStoreSuccessDeleteAndBackupMessages extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The store view has been deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that store success delete and backup messages are present
      *
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
index 68d6b781505f1..4fe29cc0b873c 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertStoreSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success store delete message
      */
     const SUCCESS_DELETE_MESSAGE = 'The store view has been deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that after store delete successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
index bd3df002224e9..95958198ae095 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertStoreSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertStoreSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success store view create message
      */
     const SUCCESS_MESSAGE = 'The store view has been saved';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after Store View has been created
      *
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
index ffda86d8bff61..4f35f7b1f7004 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteForm.php
@@ -20,8 +20,8 @@
 class AssertWebsiteForm extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
index d2d374fbb2dce..be1507534a018 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteInGrid.php
@@ -19,8 +19,8 @@
 class AssertWebsiteInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Website can be found in Stores grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
index 3c2bbc075d868..ec7f05f4ff2b4 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertWebsiteNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created Website can't be found in grid by name
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
index 9bc97635b6fb4..d20e30e790780 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteOnStoreForm.php
@@ -20,8 +20,8 @@
 class AssertWebsiteOnStoreForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Website visible on Store Group Form in Website dropdown
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
index bc98883b684d1..c18a41c4d210a 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteAndBackupMessages.php
@@ -17,6 +17,10 @@
  */
 class AssertWebsiteSuccessDeleteAndBackupMessages extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success backup message
      */
@@ -27,10 +31,6 @@ class AssertWebsiteSuccessDeleteAndBackupMessages extends AbstractConstraint
      */
     const SUCCESS_DELETE_MESSAGE = 'The website has been deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success messages is displayed after deleting website
      *
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
index 07fc6624757e1..0ec54af29b781 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertWebsiteSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success website delete message
      */
     const SUCCESS_DELETE_MESSAGE = 'The website has been deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after deleting website
      *
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
index d23c9679854ff..630511d36c3ab 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/Constraint/AssertWebsiteSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertWebsiteSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success website create message
      */
     const SUCCESS_MESSAGE = 'The website has been saved.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after Website has been created
      *
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Store/Test/etc/constraint.xml
index b64875ff21d92..09c8539d95626 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/etc/constraint.xml
@@ -9,78 +9,78 @@
 -->
 <constraint>
     <assertStoreGroupSuccessSaveMessage module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreGroupSuccessSaveMessage>
     <assertStoreGroupInGrid module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreGroupInGrid>
     <assertStoreGroupForm module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreGroupForm>
     <assertStoreGroupOnStoreViewForm module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreGroupOnStoreViewForm>
     <assertStoreGroupSuccessDeleteMessage module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreGroupSuccessDeleteMessage>
     <assertStoreGroupNotInGrid module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreGroupNotInGrid>
     <assertStoreGroupSuccessDeleteAndBackupMessages module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreGroupSuccessDeleteAndBackupMessages>
     <assertStoreSuccessSaveMessage module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreSuccessSaveMessage>
     <assertStoreInGrid module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreInGrid>
     <assertStoreBackend module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreBackend>
     <assertStoreFrontend module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreFrontend>
     <assertStoreNotOnFrontend module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreNotOnFrontend>
     <assertWebsiteSuccessSaveMessage module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWebsiteSuccessSaveMessage>
     <assertWebsiteInGrid module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWebsiteInGrid>
     <assertWebsiteOnStoreForm module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWebsiteOnStoreForm>
     <assertWebsiteForm module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWebsiteForm>
     <assertWebsiteSuccessDeleteAndBackupMessages module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWebsiteSuccessDeleteAndBackupMessages>
     <assertWebsiteSuccessDeleteMessage module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWebsiteSuccessDeleteMessage>
     <assertWebsiteNotInGrid module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWebsiteNotInGrid>
     <assertStoreForm module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreForm>
     <assertStoreSuccessDeleteMessage module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreSuccessDeleteMessage>
     <assertStoreSuccessDeleteMessage module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreSuccessDeleteMessage>
     <assertStoreNotInGrid module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreNotInGrid>
     <assertStoreNotOnFrontend module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreNotOnFrontend>
     <assertStoreSuccessDeleteAndBackupMessages module="Magento_Store">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertStoreSuccessDeleteAndBackupMessages>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertCrossSellsProductsSectionForCustomerSegment.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertCrossSellsProductsSectionForCustomerSegment.php
index ac8cfb9e4f6d8..52c601e829cdc 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertCrossSellsProductsSectionForCustomerSegment.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertCrossSellsProductsSectionForCustomerSegment.php
@@ -24,8 +24,8 @@
 class AssertCrossSellsProductsSectionForCustomerSegment extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'medium';
-     /* end tags */
+    const SEVERITY = 'medium';
+    /* end tags */
 
     /**
      * Assert that product is displayed in cross-sell section for customer segment
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleForm.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleForm.php
index 5d5c8b05e5c9d..9fecd9656e4ae 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleForm.php
@@ -20,8 +20,8 @@
 class AssertTargetRuleForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Skipped fields for verify data
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleInGrid.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleInGrid.php
index 1a6e3096d47af..1f95dd22ab0ea 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleInGrid.php
@@ -17,15 +17,15 @@
  */
 class AssertTargetRuleInGrid extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Day in seconds
      */
     const DAY = 86400;
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert target rule availability in Target Rule Grid
      *
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleIsNotPresentedInGrid.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleIsNotPresentedInGrid.php
index 56e7828227444..c0e7377a94eb7 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleIsNotPresentedInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleIsNotPresentedInGrid.php
@@ -17,15 +17,15 @@
  */
 class AssertTargetRuleIsNotPresentedInGrid extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'middle';
+    /* end tags */
+
     /**
      * Day in seconds
      */
     const DAY = 86400;
 
-    /* tags */
-     const SEVERITY = 'middle';
-     /* end tags */
-
     /**
      * Assert that Target Rule is not presented in grid
      *
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessDeleteMessage.php
index 6534e2d7d7dfc..578dbc2aed466 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertTargetRuleSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'You deleted the rule.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'You deleted the rule.';
 
     /**
      * Assert that success message is displayed after target rule delete
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessSaveMessage.php
index 11873a8ade709..f16fd6b2ff9b4 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/Constraint/AssertTargetRuleSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertTargetRuleSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You saved the rule.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You saved the rule.';
 
     /**
      * Assert that success message is displayed after target rule save
diff --git a/dev/tests/functional/tests/app/Magento/TargetRule/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/TargetRule/Test/etc/constraint.xml
index c4123985b1fbe..7d6fcbe779e60 100644
--- a/dev/tests/functional/tests/app/Magento/TargetRule/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/TargetRule/Test/etc/constraint.xml
@@ -9,33 +9,33 @@
 -->
 <constraint>
     <assertTargetRuleSuccessDeleteMessage module="Magento_TargetRule">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <targetRuleIndex class="Magento\TargetRule\Test\Page\Adminhtml\TargetRuleIndex" />
         </require>
     </assertTargetRuleSuccessDeleteMessage>
     <assertTargetRuleSuccessSaveMessage module="Magento_TargetRule">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <targetRuleIndex class="Magento\TargetRule\Test\Page\Adminhtml\TargetRuleIndex" />
         </require>
     </assertTargetRuleSuccessSaveMessage>
     <assertTargetRuleInGrid module="Magento_TargetRule">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <targetRule class="Magento\TargetRule\Test\Fixture\TargetRule" />
             <targetRuleIndex class="Magento\TargetRule\Test\Page\Adminhtml\TargetRuleIndex" />
         </require>
     </assertTargetRuleInGrid>
     <assertTargetRuleIsNotPresentedInGrid module="Magento_TargetRule">
-        <severeness>middle</severeness>
+        <severity>middle</severity>
         <require>
             <targetRule class="Magento\TargetRule\Test\Fixture\TargetRule" />
             <targetRuleIndex class="Magento\TargetRule\Test\Page\Adminhtml\TargetRuleIndex" />
         </require>
     </assertTargetRuleIsNotPresentedInGrid>
     <assertTargetRuleForm module="Magento_TargetRule">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <targetRuleIndex class="Magento\TargetRule\Test\Page\Adminhtml\TargetRuleIndex" />
             <targetRuleEdit class="Magento\TargetRule\Test\Page\Adminhtml\TargetRuleEdit" />
@@ -44,6 +44,6 @@
         </require>
     </assertTargetRuleForm>
     <assertCrossSellsProductsSectionForCustomerSegment module="Magento_TargetRule">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
     </assertCrossSellsProductsSectionForCustomerSegment>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
index c2c63ca7eaa1f..c791074f695e0 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
@@ -19,8 +19,8 @@
 class AssertTaxRateForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that tax rate form filled correctly
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
index 4ff987767762a..52aefe0d4349d 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInGrid.php
@@ -18,8 +18,8 @@
 class AssertTaxRateInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert tax rule availability in Tax Rate grid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
index 2306d918c1617..f2766734c323d 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateInTaxRule.php
@@ -16,8 +16,8 @@
 class AssertTaxRateInTaxRule extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php
index d0af6526510ad..be7fb90c3b856 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateIsInCorrectRange.php
@@ -16,8 +16,8 @@
 class AssertTaxRateIsInCorrectRange extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * @return void
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
index 46ae57ece839a..86ea4ae645f2a 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertTaxRateNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that tax rate not available in Tax Rate grid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
index 3f6c91b112f15..b79958a7e4691 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateNotInTaxRule.php
@@ -18,8 +18,8 @@
 class AssertTaxRateNotInTaxRule extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that tax rate is absent in tax rule form
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
index a8d62ddee4420..fe28608df261e 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertTaxRateSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'The tax rate has been deleted.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'The tax rate has been deleted.';
 
     /**
      * Assert that success delete message is displayed after tax rate deleted
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
index 2a6768ebd40ae..c41123a18428d 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertTaxRateSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The tax rate has been saved.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The tax rate has been saved.';
 
     /**
      * Assert that success message is displayed after tax rate saved
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
index 2c5b5fba75ffc..d74d7bc9bf67d 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleForm.php
@@ -19,8 +19,8 @@
 class AssertTaxRuleForm extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that tax rule form filled right
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
index 40e08bf94b044..6cfcd52e99d16 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleInGrid.php
@@ -18,8 +18,8 @@
 class AssertTaxRuleInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert tax rule availability in Tax Rule grid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php
index f77dc794adf74..0d5a5ca8eb314 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsApplied.php
@@ -14,8 +14,8 @@
 class AssertTaxRuleIsApplied extends AssertTaxRuleApplying
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that tax rule is applied on product in shopping cart.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
index de8d33c9c0b65..15e99b7c6aed2 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
@@ -23,6 +23,10 @@
  */
 class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Cms index page
      *
@@ -51,10 +55,6 @@ class AssertTaxRuleIsAppliedToAllPrices extends AbstractConstraint
      */
     protected $checkoutCart;
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that specified prices are actual on category, product and cart pages
      *
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php
index 01cce58996ff7..7fb5f197e6c66 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsNotApplied.php
@@ -14,8 +14,8 @@
 class AssertTaxRuleIsNotApplied extends AssertTaxRuleApplying
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that tax rule is not applied on product in shopping cart.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
index 4f59caba9dd8c..342f263a1a0f4 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertTaxRuleNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that tax rule not available in Tax Rule grid
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
index f81b5cbb1a42a..9b538b9595595 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertTaxRuleSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'The tax rule has been deleted.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'The tax rule has been deleted.';
 
     /**
      * Assert that success delete message is displayed after tax rule deleted
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
index 570ca49923d9c..ac8d2a6d9727b 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertTaxRuleSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The tax rule has been saved.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The tax rule has been saved.';
 
     /**
      * Assert that success message is displayed after tax rule saved
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php
index ca554e41091ff..4e29752739ccf 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderApplied.php
@@ -15,8 +15,8 @@
 class AssertTaxWithCrossBorderApplied extends AbstractAssertTaxWithCrossBorderApplying
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert prices on category, product and cart pages are equal for both customers
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php
index b708f987e6a9e..2b31a5bf30ac2 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxWithCrossBorderNotApplied.php
@@ -15,8 +15,8 @@
 class AssertTaxWithCrossBorderNotApplied extends AbstractAssertTaxWithCrossBorderApplying
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert prices on category, product and cart pages are different for each customer
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml
index 9eb6e3fa2a432..a8d59476e309e 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/etc/constraint.xml
@@ -9,20 +9,20 @@
 -->
 <constraint>
     <assertTaxRuleSuccessSaveMessage module="Magento_Tax">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <taxRuleIndex class="Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex" />
         </require>
     </assertTaxRuleSuccessSaveMessage>
     <assertTaxRuleInGrid module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <taxRuleIndex class="Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex" />
             <taxRule class="Magento\Tax\Test\Fixture\TaxRule" />
         </require>
     </assertTaxRuleInGrid>
     <assertTaxRuleForm module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <taxRuleIndex class="Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex" />
             <taxRuleNew class="Magento\Tax\Test\Page\Adminhtml\TaxRuleNew" />
@@ -30,20 +30,20 @@
         </require>
     </assertTaxRuleForm>
     <assertTaxRateSuccessSaveMessage module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <taxRateIndex class="Magento\Tax\Test\Page\Adminhtml\TaxRateIndex" />
         </require>
     </assertTaxRateSuccessSaveMessage>
     <assertTaxRateInGrid module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <taxRateIndex class="Magento\Tax\Test\Page\Adminhtml\TaxRateIndex" />
             <taxRate class="Magento\Tax\Test\Fixture\TaxRate" />
         </require>
     </assertTaxRateInGrid>
     <assertTaxRateForm module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <taxRateIndex class="Magento\Tax\Test\Page\Adminhtml\TaxRateIndex" />
             <taxRateNew class="Magento\Tax\Test\Page\Adminhtml\TaxRateNew" />
@@ -51,54 +51,54 @@
         </require>
     </assertTaxRateForm>
     <assertTaxRateIsInCorrectRange module="Magento_Tax">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTaxRateIsInCorrectRange>
     <assertTaxRateInTaxRule module="Magento_Tax">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertTaxRateInTaxRule>
     <assertTaxRuleIsApplied module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertTaxRuleIsApplied>
     <assertTaxRuleIsAppliedToAllPrices module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertTaxRuleIsAppliedToAllPrices>
     <assertTaxWithCrossBorderApplied module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertTaxWithCrossBorderApplied>
     <assertTaxRuleIsNotApplied module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertTaxRuleIsNotApplied>
     <assertTaxWithCrossBorderNotApplied module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertTaxWithCrossBorderNotApplied>
     <assertTaxRuleSuccessDeleteMessage module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <taxRuleIndex class="Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex" />
         </require>
     </assertTaxRuleSuccessDeleteMessage>
     <assertTaxRuleNotInGrid module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <taxRuleIndex class="Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex" />
             <taxRule class="Magento\Tax\Test\Fixture\TaxRule" />
         </require>
     </assertTaxRuleNotInGrid>
     <assertTaxRateSuccessDeleteMessage module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <taxRateIndex class="Magento\Tax\Test\Page\Adminhtml\TaxRateIndex" />
         </require>
     </assertTaxRateSuccessDeleteMessage>
     <assertTaxRateNotInGrid module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <taxRateIndex class="Magento\Tax\Test\Page\Adminhtml\TaxRateIndex" />
             <taxRate class="Magento\Tax\Test\Fixture\TaxRate" />
         </require>
     </assertTaxRateNotInGrid>
     <assertTaxRateNotInTaxRule module="Magento_Tax">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <taxRate class="Magento\Tax\Test\Fixture\TaxRate" />
             <taxRule class="Magento\Tax\Test\Fixture\TaxRule" />
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
index 5e27f27369dc6..4fb5552197c94 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertPageByUrlRewriteIsNotFound.php
@@ -19,15 +19,15 @@
  */
 class AssertPageByUrlRewriteIsNotFound extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message on the product page 404
      */
     const NOT_FOUND_MESSAGE = 'Whoops, our bad...';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Checking the server response 404 page on frontend
      *
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
index 9b0110198d179..def33fe5815ba 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryInGrid.php
@@ -19,8 +19,8 @@
 class AssertUrlRewriteCategoryInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that url rewrite category in grid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
index f2e60dc686765..f99bc18b4b9c4 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertUrlRewriteCategoryNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that category url rewrite not in grid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
index 7a93b39cf0c12..b73970623a5f5 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCategoryRedirect.php
@@ -20,8 +20,8 @@
 class AssertUrlRewriteCategoryRedirect extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert check URL rewrite category redirect
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
index a77a433c1ddba..f0ebb0a5772db 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomRedirect.php
@@ -20,8 +20,8 @@
 class AssertUrlRewriteCustomRedirect extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert check URL rewrite custom redirect
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
index 2ac74cc26bbf9..e45ebc6e89421 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteCustomSearchRedirect.php
@@ -20,8 +20,8 @@
 class AssertUrlRewriteCustomSearchRedirect extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created entity was found on search page
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
index c8be961c1d456..9f282261b5ce4 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteDeletedMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertUrlRewriteDeletedMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message that displayed after delete url rewrite
      */
     const SUCCESS_DELETE_MESSAGE = 'The URL Rewrite has been deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that delete message is displayed
      *
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
index 1b9db85cbb16a..17355dc709b16 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteInGrid.php
@@ -19,8 +19,8 @@
 class AssertUrlRewriteInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that url rewrite category in grid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
index bfc912077f059..da138fd6c5b51 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteNotInGrid.php
@@ -19,8 +19,8 @@
 class AssertUrlRewriteNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that url rewrite not in grid
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
index bc7b04310747f..f27faa060ba5f 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductRedirect.php
@@ -21,8 +21,8 @@
 class AssertUrlRewriteProductRedirect extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Check that product available by new URL on the front
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
index ccf8fbeb7d835..6be035cdae341 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertUrlRewriteSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'The URL Rewrite has been saved.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'The URL Rewrite has been saved.';
 
     /**
      * Assert that url rewrite success message is displayed
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
index 115c75ae9d9af..66851bd871b82 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteSuccessOutsideRedirect.php
@@ -19,8 +19,8 @@
 class AssertUrlRewriteSuccessOutsideRedirect extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that outside redirect was success
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php
index 3d4bbe9154f3e..07ba992603905 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteUpdatedProductInGrid.php
@@ -18,12 +18,9 @@
  */
 class AssertUrlRewriteUpdatedProductInGrid extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product url in url rewrite grid.
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml
index 316420ffe7a72..ffea07391ec21 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/etc/constraint.xml
@@ -9,20 +9,20 @@
 -->
 <constraint>
     <assertUrlRewriteInGrid module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <urlRewriteIndex class="Magento\UrlRewrite\Test\Fixture\UrlRewriteCategory"/>
             <urlRewriteCategory class="Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex"/>
         </require>
     </assertUrlRewriteInGrid>
     <assertUrlRewriteSaveMessage module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertUrlRewriteSaveMessage>
     <assertUrlRewriteCategoryRedirect module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertUrlRewriteCategoryRedirect>
     <assertUrlRewriteProductRedirect module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <urlRewrite class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView"/>
@@ -31,20 +31,20 @@
         </require>
     </assertUrlRewriteProductRedirect>
     <assertUrlRewriteDeletedMessage module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <index class="Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex"/>
         </require>
     </assertUrlRewriteDeletedMessage>
     <assertUrlRewriteNotInGrid module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <urlRewriteIndex class="Magento\UrlRewrite\Test\Page\Adminhtml\UrlRewriteIndex"/>
             <productRedirect class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
         </require>
     </assertUrlRewriteNotInGrid>
     <assertPageByUrlRewriteIsNotFound module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <catalogProductView class="Magento\Catalog\Test\Page\Product\CatalogProductView"/>
             <productRedirect class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
@@ -52,17 +52,17 @@
         </require>
     </assertPageByUrlRewriteIsNotFound>
     <assertUrlRewriteCustomRedirect module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertUrlRewriteCustomRedirect>
     <assertUrlRewriteSuccessOutsideRedirect module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <urlRewrite class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
             <browser class="Mtf\Client\Browser"/>
         </require>
     </assertUrlRewriteSuccessOutsideRedirect>
     <assertUrlRewriteCustomSearchRedirect module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <urlRewrite class="Magento\UrlRewrite\Test\Fixture\UrlRewrite"/>
             <browser class="Mtf\Client\Browser"/>
@@ -70,12 +70,12 @@
         </require>
     </assertUrlRewriteCustomSearchRedirect>
     <assertUrlRewriteCategoryInGrid module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertUrlRewriteCategoryInGrid>
     <assertUrlRewriteUpdatedProductInGrid module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertUrlRewriteUpdatedProductInGrid>
     <assertUrlRewriteCategoryNotInGrid module="Magento_UrlRewrite">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertUrlRewriteCategoryNotInGrid>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
index e69ffd59f8777..e2870067d4d3f 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertAccessTokensErrorRevokeMessage.php
@@ -17,18 +17,15 @@
  */
 class AssertAccessTokensErrorRevokeMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * User revoke tokens error message.
      */
     const ERROR_MESSAGE = 'This user has no tokens.';
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that error message appears after click on 'Force Sing-In' button for user without tokens.
      *
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
index 2e7abee1e9e2b..6f151b79eec5e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnAccount.php
@@ -16,11 +16,11 @@
  */
 class AssertImpossibleDeleteYourOwnAccount extends AbstractConstraint
 {
-    const ERROR_MESSAGE = 'You cannot delete your own account.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const ERROR_MESSAGE = 'You cannot delete your own account.';
 
     /**
      * Asserts that error message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
index bf9ee5c587e9e..d3c4a0d48ba23 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertImpossibleDeleteYourOwnRole.php
@@ -16,11 +16,11 @@
  */
 class AssertImpossibleDeleteYourOwnRole extends AbstractConstraint
 {
-    const ERROR_MESSAGE = 'You cannot delete self-assigned roles.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const ERROR_MESSAGE = 'You cannot delete self-assigned roles.';
 
     /**
      * Asserts that error message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
index f2caf10577ca3..e1b35dccbefe1 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleInGrid.php
@@ -18,8 +18,8 @@
 class AssertRoleInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Asserts that saved role is present in Role Grid.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
index 653d59024c09a..e09564b4e8380 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertRoleNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Asserts that role is not present in Role Grid.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
index a95359b28383b..fe59ef0ebe7de 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertRoleSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_DELETE_MESSAGE = 'You deleted the role.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_DELETE_MESSAGE = 'You deleted the role.';
 
     /**
      * Asserts that success delete message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
index d9c0836466d06..8c40c8f599f60 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertRoleSuccessSaveMessage.php
@@ -16,13 +16,12 @@
  */
 class AssertRoleSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     const SUCCESS_MESSAGE = 'You saved the role.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Asserts that success message equals to expected message.
      *
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
index 33e9b24a5387a..9495684283966 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserDuplicateMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertUserDuplicateMessage extends AbstractConstraint
 {
-    const ERROR_MESSAGE = 'A user with the same user name or email already exists.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const ERROR_MESSAGE = 'A user with the same user name or email already exists.';
 
     /**
      * Asserts that error message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
index d881adef7e29a..5b941c50d5054 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInGrid.php
@@ -18,8 +18,8 @@
 class AssertUserInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Asserts that user is present in User Grid.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
index 4961cfb109eb2..d069cea9887c6 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserInvalidEmailMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertUserInvalidEmailMessage extends AbstractConstraint
 {
-    const ERROR_MESSAGE = 'Please correct this email address: "%s".';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const ERROR_MESSAGE = 'Please correct this email address: "%s".';
 
     /**
      * Asserts that error message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
index dc70177372c1d..2454ae7eb9b70 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserNotInGrid.php
@@ -18,8 +18,8 @@
 class AssertUserNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Asserts that User is not present in User Grid.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
index 24df646ecee8e..01cede6fd870a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserRoleSalesRestrictedAccess.php
@@ -17,13 +17,13 @@
  */
 class AssertUserRoleSalesRestrictedAccess extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     const ROLE_RESOURCE = 'sales';
     const DENIED_ACCESS = 'Access denied';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Asserts that user has only Sales-related permissions
      *
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
index f79ffef0a37a9..84cff8a59b06c 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessDeleteMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertUserSuccessDeleteMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You deleted the user.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You deleted the user.';
 
     /**
      * Asserts that success delete message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
index c00992ab986f6..c5c6b450d89f5 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogOut.php
@@ -18,8 +18,8 @@
 class AssertUserSuccessLogOut extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Asserts that 'You have logged out.' message is present on page
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
index 9b8d79ecc7b8a..12599681b0b72 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessLogin.php
@@ -19,8 +19,8 @@
 class AssertUserSuccessLogin extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Verify whether customer has logged in to the Backend
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
index 2a7c88b68fe89..c0ca46e9616a1 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserSuccessSaveMessage.php
@@ -16,11 +16,11 @@
  */
 class AssertUserSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_MESSAGE = 'You saved the user.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const SUCCESS_MESSAGE = 'You saved the user.';
 
     /**
      * Asserts that success message equals to expected message.
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
index 07e3997e975cb..d7ef6af030e5e 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Constraint/AssertUserWrongCredentialsMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertUserWrongCredentialsMessage extends AbstractConstraint
 {
-    const INVALID_CREDENTIALS_MESSAGE = 'Please correct the user name or password.';
-
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    const INVALID_CREDENTIALS_MESSAGE = 'Please correct the user name or password.';
 
     /**
      * Verify incorrect credentials message while login to admin
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/User/Test/etc/constraint.xml
index 35d98ed51bb94..caba86a9f2013 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/User/Test/etc/constraint.xml
@@ -9,7 +9,7 @@
 -->
 <constraint>
     <assertUserSuccessLogin module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <dashboard class="Magento\Backend\Test\Page\Adminhtml\Dashboard" />
             <adminAuth class="Magento\Backend\Test\Page\AdminAuthLogin" />
@@ -18,102 +18,102 @@
         </require>
     </assertUserSuccessLogin>
     <assertUserSuccessLogOut module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <adminAuth class="Magento\Backend\Test\Page\AdminAuthLogin" />
             <dashboard class="Magento\Backend\Test\Page\Adminhtml\Dashboard" />
         </require>
     </assertUserSuccessLogOut>
     <assertUserWrongCredentialsMessage module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <adminAuth class="Magento\Backend\Test\Page\AdminAuthLogin" />
             <customAdmin class="Magento\User\Test\Fixture\User" />
         </require>
     </assertUserWrongCredentialsMessage>
     <assertUserRoleSalesRestrictedAccess module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <userIndex class="Magento\User\Test\Page\Adminhtml\UserIndex" />
             <dashboard class="Magento\Backend\Test\Page\Adminhtml\Dashboard" />
         </require>
     </assertUserRoleSalesRestrictedAccess>
     <assertRoleSuccessSaveMessage module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleIndex" />
         </require>
     </assertRoleSuccessSaveMessage>
     <assertRoleInGrid module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleIndex" />
         </require>
     </assertRoleInGrid>
     <assertUserInGrid module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <userIndex class="Magento\User\Test\Page\Adminhtml\UserIndex" />
             <user class="Magento\User\Test\Fixture\User" />
         </require>
     </assertUserInGrid>
     <assertUserSuccessSaveMessage module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <userIndex class="Magento\User\Test\Page\Adminhtml\UserIndex" />
         </require>
     </assertUserSuccessSaveMessage>
     <assertImpossibleDeleteYourOwnRole module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleEditRole" />
         </require>
     </assertImpossibleDeleteYourOwnRole>
     <assertRoleSuccessDeleteMessage module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleIndex" />
         </require>
     </assertRoleSuccessDeleteMessage>
     <assertRoleNotInGrid module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <rolePage class="Magento\User\Test\Page\Adminhtml\UserRoleIndex" />
         </require>
     </assertRoleNotInGrid>
     <assertImpossibleDeleteYourOwnAccount module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <userEdit class="Magento\User\Test\Page\Adminhtml\UserEdit" />
         </require>
     </assertImpossibleDeleteYourOwnAccount>
     <assertUserSuccessDeleteMessage module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <userIndex class="Magento\User\Test\Page\Adminhtml\UserIndex" />
         </require>
     </assertUserSuccessDeleteMessage>
     <assertUserNotInGrid module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <userIndex class="Magento\User\Test\Page\Adminhtml\UserIndex" />
         </require>
     </assertUserNotInGrid>
     <assertUserDuplicateMessage module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <userEdit class="Magento\User\Test\Page\Adminhtml\UserEdit" />
         </require>
     </assertUserDuplicateMessage>
     <assertUserInvalidEmailMessage module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <userEdit class="Magento\User\Test\Page\Adminhtml\UserEdit" />
             <user class="Magento\User\Test\Fixture\User" />
         </require>
     </assertUserInvalidEmailMessage>
     <assertAccessTokensErrorRevokeMessage module="Magento_User">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <userEdit class="Magento\User\Test\Page\Adminhtml\UserEdit" />
         </require>
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageCurrentlyPublishedRevision.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageCurrentlyPublishedRevision.php
index 5e0dcd85c1488..12498d4999604 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageCurrentlyPublishedRevision.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageCurrentlyPublishedRevision.php
@@ -21,8 +21,8 @@
 class AssertCmsPageCurrentlyPublishedRevision extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert that link to Currently Published Revision on CMS Page Information Form is available
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageInitialVersionInGrid.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageInitialVersionInGrid.php
index d0d9d7b2d4d82..7a4b2476702f7 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageInitialVersionInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageInitialVersionInGrid.php
@@ -20,8 +20,8 @@
 class AssertCmsPageInitialVersionInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * CmsNew Page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageNewVersionSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageNewVersionSuccessSaveMessage.php
index f34c6bc96ad21..2e84fcd2310e7 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageNewVersionSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageNewVersionSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCmsPageNewVersionSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * New version success save message
      */
     const SUCCESS_SAVE_MESSAGE = 'You have created the new version.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that after new CMS page version save successful message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionErrorDeleteMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionErrorDeleteMessage.php
index 2bc28ea4705f6..b96a5a816619e 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionErrorDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionErrorDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCmsPageRevisionErrorDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const ERROR_DELETE_MESSAGE = 'Revision #%d could not be removed because it is published.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that error delete message is displayed on the page
      *
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionInGrid.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionInGrid.php
index ec6cbbf1a9ed9..4c62e7d1f61c7 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionInGrid.php
@@ -21,8 +21,8 @@
 class AssertCmsPageRevisionInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created CMS page revision can be found in CMS page Version Revisions grid
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionNotInGrid.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionNotInGrid.php
index b7748ed7ed156..feaeede8b50cc 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionNotInGrid.php
@@ -21,8 +21,8 @@
 class AssertCmsPageRevisionNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created CMS page revision can not be found in CMS page Version Revisions grid
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionPreview.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionPreview.php
index 0540cdf88c5b1..e8098e8eb636c 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionPreview.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionPreview.php
@@ -24,8 +24,8 @@
 class AssertCmsPageRevisionPreview extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created CMS page revision content can be found in CMS page revisions preview
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessMassDeleteMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessMassDeleteMessage.php
index 7ec3e226b39f1..a1bee716b87a7 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessMassDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessMassDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCmsPageRevisionSuccessMassDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'medium';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MASS_DELETE_MESSAGE = 'A total of %d record(s) have been deleted.';
 
-    /* tags */
-     const SEVERITY = 'medium';
-     /* end tags */
-
     /**
      * Assert that success mass delete message is displayed on the page
      *
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessPublishMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessPublishMessage.php
index f0b17bbfb26ba..9abd3ebeb7546 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessPublishMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessPublishMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCmsPageRevisionSuccessPublishMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_PUBLISH_MESSAGE = 'You have published the revision.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert success publish message is displayed on the page
      *
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessSaveMessage.php
index b6e30d3ce5518..db9dd034d2537 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageRevisionSuccessSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCmsPageRevisionSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_SAVE_MESSAGE = 'You have saved the revision.';
 
-    /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
-
     /**
      * Assert that success save message is displayed on the CmsVersionEdit page
      *
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorDeleteMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorDeleteMessage.php
index 7b860b26b3c8d..4da3829196464 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCmsPageVersionErrorDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'medium';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const ERROR_DELETE_MESSAGE = 'Version "%s" cannot be removed because its revision is published.';
 
-    /* tags */
-     const SEVERITY = 'medium';
-     /* end tags */
-
     /**
      * Assert that error delete message is displayed on the page
      *
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorSaveMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorSaveMessage.php
index 5829616606bf1..2d5f26ee36f0a 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionErrorSaveMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCmsPageVersionErrorSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Save error message
      */
     const ERROR_SAVE_MESSAGE = 'Cannot change version access level because it is the last public version for its page.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that after change access level of last public version to private error message appears
      *
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionInGrid.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionInGrid.php
index 57e89942d3e15..637b84ba59c5b 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionInGrid.php
@@ -19,8 +19,8 @@
 class AssertCmsPageVersionInGrid extends AssertCmsPageInitialVersionInGrid
 {
     /* tags */
-     const SEVERITY = 'medium';
-     /* end tags */
+    const SEVERITY = 'medium';
+    /* end tags */
 
     /**
      * Assert that created CMS page version can be found on CMS page Versions tab in grid via:
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionNotInGrid.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionNotInGrid.php
index 4a485a108395f..1e1784769064a 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionNotInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionNotInGrid.php
@@ -20,8 +20,8 @@
 class AssertCmsPageVersionNotInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created CMS page version can not be found on CMS page Versions tab in grid
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessDeleteMessage.php
index 5870ce440de91..2ceab5be2db1b 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCmsPageVersionSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'medium';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_DELETE_MESSAGE = 'You have deleted the version.';
 
-    /* tags */
-     const SEVERITY = 'medium';
-     /* end tags */
-
     /**
      * Assert that success delete message is displayed on the page
      *
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessMassDeleteMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessMassDeleteMessage.php
index a30c5328a65e2..3d51885c9aa3d 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessMassDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessMassDeleteMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertCmsPageVersionSuccessMassDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'medium';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_DELETE_MESSAGE = 'A total of %d record(s) have been deleted.';
 
-    /* tags */
-     const SEVERITY = 'medium';
-     /* end tags */
-
     /**
      * Assert that success delete message is displayed on the page
      *
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessSaveMessage.php
index 2ba4e0f8066db..68e1b663fec3d 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertCmsPageVersionSuccessSaveMessage.php
@@ -17,11 +17,11 @@
  */
 class AssertCmsPageVersionSuccessSaveMessage extends AbstractConstraint
 {
-    const SUCCESS_SAVE_MESSAGE = 'You have saved the version.';
-
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
+    const SUCCESS_SAVE_MESSAGE = 'You have saved the version.';
 
     /**
      * Assert that success save message is displayed on the page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertWidgetHierarchyNodeLinkOnHomePage.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertWidgetHierarchyNodeLinkOnHomePage.php
index 60e7ff8a489e4..311fa40b310a4 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertWidgetHierarchyNodeLinkOnHomePage.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/Constraint/AssertWidgetHierarchyNodeLinkOnHomePage.php
@@ -20,8 +20,8 @@
 class AssertWidgetHierarchyNodeLinkOnHomePage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that widget hierarchy node link is present on Home page and after click to link widget redirects to page
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/etc/constraint.xml
index df4fd3d9c27c3..82e138e664cc2 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/etc/constraint.xml
@@ -9,7 +9,7 @@
 -->
 <constraint>
     <assertCmsPageCurrentlyPublishedRevision module="Magento_VersionsCms">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cms class="Magento\Cms\Test\Fixture\CmsPage"/>
             <cmsNew class="Magento\VersionsCms\Test\Page\Adminhtml\CmsNew" />
@@ -17,7 +17,7 @@
         </require>
     </assertCmsPageCurrentlyPublishedRevision>
     <assertCmsPageVersionInGrid module="Magento_VersionsCms">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
         <require>
             <cms class="Magento\Cms\Test\Fixture\CmsPage"/>
             <cmsNew class="Magento\VersionsCms\Test\Page\Adminhtml\CmsNew" />
@@ -25,7 +25,7 @@
         </require>
     </assertCmsPageVersionInGrid>
     <assertCmsPageInitialVersionInGrid module="Magento_VersionsCms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cms class="Magento\Cms\Test\Fixture\CmsPage"/>
             <cmsInitial class="Magento\Cms\Test\Fixture\CmsPage"/>
@@ -34,25 +34,25 @@
         </require>
     </assertCmsPageInitialVersionInGrid>
     <assertCmsPageVersionSuccessSaveMessage module="Magento_VersionsCms">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsNew class="Magento\VersionsCms\Test\Page\Adminhtml\CmsNew" />
         </require>
     </assertCmsPageVersionSuccessSaveMessage>
     <assertCmsPageVersionSuccessDeleteMessage module="Magento_VersionsCms">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
         <require>
             <cmsNew class="Magento\VersionsCms\Test\Page\Adminhtml\CmsNew" />
         </require>
     </assertCmsPageVersionSuccessDeleteMessage>
     <assertCmsPageVersionSuccessMassDeleteMessage module="Magento_VersionsCms">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
         <require>
             <cmsNew class="Magento\VersionsCms\Test\Page\Adminhtml\CmsNew" />
         </require>
     </assertCmsPageVersionSuccessMassDeleteMessage>
     <assertCmsPageVersionNotInGrid module="Magento_VersionsCms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cms class="Magento\Cms\Test\Fixture\CmsPage"/>
             <cmsIndex class="Magento\Cms\Test\Page\Adminhtml\CmsIndex" />
@@ -60,19 +60,19 @@
         </require>
     </assertCmsPageVersionNotInGrid>
     <assertCmsPageVersionErrorDeleteMessage module="Magento_VersionsCms">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
         <require>
             <cmsNew class="Magento\VersionsCms\Test\Page\Adminhtml\CmsNew" />
         </require>
     </assertCmsPageVersionErrorDeleteMessage>
     <assertCmsPageRevisionSuccessMassDeleteMessage module="Magento_VersionsCms">
-        <severeness>medium</severeness>
+        <severity>medium</severity>
         <require>
             <cmsVersionEdit class="Magento\VersionsCms\Test\Page\Adminhtml\CmsVersionEdit" />
         </require>
     </assertCmsPageRevisionSuccessMassDeleteMessage>
     <assertCmsPageRevisionNotInGrid module="Magento_VersionsCms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cms class="Magento\Cms\Test\Fixture\CmsPage"/>
             <cmsIndex class="Magento\Cms\Test\Page\Adminhtml\CmsIndex" />
@@ -81,13 +81,13 @@
         </require>
     </assertCmsPageRevisionNotInGrid>
     <assertCmsPageRevisionErrorDeleteMessage module="Magento_VersionsCms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsVersionEdit class="Magento\VersionsCms\Test\Page\Adminhtml\CmsVersionEdit" />
         </require>
     </assertCmsPageRevisionErrorDeleteMessage>
     <assertCmsPageRevisionInGrid module="Magento_VersionsCms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cms class="Magento\Cms\Test\Fixture\CmsPage"/>
             <cmsIndex class="Magento\Cms\Test\Page\Adminhtml\CmsIndex" />
@@ -96,19 +96,19 @@
         </require>
     </assertCmsPageRevisionInGrid>
     <assertCmsPageRevisionSuccessSaveMessage module="Magento_VersionsCms">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsVersionEdit class="Magento\VersionsCms\Test\Page\Adminhtml\CmsVersionEdit" />
         </require>
     </assertCmsPageRevisionSuccessSaveMessage>
     <assertCmsPageRevisionSuccessPublishMessage module="Magento_VersionsCms">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cmsIndex class="Magento\Cms\Test\Page\Adminhtml\CmsIndex" />
         </require>
     </assertCmsPageRevisionSuccessPublishMessage>
     <assertCmsPageRevisionPreview module="Magento_VersionsCms">
-        <severeness>high</severeness>
+        <severity>high</severity>
         <require>
             <cms class="Magento\Cms\Test\Fixture\CmsPage"/>
             <revision class="Magento\VersionsCms\Test\Fixture\Revision"/>
@@ -120,24 +120,24 @@
         </require>
     </assertCmsPageRevisionPreview>
     <assertCmsPageNewVersionSuccessSaveMessage module="Magento_VersionsCms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsVersionEdit class="Magento\VersionsCms\Test\Page\Adminhtml\CmsVersionEdit" />
         </require>
     </assertCmsPageNewVersionSuccessSaveMessage>
     <assertCmsPageVersionErrorSaveMessage module="Magento_VersionsCms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsVersionEdit class="Magento\VersionsCms\Test\Page\Adminhtml\CmsVersionEdit" />
         </require>
     </assertCmsPageVersionErrorSaveMessage>
     <assertCmsPageRevisionAsVersionSuccessSaveMessage module="Magento_VersionsCms">
-        <severeness>low</severeness>
+        <severity>low</severity>
         <require>
             <cmsVersionEdit class="Magento\VersionsCms\Test\Page\Adminhtml\CmsVersionEdit" />
         </require>
     </assertCmsPageRevisionAsVersionSuccessSaveMessage>
     <assertWidgetHierarchyNodeLinkOnHomePage module="Magento_VersionsCms">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetHierarchyNodeLinkOnHomePage>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/etc/constraint.xml
index d2e734dd85528..b5adf25e6f363 100644
--- a/dev/tests/functional/tests/app/Magento/Weee/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Weee/Test/etc/constraint.xml
@@ -9,6 +9,6 @@
 -->
 <constraint>
     <assertFptApplied module="Magento_Weee">
-        <severeness>high</severeness>
+        <severity>high</severity>
     </assertFptApplied>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php
index 7c596000aff2d..d809bab6b33c6 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetAbsentOnFrontendHome.php
@@ -19,8 +19,8 @@
 class AssertWidgetAbsentOnFrontendHome extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created widget is absent on frontend on Home page
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php
index 5e8441a25170b..5f867ce515c01 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCatalogCategoryLink.php
@@ -21,8 +21,8 @@
 class AssertWidgetCatalogCategoryLink extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created widget displayed on frontend on Home page and on Advanced Search and
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
index c4f4d742c6635..f678a93b6d1a4 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetCmsPageLink.php
@@ -20,8 +20,8 @@
 class AssertWidgetCmsPageLink extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created widget displayed on frontent on Home page and on Advanced Search and
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
index 7b20340b32e3f..850585bac2278 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php
@@ -18,8 +18,8 @@
 class AssertWidgetInGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'high';
-     /* end tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Assert widget availability in widget grid
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php
index 18f5ba340254c..b4c1642f8f3c4 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnFrontendInCatalog.php
@@ -20,8 +20,8 @@
 class AssertWidgetOnFrontendInCatalog extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created widget displayed on frontent in Catalog
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php
index 796a20372f700..4dfaf35d40608 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetOnProductPage.php
@@ -20,8 +20,8 @@
 class AssertWidgetOnProductPage extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that created widget displayed on frontend on Product page
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php
index c776393e9f058..592a4805bacc4 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetProductLink.php
@@ -20,8 +20,8 @@
 class AssertWidgetProductLink extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that after click on widget link on frontend system redirects you to Product page defined in widget
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
index 3e12e3b95d00f..3fb053cf2ce98 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php
@@ -22,6 +22,10 @@
  */
 class AssertWidgetRecentlyViewedProducts extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Browser
      *
@@ -43,10 +47,6 @@ class AssertWidgetRecentlyViewedProducts extends AbstractConstraint
      */
     protected $catalogCategoryView;
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that widget with type Recently Viewed Products is present on category page
      *
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php
index 4c22c63f938a1..65b6066a69ad4 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessDeleteMessage.php
@@ -16,15 +16,15 @@
  */
 class AssertWidgetSuccessDeleteMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Message displayed after delete widget
      */
     const DELETE_MESSAGE = 'The widget instance has been deleted.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that Widget success delete message is present
      *
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php
index 37b848608d6af..e5f9c5664ad08 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetSuccessSaveMessage.php
@@ -16,15 +16,15 @@
  */
 class AssertWidgetSuccessSaveMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Text value to be checked
      */
     const SUCCESS_MESSAGE = 'The widget instance has been saved.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after widget saved
      *
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Widget/Test/etc/constraint.xml
index f77d8c08f4a30..15d708d7ffab2 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/etc/constraint.xml
@@ -9,36 +9,36 @@
 -->
 <constraint>
     <assertWidgetSuccessSaveMessage module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetSuccessSaveMessage>
     <assertWidgetInGrid module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetInGrid>
     <assertWidgetOnFrontendInCatalog module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetOnFrontendInCatalog>
     <assertWidgetOnProductPage module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetOnProductPage>
     <assertWidgetCmsPageLink module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetCmsPageLink>
     <assertWidgetCatalogCategoryLink module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetCatalogCategoryLink>
     <assertWidgetProductLink module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetProductLink>
     <assertWidgetRecentlyViewedProducts module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetRecentlyViewedProducts>
     <assertWidgetSuccessDeleteMessage module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetSuccessDeleteMessage>
     <assertWidgetRecentlyComparedProducts module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetRecentlyComparedProducts>
     <assertWidgetAbsentOnFrontendHome module="Magento_Widget">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWidgetAbsentOnFrontendHome>
 </constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
index b9eb4b4d37c44..dd04486db1dd7 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertAddProductToWishlistSuccessMessage.php
@@ -18,15 +18,15 @@
  */
 class AssertAddProductToWishlistSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success add message
      */
     const SUCCESS_MESSAGE = "%s has been added to your wishlist. Click here to continue shopping.";
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message appears on My Wish List page after adding product to wishlist.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
index 0a155c2c44daa..e33a6e37b024b 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertMoveProductToWishlistSuccessMessage.php
@@ -18,15 +18,15 @@
  */
 class AssertMoveProductToWishlistSuccessMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success add message
      */
     const SUCCESS_MESSAGE = "%s has been moved to wish list Wish List";
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message appears on My Wish List page after moving product to wishlist.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
index a8c2f0d00067e..fea934e0cdcbf 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
@@ -21,8 +21,8 @@
 class AssertProductDetailsInWishlist extends AbstractAssertForm
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that the correct option details are displayed on the "View Details" tool tip
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
index 83c22aff49e3a..734ee4f13ca71 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductInCustomerWishlistOnBackendGrid.php
@@ -20,8 +20,8 @@
 class AssertProductInCustomerWishlistOnBackendGrid extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product is present in grid on customer's wish list tab with configure option and qty
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
index c8746d224220e..5ace33feaf44c 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
@@ -22,8 +22,8 @@
 class AssertProductIsPresentInCustomerBackendWishlist extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that products added to wishlist are present on Customers account on backend.
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
index 8f34b21759079..dc4d2b1359b6d 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInWishlist.php
@@ -21,8 +21,8 @@
 class AssertProductIsPresentInWishlist extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product is present in default wishlist
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
index a24af5ce37493..7dfffdf84a7f0 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductsIsAbsentInWishlist.php
@@ -24,8 +24,8 @@
 class AssertProductsIsAbsentInWishlist extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that product is not present in Wishlist on Frontend
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
index 279644683610c..33c0785aeb09a 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistIsEmpty.php
@@ -19,8 +19,8 @@
 class AssertWishlistIsEmpty extends AbstractConstraint
 {
     /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert wish list is empty
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
index 611ae53a2a6d9..7b49b5a752d89 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertWishlistShareMessage.php
@@ -17,15 +17,15 @@
  */
 class AssertWishlistShareMessage extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Success wishlist share message
      */
     const SUCCESS_MESSAGE = 'Your wish list has been shared.';
 
-    /* tags */
-     const SEVERITY = 'low';
-     /* end tags */
-
     /**
      * Assert that success message is displayed after wishlist has been shared
      *
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml
index 6af63864a368e..eba3a03fcf729 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/etc/constraint.xml
@@ -9,30 +9,30 @@
 -->
 <constraint>
     <assertWishlistShareMessage module="Magento_Wishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWishlistShareMessage>
     <assertProductsIsAbsentInWishlist module="Magento_Wishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductsIsAbsentInWishlist>
     <assertWishlistIsEmpty module="Magento_Wishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertWishlistIsEmpty>
     <assertAddProductToWishlistSuccessMessage module="Magento_Wishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAddProductToWishlistSuccessMessage>
     <assertProductIsPresentInWishlist module="Magento_Wishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductIsPresentInWishlist>
     <assertProductIsPresentInCustomerBackendWishlist module="Magento_Wishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductIsPresentInCustomerBackendWishlist>
     <assertProductDetailsInWishlist module="Magento_Wishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductDetailsInWishlist>
     <assertProductInCustomerWishlistOnBackendGrid module="Magento_Wishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertProductInCustomerWishlistOnBackendGrid>
     <assertMoveProductToWishlistSuccessMessage module="Magento_Wishlist">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertMoveProductToWishlistSuccessMessage>
 </constraint>

From 5bc5bd1c3d9846eaaaf11b3c3243042be89133d0 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Tue, 9 Dec 2014 10:36:12 -0600
Subject: [PATCH 171/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- fixed Sample Data integration tests
---
 .../Tools/SampleData/InstallerTest.php        |  5 +-
 .../Module/Catalog/Setup/ProductTest.php      | 15 ++--
 .../SampleData/Module/Cms/Setup/PageTest.php  |  5 +-
 .../Module/Customer/Setup/CustomerTest.php    |  5 +-
 .../OfflineShipping/Setup/TablerateTest.php   |  7 +-
 .../SampleData/Module/Tax/Setup/TaxTest.php   |  5 +-
 .../SampleData/Module/Theme/SetupTest.php     |  5 +-
 .../Magento/Tools/SampleData/TestLoogger.php  | 76 +++++++++++++++++++
 8 files changed, 109 insertions(+), 14 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLoogger.php

diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/InstallerTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/InstallerTest.php
index 0c09a6fe5c52c..b19d17e4f088a 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/InstallerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/InstallerTest.php
@@ -30,7 +30,10 @@ public function testLaunch()
         /** @var \Magento\Tools\SampleData\Installer $installer */
         $installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Tools\SampleData\Installer',
-            ['data' => ['admin_username' => 'adminUser']]
+            [
+                'data' => ['admin_username' => 'adminUser'],
+                'logger' => TestLoogger::factory(),
+            ]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Catalog/Setup/ProductTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Catalog/Setup/ProductTest.php
index 61eebd9247209..b95ede74bc2cc 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Catalog/Setup/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Catalog/Setup/ProductTest.php
@@ -8,6 +8,8 @@
 
 namespace Magento\Tools\SampleData\Module\Catalog\Setup;
 
+use Magento\Tools\SampleData\TestLoogger;
+
 /**
  * Class ProductTest
  */
@@ -37,22 +39,24 @@ public function installAttributes()
         $attributes = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Tools\SampleData\Module\Catalog\Setup\Attribute',
             [
-                'fixtureHelper' => $fixtureHelper
+                'fixtureHelper' => $fixtureHelper,
+                'logger' => TestLoogger::factory(),
             ]
         );
 
         ob_start();
         $attributes->run();
         $result = ob_get_clean();
-        $this->assertContains('Installing catalog attributes' . PHP_EOL, $result);
-        $this->assertContains('.................' . PHP_EOL, $result);
+        $this->assertContains('Installing catalog attributes', $result);
+        $this->assertContains('.................', $result);
     }
 
     public function installCategories()
     {
         /** @var \Magento\Tools\SampleData\Module\Catalog\Setup\Category $categories */
         $categories = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Tools\SampleData\Module\Catalog\Setup\Category'
+            'Magento\Tools\SampleData\Module\Catalog\Setup\Category',
+            ['logger' => TestLoogger::factory()]
         );
 
         ob_start();
@@ -75,7 +79,8 @@ public function installProducts()
             'Magento\Tools\SampleData\Module\Catalog\Setup\Product',
             [
                 'fixtureHelper' => $fixtureHelper,
-                'fixtures' => $fixtures
+                'fixtures' => $fixtures,
+                'logger' => TestLoogger::factory(),
             ]
         );
 
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Cms/Setup/PageTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Cms/Setup/PageTest.php
index d911472dbcdfb..516e5a21c88cb 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Cms/Setup/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Cms/Setup/PageTest.php
@@ -8,6 +8,8 @@
 
 namespace Magento\Tools\SampleData\Module\Cms\Setup;
 
+use Magento\Tools\SampleData\TestLoogger;
+
 /**
  * Class PageTest
  */
@@ -20,7 +22,8 @@ public function testRun()
     {
         /** @var \Magento\Tools\SampleData\Module\Cms\Setup\Page $model */
         $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Tools\SampleData\Module\Cms\Setup\Page'
+            'Magento\Tools\SampleData\Module\Cms\Setup\Page',
+            ['logger' => TestLoogger::factory()]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Customer/Setup/CustomerTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Customer/Setup/CustomerTest.php
index 967815e481321..c1ce95561fc92 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Customer/Setup/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Customer/Setup/CustomerTest.php
@@ -8,6 +8,8 @@
 
 namespace Magento\Tools\SampleData\Module\Customer\Setup;
 
+use Magento\Tools\SampleData\TestLoogger;
+
 /**
  * Class CustomerTest
  */
@@ -20,7 +22,8 @@ public function testRun()
     {
         /** @var \Magento\Tools\SampleData\Module\Customer\Setup\Customer $customer */
         $customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Tools\SampleData\Module\Customer\Setup\Customer'
+            'Magento\Tools\SampleData\Module\Customer\Setup\Customer',
+            ['logger' => TestLoogger::factory()]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/OfflineShipping/Setup/TablerateTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/OfflineShipping/Setup/TablerateTest.php
index 293bc07d01538..c312c092ddf94 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/OfflineShipping/Setup/TablerateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/OfflineShipping/Setup/TablerateTest.php
@@ -7,9 +7,7 @@
  */
 namespace Magento\Tools\SampleData\Module\OfflineShipping\Setup;
 
-use Magento\Tools\SampleData\Helper\Csv\ReaderFactory as CsvReaderFactory;
-use Magento\Tools\SampleData\SetupInterface;
-use Magento\Tools\SampleData\Helper\Fixture as FixtureHelper;
+use Magento\Tools\SampleData\TestLoogger;
 
 /**
  * Class TablerateTest
@@ -23,7 +21,8 @@ public function testRun()
     {
         /** @var \Magento\Tools\SampleData\Module\OfflineShipping\Setup\Tablerate $rate */
         $rate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Tools\SampleData\Module\OfflineShipping\Setup\Tablerate'
+            'Magento\Tools\SampleData\Module\OfflineShipping\Setup\Tablerate',
+            ['logger' => TestLoogger::factory()]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Tax/Setup/TaxTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Tax/Setup/TaxTest.php
index 4b882c8198e72..e9b7ee44169ba 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Tax/Setup/TaxTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Tax/Setup/TaxTest.php
@@ -8,6 +8,8 @@
 
 namespace Magento\Tools\SampleData\Module\Tax\Setup;
 
+use Magento\Tools\SampleData\TestLoogger;
+
 /**
  * Class TaxTest
  */
@@ -20,7 +22,8 @@ public function testRun()
     {
         /** @var \Magento\Tools\SampleData\Module\Tax\Setup\Tax $tax */
         $tax = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Tools\SampleData\Module\Tax\Setup\Tax'
+            'Magento\Tools\SampleData\Module\Tax\Setup\Tax',
+            ['logger' => TestLoogger::factory()]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Theme/SetupTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Theme/SetupTest.php
index 9b028d9e51f2b..68c9b4c294dd0 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Theme/SetupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Theme/SetupTest.php
@@ -8,6 +8,8 @@
 
 namespace Magento\Tools\SampleData\Module\Theme;
 
+use Magento\Tools\SampleData\TestLoogger;
+
 /**
  * Class ThemeTest
  */
@@ -20,7 +22,8 @@ public function testRun()
     {
         /** @var \Magento\Tools\SampleData\Module\Theme\Setup $model */
         $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Tools\SampleData\Module\Theme\Setup'
+            'Magento\Tools\SampleData\Module\Theme\Setup',
+            ['logger' => TestLoogger::factory()]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLoogger.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLoogger.php
new file mode 100644
index 0000000000000..ae69129e9057a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLoogger.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+
+namespace Magento\Tools\SampleData;
+
+use Magento\Setup\Model\LoggerInterface;
+
+class TestLoogger implements LoggerInterface
+{
+    /**
+     * Creates a test logger
+     *
+     * @return Logger
+     */
+    public static function factory()
+    {
+        $logger = new Logger;
+        $logger->setSubject(new TestLoogger);
+        return $logger;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function log($message)
+    {
+        $this->writeLn($message);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logError(\Exception $e)
+    {
+        $this->writeLn($e);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logInline($message)
+    {
+        echo $message;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logMeta($message)
+    {
+        $this->writeLn($message);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function logSuccess($message)
+    {
+        $this->writeLn($message);
+    }
+
+    /**
+     * Write line
+     *
+     * @param string $message
+     */
+    private function writeLn($message)
+    {
+        echo $message . PHP_EOL;
+    }
+}

From a28b4ac9d0906f888b1a4712859a0195f3942c5d Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Tue, 9 Dec 2014 12:50:23 -0600
Subject: [PATCH 172/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- (CR) removed hard-coded "Luma" literal from installer model
---
 setup/module/Magento/Setup/src/Model/Installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 31caed10c0856..d8f100e245560 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -280,7 +280,7 @@ public function install($request)
         $script[] = ['Installing admin user...', 'installAdminUser', [$request]];
         $script[] = ['Enabling caches:', 'enableCaches', []];
         if (!empty($request[Installer::USE_SAMPLE_DATA]) && $this->sampleData->isDeployed()) {
-            $script[] = ['Installing Luma sample data:', 'installSampleData', [$request]];
+            $script[] = ['Installing sample data:', 'installSampleData', [$request]];
         }
         $script[] = ['Disabling Maintenance Mode:', 'setMaintenanceMode', [0]];
         $script[] = ['Post installation file permissions check...', 'checkApplicationFilePermissions', []];

From 6b3fe854506ece8557485d2c97818030c0da6d31 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Tue, 9 Dec 2014 12:44:26 -0600
Subject: [PATCH 173/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- changed according to CR feedback
---
 setup/module/Magento/Setup/src/Controller/Install.php |  3 +++
 setup/module/Magento/Setup/src/Model/Installer.php    | 10 +++-------
 setup/pub/magento/setup/web-configuration.js          |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/Install.php b/setup/module/Magento/Setup/src/Controller/Install.php
index b029f4c38530a..00d482cf1bf5c 100644
--- a/setup/module/Magento/Setup/src/Controller/Install.php
+++ b/setup/module/Magento/Setup/src/Controller/Install.php
@@ -155,6 +155,9 @@ private function importUserConfigForm()
             ? $source['config']['https']['front'] : '';
         $result[UserConfig::KEY_IS_SECURE_ADMIN] = isset($source['config']['https']['admin'])
             ? $source['config']['https']['admin'] : '';
+        $result[UserConfig::KEY_BASE_URL_SECURE] = (isset($source['config']['https']['front'])
+            || isset($source['config']['https']['admin']))
+            ? $source['config']['https']['text'] : '';
         $result[UserConfig::KEY_LANGUAGE] = isset($source['store']['language'])
             ? $source['store']['language'] : '';
         $result[UserConfig::KEY_TIMEZONE] = isset($source['store']['timezone'])
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index d8f100e245560..5974aaf87e2ce 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -356,10 +356,8 @@ private function createEncryptConfig($data)
     {
         $key = $data[DeploymentConfigMapper::KEY_ENCRYPTION_KEY];
         // retrieve old encryption keys
-        $reader = new Reader($this->directoryList);
-        $deploymentConfig = new Config($reader);
-        if ($deploymentConfig->isAvailable()) {
-            $encryptInfo = $deploymentConfig->getSegment(EncryptConfig::CONFIG_KEY);
+        if ($this->deploymentConfig->isAvailable()) {
+            $encryptInfo = $this->deploymentConfig->getSegment(EncryptConfig::CONFIG_KEY);
             $oldKeys = $encryptInfo[EncryptConfig::KEY_ENCRYPTION_KEY];
             $key = empty($key) ? $oldKeys : $oldKeys . "\n" . $key;
         } else if (empty($key)) {
@@ -746,9 +744,7 @@ private function cleanupDb()
     {
         // stops cleanup if app/etc/config.php does not exist
         if ($this->filesystem->getDirectoryWrite(DirectoryList::CONFIG)->isFile('config.php')) {
-            $reader = new \Magento\Framework\App\DeploymentConfig\Reader($this->directoryList);
-            $deploymentConfig = new \Magento\Framework\App\DeploymentConfig($reader, []);
-            $dbConfig = new DbConfig($deploymentConfig->getSegment(DbConfig::CONFIG_KEY));
+            $dbConfig = new DbConfig($this->deploymentConfig->getSegment(DbConfig::CONFIG_KEY));
             $config = $dbConfig->getConnection(\Magento\Framework\App\Resource\Config::DEFAULT_SETUP_CONNECTION);
             if ($config) {
                 try {
diff --git a/setup/pub/magento/setup/web-configuration.js b/setup/pub/magento/setup/web-configuration.js
index 4eb7f4ae6da18..671e1c64fdc9a 100644
--- a/setup/pub/magento/setup/web-configuration.js
+++ b/setup/pub/magento/setup/web-configuration.js
@@ -18,7 +18,7 @@ angular.module('web-configuration', ['ngStorage'])
             https: {
                 front: false,
                 admin: false,
-                text: 'https://www.example.com/'
+                text: ''
             },
             rewrites: {
                 allowed: true

From 35ff3e8920adbedd38f6b22aaacc7f6082600a34 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Tue, 9 Dec 2014 13:11:32 -0600
Subject: [PATCH 174/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- (CR) typo
---
 .../testsuite/Magento/Tools/SampleData/InstallerTest.php  | 2 +-
 .../Tools/SampleData/Module/Catalog/Setup/ProductTest.php | 8 ++++----
 .../Tools/SampleData/Module/Cms/Setup/PageTest.php        | 4 ++--
 .../SampleData/Module/Customer/Setup/CustomerTest.php     | 4 ++--
 .../Module/OfflineShipping/Setup/TablerateTest.php        | 4 ++--
 .../Magento/Tools/SampleData/Module/Tax/Setup/TaxTest.php | 4 ++--
 .../Magento/Tools/SampleData/Module/Theme/SetupTest.php   | 4 ++--
 .../Tools/SampleData/{TestLoogger.php => TestLogger.php}  | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)
 rename dev/tests/integration/testsuite/Magento/Tools/SampleData/{TestLoogger.php => TestLogger.php} (92%)

diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/InstallerTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/InstallerTest.php
index b19d17e4f088a..20f0c38a47282 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/InstallerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/InstallerTest.php
@@ -32,7 +32,7 @@ public function testLaunch()
             'Magento\Tools\SampleData\Installer',
             [
                 'data' => ['admin_username' => 'adminUser'],
-                'logger' => TestLoogger::factory(),
+                'logger' => TestLogger::factory(),
             ]
         );
 
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Catalog/Setup/ProductTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Catalog/Setup/ProductTest.php
index b95ede74bc2cc..8926703f48881 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Catalog/Setup/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Catalog/Setup/ProductTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Tools\SampleData\Module\Catalog\Setup;
 
-use Magento\Tools\SampleData\TestLoogger;
+use Magento\Tools\SampleData\TestLogger;
 
 /**
  * Class ProductTest
@@ -40,7 +40,7 @@ public function installAttributes()
             'Magento\Tools\SampleData\Module\Catalog\Setup\Attribute',
             [
                 'fixtureHelper' => $fixtureHelper,
-                'logger' => TestLoogger::factory(),
+                'logger' => TestLogger::factory(),
             ]
         );
 
@@ -56,7 +56,7 @@ public function installCategories()
         /** @var \Magento\Tools\SampleData\Module\Catalog\Setup\Category $categories */
         $categories = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Tools\SampleData\Module\Catalog\Setup\Category',
-            ['logger' => TestLoogger::factory()]
+            ['logger' => TestLogger::factory()]
         );
 
         ob_start();
@@ -80,7 +80,7 @@ public function installProducts()
             [
                 'fixtureHelper' => $fixtureHelper,
                 'fixtures' => $fixtures,
-                'logger' => TestLoogger::factory(),
+                'logger' => TestLogger::factory(),
             ]
         );
 
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Cms/Setup/PageTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Cms/Setup/PageTest.php
index 516e5a21c88cb..85fa2d97092eb 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Cms/Setup/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Cms/Setup/PageTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Tools\SampleData\Module\Cms\Setup;
 
-use Magento\Tools\SampleData\TestLoogger;
+use Magento\Tools\SampleData\TestLogger;
 
 /**
  * Class PageTest
@@ -23,7 +23,7 @@ public function testRun()
         /** @var \Magento\Tools\SampleData\Module\Cms\Setup\Page $model */
         $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Tools\SampleData\Module\Cms\Setup\Page',
-            ['logger' => TestLoogger::factory()]
+            ['logger' => TestLogger::factory()]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Customer/Setup/CustomerTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Customer/Setup/CustomerTest.php
index c1ce95561fc92..bcb8256087525 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Customer/Setup/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Customer/Setup/CustomerTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Tools\SampleData\Module\Customer\Setup;
 
-use Magento\Tools\SampleData\TestLoogger;
+use Magento\Tools\SampleData\TestLogger;
 
 /**
  * Class CustomerTest
@@ -23,7 +23,7 @@ public function testRun()
         /** @var \Magento\Tools\SampleData\Module\Customer\Setup\Customer $customer */
         $customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Tools\SampleData\Module\Customer\Setup\Customer',
-            ['logger' => TestLoogger::factory()]
+            ['logger' => TestLogger::factory()]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/OfflineShipping/Setup/TablerateTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/OfflineShipping/Setup/TablerateTest.php
index c312c092ddf94..4392a1d00a3d1 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/OfflineShipping/Setup/TablerateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/OfflineShipping/Setup/TablerateTest.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\Tools\SampleData\Module\OfflineShipping\Setup;
 
-use Magento\Tools\SampleData\TestLoogger;
+use Magento\Tools\SampleData\TestLogger;
 
 /**
  * Class TablerateTest
@@ -22,7 +22,7 @@ public function testRun()
         /** @var \Magento\Tools\SampleData\Module\OfflineShipping\Setup\Tablerate $rate */
         $rate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Tools\SampleData\Module\OfflineShipping\Setup\Tablerate',
-            ['logger' => TestLoogger::factory()]
+            ['logger' => TestLogger::factory()]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Tax/Setup/TaxTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Tax/Setup/TaxTest.php
index e9b7ee44169ba..f9d91fe57921b 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Tax/Setup/TaxTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Tax/Setup/TaxTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Tools\SampleData\Module\Tax\Setup;
 
-use Magento\Tools\SampleData\TestLoogger;
+use Magento\Tools\SampleData\TestLogger;
 
 /**
  * Class TaxTest
@@ -23,7 +23,7 @@ public function testRun()
         /** @var \Magento\Tools\SampleData\Module\Tax\Setup\Tax $tax */
         $tax = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Tools\SampleData\Module\Tax\Setup\Tax',
-            ['logger' => TestLoogger::factory()]
+            ['logger' => TestLogger::factory()]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Theme/SetupTest.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Theme/SetupTest.php
index 68c9b4c294dd0..fcba826c60ba4 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Theme/SetupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/Module/Theme/SetupTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Tools\SampleData\Module\Theme;
 
-use Magento\Tools\SampleData\TestLoogger;
+use Magento\Tools\SampleData\TestLogger;
 
 /**
  * Class ThemeTest
@@ -23,7 +23,7 @@ public function testRun()
         /** @var \Magento\Tools\SampleData\Module\Theme\Setup $model */
         $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\Tools\SampleData\Module\Theme\Setup',
-            ['logger' => TestLoogger::factory()]
+            ['logger' => TestLogger::factory()]
         );
 
         ob_start();
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLoogger.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLogger.php
similarity index 92%
rename from dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLoogger.php
rename to dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLogger.php
index ae69129e9057a..2d5ff83af944e 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLoogger.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLogger.php
@@ -10,7 +10,7 @@
 
 use Magento\Setup\Model\LoggerInterface;
 
-class TestLoogger implements LoggerInterface
+class TestLogger implements LoggerInterface
 {
     /**
      * Creates a test logger
@@ -20,7 +20,7 @@ class TestLoogger implements LoggerInterface
     public static function factory()
     {
         $logger = new Logger;
-        $logger->setSubject(new TestLoogger);
+        $logger->setSubject(new TestLogger);
         return $logger;
     }
 

From c481a0a045f9d805d572ab4d6ff7efb671d7c27d Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Tue, 9 Dec 2014 13:18:08 -0600
Subject: [PATCH 175/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- changed according to CR feedback
---
 setup/module/Magento/Setup/src/Model/Installer.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 5974aaf87e2ce..9c5ace1ff2a73 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -24,7 +24,6 @@
 use Magento\Framework\Filesystem\FilesystemException;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
-use Magento\Framework\App\DeploymentConfig as Config;
 use Magento\Framework\App\DeploymentConfig\BackendConfig;
 use Magento\Framework\App\DeploymentConfig\DbConfig;
 use Magento\Framework\App\DeploymentConfig\EncryptConfig;

From 05424d66cb74a710e426e5d3be3a7b8a93e81088 Mon Sep 17 00:00:00 2001
From: Serhiy Shkolyarenko <sshkolyarenko@ebay.com>
Date: Tue, 9 Dec 2014 21:31:50 +0200
Subject: [PATCH 176/474] MAGETWO-31242: Impossible to rename subcategory on
 storeview level

updated fix
added unit test
---
 .../Adminhtml/Category/AbstractCategory.php   |   2 +-
 .../catalog/category/edit/form.phtml          |   1 -
 .../Category/AbstractCategoryTest.php         | 121 ++++++++++++++++++
 3 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
index ca2204ded0564..8671624beec39 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AbstractCategory.php
@@ -255,7 +255,7 @@ public function getNode($parentNodeCategory, $recursionLevel = 2)
      */
     public function getSaveUrl(array $args = [])
     {
-        $params = ['_current' => false, '_query' => false];
+        $params = ['_current' => false, '_query' => false, 'store' => $this->getStore()->getId()];
         $params = array_merge($params, $args);
         return $this->getUrl('catalog/*/save', $params);
     }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
index 2a02e8601d38c..0bf754b822ead 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
@@ -37,7 +37,6 @@ $categoryId = $this->getCategoryId();
         <input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>"/>
         <input type="hidden" name="category_products" id="in_category_products" value=""/>
         <input type="hidden" name="active_tab_id" id="active_tab_id" value=""/>
-        <input type="hidden" name="store" id="form_store_id" value="<?php echo $this->getStore()->getId()?>"/>
         <?php if ($parentId !== 0): ?>
             <input type="hidden" name="parent" value="<?php echo $parentId; ?>"/>
         <?php endif; ?>
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
new file mode 100644
index 0000000000000..3c41b1cc44f29
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Catalog\Block\Adminhtml\Category;
+
+class AbstractCategoryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\TestFramework\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $contextMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeMock;
+
+    /**
+     * @var \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
+     */
+    protected $category;
+
+    protected function setUp()
+    {
+        $this->objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $this->contextMock = $this->getMock(
+            'Magento\Backend\Block\Template\Context',
+            [],
+            [],
+            '',
+            false
+        );
+
+        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->any())
+            ->method('getRequest')
+            ->will($this->returnValue($this->requestMock));
+
+        $this->urlBuilderMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\StoreManagerInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->any())
+            ->method('getStoreManager')
+            ->will($this->returnValue($this->storeManagerMock));
+
+        $this->storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->contextMock->expects($this->any())
+            ->method('getUrlBuilder')
+            ->will($this->returnValue($this->urlBuilderMock));
+
+        $this->category = $this->objectManager->getObject(
+            'Magento\Catalog\Block\Adminhtml\Category\AbstractCategory',
+            [
+                'context' => $this->contextMock,
+            ]
+        );
+    }
+
+    /**
+     * @covers \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory::getStore
+     * @covers \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory::getSaveUrl
+     */
+    public function testGetSaveUrl()
+    {
+        $storeId = 23;
+        $saveUrl = 'save URL';
+        $params = ['_current' => false, '_query' => false, 'store' => $storeId];
+
+
+        $this->requestMock->expects($this->once())->method('getParam')->with('store')->willReturn($storeId);
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->with($storeId)
+            ->willReturn($this->storeMock);
+        $this->storeMock->expects($this->once())->method('getId')->willReturn($storeId);
+
+        $this->urlBuilderMock->expects($this->once())
+            ->method('getUrl')
+            ->with('catalog/*/save', $params)
+            ->willReturn($saveUrl);
+
+        $this->assertEquals($saveUrl, $this->category->getSaveUrl());
+    }
+
+}

From d8ab9e759236828986b73235e482da66d9ad2be5 Mon Sep 17 00:00:00 2001
From: Yuxing Zheng <yuxzheng@ebay.com>
Date: Tue, 9 Dec 2014 14:58:52 -0600
Subject: [PATCH 177/474] MAGETWO-31590: Merge Integration sql scripts and
 rename file with suffix 2.0.0 - I

 - Updated data install scripts for Banner module and Cms module
---
 ...ll-1.11.0.1.php => data-install-2.0.0.php} |  0
 .../data/cms_setup/data-install-1.6.0.0.php   | 50 ----------
 ...0.0-1.6.0.1.php => data-install-2.0.0.php} | 91 +++++++++++++++++++
 .../data-upgrade-1.6.0.2-1.6.0.3.php          | 44 ---------
 .../data-upgrade-1.6.0.3-2.0.0.0.php          | 23 -----
 5 files changed, 91 insertions(+), 117 deletions(-)
 rename app/code/Magento/Banner/data/banner_setup/{data-install-1.11.0.1.php => data-install-2.0.0.php} (100%)
 delete mode 100644 app/code/Magento/Cms/data/cms_setup/data-install-1.6.0.0.php
 rename app/code/Magento/Cms/data/cms_setup/{data-upgrade-1.6.0.0-1.6.0.1.php => data-install-2.0.0.php} (51%)
 delete mode 100644 app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.2-1.6.0.3.php
 delete mode 100644 app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.3-2.0.0.0.php

diff --git a/app/code/Magento/Banner/data/banner_setup/data-install-1.11.0.1.php b/app/code/Magento/Banner/data/banner_setup/data-install-2.0.0.php
similarity index 100%
rename from app/code/Magento/Banner/data/banner_setup/data-install-1.11.0.1.php
rename to app/code/Magento/Banner/data/banner_setup/data-install-2.0.0.php
diff --git a/app/code/Magento/Cms/data/cms_setup/data-install-1.6.0.0.php b/app/code/Magento/Cms/data/cms_setup/data-install-1.6.0.0.php
deleted file mode 100644
index 40edfdd71af63..0000000000000
--- a/app/code/Magento/Cms/data/cms_setup/data-install-1.6.0.0.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/** @var $this \Magento\Cms\Model\Resource\Setup */
-
-$cmsPages = array(
-    array(
-        'title' => '404 Not Found',
-        'page_layout' => '2columns-right',
-        'meta_keywords' => 'Page keywords',
-        'meta_description' => 'Page description',
-        'identifier' => 'no-route',
-        'content_heading' => 'Whoops, our bad...',
-        'content' => "<dl>\r\n<dt>The page you requested was not found, and we have a fine guess why.</dt>\r\n<dd>\r\n<ul class=\"disc\">\r\n<li>If you typed the URL directly, please make sure the spelling is correct.</li>\r\n<li>If you clicked on a link to get here, the link is outdated.</li>\r\n</ul></dd>\r\n</dl>\r\n<dl>\r\n<dt>What can you do?</dt>\r\n<dd>Have no fear, help is near! There are many ways you can get back on track with Magento Store.</dd>\r\n<dd>\r\n<ul class=\"disc\">\r\n<li><a href=\"#\" onclick=\"history.go(-1); return false;\">Go back</a> to the previous page.</li>\r\n<li>Use the search bar at the top of the page to search for your products.</li>\r\n<li>Follow these links to get you back on track!<br /><a href=\"{{store url=\"\"}}\">Store Home</a> <span class=\"separator\">|</span> <a href=\"{{store url=\"customer/account\"}}\">My Account</a></li></ul></dd></dl>\r\n",
-        'is_active' => 1,
-        'stores' => array(0),
-        'sort_order' => 0
-    ),
-    array(
-        'title' => 'Home page',
-        'page_layout' => '1column',
-        'identifier' => 'home',
-        'content_heading' => 'Home Page',
-        'content' => "<p>CMS homepage content goes here.</p>\r\n",
-        'is_active' => 1,
-        'stores' => array(0),
-        'sort_order' => 0
-    ),
-    array(
-        'title' => 'Enable Cookies',
-        'page_layout' => '1column',
-        'identifier' => 'enable-cookies',
-        'content_heading' => 'What are Cookies?',
-        'content' => "<div class=\"message notice\">\r\n            <div>Please enable cookies in your web browser to continue.</div>\r\n            </div>\r\n            <p>Cookies are short pieces of data that are sent to your computer when you visit a website. On later visits, this data is then returned to that website. Cookies allow us to recognize you automatically whenever you visit our site so that we can personalize your experience and provide you with better service. We also use cookies (and similar browser data, such as Flash cookies) for fraud prevention and other purposes. If your web browser is set to refuse cookies from our website, you will not be able to complete a purchase or take advantage of certain features of our website, such as storing items in your Shopping Cart or receiving personalized recommendations. As a result, we strongly encourage you to configure your web browser to accept cookies from our website.</p>\r\n    <h2 class=\"subtitle\">Enabling Cookies</h2>\r\n    <ul class=\"disc\">\r\n        <li><a href=\"#ie7\">Internet Explorer 7.x</a></li>\r\n        <li><a href=\"#ie6\">Internet Explorer 6.x</a></li>\r\n        <li><a href=\"#firefox\">Mozilla/Firefox</a></li>\r\n        <li><a href=\"#opera\">Opera 7.x</a></li>\r\n    </ul>\r\n    <h3><a name=\"ie7\"></a>Internet Explorer 7.x</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Start Internet Explorer</p>\r\n        </li>\r\n        <li>\r\n            <p>Under the <strong>Tools</strong> menu, click <strong>Internet Options</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-1.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click the <strong>Privacy</strong> tab</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-2.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click the <strong>Advanced</strong> button</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-3.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Put a check mark in the box for <strong>Override Automatic Cookie Handling</strong>, put another check mark in the <strong>Always accept session cookies </strong>box</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-4.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click <strong>OK</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-5.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click <strong>OK</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-6.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Restart Internet Explore</p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n    <h3><a name=\"ie6\"></a>Internet Explorer 6.x</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Select <strong>Internet Options</strong> from the Tools menu</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie6-1.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Privacy</strong> tab</p>\r\n        </li>\r\n        <li>\r\n            <p>Click the <strong>Default</strong> button (or manually slide the bar down to <strong>Medium</strong>) under <strong>Settings</strong>. Click <strong>OK</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie6-2.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n    <h3><a name=\"firefox\"></a>Mozilla/Firefox</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Click on the <strong>Tools</strong>-menu in Mozilla</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Options...</strong> item in the menu - a new window open</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Privacy</strong> selection in the left part of the window. (See image below)</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/firefox.png\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Expand the <strong>Cookies</strong> section</p>\r\n        </li>\r\n        <li>\r\n            <p>Check the <strong>Enable cookies</strong> and <strong>Accept cookies normally</strong> checkboxes</p>\r\n        </li>\r\n        <li>\r\n            <p>Save changes by clicking <strong>Ok</strong>.</p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n    <h3><a name=\"opera\"></a>Opera 7.x</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Click on the <strong>Tools</strong> menu in Opera</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Preferences...</strong> item in the menu - a new window open</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Privacy</strong> selection near the bottom left of the window. (See image below)</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/opera.png\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>The <strong>Enable cookies</strong> checkbox must be checked, and <strong>Accept all cookies</strong> should be selected in the &quot;<strong>Normal cookies</strong>&quot; drop-down</p>\r\n        </li>\r\n        <li>\r\n            <p>Save changes by clicking <strong>Ok</strong></p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n",
-        'is_active' => 1,
-        'stores' => array(0)
-    )
-);
-
-/**
- * Insert default and system pages
- */
-foreach ($cmsPages as $data) {
-    $this->createPage()->setData($data)->save();
-}
diff --git a/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.0-1.6.0.1.php b/app/code/Magento/Cms/data/cms_setup/data-install-2.0.0.php
similarity index 51%
rename from app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.0-1.6.0.1.php
rename to app/code/Magento/Cms/data/cms_setup/data-install-2.0.0.php
index 20ea2a34a7cea..25d934604c3f2 100644
--- a/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.0-1.6.0.1.php
+++ b/app/code/Magento/Cms/data/cms_setup/data-install-2.0.0.php
@@ -8,6 +8,47 @@
 
 /** @var $this \Magento\Cms\Model\Resource\Setup */
 
+$cmsPages = array(
+    array(
+        'title' => '404 Not Found',
+        'page_layout' => '2columns-right',
+        'meta_keywords' => 'Page keywords',
+        'meta_description' => 'Page description',
+        'identifier' => 'no-route',
+        'content_heading' => 'Whoops, our bad...',
+        'content' => "<dl>\r\n<dt>The page you requested was not found, and we have a fine guess why.</dt>\r\n<dd>\r\n<ul class=\"disc\">\r\n<li>If you typed the URL directly, please make sure the spelling is correct.</li>\r\n<li>If you clicked on a link to get here, the link is outdated.</li>\r\n</ul></dd>\r\n</dl>\r\n<dl>\r\n<dt>What can you do?</dt>\r\n<dd>Have no fear, help is near! There are many ways you can get back on track with Magento Store.</dd>\r\n<dd>\r\n<ul class=\"disc\">\r\n<li><a href=\"#\" onclick=\"history.go(-1); return false;\">Go back</a> to the previous page.</li>\r\n<li>Use the search bar at the top of the page to search for your products.</li>\r\n<li>Follow these links to get you back on track!<br /><a href=\"{{store url=\"\"}}\">Store Home</a> <span class=\"separator\">|</span> <a href=\"{{store url=\"customer/account\"}}\">My Account</a></li></ul></dd></dl>\r\n",
+        'is_active' => 1,
+        'stores' => array(0),
+        'sort_order' => 0
+    ),
+    array(
+        'title' => 'Home page',
+        'page_layout' => '1column',
+        'identifier' => 'home',
+        'content_heading' => 'Home Page',
+        'content' => "<p>CMS homepage content goes here.</p>\r\n",
+        'is_active' => 1,
+        'stores' => array(0),
+        'sort_order' => 0
+    ),
+    array(
+        'title' => 'Enable Cookies',
+        'page_layout' => '1column',
+        'identifier' => 'enable-cookies',
+        'content_heading' => 'What are Cookies?',
+        'content' => "<div class=\"message notice\">\r\n            <div>Please enable cookies in your web browser to continue.</div>\r\n            </div>\r\n            <p>Cookies are short pieces of data that are sent to your computer when you visit a website. On later visits, this data is then returned to that website. Cookies allow us to recognize you automatically whenever you visit our site so that we can personalize your experience and provide you with better service. We also use cookies (and similar browser data, such as Flash cookies) for fraud prevention and other purposes. If your web browser is set to refuse cookies from our website, you will not be able to complete a purchase or take advantage of certain features of our website, such as storing items in your Shopping Cart or receiving personalized recommendations. As a result, we strongly encourage you to configure your web browser to accept cookies from our website.</p>\r\n    <h2 class=\"subtitle\">Enabling Cookies</h2>\r\n    <ul class=\"disc\">\r\n        <li><a href=\"#ie7\">Internet Explorer 7.x</a></li>\r\n        <li><a href=\"#ie6\">Internet Explorer 6.x</a></li>\r\n        <li><a href=\"#firefox\">Mozilla/Firefox</a></li>\r\n        <li><a href=\"#opera\">Opera 7.x</a></li>\r\n    </ul>\r\n    <h3><a name=\"ie7\"></a>Internet Explorer 7.x</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Start Internet Explorer</p>\r\n        </li>\r\n        <li>\r\n            <p>Under the <strong>Tools</strong> menu, click <strong>Internet Options</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-1.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click the <strong>Privacy</strong> tab</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-2.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click the <strong>Advanced</strong> button</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-3.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Put a check mark in the box for <strong>Override Automatic Cookie Handling</strong>, put another check mark in the <strong>Always accept session cookies </strong>box</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-4.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click <strong>OK</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-5.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click <strong>OK</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-6.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Restart Internet Explore</p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n    <h3><a name=\"ie6\"></a>Internet Explorer 6.x</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Select <strong>Internet Options</strong> from the Tools menu</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie6-1.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Privacy</strong> tab</p>\r\n        </li>\r\n        <li>\r\n            <p>Click the <strong>Default</strong> button (or manually slide the bar down to <strong>Medium</strong>) under <strong>Settings</strong>. Click <strong>OK</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie6-2.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n    <h3><a name=\"firefox\"></a>Mozilla/Firefox</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Click on the <strong>Tools</strong>-menu in Mozilla</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Options...</strong> item in the menu - a new window open</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Privacy</strong> selection in the left part of the window. (See image below)</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/firefox.png\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Expand the <strong>Cookies</strong> section</p>\r\n        </li>\r\n        <li>\r\n            <p>Check the <strong>Enable cookies</strong> and <strong>Accept cookies normally</strong> checkboxes</p>\r\n        </li>\r\n        <li>\r\n            <p>Save changes by clicking <strong>Ok</strong>.</p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n    <h3><a name=\"opera\"></a>Opera 7.x</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Click on the <strong>Tools</strong> menu in Opera</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Preferences...</strong> item in the menu - a new window open</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Privacy</strong> selection near the bottom left of the window. (See image below)</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/opera.png\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>The <strong>Enable cookies</strong> checkbox must be checked, and <strong>Accept all cookies</strong> should be selected in the &quot;<strong>Normal cookies</strong>&quot; drop-down</p>\r\n        </li>\r\n        <li>\r\n            <p>Save changes by clicking <strong>Ok</strong></p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n",
+        'is_active' => 1,
+        'stores' => array(0)
+    )
+);
+
+/**
+ * Insert default and system pages
+ */
+foreach ($cmsPages as $data) {
+    $this->createPage()->setData($data)->save();
+}
+
 $pageContent = <<<EOD
 <div class="message info">
     <span>
@@ -243,3 +284,53 @@
         $footerLinksBlock->setContent($content)->save();
     }
 }
+
+$installer = $this->createMigrationSetup();
+$installer->startSetup();
+
+$installer->appendClassAliasReplace(
+    'cms_block',
+    'content',
+    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
+    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_WIKI,
+    array('block_id')
+);
+$installer->appendClassAliasReplace(
+    'cms_page',
+    'content',
+    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
+    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_WIKI,
+    array('page_id')
+);
+$installer->appendClassAliasReplace(
+    'cms_page',
+    'layout_update_xml',
+    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
+    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
+    array('page_id')
+);
+$installer->appendClassAliasReplace(
+    'cms_page',
+    'custom_layout_update_xml',
+    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
+    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
+    array('page_id')
+);
+
+$installer->doUpdateClassAliases();
+
+$installer->endSetup();
+
+$cookieRestriction = $this->createPage()->load('privacy-policy-cookie-restriction-mode', 'identifier');
+
+if ($cookieRestriction->getId()) {
+    $content = $cookieRestriction->getContent();
+    $replacment = '{{config path="general/store_information/street_line1"}} ' .
+        '{{config path="general/store_information/street_line2"}} ' .
+        '{{config path="general/store_information/city"}} ' .
+        '{{config path="general/store_information/postcode"}} ' .
+        '{{config path="general/store_information/region_id"}} ' .
+        '{{config path="general/store_information/country_id"}}';
+    $content = preg_replace('/{{config path="general\\/store_information\\/address"}}/ims', $replacment, $content);
+    $cookieRestriction->setContent($content)->save();
+}
diff --git a/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.2-1.6.0.3.php b/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.2-1.6.0.3.php
deleted file mode 100644
index e4ae571d5dc2a..0000000000000
--- a/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.2-1.6.0.3.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/** @var $this \Magento\Cms\Model\Resource\Setup */
-$installer = $this->createMigrationSetup();
-$installer->startSetup();
-
-$installer->appendClassAliasReplace(
-    'cms_block',
-    'content',
-    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
-    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_WIKI,
-    array('block_id')
-);
-$installer->appendClassAliasReplace(
-    'cms_page',
-    'content',
-    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
-    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_WIKI,
-    array('page_id')
-);
-$installer->appendClassAliasReplace(
-    'cms_page',
-    'layout_update_xml',
-    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
-    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
-    array('page_id')
-);
-$installer->appendClassAliasReplace(
-    'cms_page',
-    'custom_layout_update_xml',
-    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
-    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
-    array('page_id')
-);
-
-$installer->doUpdateClassAliases();
-
-$installer->endSetup();
diff --git a/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.3-2.0.0.0.php b/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.3-2.0.0.0.php
deleted file mode 100644
index 3dc4dc20cdef1..0000000000000
--- a/app/code/Magento/Cms/data/cms_setup/data-upgrade-1.6.0.3-2.0.0.0.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/** @var $this \Magento\Cms\Model\Resource\Setup */
-
-$cookieRestriction = $this->createPage()->load('privacy-policy-cookie-restriction-mode', 'identifier');
-
-if ($cookieRestriction->getId()) {
-    $content = $cookieRestriction->getContent();
-    $replacment = '{{config path="general/store_information/street_line1"}} ' .
-        '{{config path="general/store_information/street_line2"}} ' .
-        '{{config path="general/store_information/city"}} ' .
-        '{{config path="general/store_information/postcode"}} ' .
-        '{{config path="general/store_information/region_id"}} ' .
-        '{{config path="general/store_information/country_id"}}';
-    $content = preg_replace('/{{config path="general\\/store_information\\/address"}}/ims', $replacment, $content);
-    $cookieRestriction->setContent($content)->save();
-}

From 76e3e9e269002b3843c055cc6779aeb72a1813cb Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Tue, 9 Dec 2014 15:09:26 -0600
Subject: [PATCH 178/474] MAGETWO-31447: Incorrect Validation of PHP Version
 During Installation

- Fixes based on CR comments
- Fixed typos
- Renamed PhpExtensions to PhpVerifications
---
 .../Setup/src/Controller/Environment.php      | 72 +++++++++++--------
 ...PhpExtensions.php => PhpVerifications.php} | 33 ++++++++-
 .../setup/readiness-check/progress.phtml      | 19 ++++-
 3 files changed, 91 insertions(+), 33 deletions(-)
 rename setup/module/Magento/Setup/src/Model/{PhpExtensions.php => PhpVerifications.php} (69%)

diff --git a/setup/module/Magento/Setup/src/Controller/Environment.php b/setup/module/Magento/Setup/src/Controller/Environment.php
index 172b1069365c7..8cd884737bd37 100644
--- a/setup/module/Magento/Setup/src/Controller/Environment.php
+++ b/setup/module/Magento/Setup/src/Controller/Environment.php
@@ -7,30 +7,21 @@
  */
 namespace Magento\Setup\Controller;
 
-use Composer\Json\JsonFile;
 use Composer\Package\LinkConstraint\VersionConstraint;
 use Composer\Package\Version\VersionParser;
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\JsonModel;
-use Magento\Setup\Model\PhpExtensions;
+use Magento\Setup\Model\PhpVerifications;
 use Magento\Setup\Model\FilePermissions;
 
 class Environment extends AbstractActionController
 {
     /**
-     * List of required php extensions.
+     * List of current and required php verifications.
      *
-     * @var \Magento\Setup\Model\PhpExtensions
+     * @var \Magento\Setup\Model\PhpVerifications
      */
-    protected $extensions;
-
-    /**
-     * Directory List to read composer.json
-     *
-     * @var DirectoryList
-     */
-    protected $directoryList;
+    protected $verifications;
 
     /**
      * Version parser
@@ -39,23 +30,26 @@ class Environment extends AbstractActionController
      */
     protected $versionParser;
 
+    /**
+     * Missing composer.lock file message
+     */
+    const NO_COMPOSER_ERROR = 'Whoops, it looks like composer.lock file does not exist or is not readable. Please
+        make sure to run `composer install` in the root directory. Additional details: ';
+
     /**
      * Constructor
      *
-     * @param PhpExtensions $extensions
+     * @param PhpVerifications $verifications
      * @param FilePermissions $permissions
-     * @param DirectoryList $directoryList
      * @param VersionParser $versionParser
      */
     public function __construct(
-        PhpExtensions $extensions,
+        PhpVerifications $verifications,
         FilePermissions $permissions,
-        DirectoryList $directoryList,
         VersionParser $versionParser
     ) {
-        $this->extensions = $extensions;
+        $this->verifications = $verifications;
         $this->permissions = $permissions;
-        $this->directoryList = $directoryList;
         $this->versionParser = $versionParser;
     }
 
@@ -66,18 +60,29 @@ public function __construct(
      */
     public function phpVersionAction()
     {
-        $jsonFile = (new JsonFile($this->directoryList->getRoot() . '/composer.json'))->read();
-        $multipleConstraints = $this->versionParser->parseConstraints($jsonFile['require']['php']);
+        try{
+            $requiredVersion = $this->verifications->getPhpVersion();
+        }catch (\Exception $e) {
+            return new JsonModel(
+                [
+                    'responseType' => ResponseTypeInterface::RESPONSE_TYPE_ERROR,
+                    'data' => [
+                        'error' => 'phpVersionError',
+                        'message' => self::NO_COMPOSER_ERROR . $e->getMessage()
+                    ],
+                ]
+            );
+        }
+        $multipleConstraints = $this->versionParser->parseConstraints($requiredVersion);
         $currentPhpVersion = new VersionConstraint('=', PHP_VERSION);
         $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
         if (!$multipleConstraints->matches($currentPhpVersion)) {
             $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
         }
-
         $data = [
             'responseType' => $responseType,
             'data' => [
-                'required' => $jsonFile['require']['php'],
+                'required' => isset($requiredVersion) ? $requiredVersion : '' ,
                 'current' => PHP_VERSION,
             ],
         ];
@@ -85,21 +90,32 @@ public function phpVersionAction()
     }
 
     /**
-     * Verifies php extensions
+     * Verifies php verifications
      *
      * @return JsonModel
      */
-    public function phpExtensionsAction()
+    public function phpverificationsAction()
     {
-        $required = $this->extensions->getRequired();
-        $current = $this->extensions->getCurrent();
+        try{
+            $required = $this->verifications->getRequired();
+            $current = $this->verifications->getCurrent();
 
+        } catch (\Exception $e) {
+            return new JsonModel(
+                [
+                    'responseType' => ResponseTypeInterface::RESPONSE_TYPE_ERROR,
+                    'data' => [
+                        'error' => 'phpExtensionError',
+                        'message' => self::NO_COMPOSER_ERROR . $e->getMessage()
+                    ],
+                ]
+            );
+        }
         $responseType = ResponseTypeInterface::RESPONSE_TYPE_SUCCESS;
         $missing = array_values(array_diff($required, $current));
         if ($missing) {
             $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
         }
-
         $data = [
             'responseType' => $responseType,
             'data' => [
diff --git a/setup/module/Magento/Setup/src/Model/PhpExtensions.php b/setup/module/Magento/Setup/src/Model/PhpVerifications.php
similarity index 69%
rename from setup/module/Magento/Setup/src/Model/PhpExtensions.php
rename to setup/module/Magento/Setup/src/Model/PhpVerifications.php
index 94b6530656a23..ea4353dfc57fd 100644
--- a/setup/module/Magento/Setup/src/Model/PhpExtensions.php
+++ b/setup/module/Magento/Setup/src/Model/PhpVerifications.php
@@ -11,7 +11,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 
-class PhpExtensions
+class PhpVerifications
 {
     /**
      * List of required extensions
@@ -28,11 +28,15 @@ class PhpExtensions
     protected $current = [];
 
     /**
+     * Interface to read composer.lock file
+     *
      * @var \Magento\Framework\Filesystem\Directory\ReadInterface
      */
     private $rootDir;
 
     /**
+     * Constructor
+     *
      * @param Filesystem $filesystem
      */
     public function __construct(
@@ -41,25 +45,46 @@ public function __construct(
         $this->rootDir = $filesystem->getDirectoryRead(DirectoryList::ROOT);
     }
 
+    /**
+     * Retrieves required php version
+     *
+     * @return string
+     * @throws \Exception If composer.lock file is not found or if attributes are missing.
+     */
+    public function getPhpVersion()
+    {
+        if (!$this->rootDir->isExist('composer.lock')) {
+            throw new \Exception('Cannot read `composer.lock` file');
+        }
+        $composerInfo = json_decode($this->rootDir->readFile('composer.lock'), true);
+        if (!empty($composerInfo['platform']['php'])) {
+            return $composerInfo['platform']['php'];
+        } else {
+            throw new \Exception('Missing php version in `composer.lock`');
+        }
+    }
+
     /**
      * Retrieve list of required extensions
      *
      * Collect required extensions from composer.lock file
      *
      * @return array
+     * @throws \Exception If composer.lock file is not found or if attributes are missing.
      */
     public function getRequired()
     {
         if (null === $this->required) {
             if (!$this->rootDir->isExist('composer.lock')) {
-                $this->required = [];
-                return $this->required;
+                throw new \Exception('Cannot read `composer.lock` file');
             }
             $composerInfo = json_decode($this->rootDir->readFile('composer.lock'), true);
             $declaredDependencies = [];
 
             if (!empty($composerInfo['platform-dev'])) {
                 $declaredDependencies = array_merge($declaredDependencies, array_keys($composerInfo['platform-dev']));
+            } else {
+                throw new \Exception('Missing platform-dev in `composer.lock`');
             }
             if (!empty($composerInfo['packages'])) {
                 foreach ($composerInfo['packages'] as $package) {
@@ -67,6 +92,8 @@ public function getRequired()
                         $declaredDependencies = array_merge($declaredDependencies, array_keys($package['require']));
                     }
                 }
+            } else {
+                throw new \Exception('Missing packages in `composer.lock`');
             }
             if ($declaredDependencies) {
                 $declaredDependencies = array_unique($declaredDependencies);
diff --git a/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml b/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml
index d47009c3d7001..81c1225ba8738 100644
--- a/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml
@@ -31,6 +31,12 @@
                 </div>
             </div>
             <div ng-switch-default ng-init="updateOnError(version)">
+                <div ng-switch="version.data.error">
+                    <div ng-switch-when="phpVersionError" class="animate-show text-danger">
+                        <span class="glyphicon glyphicon-remove-sign"></span>&nbsp;{{version.data.message}} <br/> <br/>
+                    </div>
+
+                <div ng-switch-default ng-init="updateOnError(version)">
                 <div class="rediness-check-panel-right">
                     <p>Need Help?</p>
                     <p><a href="http://www.php.net/docs.php" target="_blank">PHP Documentation</a></p>
@@ -46,10 +52,12 @@
                         </a>
                     </p>
                     <div class="rediness-check-block" ng-show="version.expanded">
-                        <p>Donwload and install PHP version {{version.data.required}} from <a href="http://www.php.net" target="_blank">www.php.net</a> using this <a href="http://www.php.net/docs.php" target="_blank">PHP Documentation</a>.</p>
+                        <p>Download and install PHP version {{version.data.required}} from <a href="http://www.php.net" target="_blank">www.php.net</a> using this <a href="http://www.php.net/docs.php" target="_blank">PHP Documentation</a>.</p>
                         <p>If you need more help please call your hosting provider.</p>
                     </div>
                 </div>
+                <div></div>
+                </div>
             </div>
         </div>
     </div>
@@ -81,6 +89,12 @@
                 </div>
             </div>
             <div ng-switch-default ng-init="updateOnError(extensions)">
+                <div ng-switch="extensions.data.error">
+                    <div ng-switch-when="phpExtensionError" class="animate-show text-danger">
+                        <span class="glyphicon glyphicon-remove-sign"></span>&nbsp;{{extensions.data.message}}<br/>
+                        <br/>
+                    </div>
+                    <div ng-switch-default>
                 <div class="rediness-check-panel-right">
                     <p>Need Help?</p>
                     <p><a href="#" target="_blank">PHP Extension Help</a></p>
@@ -95,7 +109,7 @@
                             <span ng-show="extensions.expanded">Less detail</span>
                         </a>
                     </p>
-                    <p>The best way to resolve this is to install the correct missing extensions. The exact fix depends on our server, your host, and other system variables.</br>Our <a href="#">PHP Extension Help</a> can get you started.</p>
+                    <p>The best way to resolve this is to install the correct missing extensions. The exact fix depends on your server, your host, and other system variables.</br>Our <a href="#">PHP Extension Help</a> can get you started.</p>
                     <p>If you need more help, please call your hosting provider.</p>
                     <div class="rediness-check-block" ng-show="extensions.expanded">
                         <ul class="list-unstyled">
@@ -107,6 +121,7 @@
                         </ul>
                     </div>
                 </div>
+                </div>
             </div>
         </div>
     </div>

From 114f81b91236a49635307155989614523a74d4a5 Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Tue, 9 Dec 2014 15:56:10 -0600
Subject: [PATCH 179/474] MAGETWO-31447: Incorrect Validation of PHP Version
 During Installation

- Fixing renaming
---
 setup/module/Magento/Setup/src/Controller/Environment.php      | 2 +-
 .../Setup/view/magento/setup/readiness-check/progress.phtml    | 3 ++-
 setup/pub/magento/setup/readiness-check.js                     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/Environment.php b/setup/module/Magento/Setup/src/Controller/Environment.php
index 8cd884737bd37..960461f3b54e9 100644
--- a/setup/module/Magento/Setup/src/Controller/Environment.php
+++ b/setup/module/Magento/Setup/src/Controller/Environment.php
@@ -94,7 +94,7 @@ public function phpVersionAction()
      *
      * @return JsonModel
      */
-    public function phpverificationsAction()
+    public function phpVerificationsAction()
     {
         try{
             $required = $this->verifications->getRequired();
diff --git a/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml b/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml
index 81c1225ba8738..029d3782f65ec 100644
--- a/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/readiness-check/progress.phtml
@@ -56,7 +56,7 @@
                         <p>If you need more help please call your hosting provider.</p>
                     </div>
                 </div>
-                <div></div>
+                </div>
                 </div>
             </div>
         </div>
@@ -125,6 +125,7 @@
             </div>
         </div>
     </div>
+    </div>
 
     <div id="php-permissions" ng-show="permissions.visible">
         <div ng-hide="permissions.processed">
diff --git a/setup/pub/magento/setup/readiness-check.js b/setup/pub/magento/setup/readiness-check.js
index f0d18cbe16b1c..b2ce68a9675b1 100644
--- a/setup/pub/magento/setup/readiness-check.js
+++ b/setup/pub/magento/setup/readiness-check.js
@@ -60,7 +60,7 @@ angular.module('readiness-check', [])
                 }
             },
             'php-extensions': {
-                url:'index.php/environment/php-extensions',
+                url:'index.php/environment/php-verifications',
                 show: function() {
                     $scope.startProgress();
                     $scope.extensions.visible = true;

From 29e93158a85badb3a0fa967797d5dddda302cda3 Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Tue, 9 Dec 2014 16:46:37 -0600
Subject: [PATCH 180/474] MAGETWO-31447: Incorrect Validation of PHP Version
 During Installation

- fixes based on CR.
- Renamed PhpVerifications to PhpInformation
---
 .../Setup/src/Controller/Environment.php      | 32 ++++++++-----------
 ...hpVerifications.php => PhpInformation.php} | 19 +++++++----
 setup/pub/magento/setup/readiness-check.js    |  2 +-
 3 files changed, 26 insertions(+), 27 deletions(-)
 rename setup/module/Magento/Setup/src/Model/{PhpVerifications.php => PhpInformation.php} (77%)

diff --git a/setup/module/Magento/Setup/src/Controller/Environment.php b/setup/module/Magento/Setup/src/Controller/Environment.php
index 960461f3b54e9..837190c290c71 100644
--- a/setup/module/Magento/Setup/src/Controller/Environment.php
+++ b/setup/module/Magento/Setup/src/Controller/Environment.php
@@ -11,17 +11,17 @@
 use Composer\Package\Version\VersionParser;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\JsonModel;
-use Magento\Setup\Model\PhpVerifications;
+use Magento\Setup\Model\PhpInformation;
 use Magento\Setup\Model\FilePermissions;
 
 class Environment extends AbstractActionController
 {
     /**
-     * List of current and required php verifications.
+     * Model to determine PHP version, currently installed and required PHP extensions.
      *
-     * @var \Magento\Setup\Model\PhpVerifications
+     * @var \Magento\Setup\Model\PhpInformation
      */
-    protected $verifications;
+    protected $phpInformation;
 
     /**
      * Version parser
@@ -30,25 +30,19 @@ class Environment extends AbstractActionController
      */
     protected $versionParser;
 
-    /**
-     * Missing composer.lock file message
-     */
-    const NO_COMPOSER_ERROR = 'Whoops, it looks like composer.lock file does not exist or is not readable. Please
-        make sure to run `composer install` in the root directory. Additional details: ';
-
     /**
      * Constructor
      *
-     * @param PhpVerifications $verifications
+     * @param PhpInformation $phpInformation
      * @param FilePermissions $permissions
      * @param VersionParser $versionParser
      */
     public function __construct(
-        PhpVerifications $verifications,
+        PhpInformation $phpInformation,
         FilePermissions $permissions,
         VersionParser $versionParser
     ) {
-        $this->verifications = $verifications;
+        $this->phpInformation = $phpInformation;
         $this->permissions = $permissions;
         $this->versionParser = $versionParser;
     }
@@ -61,14 +55,14 @@ public function __construct(
     public function phpVersionAction()
     {
         try{
-            $requiredVersion = $this->verifications->getPhpVersion();
+            $requiredVersion = $this->phpInformation->getRequiredPhpVersion();
         }catch (\Exception $e) {
             return new JsonModel(
                 [
                     'responseType' => ResponseTypeInterface::RESPONSE_TYPE_ERROR,
                     'data' => [
                         'error' => 'phpVersionError',
-                        'message' => self::NO_COMPOSER_ERROR . $e->getMessage()
+                        'message' => 'Cannot determine required PHP version' . $e->getMessage()
                     ],
                 ]
             );
@@ -94,11 +88,11 @@ public function phpVersionAction()
      *
      * @return JsonModel
      */
-    public function phpVerificationsAction()
+    public function phpExtensionsAction()
     {
         try{
-            $required = $this->verifications->getRequired();
-            $current = $this->verifications->getCurrent();
+            $required = $this->phpInformation->getRequired();
+            $current = $this->phpInformation->getCurrent();
 
         } catch (\Exception $e) {
             return new JsonModel(
@@ -106,7 +100,7 @@ public function phpVerificationsAction()
                     'responseType' => ResponseTypeInterface::RESPONSE_TYPE_ERROR,
                     'data' => [
                         'error' => 'phpExtensionError',
-                        'message' => self::NO_COMPOSER_ERROR . $e->getMessage()
+                        'message' => 'Cannot determine required PHP extensions' . $e->getMessage()
                     ],
                 ]
             );
diff --git a/setup/module/Magento/Setup/src/Model/PhpVerifications.php b/setup/module/Magento/Setup/src/Model/PhpInformation.php
similarity index 77%
rename from setup/module/Magento/Setup/src/Model/PhpVerifications.php
rename to setup/module/Magento/Setup/src/Model/PhpInformation.php
index ea4353dfc57fd..f22d73e1b8e73 100644
--- a/setup/module/Magento/Setup/src/Model/PhpVerifications.php
+++ b/setup/module/Magento/Setup/src/Model/PhpInformation.php
@@ -11,7 +11,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 
-class PhpVerifications
+class PhpInformation
 {
     /**
      * List of required extensions
@@ -51,16 +51,18 @@ public function __construct(
      * @return string
      * @throws \Exception If composer.lock file is not found or if attributes are missing.
      */
-    public function getPhpVersion()
+    public function getRequiredPhpVersion()
     {
         if (!$this->rootDir->isExist('composer.lock')) {
-            throw new \Exception('Cannot read `composer.lock` file');
+            throw new \Exception('Cannot determine required PHP version from Composer information: '
+                . '\'composer.lock\'file is absent');
         }
         $composerInfo = json_decode($this->rootDir->readFile('composer.lock'), true);
         if (!empty($composerInfo['platform']['php'])) {
             return $composerInfo['platform']['php'];
         } else {
-            throw new \Exception('Missing php version in `composer.lock`');
+            throw new \Exception('Cannot determine required PHP version from Composer information: '
+            . 'Missing key \'platform=>php\' in \'composer.lock\' file');
         }
     }
 
@@ -76,7 +78,8 @@ public function getRequired()
     {
         if (null === $this->required) {
             if (!$this->rootDir->isExist('composer.lock')) {
-                throw new \Exception('Cannot read `composer.lock` file');
+                throw new \Exception('Cannot determine required PHP extensions from Composer information: '
+                    . '\'composer.lock\' file is absent');
             }
             $composerInfo = json_decode($this->rootDir->readFile('composer.lock'), true);
             $declaredDependencies = [];
@@ -84,7 +87,8 @@ public function getRequired()
             if (!empty($composerInfo['platform-dev'])) {
                 $declaredDependencies = array_merge($declaredDependencies, array_keys($composerInfo['platform-dev']));
             } else {
-                throw new \Exception('Missing platform-dev in `composer.lock`');
+                throw new \Exception('Cannot determine required PHP extensions from Composer information: '
+                    . 'Missing key \'platform-dev\' in \'composer.lock\' file');
             }
             if (!empty($composerInfo['packages'])) {
                 foreach ($composerInfo['packages'] as $package) {
@@ -93,7 +97,8 @@ public function getRequired()
                     }
                 }
             } else {
-                throw new \Exception('Missing packages in `composer.lock`');
+                throw new \Exception('Cannot determine required PHP extensions from Composer information: '
+                    . 'Missing key \'packages\' in \'composer.lock\' file');
             }
             if ($declaredDependencies) {
                 $declaredDependencies = array_unique($declaredDependencies);
diff --git a/setup/pub/magento/setup/readiness-check.js b/setup/pub/magento/setup/readiness-check.js
index b2ce68a9675b1..f0d18cbe16b1c 100644
--- a/setup/pub/magento/setup/readiness-check.js
+++ b/setup/pub/magento/setup/readiness-check.js
@@ -60,7 +60,7 @@ angular.module('readiness-check', [])
                 }
             },
             'php-extensions': {
-                url:'index.php/environment/php-verifications',
+                url:'index.php/environment/php-extensions',
                 show: function() {
                     $scope.startProgress();
                     $scope.extensions.visible = true;

From b4c7fe36151efdcd070a48cebe5e5b28807b1bd7 Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Tue, 9 Dec 2014 16:49:51 -0600
Subject: [PATCH 181/474] MAGETWO-31447: Incorrect Validation of PHP Version
 During Installation

- improved readability
---
 setup/module/Magento/Setup/src/Controller/Environment.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/Environment.php b/setup/module/Magento/Setup/src/Controller/Environment.php
index 837190c290c71..85b26d0ed85f7 100644
--- a/setup/module/Magento/Setup/src/Controller/Environment.php
+++ b/setup/module/Magento/Setup/src/Controller/Environment.php
@@ -62,7 +62,7 @@ public function phpVersionAction()
                     'responseType' => ResponseTypeInterface::RESPONSE_TYPE_ERROR,
                     'data' => [
                         'error' => 'phpVersionError',
-                        'message' => 'Cannot determine required PHP version' . $e->getMessage()
+                        'message' => 'Cannot determine required PHP version: ' . $e->getMessage()
                     ],
                 ]
             );
@@ -100,7 +100,7 @@ public function phpExtensionsAction()
                     'responseType' => ResponseTypeInterface::RESPONSE_TYPE_ERROR,
                     'data' => [
                         'error' => 'phpExtensionError',
-                        'message' => 'Cannot determine required PHP extensions' . $e->getMessage()
+                        'message' => 'Cannot determine required PHP extensions: ' . $e->getMessage()
                     ],
                 ]
             );

From 2ca2c5f3c4d8f00f3d6a044f0975a0f260f79dc1 Mon Sep 17 00:00:00 2001
From: Maksym Savich <msavich@ebay.com>
Date: Tue, 9 Dec 2014 17:14:38 -0600
Subject: [PATCH 182/474] Fixed MAGETWO-31356: PDO Exception during Magento
 installation

- Added MySQL version check during schema creation and data upgrades
---
 .../src/Controller/ConsoleController.php      |  3 --
 .../Magento/Setup/src/Model/Installer.php     | 45 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index 6b5e27daab75a..8d70b02f9aee1 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -311,7 +311,6 @@ public function installAction()
      */
     public function installDeploymentConfigAction()
     {
-        $this->installer->checkInstallationFilePermissions();
         /** @var \Zend\Console\Request $request */
         $request = $this->getRequest();
         $this->installer->installDeploymentConfig($request->getParams());
@@ -336,7 +335,6 @@ public function installSchemaAction()
      */
     public function installDataAction()
     {
-        $this->installer->checkInstallationFilePermissions();
         $this->installer->installDataFixtures();
     }
 
@@ -348,7 +346,6 @@ public function installDataAction()
      */
     public function updateAction()
     {
-        $this->installer->checkInstallationFilePermissions();
         $this->installer->installSchema();
         $this->installer->installDataFixtures();
     }
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 05d6e06ecc330..1efe395c22387 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -64,6 +64,11 @@ class Installer
 
     const INFO_MESSAGE = 'message';
 
+    /**
+     * The lowest supported MySQL verion
+     */
+    const MYSQL_VERSION_REQUIRED = '5.6.0';
+
     /**
      * File permissions checker
      *
@@ -480,6 +485,7 @@ public function checkApplicationFilePermissions()
      */
     public function installDeploymentConfig($data)
     {
+        $this->checkInstallationFilePermissions();
         $data[InstallConfig::KEY_DATE] = date('r');
         if (empty($data[EncryptConfig::KEY_ENCRYPTION_KEY])) {
             $data[EncryptConfig::KEY_ENCRYPTION_KEY] = md5($this->random->getRandomString(10));
@@ -506,6 +512,8 @@ public function installDeploymentConfig($data)
     public function installSchema()
     {
         $this->assertDeploymentConfigExists();
+        $this->assertDbAccessible();
+
         $moduleNames = $this->moduleList->getNames();
 
         $this->log->log('Schema creation/updates:');
@@ -532,6 +540,10 @@ public function installSchema()
      */
     public function installDataFixtures()
     {
+        $this->checkInstallationFilePermissions();
+        $this->assertDeploymentConfigExists();
+        $this->assertDbAccessible();
+
         /** @var \Magento\Framework\Module\Updater $updater */
         $updater = $this->getObjectManager()->create('Magento\Framework\Module\Updater');
         $updater->updateData();
@@ -683,7 +695,21 @@ public function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '')
         ]);
 
         if (!$connection) {
-            throw new \Exception('Database connection failure.');
+            throw new \Magento\Setup\Exception('Database connection failure.');
+        }
+
+        $mysqlVersion = $connection->fetchOne('SELECT version()');
+        if ($mysqlVersion) {
+            if (preg_match('/^([0-9\.]+)/', $mysqlVersion, $matches)) {
+                if (isset($matches[1]) && !empty($matches[1])) {
+                    if (version_compare($matches[1], self::MYSQL_VERSION_REQUIRED) < 0) {
+                        throw new \Magento\Setup\Exception(
+                            'Unsupported MySQL version! '
+                            . 'Version '. self::MYSQL_VERSION_REQUIRED . ' or later is required.'
+                        );
+                    }
+                }
+            }
         }
         return true;
     }
@@ -807,4 +833,21 @@ private function assertDeploymentConfigExists()
             throw new \Magento\Setup\Exception("Can't run this operation: deployment configuration is absent.");
         }
     }
+
+    /**
+     * Validates that deployment configuration exists
+     *
+     * @return void
+     */
+    private function assertDbAccessible()
+    {
+        $dbConfig = new DbConfig($this->deploymentConfig->getSegment(DbConfig::CONFIG_KEY));
+        $config = $dbConfig->getConnection(\Magento\Framework\App\Resource\Config::DEFAULT_SETUP_CONNECTION);
+        $this->checkDatabaseConnection(
+            $config[DbConfig::KEY_NAME],
+            $config[DbConfig::KEY_HOST],
+            $config[DbConfig::KEY_USER],
+            $config[DbConfig::KEY_PASS]
+        );
+    }
 }

From 5cc838074fc336079ee905ad8acac77b645d9a47 Mon Sep 17 00:00:00 2001
From: Maksym Savich <msavich@ebay.com>
Date: Tue, 9 Dec 2014 17:18:59 -0600
Subject: [PATCH 183/474] Fixed MAGETWO-31356: PDO Exception during Magento
 installation

- DocBlock fix
---
 setup/module/Magento/Setup/src/Model/Installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 1efe395c22387..7a055053006ee 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -835,7 +835,7 @@ private function assertDeploymentConfigExists()
     }
 
     /**
-     * Validates that deployment configuration exists
+     * Validates that MySQL is accessible and MySQL version is supported
      *
      * @return void
      */

From 317bd117c5114211ac2773330abea2678344213a Mon Sep 17 00:00:00 2001
From: Paul Lewis <plewis@ebay.com>
Date: Tue, 9 Dec 2014 19:32:51 -0600
Subject: [PATCH 184/474] MAGETWO-29546: DbStatusValidator does not provide
 enough information to perform successful update of the system

 - rename DbVersionDetector to DbVersionInfo and rename some of the methods in it
 - Remove mention of composer from error message
---
 .../Module/Plugin/DbStatusValidatorTest.php   | 13 ++--
 ...DetectorTest.php => DbVersionInfoTest.php} | 34 +++++-----
 .../Module/Plugin/DbStatusValidatorTest.php   | 62 +++++++++----------
 .../Magento/Framework/Module/UpdaterTest.php  | 16 ++---
 ...bVersionDetector.php => DbVersionInfo.php} | 57 +++++++++--------
 .../Module/Plugin/DbStatusValidator.php       | 27 ++++----
 .../Magento/Framework/Module/Updater.php      | 12 ++--
 7 files changed, 107 insertions(+), 114 deletions(-)
 rename dev/tests/unit/testsuite/Magento/Framework/Module/{DbVersionDetectorTest.php => DbVersionInfoTest.php} (80%)
 rename lib/internal/Magento/Framework/Module/{DbVersionDetector.php => DbVersionInfo.php} (67%)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index 9efe467876f6a..55aa07e89dd3c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -16,6 +16,8 @@ public function testValidationUpToDateDb()
 
     /**
      * @magentoDbIsolation enabled
+     * @expectedException \Magento\Framework\Module\Exception
+     * @expectedExceptionMessage Please update your database
      */
     public function testValidationOutdatedDb()
     {
@@ -33,14 +35,7 @@ public function testValidationOutdatedDb()
         $cache = $this->_objectManager->get('Magento\Framework\App\Cache\Type\Config');
         $cache->clean();
 
-        try {
-            /* This triggers plugin to be executed */
-            $this->dispatch('index/index');
-            $this->fail('Did not throw expected \Magento\Framework\Module\Exception.');
-        } catch (\Magento\Framework\Module\Exception $e) {
-            $this->assertStringStartsWith('Please update your database:', $e->getMessage());
-            $this->assertContains('Magento_AdminNotification schema:', $e->getMessage());
-            $this->assertContains('Magento_AdminNotification data:', $e->getMessage());
-        }
+        /* This triggers plugin to be executed */
+        $this->dispatch('index/index');
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionInfoTest.php
similarity index 80%
rename from dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionInfoTest.php
index 1b67b52ed1896..879364c2e99f2 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionDetectorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionInfoTest.php
@@ -8,12 +8,12 @@
 namespace Magento\Framework\Module;
 
 
-class DbVersionDetectorTest extends \PHPUnit_Framework_TestCase
+class DbVersionInfoTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var DbVersionDetector
+     * @var DbVersionInfo
      */
-    private $dbVersionDetector;
+    private $dbVersionInfo;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -48,7 +48,7 @@ protected function setUp()
         $this->moduleResource = $this->getMockForAbstractClass('\Magento\Framework\Module\ResourceInterface');
         $this->resourceResolver = $this->getMockForAbstractClass('\Magento\Framework\Module\ResourceResolverInterface');
 
-        $this->dbVersionDetector = new DbVersionDetector(
+        $this->dbVersionInfo = new DbVersionInfo(
             $this->moduleList,
             $this->moduleResource,
             $this->resourceResolver
@@ -71,7 +71,7 @@ public function testIsDbSchemaUpToDate($moduleName, $dbVersion, $expectedResult)
             ->will($this->returnValue($dbVersion));
         $this->assertEquals(
             $expectedResult,
-            $this->dbVersionDetector->isDbSchemaUpToDate($moduleName, $resourceName)
+            $this->dbVersionInfo->isSchemaUpToDate($moduleName, $resourceName)
         );
     }
 
@@ -91,7 +91,7 @@ public function testIsDbDataUpToDate($moduleName, $dbVersion, $expectedResult)
             ->will($this->returnValue($dbVersion));
         $this->assertEquals(
             $expectedResult,
-            $this->dbVersionDetector->isDbDataUpToDate($moduleName, $resourceName)
+            $this->dbVersionInfo->isDataUpToDate($moduleName, $resourceName)
         );
     }
 
@@ -140,19 +140,19 @@ public function testGetDbVersionErrors()
 
         $expectedErrors = [
             [
-                DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
-                DbVersionDetector::ERROR_KEY_CURRENT => '2',
-                DbVersionDetector::ERROR_KEY_REQUIRED => '1',
-                DbVersionDetector::ERROR_KEY_TYPE => 'schema',
+                DbVersionInfo::KEY_MODULE => 'Module_One',
+                DbVersionInfo::KEY_CURRENT => '2',
+                DbVersionInfo::KEY_REQUIRED => '1',
+                DbVersionInfo::KEY_TYPE => 'schema',
             ],
             [
-                DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
-                DbVersionDetector::ERROR_KEY_CURRENT => '2',
-                DbVersionDetector::ERROR_KEY_REQUIRED => '1',
-                DbVersionDetector::ERROR_KEY_TYPE => 'data',
+                DbVersionInfo::KEY_MODULE => 'Module_One',
+                DbVersionInfo::KEY_CURRENT => '2',
+                DbVersionInfo::KEY_REQUIRED => '1',
+                DbVersionInfo::KEY_TYPE => 'data',
             ]
         ];
-        $this->assertEquals($expectedErrors, $this->dbVersionDetector->getDbVersionErrors());
+        $this->assertEquals($expectedErrors, $this->dbVersionInfo->getDbVersionErrors());
     }
 
     /**
@@ -161,7 +161,7 @@ public function testGetDbVersionErrors()
      */
     public function testIsDbSchemaUpToDateException()
     {
-        $this->dbVersionDetector->isDbSchemaUpToDate('Module_No_Schema', 'resource_name');
+        $this->dbVersionInfo->isSchemaUpToDate('Module_No_Schema', 'resource_name');
     }
 
     /**
@@ -170,6 +170,6 @@ public function testIsDbSchemaUpToDateException()
      */
     public function testIsDbDataUpToDateException()
     {
-        $this->dbVersionDetector->isDbDataUpToDate('Module_No_Schema', 'resource_name');
+        $this->dbVersionInfo->isDataUpToDate('Module_No_Schema', 'resource_name');
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index 7357904e1c2b6..75286dcebf949 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\Framework\Module\Plugin;
 
-use Magento\Framework\Module\DbVersionDetector;
+use Magento\Framework\Module\DbVersionInfo;
 
 class DbStatusValidatorTest extends \PHPUnit_Framework_TestCase
 {
@@ -47,9 +47,9 @@ class DbStatusValidatorTest extends \PHPUnit_Framework_TestCase
     private $moduleManager;
 
     /**
-     * @var \Magento\Framework\Module\DbVersionDetector|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\DbVersionInfo|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $dbVersionDetectorMock;
+    private $dbVersionInfoMock;
 
     protected function setUp()
     {
@@ -71,10 +71,10 @@ protected function setUp()
                 return ['resource_' . $moduleName];
             }));
         $this->moduleManager = $this->getMock('\Magento\Framework\Module\Manager', [], [], '', false);
-        $this->dbVersionDetectorMock = $this->getMock('\Magento\Framework\Module\DbVersionDetector', [], [], '', false);
+        $this->dbVersionInfoMock = $this->getMock('\Magento\Framework\Module\DbVersionInfo', [], [], '', false);
         $this->_model = new DbStatusValidator(
             $this->_cacheMock,
-            $this->dbVersionDetectorMock
+            $this->dbVersionInfoMock
         );
     }
 
@@ -124,7 +124,7 @@ public function testAroundDispatchCached()
      *
      * @dataProvider aroundDispatchExceptionDataProvider
      * @expectedException \Magento\Framework\Module\Exception
-     * @expectedExceptionMessage Please update your database: first run "composer install" from the Magento
+     * @expectedExceptionMessage Please update your database:
      */
     public function testAroundDispatchException(array $dbVersionErrors)
     {
@@ -135,7 +135,7 @@ public function testAroundDispatchException(array $dbVersionErrors)
         ;
         $this->_cacheMock->expects($this->never())->method('save');
 
-        $this->dbVersionDetectorMock->expects($this->any())
+        $this->dbVersionInfoMock->expects($this->any())
             ->method('getDbVersionErrors')
             ->will($this->returnValue($dbVersionErrors));
 
@@ -151,48 +151,48 @@ public function aroundDispatchExceptionDataProvider()
             'schema is outdated' => [
                 [
                      [
-                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
-                         DbVersionDetector::ERROR_KEY_TYPE => 'schema',
-                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
+                         DbVersionInfo::KEY_MODULE => 'Module_One',
+                         DbVersionInfo::KEY_TYPE => 'schema',
+                         DbVersionInfo::KEY_CURRENT => 'none',
+                         DbVersionInfo::KEY_REQUIRED => '1'
                      ]
                 ],
             ],
             'data is outdated' => [
                 [
                      [
-                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_Two',
-                         DbVersionDetector::ERROR_KEY_TYPE => 'data',
-                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
+                         DbVersionInfo::KEY_MODULE => 'Module_Two',
+                         DbVersionInfo::KEY_TYPE => 'data',
+                         DbVersionInfo::KEY_CURRENT => 'none',
+                         DbVersionInfo::KEY_REQUIRED => '1'
                      ]
                 ],
             ],
             'both schema and data are outdated' => [
                 [
                      [
-                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
-                         DbVersionDetector::ERROR_KEY_TYPE => 'schema',
-                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
+                         DbVersionInfo::KEY_MODULE => 'Module_One',
+                         DbVersionInfo::KEY_TYPE => 'schema',
+                         DbVersionInfo::KEY_CURRENT => 'none',
+                         DbVersionInfo::KEY_REQUIRED => '1'
                      ],
                      [
-                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_Two',
-                         DbVersionDetector::ERROR_KEY_TYPE => 'schema',
-                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
+                         DbVersionInfo::KEY_MODULE => 'Module_Two',
+                         DbVersionInfo::KEY_TYPE => 'schema',
+                         DbVersionInfo::KEY_CURRENT => 'none',
+                         DbVersionInfo::KEY_REQUIRED => '1'
                      ],
                      [
-                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_One',
-                         DbVersionDetector::ERROR_KEY_TYPE => 'data',
-                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
+                         DbVersionInfo::KEY_MODULE => 'Module_One',
+                         DbVersionInfo::KEY_TYPE => 'data',
+                         DbVersionInfo::KEY_CURRENT => 'none',
+                         DbVersionInfo::KEY_REQUIRED => '1'
                      ],
                      [
-                         DbVersionDetector::ERROR_KEY_MODULE => 'Module_Two',
-                         DbVersionDetector::ERROR_KEY_TYPE => 'data',
-                         DbVersionDetector::ERROR_KEY_CURRENT => 'none',
-                         DbVersionDetector::ERROR_KEY_REQUIRED => '1'
+                         DbVersionInfo::KEY_MODULE => 'Module_Two',
+                         DbVersionInfo::KEY_TYPE => 'data',
+                         DbVersionInfo::KEY_CURRENT => 'none',
+                         DbVersionInfo::KEY_REQUIRED => '1'
                      ]
                 ],
             ],
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php
index 24cbf01013e26..f1032e9071a4f 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/UpdaterTest.php
@@ -30,9 +30,9 @@ class UpdaterTest extends \PHPUnit_Framework_TestCase
     protected $_resourceSetupMock;
 
     /**
-     * @var \Magento\Framework\Module\DbVersionDetector|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\DbVersionInfo|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $_dbVersionDetector;
+    private $_dbVersionInfo;
 
     /**
      * @var \Magento\Framework\Module\Updater
@@ -67,20 +67,20 @@ protected function setUp()
             ->will($this->returnValue($resourceList))
         ;
 
-        $this->_dbVersionDetector = $this->getMock('Magento\Framework\Module\DbVersionDetector', [], [], '', false);
+        $this->_dbVersionInfo = $this->getMock('Magento\Framework\Module\DbVersionInfo', [], [], '', false);
 
         $this->_model = new \Magento\Framework\Module\Updater(
             $this->_factoryMock,
             $this->_moduleListMock,
             $this->_resourceResolver,
-            $this->_dbVersionDetector
+            $this->_dbVersionInfo
         );
     }
 
     public function testUpdateData()
     {
-        $this->_dbVersionDetector->expects($this->once())
-            ->method('isDbDataUpToDate')
+        $this->_dbVersionInfo->expects($this->once())
+            ->method('isDataUpToDate')
             ->with('Test_Module', 'catalog_setup')
             ->will(
                 $this->returnValue(false)
@@ -98,8 +98,8 @@ public function testUpdateData()
 
     public function testUpdateDataNoUpdates()
     {
-        $this->_dbVersionDetector->expects($this->once())
-            ->method('isDbDataUpToDate')
+        $this->_dbVersionInfo->expects($this->once())
+            ->method('isDataUpToDate')
             ->with('Test_Module', 'catalog_setup')
             ->will($this->returnValue(true));
         $this->_factoryMock->expects($this->never())
diff --git a/lib/internal/Magento/Framework/Module/DbVersionDetector.php b/lib/internal/Magento/Framework/Module/DbVersionInfo.php
similarity index 67%
rename from lib/internal/Magento/Framework/Module/DbVersionDetector.php
rename to lib/internal/Magento/Framework/Module/DbVersionInfo.php
index 4f60dc37bb939..3cc8efb097539 100644
--- a/lib/internal/Magento/Framework/Module/DbVersionDetector.php
+++ b/lib/internal/Magento/Framework/Module/DbVersionInfo.php
@@ -11,18 +11,18 @@
 use Magento\Framework\Module\Updater\SetupInterface;
 
 /**
- * Class DbVersionDetector
+ * Class DbVersionInfo
  *
  */
-class DbVersionDetector
+class DbVersionInfo
 {
     /**#@+
-     * Constants defined for keys of error array
+     * Constants defined for keys of version info array
      */
-    const ERROR_KEY_MODULE = 'module';
-    const ERROR_KEY_TYPE = 'type';
-    const ERROR_KEY_CURRENT = 'current';
-    const ERROR_KEY_REQUIRED = 'required';
+    const KEY_MODULE = 'module';
+    const KEY_TYPE = 'type';
+    const KEY_CURRENT = 'current';
+    const KEY_REQUIRED = 'required';
     /**#@-*/
 
     /**
@@ -62,7 +62,7 @@ public function __construct(
      * @param string $resourceName
      * @return bool
      */
-    public function isDbSchemaUpToDate($moduleName, $resourceName)
+    public function isSchemaUpToDate($moduleName, $resourceName)
     {
         $dbVer = $this->moduleResource->getDbVersion($resourceName);
         return $this->isModuleVersionEqual($moduleName, $dbVer);
@@ -73,7 +73,7 @@ public function isDbSchemaUpToDate($moduleName, $resourceName)
      * @param string $resourceName
      * @return bool
      */
-    public function isDbDataUpToDate($moduleName, $resourceName)
+    public function isDataUpToDate($moduleName, $resourceName)
     {
         $dataVer = $this->moduleResource->getDataVersion($resourceName);
         return $this->isModuleVersionEqual($moduleName, $dataVer);
@@ -82,20 +82,20 @@ public function isDbDataUpToDate($moduleName, $resourceName)
     /**
      * Get array of errors if DB is out of date, return [] if DB is current
      *
-     * @return [] Array of errors, each error contains module name, current version, needed version,
-     *              and type (schema or data).  The array will be empty if all schema and data are current.
+     * @return string[] Array of errors, each error contains module name, current version, required version,
+     *                  and type (schema or data).  The array will be empty if all schema and data are current.
      */
     public function getDbVersionErrors()
     {
         $errors = [];
         foreach ($this->moduleList->getNames() as $moduleName) {
             foreach ($this->resourceResolver->getResourceList($moduleName) as $resourceName) {
-                if (!$this->isDbSchemaUpToDate($moduleName, $resourceName)) {
-                    $errors[] = $this->getDbSchemaVersionError($moduleName, $resourceName);
+                if (!$this->isSchemaUpToDate($moduleName, $resourceName)) {
+                    $errors[] = $this->getSchemaInfo($moduleName, $resourceName);
                 }
 
-                if (!$this->isDbDataUpToDate($moduleName, $resourceName)) {
-                    $errors[] = $this->getDbDataVersionError($moduleName, $resourceName);
+                if (!$this->isDataUpToDate($moduleName, $resourceName)) {
+                    $errors[] = $this->getDataInfo($moduleName, $resourceName);
                 }
             }
         }
@@ -103,24 +103,23 @@ public function getDbVersionErrors()
     }
 
     /**
-     * Check if DB schema is up to date, return error data if it is not.
+     * Check if DB schema is up to date, version info if it is not.
      *
      * @param string $moduleName
      * @param string $resourceName
-     * @return [] Contains current and needed version strings
+     * @return string[] Contains current and needed version strings
      */
-    private function getDbSchemaVersionError($moduleName, $resourceName)
+    private function getSchemaInfo($moduleName, $resourceName)
     {
-
         $dbVer = $this->moduleResource->getDbVersion($resourceName); // version saved in DB
         $module = $this->moduleList->getOne($moduleName);
         $configVer = $module['schema_version'];
         $dbVer = $dbVer ?: 'none';
         return [
-            self::ERROR_KEY_CURRENT => $dbVer,
-            self::ERROR_KEY_REQUIRED => $configVer,
-            self::ERROR_KEY_MODULE => $moduleName,
-            self::ERROR_KEY_TYPE => 'schema'
+            self::KEY_CURRENT => $dbVer,
+            self::KEY_REQUIRED => $configVer,
+            self::KEY_MODULE => $moduleName,
+            self::KEY_TYPE => 'schema'
         ];
     }
 
@@ -129,19 +128,19 @@ private function getDbSchemaVersionError($moduleName, $resourceName)
      *
      * @param string $moduleName
      * @param string $resourceName
-     * @return []
+     * @return string[]
      */
-    private function getDbDataVersionError($moduleName, $resourceName)
+    private function getDataInfo($moduleName, $resourceName)
     {
         $dataVer = $this->moduleResource->getDataVersion($resourceName);
         $module = $this->moduleList->getOne($moduleName);
         $configVer = $module['schema_version'];
         $dataVer = $dataVer ?: 'none';
         return [
-            self::ERROR_KEY_CURRENT => $dataVer,
-            self::ERROR_KEY_REQUIRED => $configVer,
-            self::ERROR_KEY_MODULE => $moduleName,
-            self::ERROR_KEY_TYPE => 'data'
+            self::KEY_CURRENT => $dataVer,
+            self::KEY_REQUIRED => $configVer,
+            self::KEY_MODULE => $moduleName,
+            self::KEY_TYPE => 'data'
         ];
     }
 
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index 48e1823573884..2c9ea26da0d52 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -10,7 +10,7 @@
 namespace Magento\Framework\Module\Plugin;
 
 use Magento\Framework\Cache\FrontendInterface;
-use Magento\Framework\Module\DbVersionDetector;
+use Magento\Framework\Module\DbVersionInfo;
 
 class DbStatusValidator
 {
@@ -20,20 +20,20 @@ class DbStatusValidator
     private $cache;
 
     /**
-     * @var DbVersionDetector
+     * @var DbVersionInfo
      */
-    private $dbVersionDetector;
+    private $dbVersionInfo;
 
     /**
      * @param FrontendInterface $cache
-     * @param DbVersionDetector $dbVersionDetector
+     * @param DbVersionInfo $dbVersionInfo
      */
     public function __construct(
         FrontendInterface $cache,
-        DbVersionDetector $dbVersionDetector
+        DbVersionInfo $dbVersionInfo
     ) {
         $this->cache = $cache;
-        $this->dbVersionDetector = $dbVersionDetector;
+        $this->dbVersionInfo = $dbVersionInfo;
     }
 
     /**
@@ -51,13 +51,12 @@ public function aroundDispatch(
         \Magento\Framework\App\RequestInterface $request
     ) {
         if (!$this->cache->load('db_is_up_to_date')) {
-            $errors = $this->dbVersionDetector->getDbVersionErrors();
+            $errors = $this->dbVersionInfo->getDbVersionErrors();
             if ($errors) {
                 $formattedErrors = $this->formatErrors($errors);
                 throw new \Magento\Framework\Module\Exception(
-                    'Please update your database: first run "composer install" from the Magento root/ '.
-                    'directory. Then run "php –f index.php update" from the Magento root/setup directory.'. PHP_EOL .
-                    'The following modules are outdated:' . PHP_EOL . implode(PHP_EOL, $formattedErrors)
+                    'Please update your database: Run "php –f index.php update" from the Magento root/setup directory.'
+                    . PHP_EOL . 'The following modules are outdated:' . PHP_EOL . implode(PHP_EOL, $formattedErrors)
                 );
             } else {
                 $this->cache->save('true', 'db_is_up_to_date');
@@ -76,10 +75,10 @@ private function formatErrors($errorsData)
     {
         $formattedErrors = [];
         foreach ($errorsData as $error) {
-            $formattedErrors[] = $error[DbVersionDetector::ERROR_KEY_MODULE] .
-                ' ' . $error[DbVersionDetector::ERROR_KEY_TYPE] .
-                ': current version - ' . $error[DbVersionDetector::ERROR_KEY_CURRENT ] .
-                ', required version - ' . $error[DbVersionDetector::ERROR_KEY_REQUIRED];
+            $formattedErrors[] = $error[DbVersionInfo::KEY_MODULE] .
+                ' ' . $error[DbVersionInfo::KEY_TYPE] .
+                ': current version - ' . $error[DbVersionInfo::KEY_CURRENT ] .
+                ', required version - ' . $error[DbVersionInfo::KEY_REQUIRED];
         }
         return $formattedErrors;
     }
diff --git a/lib/internal/Magento/Framework/Module/Updater.php b/lib/internal/Magento/Framework/Module/Updater.php
index a1e5924504d3e..16834161384d9 100644
--- a/lib/internal/Magento/Framework/Module/Updater.php
+++ b/lib/internal/Magento/Framework/Module/Updater.php
@@ -27,26 +27,26 @@ class Updater
     protected $_setupFactory;
 
     /**
-     * @var DbVersionDetector
+     * @var DbVersionInfo
      */
-    private $_dbVersionDetector;
+    private $_dbVersionInfo;
 
     /**
      * @param Updater\SetupFactory $setupFactory
      * @param ModuleListInterface $moduleList
      * @param ResourceResolverInterface $resourceResolver
-     * @param DbVersionDetector $dbVersionDetector
+     * @param DbVersionInfo $dbVersionInfo
      */
     public function __construct(
         Updater\SetupFactory $setupFactory,
         ModuleListInterface $moduleList,
         ResourceResolverInterface $resourceResolver,
-        DbVersionDetector $dbVersionDetector
+        DbVersionInfo $dbVersionInfo
     ) {
         $this->_moduleList = $moduleList;
         $this->_resourceResolver = $resourceResolver;
         $this->_setupFactory = $setupFactory;
-        $this->_dbVersionDetector = $dbVersionDetector;
+        $this->_dbVersionInfo = $dbVersionInfo;
     }
 
     /**
@@ -58,7 +58,7 @@ public function updateData()
     {
         foreach ($this->_moduleList->getNames() as $moduleName) {
             foreach ($this->_resourceResolver->getResourceList($moduleName) as $resourceName) {
-                if (!$this->_dbVersionDetector->isDbDataUpToDate($moduleName, $resourceName)) {
+                if (!$this->_dbVersionInfo->isDataUpToDate($moduleName, $resourceName)) {
                     $this->_setupFactory->create($resourceName, $moduleName)->applyDataUpdates();
                 }
             }

From 5abd9199943b1c9c7f3bda573a655359118b87dc Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Tue, 9 Dec 2014 20:23:08 -0600
Subject: [PATCH 185/474] MAGETWO-31413: Mainline Contribution of Install Bug
 Fixes

- return back Sample Data installation tool
- commit updated composer.lock
---
 composer.lock                                 |   2 +-
 .../Magento/Tools/SampleData/Installer.php    | 107 +++++++++++++++++
 .../Magento/Tools/SampleData/InstallerApp.php | 111 ++++++++++++++++++
 .../Magento/Tools/SampleData/install.php      |  33 ++++++
 .../Magento/Setup/src/Model/SampleData.php    |  58 +--------
 5 files changed, 257 insertions(+), 54 deletions(-)
 create mode 100644 dev/tools/Magento/Tools/SampleData/Installer.php
 create mode 100644 dev/tools/Magento/Tools/SampleData/InstallerApp.php
 create mode 100644 dev/tools/Magento/Tools/SampleData/install.php

diff --git a/composer.lock b/composer.lock
index 07c3595818715..951361eea7e55 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "932d63c52096905e5e772fb4585b9f52",
+    "hash": "613dae677441efb6b7c636523f1cd5be",
     "packages": [
         {
             "name": "composer/composer",
diff --git a/dev/tools/Magento/Tools/SampleData/Installer.php b/dev/tools/Magento/Tools/SampleData/Installer.php
new file mode 100644
index 0000000000000..81916fef141a8
--- /dev/null
+++ b/dev/tools/Magento/Tools/SampleData/Installer.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Tools\SampleData;
+
+/**
+ * Model for installation Sample Data
+ */
+class Installer {
+    /**
+     * @var Helper\Deploy
+     */
+    private $deploy;
+
+    /**
+     * @var \Magento\Framework\Module\ModuleListInterface
+     */
+    private $moduleList;
+
+    /**
+     * @var SetupFactory
+     */
+    private $setupFactory;
+
+    /**
+     * @var Helper\PostInstaller
+     */
+    private $postInstaller;
+
+    /**
+     * @var \Magento\Backend\Model\Auth\Session
+     */
+    private $session;
+
+    /**
+     * Constructor
+     *
+     * @param \Magento\Framework\Module\ModuleListInterface $moduleList
+     * @param Helper\Deploy $deploy
+     * @param SetupFactory $setupFactory
+     * @param Helper\PostInstaller $postInstaller
+     * @param \Magento\Backend\Model\Auth\Session $session
+     */
+    public function __construct(
+        \Magento\Framework\Module\ModuleListInterface $moduleList,
+        \Magento\Tools\SampleData\Helper\Deploy $deploy,
+        \Magento\Tools\SampleData\SetupFactory $setupFactory,
+        \Magento\Tools\SampleData\Helper\PostInstaller $postInstaller,
+        \Magento\Backend\Model\Auth\Session $session
+    ) {
+        $this->deploy = $deploy;
+        $this->moduleList = $moduleList;
+        $this->setupFactory = $setupFactory;
+        $this->postInstaller = $postInstaller;
+        $this->session = $session;
+    }
+
+    /**
+     * Run installation in context of the specified admin user
+     *
+     * @param \Magento\User\Model\User $adminUser
+     * @throws \Exception
+     */
+    public function run(\Magento\User\Model\User $adminUser)
+    {
+        if (!$adminUser || !$adminUser->getId()) {
+            throw new \Exception('Invalid admin user provided');
+        }
+        $this->session->setUser($adminUser);
+
+        $this->deploy->run();
+
+        $resources = $this->initResources();
+        foreach ($this->moduleList->getNames() as $moduleName) {
+            if (isset($resources[$moduleName])) {
+                $resourceType = $resources[$moduleName];
+                $this->setupFactory->create($resourceType)->run();
+                $this->postInstaller->addModule($moduleName);
+            }
+        }
+
+        $this->session->unsUser();
+        $this->postInstaller->run();
+    }
+
+    /**
+     * Init resources
+     *
+     * @return array
+     */
+    private function initResources()
+    {
+        $config = [];
+        foreach (glob(__DIR__ . '/config/*.php') as $filename) {
+            if (is_file($filename)) {
+                $configPart = include $filename;
+                $config = array_merge_recursive($config, $configPart);
+            }
+        }
+        return isset($config['setup_resources']) ? $config['setup_resources'] : [];
+    }
+}
diff --git a/dev/tools/Magento/Tools/SampleData/InstallerApp.php b/dev/tools/Magento/Tools/SampleData/InstallerApp.php
new file mode 100644
index 0000000000000..da665fc33477c
--- /dev/null
+++ b/dev/tools/Magento/Tools/SampleData/InstallerApp.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright {copyright}
+ * @license {license_link}
+ */
+namespace Magento\Tools\SampleData;
+
+use Magento\Framework\App\State;
+use Magento\Framework\Event;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\ObjectManager\ConfigLoader;
+use Magento\Framework\App\Bootstrap;
+use Magento\Framework\App\Console;
+
+/**
+ * Sample data installation application
+ */
+class InstallerApp implements \Magento\Framework\AppInterface
+{
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ConfigLoader
+     */
+    private $configLoader;
+
+    /**
+     * @var Console\Response
+     */
+    private $response;
+
+    /**
+     * @var Installer
+     */
+    private $installer;
+
+    /**
+     * @var \Magento\User\Model\UserFactory
+     */
+    private $userFactory;
+
+    /**
+     * @var string
+     */
+    private $adminUserName;
+
+    /**
+     * Construct
+     *
+     * @param State $appState
+     * @param Installer $installer
+     * @param ObjectManagerInterface $objectManager
+     * @param ConfigLoader $configLoader
+     * @param Console\Response $response
+     * @param \Magento\User\Model\UserFactory $userFactory
+     * @param array $data
+     */
+    public function __construct(
+        State $appState,
+        Installer $installer,
+        ObjectManagerInterface $objectManager,
+        ConfigLoader $configLoader,
+        Console\Response $response,
+        \Magento\User\Model\UserFactory $userFactory,
+        array $data = []
+    ) {
+        $this->appState = $appState;
+        $this->objectManager = $objectManager;
+        $this->configLoader = $configLoader;
+        $this->response = $response;
+        $this->installer = $installer;
+        $this->userFactory = $userFactory;
+        $this->adminUserName = isset($data['admin_username']) ? $data['admin_username'] : '';
+    }
+
+    /**
+     * {@inheritdoc}
+     **/
+    public function launch()
+    {
+        $areaCode = 'adminhtml';
+        $this->appState->setAreaCode($areaCode);
+        $this->objectManager->configure($this->configLoader->load($areaCode));
+        /** @var \Magento\Tools\SampleData\Logger $sampleDataLogger */
+        $sampleDataLogger = $this->objectManager->get('Magento\Tools\SampleData\Logger');
+        $sampleDataLogger->setSubject($this->objectManager->get('Magento\Setup\Model\ConsoleLogger'));
+
+        $this->installer->run($this->userFactory->create()->loadByUsername($this->adminUserName));
+
+        return $this->response;
+    }
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     **/
+    public function catchException(Bootstrap $bootstrap, \Exception $exception)
+    {
+        return false;
+    }
+}
diff --git a/dev/tools/Magento/Tools/SampleData/install.php b/dev/tools/Magento/Tools/SampleData/install.php
new file mode 100644
index 0000000000000..697d9fb499948
--- /dev/null
+++ b/dev/tools/Magento/Tools/SampleData/install.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+use \Magento\Framework\App\State;
+use \Magento\Framework\App\Bootstrap;
+use \Magento\Framework\Shell\ComplexParameter;
+
+require_once __DIR__ . '/../../../../../app/bootstrap.php';
+
+$usage = 'Usage: php -f install.php -- --admin_username= [--bootstrap=]
+    --admin_username - store\'s admin username. Required for installation.
+    [--bootstrap] - add or override parameters of the bootstrap' . PHP_EOL;
+
+
+$data = getopt('', ['admin_username:', 'bootstrap::']);
+if (!isset($data['admin_username']) || empty($data['admin_username'])) {
+    echo $usage;
+    exit(1);
+}
+
+$bootstrapParam = new ComplexParameter('bootstrap');
+$params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
+$params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
+$params[State::PARAM_MODE] = State::MODE_DEVELOPER;
+
+$bootstrap = Bootstrap::create(BP, $params);
+$app = $bootstrap->createApplication('Magento\Tools\SampleData\InstallerApp', ['data' => $data]);
+$bootstrap->run($app);
diff --git a/setup/module/Magento/Setup/src/Model/SampleData.php b/setup/module/Magento/Setup/src/Model/SampleData.php
index 2bc76b4b063ee..acf3a436f8773 100644
--- a/setup/module/Magento/Setup/src/Model/SampleData.php
+++ b/setup/module/Magento/Setup/src/Model/SampleData.php
@@ -61,16 +61,6 @@ public function install(ObjectManagerInterface $objectManager, LoggerInterface $
         $sampleDataLogger = $objectManager->get('Magento\Tools\SampleData\Logger');
         $sampleDataLogger->setSubject($logger);
 
-        /** @var \Magento\User\Model\UserFactory $userFactory */
-        $userFactory = $objectManager->get('Magento\User\Model\UserFactory');
-        $user = $userFactory->create()->loadByUsername($adminUserName);
-        if (!$user || !$user->getId()) {
-            throw new \Exception('Invalid username provided');
-        }
-        /** @var \Magento\Backend\Model\Auth\Session $session */
-        $session = $objectManager->get('Magento\Backend\Model\Auth\Session');
-        $session->setUser($user);
-
         $areaCode = 'adminhtml';
         /** @var \Magento\Framework\App\State $appState */
         $appState = $objectManager->get('Magento\Framework\App\State');
@@ -79,49 +69,11 @@ public function install(ObjectManagerInterface $objectManager, LoggerInterface $
         $configLoader = $objectManager->get('Magento\Framework\App\ObjectManager\ConfigLoader');
         $objectManager->configure($configLoader->load($areaCode));
 
-        /** @var \Magento\Tools\SampleData\Helper\Deploy $helper */
-        $helper = $objectManager->get('Magento\Tools\SampleData\Helper\Deploy');
-        $helper->run();
-
-        /** @var \Magento\Framework\Module\ModuleListInterface $moduleList */
-        $moduleList = $objectManager->get('Magento\Framework\Module\ModuleListInterface');
-
-        /** @var \Magento\Tools\SampleData\SetupFactory $setupFactory */
-        $setupFactory = $objectManager->get('Magento\Tools\SampleData\SetupFactory');
-
-        /** @var \Magento\Tools\SampleData\Helper\PostInstaller $postInstaller */
-        $postInstaller = $objectManager->get('Magento\Tools\SampleData\Helper\PostInstaller');
-
-        $resources = $this->getSetupResourceModels();
-        foreach ($moduleList->getNames() as $moduleName) {
-            if (isset($resources[$moduleName])) {
-                $class = $resources[$moduleName];
-                $setupFactory->create($class)->run();
-                $postInstaller->addModule($moduleName);
-            }
-        }
-
-        $session->unsUser();
-
-        /** @var \Magento\Tools\SampleData\Helper\PostInstaller $postInstaller */
-        $postInstaller = $objectManager->get('Magento\Tools\SampleData\Helper\PostInstaller');
-        $postInstaller->run();
-    }
+        /** @var \Magento\User\Model\UserFactory $userFactory */
+        $userFactory = $objectManager->get('Magento\User\Model\UserFactory');
+        $user = $userFactory->create()->loadByUsername($adminUserName);
 
-    /**
-     * Determines which resource models to run during setup
-     *
-     * @return array
-     */
-    private function getSetupResourceModels()
-    {
-        $config = [];
-        foreach ($this->rootDir->search(self::PATH . '/config/*.php') as $filename) {
-            if ($this->rootDir->isFile($filename)) {
-                $configPart = include $this->rootDir->getAbsolutePath($filename);
-                $config = array_merge_recursive($config, $configPart);
-            }
-        }
-        return isset($config['setup_resources']) ? $config['setup_resources'] : [];
+        $installer = $objectManager->get('Magento\Tools\SampleData\Installer');
+        $installer->run($user);
     }
 }

From 212b5f0f60d541b9e8a25305ad4a08d9629ba170 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 10 Dec 2014 01:00:33 -0600
Subject: [PATCH 186/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- fixed install bug where install fails when config.php doesn't exist
---
 lib/internal/Magento/Framework/App/DeploymentConfig.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index a041801b698cd..852a2bebf60f6 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -88,6 +88,7 @@ public function get($key = null, $defaultValue = null)
      */
     public function isAvailable()
     {
+        $this->data = null;
         $this->load();
         return $this->isAvailable;
     }

From fcc19a4b5fac17fdab9c8ba4f7a6d898921ebbfe Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Tue, 9 Dec 2014 19:15:46 +0200
Subject: [PATCH 187/474] MTA-1127: Update build.xml file for installation plan

---
 dev/build/core_dev/functional/build.xml       | 24 +++++++++-----
 dev/build/core_dev/functional/phpunit.xml     |  1 +
 .../functional/lib/Mtf/App/State/State1.php   |  6 ++--
 dev/tests/functional/phpunit.xml.dist         | 17 ++++++++--
 .../Customer/Test/Block/Form/CustomerForm.php |  2 +-
 .../Constraint/AssertAgreementTextPresent.php | 11 +++----
 .../Constraint/AssertCurrencySelected.php     | 31 ++++---------------
 .../Test/Constraint/AssertKeyCreated.php      | 31 ++++---------------
 .../Constraint/AssertLanguageSelected.php     | 31 ++++---------------
 .../Test/Constraint/AssertRewritesEnabled.php | 31 ++++---------------
 .../Constraint/AssertSecureUrlEnabled.php     | 31 ++++---------------
 .../Constraint/AssertSuccessDbConnection.php  | 11 +++----
 .../Test/Constraint/AssertSuccessInstall.php  |  9 ++----
 .../AssertSuccessfulReadinessCheck.php        | 11 +++----
 .../Magento/Install/Test/Fixture/Install.php  | 22 ++-----------
 .../Magento/Install/Test/etc/constraint.xml   | 18 +++++------
 .../InjectableTests/installation.xml          | 17 ++++++++++
 17 files changed, 111 insertions(+), 193 deletions(-)
 create mode 100644 dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml

diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index e8c2e9b453477..ee070c5ade53c 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -203,10 +203,6 @@
             <replacefilter token="{{secure_url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}"/>
         </replace>
 
-        <condition property="env.bamboo_tests_configuration" value="basic">
-            <not><isset property="env.bamboo_tests_configuration"/></not>
-        </condition>
-
         <replace file="${dir.build_directory}/instance-${instanceIndex}/dev/tests/functional/config/server.yml.dist">
             <replacefilter token="{{selenium_host}}" value="${env.selenium_host}"/>
             <replacefilter token="{{selenium_port}}" value="${env.selenium_port}"/>
@@ -214,10 +210,18 @@
             <replacefilter token="{{selenium_browser}}" value="${env.selenium_browser}"/>
         </replace>
 
+        <condition property="env.bamboo_tests_configuration" value="basic">
+            <not><isset property="env.bamboo_tests_configuration"/></not>
+        </condition>
+        <condition property="env.bamboo_module_whitelist" value="">
+            <not><isset property="env.bamboo_module_whitelist"/></not>
+        </condition>
+
         <replace file="${dir.build_directory}/instance-${instanceIndex}/dev/tests/functional/phpunit.xml">
-            <replacefilter token="{{admin_url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}/backend/"/>
-            <replacefilter token="{{url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}"/>
+            <replacefilter token="{{admin_url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}/backend/" />
+            <replacefilter token="{{url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}" />
             <replacefilter token="{{tests_configuration}}" value="${env.bamboo_tests_configuration}" />
+            <replacefilter token="{{module_whitelist}}" value="${env.bamboo_module_whitelist}" />
         </replace>
 
         <replace file="${dir.build_directory}/instance-${instanceIndex}/dev/tests/functional/config/install_data.yml.dist">
@@ -230,7 +234,7 @@
 
         <script language="javascript"><![CDATA[
             var currentInstance = project.getProperty('instanceIndex');
-            if (currentInstance > 0) {
+            if (currentInstance > 0 && project.getProperty('env.bamboo_is_magento_installed') == 1) {
                 self.project.executeTarget('_import_mysql_dump');
                 self.project.executeTarget('_copy_config_php');
                 self.project.executeTarget('_update_db');
@@ -280,9 +284,13 @@
             <param name="target_composer_dir" value="${basedir}/dev/tests/functional"/>
         </antcall>
 
+        <condition property="env.bamboo_is_magento_installed" value="1">
+            <not><isset property="env.bamboo_is_magento_installed"/></not>
+        </condition>
+
         <script language="javascript"><![CDATA[
             var currentInstance = project.getProperty('instanceIndex');
-            if (currentInstance == 0) {
+            if (currentInstance == 0 && project.getProperty('env.bamboo_is_magento_installed') == 1) {
                 self.project.executeTarget( '_install_standalone_application' );
             }
         ]]></script>
diff --git a/dev/build/core_dev/functional/phpunit.xml b/dev/build/core_dev/functional/phpunit.xml
index 255b0cdf21a30..1e8a17f23335a 100644
--- a/dev/build/core_dev/functional/phpunit.xml
+++ b/dev/build/core_dev/functional/phpunit.xml
@@ -40,6 +40,7 @@
         <env name="configuration:Mtf/TestSuite/InjectableTests" value="{{tests_configuration}}"/>
         <env name="log_directory" value="var/log"/>
         <env name="events_preset" value="base"/>
+        <env name="module_whitelist" value="{{module_whitelist}}" />
         <!--{{parallel_instances}}-->
     </php>
 
diff --git a/dev/tests/functional/lib/Mtf/App/State/State1.php b/dev/tests/functional/lib/Mtf/App/State/State1.php
index 0cd5d1ed4f4fb..56d71eebc46e8 100644
--- a/dev/tests/functional/lib/Mtf/App/State/State1.php
+++ b/dev/tests/functional/lib/Mtf/App/State/State1.php
@@ -38,8 +38,10 @@ public function __construct(Config $config)
     public function apply()
     {
         parent::apply();
-        $this->config->switchData('app_state1_configuration');
-        $this->config->persist();
+        if (file_exists(dirname(dirname(dirname(MTF_BP))) . '/app/etc/config.php')) {
+            $this->config->switchData('app_state1_configuration');
+            $this->config->persist();
+        }
     }
 
     /**
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index f181ed3cca1d4..a340a8a096d09 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -24,13 +24,14 @@
         <listener class="Mtf\System\Browser\Listener" />
         <listener class="Mtf\System\Isolation\Listener">
             <arguments>
-                <object class="Mtf\System\Isolation\Driver\Base"/>
+                <object class="Mtf\System\Isolation\Driver\Base" />
             </arguments>
         </listener>
-        <listener class="Mtf\System\Event\StateListener"/>
+        <listener class="Mtf\System\Event\StateListener" />
     </listeners>
 
     <php>
+<<<<<<< Updated upstream
         <env name="app_frontend_url" value="http://localhost/index.php/"/>
         <env name="app_backend_url" value="http://localhost/index.php/backend/"/>
         <env name="app_config_path" value="config/application.yml.dist"/>
@@ -41,6 +42,18 @@
         <env name="configuration:Mtf/TestSuite/InjectableTests" value="basic"/>
         <env name="log_directory" value="var/log"/>
         <env name="events_preset" value="base"/>
+=======
+        <env name="app_frontend_url" value="http://localhost/index.php/" />
+        <env name="app_backend_url" value="http://localhost/index.php/backend/" />
+        <env name="app_config_path" value="config/application.yml.dist" />
+        <env name="server_config_path" value="config/server.yml.dist" />
+        <env name="isolation_config_path" value="config/isolation.yml.dist" />
+        <env name="handlers_config_path" value="config/handler.yml.dist" />
+        <env name="configuration:Mtf/TestSuite/InjectableTests" value="basic" />
+        <env name="log_directory" value="var/log" />
+        <env name="events_preset" value="base" />
+        <env name="module_whitelist" value="Magento_Install" />
+>>>>>>> Stashed changes
     </php>
 
 </phpunit>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
index fe20e4ec2d07c..3a8f5d9ee3ebe 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
@@ -56,7 +56,7 @@ public function submit()
     public function getValidationMessages(CustomerInjectable $customer)
     {
         $messages = [];
-        foreach(array_keys($customer->getData()) as $field) {
+        foreach (array_keys($customer->getData()) as $field) {
             $element = $this->_rootElement->find(sprintf($this->validationText, str_replace('_', '-', $field)));
             if ($element->isVisible()) {
                 $messages[$field] = $element->getText();
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
index 1833d86fc85bc..4afb503373024 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
@@ -16,18 +16,15 @@
  */
 class AssertAgreementTextPresent extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Part of license agreement text.
      */
     const LICENSE_AGREEMENT_TEXT = 'Open Software License ("OSL") v. 3.0';
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that part of license agreement text is present on Terms & Agreement page.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
index 610b7c004b4dd..5636a6871aca7 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
@@ -1,25 +1,9 @@
 <?php
 /**
- * Magento
+ * {license_notice}
  *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @copyright   {copyright}
+ * @license     {license_link}
  */
 
 namespace Magento\Install\Test\Constraint;
@@ -32,12 +16,9 @@
  */
 class AssertCurrencySelected extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that selected currency symbol displays on dashboard.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
index de68ee0c9bc96..b83924058a1ca 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
@@ -1,25 +1,9 @@
 <?php
 /**
- * Magento
+ * {license_notice}
  *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @copyright   {copyright}
+ * @license     {license_link}
  */
 
 namespace Magento\Install\Test\Constraint;
@@ -33,12 +17,9 @@
  */
 class AssertKeyCreated extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that selected encryption key displays on success full install page.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
index 4708ddf9d4621..2c17cb6115f49 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
@@ -1,25 +1,9 @@
 <?php
 /**
- * Magento
+ * {license_notice}
  *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @copyright   {copyright}
+ * @license     {license_link}
  */
 
 namespace Magento\Install\Test\Constraint;
@@ -32,12 +16,9 @@
  */
 class AssertLanguageSelected extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that selected language currently displays on frontend.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
index 74d337e478819..3e1d152c20913 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
@@ -1,25 +1,9 @@
 <?php
 /**
- * Magento
+ * {license_notice}
  *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @copyright   {copyright}
+ * @license     {license_link}
  */
 
 namespace Magento\Install\Test\Constraint;
@@ -32,12 +16,9 @@
  */
 class AssertRewritesEnabled extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that apache redirect correct work.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
index 2130de4307ca5..fb9cb8b23f9e7 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
@@ -1,25 +1,9 @@
 <?php
 /**
- * Magento
+ * {license_notice}
  *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @copyright   {copyright}
+ * @license     {license_link}
  */
 
 namespace Magento\Install\Test\Constraint;
@@ -35,12 +19,9 @@
  */
 class AssertSecureUrlEnabled extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
 
     /**
      * Assert that Secure Urls Enabled.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php
index de0997077afee..14a7530824cc7 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php
@@ -16,18 +16,15 @@
  */
 class AssertSuccessDbConnection extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
     /**
      * Successful connection message.
      */
     const SUCCESSFUL_CONNECTION = 'Test connection successful.';
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'low';
-
     /**
      * Assert that system can successfully connect to DB.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
index 53409ab41fd6a..7cb82fe4f553d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
@@ -18,12 +18,9 @@
  */
 class AssertSuccessInstall extends AbstractConstraint
 {
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
 
     /**
      * Admin info fields mapping.
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
index 41a9888407c7a..46e302fa3e9b2 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
@@ -16,6 +16,10 @@
  */
 class AssertSuccessfulReadinessCheck extends AbstractConstraint
 {
+    /* tags */
+    const SEVERITY = 'high';
+    /* end tags */
+
     /**
      * PHP version message.
      */
@@ -31,13 +35,6 @@ class AssertSuccessfulReadinessCheck extends AbstractConstraint
      */
     const FILE_PERMISSION_MESSAGE = 'You meet 4 out of 4 writable file permission requirements.';
 
-    /**
-     * Constraint severeness.
-     *
-     * @var string
-     */
-    protected $severeness = 'high';
-
     /**
      * Assert that PHP Version, PHP Extensions and File Permission are ok.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
index 89b45788fd2c6..213887520373e 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
@@ -1,25 +1,9 @@
 <?php
 /**
- * Magento
+ * {license_notice}
  *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @copyright   {copyright}
+ * @license     {license_link}
  */
 
 namespace Magento\Install\Test\Fixture;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
index 7d25c97d8584d..ac34e139034a0 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
@@ -9,30 +9,30 @@
 -->
 <constraint>
     <assertAgreementTextPresent module="Magento_Install">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertAgreementTextPresent>
     <assertSuccessDbConnection module="Magento_Install">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSuccessDbConnection>
     <assertSuccessfulReadinessCheck module="Magento_Install">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSuccessfulReadinessCheck>
     <assertSuccessInstall module="Magento_Install">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSuccessInstall>
     <assertKeyCreated module="Magento_Install">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertKeyCreated>
     <assertLanguageSelected module="Magento_Install">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertLanguageSelected>
     <assertCurrencySelected module="Magento_Install">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertCurrencySelected>
     <assertRewritesEnabled module="Magento_Install">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertRewritesEnabled>
     <assertSecureUrlEnabled module="Magento_Install">
-        <severeness>low</severeness>
+        <severity>low</severity>
     </assertSecureUrlEnabled>
 </constraint>
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml b/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml
new file mode 100644
index 0000000000000..5f8e879e73209
--- /dev/null
+++ b/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../vendor/magento/mtf/Mtf/TestRunner/etc/testRunner.xsd">
+    <rule scope="testsuite">
+        <allow>
+            <module value="Magento_Install"/>
+        </allow>
+    </rule>
+</config>

From 894abc853d86d113f8d138e8241449c7acea04b4 Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Wed, 10 Dec 2014 10:45:02 +0200
Subject: [PATCH 188/474] MAGETWO-31513: Custom Customer & Customer Address
 attributes of Multiple Select type are present on "Create / Edit Customer"
 backend form

- fix date field mapping
---
 .../Ui/DataProvider/Config/Converter.php      |  2 +-
 .../view/base/web/js/form/element/abstract.js | 22 ++++++++++++++-----
 .../base/web/js/form/element/multiselect.js   |  6 +++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Ui/DataProvider/Config/Converter.php b/app/code/Magento/Ui/DataProvider/Config/Converter.php
index be344324e8b82..d660becbc8d18 100644
--- a/app/code/Magento/Ui/DataProvider/Config/Converter.php
+++ b/app/code/Magento/Ui/DataProvider/Config/Converter.php
@@ -29,7 +29,7 @@ class Converter implements ConverterInterface
         'text' => 'input',
         'textarea' => 'textarea',
         'multiline' => 'input',
-        'date' => 'input',
+        'date' => 'date',
         'select' => 'select',
         'multiselect' => 'multiselect',
         'boolean' => 'select',
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
index b3cac18588b2e..fa6da02de56a9 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -32,6 +32,17 @@ define([
 
     var __super__ = Component.prototype;
 
+    /**
+     * Checks wether the incoming value is not empty,
+     * e.g. not 'null' or 'undefined'
+     *
+     * @param {*} value - Value to check.
+     * @returns {Boolean}
+     */
+    function isEmpty(value){
+        return _.isUndefined(value) || _.isNull(value);
+    }
+
     return Component.extend({
 
         /**
@@ -120,13 +131,14 @@ define([
          */
         getInititalValue: function(){
             var data    = this.provider.data,
-                value   = data.get(this.dataScope);
+                values  = [data.get(this.dataScope), this.default],
+                value;
 
-            if(_.isUndefined(value) || _.isNull(value)){
-                value = '';
-            }
+            values.some(function(v){
+                return !isEmpty(value = v);
+            });
 
-            return value;
+            return isEmpty(value) ? '': value;
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js b/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
index e76556b9a4c5f..10ace68f570e0 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
@@ -29,6 +29,12 @@ define([
             __super__.initialize.apply(this, arguments);
         },
 
+        getInititalValue: function(){
+            var value = __super__.getInititalValue.apply(this, arguments);
+
+            return _.isString(value) ? value.split(',') : value;
+        },
+
         /**
          * Defines if value has changed
          * @return {Boolean}

From f1b9a9cffb81ca9a6ee8d65de6e6c67237b2cada Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Wed, 10 Dec 2014 11:05:18 +0200
Subject: [PATCH 189/474] MAGETWO-31574: Exception on Manage Shopping Cart from
 Customer page in backend

---
 .../Controller/Adminhtml/Index.php            | 21 +++++++++++++++----
 .../Controller/Adminhtml/Index/LoadBlock.php  |  4 +++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index.php b/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index.php
index 6c17e9d2e1981..a545cfba372a8 100644
--- a/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index.php
@@ -33,13 +33,25 @@ class Index extends \Magento\Backend\App\Action
     protected $_registry = null;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
+     * Customer builder
+     *
+     * @var \Magento\Customer\Api\Data\CustomerDataBuilder
+     */
+    protected $customerBuilder;
+
+    /**
+     * @param Action\Context $context
      * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder
      */
-    public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $registry)
-    {
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder
+    ) {
         parent::__construct($context);
         $this->_registry = $registry;
+        $this->customerBuilder = $customerBuilder;
     }
 
     /**
@@ -144,7 +156,8 @@ protected function _initData($useRedirects = true)
         } else {
             // customer and addresses should be set to resolve situation when no quote was saved for customer previously
             // otherwise quote would be saved with customer_id = null and zero totals
-            $quote->setStore($storeManager->getStore($storeId))->setCustomer($customer);
+            $customerDataObject = $this->customerBuilder->populateWithArray($customer->getData())->create();
+            $quote->setStore($storeManager->getStore($storeId))->setCustomer($customerDataObject);
             $quote->getBillingAddress();
             $quote->getShippingAddress();
             $this->_objectManager->get('Magento\Sales\Model\QuoteRepository')->save($quote);
diff --git a/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index/LoadBlock.php b/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index/LoadBlock.php
index 59d0bb76e3bb0..e542b18da582a 100644
--- a/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index/LoadBlock.php
+++ b/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index/LoadBlock.php
@@ -21,14 +21,16 @@ class LoadBlock extends \Magento\AdvancedCheckout\Controller\Adminhtml\Index
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $registry,
+        \Magento\Customer\Api\Data\CustomerDataBuilder $customerBuilder,
         \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
     ) {
-        parent::__construct($context, $registry);
+        parent::__construct($context, $registry, $customerBuilder);
         $this->resultLayoutFactory = $resultLayoutFactory;
     }
 

From 2e8def716c5f0b4557b2722b9f27fea8ab13f51c Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Wed, 10 Dec 2014 11:35:29 +0200
Subject: [PATCH 190/474] MAGETWO-31576: Unable to place Order within Authorize
 Direct Post with enabled terms and conditions

---
 .../Magento/Authorizenet/view/frontend/web/js/direct-post.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Authorizenet/view/frontend/web/js/direct-post.js b/app/code/Magento/Authorizenet/view/frontend/web/js/direct-post.js
index 149b614d80d39..2567f3574a454 100644
--- a/app/code/Magento/Authorizenet/view/frontend/web/js/direct-post.js
+++ b/app/code/Magento/Authorizenet/view/frontend/web/js/direct-post.js
@@ -27,7 +27,7 @@ define([
             hiddenFormTmpl: '<form target="${target}" action="${action}" method="POST" enctype="application/x-www-form-urlencoded" class="no-display">' +
                             '{{each(key, val) inputs}} <input value="${val}" name="${key}" type="hidden"> {{/each}}' +
                             '</form>',
-            reviewAgreementForm: '#checkout-agreements',
+            reviewAgreementForm: '#checkout-agreements form',
             cgiUrl: null,
             orderSaveUrl: null,
             controller: null

From 20b501d8f78447d2df105f32a588fb61fe0a6f56 Mon Sep 17 00:00:00 2001
From: Oleksandr Manchenko <omanchenko@ebay.com>
Date: Wed, 10 Dec 2014 11:38:05 +0200
Subject: [PATCH 191/474] MTA-1161: Update Magento to folloow new tagging
 mechanism

- Fixed read configuration of running
---
 .../functional/testsuites/Mtf/TestSuite/InjectableTests.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php b/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php
index 4dab01b079b31..78e4962d59c23 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php
+++ b/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests.php
@@ -98,10 +98,10 @@ private function initObjectManager()
             $configurationFileName = isset($_ENV['configuration:Mtf/TestSuite/InjectableTests'])
                 ? $_ENV['configuration:Mtf/TestSuite/InjectableTests']
                 : 'basic';
-            $confDirPath = __DIR__ . '/InjectableTests/';
+            $confFilePath = __DIR__ . '/InjectableTests/' . $configurationFileName . '.xml';
             /** @var \Mtf\TestRunner\Configuration $testRunnerConfiguration */
             $testRunnerConfiguration = $objectManagerFactory->getObjectManager()->get('\Mtf\TestRunner\Configuration');
-            $testRunnerConfiguration->load($confDirPath);
+            $testRunnerConfiguration->load($confFilePath);
             $testRunnerConfiguration->loadEnvConfig();
 
             $shared = ['Mtf\TestRunner\Configuration' => $testRunnerConfiguration];

From 896a6a7c3e0a0d20e2764c1a7c6547dd474659ff Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Wed, 10 Dec 2014 12:44:28 +0200
Subject: [PATCH 192/474] MAGETWO-30419: [GITHUB] CMS Router not routing
 correctly #683

---
 app/code/Magento/Core/App/Router/Base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Core/App/Router/Base.php b/app/code/Magento/Core/App/Router/Base.php
index 85db1c102ea4b..1a3506bbfb20d 100644
--- a/app/code/Magento/Core/App/Router/Base.php
+++ b/app/code/Magento/Core/App/Router/Base.php
@@ -281,7 +281,6 @@ protected function matchAction(\Magento\Framework\App\RequestInterface $request,
         $action = null;
         $actionInstance = null;
 
-        $request->setRouteName($this->_routeConfig->getRouteByFrontName($moduleFrontName));
         $actionPath = $this->matchActionPath($request, $params['actionPath']);
         $action = $request->getActionName() ?: ($params['actionName'] ?: $this->_defaultPath->getPart('action'));
         $this->_checkShouldBeSecure($request, '/' . $moduleFrontName . '/' . $actionPath . '/' . $action);
@@ -311,6 +310,7 @@ protected function matchAction(\Magento\Framework\App\RequestInterface $request,
         $request->setControllerName($actionPath);
         $request->setActionName($action);
         $request->setControllerModule($currentModuleName);
+        $request->setRouteName($this->_routeConfig->getRouteByFrontName($moduleFrontName));
         if (isset($params['variables'])) {
             $request->setParams($params['variables']);
         }

From 49022e86ceff720e4dd700e7854a4cf5f3e2419b Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 10 Dec 2014 13:41:12 +0200
Subject: [PATCH 193/474] MAGETWO-31337: Incorrect work of PayPal conflict
 resolution in backend

- fixed bug to M1 release state
---
 .../Adminhtml/System/Config/State.php         |  4 +--
 .../templates/system/config/edit.phtml        |  2 +-
 .../system/config/fieldset/location.phtml     | 28 ++++++++-----------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Config/State.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Config/State.php
index 1513fa5c414fd..4e89509874aa8 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Config/State.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Config/State.php
@@ -20,14 +20,14 @@ class State extends AbstractScopeConfig
      * @param \Magento\Backend\Model\Config\Structure $configStructure
      * @param \Magento\Backend\Controller\Adminhtml\System\ConfigSectionChecker $sectionChecker
      * @param \Magento\Backend\Model\Config $backendConfig
-     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRawFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Backend\Model\Config\Structure $configStructure,
         \Magento\Backend\Controller\Adminhtml\System\ConfigSectionChecker $sectionChecker,
         \Magento\Backend\Model\Config $backendConfig,
-        \Magento\Backend\Model\View\Result\RedirectFactory $resultRawFactory
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
     ) {
         parent::__construct($context, $configStructure, $sectionChecker, $backendConfig);
         $this->resultRawFactory = $resultRawFactory;
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/edit.phtml
index 690dca93a174f..ad595eb08d1f6 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/config/edit.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/config/edit.phtml
@@ -349,6 +349,6 @@ require([
 
     });
     
-    jQuery('body').trigger('adminConfigDefined');
+    jQuery(window).load(function(){jQuery('body').trigger('adminConfigDefined')})
 });
 </script>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
index ad18f6d2ef454..1d34d2591aa5b 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
@@ -26,9 +26,7 @@ require([
             "ecMissed": false,
             sharePayflowEnabling: function (enabler, isEvent) {
 
-                var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
-                    isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
-                var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
+                var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[0];
                 if (typeof ecPayflowEnabler == "undefined") {
                     return;
                 }
@@ -54,7 +52,7 @@ require([
 
                 var ecEnabler = $$(".paypal-ec-enabler")[0];
                 if (ecPayflowEnabler.value != enabler.value
-                    && (isEvent || enabler.value == 1 && !isPayflowLinkEnabled)
+                    && (isEvent || enabler.value == 1)
                 ) {
                     ecPayflowEnabler.value = enabler.value;
                     paypalConflictsObject.checklessEventAction(ecPayflowEnabler, true);
@@ -187,7 +185,7 @@ require([
                     if (conflict && !confirmationShowed && anotherEnabler.value == 1) {
                         if (isEvent) {
                             confirmationApproved = confirm(
-                                $.mage.__('There is already another PayPal solution enabled. Enable this solution instead?')
+                                jQuery.mage.__('There is already another PayPal solution enabled. Enable this solution instead?')
                             );
                         } else {
                             paypalConflictsObject.isConflict = true;
@@ -288,11 +286,9 @@ require([
         });
 
         // initially uncheck payflow
-        var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
-            isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
-        var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
+        var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[0];
         if (typeof ecPayflowEnabler != "undefined") {
-            if (ecPayflowEnabler.value == 1 && !isPayflowLinkEnabled) {
+            if (ecPayflowEnabler.value == 1) {
                 ecPayflowEnabler.value = 0;
                 fireEvent(ecPayflowEnabler, "change");
             }
@@ -317,14 +313,14 @@ require([
             paypalConflictsObject.toggleBmlEnabler(enablerElement);
         });
         if (paypalConflictsObject.isConflict || paypalConflictsObject.ecMissed) {
-            var notification = $.mage.__('The following error(s) occured:');
+            var notification = jQuery.mage.__('The following error(s) occured:');
             if (paypalConflictsObject.isConflict) {
-                notification += "\\n  " + $.mage.__('Some PayPal solutions conflict.');
+                notification += "\n  " + jQuery.mage.__('Some PayPal solutions conflict.');
             }
             if (paypalConflictsObject.ecMissed) {
-                notification += "\\n  " + $.mage.__('PayPal Express Checkout is not enabled.');
+                notification += "\n  " + jQuery.mage.__('PayPal Express Checkout is not enabled.');
             }
-            notification += "\\n" + $.mage.__('Please re-enable the previously enabled payment solutions.');
+            notification += "\n" + jQuery.mage.__('Please re-enable the previously enabled payment solutions.');
             setTimeout(function () {
                 alert(notification);
             }, 1);
@@ -332,7 +328,7 @@ require([
 
         $$(".requires").each(function (dependent) {
             var $dependent = $(dependent);
-            if ($dependent.hasClassName("paypal-ec-enabler") || $dependent.hasClassName("paypal-ec-payflow-enabler")) {
+            if ($dependent.hasClassName("paypal-ec-enabler")) {
                 $dependent.requiresObj.callback = function (required) {
                     if ($(required).hasClassName("paypal-enabler") && required.value == 0) {
                         $dependent.disable();
@@ -345,9 +341,7 @@ require([
         });
 
         configForm.on('afterValidate', function () {
-            var isPayflowLinkEnabled = !!$$(".paypal-payflowlink")[0],
-                isPayflowAdvancedEnabled = !!$$(".paypal-payflow-advanced")[0];
-            var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[+isPayflowLinkEnabled];
+            var ecPayflowEnabler = $$(".paypal-ec-payflow-enabler")[0];
             if (typeof ecPayflowEnabler == "undefined") {
                 return;
             }

From 741e480102e40d37109f09d18b531fb804b042b6 Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Wed, 10 Dec 2014 13:44:54 +0200
Subject: [PATCH 194/474] MTA-774: Stabilize Catalog module. Product Attributes

- Fix Product Attributes tests
---
 .../AddProductsToCartBySkuFromWidgetTest.php  |  1 +
 .../Adminhtml/Product/Attribute/Set/Main.php  |  3 +--
 .../AssertProductAttributeIsFilterable.php    | 24 +++++++++++++++----
 ...ssertProductTemplateGroupOnProductForm.php |  4 +++-
 .../CreateAttributeSetEntityTest.php          |  1 -
 .../CreateProductAttributeEntityTest.php      |  1 -
 .../testCreateProductAttribute.csv            |  2 +-
 .../UpdateAttributeSetTest.php                |  1 -
 .../UpdateProductAttributeEntityTest.php      |  1 -
 .../Types/Edit/GoogleShoppingForm.php         | 12 ++++------
 10 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php
index 412e2d889aa6d..68c2462f80272 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php
@@ -146,6 +146,7 @@ public function test(CustomerInjectable $customer, $products, array $orderOption
         $this->cmsIndex->open();
         $this->loginCustomer($customer);
         $this->cmsIndex->getLinksBlock()->openLink("My Account");
+        $this->customerAccountIndex->getAccountMenuBlock()->openMenuItem("Order by SKU");
         $this->customerAccountIndex->getOrderBySkuBlock()->fillForm($orderOptions);
         $this->customerAccountIndex->getOrderBySkuBlock()->addToCart();
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
index cee386f4f6fe2..cd42205b20bf2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -10,7 +10,6 @@
 
 use Mtf\Block\Block;
 use Mtf\Client\Element\Locator;
-use Mtf\ObjectManager;
 
 /**
  * Class Main
@@ -51,7 +50,7 @@ class Main extends Block
      *
      * @var string
      */
-    protected $noteBlock = 'p.note-block';
+    protected $noteBlock = '.attribute-set .title';
 
     /**
      * Move Attribute to Attribute Group
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
index 042fd99d4af46..4c30b26cbdb51 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsFilterable.php
@@ -8,13 +8,14 @@
 
 namespace Magento\Catalog\Test\Constraint;
 
+use Mtf\Fixture\FixtureFactory;
+use Mtf\Fixture\InjectableFixture;
+use Magento\Cms\Test\Page\CmsIndex;
+use Mtf\Constraint\AbstractConstraint;
 use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
 use Magento\Catalog\Test\Page\Category\CatalogCategoryView;
-use Magento\Cms\Test\Page\CmsIndex;
-use Mtf\Constraint\AbstractConstraint;
-use Mtf\Fixture\InjectableFixture;
 use Magento\Catalog\Test\Block\Adminhtml\Product\ProductForm;
 
 /**
@@ -38,6 +39,7 @@ class AssertProductAttributeIsFilterable extends AbstractConstraint
      * @param CmsIndex $cmsIndex
      * @param CatalogProductIndex $catalogProductIndex
      * @param CatalogProductEdit $catalogProductEdit
+     * @param FixtureFactory $fixtureFactory
      * @return void
      */
     public function processAssert(
@@ -46,8 +48,22 @@ public function processAssert(
         CatalogProductAttribute $attribute,
         CmsIndex $cmsIndex,
         CatalogProductIndex $catalogProductIndex,
-        CatalogProductEdit $catalogProductEdit
+        CatalogProductEdit $catalogProductEdit,
+        FixtureFactory $fixtureFactory
     ) {
+        $fixtureFactory->createByCode(
+            'catalogProductSimple',
+            [
+                'dataSet' => 'product_with_category_with_anchor',
+                'data' => [
+                    'category_ids' => [
+                        'presets' => null,
+                        'category' => $product->getDataFieldConfig('category_ids')['source']->getCategories()[0]
+                    ]
+                ],
+            ]
+        )->persist();
+
         $catalogProductIndex->open()->getProductGrid()->searchAndOpen(['sku' => $product->getSku()]);
         $productForm = $catalogProductEdit->getProductForm();
         $this->setDefaultAttributeValue($productForm, $attribute);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
index 0c087b8bbc411..5a2c4eb3c4ad0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Catalog\Test\Constraint;
 
+use Mtf\ObjectManager;
 use Mtf\Fixture\FixtureFactory;
 use Mtf\Constraint\AbstractConstraint;
 use Magento\Catalog\Test\Fixture\CatalogAttributeSet;
@@ -67,7 +68,8 @@ public function processAssert(
             ]
         );
         $productBlockForm->fill($productSimple);
-
+        $eventManager = ObjectManager::getInstance()->create('Mtf\System\Event\EventManager');
+        $eventManager->dispatchEvent(['exception'], ['Screenshot for searching button.']);
         \PHPUnit_Framework_Assert::assertTrue(
             $productEdit->getProductForm()->isTabVisible($attributeSet->getGroup()),
             "Product Group is absent on Product form tabs."
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
index 898d7aa9a86db..8876183d10179 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateAttributeSetEntityTest.php
@@ -80,7 +80,6 @@ public function testCreateAttributeSet(
         CatalogAttributeSet $attributeSet,
         CatalogProductAttribute $productAttribute
     ) {
-        $this->markTestIncomplete('CICD-1041');
         $productAttribute->persist();
 
         //Steps
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
index b43ce0e484113..1a9e6af219ae6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php
@@ -45,7 +45,6 @@ class CreateProductAttributeEntityTest extends Scenario
      */
     public function testCreateProductAttribute(CatalogProductAttribute $productAttribute)
     {
-        $this->markTestIncomplete('CICD-1041');
         $this->attribute = $productAttribute;
         $this->executeScenario();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
index 77e3f7cb0e801..7f074165faa27 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
@@ -5,6 +5,6 @@
 "custom_attribute_set";"Yes/No_Admin_%isolation%";"Yes/No";"-";"Yes";"attr_yesno_%isolation%";"Global";"-";"-";"-";"No";"-";"-";"Yes/No_Global";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm";""
 "custom_attribute_set";"Multiple_Select_Admin_%isolation%";"Multiple Select";"default";"No";"attr_multiselect_%isolation%";"Website";"-";"-";"-";"-";"Yes";"-";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch, assertAttributeSearchableByLabel, assertAttributeOptionsOnProductForm";""
 "custom_attribute_set";"Dropdown_Admin_%isolation%";"Dropdown";"default";"Yes";"attr_dropdown_%isolation%";"Global";"-";"-";"-";"-";"No";"Yes";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"Yes";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertAttributeSearchableByLabel, assertProductAttributeIsComparable, assertProductAttributeIsUsedInSortOnFrontend, assertProductAttributeIsFilterable, assertProductAttributeIsConfigurable, assertProductAttributeIsFilterableInSearch, assertAttributeOptionsOnProductForm";""
-"custom_attribute_set";"Price_Admin_%isolation%";"Price";"-";"No";"attr_price_%isolation%";"-";"1000";"-";"-";"-";"No";"-";"Price_StoreView";"Yes";"Yes";"No";"Filterable (with results)";"Yes";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertAttributeSearchableByLabel, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch";""
+"custom_attribute_set";"Price_Admin_%isolation%";"Price";"-";"No";"attr_price_%isolation%";"-";"1000";"-";"-";"-";"No";"-";"Price_StoreView";"Yes";"Yes";"No";"Filterable (with results)";"Yes";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertAttributeSearchableByLabel, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch";"Bug:MAGETWO-31560"
 "custom_attribute_set";"Fixed_Product_Tax_Admin_%isolation%";"Fixed Product Tax";"-";"-";"attr_fpt_code_%isolation%";"-";"-";"-";"-";"-";"-";"-";"Fixed_Product_Tax_Storeview";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm";""
 "custom_attribute_set";"Text_Field_Admin_%isolation%";"Text Field";"-";"Yes";"attr_textfield_%isolation%";"Store View";"default_value_text%isolation%";"-";"-";"-";"Yes";"-";"Area_Field%isolation%";"Yes";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeIsUnique";"Bug: MAGETWO-30474"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
index 33f7ed28456a6..c6ffa4fe99017 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateAttributeSetTest.php
@@ -78,7 +78,6 @@ public function test(
         CatalogAttributeSet $attributeSetOriginal,
         CatalogProductAttribute $productAttributeOriginal
     ) {
-        $this->markTestIncomplete('CICD-1041');
         // Precondition
         $attributeSetOriginal->persist();
         $productAttributeOriginal->persist();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
index fd53aa92feb0d..41510ab50e9c5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/UpdateProductAttributeEntityTest.php
@@ -53,7 +53,6 @@ public function testUpdateProductAttribute(
         CatalogProductAttributeIndex $attributeIndex,
         CatalogProductAttributeNew $attributeNew
     ) {
-        $this->markTestIncomplete('CICD-1041');
         //Precondition
         $productTemplate->persist();
         $productAttributeOriginal->persist();
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
index 9b972bd8c5c97..195a715a0a3f2 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
@@ -25,13 +25,6 @@ class GoogleShoppingForm extends Form
      */
     protected $attributeOptions = '//select[@id="gcontent_attribute_0_attribute"]//option';
 
-    /**
-     * Loading Mask locator
-     *
-     * @var string
-     */
-    protected $loadingMask = '//ancestor::body/div[@id="loading-mask"]';
-
     /**
      * Fill specified form data
      *
@@ -46,7 +39,10 @@ protected function _fill(array $fields, Element $element = null)
             $element = $this->getElement($context, $field);
             if ($this->mappingMode || ($element->isVisible() && !$element->isDisabled())) {
                 $element->setValue($field['value']);
-                $this->waitForElementNotVisible($this->loadingMask, Locator::SELECTOR_XPATH);
+                $this->blockFactory->create(
+                    'Magento\Backend\Test\Block\Template',
+                    ['element' => $this->browser->find('body')]
+                )->waitLoader();
             }
         }
     }

From 4eea87589e50607fb3eab6113f256d2b0af4599a Mon Sep 17 00:00:00 2001
From: Arkadii Chyzhov <achyzhov@ebay.com>
Date: Wed, 10 Dec 2014 14:19:06 +0200
Subject: [PATCH 195/474] MAGETWO-31415: View Files population tool doesn't
 work when application is not installed

- added throwing an exception if application is not installed yet
---
 dev/tools/Magento/Tools/View/deploy.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev/tools/Magento/Tools/View/deploy.php b/dev/tools/Magento/Tools/View/deploy.php
index b2e36dd7d29e2..a45da86ab01d9 100644
--- a/dev/tools/Magento/Tools/View/deploy.php
+++ b/dev/tools/Magento/Tools/View/deploy.php
@@ -51,6 +51,14 @@
 $objectManager = $omFactory->create(
     [\Magento\Framework\App\State::PARAM_MODE => \Magento\Framework\App\State::MODE_DEFAULT]
 );
+
+/** @var \Magento\Framework\App\DeploymentConfig $deploymentConfig */
+$deploymentConfig = $objectManager->get('Magento\Framework\App\DeploymentConfig');
+$isAppInstalled = $deploymentConfig->isAvailable();
+if (!$isAppInstalled) {
+    throw new \Exception('Application is not installed yet.');
+}
+
 $logger = new \Magento\Tools\View\Deployer\Log($verbosity);
 /** @var \Magento\Tools\View\Deployer $deployer */
 $deployer = $objectManager->create(

From bd843e9bd4f19f648fda3eb6af63ca27138eeafe Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Wed, 10 Dec 2014 14:42:45 +0200
Subject: [PATCH 196/474] MAGETWO-29550: Widget loses its options & part of its
 layout references if is saved with >11 layout references

---
 .../templates/instance/edit/layout.phtml      | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
index 9c4f3c8a67a29..b16e82c3c6226 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -30,9 +30,9 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
     '<div class="fieldset-wrapper-content">'+
 <?php foreach ($this->getDisplayOnContainers() as $container): ?>
     '<div class="no-display <?php echo $container['code'] ?> group_container" id="<?php echo $container['name'] ?>_{{id}}">'+
-        '<input type="hidden" class="container_name" name="__[container_name]" value="widget_instance[{{id}}][<?php echo $container['name'] ?>]" />'+
-        '<input type="hidden" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][page_id]" value="{{page_id}}" />'+
-        '<input type="hidden" class="layout_handle_pattern" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][layout_handle]" value="<?php echo $container['layout_handle'] ?>" />'+
+        '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[{{id}}][<?php echo $container['name'] ?>]" />'+
+        '<input disabled="disabled" type="hidden" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][page_id]" value="{{page_id}}" />'+
+        '<input disabled="disabled" type="hidden" class="layout_handle_pattern" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][layout_handle]" value="<?php echo $container['layout_handle'] ?>" />'+
         '<table cellspacing="0" class="data-table">'+
             '<col width="200" />'+
             '<thead>'+
@@ -45,9 +45,9 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
             '<tbody>'+
                 '<tr>'+
                     '<td>'+
-                        '<input type="radio" class="radio for_all" id="all_<?php echo $container['name'] ?>_{{id}}" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][for]" value="all" onclick="WidgetInstance.togglePageGroupChooser(this)" checked="checked" />&nbsp;'+
+                        '<input disabled="disabled" type="radio" class="radio for_all" id="all_<?php echo $container['name'] ?>_{{id}}" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][for]" value="all" onclick="WidgetInstance.togglePageGroupChooser(this)" checked="checked" />&nbsp;'+
                         '<label for="all_<?php echo $container['name'] ?>_{{id}}"><?php echo $this->escapeJsQuote(__('All')) ?></label><br />'+
-                        '<input type="radio" class="radio for_specific" id="specific_<?php echo $container['name'] ?>_{{id}}" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][for]" value="specific" onclick="WidgetInstance.togglePageGroupChooser(this)" />&nbsp;'+
+                        '<input disabled="disabled" type="radio" class="radio for_specific" id="specific_<?php echo $container['name'] ?>_{{id}}" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][for]" value="specific" onclick="WidgetInstance.togglePageGroupChooser(this)" />&nbsp;'+
                         '<label for="specific_<?php echo $container['name'] ?>_{{id}}"><?php echo $this->escapeJsQuote(__('Specific %1', $container['label'])) ?></label>'+
                     '</td>'+
                     '<td>'+
@@ -64,10 +64,10 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
             '</tbody>'+
         '</table>'+
         '<div class="no-display chooser_container" id="<?php echo $container['name'] ?>_ids_{{id}}">'+
-            '<input type="hidden" class="is_anchor_only" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][is_anchor_only]" value="<?php echo $container['is_anchor_only'] ?>" />'+
-            '<input type="hidden" class="product_type_id" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][product_type_id]" value="<?php echo $container['product_type_id'] ?>" />'+
+            '<input disabled="disabled" type="hidden" class="is_anchor_only" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][is_anchor_only]" value="<?php echo $container['is_anchor_only'] ?>" />'+
+            '<input disabled="disabled" type="hidden" class="product_type_id" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][product_type_id]" value="<?php echo $container['product_type_id'] ?>" />'+
             '<p>' +
-                '<input type="text" class="input-text entities" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][entities]" value="{{<?php echo $container['name'] ?>_entities}}" readonly="readonly" />&nbsp;' +
+                '<input disabled="disabled" type="text" class="input-text entities" name="widget_instance[{{id}}][<?php echo $container['name'] ?>][entities]" value="{{<?php echo $container['name'] ?>_entities}}" readonly="readonly" />&nbsp;' +
                 '<a class="widget-option-chooser" href="javascript:void(0)" onclick="WidgetInstance.displayEntityChooser(\'<?php echo $container['code'] ?>\', \'<?php echo $container['name'] ?>_ids_{{id}}\')"  title="<?php echo $this->escapeJsQuote(__('Open Chooser')) ?>">' +
                     '<img src="<?php echo $this->getViewFileUrl('images/rule_chooser_trigger.gif') ?>" alt="<?php echo $this->escapeJsQuote(__('Open Chooser')); ?>" />' +
                 '</a>&nbsp;' +
@@ -80,10 +80,10 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
     '</div>'+
 <?php endforeach; ?>
 '<div class="no-display all_pages group_container" id="all_pages_{{id}}">'+
-    '<input type="hidden" class="container_name" name="__[container_name]" value="widget_instance[{{id}}][all_pages]" />'+
-    '<input type="hidden" name="widget_instance[{{id}}][all_pages][page_id]" value="{{page_id}}" />'+
-    '<input type="hidden" class="layout_handle_pattern" name="widget_instance[{{id}}][all_pages][layout_handle]" value="default" />'+
-    '<input type="hidden" class="for_all" name="widget_instance[{{id}}][all_pages][for]" value="all" />'+
+    '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[{{id}}][all_pages]" />'+
+    '<input disabled="disabled" type="hidden" name="widget_instance[{{id}}][all_pages][page_id]" value="{{page_id}}" />'+
+    '<input disabled="disabled" type="hidden" class="layout_handle_pattern" name="widget_instance[{{id}}][all_pages][layout_handle]" value="default" />'+
+    '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[{{id}}][all_pages][for]" value="all" />'+
     '<table cellspacing="0" class="data-table">'+
         '<col width="200" />'+
         '<thead>'+
@@ -111,9 +111,9 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
     '</table>'+
 '</div>'+
 '<div class="no-display ignore-validate pages group_container" id="pages_{{id}}">'+
-    '<input type="hidden" class="container_name" name="__[container_name]" value="widget_instance[{{id}}][pages]" />'+
-    '<input type="hidden" name="widget_instance[{{id}}][pages][page_id]" value="{{page_id}}" />'+
-    '<input type="hidden" class="for_all" name="widget_instance[{{id}}][pages][for]" value="all" />'+
+    '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[{{id}}][pages]" />'+
+    '<input disabled="disabled" type="hidden" name="widget_instance[{{id}}][pages][page_id]" value="{{page_id}}" />'+
+    '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[{{id}}][pages][for]" value="all" />'+
     '<table cellspacing="0" class="data-table">'+
         '<col width="200" />'+
         '<thead>'+
@@ -142,9 +142,9 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
     '</table>'+
 '</div>'+
 '<div class="no-display ignore-validate pages group_container" id="page_layouts_{{id}}">'+
-    '<input type="hidden" class="container_name" name="__[container_name]" value="widget_instance[{{id}}][page_layouts]" />'+
-    '<input type="hidden" name="widget_instance[{{id}}][page_layouts][page_id]" value="{{page_id}}" />'+
-    '<input type="hidden" class="for_all" name="widget_instance[{{id}}][page_layouts][for]" value="all" />'+
+    '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[{{id}}][page_layouts]" />'+
+    '<input disabled="disabled" type="hidden" name="widget_instance[{{id}}][page_layouts][page_id]" value="{{page_id}}" />'+
+    '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[{{id}}][page_layouts][for]" value="all" />'+
     '<table cellspacing="0" class="data-table">'+
         '<col width="200" />'+
         '<thead>'+
@@ -272,6 +272,9 @@ var WidgetInstance = {
             container.removeClassName('no-display');
             container.removeClassName('ignore-validate');
             container.up('.fieldset-wrapper').addClassName('opened');
+            container.select('input', 'select').each(function(element) {
+                $(element).removeAttribute('disabled');
+            });
             container.show();
         }
     },
@@ -280,6 +283,9 @@ var WidgetInstance = {
         if (container) {
             container.addClassName('no-display');
             container.addClassName('ignore-validate');
+            container.select('input', 'select').each(function(element) {
+                $(element).writeAttribute('disabled', 'disabled');
+            });
             container.hide();
         }
     },

From 94a035c6a66957a6ea2ceaacd9ce61fbc9e7d91c Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Wed, 10 Dec 2014 14:43:14 +0200
Subject: [PATCH 197/474] MTA-1127: Update build.xml file for installation plan

---
 dev/build/core_dev/functional/phpunit.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/build/core_dev/functional/phpunit.xml b/dev/build/core_dev/functional/phpunit.xml
index 1e8a17f23335a..d9d9bdd777912 100644
--- a/dev/build/core_dev/functional/phpunit.xml
+++ b/dev/build/core_dev/functional/phpunit.xml
@@ -37,6 +37,7 @@
         <env name="server_config_path" value="config/server.yml.dist"/>
         <env name="isolation_config_path" value="config/isolation.yml.dist"/>
         <env name="handlers_config_path" value="config/handler.yml.dist"/>
+        <env name="install_config_path" value="config/install_data.yml.dist" />
         <env name="configuration:Mtf/TestSuite/InjectableTests" value="{{tests_configuration}}"/>
         <env name="log_directory" value="var/log"/>
         <env name="events_preset" value="base"/>

From 88d3c7db2c4688c364cd765b9174be6caa60cb39 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Wed, 10 Dec 2014 15:16:05 +0200
Subject: [PATCH 198/474] MAGETWO-23904: Fatal appears in "Recently Viewed"
 frontend widget block

---
 .../Magento/Reports/Model/Event/Observer.php  |  30 ++-
 .../Reports/Model/Event/ObserverTest.php      | 225 ++++++++++++++++++
 2 files changed, 243 insertions(+), 12 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php

diff --git a/app/code/Magento/Reports/Model/Event/Observer.php b/app/code/Magento/Reports/Model/Event/Observer.php
index b6dfffb93f931..1463aa0801ece 100644
--- a/app/code/Magento/Reports/Model/Event/Observer.php
+++ b/app/code/Magento/Reports/Model/Event/Observer.php
@@ -88,19 +88,17 @@ protected function _event($eventTypeId, $objectId, $subjectId = null, $subtype =
             }
         }
 
+        /** @var \Magento\Reports\Model\Event $eventModel */
         $eventModel = $this->_eventFactory->create();
         $storeId = $this->_storeManager->getStore()->getId();
-        $eventModel->setEventTypeId(
-            $eventTypeId
-        )->setObjectId(
-            $objectId
-        )->setSubjectId(
-            $subjectId
-        )->setSubtype(
-            $subtype
-        )->setStoreId(
-            $storeId
-        );
+        $eventModel->setData([
+            'event_type_id' => $eventTypeId,
+            'object_id' => $objectId,
+            'subject_id' => $subjectId,
+            'subtype' => $subtype,
+            'store_id' => $storeId,
+        ]);
+
         $eventModel->save();
 
         return $this;
@@ -152,7 +150,15 @@ public function catalogProductView(\Magento\Framework\Event\Observer $observer)
     {
         $productId = $observer->getEvent()->getProduct()->getId();
 
-        $this->_productIndxFactory->create()->setProductId($productId)->save()->calculate();
+        $viewData['product_id'] = $productId;
+
+        if ($this->_customerSession->isLoggedIn()) {
+            $viewData['customer_id'] = $this->_customerSession->getCustomerId();
+        } else {
+            $viewData['visitor_id'] = $this->_customerVisitor->getId();
+        }
+
+        $this->_productIndxFactory->create()->setData($viewData)->save()->calculate();
 
         return $this->_event(\Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW, $productId);
     }
diff --git a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
new file mode 100644
index 0000000000000..86c194f7e3672
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Reports\Model\Event;
+
+class ObserverTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Reports\Model\Event\Observer
+     */
+    protected $observer;
+
+    /**
+     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerSessionMock;
+
+    /**
+     * @var \Magento\Customer\Model\Visitor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerVisitorMock;
+
+    /**
+     * @var \Magento\Reports\Model\Product\Index\Viewed|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $productIndexMock;
+
+    /**
+     * @var \Magento\Reports\Model\Event|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $reportEventMock;
+
+    /**
+     * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeMock;
+
+    public function setUp()
+    {
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $this->customerSessionMock = $this->getMockBuilder('Magento\Customer\Model\Session')
+            ->disableOriginalConstructor()->getMock();
+        $this->customerVisitorMock = $this->getMockBuilder('Magento\Customer\Model\Visitor')
+            ->disableOriginalConstructor()->getMock();
+
+        $productIndexFactoryMock = $this->getMockBuilder('Magento\Reports\Model\Product\Index\ViewedFactory')
+            ->disableOriginalConstructor()->getMock();
+        $this->productIndexMock = $this->getMockBuilder('Magento\Reports\Model\Product\Index\Viewed')
+            ->disableOriginalConstructor()->getMock();
+
+        $productIndexFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->productIndexMock);
+
+        $reportEventFactory = $this->getMockBuilder('Magento\Reports\Model\EventFactory')
+            ->setMethods(['create'])->disableOriginalConstructor()->getMock();
+        $this->reportEventMock = $this->getMockBuilder('Magento\Reports\Model\Event')
+            ->disableOriginalConstructor()->getMock();
+
+        $reportEventFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->reportEventMock);
+
+        /** @var \Magento\Framework\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject $storeManager */
+        $storeManager = $this->getMockBuilder('Magento\Framework\StoreManagerInterface')
+            ->getMockForAbstractClass();
+
+        $this->storeMock = $this->getMockBuilder('\Magento\Store\Model\Store')
+            ->disableOriginalConstructor()->getMock();
+
+        $storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+
+        $this->observer = $objectManager->getObject(
+            'Magento\Reports\Model\Event\Observer',
+            [
+                'customerSession' => $this->customerSessionMock,
+                'customerVisitor' => $this->customerVisitorMock,
+                'productIndxFactory' => $productIndexFactoryMock,
+                'storeManager' => $storeManager,
+                'event' => $reportEventFactory
+            ]
+        );
+    }
+
+    public function testCatalogProductViewCustomer()
+    {
+        $productId = 5;
+        $customerId = 77;
+        $storeId = 1;
+        $expectedViewedData = [
+            'product_id' => $productId,
+            'customer_id' => $customerId
+        ];
+
+        $expectedEventData = [
+            'event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW,
+            'object_id' => $productId,
+            'subject_id' => $customerId,
+            'subtype' => 0,
+            'store_id' => $storeId,
+        ];
+
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($storeId);
+
+        $this->customerSessionMock->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(true);
+
+        $this->customerSessionMock->expects($this->any())
+            ->method('getCustomerId')
+            ->willReturn($customerId);
+
+        $this->prepareProductIndexMock($expectedViewedData);
+        $this->prepareReportEventModel($expectedEventData);
+        $eventObserver = $this->getObserverMock($productId);
+        $this->observer->catalogProductView($eventObserver);
+    }
+
+    public function testCatalogProductViewVisitor()
+    {
+        $productId = 6;
+        $visitorId = 88;
+        $storeId = 1;
+        $expectedViewedData = [
+            'product_id' => $productId,
+            'visitor_id' => $visitorId
+        ];
+
+        $expectedEventData = [
+            'event_type_id' => \Magento\Reports\Model\Event::EVENT_PRODUCT_VIEW,
+            'object_id' => $productId,
+            'subject_id' => $visitorId,
+            'subtype' => 1,
+            'store_id' => $storeId,
+        ];
+
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($storeId);
+
+        $this->customerSessionMock->expects($this->any())
+            ->method('isLoggedIn')
+            ->willReturn(false);
+
+        $this->customerVisitorMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($visitorId);
+
+        $this->prepareProductIndexMock($expectedViewedData);
+        $this->prepareReportEventModel($expectedEventData);
+        $eventObserver = $this->getObserverMock($productId);
+        $this->observer->catalogProductView($eventObserver);
+    }
+
+    /**
+     * @param array $expectedViewedData
+     * @return void
+     */
+    protected function prepareProductIndexMock($expectedViewedData)
+    {
+        $this->productIndexMock->expects($this->any())
+            ->method('setData')
+            ->with($expectedViewedData)
+            ->willReturnSelf();
+
+        $this->productIndexMock->expects($this->any())
+            ->method('save')
+            ->willReturnSelf();
+
+        $this->productIndexMock->expects($this->any())
+            ->method('calculate')
+            ->willReturnSelf();
+    }
+
+    /**
+     * @param array $expectedEventData
+     * @return void
+     */
+    protected function prepareReportEventModel($expectedEventData)
+    {
+        $this->reportEventMock->expects($this->any())
+            ->method('setData')
+            ->with($expectedEventData)
+            ->willReturnSelf();
+
+        $this->reportEventMock->expects($this->any())
+            ->method('save')
+            ->willReturnSelf();
+    }
+
+    /**
+     * @param int $productId
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getObserverMock($productId)
+    {
+        $eventObserverMock = $this->getMockBuilder('Magento\Framework\Event\Observer')->disableOriginalConstructor()
+            ->getMock();
+        $eventMock = $this->getMockBuilder('Magento\Framework\Event')->disableOriginalConstructor()
+            ->setMethods(['getProduct'])->getMock();
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')->disableOriginalConstructor()
+            ->getMock();
+
+        $productMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($productId);
+        $eventMock->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($productMock);
+        $eventObserverMock->expects($this->any())
+            ->method('getEvent')
+            ->willReturn($eventMock);
+
+        return $eventObserverMock;
+    }
+}

From fd8d62e8598f72ad58c70a7e24e764bb96d7102c Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Wed, 10 Dec 2014 08:31:25 -0600
Subject: [PATCH 199/474] MAGETWO-31447: Incorrect Validation of PHP Version
 During Installation

- CR fixes
---
 .../Setup/src/Controller/Environment.php      |  6 ++--
 .../Setup/src/Model/PhpInformation.php        | 31 ++++++++++++-------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/Environment.php b/setup/module/Magento/Setup/src/Controller/Environment.php
index 85b26d0ed85f7..3521cc338d789 100644
--- a/setup/module/Magento/Setup/src/Controller/Environment.php
+++ b/setup/module/Magento/Setup/src/Controller/Environment.php
@@ -43,7 +43,7 @@ public function __construct(
         VersionParser $versionParser
     ) {
         $this->phpInformation = $phpInformation;
-        $this->permissions = $permissions;
+            $this->permissions = $permissions;
         $this->versionParser = $versionParser;
     }
 
@@ -56,7 +56,7 @@ public function phpVersionAction()
     {
         try{
             $requiredVersion = $this->phpInformation->getRequiredPhpVersion();
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             return new JsonModel(
                 [
                     'responseType' => ResponseTypeInterface::RESPONSE_TYPE_ERROR,
@@ -76,7 +76,7 @@ public function phpVersionAction()
         $data = [
             'responseType' => $responseType,
             'data' => [
-                'required' => isset($requiredVersion) ? $requiredVersion : '' ,
+                'required' => $requiredVersion,
                 'current' => PHP_VERSION,
             ],
         ];
diff --git a/setup/module/Magento/Setup/src/Model/PhpInformation.php b/setup/module/Magento/Setup/src/Model/PhpInformation.php
index f22d73e1b8e73..cbaaf8e2a7225 100644
--- a/setup/module/Magento/Setup/src/Model/PhpInformation.php
+++ b/setup/module/Magento/Setup/src/Model/PhpInformation.php
@@ -49,15 +49,11 @@ public function __construct(
      * Retrieves required php version
      *
      * @return string
-     * @throws \Exception If composer.lock file is not found or if attributes are missing.
+     * @throws \Exception If attributes are missing in composer.lock file.
      */
     public function getRequiredPhpVersion()
     {
-        if (!$this->rootDir->isExist('composer.lock')) {
-            throw new \Exception('Cannot determine required PHP version from Composer information: '
-                . '\'composer.lock\'file is absent');
-        }
-        $composerInfo = json_decode($this->rootDir->readFile('composer.lock'), true);
+        $composerInfo = $this->getComposerInfo();
         if (!empty($composerInfo['platform']['php'])) {
             return $composerInfo['platform']['php'];
         } else {
@@ -72,16 +68,12 @@ public function getRequiredPhpVersion()
      * Collect required extensions from composer.lock file
      *
      * @return array
-     * @throws \Exception If composer.lock file is not found or if attributes are missing.
+     * @throws \Exception If attributes are missing in composer.lock file.
      */
     public function getRequired()
     {
         if (null === $this->required) {
-            if (!$this->rootDir->isExist('composer.lock')) {
-                throw new \Exception('Cannot determine required PHP extensions from Composer information: '
-                    . '\'composer.lock\' file is absent');
-            }
-            $composerInfo = json_decode($this->rootDir->readFile('composer.lock'), true);
+            $composerInfo = $this->getComposerInfo();
             $declaredDependencies = [];
 
             if (!empty($composerInfo['platform-dev'])) {
@@ -114,6 +106,21 @@ public function getRequired()
         return $this->required;
     }
 
+    /**
+     * Checks existence of composer.lock and returns its contents
+     *
+     * @return array
+     * @throws \Exception
+     */
+    private function getComposerInfo()
+    {
+        if (!$this->rootDir->isExist('composer.lock')) {
+            throw new \Exception('Cannot determine required PHP version from Composer information: '
+                . '\'composer.lock\'file is absent');
+        }
+        return json_decode($this->rootDir->readFile('composer.lock'), true);
+    }
+
     /**
      * Retrieve list of currently installed extensions
      *

From 12f8e8ea8990452fa24a0d330bcd7d6ec9277c0c Mon Sep 17 00:00:00 2001
From: Alexander Paliarush <apaliarush@ebay.com>
Date: Wed, 10 Dec 2014 16:33:30 +0200
Subject: [PATCH 200/474] MAGETWO-31613: [github]
 https://github.com/magento/magento2/issues/790

- Added workaround for PHP-FPM during content type and content length headers processing
---
 .../Magento/Webapi/Controller/Request.php     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/code/Magento/Webapi/Controller/Request.php b/app/code/Magento/Webapi/Controller/Request.php
index 19cbaa0b71c6b..d0928cb835979 100644
--- a/app/code/Magento/Webapi/Controller/Request.php
+++ b/app/code/Magento/Webapi/Controller/Request.php
@@ -54,4 +54,23 @@ public function getCookie($name = null, $default = null)
     {
         return $this->_cookieReader->getCookie($name, $default);
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * Added CGI environment support.
+     */
+    public function getHeader($header)
+    {
+        $headerValue = parent::getHeader($header);
+        if ($headerValue == false) {
+            /** Workaround for php-fpm environment */
+            $header = strtoupper(str_replace('-', '_', $header));
+            if (isset($_SERVER[$header]) && in_array($header, array('CONTENT_TYPE', 'CONTENT_LENGTH'))) {
+                $headerValue = $_SERVER[$header];
+            }
+
+        }
+        return $headerValue;
+    }
 }

From 4cc77c715f80a972e17e4f05fce82edf89f78262 Mon Sep 17 00:00:00 2001
From: Oleg Zinoviev <ozinoviev@ebay.com>
Date: Wed, 10 Dec 2014 17:11:32 +0200
Subject: [PATCH 201/474] MAGETWO-24703: Backend UI issues: improvements

- Front new products widget.
---
 .../Magento_Catalog/web/css/source/widgets.less   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/widgets.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/widgets.less
index afd3b83d7d499..410b348f8f349 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/widgets.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/widgets.less
@@ -72,12 +72,21 @@
 
 .responsive-min-l(@break) when (@break = @screen-l) {
     .block.widget .products-grid .product-item { width: 100%/5 }
-    .page-layout-1column .block.widget .products-grid .product-item { width: 100%/6 }
+    .page-layout-1column .block.widget .products-grid .product-item {
+        width: 100%/6;
+        margin-left: calc(~"(100% - 5 * (100%/6)) / 4");
+        &:nth-child(4n+1) {
+            margin-left: calc(~"(100% - 5 * (100%/6)) / 4");
+        }
+        &:nth-child(5n+1) {
+            margin-left: 0;
+        }
+    }
     .page-layout-3columns .block.widget .products-grid .product-item { width: 100%/4 }
     .block.widget .products-grid .product-items { margin: 0; }
     .block.widget .products-grid .product-item {
-        width: 22%;
-        margin-left: calc(~"(100% - 4 * 22%) / 3");
+        width: 24%;
+        margin-left: calc(~"(100% - 4 * 24%) / 3");
         padding: 0;
         &:nth-child(4n+1) {
             margin-left: 0;

From 3bc109ffd379eb3c3e6a10fbe38ca11e1db56d3e Mon Sep 17 00:00:00 2001
From: Arkadii Chyzhov <achyzhov@ebay.com>
Date: Wed, 10 Dec 2014 17:20:12 +0200
Subject: [PATCH 202/474] MAGETWO-31551: Remove @deprecated Lib Package 
 lib/internal/Magento/Framework/App/Http

---
 lib/internal/Magento/Framework/HTTP/Adapter/Curl.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
index fa3bb73963b7e..3efcfd1db8ff2 100644
--- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -123,8 +123,7 @@ public function setConfig($config = array())
      * @param int     $port
      * @param boolean $secure
      * @return $this
-     *
-     * @deprecated since 1.4.0.0-rc1
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function connect($host, $port = 80, $secure = false)
     {

From e994d730e46083a231a6d0464d0c8505034e12ef Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Wed, 10 Dec 2014 17:28:45 +0200
Subject: [PATCH 203/474] MAGETWO-30317: Css minificator works incorrectly

---
 lib/internal/Less/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Less/Parser.php b/lib/internal/Less/Parser.php
index d7121e0210b9a..f6214efb84248 100644
--- a/lib/internal/Less/Parser.php
+++ b/lib/internal/Less/Parser.php
@@ -179,7 +179,7 @@ public function getCss(){
 		}
 
 		if( Less_Parser::$options['compress'] ){
-            $css = preg_replace('/\s*([a-z]{2,})\s*(:|>|,|!)\s*("[^"]*"|\'[^\']*\'|[\w]*|[^;]*)/', '$1$2$3', $css);
+            $css = preg_replace('/\s*([-a-z]{2,})\s*(:|>|,|!)\s*("[^"]*"|\'[^\']*\'|[\w]*|[^;]*)/', '$1$2$3', $css);
 		}
 
 		//reset php settings

From b0993a422afeb8d73593befaad4884c842a2e95c Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@ebay.com>
Date: Wed, 10 Dec 2014 17:34:15 +0200
Subject: [PATCH 204/474] MAGETWO-31440: Zend_Date_Exception and
 Zend_Locale_Exception after placing order

---
 app/code/Magento/Sales/Model/Resource/Entity.php | 16 ++++++++++++++++
 app/code/Magento/Sales/Model/Resource/Order.php  |  2 --
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Resource/Entity.php b/app/code/Magento/Sales/Model/Resource/Entity.php
index ccc01c36d6894..2cb97d7ecc34c 100644
--- a/app/code/Magento/Sales/Model/Resource/Entity.php
+++ b/app/code/Magento/Sales/Model/Resource/Entity.php
@@ -129,6 +129,22 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
         if ($this->gridAggregator) {
             $this->gridAggregator->refresh($object->getId());
         }
+
+        $adapter = $this->_getReadAdapter();
+        $columns = $adapter->describeTable($this->getMainTable());
+
+        if (isset($columns['created_at'], $columns['updated_at'])) {
+            $select = $adapter->select()
+                ->from($this->getMainTable(), ['created_at', 'updated_at'])
+                ->where($this->getIdFieldName() . ' = :entity_id');
+            $row = $adapter->fetchRow($select, [':entity_id' => $object->getId()]);
+
+            if (is_array($row) && isset($row['created_at'], $row['updated_at'])) {
+                $object->setCreatedAt($row['created_at']);
+                $object->setUpdatedAt($row['updated_at']);
+            }
+        }
+
         parent::_afterSave($object);
         return $this;
     }
diff --git a/app/code/Magento/Sales/Model/Resource/Order.php b/app/code/Magento/Sales/Model/Resource/Order.php
index dc412b53f89fd..8803033be932a 100644
--- a/app/code/Magento/Sales/Model/Resource/Order.php
+++ b/app/code/Magento/Sales/Model/Resource/Order.php
@@ -196,8 +196,6 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
         foreach ($object->getRelatedObjects() as $relatedObject) {
             $relatedObject->save();
         }
-
-        $object->load($object->getId());
         return parent::_afterSave($object);
     }
 }

From ca8eb818a37b2ade38dff3b243e506871b3303cb Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Wed, 10 Dec 2014 15:58:49 +0200
Subject: [PATCH 205/474] MAGETWO-31627: Remove proxy for config classes

- Serialization problem is unresolvable (more details have akril@ebay.com)
---
 lib/internal/Magento/Framework/App/ObjectManager.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/ObjectManager.php b/lib/internal/Magento/Framework/App/ObjectManager.php
index 29a0a68d91418..e0e9cc57bece6 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager.php
@@ -24,9 +24,6 @@ class ObjectManager extends \Magento\Framework\ObjectManager\ObjectManager
     /**
      * Retrieve object manager
      *
-     * TODO: Temporary solution for serialization, should be removed when Serialization problem is resolved
-     *
-     * @deprecated
      * @return ObjectManager
      * @throws \RuntimeException
      */

From d4e09b2efea2935ba5edbee56f55fd3b6e9d6887 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@ebay.com>
Date: Wed, 10 Dec 2014 17:51:43 +0200
Subject: [PATCH 206/474] MAGETWO-31635: Warning if try to change billing
 address during multiple address checkout

---
 .../Block/Checkout/Address/Select.php         |  37 +++-
 .../Block/Checkout/Address/SelectTest.php     | 196 ++++++++++++++++++
 2 files changed, 230 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php

diff --git a/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php b/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php
index c60451f274521..2d33180284a74 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php
@@ -9,6 +9,7 @@
 
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Customer\Helper\Address as CustomerAddressHelper;
+use Magento\Customer\Api\AddressRepositoryInterface;
 
 /**
  * Class Select
@@ -26,6 +27,21 @@ class Select extends \Magento\Multishipping\Block\Checkout\AbstractMultishipping
      */
     protected $addressMapper;
 
+    /**
+     * @var \Magento\Framework\Api\FilterBuilder
+     */
+    protected $filterBuilder;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    protected $searchCriteriaBuilder;
+
+    /**
+     * @var AddressRepositoryInterface
+     */
+    protected $addressRepository;
+
     /**
      * Initialize dependencies.
      *
@@ -33,6 +49,9 @@ class Select extends \Magento\Multishipping\Block\Checkout\AbstractMultishipping
      * @param \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping
      * @param CustomerAddressHelper $customerAddressHelper
      * @param \Magento\Customer\Model\Address\Mapper $addressMapper
+     * @param AddressRepositoryInterface $addressRepository
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
      * @param array $data
      */
     public function __construct(
@@ -40,10 +59,16 @@ public function __construct(
         \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping,
         CustomerAddressHelper $customerAddressHelper,
         \Magento\Customer\Model\Address\Mapper $addressMapper,
+        AddressRepositoryInterface $addressRepository,
+        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
+        \Magento\Framework\Api\FilterBuilder $filterBuilder,
         array $data = []
     ) {
         $this->_customerAddressHelper = $customerAddressHelper;
         $this->addressMapper = $addressMapper;
+        $this->addressRepository = $addressRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->filterBuilder = $filterBuilder;
         parent::__construct($context, $multishipping, $data);
     }
 
@@ -73,7 +98,13 @@ public function getAddress()
         $addresses = $this->getData('address_collection');
         if (is_null($addresses)) {
             try {
-                $addresses = $this->_multishipping->getCustomer()->getAddresses();
+                $filter =  $this->filterBuilder->setField('parent_id')
+                    ->setValue($this->_multishipping->getCustomer()->getId())
+                    ->setConditionType('eq')
+                    ->create();
+                $addresses = (array)($this->addressRepository->getList(
+                    $this->searchCriteriaBuilder->addFilter([$filter])->create()
+                )->getItems());
             } catch (NoSuchEntityException $e) {
                 return [];
             }
@@ -106,7 +137,7 @@ public function getAddressAsHtml(\Magento\Customer\Api\Data\AddressInterface $ad
      */
     public function isAddressDefaultBilling(\Magento\Customer\Api\Data\AddressInterface $address)
     {
-        return $address->getId() == $this->_multishipping->getCustomer()->getDefaultBilling()->getId();
+        return $address->getId() == $this->_multishipping->getCustomer()->getDefaultBilling();
     }
 
     /**
@@ -117,7 +148,7 @@ public function isAddressDefaultBilling(\Magento\Customer\Api\Data\AddressInterf
      */
     public function isAddressDefaultShipping(\Magento\Customer\Api\Data\AddressInterface $address)
     {
-        return $address->getId() == $this->_multishipping->getCustomer()->getDefaultShipping()->getId();
+        return $address->getId() == $this->_multishipping->getCustomer()->getDefaultShipping();
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
new file mode 100644
index 0000000000000..b050b067626e3
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ *
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Multishipping\Block\Checkout\Address;
+
+use Magento\TestFramework\Helper\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+class SelectTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Multishipping\Block\Checkout\Address\Select
+     */
+    protected $block;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $multishippingMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filterBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchCriteriaBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $filterMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $searchCriteriaMock;
+
+    /**
+     * @var \Magento\TestFramework\Helper\ObjectManager
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->multishippingMock =
+            $this->getMock('Magento\Multishipping\Model\Checkout\Type\Multishipping', [], [], '', false);
+        $this->addressMock = $this->getMock('Magento\Customer\Api\Data\AddressInterface');
+        $this->customerMock = $this->getMock('Magento\Customer\Api\Data\CustomerInterface');
+        $this->filterBuilderMock = $this->getMock('Magento\Framework\Api\FilterBuilder', [], [], '', false);
+        $this->searchCriteriaBuilderMock =
+            $this->getMock('Magento\Framework\Api\SearchCriteriaBuilder', [], [], '', false);
+        $this->addressRepositoryMock = $this->getMock('Magento\Customer\Api\AddressRepositoryInterface');
+        $this->filterMock = $this->getMock('Magento\Framework\Api\Filter', [], [], '', false);
+        $this->searchCriteriaMock = $this->getMock('Magento\Framework\Api\SearchCriteria', [], [], '', false);
+        $this->block = $this->objectManager->getObject('Magento\Multishipping\Block\Checkout\Address\Select', [
+                'multishipping' => $this->multishippingMock,
+                'addressRepository' => $this->addressRepositoryMock,
+                'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
+                'filterBuilder' => $this->filterBuilderMock
+            ]
+        );
+    }
+
+    /**
+     * @param string $id
+     * @param bool $expectedValue
+     * @dataProvider isDefaultAddressDataProvider
+     */
+    public function testIsAddressDefaultBilling($id, $expectedValue)
+    {
+        $this->addressMock->expects($this->once())->method('getId')->willReturn(1);
+        $this->multishippingMock->expects($this->once())->method('getCustomer')->willReturn($this->customerMock);
+        $this->customerMock->expects($this->once())->method('getDefaultBilling')->willReturn($id);
+        $this->assertEquals($expectedValue, $this->block->isAddressDefaultBilling($this->addressMock));
+    }
+
+    /**
+     * @param string $id
+     * @param bool $expectedValue
+     * @dataProvider isDefaultAddressDataProvider
+     */
+    public function testIsAddressDefaultShipping($id, $expectedValue)
+    {
+        $this->addressMock->expects($this->once())->method('getId')->willReturn(1);
+        $this->multishippingMock->expects($this->once())->method('getCustomer')->willReturn($this->customerMock);
+        $this->customerMock->expects($this->once())->method('getDefaultShipping')->willReturn($id);
+        $this->assertEquals($expectedValue, $this->block->isAddressDefaultShipping($this->addressMock));
+    }
+
+    public function isDefaultAddressDataProvider()
+    {
+        return [
+            'yes' => [1, true],
+            'no' => [2, false],
+        ];
+    }
+
+    public function testGetAddress()
+    {
+        $searchResultMock = $this->getMock('Magento\Customer\Api\Data\AddressSearchResultsInterface');
+        $this->multishippingMock->expects($this->once())->method('getCustomer')->willReturn($this->customerMock);
+        $this->customerMock->expects($this->once())->method('getId')->willReturn(1);
+        $this->filterBuilderMock->expects($this->once())->method('setField')->with('parent_id')->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())->method('setValue')->with(1)->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())->method('setConditionType')->with('eq')->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())->method('create')->willReturn($this->filterMock);
+        $this->searchCriteriaBuilderMock
+            ->expects($this->once())
+            ->method('addFilter')
+            ->with([$this->filterMock])
+            ->willReturnSelf();
+        $this->searchCriteriaBuilderMock
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($this->searchCriteriaMock);
+        $this->addressRepositoryMock
+            ->expects($this->once())
+            ->method('getList')
+            ->with($this->searchCriteriaMock)
+            ->willReturn($searchResultMock);
+        $searchResultMock->expects($this->once())->method('getItems')->willReturn([$this->addressMock]);
+        $this->assertEquals([$this->addressMock], $this->block->getAddress());
+        $this->assertEquals([$this->addressMock], $this->block->getData('address_collection'));
+    }
+
+    public function testGetAlreadyExistingAddress()
+    {
+        $this->block = $this->objectManager->getObject('Magento\Multishipping\Block\Checkout\Address\Select', [
+                'addressRepository' => $this->addressRepositoryMock,
+                'filterBuilder' => $this->filterBuilderMock,
+                'data' => [
+                    'address_collection' => [$this->addressMock
+                    ]
+                ]
+            ]
+        );
+        $this->filterBuilderMock->expects($this->never())->method('setField');
+        $this->addressRepositoryMock
+            ->expects($this->never())
+            ->method('getList');
+        $this->assertEquals([$this->addressMock], $this->block->getAddress());
+    }
+
+    public function testGetAddressWhenItNotExistInCustomer()
+    {
+        $searchResultMock = $this->getMock('Magento\Customer\Api\Data\AddressSearchResultsInterface');
+        $this->multishippingMock->expects($this->once())->method('getCustomer')->willReturn($this->customerMock);
+        $this->customerMock->expects($this->once())->method('getId')->willReturn(1);
+        $this->filterBuilderMock->expects($this->once())->method('setField')->with('parent_id')->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())->method('setValue')->with(1)->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())->method('setConditionType')->with('eq')->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())->method('create')->willReturn($this->filterMock);
+        $this->searchCriteriaBuilderMock
+            ->expects($this->once())
+            ->method('addFilter')
+            ->with([$this->filterMock])
+            ->willReturnSelf();
+        $this->searchCriteriaBuilderMock
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($this->searchCriteriaMock);
+        $this->addressRepositoryMock
+            ->expects($this->once())
+            ->method('getList')
+            ->with($this->searchCriteriaMock)
+            ->willReturn($searchResultMock);
+
+        $searchResultMock->expects($this->once())->method('getItems')->willThrowException(new NoSuchEntityException());
+        $this->assertEquals([], $this->block->getAddress());
+    }
+}

From 99f793f03f493dde374c2835c69cc94845404d7e Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Wed, 10 Dec 2014 18:01:04 +0200
Subject: [PATCH 207/474] MAGETWO-24703: Backend UI issues: improvements

---
 app/design/frontend/Magento/blank/web/css/source/layout.less | 2 +-
 dev/tools/Magento/Tools/SampleData/fixtures/Cms/styles.css   | 2 +-
 lib/web/css/source/lib/responsive.less                       | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/layout.less b/app/design/frontend/Magento/blank/web/css/source/layout.less
index 2cb6d1c27a7db..7034e2c1cf975 100644
--- a/app/design/frontend/Magento/blank/web/css/source/layout.less
+++ b/app/design/frontend/Magento/blank/web/css/source/layout.less
@@ -85,7 +85,7 @@
         margin-left: auto;
         margin-right: auto;
         width: auto;
-        max-width: @layout-max-width + @layout-indent * 2;
+        max-width: @layout-max-width;
         box-sizing: border-box;
     }
     .page-main {
diff --git a/dev/tools/Magento/Tools/SampleData/fixtures/Cms/styles.css b/dev/tools/Magento/Tools/SampleData/fixtures/Cms/styles.css
index 41bb1f86cdbd5..afc79d02c6f27 100644
--- a/dev/tools/Magento/Tools/SampleData/fixtures/Cms/styles.css
+++ b/dev/tools/Magento/Tools/SampleData/fixtures/Cms/styles.css
@@ -1 +1 @@
-.cms-index-index .page-title{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.widget .block-promo img{max-width:none}.block-promo{box-sizing:border-box;overflow:hidden;position:relative;display:block;width:100%;color:#333 !important}.block-promo:hover{text-decoration:none}.block-promo .content{display:block;box-sizing:border-box;position:absolute;z-index:1;overflow:hidden;padding:25px 35px 35px}.block-promo .title{display:block;font-weight:300;font-size:32px;font-size:3.2rem;line-height:1.2;margin-bottom:15px}.block-promo .info{display:block;font-weight:300;font-size:22px;font-size:2.2rem;margin-bottom:20px}.block-promo .more{font-size:16px;font-size:1.6rem}.block-promo .icon.more{display:inline-block;text-decoration:none}.block-promo .icon.more:after{font-family:'luma-icons';content:'\e608';font-size:12px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:normal;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:0 0 0 5px}.block-promo .button.more{font-size:18px;font-size:1.8rem;background-image:none;background:#1979c3;padding:7px 15px;color:#fff;border:1px solid #1979c3;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:14px;font-size:1.4rem;font-weight:600;box-sizing:border-box;vertical-align:middle;border-radius:3px;text-decoration:none;padding:10px 15px}.block-promo .button.more:focus,.block-promo .button.more:active{background:#006bb4;border:1px solid #006bb4;color:#fff}.block-promo .button.more:hover{background:#006bb4;border:1px solid #006bb4;color:#fff}.block-promo .button.more.disabled,.block-promo .button.more[disabled],fieldset[disabled] .block-promo .button.more{cursor:default;pointer-events:none;opacity:.5}.block-promo .title+.button{margin-top:10px}.block-promo sup{top:-0.2em}.block-promo-2columns .content{padding:20px 25px}.womens-main .content,.womens-pants .content,.training-main .content,.training-erin .content,.sale-main .content,.sale-women .content,.mens-main .content,.mens-pants .content,.gear-main .content,.gear-equipment .content,.new-main .content,.new-eco .content,.home-main .content,.home-performance .content,.home-eco .content,.collection-eco .content,.collection-performance .content{background-color:rgba(255,255,255,0.9)}.home-pants{max-width:417px}.home-pants .content{top:0;left:0;width:80%}.home-pants .title{display:block;font-weight:600;font-family:Halvetica Neue,Helvetica,Arial,sans-serif;white-space:nowrap;margin-bottom:0}.home-t-shirts{background:#ffdd16}.home-erin{height:373px;max-width:426px}.home-erin .content{top:0;right:0;width:60%}.home-performance{height:664px;max-width:415px}.home-performance .content{top:25px;right:25px;left:25px}.home-eco{height:274px;max-width:858px}.new-performance .icon.more{white-space:nowrap}.block-promo-hp .bg-white,.block-promo-hp .home-erin .content{padding:20px}.womens-erin{background:#f4f4f4}.womens-erin .content{padding:20px 35px}.training-main{height:372px;max-width:1280px}.training-main .title{margin-bottom:0;line-height:1.4}.training-main .title span{font-weight:600}.training-erin{height:214px;max-width:1280px}.training-erin .content{padding:15px;text-align:center}.training-erin .info{margin-bottom:0}.training-on-demand,.training-videos{color:#fff !important}.training-on-demand .content,.training-videos .content{position:static;text-align:center}.training-on-demand .icon.calendar,.training-videos .icon.calendar,.training-on-demand .icon.download,.training-videos .icon.download{margin-top:-10px;display:block;text-decoration:none}.training-on-demand .icon.calendar>span,.training-videos .icon.calendar>span,.training-on-demand .icon.download>span,.training-videos .icon.download>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.training-on-demand .icon.calendar:before,.training-videos .icon.calendar:before,.training-on-demand .icon.download:before,.training-videos .icon.download:before{font-family:'luma-icons';font-size:32px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:normal;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.training-on-demand .icon.calendar:before,.training-videos .icon.calendar:before{content:'\e612'}.training-on-demand .icon.download:before,.training-videos .icon.download:before{content:'\e626'}.training-on-demand .icon.more,.training-videos .icon.more{position:absolute;left:0;right:0;bottom:25px}.training-on-demand .info,.training-videos .info{font-size:16px}.training-on-demand{background:#00ade2}.training-videos{background:#5a5e62}.sale-main{max-width:1080px}.sale-women,.sale-mens{max-width:580px;height:372px}.sale-mens .content{top:0;right:0;width:60%}.sale-20-off .content,.sale-free-shipping .content,.sale-womens-t-shirts .content{padding:15px 20px}.sale-20-off{background:#f4f4f4}.sale-20-off .title{font-size:40px;font-size:4rem;font-weight:700;white-space:nowrap}.sale-20-off img{position:absolute;z-index:0;bottom:0;right:0}.sale-20-off .content{width:75%;position:relative}.sale-free-shipping{background:#71b54e;color:#fff !important}.sale-free-shipping .content{position:static}.sale-free-shipping img{display:block;margin:0 auto 10px;max-width:100% !important}.sale-womens-t-shirts{background:#fedd16}.sale-womens-t-shirts .content{position:static}.sale-womens-t-shirts img{max-width:95% !important}.mens-main .content{width:45%}.womens-main,.home-main,.mens-main,.new-main,.sale-main,.gear-main{height:450px}.womens-t-shirts,.mens-t-shirts{background:#ffdd17}.womens-t-shirts img,.mens-t-shirts img{max-width:100% !important}.womens-t-shirts .content,.mens-t-shirts .content{position:static}.womens-pants,.mens-pants,.gear-fitnes,.gear-equipment,.new-performance,.new-eco{height:372px;max-width:580px}.womens-pants .info span,.mens-pants .info span{display:block;font-size:44px;font-size:4.4rem;font-family:Halvetica Neue,Helvetica,Arial,sans-serif;line-height:1.2;font-weight:600;white-space:nowrap}.womens-category-pants,.womens-category-tanks,.womens-category-shorts,.mens-category-tees,.mens-category-hoodies,.mens-category-shorts,.gear-category-bags,.gear-category-equipment,.gear-category-watches{background:#f4f4f4;min-height:170px}.womens-category-pants img,.womens-category-tanks img,.womens-category-shorts img,.mens-category-tees img,.mens-category-hoodies img,.mens-category-shorts img,.gear-category-bags img,.gear-category-equipment img,.gear-category-watches img{max-width:100% !important;position:absolute;z-index:0;top:0;right:0;left:60%}.womens-category-pants .content,.womens-category-tanks .content,.womens-category-shorts .content,.mens-category-tees .content,.mens-category-hoodies .content,.mens-category-shorts .content,.gear-category-bags .content,.gear-category-equipment .content,.gear-category-watches .content{padding:20px 0 50px 20px !important;position:static;width:60%;z-index:1}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title,.womens-category-pants .info,.womens-category-tanks .info,.womens-category-shorts .info,.mens-category-tees .info,.mens-category-hoodies .info,.mens-category-shorts .info,.gear-category-bags .info,.gear-category-equipment .info,.gear-category-watches .info{font-size:18px;font-size:1.8rem}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title{font-weight:400;margin-bottom:5px}.womens-category-pants .more,.womens-category-tanks .more,.womens-category-shorts .more,.mens-category-tees .more,.mens-category-hoodies .more,.mens-category-shorts .more,.gear-category-bags .more,.gear-category-equipment .more,.gear-category-watches .more{position:absolute;z-index:1;bottom:20px}.gear-fitnes .content,.new-performance .content{right:0;top:0;width:65%}.collection-eco,.collection-performance{height:200px;max-width:1280px}.collection-eco .content,.collection-performance .content{padding:15px;text-align:center}.collection-eco .info,.collection-performance .info{margin-bottom:0}.collection-erin{background:#f4f4f4}.collection-erin .content{padding:20px 35px}.content-heading{text-align:center;margin:10px 0 25px}.content-heading .title{margin:0 0 5px}.content-heading .info{margin-bottom:0}.categories-menu .title{text-transform:uppercase;margin-bottom:10px;display:block}.categories-menu a:link,.categories-menu a:visited,.categories-menu a:hover,.categories-menu a:active{color:#333}.categories-menu .items{margin-bottom:40px}.categories-menu .items:last-child{margin-bottom:0}.cms-content-important{display:block;background:#f5f5f5}.cms-content-important h2{margin-top:0}.cms-content table{border:none}.cms-content table>thead>tr>th,.cms-content table>tbody>tr>th,.cms-content table>tfoot>tr>th,.cms-content table>thead>tr>td,.cms-content table>tbody>tr>td,.cms-content table>tfoot>tr>td{border:none}.cms-content table>thead>tr>th,.cms-content table>thead>tr>td{border-bottom:1px solid #ccc}.cms-content table>tbody>tr:nth-child(even)>td,.cms-content table>tbody>tr:nth-child(even)>th{background:#f7f7f7}.cms-content table th{font-weight:400}.cms-content table td{font-weight:600}.cms-content .block .block-title{margin-bottom:15px}.cms-content .block .block-title>strong{display:none}.cms-content .block .box-title{display:inline-block;margin:0 0 15px}.cms-content .block .box-title>span{font-size:18px;font-size:1.8rem;font-weight:600;line-height:1.1;margin-top:20px;margin-top:2rem;margin-bottom:10px;margin-bottom:1rem;font-weight:300}.cms-content .block .block-content p:last-child{margin-bottom:0}.sale-main,.mens-main,.gear-main,.womens-main{max-width:1080px}.sale-women,.sale-mens,.mens-pants,.womens-pants,.gear-fitnes,.gear-equipment,.new-performance,.new-eco{max-width:580px}.training-main,.training-erin,.collection-eco,.collection-performance,.home-main{max-width:1280px}@media only screen and (max-width:399px){.womens-pants img{width:250%;float:right;margin:-70px -140px 0 0}.mens-main img{margin-left:-180px}.training-main img,.gear-main img,.womens-main img{margin-left:-210px}.home-main img{margin-left:-310px}.sale-main img,.mens-pants img,.home-eco img{margin-left:-150px}.sale-mens img,.gear-fitnes img,.new-performance img{margin-left:-60px}.new-main img,.sale-women img,.training-erin img,.gear-equipment img{margin-left:-120px}.new-eco img{margin-left:-80px}.home-pants,.home-performance{height:580px}.home-pants img,.home-performance img{margin-left:-50px}}@media only screen and (max-width:767px){.womens-main .content,.mens-main .content,.gear-main .content,.new-main .content,.home-main .content,.training-main .content,.sale-main .content{top:20px;right:0;width:65%}.training-main .title{font-size:20px;font-size:2rem}.womens-erin .content,.collection-erin .content{position:static}.womens-erin img,.collection-erin img{display:block;margin:0 auto;max-width:75% !important}.sale-women .content{width:60%;bottom:20px;left:0}.sale-main .content{top:auto;bottom:20px}.sale-20-off{min-height:185px}.sale-20-off .title{font-size:40px;font-size:4rem}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title{font-size:16px;font-size:1.6rem}.womens-category-pants .info,.womens-category-tanks .info,.womens-category-shorts .info,.mens-category-tees .info,.mens-category-hoodies .info,.mens-category-shorts .info,.gear-category-bags .info,.gear-category-equipment .info,.gear-category-watches .info{font-size:14px;font-size:1.4rem}.womens-pants .info span,.mens-pants .info span{font-size:40px;font-size:4rem}.womens-pants .content,.mens-pants .content{max-width:220px;bottom:20px}.home-eco .content{width:65%;top:20px;right:0}.gear-fitnes .content,.new-performance .content,.home-erin .content{padding-top:30px}.gear-equipment .content,.new-eco .content{left:0;bottom:20px;max-width:220px}.training-erin .content{right:10px;bottom:10px;left:10px}.training-erin .title{margin-bottom:10px;font-size:18px;font-size:1.8rem}.training-erin .info{font-size:12px;font-size:1.2rem;margin-bottom:0}.training-on-demand .content,.training-videos .content{padding-top:25px;padding-bottom:45px}.home-pants img{position:absolute;z-index:0;bottom:-10px}.home-pants .title{font-size:40px;font-size:4rem}.home-performance img{position:absolute;z-index:0;top:-20px}.home-pants,.home-performance{height:580px}.womens-main .content,.training-main .content,.gear-main .content{top:auto;bottom:20px}.home-t-shirts .image{display:block;padding:20px 20px 0}.home-t-shirts img{max-width:100% !important}.home-t-shirts .content{position:static}.collection-eco .content,.collection-performance .content{right:10px;bottom:10px;left:10px}.collection-eco .title,.collection-performance .title{margin-bottom:10px;font-size:18px;font-size:1.8rem}.collection-eco .info,.collection-performance .info{font-size:12px;font-size:1.2rem}.collection-erin .title{font-size:18px;font-size:1.8rem}.collection-erin .info{font-size:12px;font-size:1.2rem}.content-heading .title{font-size:30px;font-size:3rem}.content-heading .info{font-size:14px;font-size:1.4rem}.cms-content-important{padding:15px;margin:0 -15px 15px}.cms-content table{margin:10px 0 0}.cms-content table thead th{font-size:11px;font-size:1.1rem}.cms-content ul li{margin-bottom:5px}.cms-content .block .box{margin-bottom:30px}.blocks-promo{margin-left:-15px;margin-right:-15px}.block-promo{margin-bottom:8px}.block-promo .title{font-size:22px;font-size:2.2rem}.block-promo .info{font-size:16px;font-size:1.6rem;margin-bottom:10px}.block-promo .more{font-size:14px;font-size:1.4rem}.block-promo .icon.more:after{font-size:10px;font-size:1rem}.block-promo .button.more{font-size:12px;font-size:1.2rem}.block-promo .content{padding:15px 20px 20px}.block-promo .button.more{padding:8px 12px}}@media all and (min-width:640px),print{.block-promo{margin-bottom:16px}.block-promo-wrapper:before,.block-promo-wrapper:after{content:"";display:table}.block-promo-wrapper:after{clear:both}.block-promo-wrapper .block-promo{float:left;border-right:16px solid #fff}.block-promo-2columns .block-promo{width:50%}.block-promo-3columns .block-promo{width:33.3%}.block-promo-2columns .block-promo:nth-child(2n),.block-promo-3columns .block-promo:nth-child(3n){border-right:0}}@media all and (min-width:768px),print{.block-promo-hp{margin:0 -8px}.block-promo-hp .block-promo{border-left:8px solid #fff;border-right:8px solid #fff}.block-promo-wrapper .home-performance{float:right}.home-pants,.home-erin,.home-performance{width:33.3%}.home-t-shirts,.home-eco{width:66.7%}.womens-main .content,.mens-main .content,.gear-main .content,.new-main .content,.home-main .content,.training-main .content,.sale-main .content{top:40px;right:40px;width:40%}.womens-t-shirts,.mens-t-shirts{height:372px}.womens-pants .content,.mens-pants .content{width:47%;left:20px;top:20px}.womens-erin,.home-t-shirts,.collection-erin{display:table}.womens-erin .content,.home-t-shirts .content,.collection-erin .content,.womens-erin .image,.home-t-shirts .image,.collection-erin .image{display:table-cell}.womens-erin .content,.home-t-shirts .content,.collection-erin .content{position:static}.womens-erin .image,.home-t-shirts .image,.collection-erin .image{vertical-align:bottom}.womens-erin img,.home-t-shirts img,.collection-erin img{float:right}.home-t-shirts{height:276px}.home-t-shirts .content{width:40%}.home-t-shirts .image{width:60%;vertical-align:middle;text-align:center;padding-left:10px}.home-t-shirts img{max-width:100% !important}.womens-category-pants,.womens-category-tanks,.womens-category-shorts,.mens-category-tees,.mens-category-hoodies,.mens-category-shorts,.gear-category-bags,.gear-category-equipment,.gear-category-watches{height:210px}.sale-women .content{width:50%;left:20px;bottom:20px}.sale-20-off .title{font-size:44px;font-size:4.4rem}.sale-20-off .info{font-size:18px;font-size:1.8rem}.sale-20-off,.sale-free-shipping,.sale-womens-t-shirts{height:205px}.sale-free-shipping .title{font-size:25px;font-size:2.5rem}.sale-free-shipping .info{font-size:16px;font-size:1.6rem}.sale-womens-t-shirts .title{font-size:20px;font-size:2rem;margin-bottom:5px}.sale-womens-t-shirts .info{font-size:16px;font-size:1.6rem;margin-bottom:5px}.home-eco .content{width:70%;top:45px;right:45px}.gear-equipment .content,.new-eco .content{left:20px;bottom:20px;width:60%}.new-eco .content{width:70%}.training-erin .content{width:73%;top:16px;bottom:16px;right:16px}.training-erin .info{font-size:16px;font-size:1.6rem;display:block;padding:0 10%}.training-on-demand,.training-videos{height:208px}.home-pants{height:664px}.home-pants .title{font-size:44px !important;font-size:4.4rem !important;line-height:1.2}.collection-eco .content,.collection-performance .content{width:60%;top:16px;bottom:16px;left:50%;margin-left:-30%}.collection-eco .title,.collection-performance .title{font-size:40px;font-size:4rem}.collection-eco .info,.collection-performance .info{font-size:22px;font-size:2.2rem;display:block;padding:0 10%}.collection-erin{height:164px}.collection-erin .content{width:70%}.collection-erin .image{width:30%}.collection-erin .title{font-size:40px;font-size:4rem}.collection-erin .info{font-size:22px;font-size:2.2rem}.content-heading{position:relative}.content-heading:before{content:'';display:block;height:1px;width:100%;background:-moz-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:-webkit-gradient(radial, center center, 0, center center, 100%, color-stop(25%, #fff), color-stop(100%, #cecece));background:-webkit-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:-ms-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:radial-gradient(ellipse at center, #fff 25%, #cecece 100%);position:absolute;top:50%;z-index:0}.content-heading .title,.content-heading .info{position:relative;z-index:1}.content-heading .title{font-size:38px;font-size:3.8rem}.content-heading .info{font-size:18px;font-size:1.8rem}.cms-content-important{font-size:22px;font-size:2.2rem;font-weight:300;padding:20px;margin:0 0 35px -20px}.cms-content table{margin:40px 0 0}.cms-content ul li{margin-bottom:15px}.cms-content .block .block-content:before,.cms-content .block .block-content:after{content:"";display:table}.cms-content .block .block-content:after{clear:both}.cms-content .block .box{width:48%;margin-bottom:40px}.cms-content .block .box:nth-child(1){float:left;clear:left}.cms-content .block .box:nth-child(2){float:right}.cms-content .block .box:nth-child(2)+*{clear:both}.cms-content .block .box:nth-last-child(1),.cms-content .block .box:nth-last-child(2){margin-bottom:0}.privacy-policy-content{box-sizing:border-box;width:77.7%;float:right;padding-left:2%}.privacy-policy .block-collapsible-nav{box-sizing:border-box;width:22.3%;float:left}}
\ No newline at end of file
+.cms-index-index .page-title{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.widget .block-promo img{max-width:none}.block-promo{box-sizing:border-box;overflow:hidden;position:relative;display:block;width:100%;color:#333 !important}.block-promo:hover{text-decoration:none}.block-promo .content{display:block;box-sizing:border-box;position:absolute;z-index:1;overflow:hidden;padding:25px 35px 35px}.block-promo .title{display:block;font-weight:300;font-size:3.2rem;line-height:1.2;margin-bottom:15px}.block-promo .info{display:block;font-weight:300;font-size:2.2rem;margin-bottom:20px}.block-promo .more{font-size:1.6rem}.block-promo .icon.more{display:inline-block;text-decoration:none}.block-promo .icon.more:after{font-family:'icons-blank-theme';content:'\e608';font-size:12px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:normal;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:0 0 0 5px}.block-promo .button.more{font-size:1.8rem;background-image:none;background:#1979c3;padding:7px 15px;color:#fff;border:1px solid #1979c3;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;box-sizing:border-box;vertical-align:middle;border-radius:3px;text-decoration:none;padding:10px 15px}.block-promo .button.more:focus,.block-promo .button.more:active{background:#006bb4;border:1px solid #006bb4;color:#fff}.block-promo .button.more:hover{background:#006bb4;border:1px solid #006bb4;color:#fff}.block-promo .button.more.disabled,.block-promo .button.more[disabled],fieldset[disabled] .block-promo .button.more{cursor:default;pointer-events:none;opacity:.5}.block-promo .title+.button{margin-top:10px}.block-promo sup{top:-0.2em}.block-promo-2columns .content{padding:20px 25px}.womens-main .content,.womens-pants .content,.training-main .content,.training-erin .content,.sale-main .content,.sale-women .content,.mens-main .content,.mens-pants .content,.gear-main .content,.gear-equipment .content,.new-main .content,.new-eco .content,.home-main .content,.home-performance .content,.home-eco .content,.collection-eco .content,.collection-performance .content{background-color:rgba(255,255,255,0.9)}.sale-main,.mens-main,.gear-main,.womens-main{max-width:1080px}.sale-women,.sale-mens,.mens-pants,.womens-pants,.gear-fitnes,.gear-equipment,.new-performance,.new-eco{max-width:580px}.training-main,.training-erin,.collection-eco,.collection-performance,.home-main{max-width:1280px}.home-pants .content{top:0;left:0;width:80%}.home-pants .title{display:block;font-weight:600;font-family:Halvetica Neue,Helvetica,Arial,sans-serif;white-space:nowrap;margin-bottom:0}.home-t-shirts{background:#ffdd16}.home-erin{height:373px}.home-erin .content{top:0;right:0;width:60%}.home-performance{height:664px}.home-performance .content{top:25px;right:25px;left:25px}.home-eco{height:274px}.new-performance .icon.more{white-space:nowrap}.block-promo-hp .bg-white,.block-promo-hp .home-erin .content{padding:20px}.womens-erin{background:#f4f4f4}.womens-erin .content{padding:20px 35px}.training-main{height:372px}.training-main .title{margin-bottom:0;line-height:1.4}.training-main .title span{font-weight:600}.training-erin{height:214px}.training-erin .content{padding:15px;text-align:center}.training-erin .info{margin-bottom:0}.training-on-demand,.training-videos{color:#fff !important}.training-on-demand .content,.training-videos .content{position:static;text-align:center}.training-on-demand .icon.calendar,.training-videos .icon.calendar,.training-on-demand .icon.download,.training-videos .icon.download{margin-top:-10px;display:block;text-decoration:none}.training-on-demand .icon.calendar>span,.training-videos .icon.calendar>span,.training-on-demand .icon.download>span,.training-videos .icon.download>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.training-on-demand .icon.calendar:before,.training-videos .icon.calendar:before,.training-on-demand .icon.download:before,.training-videos .icon.download:before{font-family:'icons-blank-theme';font-size:32px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:normal;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.training-on-demand .icon.calendar:before,.training-videos .icon.calendar:before{content:'\e612'}.training-on-demand .icon.download:before,.training-videos .icon.download:before{content:'\e626'}.training-on-demand .icon.more,.training-videos .icon.more{position:absolute;left:0;right:0;bottom:25px}.training-on-demand .info,.training-videos .info{font-size:16px}.training-on-demand{background:#00ade2}.training-videos{background:#5a5e62}.sale-women,.sale-mens{height:372px}.sale-mens .content{top:0;right:0;width:60%}.sale-20-off .content,.sale-free-shipping .content,.sale-womens-t-shirts .content{padding:15px 20px}.sale-20-off{background:#f4f4f4}.sale-20-off .title{font-size:4rem;font-weight:700;white-space:nowrap}.sale-20-off img{position:absolute;z-index:0;bottom:0;right:0}.sale-20-off .content{width:75%;position:relative}.sale-free-shipping{background:#71b54e;color:#fff !important}.sale-free-shipping .content{position:static}.sale-free-shipping img{display:block;margin:0 auto 10px;max-width:100% !important}.sale-womens-t-shirts{background:#fedd16}.sale-womens-t-shirts .content{position:static}.sale-womens-t-shirts img{max-width:95% !important}.mens-main .content{width:45%}.womens-main,.home-main,.mens-main,.new-main,.sale-main,.gear-main{height:450px}.womens-t-shirts,.mens-t-shirts{background:#ffdd17}.womens-t-shirts img,.mens-t-shirts img{max-width:100% !important}.womens-t-shirts .content,.mens-t-shirts .content{position:static}.womens-pants,.mens-pants,.gear-fitnes,.gear-equipment,.new-performance,.new-eco{height:372px}.womens-pants .info span,.mens-pants .info span{display:block;font-size:4.4rem;font-family:Halvetica Neue,Helvetica,Arial,sans-serif;line-height:1.2;font-weight:600;white-space:nowrap}.womens-category-pants,.womens-category-tanks,.womens-category-shorts,.mens-category-tees,.mens-category-hoodies,.mens-category-shorts,.gear-category-bags,.gear-category-equipment,.gear-category-watches{background:#f4f4f4;min-height:170px}.womens-category-pants img,.womens-category-tanks img,.womens-category-shorts img,.mens-category-tees img,.mens-category-hoodies img,.mens-category-shorts img,.gear-category-bags img,.gear-category-equipment img,.gear-category-watches img{max-width:100% !important;position:absolute;z-index:0;top:0;right:0;left:60%}.womens-category-pants .content,.womens-category-tanks .content,.womens-category-shorts .content,.mens-category-tees .content,.mens-category-hoodies .content,.mens-category-shorts .content,.gear-category-bags .content,.gear-category-equipment .content,.gear-category-watches .content{padding:20px 0 50px 20px !important;position:static;width:60%;z-index:1}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title,.womens-category-pants .info,.womens-category-tanks .info,.womens-category-shorts .info,.mens-category-tees .info,.mens-category-hoodies .info,.mens-category-shorts .info,.gear-category-bags .info,.gear-category-equipment .info,.gear-category-watches .info{font-size:1.8rem}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title{font-weight:400;margin-bottom:5px}.womens-category-pants .more,.womens-category-tanks .more,.womens-category-shorts .more,.mens-category-tees .more,.mens-category-hoodies .more,.mens-category-shorts .more,.gear-category-bags .more,.gear-category-equipment .more,.gear-category-watches .more{position:absolute;z-index:1;bottom:20px}.gear-fitnes .content,.new-performance .content{right:0;top:0;width:65%}.collection-eco,.collection-performance{height:200px}.collection-eco .content,.collection-performance .content{padding:15px;text-align:center}.collection-eco .info,.collection-performance .info{margin-bottom:0}.collection-erin{background:#f4f4f4}.collection-erin .content{padding:20px 35px}.content-heading{text-align:center;margin:10px 0 25px}.content-heading .title{margin:0 0 5px}.content-heading .info{margin-bottom:0}.categories-menu .title{text-transform:uppercase;margin-bottom:10px;display:block}.categories-menu a:link,.categories-menu a:visited,.categories-menu a:hover,.categories-menu a:active{color:#333}.categories-menu .items{margin-bottom:40px}.categories-menu .items:last-child{margin-bottom:0}.cms-content-important{display:block;background:#f5f5f5}.cms-content-important h2{margin-top:0}.cms-content table{border:none}.cms-content table>thead>tr>th,.cms-content table>tbody>tr>th,.cms-content table>tfoot>tr>th,.cms-content table>thead>tr>td,.cms-content table>tbody>tr>td,.cms-content table>tfoot>tr>td{border:none}.cms-content table>thead>tr>th,.cms-content table>thead>tr>td{border-bottom:1px solid #d1d1d1}.cms-content table>tbody>tr:nth-child(even)>td,.cms-content table>tbody>tr:nth-child(even)>th{background:#f7f7f7}.cms-content table th{font-weight:400}.cms-content table td{font-weight:600}.cms-content .block .block-title{margin-bottom:15px}.cms-content .block .block-title>strong{display:none}.cms-content .block .box-title{display:inline-block;margin:0 0 15px}.cms-content .block .box-title>span{font-size:1.8rem;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem;font-weight:300}.cms-content .block .block-content p:last-child{margin-bottom:0}@media only screen and (max-width:399px){.womens-pants img{width:250%;float:right;margin:-70px -140px 0 0}.mens-main img{margin-left:-180px}.training-main img,.gear-main img,.womens-main img{margin-left:-210px}.home-main img{margin-left:-310px}.sale-main img,.mens-pants img,.home-eco img{margin-left:-150px}.sale-mens img,.gear-fitnes img,.new-performance img{margin-left:-60px}.new-main img,.sale-women img,.training-erin img,.gear-equipment img{margin-left:-120px}.new-eco img{margin-left:-80px}.home-pants,.home-performance{height:580px}.home-pants img,.home-performance img{margin-left:-50px}}@media only screen and (max-width:767px){.home-pants{max-width:417px}.home-erin{max-width:426px}.home-performance{max-width:415px}.home-eco{max-width:858px}.home-pants,.home-performance{height:580px}.womens-main .content,.mens-main .content,.gear-main .content,.new-main .content,.home-main .content,.training-main .content,.sale-main .content{top:20px;right:0;width:65%}.training-main .title{font-size:2rem}.womens-erin .content,.collection-erin .content{position:static}.womens-erin img,.collection-erin img{display:block;margin:0 auto;max-width:75% !important}.sale-women .content{width:60%;bottom:20px;left:0}.sale-main .content{top:auto;bottom:20px}.sale-20-off{min-height:185px}.sale-20-off .title{font-size:4rem}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title{font-size:1.6rem}.womens-category-pants .info,.womens-category-tanks .info,.womens-category-shorts .info,.mens-category-tees .info,.mens-category-hoodies .info,.mens-category-shorts .info,.gear-category-bags .info,.gear-category-equipment .info,.gear-category-watches .info{font-size:1.4rem}.womens-pants .info span,.mens-pants .info span{font-size:4rem}.womens-pants .content,.mens-pants .content{max-width:220px;bottom:20px}.home-eco .content{width:65%;top:20px;right:0}.gear-fitnes .content,.new-performance .content,.home-erin .content{padding-top:30px}.gear-equipment .content,.new-eco .content{left:0;bottom:20px;max-width:220px}.training-erin .content{right:10px;bottom:10px;left:10px}.training-erin .title{margin-bottom:10px;font-size:1.8rem}.training-erin .info{font-size:1.2rem;margin-bottom:0}.training-on-demand .content,.training-videos .content{padding-top:25px;padding-bottom:45px}.home-pants img{position:absolute;z-index:0;bottom:-10px}.home-pants .title{font-size:4rem}.home-performance img{position:absolute;z-index:0;top:-20px}.womens-main .content,.training-main .content,.gear-main .content{top:auto;bottom:20px}.home-t-shirts .image{display:block;padding:20px 20px 0}.home-t-shirts img{max-width:100% !important}.home-t-shirts .content{position:static}.collection-eco .content,.collection-performance .content{right:10px;bottom:10px;left:10px}.collection-eco .title,.collection-performance .title{margin-bottom:10px;font-size:1.8rem}.collection-eco .info,.collection-performance .info{font-size:1.2rem}.collection-erin .title{font-size:1.8rem}.collection-erin .info{font-size:1.2rem}.content-heading .title{font-size:3rem}.content-heading .info{font-size:1.4rem}.cms-content-important{padding:15px;margin:0 -15px 15px}.cms-content table{margin:10px 0 0}.cms-content table thead th{font-size:1.1rem}.cms-content ul li{margin-bottom:5px}.cms-content .block .box{margin-bottom:30px}.blocks-promo{margin-left:-15px;margin-right:-15px}.block-promo{margin-bottom:8px}.block-promo .title{font-size:2.2rem}.block-promo .info{font-size:1.6rem;margin-bottom:10px}.block-promo .more{font-size:1.4rem}.block-promo .icon.more:after{font-size:1rem}.block-promo .button.more{font-size:1.2rem}.block-promo .content{padding:15px 20px 20px}.block-promo .button.more{padding:8px 12px}}@media all and (min-width:640px),print{.block-promo{margin-bottom:16px}.block-promo-wrapper:before,.block-promo-wrapper:after{content:"";display:table}.block-promo-wrapper:after{clear:both}.block-promo-wrapper .block-promo{float:left;border-right:16px solid #fff}.block-promo-2columns .block-promo{width:50%}.block-promo-3columns .block-promo{width:33.3%}.block-promo-2columns .block-promo:nth-child(2n),.block-promo-3columns .block-promo:nth-child(3n){border-right:0}}@media all and (min-width:768px),print{.block-promo-hp{margin:0 -8px}.block-promo-hp .block-promo{border-left:8px solid #fff;border-right:8px solid #fff}.block-promo-wrapper .home-performance{float:right}.home-pants,.home-erin,.home-performance{width:33.3%}.home-t-shirts,.home-eco{width:66.7%}.womens-main .content,.mens-main .content,.gear-main .content,.new-main .content,.home-main .content,.training-main .content,.sale-main .content{top:40px;right:40px;width:40%}.womens-t-shirts,.mens-t-shirts{height:372px}.womens-pants .content,.mens-pants .content{width:47%;left:20px;top:20px}.womens-erin,.home-t-shirts,.collection-erin{display:table}.womens-erin .content,.home-t-shirts .content,.collection-erin .content,.womens-erin .image,.home-t-shirts .image,.collection-erin .image{display:table-cell}.womens-erin .content,.home-t-shirts .content,.collection-erin .content{position:static}.womens-erin .image,.home-t-shirts .image,.collection-erin .image{vertical-align:bottom}.womens-erin img,.home-t-shirts img,.collection-erin img{float:right}.home-t-shirts{height:276px}.home-t-shirts .content{width:40%}.home-t-shirts .image{width:60%;vertical-align:middle;text-align:center;padding-left:10px}.home-t-shirts img{max-width:100% !important}.womens-category-pants,.womens-category-tanks,.womens-category-shorts,.mens-category-tees,.mens-category-hoodies,.mens-category-shorts,.gear-category-bags,.gear-category-equipment,.gear-category-watches{height:210px}.sale-women .content{width:50%;left:20px;bottom:20px}.sale-20-off .title{font-size:4.4rem}.sale-20-off .info{font-size:1.8rem}.sale-20-off,.sale-free-shipping,.sale-womens-t-shirts{height:205px}.sale-free-shipping .title{font-size:2.5rem}.sale-free-shipping .info{font-size:1.6rem}.sale-womens-t-shirts .title{font-size:2rem;margin-bottom:5px}.sale-womens-t-shirts .info{font-size:1.6rem;margin-bottom:5px}.home-eco .content{width:70%;top:45px;right:45px}.gear-equipment .content,.new-eco .content{left:20px;bottom:20px;width:60%}.new-eco .content{width:70%}.training-erin .content{width:73%;top:16px;bottom:16px;right:16px}.training-erin .info{font-size:1.6rem;display:block;padding:0 10%}.training-on-demand,.training-videos{height:208px}.home-pants{height:664px}.home-pants .title{font-size:44px !important;font-size:4.4rem !important;line-height:1.2}.collection-eco .content,.collection-performance .content{width:60%;top:16px;bottom:16px;left:50%;margin-left:-30%}.collection-eco .title,.collection-performance .title{font-size:4rem}.collection-eco .info,.collection-performance .info{font-size:2.2rem;display:block;padding:0 10%}.collection-erin{height:164px}.collection-erin .content{width:70%}.collection-erin .image{width:30%}.collection-erin .title{font-size:4rem}.collection-erin .info{font-size:2.2rem}.content-heading{position:relative}.content-heading:before{content:'';display:block;height:1px;width:100%;background:-moz-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:-webkit-gradient(radial, center center, 0, center center, 100%, color-stop(25%, #fff), color-stop(100%, #cecece));background:-webkit-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:-ms-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:radial-gradient(ellipse at center, #fff 25%, #cecece 100%);position:absolute;top:50%;z-index:0}.content-heading .title,.content-heading .info{position:relative;z-index:1}.content-heading .title{font-size:3.8rem}.content-heading .info{font-size:1.8rem}.cms-content-important{font-size:2.2rem;font-weight:300;padding:20px;margin:0 0 35px -20px}.cms-content table{margin:40px 0 0}.cms-content ul li{margin-bottom:15px}.cms-content .block .block-content:before,.cms-content .block .block-content:after{content:"";display:table}.cms-content .block .block-content:after{clear:both}.cms-content .block .box{width:48%;margin-bottom:40px}.cms-content .block .box:nth-child(1){float:left;clear:left}.cms-content .block .box:nth-child(2){float:right}.cms-content .block .box:nth-child(2)+*{clear:both}.cms-content .block .box:nth-last-child(1),.cms-content .block .box:nth-last-child(2){margin-bottom:0}.privacy-policy-content{box-sizing:border-box;width:77.7%;float:right;padding-left:2%}.privacy-policy .block-collapsible-nav{box-sizing:border-box;width:22.3%;float:left}}
\ No newline at end of file
diff --git a/lib/web/css/source/lib/responsive.less b/lib/web/css/source/lib/responsive.less
index 3e1785748235c..1f287d355696f 100644
--- a/lib/web/css/source/lib/responsive.less
+++ b/lib/web/css/source/lib/responsive.less
@@ -39,6 +39,11 @@
 
 .responsive-min-l(@break) {}
 
+@media all and (min-width: @screen-s),
+print {
+    .responsive-min-l(@screen-s);
+}
+
 @media all and (min-width: @screen-m),
 print {
     .responsive-min-l(@screen-m);

From 43364d3735e40eb7dccae93064458b18a5d6a1ae Mon Sep 17 00:00:00 2001
From: Maksym Savich <msavich@ebay.com>
Date: Wed, 10 Dec 2014 10:07:14 -0600
Subject: [PATCH 208/474] Fixed MAGETWO-31356: PDO Exception during Magento
 installation

- CR changes
---
 .../Magento/Setup/src/Controller/ConsoleController.php    | 8 +-------
 setup/module/Magento/Setup/src/Model/Installer.php        | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Controller/ConsoleController.php b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
index 8d70b02f9aee1..9043a895bd68b 100644
--- a/setup/module/Magento/Setup/src/Controller/ConsoleController.php
+++ b/setup/module/Magento/Setup/src/Controller/ConsoleController.php
@@ -294,7 +294,6 @@ public function onDispatch(\Zend\Mvc\MvcEvent $e)
      * Controller for Install Command
      *
      * @return void
-     * @throws \Exception
      */
     public function installAction()
     {
@@ -307,7 +306,6 @@ public function installAction()
      * Creates the config.php file
      *
      * @return void
-     * @throws \Exception
      */
     public function installDeploymentConfigAction()
     {
@@ -320,7 +318,6 @@ public function installDeploymentConfigAction()
      * Installs and updates database schema
      *
      * @return void
-     * @throws \Exception
      */
     public function installSchemaAction()
     {
@@ -331,7 +328,6 @@ public function installSchemaAction()
      * Installs and updates data fixtures
      *
      * @return void
-     * @throws \Exception
      */
     public function installDataAction()
     {
@@ -342,7 +338,6 @@ public function installDataAction()
      * Updates database schema and data
      *
      * @return void
-     * @throws \Exception
      */
     public function updateAction()
     {
@@ -378,7 +373,6 @@ public function installAdminUserAction()
      * Controller for Uninstall Command
      *
      * @return void
-     * @throws \Exception
      */
     public function uninstallAction()
     {
@@ -420,7 +414,7 @@ public function maintenanceAction()
      * Shows necessary information for installing Magento
      *
      * @return string
-     * @throws \Exception
+     * @throws \InvalidArgumentException
      */
     public function helpAction()
     {
diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 7a055053006ee..8ce63e6af582d 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -682,7 +682,7 @@ private function setMaintenanceMode($value)
      * @param string $dbUser
      * @param string $dbPass
      * @return boolean
-     * @throws \Exception
+     * @throws \Magento\Setup\Exception
      */
     public function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '')
     {

From 9cd1b47a6596ba9a0fa5c79a86407c2e6099dbab Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Wed, 10 Dec 2014 18:16:25 +0200
Subject: [PATCH 209/474] MAGETWO-31627: Remove proxy for config classes

---
 .../TestFramework/ObjectManager/Config.php    |   9 +-
 .../ObjectManager/Environment/Developer.php   |   6 +-
 .../ObjectManager/Compiled/Config.php         |  55 ++++++++
 .../ObjectManager/Config/ProxyConfig.php      | 123 ------------------
 .../ObjectManager/Environment/Compiled.php    |   4 +-
 .../ObjectManager/Environment/Developer.php   |   6 +-
 6 files changed, 67 insertions(+), 136 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Interception/ObjectManager/Compiled/Config.php
 delete mode 100644 lib/internal/Magento/Framework/ObjectManager/Config/ProxyConfig.php

diff --git a/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Config.php b/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Config.php
index 5fe3e0f47a877..a2d51c2a2a97f 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Config.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Config.php
@@ -10,11 +10,14 @@
 class Config extends \Magento\Framework\Interception\ObjectManager\Config
 {
     /**
-     * Clean configuration by recreating subject for proxy config
+     * Clean configuration
      */
     public function clean()
     {
-        $className = get_class($this->subjectConfig);
-        $this->subjectConfig = new $className();
+        $this->_preferences = [];
+        $this->_virtualTypes = [];
+        $this->_arguments = [];
+        $this->_nonShared = [];
+        $this->_mergedArguments = [];
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Environment/Developer.php b/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Environment/Developer.php
index e3683e9b2147c..352ca61367032 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Environment/Developer.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Environment/Developer.php
@@ -13,10 +13,8 @@ public function getDiConfig()
     {
         if (!$this->config) {
             $this->config = new \Magento\TestFramework\ObjectManager\Config(
-                new \Magento\Framework\ObjectManager\Config\Config(
-                    $this->envFactory->getRelations(),
-                    $this->envFactory->getDefinitions()
-                )
+                $this->envFactory->getRelations(),
+                $this->envFactory->getDefinitions()
             );
         }
 
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Compiled/Config.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Compiled/Config.php
new file mode 100644
index 0000000000000..d8bda0213b7c8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Compiled/Config.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * ObjectManager config with interception processing
+ *
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Framework\Interception\ObjectManager\Compiled;
+
+class Config extends \Magento\Framework\ObjectManager\Config\Compiled
+{
+    /**
+     * @var \Magento\Framework\Interception\ConfigInterface
+     */
+    protected $interceptionConfig;
+
+    /**
+     * Set Interception config
+     *
+     * @param \Magento\Framework\Interception\ConfigInterface $interceptionConfig
+     * @return void
+     */
+    public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInterface $interceptionConfig)
+    {
+        $this->interceptionConfig = $interceptionConfig;
+    }
+
+    /**
+     * Retrieve instance type with interception processing
+     *
+     * @param string $instanceName
+     * @return string
+     */
+    public function getInstanceType($instanceName)
+    {
+        $type = parent::getInstanceType($instanceName);
+        if ($this->interceptionConfig && $this->interceptionConfig->hasPlugins($instanceName)) {
+            return $type . '\\Interceptor';
+        }
+        return $type;
+    }
+
+    /**
+     * Retrieve instance type without interception processing
+     *
+     * @param string $instanceName
+     * @return string
+     */
+    public function getOriginalInstanceType($instanceName)
+    {
+        return parent::getInstanceType($instanceName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/ProxyConfig.php b/lib/internal/Magento/Framework/ObjectManager/Config/ProxyConfig.php
deleted file mode 100644
index ebaeace935a45..0000000000000
--- a/lib/internal/Magento/Framework/ObjectManager/Config/ProxyConfig.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-namespace Magento\Framework\ObjectManager\Config;
-
-use Magento\Framework\ObjectManager\ConfigCacheInterface;
-use Magento\Framework\ObjectManager\RelationsInterface;
-
-class ProxyConfig implements \Magento\Framework\ObjectManager\ConfigInterface
-{
-    /**
-     * @var \Magento\Framework\ObjectManager\ConfigInterface
-     */
-    protected $subjectConfig;
-
-    /**
-     * @param \Magento\Framework\ObjectManager\ConfigInterface $config
-     */
-    public function __construct(\Magento\Framework\ObjectManager\ConfigInterface $config)
-    {
-        $this->subjectConfig = $config;
-    }
-
-    /**
-     * Set class relations
-     *
-     * @param RelationsInterface $relations
-     *
-     * @return void
-     */
-    public function setRelations(RelationsInterface $relations)
-    {
-        $this->subjectConfig->setRelations($relations);
-    }
-
-    /**
-     * Set configuration cache instance
-     *
-     * @param ConfigCacheInterface $cache
-     *
-     * @return void
-     */
-    public function setCache(ConfigCacheInterface $cache)
-    {
-        $this->subjectConfig->setCache($cache);
-    }
-
-    /**
-     * Retrieve list of arguments per type
-     *
-     * @param string $type
-     *
-     * @return array
-     */
-    public function getArguments($type)
-    {
-        return $this->subjectConfig->getArguments($type);
-    }
-
-    /**
-     * Check whether type is shared
-     *
-     * @param string $type
-     *
-     * @return bool
-     */
-    public function isShared($type)
-    {
-        return $this->subjectConfig->isShared($type);
-    }
-
-    /**
-     * Retrieve instance type
-     *
-     * @param string $instanceName
-     *
-     * @return mixed
-     */
-    public function getInstanceType($instanceName)
-    {
-        return $this->subjectConfig->getInstanceType($instanceName);
-    }
-
-    /**
-     * Retrieve preference for type
-     *
-     * @param string $type
-     *
-     * @return string
-     * @throws \LogicException
-     */
-    public function getPreference($type)
-    {
-        return $this->subjectConfig->getPreference($type);
-    }
-
-    /**
-     * Extend configuration
-     *
-     * @param array $configuration
-     *
-     * @return void
-     */
-    public function extend(array $configuration)
-    {
-        $this->subjectConfig->extend($configuration);
-    }
-
-    /**
-     * Returns list of virtual types
-     *
-     * @return array
-     */
-    public function getVirtualTypes()
-    {
-        return $this->subjectConfig->getVirtualTypes();
-    }
-}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Environment/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Environment/Compiled.php
index 834afc4d5dea0..fbefb921be8a9 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Environment/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Environment/Compiled.php
@@ -49,8 +49,8 @@ class Compiled extends AbstractEnvironment implements EnvironmentInterface
     public function getDiConfig()
     {
         if (!$this->config) {
-            $this->config = new \Magento\Framework\Interception\ObjectManager\Config(
-                new \Magento\Framework\ObjectManager\Config\Compiled($this->getConfigData())
+            $this->config = new \Magento\Framework\Interception\ObjectManager\Compiled\Config(
+                $this->getConfigData()
             );
         }
 
diff --git a/lib/internal/Magento/Framework/ObjectManager/Environment/Developer.php b/lib/internal/Magento/Framework/ObjectManager/Environment/Developer.php
index 648851cc55641..d195931351c9a 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Environment/Developer.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Environment/Developer.php
@@ -38,10 +38,8 @@ public function getDiConfig()
     {
         if (!$this->config) {
             $this->config = new \Magento\Framework\Interception\ObjectManager\Config(
-                new \Magento\Framework\ObjectManager\Config\Config(
-                    $this->envFactory->getRelations(),
-                    $this->envFactory->getDefinitions()
-                )
+                $this->envFactory->getRelations(),
+                $this->envFactory->getDefinitions()
             );
         }
 

From e83ecb665e101961ca8f81dcd68dfcd70706275d Mon Sep 17 00:00:00 2001
From: Denys Rul <drul@ebay.com>
Date: Wed, 10 Dec 2014 18:16:47 +0200
Subject: [PATCH 210/474] MAGETWO-8915: Gift Card isn't saved if in Amounts
 grid were added two rows with the same value

- Fix validate-digits bug
- Implement '_super' property
---
 .../web/js/core/renderer/components/types.js  |  2 +
 .../base/web/js/core/renderer/renderer.js     |  2 +
 app/code/Magento/Ui/view/base/web/js/form.js  | 12 +--
 .../Ui/view/base/web/js/form/client.js        |  2 +
 .../Ui/view/base/web/js/form/component.js     |  4 +-
 .../view/base/web/js/form/components/area.js  | 26 ++----
 .../web/js/form/components/collapsible.js     | 26 ++----
 .../base/web/js/form/components/collection.js | 37 ++++----
 .../web/js/form/components/collection/item.js | 35 +++----
 .../base/web/js/form/components/fieldset.js   | 20 +---
 .../view/base/web/js/form/components/group.js | 34 +++----
 .../view/base/web/js/form/components/html.js  | 57 ++++++------
 .../view/base/web/js/form/components/tab.js   | 30 +++---
 .../base/web/js/form/components/tab_group.js  | 16 ++--
 .../view/base/web/js/form/element/abstract.js | 52 +++++------
 .../view/base/web/js/form/element/boolean.js  |  8 +-
 .../base/web/js/form/element/multiselect.js   | 19 +---
 .../view/base/web/js/form/element/select.js   | 22 ++---
 .../view/base/web/js/form/element/textarea.js | 18 +---
 .../Magento/Ui/view/base/web/js/lib/class.js  | 93 ++++++++++++++-----
 lib/web/mage/validation.js                    |  6 +-
 21 files changed, 243 insertions(+), 278 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/core/renderer/components/types.js b/app/code/Magento/Ui/view/base/web/js/core/renderer/components/types.js
index 773ffbf6fbcc7..9441e228d3ed3 100644
--- a/app/code/Magento/Ui/view/base/web/js/core/renderer/components/types.js
+++ b/app/code/Magento/Ui/view/base/web/js/core/renderer/components/types.js
@@ -18,6 +18,8 @@ define([
             this.types = {};
 
             this.set(types);
+
+            return this;
         },
 
         set: function(types){
diff --git a/app/code/Magento/Ui/view/base/web/js/core/renderer/renderer.js b/app/code/Magento/Ui/view/base/web/js/core/renderer/renderer.js
index 25267d5393544..208aa34fb5e27 100644
--- a/app/code/Magento/Ui/view/base/web/js/core/renderer/renderer.js
+++ b/app/code/Magento/Ui/view/base/web/js/core/renderer/renderer.js
@@ -15,6 +15,8 @@ define([
         initialize: function(data){
             this.types = new Types(data.types);
             this.layout = new Layout(data.layout, this.types);
+
+            return this;
         },
 
         render: function(data){
diff --git a/app/code/Magento/Ui/view/base/web/js/form.js b/app/code/Magento/Ui/view/base/web/js/form.js
index cffdbd13f9d07..6d16976fc8559 100644
--- a/app/code/Magento/Ui/view/base/web/js/form.js
+++ b/app/code/Magento/Ui/view/base/web/js/form.js
@@ -5,14 +5,13 @@
  * @license     {license_link}
  */
 define([
+    'underscore',
     'Magento_Ui/js/form/component',
     'Magento_Ui/js/lib/spinner',
     './form/adapter'
-], function (Component, loader, adapter) {
+], function (_, Component, loader, adapter) {
     'use strict';
 
-    var __super__ = Component.prototype;
-
     function collectData(selector){
         var items = document.querySelectorAll(selector),
             result = {};
@@ -29,11 +28,12 @@ define([
     return Component.extend({
 
         initialize: function(){
-            __super__.initialize.apply(this, arguments);
-
-            this.initAdapter()
+            this._super()
+                .initAdapter()
                 .initSelector()
                 .hideLoader();
+
+            return this;
         },
 
         initAdapter: function(){
diff --git a/app/code/Magento/Ui/view/base/web/js/form/client.js b/app/code/Magento/Ui/view/base/web/js/form/client.js
index 2e7c8dbb25c5b..e08e503f3f583 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/client.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/client.js
@@ -50,6 +50,8 @@ define([
          */
         initialize: function(config) {
             _.extend(this, defaults, config);
+
+            return this;
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/component.js b/app/code/Magento/Ui/view/base/web/js/form/component.js
index 70b464991a72c..e603bf170aaad 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/component.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/component.js
@@ -77,7 +77,9 @@ define([
             this.initProperties()
                 .initObservable()
                 .initListeners()
-                .initUnique()
+                .initUnique();
+
+            return this;
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/area.js b/app/code/Magento/Ui/view/base/web/js/form/components/area.js
index ba96a65da69bf..7181a784e2381 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/area.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/area.js
@@ -10,27 +10,22 @@ define([
 ], function(_, Tab) {
     'use strict';
 
-    var defaults = {
-        uniqueNs:   'activeArea',
-        template:   'ui/area',
-        changed:    false,
-        loading:    false
-    };
-
-    var __super__ = Tab.prototype;
-
     return Tab.extend({
+        defaults: {
+            uniqueNs:   'activeArea',
+            template:   'ui/area',
+            changed:    false,
+            loading:    false
+        },
 
         /**
          * Extends instance with defaults. Invokes parent initialize method.
          * Calls initListeners and pushParams methods.
          */
         initialize: function() {
-            _.extend(this, defaults);
-
             _.bindAll(this, 'onChildrenUpdate', 'onContentLoading', 'onContentLoaded');
 
-            __super__.initialize.apply(this, arguments);
+            return this._super();
         },
 
         /**
@@ -39,9 +34,8 @@ define([
          * @return {Object} - reference to instance
          */
         initObservable: function() {
-            __super__.initObservable.apply(this, arguments);
-
-            this.observe('changed loading');
+            this._super()
+                .observe('changed loading');
 
             return this;
         },
@@ -53,7 +47,7 @@ define([
          * @return {Object} - reference to instance
          */
         initElement: function(elem){
-            __super__.initElement.apply(this, arguments);
+            this._super();
 
             elem.on({
                 'update':   this.onChildrenUpdate,
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/collapsible.js b/app/code/Magento/Ui/view/base/web/js/form/components/collapsible.js
index 1882dabe31a25..32546710c78b4 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/collapsible.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/collapsible.js
@@ -5,27 +5,14 @@
  * @license     {license_link}
  */
 define([
-    'underscore',
     'Magento_Ui/js/form/component'
-], function(_, Component) {
+], function(Component) {
     'use strict';
 
-    var defaults = {
-        collapsible:    false,
-        opened:         true
-    };
-
-    var __super__ = Component.prototype;
-
     return Component.extend({
-
-        /**
-         * Merges 'defaults' to instance, calls 'initialize' of parent
-         */
-        initialize: function() {
-            _.extend(this, defaults);
-
-            __super__.initialize.apply(this, arguments);
+        defaults: {
+            collapsible:    false,
+            opened:         true
         },
 
         /**
@@ -34,9 +21,8 @@ define([
          * @return {Object} - reference to instance
          */
         initObservable: function(){
-            __super__.initObservable.apply(this, arguments);
-
-            this.observe('opened');
+            this._super()
+                .observe('opened');
 
             return this;
         },
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/collection.js b/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
index bac8197aa2185..79a1bcbe632cd 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/collection.js
@@ -5,20 +5,13 @@
  * @license     {license_link}
  */
 define([
+    'underscore',
     'mage/utils',
+    'Magento_Ui/js/lib/registry/registry',
     'Magento_Ui/js/form/component',
-    'underscore',
-    'Magento_Ui/js/lib/registry/registry'
-], function (utils, Component, _, registry) {
+], function (_, utils, registry, Component) {
     'use strict';
 
-    var __super__ = Component.prototype;
-
-    var defaults = {
-        lastIndex: 0,
-        template: 'ui/form/components/collection'
-    };
-
     var childTemplate = {
         template:   "{name}.{itemTemplate}",
         parent:     "{name}",
@@ -27,17 +20,20 @@ define([
     };
 
     return Component.extend({
+        defaults: {
+            lastIndex: 0,
+            template: 'ui/form/components/collection'
+        },
 
         /**
          * Extends instance with default config, calls initialize of parent
          * class, calls initChildren method.
          */
         initialize: function () {
-            _.extend(this, defaults);
+            this._super()
+                .initChildren();
 
-            __super__.initialize.apply(this, arguments);
-
-            this.initChildren();
+            return this;
         },
 
         /**
@@ -45,12 +41,14 @@ define([
          *
          * @param {Object} elem - Incoming child.
          */
-        initElement: function (elem) {
-            __super__.initElement.apply(this, arguments);
+        initElement: function(elem) {
+            this._super();
 
             elem.activate();
 
             this.trigger('update');
+
+            return this;
         },
 
         /**
@@ -59,19 +57,18 @@ define([
          *
          * @returns {Collection} Chainable.
          */
-        initChildren: function () {
+        initChildren: function() {
             var data     = this.provider.data,
                 children = data.get(this.dataScope),
                 initial  = this.initialItems = [];
-                        
-            _.each(children, function(item, index){
+
+            _.each(children, function(item, index) {
                 initial.push(index);
                 this.addChild(index);
             }, this);
 
             return this;
         },
-
         /**
          * Creates new item of collection, based on incoming 'index'.
          * If not passed creates one with 'new_' prefix.
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js b/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
index 1e994d85c40eb..2abafb732d9c5 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/collection/item.js
@@ -5,27 +5,17 @@
  * @license     {license_link}
  */
 define([
-    '../tab',
     'underscore',
-    'mage/utils'
-], function (Tab, _, utils) {
+    'mage/utils',
+    '../tab'
+], function (_, utils, Tab) {
     'use strict';
 
-    var defaults = {
-        template:           'ui/form/components/collection/item',
-        displayArea:        'body',
-        label:              '',
-        uniqueNs:           'activeCollectionItem',
-        previewTpl:         'ui/form/components/collection/preview'     
-    };
-
     var previewConfig = {
         separator: ' ',
         prefix: ''
     };
 
-    var __super__ = Tab.prototype;
-
     /**
      * Parses incoming data and returnes result merged with default preview config
      * 
@@ -45,16 +35,20 @@ define([
     }
 
     return Tab.extend({
+        defaults: {
+            template:           'ui/form/components/collection/item',
+            label:              '',
+            uniqueNs:           'activeCollectionItem',
+            previewTpl:         'ui/form/components/collection/preview'   
+        },
 
         /**
          * Extends instance with default config, calls initializes of parent class
          */
         initialize: function () {
-            _.extend(this, defaults);
-
             _.bindAll(this, 'buildPreview', 'hasPreview');
 
-            __super__.initialize.apply(this, arguments);
+            return this._super();
         },
 
         /**
@@ -64,7 +58,7 @@ define([
          * @return {Object} - reference to instance
          */
         initProperties: function () {
-            __super__.initProperties.apply(this, arguments);
+            this._super();
 
             this.displayed = [];
             
@@ -80,7 +74,7 @@ define([
          * @return {Object} - reference to instance
          */
         initObservable: function () {
-            __super__.initObservable.apply(this, arguments);
+            this._super();
 
             this.observe({
                 'noPreview': true,
@@ -98,9 +92,10 @@ define([
          * @param  {Object} elem
          */
         initElement: function (elem) {
-            __super__.initElement.apply(this, arguments);
+            this._super()
+                .insertToIndexed(elem);
 
-            this.insertToIndexed(elem);
+            return this;
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
index 91e1f836b1153..faa5ff6036ca1 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js
@@ -5,27 +5,13 @@
  * @license     {license_link}
  */
 define([
-    'underscore',
     './collapsible'
-], function(_, Collapsible) {
+], function(Collapsible) {
     'use strict';
 
-    var defaults = {
-        template: 'ui/fieldset/fieldset'
-    };
-
-    var __super__ = Collapsible.prototype;
-
     return Collapsible.extend({
-
-        /**
-         * Extends instance with default config, binds required methods
-         *     to instance, calls initialize method of parent class.
-         */
-        initialize: function() {
-            _.extend(this, defaults);
-            
-            __super__.initialize.apply(this, arguments);
+        defaults: {
+            template: 'ui/fieldset/fieldset'
         }
     });
 });
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/group.js b/app/code/Magento/Ui/view/base/web/js/form/components/group.js
index 060b06eb45437..1c32ee12c415e 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/group.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/group.js
@@ -10,18 +10,7 @@ define([
     'mage/utils'
 ], function(_, Component, utils) {
     'use strict';
-
-    var defaults = {
-        hidden:         false,
-        label:          '',
-        required:       false,
-        template:       'ui/group/group',
-        fieldTemplate:  'ui/group/field',
-        breakLine:      true
-    };
-
-    var __super__ = Component.prototype;
-
+    
     function extractData(container, field){
         var data,
             value;
@@ -40,6 +29,14 @@ define([
     }
 
     return Component.extend({
+        defaults: {
+            hidden:         false,
+            label:          '',
+            required:       false,
+            template:       'ui/group/group',
+            fieldTemplate:  'ui/group/field',
+            breakLine:      true
+        },
 
         /**
          * Extends this with defaults and config.
@@ -47,12 +44,10 @@ define([
          * 
          * @param  {Object} config
          */
-        initialize: function() {
-            _.extend(this, defaults);
-            
+        initialize: function() {            
             _.bindAll(this, 'toggle');
 
-            __super__.initialize.apply(this, arguments);
+            return this._super();
         },
 
         /**
@@ -62,9 +57,10 @@ define([
          * @return {Object} - reference to instance
          */
         initObservable: function(){
-            __super__.initObservable.apply(this, arguments);
+            this._super()
+                .observe('hidden label required');
 
-            return this.observe('hidden label required');
+            return this;
         },
 
         /**
@@ -74,7 +70,7 @@ define([
          * @return {Object} - reference to instance
          */
         initElement: function(elem){
-            __super__.initElement.apply(this, arguments);
+            this._super();
 
             elem.on({
                 'toggle': this.toggle
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/html.js b/app/code/Magento/Ui/view/base/web/js/form/components/html.js
index 735b5e9c3cc60..20d957f11f9b2 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/html.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/html.js
@@ -11,29 +11,25 @@ define([
 ], function($, _, Component) {
     'use strict';
 
-    var defaults = {
-        content:        '',
-        showSpinner:    false,
-        loading:        false,
-        template:       'ui/content/content'
-    };
-
-    var __super__ = Component.prototype;
-
     return Component.extend({
+        defaults: {
+            content:        '',
+            showSpinner:    false,
+            loading:        false,
+            template:       'ui/content/content'
+        },
 
         /**
          * Extends instance with default config, calls 'initialize' method of
          *     parent, calls 'initAjaxConfig'
          */
         initialize: function() {
-            _.extend(this, defaults);
-
-            __super__.initialize.apply(this, arguments);
-
             _.bindAll(this, 'onContainerToggle', 'onDataLoaded');
 
-            this.initAjaxConfig();
+            this._super()
+                .initAjaxConfig();
+
+            return this;
         },
 
         /**
@@ -42,10 +38,9 @@ define([
          *     
          * @return {Object} - reference to instance
          */
-        initObservable: function(){
-            __super__.initObservable.apply(this, arguments);
-
-            this.observe('content loading');
+        initObservable: function() {
+            this._super()
+                .observe('content loading');
 
             return this;
         },
@@ -55,18 +50,18 @@ define([
          * 
          * @return {Object} - reference to instance
          */
-        initListeners: function () {
-            __super__.initListeners.apply(this, arguments);
+        initListeners: function() {
+            this._super();
 
-            this.loading.subscribe(function(value){
+            this.loading.subscribe(function(value) {
                 this.trigger(value ? 'loading' : 'loaded');
             }, this);
 
             return this;
         },
 
-        initContainer: function(parent){
-            __super__.initContainer.apply(this, arguments);
+        initContainer: function(parent) {
+            this._super();
 
             parent.on('active', this.onContainerToggle);
 
@@ -94,8 +89,8 @@ define([
          * 
          * @param  {Boolean} active
          */
-        onContainerToggle: function(active){
-            if(active && this.shouldLoad()){
+        onContainerToggle: function(active) {
+            if (active && this.shouldLoad()) {
                 this.loadData();
             }
         },
@@ -105,7 +100,7 @@ define([
          * 
          * @return {Boolean} [description]
          */
-        hasData: function(){
+        hasData: function() {
             return !!this.content();
         },
 
@@ -114,7 +109,7 @@ define([
          * 
          * @return {Boolean}
          */
-        shouldLoad: function(){
+        shouldLoad: function() {
             return this.source && !this.hasData() && !this.loading();
         },
 
@@ -123,7 +118,7 @@ define([
          * 
          * @return {Object} - reference to instance
          */
-        loadData: function(){
+        loadData: function() {
             this.loading(true);
 
             $.ajax(this.ajaxConfig);
@@ -137,9 +132,9 @@ define([
          * 
          * @param  {String} data
          */
-        onDataLoaded: function(data){
+        onDataLoaded: function(data) {
             this.updateContent(data)
-                .loading(false); 
+                .loading(false);
         },
 
         /**
@@ -148,7 +143,7 @@ define([
          * @param  {String} content
          * @return {Object} - reference to instance
          */
-        updateContent: function(content){
+        updateContent: function(content) {
             this.content(content);
 
             return this;
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/tab.js b/app/code/Magento/Ui/view/base/web/js/form/components/tab.js
index a64aa4eca7748..6ddf45b086684 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/tab.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/tab.js
@@ -5,31 +5,24 @@
  * @license     {license_link}
  */
 define([
-    'underscore',
     '../component'
-], function(_, Component) {
+], function(Component) {
     'use strict';
 
-    var defaults = {
-        uniqueProp:     'active',
-        active:         false,
-        wasActivated:   false
-    };
-
-    var __super__ = Component.prototype;
-
     return Component.extend({
+        defaults: {
+            uniqueProp:     'active',
+            active:         false,
+            wasActivated:   false
+        },
 
         /**
          * Extends instance with defaults. Invokes parent initialize method.
          * Calls initListeners and pushParams methods.
          */
         initialize: function() {
-            _.extend(this, defaults);
-
-            __super__.initialize.apply(this, arguments);
-
-            this.setUnique();
+            this._super()
+                .setUnique();
         },
 
         /**
@@ -38,9 +31,8 @@ define([
          * @return {Object} - reference to instance
          */
         initObservable: function() {
-            __super__.initObservable.apply(this, arguments);
-
-            this.observe('active wasActivated');
+            this._super()
+                .observe('active wasActivated');
 
             return this;
         },
@@ -48,7 +40,7 @@ define([
         onUniqueUpdate: function(name){
             var active = name === this.name;
 
-            __super__.onUniqueUpdate.apply(this, arguments);
+            this._super();
 
             this.trigger('active', active);
         },
diff --git a/app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js b/app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js
index 2f06b68943817..fdf04bb5dfb83 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/components/tab_group.js
@@ -5,13 +5,12 @@
  * @license     {license_link}
  */
 define([
+    'underscore',
     './collapsible',
     'Magento_Ui/js/lib/spinner'
-], function(Collapsible, loader) {
+], function(_, Collapsible, loader) {
     'use strict';
    
-    var __super__ = Collapsible.prototype;
-
     return Collapsible.extend({
 
         /**
@@ -21,9 +20,8 @@ define([
          * @returns {Object} - reference to instance
          */
         initElement: function(elem){
-            __super__.initElement.apply(this, arguments);    
-
-            this.initActivation(elem)
+            this._super()
+                .initActivation(elem)
                 .hideLoader();
 
             return this;
@@ -38,7 +36,7 @@ define([
             var data    = this.provider.data,
                 handler = this.onValidate.bind(this);
 
-            __super__.initListeners.apply(this, arguments); 
+            this._super();
 
             data.on('validate', handler, this.name);
             
@@ -48,8 +46,9 @@ define([
         /**
          * Activates element if one is first or if one has 'active' propert
          * set to true.
+         *
          * @param  {Object} elem
-         * @return {Object} - reference to instance
+         * @returns {Object} - reference to instance
          */
         initActivation: function(elem){
             var elems   = this.elems(),
@@ -71,6 +70,7 @@ define([
          * of params storage, and if defined, activates element, sets 
          * 'allValid' property of instance to false and sets invalid's
          * 'focused' property to true.
+         *
          * @param {Object} elem
          */
         validate: function(elem){
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
index b3cac18588b2e..5249498f8df06 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -12,27 +12,24 @@ define([
 ], function (_, utils, Component, validator) {
     'use strict';
 
-    var defaults = {
-        hidden:             false,
-        preview:            '',
-        focused:            false,
-        tooltip:            null,
-        required:           false,
-        disabled:           false,
-        tmpPath:            'ui/form/element/',
-        tooltipTpl:         'ui/form/element/helper/tooltip',
-        input_type:         'input',
-        placeholder:        null,
-        noticeid:           null,
-        description:        '',
-        label:              '',
-        error:              '',
-        notice:             null
-    };
-
-    var __super__ = Component.prototype;
-
     return Component.extend({
+        defaults: {
+            hidden:             false,
+            preview:            '',
+            focused:            false,
+            tooltip:            null,
+            required:           false,
+            disabled:           false,
+            tmpPath:            'ui/form/element/',
+            tooltipTpl:         'ui/form/element/helper/tooltip',
+            input_type:         'input',
+            placeholder:        null,
+            noticeid:           null,
+            description:        '',
+            label:              '',
+            error:              '',
+            notice:             null
+        },
 
         /**
          * Invokes initialize method of parent class, contains initialization
@@ -41,14 +38,13 @@ define([
          * @param {Object} config - form element configuration
          */
         initialize: function () {
-            _.extend(this, defaults);
-
             _.bindAll(this, 'onUpdate', 'reset');
 
-            __super__.initialize.apply(this, arguments);
-
-            this.setHidden(this.hidden())
+            this._super()
+                .setHidden(this.hidden())
                 .store(this.value());
+
+            return this;
         },
 
         /**
@@ -60,7 +56,7 @@ define([
             var value = this.getInititalValue(), 
                 rules;
 
-            __super__.initObservable.apply(this, arguments);
+            this._super();
 
             rules = this.validation = this.validation || {};
 
@@ -81,7 +77,7 @@ define([
          * @returns {Abstract} Chainable.
          */
         initProperties: function () {
-            __super__.initProperties.apply(this, arguments);
+            this._super();
 
             _.extend(this, {
                 'uid':        utils.uniqueid(),
@@ -104,7 +100,7 @@ define([
             var provider  = this.provider,
                 data      = provider.data;
 
-            __super__.initListeners.apply(this, arguments);
+            this._super();
 
             data.on('reset', this.reset, this.name);
             
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/boolean.js b/app/code/Magento/Ui/view/base/web/js/form/element/boolean.js
index e8cf35d936781..91769ee699e76 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/boolean.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/boolean.js
@@ -9,8 +9,6 @@ define([
 ], function (Abstract) {
     'use strict';
 
-    var __super__ = Abstract.prototype;
-
     return Abstract.extend({
         /**
          * Converts the result of parent 'getInitialValue' call to boolean
@@ -18,9 +16,7 @@ define([
          * @return {Boolean}
          */
         getInititalValue: function(){
-            var value = __super__.getInititalValue.apply(this, arguments);
-
-            return !!+value;
+            return !!+this._super();
         },
 
         /**
@@ -31,7 +27,7 @@ define([
          * @return {Object} - reference to instance
          */
         store: function() {
-            __super__.store.apply(this, arguments);
+            this._super();
 
             if (this.hasUnique) {
                 this.setUnique();
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js b/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
index e97182936306c..8eefb5c126425 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/multiselect.js
@@ -11,23 +11,10 @@ define([
 ], function (_, utils, Select) {
     'use strict';
 
-    var defaults = {
-        size: 5,
-        template: 'ui/form/element/multiselect'
-    };
-
-    var __super__ = Select.prototype;
-
     return Select.extend({
-
-        /**
-         * Extends instance with defaults, extends config with formatted values
-         *     and options, and invokes initialize method of AbstractElement class.
-         */
-        initialize: function () {
-            _.extend(this, defaults);
-            
-            __super__.initialize.apply(this, arguments);
+        defaults: {
+            size:       5,
+            template:   'ui/form/element/multiselect'
         },
 
         /**
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/select.js b/app/code/Magento/Ui/view/base/web/js/form/element/select.js
index 2173fcaab2938..69fde39c9bbf7 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/select.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/select.js
@@ -11,12 +11,6 @@ define([
 ], function (_, utils, Abstract) {
     'use strict';
 
-    var defaults = {
-        template: 'ui/form/element/select'
-    };
-
-    var __super__ = Abstract.prototype;
-    
     var inputNode = {
         name:  '{index}_input',
         type: 'input',
@@ -90,6 +84,9 @@ define([
     }
 
     return Abstract.extend({
+        defaults: {
+            template: 'ui/form/element/select'
+        },
 
         /**
          * Extends instance with defaults, extends config with formatted values
@@ -97,15 +94,14 @@ define([
          *     If instance's 'customEntry' property is set to true, calls 'initInput'
          */
         initialize: function (config) {
-            _.extend(this, defaults);
-
-            this.initOptions(config);
-
-            __super__.initialize.apply(this, arguments);
+            this.initOptions(config)
+                ._super();
    
             if(this.customEntry){
                 this.initInput();
             }
+
+            return this;
         },
 
         /**
@@ -115,7 +111,7 @@ define([
          * @returns {Select} Chainable.
          */
         initObservable: function(){
-            __super__.initObservable.apply(this, arguments);
+            this._super();
 
             this.initialOptions = this.options;
 
@@ -161,7 +157,7 @@ define([
          * @returns {Number|String}
          */
         getInititalValue: function(){
-            var value = __super__.getInititalValue.apply(this, arguments);
+            var value = this._super();
 
             if(value !== ''){
                 return value;
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/textarea.js b/app/code/Magento/Ui/view/base/web/js/form/element/textarea.js
index d36954c0f7914..36bd470ccfeaf 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/textarea.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/textarea.js
@@ -9,21 +9,11 @@ define([
 ], function (Abstract) {
     'use strict';
 
-    var defaults = {
-        cols: 15,
-        rows: 2,
-        template: 'ui/form/element/textarea'
-    };
-
     return Abstract.extend({
-
-        /**
-         * Invokes initialize method of parent class.
-         */
-        initialize: function (config) {
-            _.extend(this, defaults);
-            
-            Abstract.prototype.initialize.apply(this, arguments);
+        defaults: {
+            cols:       15,
+            rows:       2,
+            template:   'ui/form/element/textarea'
         }
     });
 });
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/class.js b/app/code/Magento/Ui/view/base/web/js/lib/class.js
index 6cc7abeabf548..099d5ad982905 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/class.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/class.js
@@ -9,38 +9,89 @@ define([
 ], function(_) {
     'use strict';
 
+    var superReg = /\b_super\b/;
+
+    /**
+     * Checks wether the incoming method contains calls of the '_super' property.
+     *
+     * @param {Function} method - Method to be checked.
+     * @returns {Boolean}
+     */
+    function hasSuper(method){
+        return _.isFunction(method) && superReg.test(method);
+    }
+
+    /**
+     * Wraps the incoming method to implement support of the '_super' method.
+     *
+     * @param {Object} parent - Reference to parents' prototype.
+     * @param {String} name - Name of the method.
+     * @param {Function} method - Method to be wrapped.
+     * @returns {Function} Wrapped method.
+     */
+    function superWrapper(parent, name, method){
+        return function(){
+            var superTmp    = this._super,
+                args        = arguments,
+                result;
+
+            this._super = function(){
+                var superArgs = arguments.length ? arguments : args;
+
+                return parent[name].apply(this, superArgs);
+            };
+
+            result = method.apply(this, args);
+
+            this._super = superTmp;
+
+            return result;
+        }
+    }
+
     /**
      * Analogue of Backbone.extend function.
-     * @param  {Object} protoProps - object, that describes the prototype of
-     * created constructor.
-     * @return {Function} - new constructor
+     *
+     * @param  {Object} extender - 
+     *      Object, that describes the prototype of
+     *      created constructor.
+     * @param {...Object} Multiple amount of mixins.
+     * @returns {Function} New constructor.
      */
-    function extend( protoProps ){
-        var parent = this,
+    function extend(extender){
+        var parent      = this,
+            parentProto = parent.prototype,
+            defaults    = extender.defaults || {},
             child,
-            args,
-            hasConstructor;
+            childProto,
+            mixins;
 
-        protoProps      = protoProps || {};
-        hasConstructor  = protoProps.hasOwnProperty('constructor');
+        child = function(){
+            _.defaults(this, defaults);
 
-        child = hasConstructor ?
-            protoProps.constructor :
-            function() {
-                return parent.apply(this, arguments);
-            };
+            parent.apply(this, arguments);
+        };
+
+        delete extender.defaults;
+
+        childProto = child.prototype = Object.create(parentProto);
 
-        child.prototype = Object.create( parent.prototype );
-        child.prototype.constructor = child;
+        childProto.constructor = child;
 
-        args = [child.prototype];
+        _.each(extender, function(method, name){
+            childProto[name] = hasSuper(method) ?
+                superWrapper(parentProto, name, method) :
+                method;
+        });
 
-        args.push.apply(args, arguments);
+        mixins = _.toArray(arguments).slice(1);
 
-        _.extend.apply(_, args);
+        mixins.forEach(function(mixin){
+            _.extend(childProto, mixin);
+        });
 
-        child.extend = extend;
-        child.__super__ = parent.prototype;
+        child.__super__ = parentProto;
+        child.extend    = extend;
 
         return child;
     }
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index d49246660c6c4..0dcf3f731c439 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -26,7 +26,7 @@
              * @param {string}
                 */
             isEmpty: function(value) {
-                return (value === '' || (value == null) || (value.length === 0) || /^\s+$/.test(value));
+                return (value === ''  || value === undefined || (value == null) || (value.length === 0) || /^\s+$/.test(value));
             },
 
             /**
@@ -46,8 +46,8 @@
              * @returns {boolean}
              */
             isBetween: function(value, from, to){
-                return (from === null || from === '' || value >= $.mage.parseNumber(from)) &&
-                       (to === null || to === '' || value <= $.mage.parseNumber(to));
+                return ($.mage.isEmpty(from) || value >= $.mage.parseNumber(from)) &&
+                       ($.mage.isEmpty(to) || value <= $.mage.parseNumber(to));
             },
 
             /**

From 83df7ef8f40de994d69c271d0dd1a4f57c4db74b Mon Sep 17 00:00:00 2001
From: Alex Akimov <aakimov@ebay.com>
Date: Wed, 10 Dec 2014 18:12:50 +0200
Subject: [PATCH 211/474] MAGETWO-31620: There is no Ability to Select Product
 Qty and Ship Addresses for new Customer During Multiple Checkout

---
 .../Checkout/Address/ShippingSaved.php        |  42 ++++-
 .../Checkout/Address/ShippingSavedTest.php    | 151 ++++++++++++++++++
 2 files changed, 190 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php

diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php
index bb3f09c2e4f14..abe9a6ce45c56 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php
@@ -9,20 +9,50 @@
 
 use Magento\Framework\App\Action\Context;
 use Magento\Multishipping\Controller\Checkout\Address;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 
 /**
  * Class ShippingSaved
+ *
+ * @SuppressWarnings(PHPMD.LongVariable)
  */
 class ShippingSaved extends Address
 {
+    /**
+     * @var \Magento\Customer\Api\AddressRepositoryInterface
+     */
+    private $addressRepository;
+
+    /**
+     * @var \Magento\Framework\Api\FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
     /**
      * Initialize dependencies.
      *
      * @param Context $context
+     * @param AddressRepositoryInterface $addressRepository
+     * @param FilterBuilder $filterBuilder
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
      */
-    public function __construct(Context $context)
-    {
+    public function __construct(
+        Context $context,
+        AddressRepositoryInterface $addressRepository,
+        FilterBuilder $filterBuilder,
+        SearchCriteriaBuilder $searchCriteriaBuilder
+    ) {
         parent::__construct($context);
+        $this->addressRepository = $addressRepository;
+        $this->filterBuilder = $filterBuilder;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
     }
 
     /**
@@ -30,10 +60,16 @@ public function __construct(Context $context)
      */
     public function execute()
     {
+        $filter = $this->filterBuilder->setField('parent_id')->setValue($this->_getCheckout()->getCustomer()->getId())
+            ->setConditionType('eq')->create();
+        $addresses = (array)($this->addressRepository->getList(
+            $this->searchCriteriaBuilder->addFilter([$filter])->create()
+        )->getItems());
+
         /**
          * if we create first address we need reset emd init checkout
          */
-        if (count($this->_getCheckout()->getCustomer()->getAddresses()) === 1) {
+        if (count($addresses) === 1) {
             $this->_getCheckout()->reset();
         }
         $this->_redirect('*/checkout/addresses');
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php
new file mode 100644
index 0000000000000..75a48b539eb7d
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Multishipping\Controller\Checkout\Address;
+
+/**
+ * @SuppressWarnings(PHPMD.LongVariable)
+ */
+class ShippingSavedTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ShippingSaved
+     */
+    private $controller;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $addressRepositoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $filterBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $criteriaBuilderMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $checkoutMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $redirectMock;
+
+    protected function setUp()
+    {
+        $this->checkoutMock = $this->getMock(
+            'Magento\Multishipping\Model\Checkout\Type\Multishipping',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->objectManagerMock->expects($this->any())
+            ->method('get')
+            ->with('Magento\Multishipping\Model\Checkout\Type\Multishipping')
+            ->willReturn($this->checkoutMock);
+        $this->contextMock = $this->getMock('Magento\Framework\App\Action\Context', [], [], '', false);
+        $requestMock = $this->getMock('Magento\Framework\App\RequestInterface');
+        $responseMock = $this->getMock('Magento\Framework\App\ResponseInterface');
+        $this->redirectMock = $this->getMock('Magento\Framework\App\Response\RedirectInterface');
+        $this->contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock);
+        $this->contextMock->expects($this->any())->method('getRequest')->willReturn($requestMock);
+        $this->contextMock->expects($this->any())->method('getResponse')->willReturn($responseMock);
+        $this->contextMock->expects($this->any())->method('getRedirect')->willReturn($this->redirectMock);
+
+        $this->addressRepositoryMock = $this->getMock('Magento\Customer\Api\AddressRepositoryInterface');
+        $this->filterBuilderMock = $this->getMock('Magento\Framework\Api\FilterBuilder', [], [], '', false);
+        $this->criteriaBuilderMock = $this->getMock('Magento\Framework\Api\SearchCriteriaBuilder', [], [], '', false);
+        $this->controller = new ShippingSaved(
+            $this->contextMock,
+            $this->addressRepositoryMock,
+            $this->filterBuilderMock,
+            $this->criteriaBuilderMock
+        );
+    }
+
+    public function testExecuteResetsCheckoutIfCustomerHasAddedNewShippingAddressAndItIsTheOnlyAddressHeHas()
+    {
+        $customerId = 1;
+        $customerMock = $this->getMock('Magento\Customer\Api\Data\CustomerInterface');
+        $customerMock->expects($this->any())->method('getId')->willReturn($customerId);
+        $this->checkoutMock->expects($this->any())->method('getCustomer')->willReturn($customerMock);
+
+        $this->mockCustomerAddressRepository(
+            $customerId,
+            array($this->getMock('Magento\Customer\Api\Data\AddressInterface'))
+        );
+
+        // check that checkout is reset
+        $this->checkoutMock->expects($this->once())->method('reset');
+        $this->controller->execute();
+    }
+
+    public function testExecuteDoesNotResetCheckoutIfCustomerHasMoreThanOneAddress()
+    {
+        $customerId = 1;
+        $customerMock = $this->getMock('Magento\Customer\Api\Data\CustomerInterface');
+        $customerMock->expects($this->any())->method('getId')->willReturn($customerId);
+        $this->checkoutMock->expects($this->any())->method('getCustomer')->willReturn($customerMock);
+
+        $this->mockCustomerAddressRepository(
+            $customerId,
+            array(
+                $this->getMock('Magento\Customer\Api\Data\AddressInterface'),
+                $this->getMock('Magento\Customer\Api\Data\AddressInterface'),
+            )
+        );
+
+        // check that checkout is not reset
+        $this->checkoutMock->expects($this->never())->method('reset');
+        $this->controller->execute();
+    }
+
+    /**
+     * Mock customer address repository
+     *
+     * @param int $customerId
+     * @param array $addresses list of customer addresses
+     */
+    private function mockCustomerAddressRepository($customerId, array $addresses) {
+        $filterMock = $this->getMock('Magento\Framework\Api\Filter', [], [], '', false);
+        $this->filterBuilderMock->expects($this->once())->method('setField')->with('parent_id')->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())->method('setValue')->with($customerId)->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())->method('setConditionType')->with('eq')->willReturnSelf();
+        $this->filterBuilderMock->expects($this->once())->method('create')->willReturn($filterMock);
+
+        $searchCriteriaMock = $this->getMock('Magento\Framework\Api\SearchCriteria', [], [], '', false);
+        $this->criteriaBuilderMock->expects($this->once())->method('addFilter')->with([$filterMock])->willReturnSelf();
+        $this->criteriaBuilderMock->expects($this->once())->method('create')->willReturn($searchCriteriaMock);
+
+        $searchResultMock = $this->getMock('Magento\Customer\Api\Data\AddressSearchResultsInterface');
+        $this->addressRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn($searchResultMock);
+
+        $searchResultMock->expects($this->once())->method('getItems')->willReturn($addresses);
+    }
+}

From 9a1c28cef827d7b64b40d57e115844d4bf05331e Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Wed, 10 Dec 2014 18:19:15 +0200
Subject: [PATCH 212/474] MAGETWO-31467: Price is not updated when select
 downloadable link on product page.

---
 .../Block/Catalog/Product/Links.php           | 30 ++++---------------
 .../view/frontend/web/downloadable.js         | 29 +++++++-----------
 .../Test/Legacy/_files/obsolete_methods.php   |  3 +-
 3 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
index 3008d0db0c055..f8f1856a11328 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
@@ -96,38 +96,18 @@ public function getCurrencyPrice($price)
      */
     public function getJsonConfig()
     {
-        $priceInfo = $this->getProduct()->getPriceInfo();
-        $finalPrice = $priceInfo->getPrice(FinalPrice::PRICE_CODE);
-        $regularPrice = $priceInfo->getPrice(RegularPrice::PRICE_CODE);
-        $config = [
-            'price' => $finalPrice->getAmount()->getValue(),
-            'oldPrice' => $regularPrice->getValue(),
-        ];
-        $config['links'] = $this->getLinksConfig();
-
-        return json_encode($config);
-    }
+        $finalPrice = $this->getProduct()->getPriceInfo()
+            ->getPrice(FinalPrice::PRICE_CODE);
 
-    /**
-     * Get links price config
-     *
-     * @return array
-     */
-    protected function getLinksConfig()
-    {
-        $finalPrice = $this->getProduct()->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE);
         $linksConfig = [];
         foreach ($this->getLinks() as $link) {
             $amount = $finalPrice->getCustomAmount($link->getPrice());
-            $price = $this->coreData->currency($link->getPrice(), false, false);
             $linksConfig[$link->getId()] = [
-                'price' => $price,
-                'oldPrice' => $price,
-                'inclTaxPrice' => $amount->getValue(),
-                'exclTaxPrice' => $amount->getBaseAmount()
+                'finalPrice' => $amount->getValue(),
             ];
         }
-        return $linksConfig;
+
+        return json_encode(['links' => $linksConfig]);
     }
 
     /**
diff --git a/app/code/Magento/Downloadable/view/frontend/web/downloadable.js b/app/code/Magento/Downloadable/view/frontend/web/downloadable.js
index f12ec33973091..5cc1eb98086f6 100644
--- a/app/code/Magento/Downloadable/view/frontend/web/downloadable.js
+++ b/app/code/Magento/Downloadable/view/frontend/web/downloadable.js
@@ -7,11 +7,16 @@
 /*jshint browser:true jquery:true expr:true*/
 define([
     "jquery",
-    "jquery/ui"
+    "jquery/ui",
+    "Magento_Catalog/js/price-box"
 ], function($){
     "use strict";
     
     $.widget('mage.downloadable', {
+        options: {
+            priceHolderSelector: '.price-box'
+        },
+
         _create: function() {
             var self = this;
 
@@ -39,26 +44,14 @@ define([
          * @private
          */
         _reloadPrice: function() {
-            var price = 0,
-                oldPrice = 0,
-                inclTaxPrice = 0,
-                exclTaxPrice = 0;
+            var finalPrice = 0;
             this.element.find(this.options.linkElement + ':checked').each($.proxy(function(index, element) {
-                price += this.options.config.links[$(element).val()].price;
-                oldPrice += this.options.config.links[$(element).val()].oldPrice;
-                inclTaxPrice += this.options.config.links[$(element).val()].inclTaxPrice;
-                exclTaxPrice += this.options.config.links[$(element).val()].exclTaxPrice;
+                finalPrice += this.options.config.links[$(element).val()].finalPrice;
             }, this));
 
-            this.element.trigger('changePrice', {
-                'config': 'config',
-                'price': {
-                    'price': price,
-                    'oldPrice': oldPrice,
-                    'inclTaxPrice': inclTaxPrice,
-                    'exclTaxPrice': exclTaxPrice
-                }
-            }).trigger('reloadPrice');
+            $(this.options.priceHolderSelector).trigger('updatePrice', {
+                'prices': { 'finalPrice': { 'amount': finalPrice }}
+            });
         }
     });
     
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 0bd6cb63ffa91..3aca6bea8dce5 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -2116,5 +2116,6 @@
     ['getCategoryModel', 'Magento\Catalog\Model\Resource\Url'],
     ['getTaxConfig', 'Magento\ConfigurableProduct\Pricing\Price\AttributePrice'],
     ['prepareAdjustmentConfig', 'Magento\ConfigurableProduct\Pricing\Price\AttributePrice'],
-    ['_escapeDefaultValue', 'Magento\Framework\Code\Generator\EntityAbstract']
+    ['_escapeDefaultValue', 'Magento\Framework\Code\Generator\EntityAbstract'],
+    ['getLinksConfig', 'Magento\Downloadable\Block\Catalog\Product\Links']
 );

From c0caac94063722326d8cf11c8e756a682cc560a7 Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Wed, 10 Dec 2014 18:22:14 +0200
Subject: [PATCH 213/474] MAGETWO-31627: Remove proxy for config classes

---
 .../Magento/Framework/Interception/ObjectManager/Config.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Config.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config.php
index 4274c21535b04..fafc88f27d485 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/Config.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Config.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\Framework\Interception\ObjectManager;
 
-class Config extends \Magento\Framework\ObjectManager\Config\ProxyConfig
+class Config extends \Magento\Framework\ObjectManager\Config\Config
 {
     /**
      * @var \Magento\Framework\Interception\ConfigInterface

From 14f2ea8b1d25f92a5cb3e4bf882350dbc35c4e73 Mon Sep 17 00:00:00 2001
From: Alexander Paliarush <apaliarush@ebay.com>
Date: Wed, 10 Dec 2014 18:30:17 +0200
Subject: [PATCH 214/474] MAGETWO-31644: Lib Package
 lib\internal\Magento\Framework\Api

---
 .../Api/ExtensibleDataObjectConverter.php     | 26 -------------------
 .../Framework/Api/ExtensibleObjectBuilder.php | 13 ----------
 2 files changed, 39 deletions(-)

diff --git a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
index ed4b0f4019ec4..b1ac5eaeef07d 100644
--- a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
+++ b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
@@ -68,32 +68,6 @@ public function toFlatArray(ExtensibleDataInterface $dataObject, $skipCustomAttr
         return ConvertArray::toFlatArray($dataObjectArray);
     }
 
-    /**
-     * Convert AbstractExtensibleObject into flat array.
-     *
-     * @param AbstractExtensibleObject $dataObject
-     * @param string[] $skipCustomAttributes
-     * @return array
-     * @deprecated use toFlatArray instead. Should be removed once all references are refactored.
-     */
-    public static function toFlatArrayStatic(AbstractExtensibleObject $dataObject, $skipCustomAttributes = array())
-    {
-        $dataObjectArray = $dataObject->__toArray();
-        //process custom attributes if present
-        if (!empty($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY])) {
-            /** @var AttributeValue[] $customAttributes */
-            $customAttributes = $dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY];
-            unset ($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY]);
-            foreach ($customAttributes as $attributeValue) {
-                if (!in_array($attributeValue[AttributeValue::ATTRIBUTE_CODE], $skipCustomAttributes)) {
-                    $dataObjectArray[$attributeValue[AttributeValue::ATTRIBUTE_CODE]]
-                        = $attributeValue[AttributeValue::VALUE];
-                }
-            }
-        }
-        return ConvertArray::toFlatArray($dataObjectArray);
-    }
-
     /**
      * Convert Extensible Data Object custom attributes in sequential array format.
      *
diff --git a/lib/internal/Magento/Framework/Api/ExtensibleObjectBuilder.php b/lib/internal/Magento/Framework/Api/ExtensibleObjectBuilder.php
index add16dd5b6fcb..aff71b981fa34 100644
--- a/lib/internal/Magento/Framework/Api/ExtensibleObjectBuilder.php
+++ b/lib/internal/Magento/Framework/Api/ExtensibleObjectBuilder.php
@@ -183,19 +183,6 @@ protected function getCustomAttributesCodes()
         return $attributeCodes;
     }
 
-    /**
-     * Set data item value.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return $this
-     * @deprecated This method should not be used in the client code and will be removed after Service Layer refactoring
-     */
-    public function set($key, $value)
-    {
-        return $this->_set($key, $value);
-    }
-
     /**
      * Initializes Data Object with the data from array
      *

From b488d4dd2c0a551998929b2117d58266eaa6d18c Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 10 Dec 2014 10:35:02 -0600
Subject: [PATCH 215/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- added test coverage to DeploymentConfig
---
 .../Magento/Framework/App/DeploymentConfigTest.php       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfigTest.php
index 5c826602904fb..93829af794372 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfigTest.php
@@ -95,6 +95,15 @@ public function testNotAvailable()
         $this->assertFalse($object->isAvailable());
     }
 
+    public function testNotAvailableThenAvailable()
+    {
+        $this->reader->expects($this->at(0))->method('load')->willReturn([]);
+        $this->reader->expects($this->at(1))->method('load')->willReturn(['a' => 1]);
+        $object = new DeploymentConfig($this->reader);
+        $this->assertFalse($object->isAvailable());
+        $this->assertTrue($object->isAvailable());
+    }
+
     /**
      * @param array $data
      * @expectedException \Exception

From 8cad83fe77e56d20e0415c4c4e20824dd0f32332 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Wed, 10 Dec 2014 18:36:35 +0200
Subject: [PATCH 216/474] MAGETWO-21023: CLONE - CMS Hierarchy: validation
 actions (save, copy, delete) and control buttons for AdminGWS user

---
 app/code/Magento/AdminGws/Model/Containers.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/AdminGws/Model/Containers.php b/app/code/Magento/AdminGws/Model/Containers.php
index c76b5017a690b..15905f71d3bc3 100644
--- a/app/code/Magento/AdminGws/Model/Containers.php
+++ b/app/code/Magento/AdminGws/Model/Containers.php
@@ -37,7 +37,7 @@ class Containers implements CallbackProcessorInterface
     protected $categoryResource;
 
     /**
-     * @var \Magento\Framework\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected  $storeManager;
 
@@ -46,14 +46,14 @@ class Containers implements CallbackProcessorInterface
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Cms\Model\Resource\Page $cmsPageResource
      * @param \Magento\Catalog\Model\Resource\Category $categoryResource
-     * @param \Magento\Framework\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         Role $role,
         \Magento\Framework\Registry $registry,
         \Magento\Cms\Model\Resource\Page $cmsPageResource,
         \Magento\Catalog\Model\Resource\Category $categoryResource,
-        \Magento\Framework\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_role = $role;
         $this->registry = $registry;

From 89845519dc3200837a093204bbb144b4cc575831 Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Wed, 10 Dec 2014 10:48:59 -0600
Subject: [PATCH 217/474] MAGETWO-31447: Incorrect Validation of PHP Version
 During Installation

- changed message in error
---
 .../Magento/Setup/src/Model/PhpInformation.php       | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/PhpInformation.php b/setup/module/Magento/Setup/src/Model/PhpInformation.php
index cbaaf8e2a7225..894e1f666cb12 100644
--- a/setup/module/Magento/Setup/src/Model/PhpInformation.php
+++ b/setup/module/Magento/Setup/src/Model/PhpInformation.php
@@ -57,8 +57,7 @@ public function getRequiredPhpVersion()
         if (!empty($composerInfo['platform']['php'])) {
             return $composerInfo['platform']['php'];
         } else {
-            throw new \Exception('Cannot determine required PHP version from Composer information: '
-            . 'Missing key \'platform=>php\' in \'composer.lock\' file');
+            throw new \Exception('Missing key \'platform=>php\' in \'composer.lock\' file');
         }
     }
 
@@ -79,8 +78,7 @@ public function getRequired()
             if (!empty($composerInfo['platform-dev'])) {
                 $declaredDependencies = array_merge($declaredDependencies, array_keys($composerInfo['platform-dev']));
             } else {
-                throw new \Exception('Cannot determine required PHP extensions from Composer information: '
-                    . 'Missing key \'platform-dev\' in \'composer.lock\' file');
+                throw new \Exception('Missing key \'platform-dev\' in \'composer.lock\' file');
             }
             if (!empty($composerInfo['packages'])) {
                 foreach ($composerInfo['packages'] as $package) {
@@ -89,8 +87,7 @@ public function getRequired()
                     }
                 }
             } else {
-                throw new \Exception('Cannot determine required PHP extensions from Composer information: '
-                    . 'Missing key \'packages\' in \'composer.lock\' file');
+                throw new \Exception('Missing key \'packages\' in \'composer.lock\' file');
             }
             if ($declaredDependencies) {
                 $declaredDependencies = array_unique($declaredDependencies);
@@ -115,8 +112,7 @@ public function getRequired()
     private function getComposerInfo()
     {
         if (!$this->rootDir->isExist('composer.lock')) {
-            throw new \Exception('Cannot determine required PHP version from Composer information: '
-                . '\'composer.lock\'file is absent');
+            throw new \Exception('Cannot read \'composer.lock\' file');
         }
         return json_decode($this->rootDir->readFile('composer.lock'), true);
     }

From 964f7c37bd4f5c4d5b5a150d578a6d3968ea3155 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Wed, 10 Dec 2014 19:25:48 +0200
Subject: [PATCH 218/474] MAGETWO-31629: Online payment methods removal for CE
 release

---
 dev/build/publication/edition/ee.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/build/publication/edition/ee.txt b/dev/build/publication/edition/ee.txt
index b859f74c8ba92..309d839a79807 100644
--- a/dev/build/publication/edition/ee.txt
+++ b/dev/build/publication/edition/ee.txt
@@ -39,6 +39,10 @@ dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Logging
 {app/code,dev/tests/{integration,unit}/testsuite}/Magento/PricePermissions
 {app/code,dev/tests/{integration,unit}/testsuite}/Magento/PromotionPermissions
 {app/code,dev/tests/{integration,unit}/testsuite}/Magento/Reminder
+{app/code,dev/tests/{integration,unit}/testsuite}/Magento/Authorizenet
+{app/code,dev/tests/{integration,unit}/testsuite}/Magento/Centinel
+{app/code,dev/tests/{integration,unit}/testsuite}/Magento/Ogone
+{app/code,dev/tests/{integration,unit}/testsuite}/Magento/Paypal
 
 {app/code,dev/tests/{integration,unit}/testsuite}/Magento/Reward
 dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Reward

From 9f594b7d857a606030a003fb17c984a5f84cc407 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Wed, 10 Dec 2014 11:31:41 -0600
Subject: [PATCH 219/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- Fix L1 test
---
 setup/module/Magento/Setup/src/Model/Installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 9c5ace1ff2a73..06402fb01f7f4 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -742,7 +742,7 @@ public function getInstallInfo()
     private function cleanupDb()
     {
         // stops cleanup if app/etc/config.php does not exist
-        if ($this->filesystem->getDirectoryWrite(DirectoryList::CONFIG)->isFile('config.php')) {
+        if ($this->deploymentConfig->isAvailable()) {
             $dbConfig = new DbConfig($this->deploymentConfig->getSegment(DbConfig::CONFIG_KEY));
             $config = $dbConfig->getConnection(\Magento\Framework\App\Resource\Config::DEFAULT_SETUP_CONNECTION);
             if ($config) {

From 64c8d1c9b73a9a6bc7add81d52bbeee41462f745 Mon Sep 17 00:00:00 2001
From: Maxim Medinskiy <mmedinskiy@ebay.com>
Date: Wed, 10 Dec 2014 19:33:43 +0200
Subject: [PATCH 220/474] MAGETWO-24603: Port MPERF-310:  Bundle price index
 rounding errors

---
 .../Pricing/Price/BundleSelectionPrice.php    |  5 +-
 .../Price/BundleSelectionPriceTest.php        | 58 +++++++++++++------
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
index edf1f0c9b94fb..82aa299440da3 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
@@ -123,13 +123,14 @@ public function getValue()
             } else {
                 // calculate price for selection type fixed
                 $selectionPriceValue = $this->selection->getSelectionPriceValue();
-                $value = $this->priceCurrency->convertAndRound($selectionPriceValue) * $this->quantity;
+                $value = $this->priceCurrency->convert($selectionPriceValue) * $this->quantity;
             }
         }
         if (!$this->useRegularPrice) {
             $value = $this->discountCalculator->calculateDiscount($this->bundleProduct, $value);
         }
-        $this->value = $value;
+        $this->value = $this->priceCurrency->round($value);
+
         return $this->value;
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/BundleSelectionPriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/BundleSelectionPriceTest.php
index ef9ee0656cd71..a50025724d446 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/BundleSelectionPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Pricing/Price/BundleSelectionPriceTest.php
@@ -172,9 +172,10 @@ public function testGetValueTypeDynamic($useRegularPrice)
     {
         $this->setupSelectionPrice($useRegularPrice);
         $priceCode = $useRegularPrice ? RegularPrice::PRICE_CODE : FinalPrice::PRICE_CODE;
-        $regularPrice = 100;
-        $discountedPrice = 70;
-        $expectedPrice = $useRegularPrice ? $regularPrice : $discountedPrice;
+        $regularPrice = 100.125;
+        $discountedPrice = 70.453;
+        $actualPrice = $useRegularPrice ? $regularPrice : $discountedPrice;
+        $expectedPrice = $useRegularPrice ? round($regularPrice, 2) : round($discountedPrice, 2);
 
         $this->bundleMock->expects($this->once())
             ->method('getPriceType')
@@ -185,18 +186,23 @@ public function testGetValueTypeDynamic($useRegularPrice)
             ->will($this->returnValue($this->finalPriceMock));
         $this->finalPriceMock->expects($this->once())
             ->method('getValue')
-            ->will($this->returnValue($regularPrice));
+            ->will($this->returnValue($actualPrice));
 
         if (!$useRegularPrice) {
             $this->discountCalculatorMock->expects($this->once())
                 ->method('calculateDiscount')
                 ->with(
                     $this->equalTo($this->bundleMock),
-                    $this->equalTo($regularPrice)
+                    $this->equalTo($actualPrice)
                 )
                 ->will($this->returnValue($discountedPrice));
         }
-        $this->assertEquals($expectedPrice, $this->selectionPrice->getValue());
+
+        $this->priceCurrencyMock->expects($this->once())
+            ->method('round')
+            ->with($actualPrice)
+            ->will($this->returnValue($expectedPrice));
+
         $this->assertEquals($expectedPrice, $this->selectionPrice->getValue());
     }
 
@@ -209,9 +215,10 @@ public function testGetValueTypeDynamic($useRegularPrice)
     public function testGetValueTypeFixedWithSelectionPriceType($useRegularPrice)
     {
         $this->setupSelectionPrice($useRegularPrice);
-        $regularPrice = 100;
-        $discountedPrice = 70;
-        $expectedPrice = $useRegularPrice ? $regularPrice : $discountedPrice;
+        $regularPrice = 100.125;
+        $discountedPrice = 70.453;
+        $actualPrice = $useRegularPrice ? $regularPrice : $discountedPrice;
+        $expectedPrice = $useRegularPrice ? round($regularPrice, 2) : round($discountedPrice, 2);
 
         $this->bundleMock->expects($this->once())
             ->method('getPriceType')
@@ -225,7 +232,7 @@ public function testGetValueTypeFixedWithSelectionPriceType($useRegularPrice)
             ->will($this->returnValue($this->regularPriceMock));
         $this->regularPriceMock->expects($this->once())
             ->method('getValue')
-            ->will($this->returnValue($regularPrice));
+            ->will($this->returnValue($actualPrice));
         $this->bundleMock->expects($this->once())
             ->method('setFinalPrice')
             ->will($this->returnSelf());
@@ -233,7 +240,8 @@ public function testGetValueTypeFixedWithSelectionPriceType($useRegularPrice)
             ->method('dispatch');
         $this->bundleMock->expects($this->exactly(2))
             ->method('getData')
-            ->will($this->returnValueMap(
+            ->will(
+                $this->returnValueMap(
                     [
                         ['qty', null, 1],
                         ['final_price', null, 100],
@@ -245,17 +253,23 @@ public function testGetValueTypeFixedWithSelectionPriceType($useRegularPrice)
             ->will($this->returnValue(true));
         $this->productMock->expects($this->any())
             ->method('getSelectionPriceValue')
-            ->will($this->returnValue($regularPrice));
+            ->will($this->returnValue($actualPrice));
 
         if (!$useRegularPrice) {
             $this->discountCalculatorMock->expects($this->once())
                 ->method('calculateDiscount')
                 ->with(
                     $this->equalTo($this->bundleMock),
-                    $this->equalTo($regularPrice)
+                    $this->equalTo($actualPrice)
                 )
                 ->will($this->returnValue($discountedPrice));
         }
+
+        $this->priceCurrencyMock->expects($this->once())
+            ->method('round')
+            ->with($actualPrice)
+            ->will($this->returnValue($expectedPrice));
+
         $this->assertEquals($expectedPrice, $this->selectionPrice->getValue());
     }
 
@@ -268,11 +282,11 @@ public function testGetValueTypeFixedWithSelectionPriceType($useRegularPrice)
     public function testGetValueTypeFixedWithoutSelectionPriceType($useRegularPrice)
     {
         $this->setupSelectionPrice($useRegularPrice);
-        $regularPrice = 100;
-        $discountedPrice = 70;
-        $convertedValue = 100.02;
-        $expectedPrice = $useRegularPrice ? $convertedValue : $discountedPrice;
-
+        $regularPrice = 100.125;
+        $discountedPrice = 70.453;
+        $convertedValue = 100.247;
+        $actualPrice = $useRegularPrice ? $convertedValue : $discountedPrice;
+        $expectedPrice = $useRegularPrice ? round($convertedValue, 2) : round($discountedPrice, 2);
 
         $this->bundleMock->expects($this->once())
             ->method('getPriceType')
@@ -285,7 +299,7 @@ public function testGetValueTypeFixedWithoutSelectionPriceType($useRegularPrice)
             ->will($this->returnValue($regularPrice));
 
         $this->priceCurrencyMock->expects($this->once())
-            ->method('convertAndRound')
+            ->method('convert')
             ->with($regularPrice)
             ->will($this->returnValue($convertedValue));
 
@@ -298,6 +312,12 @@ public function testGetValueTypeFixedWithoutSelectionPriceType($useRegularPrice)
                 )
                 ->will($this->returnValue($discountedPrice));
         }
+
+        $this->priceCurrencyMock->expects($this->once())
+            ->method('round')
+            ->with($actualPrice)
+            ->will($this->returnValue($expectedPrice));
+
         $this->assertEquals($expectedPrice, $this->selectionPrice->getValue());
     }
 

From 57350220281527e4fcf29defa31f609a0124d4fe Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Wed, 10 Dec 2014 19:48:06 +0200
Subject: [PATCH 221/474] MAGETWO-31629: Online payment methods removal for CE
 release

---
 dev/build/publication/edition/ee.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/build/publication/edition/ee.txt b/dev/build/publication/edition/ee.txt
index 309d839a79807..f5760cdce6be4 100644
--- a/dev/build/publication/edition/ee.txt
+++ b/dev/build/publication/edition/ee.txt
@@ -87,6 +87,7 @@ dev/tools/Magento/Tools/SampleData/fixtures/TargetRule
 dev/tools/Magento/Tools/SampleData/Module/TargetRule
 
 dev/tests/integration/testsuite/Magento/Test/Design/Frontend/Enterprise
+dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Centinel
 
 dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ee.php
 dev/tests/static/testsuite/Magento/Test/Js/_files/{whitelist,blacklist}/ee.txt

From 1780a77bd966523121f6b68bbdfa810ad3c5b8e6 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 10 Dec 2014 11:57:29 -0600
Subject: [PATCH 222/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Refactored the infinite DB connection loop (removed it).
---
 .../view/magento/setup/add-database.phtml     |  5 ++++
 setup/pub/magento/setup/add-database.js       | 30 +++++++++----------
 setup/pub/magento/setup/main.js               |  1 +
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
index 73e52a2cb86b2..f225f45f8d4a9 100644
--- a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
@@ -121,6 +121,11 @@
                    name="dbname"
                    ng-model="db.name"
                    required />
+            <input type="hidden"
+                   ng-model="call.db"
+                   ng-show=""
+                   ng-init="initialCall()"
+                   required />
         </div>
         <div class="col-sm-offset-4 col-sm-4" ng-show="database.dbname.$invalid && database.submitted">
             <div class="error-container">
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 8ca1d048a1af6..6a8d3a01e90b6 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -7,7 +7,7 @@
 
 'use strict';
 angular.module('add-database', ['ngStorage'])
-    .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', '$timeout', '$interval', function ($scope, $state, $localStorage, $http, $timeout, $interval) {
+    .controller('addDatabaseController', ['$scope', '$state', '$localStorage', '$http', function ($scope, $state, $localStorage, $http) {
         $scope.db = {
             useExistingDb: 1,
             useAccess: 1,
@@ -16,19 +16,6 @@ angular.module('add-database', ['ngStorage'])
             name: 'magento'
         };
         $scope.testConn = 'mock';
-        var intervalPromise = $interval(function () {
-            $http.post('index.php/database-check', $scope.db)
-                .success(function (data) {
-                    $scope.testConnection.result = data;
-                    if (($scope.testConnection.result !== undefined) && (!$scope.testConnection.result.success)) {
-                        $scope.testConn = '';
-                    } else {
-                        $scope.testConn = 'mock';
-                    }
-                });
-        }, 500);
-
-        $scope.$on('$destroy', function () {$interval.cancel(intervalPromise);});
 
         if ($localStorage.db) {
             $scope.db = $localStorage.db;
@@ -38,14 +25,23 @@ angular.module('add-database', ['ngStorage'])
             $http.post('index.php/database-check', $scope.db)
                 .success(function (data) {
                     $scope.testConnection.result = data;
+                    if (($scope.testConnection.result !== undefined) && (!$scope.testConnection.result.success)) {
+                        $scope.testConn = '';
+                    } else {
+                        $scope.testConn = 'mock';
+                        $scope.database.$valid = true;
+                    }
                 });
         };
 
         $scope.$on('nextState', function () {
             $localStorage.db = $scope.db;
-            $interval.cancel(intervalPromise);
         });
 
+        $scope.initialCall = function () {
+            $scope.testConnection();
+        };
+
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();
@@ -53,18 +49,22 @@ angular.module('add-database', ['ngStorage'])
 
         $scope.$watch('db.host', function(newVal, oldVal) {
             $scope.database.$valid = false;
+            $scope.testConnection();
         });
 
         $scope.$watch('db.user', function(newVal, oldVal) {
             $scope.database.$valid = false;
+            $scope.testConnection();
         });
 
         $scope.$watch('db.password', function(newVal, oldVal) {
             $scope.database.$valid = false;
+            $scope.testConnection();
         });
 
         $scope.$watch('db.name', function(newVal, oldVal) {
             $scope.database.$valid = false;
+            $scope.testConnection();
         });
 
         // Dispatch 'validation-response' event to parent controller
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index f036351b941cd..cb23328aa95fb 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -19,6 +19,7 @@ main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navi
     '$scope', '$state', 'navigationService',
     function ($scope, $state, navigationService) {
         $scope.$on('$stateChangeSuccess', function (event, state) {
+            $scope.valid = true;
             $scope.class = 'col-lg-9';
             if (state.main) {
                 $scope.class = 'col-lg-offset-3 col-lg-6';

From d126c11fe2327e3274e89c42dfef92b37f0521e9 Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Wed, 10 Dec 2014 19:57:54 +0200
Subject: [PATCH 223/474] MAGETWO-31467: Price is not updated when select
 downloadable link on product page.

---
 .../Block/Catalog/Product/Links.php           | 21 +++---
 .../Block/Catalog/Product/LinksTest.php       | 66 +++++--------------
 2 files changed, 28 insertions(+), 59 deletions(-)

diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
index f8f1856a11328..1490b3440cdfb 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
@@ -8,41 +8,40 @@
 namespace Magento\Downloadable\Block\Catalog\Product;
 
 use Magento\Catalog\Pricing\Price\FinalPrice;
-use Magento\Catalog\Pricing\Price\RegularPrice;
 use Magento\Downloadable\Model\Link;
 use Magento\Downloadable\Pricing\Price\LinkPrice;
+use Magento\Framework\Json\EncoderInterface;
 
 /**
  * Downloadable Product Links part block
- *
  */
 class Links extends \Magento\Catalog\Block\Product\AbstractProduct
 {
     /**
-     * @var \Magento\Framework\Json\EncoderInterface
+     * @var \Magento\Core\Helper\Data
      */
-    protected $jsonEncoder;
+    protected $coreData;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var EncoderInterface
      */
-    protected $coreData;
+    protected $encoder;
 
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Core\Helper\Data $coreData
+     * @param EncoderInterface $encoder
      * @param array $data
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
         \Magento\Core\Helper\Data $coreData,
+        EncoderInterface $encoder,
         array $data = array()
     ) {
         $this->coreData = $coreData;
-        parent::__construct(
-            $context,
-            $data
-        );
+        $this->encoder = $encoder;
+        parent::__construct($context, $data);
     }
 
     /**
@@ -107,7 +106,7 @@ public function getJsonConfig()
             ];
         }
 
-        return json_encode(['links' => $linksConfig]);
+        return $this->encoder->encode(['links' => $linksConfig]);
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Downloadable/Block/Catalog/Product/LinksTest.php b/dev/tests/unit/testsuite/Magento/Downloadable/Block/Catalog/Product/LinksTest.php
index d8804a0e3b8c0..3dca334bf5cca 100644
--- a/dev/tests/unit/testsuite/Magento/Downloadable/Block/Catalog/Product/LinksTest.php
+++ b/dev/tests/unit/testsuite/Magento/Downloadable/Block/Catalog/Product/LinksTest.php
@@ -9,7 +9,6 @@
 namespace Magento\Downloadable\Block\Catalog\Product;
 
 use Magento\Catalog\Pricing\Price\FinalPrice;
-use Magento\Catalog\Pricing\Price\RegularPrice;
 
 /**
  * Tests Magento\Downloadable\Block\Catalog\Product\Links
@@ -41,6 +40,11 @@ class LinksTest extends \PHPUnit_Framework_TestCase
      */
     protected $coreHelper;
 
+    /**
+     * @var \Magento\Framework\Json\EncoderInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $jsonEncoder;
+
     public function setUp()
     {
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
@@ -55,12 +59,14 @@ public function setUp()
             ->method('getPriceInfo')
             ->will($this->returnValue($this->priceInfoMock));
         $this->coreHelper = $this->getMock('Magento\Core\Helper\Data', [], [], '', false);
+        $this->jsonEncoder = $this->getMock('Magento\Framework\Json\EncoderInterface', [], [], '', false);
 
         $this->linksBlock = $objectManager->getObject(
             'Magento\Downloadable\Block\Catalog\Product\Links',
             [
                 'context' => $contextMock,
                 'coreData' => $this->coreHelper,
+                'encoder' => $this->jsonEncoder,
                 'data' => [
                     'product' => $this->productMock
                 ]
@@ -107,42 +113,21 @@ public function testGetLinkPrice()
 
     public function testGetJsonConfig()
     {
-        $regularPrice = 11.;
-        $finalPrice = 10.;
-        $price = 10.;
-        $oldPrice = 11.;
-
         $linkPrice = 3.;
-        $linkIncludeTaxPrice = 4.;
-        $linkExcludeTaxPrice = 3.;
-
         $linkId = 42;
 
         $config = [
-            'price' => $price,
-            'oldPrice' => $oldPrice,
             'links' => [
                 $linkId => [
-                    'price' => $linkPrice,
-                    'oldPrice' => $linkPrice,
-                    'inclTaxPrice' => $linkIncludeTaxPrice,
-                    'exclTaxPrice' => $linkExcludeTaxPrice
+                    'finalPrice' => $linkPrice,
                 ]
             ]
         ];
 
-        $linkAmountMock = $this->getMock('Magento\Framework\Pricing\Amount\Base', [], [], '', false);
+        $linkAmountMock = $this->getMock('Magento\Framework\Pricing\Amount\AmountInterface', [], [], '', false);
         $linkAmountMock->expects($this->once())
             ->method('getValue')
-            ->will($this->returnValue($linkIncludeTaxPrice));
-        $linkAmountMock->expects($this->once())
-            ->method('getBaseAmount')
-            ->will($this->returnValue($linkExcludeTaxPrice));
-
-        $amountMock = $this->getMock('Magento\Framework\Pricing\Amount\Base', [], [], '', false);
-        $amountMock->expects($this->once())
-            ->method('getValue')
-            ->will($this->returnValue($finalPrice));
+            ->will($this->returnValue($linkPrice));
 
         $typeInstanceMock = $this->getMock('Magento\Catalog\Model\Product\Type\Simple', ['getLinks'], [], '', false);
         $typeInstanceMock->expects($this->once())
@@ -152,38 +137,23 @@ public function testGetJsonConfig()
             ->method('getTypeInstance')
             ->will($this->returnValue($typeInstanceMock));
 
-        $regularPriceMock = $this->getMock('Magento\Catalog\Pricing\Price\RegularPrice', [], [], '', false);
-        $regularPriceMock->expects($this->once())
-            ->method('getValue')
-            ->will($this->returnValue($regularPrice));
-
         $finalPriceMock = $this->getMock('Magento\Catalog\Pricing\Price\FinalPrice', [], [], '', false);
-        $finalPriceMock->expects($this->at(0))
-            ->method('getAmount')
-            ->will($this->returnValue($amountMock));
-        $finalPriceMock->expects($this->at(1))
+        $finalPriceMock->expects($this->once())
             ->method('getCustomAmount')
             ->with($linkPrice)
             ->will($this->returnValue($linkAmountMock));
 
-        $this->coreHelper->expects($this->at(0))
-            ->method('currency')
-            ->with($linkPrice, false, false)
-            ->will($this->returnValue($linkPrice));
-
-        $this->priceInfoMock->expects($this->at(0))
-            ->method('getPrice')
-            ->with(FinalPrice::PRICE_CODE)
-            ->will($this->returnValue($finalPriceMock));
-        $this->priceInfoMock->expects($this->at(1))
-            ->method('getPrice')
-            ->with(RegularPrice::PRICE_CODE)
-            ->will($this->returnValue($regularPriceMock));
-        $this->priceInfoMock->expects($this->at(2))
+        $this->priceInfoMock->expects($this->once())
             ->method('getPrice')
             ->with(FinalPrice::PRICE_CODE)
             ->will($this->returnValue($finalPriceMock));
 
+        $json = json_encode($config);
+        $this->jsonEncoder->expects($this->once())
+            ->method('encode')
+            ->with($config)
+            ->will($this->returnValue($json));
+
         $encodedJsonConfig = $this->linksBlock->getJsonConfig();
         $this->assertEquals(json_encode($config), $encodedJsonConfig);
     }

From 826b12da47d316a1cce1cccc8fd91ee49ff066a5 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Wed, 10 Dec 2014 20:29:51 +0200
Subject: [PATCH 224/474] MAGETWO-31623: Performance degradation investigation

- IncludePath is used for production code
---
 app/autoload.php                              |  4 +
 .../Framework/Autoload/IncludePath.php        | 76 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 lib/internal/Magento/Framework/Autoload/IncludePath.php

diff --git a/app/autoload.php b/app/autoload.php
index b2cac68f237a6..bf25cffe341cb 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -20,6 +20,10 @@
 if (file_exists($vendorAutoload)) {
     $composerAutoloader = include $vendorAutoload;
 }
+require_once BP . '/lib/internal/Magento/Framework/Autoload/IncludePath.php';
+$includePath = new \Magento\Framework\Autoload\IncludePath();
+$includePath->addIncludePath([BP . '/app/code', BP . '/lib/internal', BP . '/var/generation']);
+spl_autoload_register([$includePath, 'load'], true, true);
 
 AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
 
diff --git a/lib/internal/Magento/Framework/Autoload/IncludePath.php b/lib/internal/Magento/Framework/Autoload/IncludePath.php
new file mode 100644
index 0000000000000..e2acfb3e6b610
--- /dev/null
+++ b/lib/internal/Magento/Framework/Autoload/IncludePath.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * An autoloader that uses include path. Compliant with PSR-0 standard
+ *
+ * {license_notice}
+ *
+ * @copyright  {copyright}
+ * @license    {license_link}
+ */
+namespace Magento\Framework\Autoload;
+
+class IncludePath
+{
+    /**
+     * Namespaces separator
+     */
+    const NS_SEPARATOR = '\\';
+
+    /**
+     * Find a file in include path
+     *
+     * @param string $class
+     * @return string|bool
+     */
+    public function getFile($class)
+    {
+        $relativePath = $this->getFilePath($class);
+        return stream_resolve_include_path($relativePath);
+    }
+
+    /**
+     * Get relative file path for specified class
+     *
+     * @static
+     * @param string $class
+     * @return string
+     */
+    public function getFilePath($class)
+    {
+        return ltrim(str_replace(array('_',self::NS_SEPARATOR), '/', $class), '/') . '.php';
+    }
+
+    /**
+     * Add specified path(s) to the current include_path
+     *
+     * @param string|array $path
+     * @param bool $prepend Whether to prepend paths or to append them
+     * @return void
+     */
+    public function addIncludePath($path, $prepend = true)
+    {
+        $includePathExtra = implode(PATH_SEPARATOR, (array)$path);
+        $includePath = get_include_path();
+        $pathSeparator = $includePath && $includePathExtra ? PATH_SEPARATOR : '';
+        if ($prepend) {
+            $includePath = $includePathExtra . $pathSeparator . $includePath;
+        } else {
+            $includePath = $includePath . $pathSeparator . $includePathExtra;
+        }
+        set_include_path($includePath);
+    }
+
+    /**
+     * Resolve a class file and include it
+     *
+     * @param string $class
+     * @return void
+     */
+    public function load($class)
+    {
+        $file = $this->getFile($class);
+        if ($file) {
+            include $file;
+        }
+    }
+}

From 735187765811d2c1b6f2b6a8520f1d9b7767cbef Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Wed, 10 Dec 2014 13:15:23 -0600
Subject: [PATCH 225/474] MAGETWO-31413: Mainline Contribution of Install Bug
 Fixes

- fixed code style
---
 dev/tools/Magento/Tools/SampleData/Installer.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/tools/Magento/Tools/SampleData/Installer.php b/dev/tools/Magento/Tools/SampleData/Installer.php
index 81916fef141a8..46d65061b47e0 100644
--- a/dev/tools/Magento/Tools/SampleData/Installer.php
+++ b/dev/tools/Magento/Tools/SampleData/Installer.php
@@ -11,7 +11,8 @@
 /**
  * Model for installation Sample Data
  */
-class Installer {
+class Installer
+{
     /**
      * @var Helper\Deploy
      */
@@ -65,6 +66,8 @@ public function __construct(
      *
      * @param \Magento\User\Model\User $adminUser
      * @throws \Exception
+     *
+     * @return void
      */
     public function run(\Magento\User\Model\User $adminUser)
     {

From ef8a4e7c0be7c771666ad901c27ffc4e4a9d17d1 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Tue, 9 Dec 2014 20:38:31 -0600
Subject: [PATCH 226/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- changed implementation to be compatible with symlink deployments
---
 lib/internal/Magento/Framework/App/Http.php   |  2 +-
 .../Magento/Framework/App/SetupInfo.php       | 81 ++++++++++++++++---
 .../Setup/src/Controller/WebConfiguration.php | 27 +------
 .../Setup/view/magento/setup/success.phtml    |  8 +-
 4 files changed, 74 insertions(+), 44 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index 9c41cb5f6316e..ca9537eac92b4 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -182,7 +182,7 @@ private function redirectToSetup(Bootstrap $bootstrap, \Exception $exception)
     {
         $setupInfo = new SetupInfo($bootstrap->getParams());
         $projectRoot = $this->_filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath();
-        if ($setupInfo->isAvailable($projectRoot)) {
+        if ($setupInfo->isAvailable()) {
             $this->_response->setRedirect($setupInfo->getUrl());
             $this->_response->sendHeaders();
         } else {
diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php
index 4ee0f87f40ee2..341f89497f71c 100644
--- a/lib/internal/Magento/Framework/App/SetupInfo.php
+++ b/lib/internal/Magento/Framework/App/SetupInfo.php
@@ -32,14 +32,60 @@ class SetupInfo
      */
     private $server;
 
+    /**
+     * Current document root directory
+     *
+     * @var string
+     */
+    private $docRoot;
+
+    /**
+     * Project root directory
+     *
+     * @var string
+     */
+    private $projectRoot;
+
     /**
      * Constructor
      *
      * @param array $server
+     * @param string $projectRoot
+     * @throws \InvalidArgumentException
      */
-    public function __construct($server)
+    public function __construct($server, $projectRoot = '')
     {
         $this->server = $server;
+        if (!isset($server['DOCUMENT_ROOT'])) {
+            throw new \InvalidArgumentException('DOCUMENT_ROOT variable is unavailable.');
+        }
+        $this->docRoot = str_replace('\\', '/', $server['DOCUMENT_ROOT']);
+        $this->projectRoot = $projectRoot ?: $this->detectProjectRoot();
+        $this->projectRoot = str_replace('\\', '/', $this->projectRoot);
+    }
+
+    /**
+     * Automatically detects project root from current environment
+     *
+     * Assumptions:
+     * if the current setup application relative path is at the end of script path, then it is setup application
+     * otherwise it is the "main" application
+     *
+     * @return mixed
+     * @throws \InvalidArgumentException
+     */
+    private function detectProjectRoot()
+    {
+        if (!isset($this->server['SCRIPT_FILENAME'])) {
+            throw new \InvalidArgumentException('Project root cannot be automatically detected.');
+        }
+        $haystack = str_replace('\\', '/', dirname($this->server['SCRIPT_FILENAME']));
+        $needle = '/' . $this->getPath();
+        $isSetupApp = preg_match('/^(.+?)' . preg_quote($needle, '/') . '$/', $haystack, $matches);
+        if ($isSetupApp) {
+            return $matches[1];
+        }
+        return $haystack;
     }
 
     /**
@@ -52,7 +98,21 @@ public function getUrl()
         if (isset($this->server[self::PARAM_NOT_INSTALLED_URL])) {
             return $this->server[self::PARAM_NOT_INSTALLED_URL];
         }
-        return Request\Http::getDistroBaseUrlPath($this->server) . trim($this->getPath(), '/') . '/';
+        return Request\Http::getDistroBaseUrlPath($this->server) . $this->getPath() . '/';
+    }
+
+    /**
+     * Gets the "main" application URL
+     *
+     * @return string
+     */
+    public function getProjectUrl()
+    {
+        $isProjectInDocRoot = false !== strpos($this->projectRoot . '/', $this->docRoot . '/');
+        if (!$isProjectInDocRoot || !isset($this->server['HTTP_HOST'])) {
+            return '';
+        }
+        return 'http://' . $this->server['HTTP_HOST'] . substr($this->projectRoot . '/', strlen($this->docRoot));
     }
 
     /**
@@ -63,24 +123,19 @@ public function getUrl()
      */
     public function getDir($projectRoot)
     {
-        return rtrim($projectRoot, '/') . '/' . trim($this->getPath(), '/');
+        return rtrim($projectRoot, '/') . '/' . $this->getPath();
     }
 
     /**
      * Checks if the setup application is available in current document root
      *
-     * @param string $projectRoot
      * @return bool
      */
-    public function isAvailable($projectRoot)
+    public function isAvailable()
     {
-        if (isset($this->server['DOCUMENT_ROOT'])) {
-            // realpath() is used only to normalize path - there is no intent to check if path actually exists
-            $docRoot = str_replace('\\', '/', realpath($this->server['DOCUMENT_ROOT']));
-            $installDir = str_replace('\\', '/', realpath($this->getDir($projectRoot)));
-            return false !== strpos($installDir . '/', $docRoot . '/');
-        }
-        return false;
+        $setupDir = $this->getDir($this->projectRoot);
+        $isSubDir = false !== strpos($setupDir . '/', $this->docRoot . '/');
+        return $isSubDir && realpath($setupDir);
     }
 
     /**
@@ -91,7 +146,7 @@ public function isAvailable($projectRoot)
     private function getPath()
     {
         if (isset($this->server[self::PARAM_NOT_INSTALLED_URL_PATH])) {
-            return $this->server[self::PARAM_NOT_INSTALLED_URL_PATH];
+            return trim($this->server[self::PARAM_NOT_INSTALLED_URL_PATH], '/');
         }
         return self::DEFAULT_PATH;
     }
diff --git a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
index 6e95ae8041895..60e5f96feabde 100644
--- a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
+++ b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
@@ -9,28 +9,10 @@
 
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\SetupInfo;
 
 class WebConfiguration extends AbstractActionController
 {
-    /**
-     * Directory list
-     *
-     * @var DirectoryList
-     */
-    private $dirList;
-
-    /**
-     * Constructor
-     *
-     * @param DirectoryList $dirList
-     */
-    public function __construct(DirectoryList $dirList)
-    {
-        $this->dirList = $dirList;
-    }
-
     /**
      * Displays web configuration form
      *
@@ -39,14 +21,7 @@ public function __construct(DirectoryList $dirList)
     public function indexAction()
     {
         $setupInfo = new SetupInfo($_SERVER);
-        $projectRoot = $this->dirList->getRoot();
-        $docRoot = str_replace('\\', '/', $_SERVER['DOCUMENT_ROOT']);
-        if ($setupInfo->isAvailable($this->dirList->getRoot())) {
-            $urlPath = substr($projectRoot, strlen($docRoot));
-        } else {
-            $urlPath = '';
-        }
-        $view = new ViewModel(['autoBaseUrl' => 'http://' . $_SERVER['HTTP_HOST'] . $urlPath . '/']);
+        $view = new ViewModel(['autoBaseUrl' => $setupInfo->getProjectUrl()]);
         $view->setTerminal(true);
         return $view;
     }
diff --git a/setup/module/Magento/Setup/view/magento/setup/success.phtml b/setup/module/Magento/Setup/view/magento/setup/success.phtml
index 558291e2c2937..163702867cac4 100644
--- a/setup/module/Magento/Setup/view/magento/setup/success.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/success.phtml
@@ -22,11 +22,11 @@
         <div class="col-sm-6">Password:</div>
         <div class="col-sm-6">******</div>
     </div>
-    <div class="row p-top-10">
+    <div class="row p-top-10" ng-show="config.address.actual_base_url">
         <div class="col-sm-6">Your Store Address:</div>
         <div class="col-sm-6"><a href="{{config.address.actual_base_url}}">{{config.address.actual_base_url}}</a></div>
     </div>
-    <div class="row p-top-10">
+    <div class="row p-top-10" ng-show="config.address.actual_base_url">
         <div class="col-sm-6">Magento Admin Address:</div>
         <div class="col-sm-6"><a href="{{config.address.actual_base_url}}{{config.address.admin}}/">{{config.address.actual_base_url}}{{config.address.admin}}/</a></div>
     </div>
@@ -51,6 +51,6 @@
     </div>
 </div>
 <div class="text-center">
-    <div class="bold" ng-repeat="message in messages">{{message}}</div><br/>
-    <a type="button" class="btn btn-primary" href="{{config.address.actual_base_url}}{{config.address.admin}}/">Launch Magento Admin</a>
+    <div class="bold" ng-repeat="message in messages">{{message}}</div>
+    <div ng-show="config.address.actual_base_url"><a type="button" class="btn btn-primary" href="{{config.address.actual_base_url}}{{config.address.admin}}/">Launch Magento Admin</a></div>
 </div>

From 3807c95b7b7a0b0aae6389686ceda6c253d2e546 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Wed, 10 Dec 2014 13:48:27 -0600
Subject: [PATCH 227/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- unit tests
---
 .../Magento/Framework/App/HttpTest.php        |   7 +-
 .../Magento/Framework/App/SetupInfoTest.php   | 104 ++++++++++++++----
 .../Magento/Framework/App/SetupInfo.php       |   6 +-
 3 files changed, 89 insertions(+), 28 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php
index d6f8766d11e4a..304529c007d18 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php
@@ -170,6 +170,7 @@ public function testHandleDeveloperModeNotInstalled()
         $bootstrap->expects($this->once())->method('getParams')->willReturn([
             'SCRIPT_NAME' => '/index.php',
             'DOCUMENT_ROOT' => __DIR__,
+            'SCRIPT_FILENAME' => __DIR__ . '/index.php',
             SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files',
         ]);
         $this->assertTrue($this->http->catchException($bootstrap, new \Exception('Test Message')));
@@ -185,7 +186,11 @@ public function testHandleDeveloperMode()
         $constraint = new \PHPUnit_Framework_Constraint_StringStartsWith('strange error');
         $this->responseMock->expects($this->once())->method('setBody')->with($constraint);
         $this->responseMock->expects($this->once())->method('sendResponse');
-        $this->assertTrue($this->http->catchException($this->getBootstrapNotInstalled(), new \Exception('Test')));
+        $bootstrap = $this->getBootstrapNotInstalled();
+        $bootstrap->expects($this->once())->method('getParams')->willReturn(
+            ['DOCUMENT_ROOT' => 'something', 'SCRIPT_FILENAME' => 'something/else']
+        );
+        $this->assertTrue($this->http->catchException($bootstrap, new \Exception('Test')));
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php
index 1cd98b6639c5f..c678919206e0a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php
@@ -11,6 +11,36 @@
 
 class SetupInfoTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * A default fixture
+     *
+     * @var array
+     */
+    private static $fixture = ['DOCUMENT_ROOT' => '/doc/root', 'SCRIPT_FILENAME' => '/doc/root/dir/file.php'];
+
+    /**
+     * @param array $server
+     * @param string $expectedError
+     * @dataProvider constructorExceptionsDataProvider
+     */
+    public function testConstructorExceptions($server, $expectedError)
+    {
+        $this->setExpectedException('\InvalidArgumentException', $expectedError);
+        new SetupInfo($server);
+    }
+
+    public function constructorExceptionsDataProvider()
+    {
+        $docRootErr = 'DOCUMENT_ROOT variable is unavailable.';
+        $projectRootErr = 'Project root cannot be automatically detected.';
+        return [
+            [[], $docRootErr],
+            [['DOCUMENT_ROOT' => ''], $docRootErr],
+            [['DOCUMENT_ROOT' => '/foo'], $projectRootErr],
+            [['DOCUMENT_ROOT' => '/foo', 'SCRIPT_FILENAME' => ''], $projectRootErr],
+        ];
+    }
+
     /**
      * @param array $server
      * @param string $expected
@@ -29,20 +59,48 @@ public function getUrlDataProvider()
     {
         return [
             [
-                [],
+                self::$fixture,
                 '/setup/'
             ],
             [
-                [SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => 'install'],
+                self::$fixture + [SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => 'install'],
                 '/install/',
             ],
             [
-                [SetupInfo::PARAM_NOT_INSTALLED_URL => 'http://example.com/'],
+                self::$fixture + [SetupInfo::PARAM_NOT_INSTALLED_URL => 'http://example.com/'],
                 'http://example.com/',
             ],
         ];
     }
 
+    /**
+     * @param array $server
+     * @param string $expected
+     * @dataProvider getProjectUrlDataProvider
+     */
+    public function testGetProjectUrl($server, $expected)
+    {
+        $info = new SetupInfo($server);
+        $this->assertEquals($expected, $info->getProjectUrl());
+    }
+
+    /**
+     * @return array
+     */
+    public function getProjectUrlDataProvider()
+    {
+        return [
+            [self::$fixture, ''],
+            [self::$fixture + ['HTTP_HOST' => ''], ''],
+            [['DOCUMENT_ROOT' => '/foo/bar', 'SCRIPT_FILENAME' => '/other/baz.php', 'HTTP_HOST' => 'example.com'], ''],
+            [self::$fixture + ['HTTP_HOST' => 'example.com'], 'http://example.com/dir/'],
+            [
+                ['DOCUMENT_ROOT' => '/foo/bar', 'SCRIPT_FILENAME' => '/foo/bar/baz.php', 'HTTP_HOST' => 'example.com'],
+                'http://example.com/'
+            ],
+        ];
+    }
+
     /**
      * @param array $server
      * @param string $projectRoot
@@ -62,17 +120,17 @@ public function getDirDataProvider()
     {
         return [
             [
-                [],
+                self::$fixture,
                 '/test/root',
                 '/test/root/setup',
             ],
             [
-                [],
+                self::$fixture,
                 '/test/root/',
                 '/test/root/setup',
             ],
             [
-                [SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '/install/'],
+                self::$fixture + [SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '/install/'],
                 '/test/',
                 '/test/install',
             ],
@@ -81,14 +139,13 @@ public function getDirDataProvider()
 
     /**
      * @param array $server
-     * @param string $projectRoot
      * @param bool $expected
      * @dataProvider isAvailableDataProvider
      */
-    public function testIsAvailable($server, $projectRoot, $expected)
+    public function testIsAvailable($server, $expected)
     {
         $info = new SetupInfo($server);
-        $this->assertEquals($expected, $info->isAvailable($projectRoot));
+        $this->assertEquals($expected, $info->isAvailable());
     }
 
     /**
@@ -96,35 +153,34 @@ public function testIsAvailable($server, $projectRoot, $expected)
      */
     public function isAvailableDataProvider()
     {
+        $server = ['DOCUMENT_ROOT' => __DIR__, 'SCRIPT_FILENAME' => __FILE__];
         return [
-            'no doc root defined' => [
-                [],
-                'anything',
-                false
-            ],
             'root = doc root, but no "setup" sub-directory' => [
-                ['DOCUMENT_ROOT' => __DIR__], // it will look for "setup/" sub-directory, but won't find anything
-                __DIR__,
+                $server, // it will look for "setup/" sub-directory, but won't find anything
                 false
             ],
             'root = doc root, nonexistent sub-directory' => [
-                ['DOCUMENT_ROOT' => __DIR__, SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => 'nonexistent'],
-                __DIR__,
+                $server + [SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => 'nonexistent'],
                 false
             ],
             'root = doc root, existent sub-directory' => [
-                ['DOCUMENT_ROOT' => __DIR__, SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files'],
-                __DIR__,
+                $server + [SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files'],
                 true
             ],
             'root within doc root, existent sub-directory' => [
-                ['DOCUMENT_ROOT' => dirname(__DIR__), SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files'],
-                __DIR__,
+                [
+                    'DOCUMENT_ROOT' => dirname(__DIR__),
+                    'SCRIPT_FILENAME' => __FILE__,
+                    SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files'
+                ],
                 true
             ],
             'root outside of doc root, existent sub-directory' => [
-                ['DOCUMENT_ROOT' => __DIR__, SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files'],
-                dirname(__DIR__),
+                [
+                    'DOCUMENT_ROOT' => __DIR__,
+                    'SCRIPT_FILENAME' => dirname(dirname(__DIR__)) . '/foo.php',
+                    SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => basename(__DIR__)
+                ],
                 false
             ],
         ];
diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php
index 341f89497f71c..917826a78bf56 100644
--- a/lib/internal/Magento/Framework/App/SetupInfo.php
+++ b/lib/internal/Magento/Framework/App/SetupInfo.php
@@ -56,7 +56,7 @@ class SetupInfo
     public function __construct($server, $projectRoot = '')
     {
         $this->server = $server;
-        if (!isset($server['DOCUMENT_ROOT'])) {
+        if (empty($server['DOCUMENT_ROOT'])) {
             throw new \InvalidArgumentException('DOCUMENT_ROOT variable is unavailable.');
         }
         $this->docRoot = str_replace('\\', '/', $server['DOCUMENT_ROOT']);
@@ -76,7 +76,7 @@ public function __construct($server, $projectRoot = '')
      */
     private function detectProjectRoot()
     {
-        if (!isset($this->server['SCRIPT_FILENAME'])) {
+        if (empty($this->server['SCRIPT_FILENAME'])) {
             throw new \InvalidArgumentException('Project root cannot be automatically detected.');
         }
         $haystack = str_replace('\\', '/', dirname($this->server['SCRIPT_FILENAME']));
@@ -109,7 +109,7 @@ public function getUrl()
     public function getProjectUrl()
     {
         $isProjectInDocRoot = false !== strpos($this->projectRoot . '/', $this->docRoot . '/');
-        if (!$isProjectInDocRoot || !isset($this->server['HTTP_HOST'])) {
+        if (!$isProjectInDocRoot || empty($this->server['HTTP_HOST'])) {
             return '';
         }
         return 'http://' . $this->server['HTTP_HOST'] . substr($this->projectRoot . '/', strlen($this->docRoot));

From ce8c913cbc5989838062350307264ed25ad19fdf Mon Sep 17 00:00:00 2001
From: Bibu Mathew <bimathew@paypal.com>
Date: Wed, 10 Dec 2014 14:05:50 -0600
Subject: [PATCH 228/474] MAGETWO-24665: Joining the Same Table with Different
 Aliases in Collection

 - Fixed logical error of checking table and setting alias in joinedTables
---
 .../Model/Resource/Db/Collection/AbstractCollection.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php b/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php
index eb50208bf74e2..718f1ef9a8125 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Db/Collection/AbstractCollection.php
@@ -507,7 +507,7 @@ public function join($table, $cond, $cols = '*')
             $alias = $table;
         }
 
-        if (!isset($this->_joinedTables[$table])) {
+        if (!isset($this->_joinedTables[$alias])) {
             $this->getSelect()->join(array($alias => $this->getTable($table)), $cond, $cols);
             $this->_joinedTables[$alias] = true;
         }

From 26a362a048c5f4bc617435c97fe4d739adf0be79 Mon Sep 17 00:00:00 2001
From: Richard Bates <rbates@x.com>
Date: Wed, 10 Dec 2014 14:24:39 -0600
Subject: [PATCH 229/474] MAGETWO-3315: Functions _camelize and _underscore
 work incorrect with keys that have digits between '_' symbol  - Updated
 _underscore method to work better with integers

---
 .../Magento/Framework/ObjectTest.php          | 116 +++++++++++-------
 lib/internal/Magento/Framework/Object.php     |  38 +++---
 2 files changed, 89 insertions(+), 65 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php b/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php
index 3f3ddfebad68e..c7f50ac20d510 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php
@@ -44,9 +44,9 @@ protected function tearDown()
     public function testConstruct()
     {
         $object = new \Magento\Framework\Object();
-        $this->assertEquals(array(), $object->getData());
+        $this->assertEquals([], $object->getData());
 
-        $data = array('test' => 'test');
+        $data = ['test' => 'test'];
         $object = new \Magento\Framework\Object($data);
         $this->assertEquals($data, $object->getData());
     }
@@ -72,18 +72,18 @@ public function testHasDataChanges()
         $this->_object->setData('key', 'value');
         $this->assertTrue($this->_object->hasDataChanges(), 'Data changed');
 
-        $object = new \Magento\Framework\Object(array('key' => 'value'));
+        $object = new \Magento\Framework\Object(['key' => 'value']);
         $object->setData('key', 'value');
         $this->assertFalse($object->hasDataChanges(), 'Data not changed');
 
-        $object->setData(array('key' => 'value'));
+        $object->setData(['key' => 'value']);
         $this->assertFalse($object->hasDataChanges(), 'Data not changed (array)');
 
         $object = new \Magento\Framework\Object();
         $object->unsetData();
         $this->assertFalse($object->hasDataChanges(), 'Unset data');
 
-        $object = new \Magento\Framework\Object(array('key' => null));
+        $object = new \Magento\Framework\Object(['key' => null]);
         $object->setData('key', null);
         $this->assertFalse($object->hasDataChanges(), 'Null data');
     }
@@ -109,14 +109,14 @@ public function testSetGetIdFieldName()
      */
     public function testAddData()
     {
-        $this->_object->addData(array('test' => 'value'));
+        $this->_object->addData(['test' => 'value']);
         $this->assertEquals('value', $this->_object->getData('test'));
 
-        $this->_object->addData(array('test' => 'value1'));
+        $this->_object->addData(['test' => 'value1']);
         $this->assertEquals('value1', $this->_object->getData('test'));
 
-        $this->_object->addData(array('test2' => 'value2'));
-        $this->assertEquals(array('test' => 'value1', 'test2' => 'value2'), $this->_object->getData());
+        $this->_object->addData(['test2' => 'value2']);
+        $this->assertEquals(['test' => 'value1', 'test2' => 'value2'], $this->_object->getData());
     }
 
     /**
@@ -124,7 +124,7 @@ public function testAddData()
      */
     public function testSetData()
     {
-        $data = array('key1' => 'value1', 'key2' => 'value2', 'key3' => 3);
+        $data = ['key1' => 'value1', 'key2' => 'value2', 'key3' => 3];
         $this->_object->setData($data);
         $this->assertEquals($data, $this->_object->getData());
 
@@ -142,20 +142,20 @@ public function testSetData()
      */
     public function testUnsetData()
     {
-        $data = array('key1' => 'value1', 'key2' => 'value2', 'key3' => 3, 'key4' => 4);
+        $data = ['key1' => 'value1', 'key2' => 'value2', 'key3' => 3, 'key4' => 4];
         $this->_object->setData($data);
 
         $this->_object->unsetData('key1');
         unset($data['key1']);
         $this->assertEquals($data, $this->_object->getData());
 
-        $this->_object->unsetData(array('key2', 'key3'));
+        $this->_object->unsetData(['key2', 'key3']);
         unset($data['key2']);
         unset($data['key3']);
         $this->assertEquals($data, $this->_object->getData());
 
         $this->_object->unsetData();
-        $this->assertEquals(array(), $this->_object->getData());
+        $this->assertEquals([], $this->_object->getData());
     }
 
     /**
@@ -163,16 +163,16 @@ public function testUnsetData()
      */
     public function testGetData()
     {
-        $data = array(
+        $data = [
             'key1' => 'value1',
-            'key2' => array(
+            'key2' => [
                 'subkey2.1' => 'value2.1',
                 'subkey2.2' => 'multiline
 string',
-                'subkey2.3' => new \Magento\Framework\Object(array('test_key' => 'test_value'))
-            ),
+                'subkey2.3' => new \Magento\Framework\Object(['test_key' => 'test_value'])
+            ],
             'key3' => 5
-        );
+        ];
         $this->_object->setData($data);
 
         $this->assertEquals($data, $this->_object->getData());
@@ -187,15 +187,15 @@ public function testGetData()
     public function testGetDataByPath()
     {
         $this->_object->setData(
-            array(
+            [
                 'key1' => 'value1',
-                'key2' => array(
+                'key2' => [
                     'subkey2.1' => 'value2.1',
                     'subkey2.2' => 'multiline
 string',
-                    'subkey2.3' => new \Magento\Framework\Object(array('test_key' => 'test_value'))
-                )
-            )
+                    'subkey2.3' => new \Magento\Framework\Object(['test_key' => 'test_value'])
+                ]
+            ]
         );
         $this->assertEquals('value1', $this->_object->getDataByPath('key1'));
         $this->assertEquals('value2.1', $this->_object->getDataByPath('key2/subkey2.1'));
@@ -206,7 +206,7 @@ public function testGetDataByPath()
 
     public function testGetDataByKey()
     {
-        $this->_object->setData(array('key' => 'value'));
+        $this->_object->setData(['key' => 'value']);
         $this->assertEquals('value', $this->_object->getDataByKey('key'));
         $this->assertNull($this->_object->getDataByKey('empty'));
     }
@@ -216,7 +216,7 @@ public function testGetDataByKey()
      */
     public function testSetGetDataUsingMethod()
     {
-        $mock = $this->getMock('Magento\Framework\Object', array('setTestData', 'getTestData'));
+        $mock = $this->getMock('Magento\Framework\Object', ['setTestData', 'getTestData']);
         $mock->expects($this->once())->method('setTestData')->with($this->equalTo('data'));
         $mock->expects($this->once())->method('getTestData');
 
@@ -229,7 +229,7 @@ public function testSetGetDataUsingMethod()
      */
     public function testGetDataSetDefault()
     {
-        $this->_object->setData(array('key1' => 'value1', 'key2' => null));
+        $this->_object->setData(['key1' => 'value1', 'key2' => null]);
         $this->assertEquals('value1', $this->_object->getDataSetDefault('key1', 'default'));
         $this->assertEquals(null, $this->_object->getDataSetDefault('key2', 'default'));
         $this->assertEquals('default', $this->_object->getDataSetDefault('key3', 'default'));
@@ -251,11 +251,11 @@ public function testHasData()
      */
     public function testToArray()
     {
-        $this->assertEquals(array(), $this->_object->toArray());
-        $this->assertEquals(array('key' => null), $this->_object->toArray(array('key')));
-        $this->_object->setData(array('key1' => 'value1', 'key2' => 'value2'));
-        $this->assertEquals(array('key1' => 'value1'), $this->_object->toArray(array('key1')));
-        $this->assertEquals(array('key2' => 'value2'), $this->_object->convertToArray(array('key2')));
+        $this->assertEquals([], $this->_object->toArray());
+        $this->assertEquals(['key' => null], $this->_object->toArray(['key']));
+        $this->_object->setData(['key1' => 'value1', 'key2' => 'value2']);
+        $this->assertEquals(['key1' => 'value1'], $this->_object->toArray(['key1']));
+        $this->assertEquals(['key2' => 'value2'], $this->_object->convertToArray(['key2']));
     }
 
     /**
@@ -263,7 +263,7 @@ public function testToArray()
      */
     public function testToXml()
     {
-        $this->_object->setData(array('key1' => 'value1', 'key2' => 'value2'));
+        $this->_object->setData(['key1' => 'value1', 'key2' => 'value2']);
         $xml = '<item>
 <key1><![CDATA[value1]]></key1>
 <key2><![CDATA[value2]]></key2>
@@ -275,19 +275,19 @@ public function testToXml()
 <key2><![CDATA[value2]]></key2>
 </item>
 ';
-        $this->assertEquals($xml, $this->_object->toXml(array('key2')));
+        $this->assertEquals($xml, $this->_object->toXml(['key2']));
 
         $xml = '<my_item>
 <key1><![CDATA[value1]]></key1>
 <key2><![CDATA[value2]]></key2>
 </my_item>
 ';
-        $this->assertEquals($xml, $this->_object->toXml(array(), 'my_item'));
+        $this->assertEquals($xml, $this->_object->toXml([], 'my_item'));
 
         $xml = '<key1><![CDATA[value1]]></key1>
 <key2><![CDATA[value2]]></key2>
 ';
-        $this->assertEquals($xml, $this->_object->toXml(array(), false));
+        $this->assertEquals($xml, $this->_object->toXml([], false));
 
         $xml = '<?xml version="1.0" encoding="UTF-8"?>
 <item>
@@ -295,7 +295,7 @@ public function testToXml()
 <key2><![CDATA[value2]]></key2>
 </item>
 ';
-        $this->assertEquals($xml, $this->_object->toXml(array(), 'item', true));
+        $this->assertEquals($xml, $this->_object->toXml([], 'item', true));
 
         $xml = '<?xml version="1.0" encoding="UTF-8"?>
 <item>
@@ -303,7 +303,7 @@ public function testToXml()
 <key2>value2</key2>
 </item>
 ';
-        $this->assertEquals($xml, $this->_object->convertToXml(array(), 'item', true, false));
+        $this->assertEquals($xml, $this->_object->convertToXml([], 'item', true, false));
     }
 
     /**
@@ -311,10 +311,10 @@ public function testToXml()
      */
     public function testToJson()
     {
-        $this->_object->setData(array('key1' => 'value1', 'key2' => 'value2'));
+        $this->_object->setData(['key1' => 'value1', 'key2' => 'value2']);
         $this->assertEquals('{"key1":"value1","key2":"value2"}', $this->_object->toJson());
-        $this->assertEquals('{"key1":"value1"}', $this->_object->toJson(array('key1')));
-        $this->assertEquals('{"key1":"value1","key":null}', $this->_object->convertToJson(array('key1', 'key')));
+        $this->assertEquals('{"key1":"value1"}', $this->_object->toJson(['key1']));
+        $this->assertEquals('{"key1":"value1","key":null}', $this->_object->convertToJson(['key1', 'key']));
     }
 
     /**
@@ -322,7 +322,7 @@ public function testToJson()
      */
     public function testToString()
     {
-        $this->_object->setData(array('key1' => 'value1', 'key2' => 'value2'));
+        $this->_object->setData(['key1' => 'value1', 'key2' => 'value2']);
         $this->assertEquals('value1, value2', $this->_object->toString());
         $this->assertEquals('test value1 with value2', $this->_object->toString('test {{key1}} with {{key2}}'));
     }
@@ -334,7 +334,7 @@ public function testToString()
      */
     public function testCall()
     {
-        $this->_object->setData(array('key' => 'value'));
+        $this->_object->setData(['key' => 'value']);
         $this->_object->setTest('test');
         $this->assertEquals('test', $this->_object->getData('test'));
 
@@ -374,11 +374,11 @@ public function testIsEmpty()
      */
     public function testSerialize()
     {
-        $this->_object->setData(array('key1' => 'value1', 'key2' => 'value2'));
+        $this->_object->setData(['key1' => 'value1', 'key2' => 'value2']);
         $this->assertEquals('key1="value1" key2="value2"', $this->_object->serialize());
         $this->assertEquals(
             'key1:\'value1\'_key2:\'value2\'',
-            $this->_object->serialize(array('key', 'key1', 'key2'), ':', '_', '\'')
+            $this->_object->serialize(['key', 'key1', 'key2'], ':', '_', '\'')
         );
     }
 
@@ -387,7 +387,7 @@ public function testSerialize()
      */
     public function testOrigData()
     {
-        $data = array('key1' => 'value1', 'key2' => 'value2');
+        $data = ['key1' => 'value1', 'key2' => 'value2'];
         $this->_object->setData($data);
         $this->_object->setOrigData();
         $this->_object->setData('key1', 'test');
@@ -413,7 +413,7 @@ public function testSetDataChanges()
      */
     public function testDebug()
     {
-        $data = array('key1' => 'value1', 'key2' => array('test'), 'key3' => $this->_object);
+        $data = ['key1' => 'value1', 'key2' => ['test'], 'key3' => $this->_object];
         $this->_object->setData($data);
 
         $debug = $data;
@@ -436,4 +436,28 @@ public function testOffset()
         $this->_object->offsetUnset('key1');
         $this->assertFalse($this->_object->offsetExists('key1'));
     }
+
+    /**
+     * Tests _underscore method directly
+     *
+     * @dataProvider underscoreDataProvider
+     */
+    public function testUnderscore($input, $expectedOutput)
+    {
+        $refObject = new \ReflectionObject($this->_object);
+        $refMethod = $refObject->getMethod('_underscore');
+        $refMethod->setAccessible(true);
+        $output = $refMethod->invoke($this->_object, $input);
+        $this->assertEquals($expectedOutput, $output);
+    }
+
+    public function underscoreDataProvider()
+    {
+        return [
+            'Test 1' => ['Stone1Color', 'stone_1_color'],
+            'Test 2' => ['StoneColor', 'stone_color'],
+            'Test 3' => ['StoneToXML', 'stone_to_x_m_l'],
+            'Test 4' => ['1StoneColor', '1_stone_color'],
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/Object.php b/lib/internal/Magento/Framework/Object.php
index 39d9e1c1f27e2..189f081ac64a7 100644
--- a/lib/internal/Magento/Framework/Object.php
+++ b/lib/internal/Magento/Framework/Object.php
@@ -19,7 +19,7 @@ class Object implements \ArrayAccess
      *
      * @var array
      */
-    protected $_data = array();
+    protected $_data = [];
 
     /**
      * Data changes flag (true after setData|unsetData call)
@@ -46,7 +46,7 @@ class Object implements \ArrayAccess
      *
      * @var array
      */
-    protected static $_underscoreCache = array();
+    protected static $_underscoreCache = [];
 
     /**
      * Object delete flag
@@ -63,7 +63,7 @@ class Object implements \ArrayAccess
      *
      * @param array $data
      */
-    public function __construct(array $data = array())
+    public function __construct(array $data = [])
     {
         $this->_data = $data;
     }
@@ -193,7 +193,7 @@ public function setData($key, $value = null)
     public function unsetData($key = null)
     {
         if (is_null($key)) {
-            $this->setData(array());
+            $this->setData([]);
         } elseif (is_string($key)) {
             if (array_key_exists($key, $this->_data)) {
                 $this->_hasDataChanges = true;
@@ -304,7 +304,7 @@ protected function _getData($key)
      * @param mixed $args
      * @return $this
      */
-    public function setDataUsingMethod($key, $args = array())
+    public function setDataUsingMethod($key, $args = [])
     {
         $method = 'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
         $this->{$method}($args);
@@ -360,13 +360,13 @@ public function hasData($key = '')
      * @param array $keys array of required keys
      * @return array
      */
-    public function toArray(array $keys = array())
+    public function toArray(array $keys = [])
     {
         if (empty($keys)) {
             return $this->_data;
         }
 
-        $result = array();
+        $result = [];
         foreach ($keys as $key) {
             if (isset($this->_data[$key])) {
                 $result[$key] = $this->_data[$key];
@@ -383,7 +383,7 @@ public function toArray(array $keys = array())
      * @param  array $keys
      * @return array
      */
-    public function convertToArray(array $keys = array())
+    public function convertToArray(array $keys = [])
     {
         return $this->toArray($keys);
     }
@@ -397,7 +397,7 @@ public function convertToArray(array $keys = array())
      * @param bool $addCdata flag that require wrap all values in CDATA
      * @return string
      */
-    public function toXml(array $keys = array(), $rootName = 'item', $addOpenTag = false, $addCdata = true)
+    public function toXml(array $keys = [], $rootName = 'item', $addOpenTag = false, $addCdata = true)
     {
         $xml = '';
         $data = $this->toArray($keys);
@@ -406,8 +406,8 @@ public function toXml(array $keys = array(), $rootName = 'item', $addOpenTag = f
                 $fieldValue = "<![CDATA[{$fieldValue}]]>";
             } else {
                 $fieldValue = str_replace(
-                    array('&', '"', "'", '<', '>'),
-                    array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'),
+                    ['&', '"', "'", '<', '>'],
+                    ['&amp;', '&quot;', '&apos;', '&lt;', '&gt;'],
                     $fieldValue
                 );
             }
@@ -432,7 +432,7 @@ public function toXml(array $keys = array(), $rootName = 'item', $addOpenTag = f
      * @return string
      */
     public function convertToXml(
-        array $arrAttributes = array(),
+        array $arrAttributes = [],
         $rootName = 'item',
         $addOpenTag = false,
         $addCdata = true
@@ -446,7 +446,7 @@ public function convertToXml(
      * @param array $keys array of required keys
      * @return string
      */
-    public function toJson(array $keys = array())
+    public function toJson(array $keys = [])
     {
         $data = $this->toArray($keys);
         return \Zend_Json::encode($data);
@@ -458,7 +458,7 @@ public function toJson(array $keys = array())
      * @param  array $keys
      * @return string
      */
-    public function convertToJson(array $keys = array())
+    public function convertToJson(array $keys = [])
     {
         return $this->toJson($keys);
     }
@@ -543,7 +543,7 @@ protected function _underscore($name)
         if (isset(self::$_underscoreCache[$name])) {
             return self::$_underscoreCache[$name];
         }
-        $result = strtolower(preg_replace('/(.)([A-Z])/', "$1_$2", $name));
+        $result = strtolower(trim(preg_replace('/([A-Z0-9])/', "_$1", $name), '_'));
         self::$_underscoreCache[$name] = $result;
         return $result;
     }
@@ -559,9 +559,9 @@ protected function _underscore($name)
      * @param   string $quote quoting sign
      * @return  string
      */
-    public function serialize($keys = array(), $valueSeparator = '=', $fieldSeparator = ' ', $quote = '"')
+    public function serialize($keys = [], $valueSeparator = '=', $fieldSeparator = ' ', $quote = '"')
     {
-        $data = array();
+        $data = [];
         if (empty($keys)) {
             $keys = array_keys($this->_data);
         }
@@ -640,7 +640,7 @@ public function setDataChanges($value)
      * @param array &$objects
      * @return array
      */
-    public function debug($data = null, &$objects = array())
+    public function debug($data = null, &$objects = [])
     {
         if (is_null($data)) {
             $hash = spl_object_hash($this);
@@ -650,7 +650,7 @@ public function debug($data = null, &$objects = array())
             $objects[$hash] = true;
             $data = $this->getData();
         }
-        $debug = array();
+        $debug = [];
         foreach ($data as $key => $value) {
             if (is_scalar($value)) {
                 $debug[$key] = $value;

From a7691eedbca26a1d0567122a7d6c6bb337b43c11 Mon Sep 17 00:00:00 2001
From: Anton Makarenko <amakarenko@ebay.com>
Date: Wed, 10 Dec 2014 14:34:42 -0600
Subject: [PATCH 230/474] MAGETWO-30676: Redirect Loop in Case Directory Root
 is Set to pub

- fixed behavior of auto-completing base URL in the Admin URL, if empty value was entered
---
 .../Magento/Setup/view/magento/setup/web-configuration.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
index 7d5d00bb7c4d0..cb0107c1ac42d 100644
--- a/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/web-configuration.phtml
@@ -56,7 +56,7 @@ $hints = [
     <div class="form-group" ng-class="{'has-error': webconfig.admin.$invalid && webconfig.submitted}">
         <label class="col-md-3 control-label">Magento Admin Address&nbsp;<span class="required">*</span></label>
         <div class="col-md-4 input-group" style="padding-left: 15px; padding-right: 15px;">
-            <span class="input-group-addon">{{config.address.base_url}}</span>
+            <span class="input-group-addon">{{config.address.actual_base_url}}</span>
             <input type="text"
                    name="admin"
                    class="form-control"

From d439b781c81ad21837ce64d1ceb7009bf79db5d4 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Wed, 10 Dec 2014 15:16:45 -0600
Subject: [PATCH 231/474] MAGETWO-30951: Test database connection when 'Next'
 button is clicked

- Now only one DB connection check after pressing next button.
---
 .../view/magento/setup/add-database.phtml     | 18 ++---------
 setup/pub/magento/setup/add-database.js       | 32 ++-----------------
 2 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
index f225f45f8d4a9..b3ed79da16a5a 100644
--- a/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
+++ b/setup/module/Magento/Setup/view/magento/setup/add-database.phtml
@@ -8,7 +8,7 @@
 ?>
 <div class="step-controls">
     <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
-    <a href="" class="btn btn-primary" ng-click="nextState()">Next</a>
+    <a href="" class="btn btn-primary" ng-click="testConnection()">Next</a>
 </div>
 
 <div class="page-header">
@@ -121,11 +121,6 @@
                    name="dbname"
                    ng-model="db.name"
                    required />
-            <input type="hidden"
-                   ng-model="call.db"
-                   ng-show=""
-                   ng-init="initialCall()"
-                   required />
         </div>
         <div class="col-sm-offset-4 col-sm-4" ng-show="database.dbname.$invalid && database.submitted">
             <div class="error-container">
@@ -165,14 +160,7 @@
     </div>
 
     <div class="form-group">
-        <div class="col-sm-4">
-            <input type="hidden"
-                   ng-model="testConn"
-                   ng-show="testConnection.result !== undefined && !testConnection.result.success"
-                   ng-bind="testConn"
-                   required />
-        </div>
-        <div  class="col-sm-4" ng-show="database.submitted">
+        <div  class="col-sm-offset-4 col-sm-4">
             <div ng-show="testConnection.result.success === false && testConnection.result !== undefined" class="error-container animate-show text-danger">
                 <span class="glyphicon glyphicon-remove-sign">&nbsp;{{testConnection.result.error}}</span>
             </div>
@@ -257,5 +245,5 @@
 
 <div class="step-controls">
     <a href="" class="btn btn-primary" ng-click="previousState()">Previous</a>
-    <a href="" class="btn btn-primary" ng-click="nextState()">Next</a>
+    <a href="" class="btn btn-primary" ng-click="testConnection()">Next</a>
 </div>
\ No newline at end of file
diff --git a/setup/pub/magento/setup/add-database.js b/setup/pub/magento/setup/add-database.js
index 6a8d3a01e90b6..50c5de80c037f 100644
--- a/setup/pub/magento/setup/add-database.js
+++ b/setup/pub/magento/setup/add-database.js
@@ -15,7 +15,6 @@ angular.module('add-database', ['ngStorage'])
             user: 'root',
             name: 'magento'
         };
-        $scope.testConn = 'mock';
 
         if ($localStorage.db) {
             $scope.db = $localStorage.db;
@@ -25,11 +24,8 @@ angular.module('add-database', ['ngStorage'])
             $http.post('index.php/database-check', $scope.db)
                 .success(function (data) {
                     $scope.testConnection.result = data;
-                    if (($scope.testConnection.result !== undefined) && (!$scope.testConnection.result.success)) {
-                        $scope.testConn = '';
-                    } else {
-                        $scope.testConn = 'mock';
-                        $scope.database.$valid = true;
+                    if (!(($scope.testConnection.result !== undefined) && (!$scope.testConnection.result.success))) {
+                        $scope.nextState();
                     }
                 });
         };
@@ -38,35 +34,11 @@ angular.module('add-database', ['ngStorage'])
             $localStorage.db = $scope.db;
         });
 
-        $scope.initialCall = function () {
-            $scope.testConnection();
-        };
-
         // Listens on form validate event, dispatched by parent controller
         $scope.$on('validate-' + $state.current.id, function() {
             $scope.validate();
         });
 
-        $scope.$watch('db.host', function(newVal, oldVal) {
-            $scope.database.$valid = false;
-            $scope.testConnection();
-        });
-
-        $scope.$watch('db.user', function(newVal, oldVal) {
-            $scope.database.$valid = false;
-            $scope.testConnection();
-        });
-
-        $scope.$watch('db.password', function(newVal, oldVal) {
-            $scope.database.$valid = false;
-            $scope.testConnection();
-        });
-
-        $scope.$watch('db.name', function(newVal, oldVal) {
-            $scope.database.$valid = false;
-            $scope.testConnection();
-        });
-
         // Dispatch 'validation-response' event to parent controller
         $scope.validate = function() {
             if ($scope.database.$valid) {

From fc642b58d41b1a33f2697d460968587a7d1f367d Mon Sep 17 00:00:00 2001
From: Paul Lewis <plewis@ebay.com>
Date: Wed, 10 Dec 2014 15:24:58 -0600
Subject: [PATCH 232/474] MAGETWO-29546: DbStatusValidator does not provide
 enough information to perform successful update of the system

 - change integration test so it does not rely on any particular module being installed
---
 .../Module/Plugin/DbStatusValidatorTest.php   | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
index 55aa07e89dd3c..9047d10d05595 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Module/Plugin/DbStatusValidatorTest.php
@@ -21,15 +21,27 @@ public function testValidationUpToDateDb()
      */
     public function testValidationOutdatedDb()
     {
-        $resourceName = 'adminnotification_setup';
-        /*reset versions*/
-        /** @var \Magento\Framework\Module\ResourceInterface $resource */
-        $resource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\Module\ResourceInterface'
-        );
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var Magento\Framework\Module\ModuleListInterface $moduleList */
+        $moduleList = $objectManager->get('Magento\Framework\Module\ModuleListInterface');
+
+        /** @var \Magento\Framework\Module\ResourceResolverInterface $resourceResolver */
+        $resourceResolver = $objectManager->get('\Magento\Framework\Module\ResourceResolverInterface');
 
-        $resource->setDbVersion($resourceName, '0.1');
-        $resource->setDataVersion($resourceName, '0.1');
+        // get first resource, we don't care which one it is.
+        foreach ($moduleList->getNames() as $moduleName) {
+            if ($resourceList = $resourceResolver->getResourceList($moduleName)) {
+                $resourceName = $resourceList[0];
+                break;
+            }
+        }
+
+        // Prepend '0.' to DB Version, to cause it to be an older version
+        /** @var \Magento\Framework\Module\ResourceInterface $resource */
+        $resource = $objectManager->create('Magento\Framework\Module\ResourceInterface');
+        $currentDbVersion = $resource->getDbVersion($resourceName);
+        $resource->setDbVersion($resourceName, '0.' . $currentDbVersion);
 
         /** @var \Magento\Framework\Cache\FrontendInterface $cache */
         $cache = $this->_objectManager->get('Magento\Framework\App\Cache\Type\Config');

From 075b0fe627042acc65bce6ac75aeff6a9aa4cdaa Mon Sep 17 00:00:00 2001
From: Richard Bates <rbates@x.com>
Date: Wed, 10 Dec 2014 15:54:31 -0600
Subject: [PATCH 233/474] MAGETWO-3315: Functions _camelize and _underscore
 work incorrect with keys that have digits between '_' symbol  - minor change
 to attributes being set

---
 .../unit/testsuite/Magento/Authorizenet/Helper/DataTest.php     | 2 +-
 dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Authorizenet/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Authorizenet/Helper/DataTest.php
index 3aaf6216bd6ea..6c99b974ab28d 100644
--- a/dev/tests/unit/testsuite/Magento/Authorizenet/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Authorizenet/Helper/DataTest.php
@@ -52,7 +52,7 @@ public function testGetTransactionMessage($type, $amount, $exception, $additiona
         $payment->expects($this->any())
             ->method('getOrder')
             ->will($this->returnValue($order));
-        $card = new \Magento\Framework\Object(['cc_last4' => self::LAST4]);
+        $card = new \Magento\Framework\Object(['cc_last_4' => self::LAST4]);
         $message = $this->_model->getTransactionMessage(
             $payment,
             $type,
diff --git a/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php b/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php
index c7f50ac20d510..1bee97accdfe6 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php
@@ -458,6 +458,7 @@ public function underscoreDataProvider()
             'Test 2' => ['StoneColor', 'stone_color'],
             'Test 3' => ['StoneToXML', 'stone_to_x_m_l'],
             'Test 4' => ['1StoneColor', '1_stone_color'],
+            'Test 5' => ['getCcLast4', 'get_cc_last_4']
         ];
     }
 }

From 04240cbaa6de0c7b33bd7eb88df89edb540af963 Mon Sep 17 00:00:00 2001
From: Richard Bates <rbates@x.com>
Date: Wed, 10 Dec 2014 16:02:14 -0600
Subject: [PATCH 234/474] MAGETWO-3315: Functions _camelize and _underscore
 work incorrect with keys that have digits between '_' symbol  - Changed how
 consecutive digits or capital characters are handled

---
 app/code/Magento/Paypal/Model/Info.php                    | 2 +-
 dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php | 5 +++--
 lib/internal/Magento/Framework/Object.php                 | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Info.php b/app/code/Magento/Paypal/Model/Info.php
index 8103d2323e945..8c24133c83fcf 100644
--- a/app/code/Magento/Paypal/Model/Info.php
+++ b/app/code/Magento/Paypal/Model/Info.php
@@ -39,7 +39,7 @@ class Info
 
     const AVS_CODE = 'avs_result';
 
-    const CVV2_MATCH = 'cvv2_check_result';
+    const CVV2_MATCH = 'cvv_2_check_result';
 
     const CENTINEL_VPAS = 'centinel_vpas_result';
 
diff --git a/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php b/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php
index 1bee97accdfe6..ae011b3c2c3da 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/ObjectTest.php
@@ -456,9 +456,10 @@ public function underscoreDataProvider()
         return [
             'Test 1' => ['Stone1Color', 'stone_1_color'],
             'Test 2' => ['StoneColor', 'stone_color'],
-            'Test 3' => ['StoneToXML', 'stone_to_x_m_l'],
+            'Test 3' => ['StoneToXML', 'stone_to_xml'],
             'Test 4' => ['1StoneColor', '1_stone_color'],
-            'Test 5' => ['getCcLast4', 'get_cc_last_4']
+            'Test 5' => ['getCcLast4', 'get_cc_last_4'],
+            'Test 6' => ['99Bottles', '99_bottles']
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/Object.php b/lib/internal/Magento/Framework/Object.php
index 189f081ac64a7..cb8a98ba08b40 100644
--- a/lib/internal/Magento/Framework/Object.php
+++ b/lib/internal/Magento/Framework/Object.php
@@ -543,7 +543,7 @@ protected function _underscore($name)
         if (isset(self::$_underscoreCache[$name])) {
             return self::$_underscoreCache[$name];
         }
-        $result = strtolower(trim(preg_replace('/([A-Z0-9])/', "_$1", $name), '_'));
+        $result = strtolower(trim(preg_replace('/([A-Z]+|[0-9]+)/', "_$1", $name), '_'));
         self::$_underscoreCache[$name] = $result;
         return $result;
     }

From 8afeefcb18ef79a80de1aaf325f163b282f8331f Mon Sep 17 00:00:00 2001
From: Richard Bates <rbates@x.com>
Date: Wed, 10 Dec 2014 16:12:01 -0600
Subject: [PATCH 235/474] MAGETWO-3315: Functions _camelize and _underscore
 work incorrect with keys that have digits between '_' symbol  - fixed
 property in payment interface

---
 app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php b/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
index 627782ac208c0..59a51a77e1d19 100644
--- a/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
@@ -45,7 +45,7 @@ interface OrderPaymentInterface extends \Magento\Framework\Api\ExtensibleDataInt
     const CC_SECURE_VERIFY = 'cc_secure_verify';
     const PROTECTION_ELIGIBILITY = 'protection_eligibility';
     const CC_APPROVAL = 'cc_approval';
-    const CC_LAST4 = 'cc_last4';
+    const CC_LAST4 = 'cc_last_4';
     const CC_STATUS_DESCRIPTION = 'cc_status_description';
     const ECHECK_TYPE = 'echeck_type';
     const CC_DEBUG_RESPONSE_SERIALIZED = 'cc_debug_response_serialized';

From 5d6e99c8fb59a80c12708ccb9a6dc4a6d30a85ee Mon Sep 17 00:00:00 2001
From: Maksym Savich <msavich@ebay.com>
Date: Wed, 10 Dec 2014 17:12:52 -0600
Subject: [PATCH 236/474] Fixed MAGETWO-31356: PDO Exception during Magento
 installation

- Error message text changed
---
 setup/module/Magento/Setup/src/Model/Installer.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index 8ce63e6af582d..ec5e0deb57d51 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -704,8 +704,7 @@ public function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '')
                 if (isset($matches[1]) && !empty($matches[1])) {
                     if (version_compare($matches[1], self::MYSQL_VERSION_REQUIRED) < 0) {
                         throw new \Magento\Setup\Exception(
-                            'Unsupported MySQL version! '
-                            . 'Version '. self::MYSQL_VERSION_REQUIRED . ' or later is required.'
+                            'Sorry, but we support MySQL version '. self::MYSQL_VERSION_REQUIRED . ' or later."'
                         );
                     }
                 }

From 32b36fdcf651ec057a3ed55a4d6648fb4f04fb2d Mon Sep 17 00:00:00 2001
From: Maksym Savich <msavich@ebay.com>
Date: Wed, 10 Dec 2014 17:24:46 -0600
Subject: [PATCH 237/474] Fixed MAGETWO-31356: PDO Exception during Magento
 installation

- Error message text fixed
---
 setup/module/Magento/Setup/src/Model/Installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index ec5e0deb57d51..094687df93047 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -704,7 +704,7 @@ public function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '')
                 if (isset($matches[1]) && !empty($matches[1])) {
                     if (version_compare($matches[1], self::MYSQL_VERSION_REQUIRED) < 0) {
                         throw new \Magento\Setup\Exception(
-                            'Sorry, but we support MySQL version '. self::MYSQL_VERSION_REQUIRED . ' or later."'
+                            'Sorry, but we support MySQL version '. self::MYSQL_VERSION_REQUIRED . ' or later.'
                         );
                     }
                 }

From fb5e6f48d69725a7d20863cea290ceb496cf8b37 Mon Sep 17 00:00:00 2001
From: Oleksandr Rykh <orykh@ebay.com>
Date: Thu, 11 Dec 2014 10:27:37 +0200
Subject: [PATCH 238/474] MTA-774: Stabilize Catalog module. Product Attributes

- Fix CR Changes
---
 .../AssertProductTemplateGroupOnProductForm.php          | 3 +--
 .../Block/Adminhtml/Types/Edit/GoogleShoppingForm.php    | 9 ++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
index 455be914048f1..7eb0351662ec7 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTemplateGroupOnProductForm.php
@@ -65,8 +65,7 @@ public function processAssert(
             ]
         );
         $productBlockForm->fill($productSimple);
-        $eventManager = ObjectManager::getInstance()->create('Mtf\System\Event\EventManager');
-        $eventManager->dispatchEvent(['exception'], ['Screenshot for searching button.']);
+
         \PHPUnit_Framework_Assert::assertTrue(
             $productEdit->getProductForm()->isTabVisible($attributeSet->getGroup()),
             "Product Group is absent on Product form tabs."
diff --git a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
index 195a715a0a3f2..fa363d5fe1a3d 100644
--- a/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
+++ b/dev/tests/functional/tests/app/Magento/GoogleShopping/Test/Block/Adminhtml/Types/Edit/GoogleShoppingForm.php
@@ -25,6 +25,13 @@ class GoogleShoppingForm extends Form
      */
     protected $attributeOptions = '//select[@id="gcontent_attribute_0_attribute"]//option';
 
+    /**
+     * Locator for root elements
+     *
+     * @var string
+     */
+    protected $loaderRootLocator = 'body';
+
     /**
      * Fill specified form data
      *
@@ -41,7 +48,7 @@ protected function _fill(array $fields, Element $element = null)
                 $element->setValue($field['value']);
                 $this->blockFactory->create(
                     'Magento\Backend\Test\Block\Template',
-                    ['element' => $this->browser->find('body')]
+                    ['element' => $this->browser->find($this->loaderRootLocator)]
                 )->waitLoader();
             }
         }

From 157cd79c648f1661bfc414745afea8c47565cec9 Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Wed, 10 Dec 2014 16:54:59 +0200
Subject: [PATCH 239/474] MTA-1127: Update build.xml file for installation plan
 - skipped issues - updated assert

---
 .../Test/Constraint/AssertRewritesEnabled.php | 30 +++++++++----------
 .../Install/Test/TestCase/InstallTest.php     | 10 +++++++
 .../Test/TestCase/InstallTest/test.csv        |  2 +-
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
index 3e1d152c20913..55394a8fcad3b 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
@@ -8,11 +8,13 @@
 
 namespace Magento\Install\Test\Constraint;
 
-use Mtf\Client\Browser;
+use Magento\Cms\Test\Page\CmsIndex;
 use Mtf\Constraint\AbstractConstraint;
+use Mtf\Client\Driver\Selenium\Browser;
+use \Magento\Catalog\Test\Fixture\CatalogCategory;
 
 /**
- * Assert that apache redirect correct work.
+ * Assert that apache redirect correct works.
  */
 class AssertRewritesEnabled extends AbstractConstraint
 {
@@ -21,24 +23,22 @@ class AssertRewritesEnabled extends AbstractConstraint
     /* end tags */
 
     /**
-     * Assert that apache redirect correct work.
+     * Assert that apache redirect works by opening category page and asserting index.php in its url
      *
+     * @param CatalogCategory $category
+     * @param CmsIndex $homePage
      * @param Browser $browser
-     * @return void
      */
-    public function processAssert(Browser $browser)
+    public function processAssert(CatalogCategory $category, CmsIndex $homePage, Browser $browser)
     {
-        $frontUrl = str_replace('index.php/', '', $_ENV['app_frontend_url']);
-        $browser->open($frontUrl . 'index.php/');
-        \PHPUnit_Framework_Assert::assertEquals(
-            $frontUrl,
-            $browser->getUrl(),
-            'Apache redirect on front page does not work.'
-        );
+        $category->persist();
+        $homePage->open();
+        $homePage->getTopmenu()->selectCategoryByName($category->getName());
 
-        $browser->open($frontUrl . 'index.php/backend/');
-        $isRedirect = strpos($browser->getUrl(), 'index.php') !== false;
-        \PHPUnit_Framework_Assert::assertTrue($isRedirect, 'Apache redirect on backend does not work.');
+        \PHPUnit_Framework_Assert::assertTrue(
+            strpos($browser->getUrl(), 'index.php') === false,
+            'Apache redirect for category does not work.'
+        );
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
index af7c183f0e04b..f06d7d219b544 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
@@ -62,6 +62,16 @@ class InstallTest extends Injectable
      */
     protected $homePage;
 
+    /**
+     * Ignore test due to the issue
+     *
+     * @return void
+     */
+    public static function setUpBeforeClass()
+    {
+        self::markTestIncomplete('Bug: MAGETWO-31622');
+    }
+
     /**
      * Uninstall Magento before test.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
index 86a042e1e3c44..4a3b6dc96aef1 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest/test.csv
@@ -2,6 +2,6 @@
 "default";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin";"install with default values";""
 "default";"-";"custom";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin";"install with custom admin path";""
 "default";"-";"-";"-";"-";"-";"Yes";"123123qa";"German (Germany)";"Euro (EUR)";"€";"Suchbegriffe";"assertSuccessInstall, assertKeyCreated, assertUserSuccessLogin, assertCurrencySelected, assertLanguageSelected";"install with custom encryption key and changed currency and locale";""
-"default";"prefix1_";"-";"-";"-";"-";"-";"-";"Chinese (China)";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin";"install with table prefix";""
+"default";"prefix1_";"-";"-";"-";"-";"-";"-";"Chinese (China)";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin";"install with table prefix";"MAGETWO-31658"
 "default";"-";"-";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin, assertRewritesEnabled";"install with enabled url rewrites";""
 "default";"-";"-";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertSuccessInstall, assertUserSuccessLogin, assertSecureUrlEnabled";"install with enabled secure urls";"MAGETWO-31409"

From cfdf3093cfa6aa7dfdad75605275703e9b0f5e63 Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Thu, 11 Dec 2014 11:00:14 +0200
Subject: [PATCH 240/474] MTA-1127: Update build.xml file for installation plan
 - fixed merge conflicts

---
 dev/tests/functional/phpunit.xml.dist | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index a340a8a096d09..7ffa3c6bdfe6e 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -31,18 +31,6 @@
     </listeners>
 
     <php>
-<<<<<<< Updated upstream
-        <env name="app_frontend_url" value="http://localhost/index.php/"/>
-        <env name="app_backend_url" value="http://localhost/index.php/backend/"/>
-        <env name="app_config_path" value="config/application.yml.dist"/>
-        <env name="server_config_path" value="config/server.yml.dist"/>
-        <env name="isolation_config_path" value="config/isolation.yml.dist"/>
-        <env name="handlers_config_path" value="config/handler.yml.dist"/>
-        <env name="install_config_path" value="config/install_data.yml.dist"/>
-        <env name="configuration:Mtf/TestSuite/InjectableTests" value="basic"/>
-        <env name="log_directory" value="var/log"/>
-        <env name="events_preset" value="base"/>
-=======
         <env name="app_frontend_url" value="http://localhost/index.php/" />
         <env name="app_backend_url" value="http://localhost/index.php/backend/" />
         <env name="app_config_path" value="config/application.yml.dist" />
@@ -53,7 +41,6 @@
         <env name="log_directory" value="var/log" />
         <env name="events_preset" value="base" />
         <env name="module_whitelist" value="Magento_Install" />
->>>>>>> Stashed changes
     </php>
 
 </phpunit>

From c7cf85b42138a48078ca54b5d7961a76665d6cc4 Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@ebay.com>
Date: Thu, 11 Dec 2014 11:32:30 +0200
Subject: [PATCH 241/474] MAGETWO-31572: Refactor and cover by unit tests
 Magento\GoogleShopping\Model\Attribute\SalePriceEffectiveDate::convertAttribute

---
 .../Attribute/SalePriceEffectiveDateTest.php  | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php

diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php
new file mode 100644
index 0000000000000..712fc333a4fc1
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\GoogleShopping\Model\Attribute;
+
+class SalePriceEffectiveDateTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider testConvertAttributeDataProvider
+     * @param $dateFrom
+     * @param $dataTo
+     */
+    public function testConvertAttribute($dateFrom, $dataTo)
+    {
+        /** @var \Magento\GoogleShopping\Model\Attribute\SalePriceEffectiveDate $model */
+        $model = (new \Magento\TestFramework\Helper\ObjectManager($this))
+            ->getObject('\Magento\GoogleShopping\Model\Attribute\SalePriceEffectiveDate');
+        $product = $this->getMock('\Magento\Catalog\Model\Product', ['__wakeup'], [], '', false);
+        $effectiveDateFrom = $this->getMock(
+            '\Magento\GoogleShopping\Model\Attribute\DefaultAttribute',
+            ['getProductAttributeValue'],
+            [],
+            '',
+            false
+        );
+        $effectiveDateFrom->expects($this->any())
+            ->method('getProductAttributeValue')
+            ->with($product)
+            ->will($this->returnValue($dateFrom));
+
+        $effectiveDateTo = $this->getMock(
+            '\Magento\GoogleShopping\Model\Attribute\DefaultAttribute',
+            ['getProductAttributeValue'],
+            [],
+            '',
+            false
+        );
+        $effectiveDateTo->expects($this->any())
+            ->method('getProductAttributeValue')
+            ->with($product)
+            ->will($this->returnValue($dataTo));
+        $model->setGroupAttributeSalePriceEffectiveDateFrom($effectiveDateFrom);
+        $model->setGroupAttributeSalePriceEffectiveDateTo($effectiveDateTo);
+        $attribute = $this->getMock('\Magento\Framework\Gdata\Gshopping\Extension\Attribute');
+        $entry = $this->getMock(
+            '\Magento\Framework\Gdata\Gshopping\Entry',
+            ['getContentAttributeByName'],
+            [],
+            '',
+            false
+        );
+        $entry->expects($this->any())
+            ->method('getContentAttributeByName')
+            ->with('sale_price_effective_date')
+            ->will($this->returnValue($attribute));
+        $this->assertEquals($entry, $model->convertAttribute($product, $entry));
+    }
+
+    public function testConvertAttributeDataProvider()
+    {
+        $dateFrom = date(DATE_ATOM, strtotime("-2 day"));
+        $dateTo = date(DATE_ATOM);
+        return [
+            [$dateFrom, $dateTo],
+            [null, $dateTo],
+            [$dateFrom, null]
+        ];
+    }
+}

From fe384a30638730602c984f0f26e4feb47099e60c Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Thu, 11 Dec 2014 11:34:39 +0200
Subject: [PATCH 242/474] MAGETWO-30317: Css minificator works incorrectly

---
 .../Magento/Framework/Css/PreProcessor/_files/minificate.css | 2 +-
 .../Magento/Framework/Css/PreProcessor/_files/oyejorge.css   | 2 +-
 .../Magento/Framework/Css/PreProcessor/_files/oyejorge.less  | 5 +++++
 .../Framework/Css/PreProcessor/_files/oyejorge_dev.css       | 4 ++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css
index e0a7f5ba7f704..95412618c8a2c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css
@@ -1 +1 @@
-#header{color:#4d926f}h2{color:#4d926f}#header{-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;-o-border-radius:5px;border-radius:5px}#footer{-webkit-border-radius:10px;-moz-border-radius:10px;-ms-border-radius:10px;-o-border-radius:10px;border-radius:10px}#header h1{font-size:26px;font-weight:bold}#header p{font-size:12px}#header p a{text-decoration:none}#header p a:hover{border-width:1px}#header{color:#333;border-left:1px;border-right:2px}#footer{color:#141;border-color:#7d2717}body{background-image:url(Magento_Theme::validation_advice_bg.gif)}
\ No newline at end of file
+#header{color:#4d926f}h2{color:#4d926f}#header{-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;-o-border-radius:5px;border-radius:5px}#footer{-webkit-border-radius:10px;-moz-border-radius:10px;-ms-border-radius:10px;-o-border-radius:10px;border-radius:10px}#header h1{font-size:26px;font-weight:bold}#header p{font-size:12px}#header p a{text-decoration:none}#header p a:hover{border-width:1px}#header{color:#333;border-left:1px;border-right:2px}#footer{color:#141;border-color:#7d2717}body{background-image:url(Magento_Theme::validation_advice_bg.gif)}.overflow{overflow-y:hidden;overflow-x:auto}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
index dfa22a70de2dc..a892b39cc0950 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
@@ -1 +1 @@
-#header{color: #4d926f}h2{color: #4d926f}#header{-webkit-border-radius: 5px;-moz-border-radius: 5px;-ms-border-radius: 5px;-o-border-radius: 5px;border-radius: 5px}#footer{-webkit-border-radius: 10px;-moz-border-radius: 10px;-ms-border-radius: 10px;-o-border-radius: 10px;border-radius: 10px}#header h1{font-size: 26px;font-weight: bold}#header p{font-size: 12px}#header p a{text-decoration: none}#header p a:hover{border-width: 1px}#header{color: #333;border-left: 1px;border-right: 2px}#footer{color: #141;border-color: #7d2717}body{background-image: url(Magento_Theme::validation_advice_bg.gif)}
\ No newline at end of file
+#header{color: #4d926f}h2{color: #4d926f}#header{-webkit-border-radius: 5px;-moz-border-radius: 5px;-ms-border-radius: 5px;-o-border-radius: 5px;border-radius: 5px}#footer{-webkit-border-radius: 10px;-moz-border-radius: 10px;-ms-border-radius: 10px;-o-border-radius: 10px;border-radius: 10px}#header h1{font-size: 26px;font-weight: bold}#header p{font-size: 12px}#header p a{text-decoration: none}#header p a:hover{border-width: 1px}#header{color: #333;border-left: 1px;border-right: 2px}#footer{color: #141;border-color: #7d2717}body{background-image: url(Magento_Theme::validation_advice_bg.gif)}.overflow{overflow-y: hidden;overflow-x: auto}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.less b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.less
index febf31ee5af5b..b7d511ed6ab03 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.less
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.less
@@ -67,3 +67,8 @@ h2 {
 body {
   background-image: @body-bg-img;
 }
+
+.overflow {
+  overflow-y: hidden;
+  overflow-x: auto;
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css
index 5cfe4bd6f2372..ffee09ead620e 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css
@@ -43,3 +43,7 @@ h2 {
 body {
   background-image: url(Magento_Theme::validation_advice_bg.gif);
 }
+.overflow {
+    overflow-y: hidden;
+    overflow-x: auto;
+}

From a38e0bae5fe36871a93bdbdc5b6734cb46829751 Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Thu, 11 Dec 2014 11:36:58 +0200
Subject: [PATCH 243/474] MTA-1127: Update build.xml file for installation plan
 - updated test skip

---
 .../app/Magento/Install/Test/TestCase/InstallTest.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
index f06d7d219b544..55fdf17178c28 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
@@ -62,16 +62,6 @@ class InstallTest extends Injectable
      */
     protected $homePage;
 
-    /**
-     * Ignore test due to the issue
-     *
-     * @return void
-     */
-    public static function setUpBeforeClass()
-    {
-        self::markTestIncomplete('Bug: MAGETWO-31622');
-    }
-
     /**
      * Uninstall Magento before test.
      *
@@ -126,6 +116,7 @@ public function test(
         AssertSuccessfulReadinessCheck $assertReadiness,
         AssertSuccessDbConnection $assertDbConnection
     ) {
+        $this->markTestIncomplete('Bug: MAGETWO-31622');
         $dataConfig = array_merge($install, $configData);
         /** @var InstallConfig $installConfig */
         $installConfig = $fixtureFactory->create('Magento\Install\Test\Fixture\Install', ['data' => $dataConfig]);

From e3067b67491f132d1490d1acec90bafc340565b3 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 11 Dec 2014 11:58:29 +0200
Subject: [PATCH 244/474] MAGETWO-31629: Online payment methods removal for CE
 release

---
 .../testsuite/Magento/Test/Integrity/Di/_files/blacklist.txt   | 3 ++-
 .../Magento/Test/Integrity/_files/blacklist/reference.txt      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/_files/blacklist.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/_files/blacklist.txt
index 37da099b25997..98029af54f487 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/_files/blacklist.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/_files/blacklist.txt
@@ -1 +1,2 @@
-app/code/Magento/SalesArchive/sql/salesarchive_setup/recurring.php
\ No newline at end of file
+app/code/Magento/SalesArchive/sql/salesarchive_setup/recurring.php
+app/code/Magento/Payment/Model/Method/Cc.php
\ No newline at end of file
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
index 1d55de7b2756d..7d3185533b58d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
@@ -37,3 +37,4 @@ Model3
 \Magento\Wonderland\Model\Data\FakeRegion
 \Magento\Wonderland\Model\Data\FakeAddress
 \Magento\Framework\Error\Processor
+\Magento\Payment\Model\Method\Cc

From 3bd094186fa9428698a862be7a64e319f8037040 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Thu, 11 Dec 2014 12:59:48 +0200
Subject: [PATCH 245/474] MAGETWO-30419: [GITHUB] CMS Router not routing
 correctly #683

---
 .../Magento/Cms/Controller/PageTest.php       | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
index 1348e34b6b9f9..e76e888a82b98 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
@@ -31,4 +31,27 @@ public function testAddBreadcrumbs()
         $breadcrumbsBlock = $layout->getBlock('breadcrumbs');
         $this->assertContains($breadcrumbsBlock->toHtml(), $this->getResponse()->getBody());
     }
+
+    /**
+     * @magentoDataFixture cmsPageWIthSystemRouteFixture
+     */
+    public function testCreatePageWithSameModuleName()
+    {
+        $this->dispatch('/shipping/');
+        $content = $this->getResponse()->getBody();
+        $this->assertContains('Shipping Test Page', $content);
+    }
+
+    public static function cmsPageWIthSystemRouteFixture()
+    {
+        /** @var $page \Magento\Cms\Model\Page */
+        $page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Cms\Model\Page');
+        $page->setTitle('Test title')
+            ->setIdentifier('shipping')
+            ->setStores([0])
+            ->setIsActive(1)
+            ->setContent('<h1>Shipping Test Page</h1>')
+            ->setPageLayout('1column')
+            ->save();
+    }
 }

From 4e6461db784dbc71e90d2154ce6658946dee0ec9 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 11 Dec 2014 13:11:43 +0200
Subject: [PATCH 246/474] MAGETWO-31337: Incorrect work of PayPal conflict
 resolution in backend

---
 .../testsuite/Magento/Test/Legacy/_files/obsolete_classes.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 432cb659b4d89..3b41e84af5c01 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -2896,4 +2896,5 @@
     ['Magento\Framework\App\Arguments', 'Magento\Framework\App\DeploymentConfig'],
     ['Magento\Sales\Controller\Adminhtml\Order\InvoiceLoader'],
     ['Magento\Sales\Model\Resource\AbstractResource', 'Magento\Framework\Model\Resource\Db\AbstractDb'],
+    ['Magento\Paypal\Block\System\Config\Fieldset\Location']
 );

From f53b6e7a75d9b692c1b285ba30ed3d953180ba37 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com>
Date: Thu, 11 Dec 2014 13:32:52 +0200
Subject: [PATCH 247/474] MAGETWO-31639: Unable to update customer balance

---
 .../Model/Adminhtml/Balance/History.php       |   3 +
 .../CustomerBalance/Model/Balance/History.php |  11 +-
 .../Model/Balance/HistoryTest.php             | 164 ++++++++++++++++++
 3 files changed, 177 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/CustomerBalance/Model/Balance/HistoryTest.php

diff --git a/app/code/Magento/CustomerBalance/Model/Adminhtml/Balance/History.php b/app/code/Magento/CustomerBalance/Model/Adminhtml/Balance/History.php
index c747916687064..9439ac397417e 100644
--- a/app/code/Magento/CustomerBalance/Model/Adminhtml/Balance/History.php
+++ b/app/code/Magento/CustomerBalance/Model/Adminhtml/Balance/History.php
@@ -27,6 +27,7 @@ class History extends \Magento\CustomerBalance\Model\Balance\History
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Backend\Model\Auth\Session $authSession
+     * @param \Magento\Customer\Model\CustomerRegistry $customerRegistry
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -39,6 +40,7 @@ public function __construct(
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Backend\Model\Auth\Session $authSession,
+        \Magento\Customer\Model\CustomerRegistry $customerRegistry,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = array()
@@ -51,6 +53,7 @@ public function __construct(
             $storeManager,
             $design,
             $scopeConfig,
+            $customerRegistry,
             $resource,
             $resourceCollection,
             $data
diff --git a/app/code/Magento/CustomerBalance/Model/Balance/History.php b/app/code/Magento/CustomerBalance/Model/Balance/History.php
index 4d1b5a4e3a16b..2ca7b2c750f06 100644
--- a/app/code/Magento/CustomerBalance/Model/Balance/History.php
+++ b/app/code/Magento/CustomerBalance/Model/Balance/History.php
@@ -67,6 +67,11 @@ class History extends \Magento\Framework\Model\AbstractModel
      */
     protected $_transportBuilder;
 
+    /**
+     * @var \Magento\Customer\Model\CustomerRegistry
+     */
+    protected $customerRegistry;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -74,6 +79,7 @@ class History extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Customer\Model\CustomerRegistry $customerRegistry
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -85,6 +91,7 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Customer\Model\CustomerRegistry $customerRegistry,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = array()
@@ -93,6 +100,7 @@ public function __construct(
         $this->_design = $design;
         $this->_scopeConfig = $scopeConfig;
         $this->_storeManager = $storeManager;
+        $this->customerRegistry = $customerRegistry;
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -195,7 +203,8 @@ public function afterSave()
         $this->setIsCustomerNotified(false);
         if ($this->getBalanceModel()->getNotifyByEmail()) {
             $storeId = $this->getBalanceModel()->getStoreId();
-            $customer = $this->getBalanceModel()->getCustomer();
+            $customerId = $this->getBalanceModel()->getCustomer()->getId();
+            $customer = $this->customerRegistry->retrieve($customerId);
 
             $transport = $this->_transportBuilder->setTemplateIdentifier(
                 $this->_scopeConfig->getValue(
diff --git a/dev/tests/unit/testsuite/Magento/CustomerBalance/Model/Balance/HistoryTest.php b/dev/tests/unit/testsuite/Magento/CustomerBalance/Model/Balance/HistoryTest.php
new file mode 100644
index 0000000000000..1a56b54a0f98c
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/CustomerBalance/Model/Balance/HistoryTest.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\CustomerBalance\Model\Balance;
+
+class HistoryTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\CustomerBalance\Model\Balance\History
+     */
+    protected $model;
+
+    /**
+     * @var \PHPUnit_FrameWork_MockObject_MockObject
+     */
+    protected $balanceModelMock;
+
+    /**
+     * @var \PHPUnit_FrameWork_MockObject_MockObject
+     */
+    protected $customerRegistryMock;
+
+    /**
+     * @var \PHPUnit_FrameWork_MockObject_MockObject
+     */
+    protected $scopeConfigMock;
+
+    /**
+     * @var \PHPUnit_FrameWork_MockObject_MockObject
+     */
+    protected $transportBuilderMock;
+
+    /**
+     * @var \PHPUnit_FrameWork_MockObject_MockObject
+     */
+    protected $storeManagerMock;
+
+    /**
+     * @var \PHPUnit_FrameWork_MockObject_MockObject
+     */
+    protected $designMock;
+
+    /**
+     * @var \PHPUnit_FrameWork_MockObject_MockObject
+     */
+    protected $resourceMock;
+
+    protected function setUp()
+    {
+        $this->balanceModelMock = $this->getMock(
+            '\Magento\CustomerBalance\Model\Balance',
+            ['getNotifyByEmail', 'getStoreId', 'getCustomer', 'getWebsiteId', 'getAmount'],
+            [],
+            '',
+            false
+        );
+        $this->scopeConfigMock = $this->getMock(
+            '\Magento\Framework\App\Config\ScopeConfigInterface',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->transportBuilderMock = $this->getMock(
+            '\Magento\Framework\Mail\Template\TransportBuilder',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->resourceMock = $this->getMockForAbstractClass(
+            '\Magento\Framework\Model\Resource\AbstractResource',
+            [],
+            '',
+            false,
+            false,
+            true,
+            ['getIdFieldName', 'markAsSent']
+        );
+        $this->customerRegistryMock = $this->getMock('\Magento\Customer\Model\CustomerRegistry', [], [], '', false);
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
+        $this->designMock = $this->getMock('\Magento\Framework\View\DesignInterface', [], [], '', false);
+        $objectHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->model = $objectHelper->getObject(
+            '\Magento\CustomerBalance\Model\Balance\History',
+            [
+                'customerRegistry' => $this->customerRegistryMock,
+                'transportBuilder' => $this->transportBuilderMock,
+                'scopeConfig' => $this->scopeConfigMock,
+                'design' => $this->designMock,
+                'storeManager' => $this->storeManagerMock,
+                'resource' => $this->resourceMock
+            ]
+        );
+    }
+
+    public function testAfterSave()
+    {
+        $this->model->setBalanceModel($this->balanceModelMock);
+        $customerId = 1;
+        $storeId = 2;
+        $websiteId = 3;
+        $templateIdentifier = 'tpl';
+        $area = 'area';
+        $format = 'format';
+        $amount = 10;
+        $customerName = 'John Doe';
+        $customerEmail = 'johndoe@example.com';
+
+        $customerDataMock = $this->getMock('\Magento\Customer\Model\Data\Customer', ['getId'], [], '', false);
+        $customerMock = $this->getMock('\Magento\Customer\Model\Customer', ['getEmail', 'getName'], [], '', false);
+        $storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
+        $transportMock = $this->getMock('\Magento\Framework\Mail\TransportInterface', [], [], '', false);
+        $websiteMock = $this->getMock('\Magento\Store\Model\Website', [], [], '', false);
+        $currencyMock = $this->getMock('\Magento\Directory\Model\Currency', [], [], '', false);
+        $this->balanceModelMock->expects($this->once())->method('getNotifyByEmail')->willReturn(true);
+        $this->balanceModelMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
+        $this->balanceModelMock->expects($this->once())->method('getCustomer')->willReturn($customerDataMock);
+        $customerDataMock->expects($this->once())->method('getId')->willReturn($customerId);
+        $this->customerRegistryMock->expects($this->once())->method('retrieve')->with($customerId)
+            ->willReturn($customerMock);
+        $this->scopeConfigMock->expects($this->exactly(2))->method('getValue')->withConsecutive(
+            [
+                'customer/magento_customerbalance/email_template',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $storeId
+            ],
+            [
+                'customer/magento_customerbalance/email_identity',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $storeId
+            ]
+        )->willReturn($templateIdentifier);
+        $this->transportBuilderMock->expects($this->once())->method('setTemplateIdentifier')->with($templateIdentifier)
+            ->willReturnSelf();
+        $this->designMock->expects($this->once())->method('getArea')->willReturn($area);
+        $this->transportBuilderMock->expects($this->once())->method('setTemplateOptions')->with(
+            ['area' => $area, 'store' => $storeId]
+        )->willReturnSelf();
+        $this->balanceModelMock->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManagerMock->expects($this->once())->method('getWebsite')->with($websiteId)
+            ->willReturn($websiteMock);
+        $websiteMock->expects($this->once())->method('getBaseCurrency')->willReturn($currencyMock);
+        $this->balanceModelMock->expects($this->once())->method('getAmount')->willReturn($amount);
+        $currencyMock->expects($this->once())->method('format')->with($amount, [], false)->willReturn($format);
+        $customerMock->expects($this->exactly(2))->method('getName')->willReturn($customerName);
+        $this->storeManagerMock->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $this->transportBuilderMock->expects($this->once())->method('setTemplateVars')->with(
+            ['balance' => $format, 'name' => $customerName, 'store' => $storeMock]
+        )->willReturnSelf();
+        $this->transportBuilderMock->expects($this->once())->method('setFrom')->with($templateIdentifier)
+            ->willReturnSelf();
+        $customerMock->expects($this->once())->method('getEmail')->willReturn($customerEmail);
+        $this->transportBuilderMock->expects($this->once())->method('addTo')->with($customerEmail, $customerName)
+            ->willReturnSelf();
+        $this->transportBuilderMock->expects($this->once())->method('getTransport')->willReturn($transportMock);
+        $transportMock->expects($this->once())->method('sendMessage');
+        $this->assertEquals($this->model, $this->model->afterSave());
+    }
+}

From f5ffd85f2fb95d9d83d95a3b2d7560f4de1897f3 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Thu, 11 Dec 2014 13:33:38 +0200
Subject: [PATCH 248/474] MAGETWO-31694: Fatal if search in Wishlist search
 widget

---
 app/code/Magento/MultipleWishlist/Controller/Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MultipleWishlist/Controller/Search.php b/app/code/Magento/MultipleWishlist/Controller/Search.php
index f9c520b67d17f..c17132b3e1cff 100644
--- a/app/code/Magento/MultipleWishlist/Controller/Search.php
+++ b/app/code/Magento/MultipleWishlist/Controller/Search.php
@@ -139,7 +139,7 @@ public function __construct(
      */
     public function dispatch(RequestInterface $request)
     {
-        if (!$this->_objectManager->get('Magento\MultipleWishlist\Helper\Data')->isModuleEnabled()) {
+        if (!$this->_objectManager->get('Magento\Framework\Module\Manager')->isEnabled('Magento_MultipleWishlist')) {
             throw new NotFoundException();
         }
         return parent::dispatch($request);

From db2433b0e7fb6fb3651e6f128fa9ef01252cd3c8 Mon Sep 17 00:00:00 2001
From: Oleg Zinoviev <ozinoviev@ebay.com>
Date: Thu, 11 Dec 2014 13:49:17 +0200
Subject: [PATCH 249/474] MAGETWO-24703: Backend UI issues: improvements

- admin popup z-index issue.
---
 .../Magento/backend/Magento_Theme/web/css/source/module.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
index 697e6d9e9b3d8..92ce4753f84f2 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
@@ -237,7 +237,7 @@ body {
             top: 0;
             left: 0;
             right: 0;
-            z-index: 998;
+            z-index: 10;
             padding: 0;
             background: -webkit-linear-gradient(top, rgba(245, 242, 237, 1) 0%, rgba(245, 242, 237, 1) 56%, rgba(245, 242, 237, 0) 100%); // Use in 4.3 Android
             background: -ms-linear-gradient(top, rgba(245, 242, 237, 1) 0%, rgba(245, 242, 237, 1) 56%, rgba(245, 242, 237, 0) 100%); // Use in 10 IE

From 986fbe54fb93b9aecb9bfdfcf7044fa091c3804d Mon Sep 17 00:00:00 2001
From: Maxim Medinskiy <mmedinskiy@ebay.com>
Date: Thu, 11 Dec 2014 14:00:55 +0200
Subject: [PATCH 250/474] MAGETWO-24603: Port MPERF-310:  Bundle price index
 rounding errors

---
 app/code/Magento/Downloadable/Block/Catalog/Product/Links.php   | 2 +-
 .../testsuite/Magento/Test/Legacy/_files/obsolete_methods.php   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
index 2b24e8497f560..eabb0c4225444 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
@@ -34,7 +34,7 @@ public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
         \Magento\Core\Helper\Data $coreData,
         EncoderInterface $encoder,
-        array $data = array()
+        array $data = []
     ) {
         $this->coreData = $coreData;
         $this->encoder = $encoder;
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index aaebeffcb2f02..126a9320894d8 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -1994,6 +1994,5 @@
     ['getScriptTranslation', 'Magento\Framework\LocaleInterface'],
     ['getCountryTranslation', 'Magento\Framework\LocaleInterface'],
     ['getTerritoryTranslation', 'Magento\Framework\LocaleInterface'],
-    ['_escapeDefaultValue', 'Magento\Framework\Code\Generator\EntityAbstract'],
     ['getLinksConfig', 'Magento\Downloadable\Block\Catalog\Product\Links'],
 ];

From 8dc1a4fc45569497b4ac7a724090676291c1e165 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Thu, 11 Dec 2014 14:59:13 +0200
Subject: [PATCH 251/474] MAGETWO-31694: Fatal if search in Wishlist search
 widget

---
 .../Magento/MultipleWishlist/Controller/Search.php | 14 ++++++++++----
 .../Controller/Search/Addtocart.php                |  5 ++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/MultipleWishlist/Controller/Search.php b/app/code/Magento/MultipleWishlist/Controller/Search.php
index c17132b3e1cff..7cf685c91a21a 100644
--- a/app/code/Magento/MultipleWishlist/Controller/Search.php
+++ b/app/code/Magento/MultipleWishlist/Controller/Search.php
@@ -90,8 +90,11 @@ class Search extends \Magento\Framework\App\Action\Action
     protected $_itemFactory;
 
     /**
-     * Construct
-     *
+     * @var \Magento\Framework\Module\Manager
+     */
+    protected $moduleManager;
+
+    /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Wishlist\Model\ItemFactory $itemFactory
@@ -103,6 +106,7 @@ class Search extends \Magento\Framework\App\Action\Action
      * @param \Magento\Checkout\Model\Cart $checkoutCart
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param \Magento\Framework\Module\Manager $moduleManager
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -115,7 +119,8 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Checkout\Model\Cart $checkoutCart,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Framework\Locale\ResolverInterface $localeResolver
+        \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        \Magento\Framework\Module\Manager $moduleManager
     ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_itemFactory = $itemFactory;
@@ -127,6 +132,7 @@ public function __construct(
         $this->_checkoutCart = $checkoutCart;
         $this->_customerSession = $customerSession;
         $this->_localeResolver = $localeResolver;
+        $this->moduleManager = $moduleManager;
         parent::__construct($context);
     }
 
@@ -139,7 +145,7 @@ public function __construct(
      */
     public function dispatch(RequestInterface $request)
     {
-        if (!$this->_objectManager->get('Magento\Framework\Module\Manager')->isEnabled('Magento_MultipleWishlist')) {
+        if (!$this->moduleManager->isEnabled('Magento_MultipleWishlist')) {
             throw new NotFoundException();
         }
         return parent::dispatch($request);
diff --git a/app/code/Magento/MultipleWishlist/Controller/Search/Addtocart.php b/app/code/Magento/MultipleWishlist/Controller/Search/Addtocart.php
index 54dabafdb4372..57f402373ac0d 100644
--- a/app/code/Magento/MultipleWishlist/Controller/Search/Addtocart.php
+++ b/app/code/Magento/MultipleWishlist/Controller/Search/Addtocart.php
@@ -26,6 +26,7 @@ class Addtocart extends \Magento\MultipleWishlist\Controller\Search
      * @param \Magento\Checkout\Model\Cart $checkoutCart
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Wishlist\Model\LocaleQuantityProcessor $quantityProcessor
      */
     public function __construct(
@@ -40,6 +41,7 @@ public function __construct(
         \Magento\Checkout\Model\Cart $checkoutCart,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Wishlist\Model\LocaleQuantityProcessor $quantityProcessor
     ) {
         $this->quantityProcessor = $quantityProcessor;
@@ -55,7 +57,8 @@ public function __construct(
             $checkoutSession,
             $checkoutCart,
             $customerSession,
-            $localeResolver
+            $localeResolver,
+            $moduleManager
         );
     }
 

From e562d9f9494acd1e258f945c43eef62092e74021 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 11 Dec 2014 15:08:19 +0200
Subject: [PATCH 252/474] MAGETWO-31629: Online payment methods removal for CE
 release

---
 dev/build/publication/edition/ee.txt                           | 1 +
 .../testsuite/Magento/Test/Integrity/Di/_files/blacklist.txt   | 3 +--
 .../Magento/Test/Integrity/_files/blacklist/reference.txt      | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev/build/publication/edition/ee.txt b/dev/build/publication/edition/ee.txt
index f5760cdce6be4..8bd07df208bec 100644
--- a/dev/build/publication/edition/ee.txt
+++ b/dev/build/publication/edition/ee.txt
@@ -88,6 +88,7 @@ dev/tools/Magento/Tools/SampleData/Module/TargetRule
 
 dev/tests/integration/testsuite/Magento/Test/Design/Frontend/Enterprise
 dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Centinel
+app/code/Magento/Payment/Model/Method/Cc.php
 
 dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ee.php
 dev/tests/static/testsuite/Magento/Test/Js/_files/{whitelist,blacklist}/ee.txt
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/_files/blacklist.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/_files/blacklist.txt
index 98029af54f487..37da099b25997 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/_files/blacklist.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/_files/blacklist.txt
@@ -1,2 +1 @@
-app/code/Magento/SalesArchive/sql/salesarchive_setup/recurring.php
-app/code/Magento/Payment/Model/Method/Cc.php
\ No newline at end of file
+app/code/Magento/SalesArchive/sql/salesarchive_setup/recurring.php
\ No newline at end of file
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
index 7d3185533b58d..1d55de7b2756d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
@@ -37,4 +37,3 @@ Model3
 \Magento\Wonderland\Model\Data\FakeRegion
 \Magento\Wonderland\Model\Data\FakeAddress
 \Magento\Framework\Error\Processor
-\Magento\Payment\Model\Method\Cc

From 35897edc33534df5cb623b42ea4d5e427aa664a1 Mon Sep 17 00:00:00 2001
From: Oleg Zinoviev <ozinoviev@ebay.com>
Date: Thu, 11 Dec 2014 15:08:45 +0200
Subject: [PATCH 253/474] MAGETWO-24703: Backend UI issues: improvements

- Edit Page Revision issue.
---
 .../Block/Adminhtml/Cms/Page/Revision/Edit.php         |  5 ++++-
 .../view/adminhtml/templates/page/revision/info.phtml  | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Page/Revision/Edit.php b/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Page/Revision/Edit.php
index bd4af39817238..0a9fec5132591 100644
--- a/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Page/Revision/Edit.php
+++ b/app/code/Magento/VersionsCms/Block/Adminhtml/Cms/Page/Revision/Edit.php
@@ -179,7 +179,10 @@ function newVersionAction(e){
             $this->removeButton('save');
             $this->removeButton('saveandcontinue');
         }
-
+        $pageMainTitle = $this->getLayout()->getBlock('page-title');
+        if ($pageMainTitle) {
+            $pageMainTitle->setPageTitle($this->getHeaderText());
+        }
         return $this;
     }
 
diff --git a/app/code/Magento/VersionsCms/view/adminhtml/templates/page/revision/info.phtml b/app/code/Magento/VersionsCms/view/adminhtml/templates/page/revision/info.phtml
index a0a2c725b195d..bd449e89efc74 100644
--- a/app/code/Magento/VersionsCms/view/adminhtml/templates/page/revision/info.phtml
+++ b/app/code/Magento/VersionsCms/view/adminhtml/templates/page/revision/info.phtml
@@ -11,15 +11,15 @@
 ?>
 <div class="cms-revision-info">
     <div class="fieldset-wrapper">
-        <?php if ($this->getRevisionNumber()): ?>
         <div class="fieldset-wrapper-title">
             <span class="title">
-                <?php echo __('Revision #') ?> <?php echo $this->getRevisionNumber() ?>
-            <?php else: ?>
-                <?php echo __('New Revision') ?>
+                <?php if ($this->getRevisionNumber()): ?>
+                    <?php echo __('Revision #') ?> <?php echo $this->getRevisionNumber() ?>
+                <?php else: ?>
+                    <?php echo __('New Revision') ?>
+                <?php endif; ?>
             </span>
         </div>
-        <?php endif; ?>
         <table class="data-table">
             <tr>
                 <th><?php echo __('Author:') ?></th>

From ed21dfc78f54889dc7ce40a6cb0c52ff54754da6 Mon Sep 17 00:00:00 2001
From: Oleg Zinoviev <ozinoviev@ebay.com>
Date: Thu, 11 Dec 2014 15:22:00 +0200
Subject: [PATCH 254/474] MAGETWO-24703: Backend UI issues: improvements

- Clickable dropdowns in backend
---
 .../Magento/backend/Magento_Theme/web/css/source/module.less   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
index 92ce4753f84f2..ac995a67a410c 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
@@ -229,6 +229,9 @@ body {
             }
             .dropdown-menu {
                 text-align: left;
+                .item {
+                    display: block;
+                }
             }
         }
         // Fixed page actions

From 808176b4ae8660b67eca36cce2977e5edd24efbe Mon Sep 17 00:00:00 2001
From: Oleg Zinoviev <ozinoviev@ebay.com>
Date: Thu, 11 Dec 2014 15:50:28 +0200
Subject: [PATCH 255/474] MAGETWO-24703: Backend UI issues: improvements

- Aligned text for Ogone payment
---
 app/code/Magento/Ogone/etc/adminhtml/system.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Ogone/etc/adminhtml/system.xml b/app/code/Magento/Ogone/etc/adminhtml/system.xml
index ed9ff22b8a932..e8a14cd428f3e 100644
--- a/app/code/Magento/Ogone/etc/adminhtml/system.xml
+++ b/app/code/Magento/Ogone/etc/adminhtml/system.xml
@@ -10,15 +10,13 @@
             <group id="ogone" translate="label,comment" type="text" sortOrder="800" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Ogone</label>
                 <comment>
-                    <![CDATA[<br />
-                    <div class="custom-options">
+                    <![CDATA[
                     <div class="box">
-                        <p class="grand-total"><br /><b>Signing up with Ogone</b></p>
+                        <p class="grand-total"><b>Signing up with Ogone</b></p>
                         <p>Please enter the correct post back url and offline processiong url in Ogone configuration</p>
                         <p>Post back url example: http://myMagentoStore.com/ogone/api/postBack</p>
                         <p>Offline processing url example: http://myMagentoStore.com/ogone/api/offlineProcess</p>
                     </div>
-                    </div>
                     ]]>
                 </comment>
                 <field id="active" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="0">

From c9ae2b7a9e68e61f364345a9efc5c8e3ff38e888 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Thu, 11 Dec 2014 15:54:39 +0200
Subject: [PATCH 256/474] MAGETWO-31627: Remove proxy for config classes

- Added Config interface for interception
- Changed Interception config usages
---
 .../TestFramework/ObjectManager/Config.php    |  2 +-
 .../Framework/Interception/GeneralTest.php    |  2 +-
 .../Interception/ObjectManager/ConfigTest.php |  4 +--
 .../Framework/App/ObjectManagerFactory.php    |  4 +--
 .../Framework/Interception/Config/Config.php  |  6 ++--
 .../{Config.php => Config/Compiled.php}       |  6 ++--
 .../Config.php => Config/Developer.php}       |  6 ++--
 .../ObjectManager/ConfigInterface.php         | 29 +++++++++++++++++++
 .../Interception/PluginList/PluginList.php    |  8 ++---
 .../Environment/AbstractEnvironment.php       |  2 +-
 .../ObjectManager/Environment/Compiled.php    |  4 +--
 .../ObjectManager/Environment/Developer.php   |  6 ++--
 .../ObjectManager/EnvironmentInterface.php    |  2 +-
 .../ObjectManager/Factory/AbstractFactory.php | 18 +++++++-----
 14 files changed, 67 insertions(+), 32 deletions(-)
 rename lib/internal/Magento/Framework/Interception/ObjectManager/{Config.php => Config/Compiled.php} (85%)
 rename lib/internal/Magento/Framework/Interception/ObjectManager/{Compiled/Config.php => Config/Developer.php} (85%)
 create mode 100644 lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php

diff --git a/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Config.php b/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Config.php
index a2d51c2a2a97f..5f483a2c304f4 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Config.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/ObjectManager/Config.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\TestFramework\ObjectManager;
 
-class Config extends \Magento\Framework\Interception\ObjectManager\Config
+class Config extends \Magento\Framework\Interception\ObjectManager\Config\Developer
 {
     /**
      * Clean configuration
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
index d7a11559b0a93..4106449fc9de2 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
@@ -28,7 +28,7 @@ class GeneralTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $config = new \Magento\Framework\Interception\ObjectManager\Config(new ObjectManagerConfig());
+        $config = new \Magento\Framework\Interception\ObjectManager\Config\Developer(new ObjectManagerConfig());
         $factory = new \Magento\Framework\ObjectManager\Factory\Dynamic\Developer($config, null);
 
         $this->_configReader = $this->getMock('Magento\Framework\Config\ReaderInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/ConfigTest.php
index aea04b7be373d..3b3dacb34572b 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/ConfigTest.php
@@ -11,7 +11,7 @@
 class ConfigTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Interception\ObjectManager\Config
+     * @var \Magento\Framework\Interception\ObjectManager\Config\Developer
      */
     private $model;
 
@@ -32,7 +32,7 @@ protected function setUp()
             ->setMethods(['getInstanceType'])
             ->getMock();
 
-        $this->model = new Config($this->subjectConfigMock);
+        $this->model = new Developer($this->subjectConfigMock);
     }
 
     public function testGetInstanceTypeReturnsInterceptorClass()
diff --git a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
index ce885e7a70025..dbbaef8dfe045 100644
--- a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
+++ b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
@@ -115,7 +115,7 @@ public function create(array $arguments, $useCompiled = true)
         /** @var EnvironmentInterface $env */
         $env =  $enFactory->createEnvironment();
 
-        /** @var \Magento\Framework\Interception\ObjectManager\Config $diConfig */
+        /** @var \Magento\Framework\Interception\ObjectManager\ConfigInterface $diConfig */
         $diConfig = $env->getDiConfig();
 
         $appMode = isset($arguments[State::PARAM_MODE]) ? $arguments[State::PARAM_MODE] : State::MODE_DEFAULT;
@@ -140,7 +140,7 @@ public function create(array $arguments, $useCompiled = true)
             'Magento\Framework\ObjectManager\RelationsInterface' => $relations,
             'Magento\Framework\Interception\DefinitionInterface' => $definitionFactory->createPluginDefinition(),
             'Magento\Framework\ObjectManager\ConfigInterface' => $diConfig,
-            'Magento\Framework\Interception\ObjectManager\Config' => $diConfig,
+            'Magento\Framework\Interception\ObjectManager\ConfigInterface' => $diConfig,
             'Magento\Framework\ObjectManager\DefinitionInterface' => $definitions,
             'Magento\Framework\Stdlib\BooleanUtils' => $booleanUtils,
             'Magento\Framework\ObjectManager\Config\Mapper\Dom' => $argumentMapper,
diff --git a/lib/internal/Magento/Framework/Interception/Config/Config.php b/lib/internal/Magento/Framework/Interception/Config/Config.php
index 1bf2800ad36a0..935b60e67a66b 100644
--- a/lib/internal/Magento/Framework/Interception/Config/Config.php
+++ b/lib/internal/Magento/Framework/Interception/Config/Config.php
@@ -14,7 +14,7 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
     /**
      * Type configuration
      *
-     * @var \Magento\Framework\ObjectManager\ConfigInterface
+     * @var \Magento\Framework\Interception\ObjectManager\ConfigInterface
      */
     protected $_omConfig;
 
@@ -77,7 +77,7 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
      * @param \Magento\Framework\Config\ScopeListInterface $scopeList
      * @param \Magento\Framework\Cache\FrontendInterface $cache
      * @param \Magento\Framework\ObjectManager\RelationsInterface $relations
-     * @param \Magento\Framework\Interception\ObjectManager\Config $omConfig
+     * @param \Magento\Framework\Interception\ObjectManager\ConfigInterface $omConfig
      * @param \Magento\Framework\ObjectManager\DefinitionInterface $classDefinitions
      * @param string $cacheId
      */
@@ -86,7 +86,7 @@ public function __construct(
         \Magento\Framework\Config\ScopeListInterface $scopeList,
         \Magento\Framework\Cache\FrontendInterface $cache,
         \Magento\Framework\ObjectManager\RelationsInterface $relations,
-        \Magento\Framework\Interception\ObjectManager\Config $omConfig,
+        \Magento\Framework\Interception\ObjectManager\ConfigInterface $omConfig,
         \Magento\Framework\ObjectManager\DefinitionInterface $classDefinitions,
         $cacheId = 'interception'
     ) {
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Config.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
similarity index 85%
rename from lib/internal/Magento/Framework/Interception/ObjectManager/Config.php
rename to lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
index fafc88f27d485..dc3c9d68a3a5a 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/Config.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
@@ -7,9 +7,11 @@
  * @copyright   {copyright}
  * @license     {license_link}
  */
-namespace Magento\Framework\Interception\ObjectManager;
+namespace Magento\Framework\Interception\ObjectManager\Config;
 
-class Config extends \Magento\Framework\ObjectManager\Config\Config
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
+
+class Compiled extends \Magento\Framework\ObjectManager\Config\Compiled implements ConfigInterface
 {
     /**
      * @var \Magento\Framework\Interception\ConfigInterface
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Compiled/Config.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
similarity index 85%
rename from lib/internal/Magento/Framework/Interception/ObjectManager/Compiled/Config.php
rename to lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
index d8bda0213b7c8..0b6cec7bc5535 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/Compiled/Config.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
@@ -7,9 +7,11 @@
  * @copyright   {copyright}
  * @license     {license_link}
  */
-namespace Magento\Framework\Interception\ObjectManager\Compiled;
+namespace Magento\Framework\Interception\ObjectManager\Config;
 
-class Config extends \Magento\Framework\ObjectManager\Config\Compiled
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
+
+class Developer extends \Magento\Framework\ObjectManager\Config\Config implements ConfigInterface
 {
     /**
      * @var \Magento\Framework\Interception\ConfigInterface
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php b/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
new file mode 100644
index 0000000000000..99a73f812b8d2
--- /dev/null
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ *
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Framework\Interception\ObjectManager;
+
+interface ConfigInterface extends \Magento\Framework\ObjectManager\ConfigInterface
+{
+    /**
+     * Set Interception config
+     *
+     * @param \Magento\Framework\Interception\ConfigInterface $interceptionConfig
+     * @return void
+     */
+    public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInterface $interceptionConfig);
+
+    /**
+     * Retrieve instance type without interception processing
+     *
+     * @param string $instanceName
+     * @return string
+     */
+    public function getOriginalInstanceType($instanceName);
+}
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index c9b501877e56a..9612373a3e660 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -15,7 +15,7 @@
 use Magento\Framework\Config\Data\Scoped;
 use Magento\Framework\Interception\DefinitionInterface;
 use Magento\Framework\Interception\PluginListInterface as InterceptionPluginList;
-use Magento\Framework\Interception\ObjectManager\Config;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\RelationsInterface;
 use Magento\Framework\ObjectManager\DefinitionInterface as ClassDefinitions;
 use Magento\Framework\ObjectManagerInterface;
@@ -40,7 +40,7 @@ class PluginList extends Scoped implements InterceptionPluginList
     /**
      * Type config
      *
-     * @var Config
+     * @var ConfigInterface
      */
     protected $_omConfig;
 
@@ -80,7 +80,7 @@ class PluginList extends Scoped implements InterceptionPluginList
      * @param ScopeInterface $configScope
      * @param CacheInterface $cache
      * @param RelationsInterface $relations
-     * @param Config $omConfig
+     * @param ConfigInterface $omConfig
      * @param DefinitionInterface $definitions
      * @param ObjectManagerInterface $objectManager
      * @param ClassDefinitions $classDefinitions
@@ -92,7 +92,7 @@ public function __construct(
         ScopeInterface $configScope,
         CacheInterface $cache,
         RelationsInterface $relations,
-        Config $omConfig,
+        ConfigInterface $omConfig,
         DefinitionInterface $definitions,
         ObjectManagerInterface $objectManager,
         ClassDefinitions $classDefinitions,
diff --git a/lib/internal/Magento/Framework/ObjectManager/Environment/AbstractEnvironment.php b/lib/internal/Magento/Framework/ObjectManager/Environment/AbstractEnvironment.php
index 09421bf5f1304..930faf44fb9e9 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Environment/AbstractEnvironment.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Environment/AbstractEnvironment.php
@@ -16,7 +16,7 @@
 abstract class AbstractEnvironment implements EnvironmentInterface
 {
     /**
-     * @var \Magento\Framework\Interception\ObjectManager\Config
+     * @var \Magento\Framework\Interception\ObjectManager\ConfigInterface
      */
     protected $config;
 
diff --git a/lib/internal/Magento/Framework/ObjectManager/Environment/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Environment/Compiled.php
index fbefb921be8a9..2321de8aaf7d5 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Environment/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Environment/Compiled.php
@@ -44,12 +44,12 @@ class Compiled extends AbstractEnvironment implements EnvironmentInterface
     /**
      * Returns initialized compiled config
      *
-     * @return \Magento\Framework\Interception\ObjectManager\Config
+     * @return \Magento\Framework\Interception\ObjectManager\ConfigInterface
      */
     public function getDiConfig()
     {
         if (!$this->config) {
-            $this->config = new \Magento\Framework\Interception\ObjectManager\Compiled\Config(
+            $this->config = new \Magento\Framework\Interception\ObjectManager\Config\Compiled(
                 $this->getConfigData()
             );
         }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Environment/Developer.php b/lib/internal/Magento/Framework/ObjectManager/Environment/Developer.php
index d195931351c9a..7f3d4b4be8ce4 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Environment/Developer.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Environment/Developer.php
@@ -20,7 +20,7 @@ class Developer extends AbstractEnvironment implements EnvironmentInterface
     /**#@- */
 
     /**
-     * @var \Magento\Framework\Interception\ObjectManager\Config
+     * @var \Magento\Framework\Interception\ObjectManager\ConfigInterface
      */
     protected $config;
 
@@ -32,12 +32,12 @@ class Developer extends AbstractEnvironment implements EnvironmentInterface
     /**
      * Returns initialized di config entity
      *
-     * @return \Magento\Framework\Interception\ObjectManager\Config
+     * @return \Magento\Framework\Interception\ObjectManager\ConfigInterface
      */
     public function getDiConfig()
     {
         if (!$this->config) {
-            $this->config = new \Magento\Framework\Interception\ObjectManager\Config(
+            $this->config = new \Magento\Framework\Interception\ObjectManager\Config\Developer(
                 $this->envFactory->getRelations(),
                 $this->envFactory->getDefinitions()
             );
diff --git a/lib/internal/Magento/Framework/ObjectManager/EnvironmentInterface.php b/lib/internal/Magento/Framework/ObjectManager/EnvironmentInterface.php
index 88029058191f5..0fdf5573f4b2b 100644
--- a/lib/internal/Magento/Framework/ObjectManager/EnvironmentInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/EnvironmentInterface.php
@@ -23,7 +23,7 @@ public function getMode();
     /**
      * Return config object
      *
-     * @return \Magento\Framework\Interception\ObjectManager\Config
+     * @return \Magento\Framework\Interception\ObjectManager\ConfigInterface
      */
     public function getDiConfig();
 
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index aaab742c0e2b8..c661d433e981d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -172,11 +172,12 @@ protected function resolveArgument(&$argument, $paramType, $paramDefault, $param
                     'Invalid parameter configuration provided for $' . $paramName . ' argument of ' . $requestedType
                 );
             }
-            $argumentType = $argument['instance'];
-            $isShared = (isset($argument['shared']) ? $argument['shared'] : $this->config->isShared($argumentType));
+            $isShared = (isset($argument['shared'])
+                ? $argument['shared']
+                : $this->config->isShared($argument['instance']));
             $argument = $isShared
-                ? $this->objectManager->get($argumentType)
-                : $this->objectManager->create($argumentType);
+                ? $this->objectManager->get($argument['instance'])
+                : $this->objectManager->create($argument['instance']);
         } else if (is_array($argument)) {
             if (isset($argument['argument'])) {
                 $argument = isset($this->globalArguments[$argument['argument']])
@@ -200,11 +201,12 @@ protected function parseArray(&$array)
         foreach ($array as $key => $item) {
             if (is_array($item)) {
                 if (isset($item['instance'])) {
-                    $itemType = $item['instance'];
-                    $isShared = (isset($item['shared'])) ? $item['shared'] : $this->config->isShared($itemType);
+                    $isShared = (isset($item['shared']))
+                        ? $item['shared']
+                        : $this->config->isShared($item['instance']);
                     $array[$key] = $isShared
-                        ? $this->objectManager->get($itemType)
-                        : $this->objectManager->create($itemType);
+                        ? $this->objectManager->get($item['instance'])
+                        : $this->objectManager->create($item['instance']);
                 } elseif (isset($item['argument'])) {
                     $array[$key] = isset($this->globalArguments[$item['argument']])
                         ? $this->globalArguments[$item['argument']]

From 698c4dc2d155b93eb1c3aef5a3cb4b1072827ea8 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Thu, 11 Dec 2014 15:57:22 +0200
Subject: [PATCH 257/474] MAGETWO-30419: [GITHUB] CMS Router not routing
 correctly #683

---
 .../integration/testsuite/Magento/Cms/Controller/PageTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
index e76e888a82b98..4a165e42ae723 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
@@ -33,7 +33,7 @@ public function testAddBreadcrumbs()
     }
 
     /**
-     * @magentoDataFixture cmsPageWIthSystemRouteFixture
+     * @magentoDataFixture cmsPageWithSystemRouteFixture
      */
     public function testCreatePageWithSameModuleName()
     {
@@ -42,7 +42,7 @@ public function testCreatePageWithSameModuleName()
         $this->assertContains('Shipping Test Page', $content);
     }
 
-    public static function cmsPageWIthSystemRouteFixture()
+    public static function cmsPageWithSystemRouteFixture()
     {
         /** @var $page \Magento\Cms\Model\Page */
         $page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Cms\Model\Page');

From 5397feb46e8eacf9b7a43226f08e047e6f573249 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Thu, 11 Dec 2014 16:16:10 +0200
Subject: [PATCH 258/474] MAGETWO-31574: Exception on Manage Shopping Cart from
 Customer page in backend

---
 .../Controller/Adminhtml/Index.php            |   2 +-
 .../Controller/Adminhtml/IndexTest.php        | 138 ++++++++++++++++++
 .../Controller/Adminhtml/Stub/Child.php       |  13 ++
 3 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/Stub/Child.php

diff --git a/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index.php b/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index.php
index bf94d04cacdc1..e4c41dc327c33 100644
--- a/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/AdvancedCheckout/Controller/Adminhtml/Index.php
@@ -93,7 +93,7 @@ protected function _initData($useRedirects = true)
         ) {
             if ($useRedirects) {
                 $this->messageManager->addError(__('Shopping cart management disabled for this customer.'));
-                $this->_redirect('customer/index/edit', ['id' => $customer->getId()]);
+                $this->_redirect('customer/index/edit', ['id' => $customerId]);
                 $this->_redirectFlag = true;
                 return $this;
             } else {
diff --git a/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php b/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php
new file mode 100644
index 0000000000000..8cce627966021
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\AdvancedCheckout\Controller\Adminhtml;
+
+class IndexTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\AdvancedCheckout\Controller\Adminhtml\Stub\Child
+     */
+    protected $controller;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManager;
+
+    /**
+     * @var \Magento\Framework\App\Request\Http | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $request;
+
+    /**
+     * @var \Magento\Customer\Api\Data\CustomerDataBuilder | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerBuilder;
+
+    public function setUp()
+    {
+        $this->objectManager = $this->getMock('Magento\Framework\ObjectManager\ObjectManager', [], [], '', false);
+        $this->customerBuilder = $this->getMock('Magento\Customer\Api\Data\CustomerDataBuilder', [], [], '', false);
+
+        $this->request = $this->getMock('Magento\Framework\App\Request\Http', ['getPost', 'getParam'], [], '', false);
+        $response = $this->getMock('Magento\Framework\App\ResponseInterface');
+
+        $context = $this->getMock('Magento\Backend\App\Action\Context', [], [], '', false);
+        $context->expects($this->once())
+            ->method('getRequest')
+            ->willReturn($this->request);
+        $context->expects($this->once())
+            ->method('getResponse')
+            ->willReturn($response);
+        $context->expects($this->once())
+            ->method('getObjectManager')
+            ->willReturn($this->objectManager);
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->controller = $objectManager->getObject(
+            'Magento\AdvancedCheckout\Controller\Adminhtml\Stub\Child',
+            ['context' => $context, 'customerBuilder' => $this->customerBuilder]
+        );
+    }
+
+    public function testInitData()
+    {
+        $this->request->expects($this->any())
+            ->method('getParam')
+            ->willReturn(true);
+
+        $customerModel = $this->getMock('Magento\Customer\Model\Customer', ['getWebsiteId', 'load', 'getId'], [], '', false);
+        $customerModel->expects($this->once())
+            ->method('load')
+            ->willReturnSelf();
+        $customerModel->expects($this->once())
+            ->method('getId')
+            ->willReturn(true);
+        $customerModel->expects($this->once())
+            ->method('getWebsiteId')
+            ->willReturn(true);
+
+        $store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
+
+        $storeManager = $this->getMock('Magento\Store\Model\StoreManager', ['getWebsiteId', 'getStore'], [], '', false);
+        $storeManager->expects($this->any())
+            ->method('getStore')
+            ->willReturn($store);
+
+        $quote = $this->getMock('Magento\Sales\Model\Quote', [], [], '', false);
+        $quote->expects($this->once())
+            ->method('getId')
+            ->willReturn(false);
+
+        $cart = $this->getMock('Magento\AdvancedCheckout\Model\Cart', [], [], '', false);
+        $cart->expects($this->once())
+            ->method('setSession')
+            ->willReturnSelf();
+        $cart->expects($this->once())
+            ->method('setContext')
+            ->willReturnSelf();
+        $cart->expects($this->once())
+            ->method('setCurrentStore')
+            ->willReturnSelf();
+        $cart->expects($this->once())
+            ->method('getQuote')
+            ->willReturn($quote);
+
+        $session = $this->getMock('Magento\Backend\Model\Session', [], [], '', false);
+        $quoteRepository = $this->getMock('Magento\Sales\Model\QuoteRepository', [], [], '', false);
+
+        $this->objectManager->expects($this->at(0))
+            ->method('create')
+            ->with('Magento\Customer\Model\Customer')
+            ->willReturn($customerModel);
+        $this->objectManager->expects($this->at(1))
+            ->method('get')
+            ->with('Magento\Store\Model\StoreManager')
+            ->willReturn($storeManager);
+        $this->objectManager->expects($this->at(2))
+            ->method('get')
+            ->with('Magento\AdvancedCheckout\Model\Cart')
+            ->willReturn($cart);
+        $this->objectManager->expects($this->at(3))
+            ->method('get')
+            ->with('Magento\Backend\Model\Session')
+            ->willReturn($session);
+        $this->objectManager->expects($this->at(4))
+            ->method('get')
+            ->with('Magento\Sales\Model\QuoteRepository')
+            ->willReturn($quoteRepository);
+
+        $customerData = $this->getMock('Magento\Customer\Api\Data\CustomerInterface');
+
+        $this->customerBuilder->expects($this->once())
+            ->method('populateWithArray')
+            ->willReturnSelf();
+        $this->customerBuilder->expects($this->once())
+            ->method('create')
+            ->willReturn($customerData);
+        $quote->expects($this->once())
+            ->method('setStore')
+            ->willReturnSelf();
+        $quote->expects($this->once())
+            ->method('setCustomer')
+            ->with($customerData);
+
+        $this->controller->execute();
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/Stub/Child.php b/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/Stub/Child.php
new file mode 100644
index 0000000000000..ec14302ba08e2
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/Stub/Child.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\AdvancedCheckout\Controller\Adminhtml\Stub;
+
+class Child extends \Magento\AdvancedCheckout\Controller\Adminhtml\Index
+{
+    public function execute()
+    {
+        $this->_initData();
+    }
+}

From 3f24fc33b20ab624938cfd6ff7b9398d010339ce Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 11 Dec 2014 16:25:29 +0200
Subject: [PATCH 259/474] MAGETWO-31337: Incorrect work of PayPal conflict
 resolution in backend

- fix sanity check
---
 .../Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
index 5082d3ac04bc3..96400b8a6afbc 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Paypal\Block\Adminhtml\System\Config\Fieldset;
 

From a6a66a28cb6461e2c310bec81acc2123cb46d791 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@ebay.com>
Date: Thu, 11 Dec 2014 16:31:35 +0200
Subject: [PATCH 260/474] MAGETWO-31672: It's impossible to save Bundle Product
 with re-created bundle option

---
 .../product/edit/bundle/option.phtml          | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
index 9400bd038a580..736d5d5131351 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
@@ -186,18 +186,23 @@ Bundle.Option.prototype = {
 
     remove : function(event){
         var element = Event.findElement(event, 'div').up('.option-box');
+        if (element) {
+            var idInput = Element.select(element, '[name$="[option_id]"]')[0];
+            if (idInput.value == '') {
+                element.remove();
+            } else {
+                Element.select(element, '[data-state="deleted"]').each(function (elem) {
+                    elem.value = '1';
+                });
 
-        if(element){
-            Element.select(element, '[data-state="deleted"]').each(function(elem) {
-                elem.value = '1';
-            });
-
-            Element.select(element, ['input', 'select']).each(function(elem) {
-                elem.hide();
-                elem.className = '';
-            });
+                Element.select(element, ['input', 'select']).each(function (elem) {
+                    elem.hide();
+                    elem.disable();
+                    elem.className = '';
+                });
 
-            Element.hide(element);
+                Element.hide(element);
+            }
         }
     },
 

From 02719ce80ad5ee6a2aeef7344f3cc499d7d07a10 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@ebay.com>
Date: Thu, 11 Dec 2014 16:36:33 +0200
Subject: [PATCH 261/474] MAGETWO-31440: Zend_Date_Exception and
 Zend_Locale_Exception after placing order - integration test added.

---
 .../Sales/Model/Resource/OrderTest.php        | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
new file mode 100644
index 0000000000000..477791d778b6d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ *
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+namespace Magento\Sales\Model\Resource;
+
+class OrderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Sales\Model\Resource\Order
+     */
+    protected $resourceModel;
+
+    /**
+     * @var int
+     */
+    protected $orderIncrementId;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->resourceModel = $this->objectManager->create('\Magento\Sales\Model\Resource\Order');
+        $this->orderIncrementId = '100000001';
+    }
+
+    protected function tearDown()
+    {
+        $registry = $this->objectManager->get('Magento\Framework\Registry');
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->objectManager->create('Magento\Sales\Model\Order');
+        $order->loadByIncrementId($this->orderIncrementId);
+        $order->delete();
+
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+
+        parent::tearDown();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testSaveOrder()
+    {
+        $addressData = array(
+            'region' => 'CA',
+            'postcode' => '11111',
+            'lastname' => 'lastname',
+            'firstname' => 'firstname',
+            'street' => 'street',
+            'city' => 'Los Angeles',
+            'email' => 'admin@example.com',
+            'telephone' => '11111111',
+            'country_id' => 'US'
+        );
+
+        $billingAddress = $this->objectManager->create('Magento\Sales\Model\Order\Address', array('data' => $addressData));
+        $billingAddress->setAddressType('billing');
+
+        $shippingAddress = clone $billingAddress;
+        $shippingAddress->setId(null)->setAddressType('shipping');
+
+        $payment = $this->objectManager->create('Magento\Sales\Model\Order\Payment');
+        $payment->setMethod('checkmo');
+
+        /** @var \Magento\Sales\Model\Order\Item $orderItem */
+        $orderItem = $this->objectManager->create('Magento\Sales\Model\Order\Item');
+        $orderItem->setProductId(1)
+            ->setQtyOrdered(2)
+            ->setBasePrice(10)
+            ->setPrice(10)
+            ->setRowTotal(10);
+
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->objectManager->create('Magento\Sales\Model\Order');
+        $order->setIncrementId($this->orderIncrementId)
+            ->setState(\Magento\Sales\Model\Order::STATE_PROCESSING, true)
+            ->setSubtotal(100)
+            ->setBaseSubtotal(100)
+            ->setBaseGrandTotal(100)
+            ->setCustomerIsGuest(true)
+            ->setCustomerEmail('customer@null.com')
+            ->setBillingAddress($billingAddress)
+            ->setShippingAddress($shippingAddress)
+            ->setStoreId($this->objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId())
+            ->addItem($orderItem)
+            ->setPayment($payment);
+
+        $this->resourceModel->save($order);
+        $this->assertNotNull($order->getCreatedAt());
+        $this->assertNotNull($order->getUpdatedAt());
+    }
+}

From 55d56055398b84d0080dce585ad732dedc8d6361 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@ebay.com>
Date: Thu, 11 Dec 2014 16:41:12 +0200
Subject: [PATCH 262/474] MAGETWO-31672: It's impossible to save Bundle Product
 with re-created bundle option

---
 .../view/adminhtml/templates/product/edit/bundle/option.phtml    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
index 736d5d5131351..766cfdb8d4af9 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
@@ -197,7 +197,6 @@ Bundle.Option.prototype = {
 
                 Element.select(element, ['input', 'select']).each(function (elem) {
                     elem.hide();
-                    elem.disable();
                     elem.className = '';
                 });
 

From 06357acae63049ceb5d66efba30fc941811ced97 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 11 Dec 2014 16:42:58 +0200
Subject: [PATCH 263/474] MAGETWO-31337: Incorrect work of PayPal conflict
 resolution in backend

- rm extra comment
---
 .../templates/system/config/fieldset/location.phtml          | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
index 04a317fe36c12..504b225253b0c 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/location.phtml
@@ -3,11 +3,6 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 ?>
-<?php
-/**
- * @see \Magento\Paypal\Block\System\Config\Fieldset\Location
- */
-?>
 <script type="text/javascript">
 require([
     "jquery",

From 6babf2e31f65666e03cd2f5e84ab4289d2dfa969 Mon Sep 17 00:00:00 2001
From: Richard Bates <rbates@x.com>
Date: Thu, 11 Dec 2014 08:57:09 -0600
Subject: [PATCH 264/474] MAGETWO-3315: Functions _camelize and _underscore
 work incorrect with keys that have digits between '_' symbol  - Fixed more
 problems with cc_last_4

---
 app/code/Magento/Pbridge/Helper/Data.php                  | 2 +-
 app/code/Magento/Pbridge/Model/Payment/Method/Pbridge.php | 4 ++--
 app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php | 4 ++--
 app/code/Magento/Sales/Model/AdminOrder/Create.php        | 2 +-
 app/code/Magento/Sales/Model/Order/Payment.php            | 4 ++--
 app/code/Magento/Sales/etc/fieldset.xml                   | 4 ++--
 app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php  | 8 ++++----
 .../Magento/Core/Model/Fieldset/_files/fieldset.xml       | 4 ++--
 .../Core/Model/Fieldset/_files/invalid_fieldset.xml       | 8 ++++----
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Pbridge/Helper/Data.php b/app/code/Magento/Pbridge/Helper/Data.php
index 20fec0dfe1e9b..a7d906d3d9b54 100644
--- a/app/code/Magento/Pbridge/Helper/Data.php
+++ b/app/code/Magento/Pbridge/Helper/Data.php
@@ -434,7 +434,7 @@ public function getPbridgeParams()
                     ? $data['original_payment_method']
                     : null,
             'token' => isset($data['token']) ? $data['token'] : null,
-            'cc_last4' => isset($data['cc_last4']) ? $data['cc_last4'] : null,
+            'cc_last_4' => isset($data['cc_last_4']) ? $data['cc_last_4'] : null,
             'cc_type' => isset($data['cc_type']) ? $data['cc_type'] : null,
             'x_params' => isset($data['x_params']) ? serialize($data['x_params']) : null
         );
diff --git a/app/code/Magento/Pbridge/Model/Payment/Method/Pbridge.php b/app/code/Magento/Pbridge/Model/Payment/Method/Pbridge.php
index 1380218e7fd72..fd83c36e6dae7 100644
--- a/app/code/Magento/Pbridge/Model/Payment/Method/Pbridge.php
+++ b/app/code/Magento/Pbridge/Model/Payment/Method/Pbridge.php
@@ -218,13 +218,13 @@ public function assignData($data)
         if (is_array($data)) {
             if (isset($data['pbridge_data'])) {
                 $pbridgeData = $data['pbridge_data'];
-                $data['cc_last4'] = $pbridgeData['cc_last4'];
+                $data['cc_last_4'] = $pbridgeData['cc_last_4'];
                 $data['cc_type'] = $pbridgeData['cc_type'];
                 unset($data['pbridge_data']);
             }
         } else {
             $pbridgeData = $data->getData('pbridge_data');
-            $data->setData('cc_last4', $pbridgeData['cc_last4']);
+            $data->setData('cc_last_4', $pbridgeData['cc_last_4']);
             $data->setData('cc_type', $pbridgeData['cc_type']);
             $data->unsetData('pbridge_data');
         }
diff --git a/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php b/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
index 59a51a77e1d19..f542225625141 100644
--- a/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
@@ -45,7 +45,7 @@ interface OrderPaymentInterface extends \Magento\Framework\Api\ExtensibleDataInt
     const CC_SECURE_VERIFY = 'cc_secure_verify';
     const PROTECTION_ELIGIBILITY = 'protection_eligibility';
     const CC_APPROVAL = 'cc_approval';
-    const CC_LAST4 = 'cc_last_4';
+    const CC_LAST_4 = 'cc_last_4';
     const CC_STATUS_DESCRIPTION = 'cc_status_description';
     const ECHECK_TYPE = 'echeck_type';
     const CC_DEBUG_RESPONSE_SERIALIZED = 'cc_debug_response_serialized';
@@ -267,7 +267,7 @@ public function getCcExpMonth();
     public function getCcExpYear();
 
     /**
-     * Returns cc_last4
+     * Returns cc_last_4
      *
      * @return string
      */
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index ef5b8155285d0..85c2dac7e932c 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -475,7 +475,7 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
         $quote->getShippingAddress()->setShippingDescription($order->getShippingDescription());
 
         $paymentData = $order->getPayment()->getData();
-        unset($paymentData['cc_type'], $paymentData['cc_last4']);
+        unset($paymentData['cc_type'], $paymentData['cc_last_4']);
         unset($paymentData['cc_exp_month'], $paymentData['cc_exp_year']);
         $quote->getPayment()->addData($paymentData);
 
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index b62f1816517bd..e8f85a12c9141 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -1960,13 +1960,13 @@ public function getCcExpYear()
     }
 
     /**
-     * Returns cc_last4
+     * Returns cc_last_4
      *
      * @return string
      */
     public function getCcLast4()
     {
-        return $this->getData(OrderPaymentInterface::CC_LAST4);
+        return $this->getData(OrderPaymentInterface::CC_LAST_4);
     }
 
     /**
diff --git a/app/code/Magento/Sales/etc/fieldset.xml b/app/code/Magento/Sales/etc/fieldset.xml
index 17cc35db5adcb..4fab7e60a428f 100644
--- a/app/code/Magento/Sales/etc/fieldset.xml
+++ b/app/code/Magento/Sales/etc/fieldset.xml
@@ -365,7 +365,7 @@
             <field name="cc_number_enc">
                 <aspect name="to_order_payment" />
             </field>
-            <field name="cc_last4">
+            <field name="cc_last_4">
                 <aspect name="to_order_payment" />
             </field>
             <field name="cc_owner">
@@ -693,7 +693,7 @@
             <field name="cc_number_enc">
                 <aspect name="to_quote_payment" />
             </field>
-            <field name="cc_last4">
+            <field name="cc_last_4">
                 <aspect name="to_quote_payment" />
             </field>
             <field name="cc_owner">
diff --git a/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php b/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php
index 562afdde91ac7..d5e04c61e08ce 100644
--- a/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php
+++ b/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php
@@ -1893,11 +1893,11 @@
     array(),
     'Cc Approval'
 )->addColumn(
-    'cc_last4',
+    'cc_last_4',
     \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
     255,
     array(),
-    'Cc Last4'
+    'Cc Last 4'
 )->addColumn(
     'cc_status_description',
     \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
@@ -5334,11 +5334,11 @@
     array(),
     'Cc Number Enc'
 )->addColumn(
-    'cc_last4',
+    'cc_last_4',
     \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
     255,
     array(),
-    'Cc Last4'
+    'Cc Last 4'
 )->addColumn(
     'cc_cid_enc',
     \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/Fieldset/_files/fieldset.xml b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/Fieldset/_files/fieldset.xml
index 5025e70e8bc6d..b9da4647e70df 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/Fieldset/_files/fieldset.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/Fieldset/_files/fieldset.xml
@@ -365,7 +365,7 @@
             <field name="cc_number_enc">
                 <aspect name="to_order_payment" />
             </field>
-            <field name="cc_last4">
+            <field name="cc_last_4">
                 <aspect name="to_order_payment" />
             </field>
             <field name="cc_owner">
@@ -696,7 +696,7 @@
             <field name="cc_number_enc">
                 <aspect name="to_quote_payment" />
             </field>
-            <field name="cc_last4">
+            <field name="cc_last_4">
                 <aspect name="to_quote_payment" />
             </field>
             <field name="cc_owner">
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/Fieldset/_files/invalid_fieldset.xml b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/Fieldset/_files/invalid_fieldset.xml
index e47bb4a0f560e..231443f9b1a0c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/Fieldset/_files/invalid_fieldset.xml
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Core/Model/Fieldset/_files/invalid_fieldset.xml
@@ -365,9 +365,9 @@
                 <cc_number_enc>
                     <to_order_payment>*</to_order_payment>
                 </cc_number_enc>
-                <cc_last4>
+                <cc_last_4>
                     <to_order_payment>*</to_order_payment>
-                </cc_last4>
+                </cc_last_4>
                 <cc_owner>
                     <to_order_payment>*</to_order_payment>
                 </cc_owner>
@@ -696,9 +696,9 @@
                 <cc_number_enc>
                     <to_quote_payment>*</to_quote_payment>
                 </cc_number_enc>
-                <cc_last4>
+                <cc_last_4>
                     <to_quote_payment>*</to_quote_payment>
-                </cc_last4>
+                </cc_last_4>
                 <cc_owner>
                     <to_quote_payment>*</to_quote_payment>
                 </cc_owner>

From ea39ca92a2b34c13b34a129df94019610c027d7b Mon Sep 17 00:00:00 2001
From: Oleg Zinoviev <ozinoviev@ebay.com>
Date: Thu, 11 Dec 2014 17:05:15 +0200
Subject: [PATCH 265/474] MAGETWO-24703: Backend UI issues: improvements

- customer form ie9 (margin collapsing)
---
 .../backend/Magento_Ui/web/css/source/formelements.less      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/formelements.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/formelements.less
index 97ef170ba320c..ffd7979f5d926 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/formelements.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/formelements.less
@@ -132,7 +132,12 @@
        font-weight: 500;
        box-sizing: border-box;
        max-width: 380px;
+        .no-flexbox.no-flexboxlegacy & {
+            display: inline-block;
+            width: 100%;
+        }
     }
+
 }
 
 .form__field {

From ec02a1ea9ed91bfd0b3d9e0435f71b4bbd9c1fd8 Mon Sep 17 00:00:00 2001
From: Alexander Paliarush <apaliarush@ebay.com>
Date: Thu, 11 Dec 2014 17:09:43 +0200
Subject: [PATCH 266/474] MAGETWO-12806: Prevent Sending Emails in Integration
 Tests

---
 .../Mail/Template/TransportBuilderMock.php           | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php b/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php
index 2d91bf268269f..6289b4cfeb888 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php
@@ -24,7 +24,7 @@ protected function reset()
     }
 
     /**
-     * Returns message object with prepared data
+     * Return message object with prepared data
      *
      * @return \Magento\Framework\Mail\Message|null
      */
@@ -32,4 +32,14 @@ public function getSentMessage()
     {
         return $this->_sentMessage;
     }
+
+    /**
+     * Return transport mock.
+     *
+     * @return \Magento\TestFramework\Mail\TransportInterfaceMock
+     */
+    public function getTransport()
+    {
+        return new \Magento\TestFramework\Mail\TransportInterfaceMock();
+    }
 }

From f10913184035b810877b83c00831961e1a97ad94 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com>
Date: Thu, 11 Dec 2014 17:13:04 +0200
Subject: [PATCH 267/474] MAGETWO-31696: Can't save config at "Admin" section

---
 lib/web/mage/validation.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 80404eef56f0a..bb95f1cc81ab5 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -706,6 +706,7 @@
                         range = classes[ii];
                         m = classNameRange.exec(range);
                         if (m) {
+                            m[2] = m[2] || null;
                             result = result && $.mage.isBetween(numValue, m[1], m[2]);
                             break;
                         }

From 1108d0dd21074d3ae537b3ca77a68678b9a10691 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Thu, 11 Dec 2014 17:39:47 +0200
Subject: [PATCH 268/474] MAGETWO-31668: It's impossible to move Product from
 found Wishlist to Shopping Cart

---
 .../Controller/Search/Addtocart.php           |  11 +-
 .../Controller/Search/AddtocartTest.php       | 729 ++++++++++++++++++
 .../Controller/Search/ViewTest.php            |  12 +-
 3 files changed, 746 insertions(+), 6 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/AddtocartTest.php

diff --git a/app/code/Magento/MultipleWishlist/Controller/Search/Addtocart.php b/app/code/Magento/MultipleWishlist/Controller/Search/Addtocart.php
index 57f402373ac0d..e309368763a30 100644
--- a/app/code/Magento/MultipleWishlist/Controller/Search/Addtocart.php
+++ b/app/code/Magento/MultipleWishlist/Controller/Search/Addtocart.php
@@ -76,16 +76,16 @@ public function execute()
 
         /** @var \Magento\Checkout\Model\Cart $cart  */
         $cart = $this->_checkoutCart;
-        $qtys = $this->getRequest()->getParam('qty');
-        $selected = $this->getRequest()->getParam('selected');
+        $qtys = (array)$this->getRequest()->getParam('qty');
+        $selected = (array)$this->getRequest()->getParam('selected');
         foreach ($qtys as $itemId => $qty) {
             if ($qty && isset($selected[$itemId])) {
+                /** @var \Magento\Wishlist\Model\Item $item*/
+                $item = $this->_itemFactory->create();
                 try {
-                    /** @var \Magento\Wishlist\Model\Item $item*/
-                    $item = $this->_itemFactory->create();
                     $item->loadWithOptions($itemId);
                     $item->unsProduct();
-                    $qty = $this->qtyProcessor->process($qty);
+                    $qty = $this->quantityProcessor->process($qty);
                     if ($qty) {
                         $item->setQty($qty);
                     }
@@ -107,6 +107,7 @@ public function execute()
             }
         }
 
+        $redirectUrl = '';
         if ($this->_objectManager->get('Magento\Checkout\Helper\Cart')->getShouldRedirectToCart()) {
             $redirectUrl = $this->_objectManager->get('Magento\Checkout\Helper\Cart')->getCartUrl();
         } elseif ($this->_redirect->getRefererUrl()) {
diff --git a/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/AddtocartTest.php b/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/AddtocartTest.php
new file mode 100644
index 0000000000000..fb47b0d3f1f70
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/AddtocartTest.php
@@ -0,0 +1,729 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\MultipleWishlist\Controller\Search;
+
+class AddtocartTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Addtocart
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $contextMock;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $requestMock;
+
+    /**
+     * @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $viewMock;
+
+    /**
+     * @var \Magento\Framework\App\Response\RedirectInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $redirectMock;
+
+    /**
+     * @var \Magento\Wishlist\Model\Wishlist|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $wishlistMock;
+
+    /**
+     * @var \Magento\Wishlist\Model\WishlistFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $wishlistFactorytMock;
+
+    /**
+     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $registryMock;
+
+    /**
+     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $customerSessionMock;
+
+    /**
+     * @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $layoutMock;
+
+    /**
+     * @var \Magento\Framework\View\Element\BlockInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $blockMock;
+
+    /**
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $moduleManagerMock;
+
+    /**
+     * @var \Magento\Wishlist\Model\LocaleQuantityProcessor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $quantityProcessorMock;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManagerMock;
+
+    /**
+     * @var \Magento\Checkout\Model\Cart|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $checkoutCartMock;
+
+    /**
+     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $responseMock;
+
+    /**
+     * @var \Magento\Wishlist\Model\ItemFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $itemFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Message\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $messageManagerMock;
+
+    protected function setUp()
+    {
+        $this->wishlistMock = $this->getMockBuilder('Magento\Wishlist\Model\Wishlist')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->wishlistFactorytMock = $this->getMockBuilder('Magento\Wishlist\Model\WishlistFactory')
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->wishlistFactorytMock->expects($this->any())
+            ->method('create')
+            ->will($this->returnValue($this->wishlistMock));
+
+        $this->registryMock = $this->getMockBuilder('Magento\Framework\Registry')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->itemFactoryMock = $this->getMockBuilder('Magento\Wishlist\Model\ItemFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $searchFactoryMock = $this->getMockBuilder('Magento\MultipleWishlist\Model\SearchFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $strategyEmailFactoryMock = $this->getMockBuilder(
+            'Magento\MultipleWishlist\Model\Search\Strategy\EmailFactory'
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $strategyNameFactoryMock = $this->getMockBuilder(
+            'Magento\MultipleWishlist\Model\Search\Strategy\NameFactory'
+        )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $checkoutSessionMock = $this->getMockBuilder('Magento\Checkout\Model\Session')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->checkoutCartMock = $this->getMockBuilder('Magento\Checkout\Model\Cart')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerSessionMock = $this->getMockBuilder('Magento\Customer\Model\Session')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $localeResolverMock = $this->getMockBuilder('Magento\Framework\Locale\ResolverInterface')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->responseMock = $this->getMockBuilder('Magento\Framework\App\ResponseInterface')
+            ->disableOriginalConstructor()
+            ->setMethods(['setRedirect'])
+            ->getMockForAbstractClass();
+        $this->viewMock = $this->getMockBuilder('Magento\Framework\App\ViewInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->redirectMock = $this->getMockBuilder('Magento\Framework\App\Response\RedirectInterface')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->layoutMock = $this->getMockBuilder('Magento\Framework\View\Layout')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->blockMock = $this->getMockBuilder('Magento\Framework\View\Element\BlockInterface')
+            ->disableOriginalConstructor()
+            ->setMethods(['toHtml', 'setRefererUrl'])
+            ->getMockForAbstractClass();
+
+        $this->moduleManagerMock = $this->getMockBuilder('Magento\Framework\Module\Manager')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->quantityProcessorMock = $this->getMockBuilder('Magento\Wishlist\Model\LocaleQuantityProcessor')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManagerInterface')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->messageManagerMock = $this->getMockBuilder('Magento\Framework\Message\ManagerInterface')
+            ->disableOriginalConstructor()
+            ->setMethods(['addSuccess'])
+            ->getMockForAbstractClass();
+
+        $this->contextMock = $this->getMockBuilder('Magento\Framework\App\Action\Context')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->contextMock->expects($this->any())
+            ->method('getRequest')
+            ->will($this->returnValue($this->requestMock));
+        $this->contextMock->expects($this->any())
+            ->method('getResponse')
+            ->will($this->returnValue($this->responseMock));
+        $this->contextMock->expects($this->any())
+            ->method('getView')
+            ->will($this->returnValue($this->viewMock));
+        $this->contextMock->expects($this->any())
+            ->method('getRedirect')
+            ->will($this->returnValue($this->redirectMock));
+        $this->contextMock->expects($this->any())
+            ->method('getObjectManager')
+            ->will($this->returnValue($this->objectManagerMock));
+        $this->contextMock->expects($this->any())
+            ->method('getMessageManager')
+            ->will($this->returnValue($this->messageManagerMock));
+
+        $this->model = new Addtocart(
+            $this->contextMock,
+            $this->registryMock,
+            $this->itemFactoryMock,
+            $this->wishlistFactorytMock,
+            $searchFactoryMock,
+            $strategyEmailFactoryMock,
+            $strategyNameFactoryMock,
+            $checkoutSessionMock,
+            $this->checkoutCartMock,
+            $this->customerSessionMock,
+            $localeResolverMock,
+            $this->moduleManagerMock,
+            $this->quantityProcessorMock
+        );
+    }
+
+    public function testExecuteWithNoSelectedAndRedirectToCart()
+    {
+        $this->requestMock->expects($this->at(0))
+            ->method('getParam')
+            ->with('qty', null)
+            ->willReturn(false);
+        $this->requestMock->expects($this->at(1))
+            ->method('getParam')
+            ->with('selected', null)
+            ->willReturn(false);
+
+        $cartHelperMock = $this->getMockBuilder('Magento\Checkout\Helper\Cart')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cartHelperMock->expects($this->once())
+            ->method('getShouldRedirectToCart')
+            ->willReturn(true);
+        $cartHelperMock->expects($this->once())
+            ->method('getCartUrl')
+            ->willReturn('cart_url');
+
+        $this->objectManagerMock->expects($this->exactly(2))
+            ->method('get')
+            ->with('Magento\Checkout\Helper\Cart')
+            ->willReturn($cartHelperMock);
+
+        $salesQuoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $salesQuoteMock->expects($this->once())
+            ->method('collectTotals')
+            ->willReturnSelf();
+
+        $this->checkoutCartMock->expects($this->once())
+            ->method('save')
+            ->willReturnSelf();
+        $this->checkoutCartMock->expects($this->once())
+            ->method('getQuote')
+            ->willReturn($salesQuoteMock);
+
+        $this->responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->with('cart_url');
+
+        $this->model->execute();
+    }
+
+    public function testExecuteWithRedirectToReferer()
+    {
+        $this->requestMock->expects($this->at(0))
+            ->method('getParam')
+            ->with('qty', null)
+            ->willReturn([11 => 2]);
+        $this->requestMock->expects($this->at(1))
+            ->method('getParam')
+            ->with('selected', null)
+            ->willReturn([11 => 'on']);
+
+        $itemMock = $this->getMockBuilder('Magento\Wishlist\Model\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->itemFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($itemMock);
+        $itemMock->expects($this->once())
+            ->method('loadWithOptions')
+            ->with(11)
+            ->willReturnSelf();
+
+        $this->quantityProcessorMock->expects($this->once())
+            ->method('process')
+            ->with(2)
+            ->willReturn('2');
+
+        $itemMock->expects($this->once())
+            ->method('setQty')
+            ->with('2')
+            ->willReturnSelf();
+        $itemMock->expects($this->once())
+            ->method('addToCart')
+            ->with($this->checkoutCartMock, false)
+            ->willReturn(true);
+
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $itemMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($productMock);
+
+        $cartHelperMock = $this->getMockBuilder('Magento\Checkout\Helper\Cart')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('get')
+            ->with('Magento\Checkout\Helper\Cart')
+            ->willReturn($cartHelperMock);
+
+        $cartHelperMock->expects($this->once())
+            ->method('getShouldRedirectToCart')
+            ->willReturn(false);
+        $this->redirectMock->expects($this->exactly(2))
+            ->method('getRefererUrl')
+            ->willReturn('referer_url');
+
+        $productMock->expects($this->once())
+            ->method('getName')
+            ->willReturn('product_name');
+        $this->messageManagerMock->expects($this->once())
+            ->method('addSuccess')
+            ->with('1 product(s) have been added to shopping cart: "product_name".')
+            ->willReturnSelf();
+
+        $salesQuoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $salesQuoteMock->expects($this->once())
+            ->method('collectTotals')
+            ->willReturnSelf();
+
+        $this->checkoutCartMock->expects($this->once())
+            ->method('save')
+            ->willReturnSelf();
+        $this->checkoutCartMock->expects($this->once())
+            ->method('getQuote')
+            ->willReturn($salesQuoteMock);
+
+        $this->responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->with('referer_url');
+
+        $this->model->execute();
+    }
+
+    public function testExecuteWithNotSalableAndNoRedirect()
+    {
+        $this->requestMock->expects($this->at(0))
+            ->method('getParam')
+            ->with('qty', null)
+            ->willReturn([22 => 2]);
+        $this->requestMock->expects($this->at(1))
+            ->method('getParam')
+            ->with('selected', null)
+            ->willReturn([22 => 'on']);
+
+        $itemMock = $this->getMockBuilder('Magento\Wishlist\Model\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->itemFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($itemMock);
+        $itemMock->expects($this->once())
+            ->method('loadWithOptions')
+            ->with(22)
+            ->willReturnSelf();
+
+        $this->quantityProcessorMock->expects($this->once())
+            ->method('process')
+            ->with(2)
+            ->willReturn('2');
+
+        $itemMock->expects($this->once())
+            ->method('setQty')
+            ->with('2')
+            ->willReturnSelf();
+        $itemMock->expects($this->once())
+            ->method('addToCart')
+            ->with($this->checkoutCartMock, false)
+            ->willThrowException(
+                new \Magento\Framework\Model\Exception(null, \Magento\Wishlist\Model\Item::EXCEPTION_CODE_NOT_SALABLE)
+            );
+
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $itemMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($productMock);
+
+        $cartHelperMock = $this->getMockBuilder('Magento\Checkout\Helper\Cart')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('get')
+            ->with('Magento\Checkout\Helper\Cart')
+            ->willReturn($cartHelperMock);
+
+        $cartHelperMock->expects($this->once())
+            ->method('getShouldRedirectToCart')
+            ->willReturn(false);
+        $this->redirectMock->expects($this->once())
+            ->method('getRefererUrl')
+            ->willReturn(false);
+
+        $productMock->expects($this->once())
+            ->method('getName')
+            ->willReturn('product_name');
+        $this->messageManagerMock->expects($this->once())
+            ->method('addError')
+            ->with('Cannot add the following product(s) to shopping cart: "product_name".')
+            ->willReturnSelf();
+
+        $salesQuoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $salesQuoteMock->expects($this->once())
+            ->method('collectTotals')
+            ->willReturnSelf();
+
+        $this->checkoutCartMock->expects($this->once())
+            ->method('save')
+            ->willReturnSelf();
+        $this->checkoutCartMock->expects($this->once())
+            ->method('getQuote')
+            ->willReturn($salesQuoteMock);
+
+        $this->responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->with('');
+
+        $this->model->execute();
+    }
+
+    public function testExecuteWithHasOptions()
+    {
+        $this->requestMock->expects($this->at(0))
+            ->method('getParam')
+            ->with('qty', null)
+            ->willReturn([22 => 2]);
+        $this->requestMock->expects($this->at(1))
+            ->method('getParam')
+            ->with('selected', null)
+            ->willReturn([22 => 'on']);
+
+        $itemMock = $this->getMockBuilder('Magento\Wishlist\Model\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->itemFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($itemMock);
+        $itemMock->expects($this->once())
+            ->method('loadWithOptions')
+            ->with(22)
+            ->willReturnSelf();
+
+        $this->quantityProcessorMock->expects($this->once())
+            ->method('process')
+            ->with(2)
+            ->willReturn('2');
+
+        $itemMock->expects($this->once())
+            ->method('setQty')
+            ->with('2')
+            ->willReturnSelf();
+        $itemMock->expects($this->once())
+            ->method('addToCart')
+            ->with($this->checkoutCartMock, false)
+            ->willThrowException(
+                new \Magento\Framework\Model\Exception(
+                    null,
+                    \Magento\Wishlist\Model\Item::EXCEPTION_CODE_HAS_REQUIRED_OPTIONS
+                )
+            );
+
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $itemMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($productMock);
+
+        $cartHelperMock = $this->getMockBuilder('Magento\Checkout\Helper\Cart')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('get')
+            ->with('Magento\Checkout\Helper\Cart')
+            ->willReturn($cartHelperMock);
+
+        $cartHelperMock->expects($this->once())
+            ->method('getShouldRedirectToCart')
+            ->willReturn(false);
+        $this->redirectMock->expects($this->once())
+            ->method('getRefererUrl')
+            ->willReturn(false);
+
+        $productMock->expects($this->once())
+            ->method('getName')
+            ->willReturn('product_name');
+        $itemMock->expects($this->once())
+            ->method('getProductUrl')
+            ->willReturn('product_url');
+
+        $salesQuoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $salesQuoteMock->expects($this->once())
+            ->method('collectTotals')
+            ->willReturnSelf();
+
+        $this->checkoutCartMock->expects($this->once())
+            ->method('save')
+            ->willReturnSelf();
+        $this->checkoutCartMock->expects($this->once())
+            ->method('getQuote')
+            ->willReturn($salesQuoteMock);
+
+        $this->responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->with('product_url');
+
+        $this->model->execute();
+    }
+
+    public function testExecuteWithMagentoException()
+    {
+        $this->requestMock->expects($this->at(0))
+            ->method('getParam')
+            ->with('qty', null)
+            ->willReturn([22 => 2]);
+        $this->requestMock->expects($this->at(1))
+            ->method('getParam')
+            ->with('selected', null)
+            ->willReturn([22 => 'on']);
+
+        $itemMock = $this->getMockBuilder('Magento\Wishlist\Model\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->itemFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($itemMock);
+        $itemMock->expects($this->once())
+            ->method('loadWithOptions')
+            ->with(22)
+            ->willReturnSelf();
+
+        $this->quantityProcessorMock->expects($this->once())
+            ->method('process')
+            ->with(2)
+            ->willReturn('2');
+
+        $itemMock->expects($this->once())
+            ->method('setQty')
+            ->with('2')
+            ->willReturnSelf();
+        $itemMock->expects($this->once())
+            ->method('addToCart')
+            ->with($this->checkoutCartMock, false)
+            ->willThrowException(new \Magento\Framework\Model\Exception('Unknown Magento error'));
+
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $itemMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($productMock);
+
+        $cartHelperMock = $this->getMockBuilder('Magento\Checkout\Helper\Cart')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerMock->expects($this->once())
+            ->method('get')
+            ->with('Magento\Checkout\Helper\Cart')
+            ->willReturn($cartHelperMock);
+
+        $cartHelperMock->expects($this->once())
+            ->method('getShouldRedirectToCart')
+            ->willReturn(false);
+        $this->redirectMock->expects($this->exactly(2))
+            ->method('getRefererUrl')
+            ->willReturn('referer_url');
+
+        $productMock->expects($this->once())
+            ->method('getName')
+            ->willReturn('product_name');
+        $this->messageManagerMock->expects($this->once())
+            ->method('addError')
+            ->with('Unknown Magento error for "product_name"')
+            ->willReturnSelf();
+
+        $salesQuoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $salesQuoteMock->expects($this->once())
+            ->method('collectTotals')
+            ->willReturnSelf();
+
+        $this->checkoutCartMock->expects($this->once())
+            ->method('save')
+            ->willReturnSelf();
+        $this->checkoutCartMock->expects($this->once())
+            ->method('getQuote')
+            ->willReturn($salesQuoteMock);
+
+        $this->responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->with('referer_url');
+
+        $this->model->execute();
+    }
+
+    public function testExecuteWithException()
+    {
+        $this->requestMock->expects($this->at(0))
+            ->method('getParam')
+            ->with('qty', null)
+            ->willReturn([22 => 2]);
+        $this->requestMock->expects($this->at(1))
+            ->method('getParam')
+            ->with('selected', null)
+            ->willReturn([22 => 'on']);
+
+        $itemMock = $this->getMockBuilder('Magento\Wishlist\Model\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->itemFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($itemMock);
+        $itemMock->expects($this->once())
+            ->method('loadWithOptions')
+            ->with(22)
+            ->willReturnSelf();
+
+        $this->quantityProcessorMock->expects($this->once())
+            ->method('process')
+            ->with(2)
+            ->willReturn('2');
+
+        $exception = new \Exception();
+
+        $itemMock->expects($this->once())
+            ->method('setQty')
+            ->with('2')
+            ->willReturnSelf();
+        $itemMock->expects($this->once())
+            ->method('addToCart')
+            ->with($this->checkoutCartMock, false)
+            ->willThrowException($exception);
+
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $loggerMock = $this->getMockBuilder('Magento\Framework\Logger')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerMock->expects($this->at(0))
+            ->method('get')
+            ->with('Magento\Framework\Logger')
+            ->willReturn($loggerMock);
+
+        $loggerMock->expects($this->once())
+            ->method('logException')
+            ->with($exception);
+
+        $cartHelperMock = $this->getMockBuilder('Magento\Checkout\Helper\Cart')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->objectManagerMock->expects($this->at(1))
+            ->method('get')
+            ->with('Magento\Checkout\Helper\Cart')
+            ->willReturn($cartHelperMock);
+
+        $cartHelperMock->expects($this->once())
+            ->method('getShouldRedirectToCart')
+            ->willReturn(false);
+        $this->redirectMock->expects($this->exactly(2))
+            ->method('getRefererUrl')
+            ->willReturn('referer_url');
+
+        $this->messageManagerMock->expects($this->once())
+            ->method('addError')
+            ->with('We could not add the item to shopping cart.')
+            ->willReturnSelf();
+
+        $salesQuoteMock = $this->getMockBuilder('Magento\Sales\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $salesQuoteMock->expects($this->once())
+            ->method('collectTotals')
+            ->willReturnSelf();
+
+        $this->checkoutCartMock->expects($this->once())
+            ->method('save')
+            ->willReturnSelf();
+        $this->checkoutCartMock->expects($this->once())
+            ->method('getQuote')
+            ->willReturn($salesQuoteMock);
+
+        $this->responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->with('referer_url');
+
+        $this->model->execute();
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/ViewTest.php b/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/ViewTest.php
index bb04bdfa23958..874746943526f 100644
--- a/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/ViewTest.php
@@ -62,6 +62,11 @@ class ViewTest extends \PHPUnit_Framework_TestCase
      */
     protected $blockMock;
 
+    /**
+     * @var \Magento\Framework\Module\Manager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $moduleManagerMock;
+
     protected function setUp()
     {
         $this->wishlistMock = $this->getMockBuilder('Magento\Wishlist\Model\Wishlist')
@@ -145,6 +150,10 @@ protected function setUp()
             ->method('getRedirect')
             ->will($this->returnValue($this->redirectMock));
 
+        $this->moduleManagerMock = $this->getMockBuilder('Magento\Framework\Module\Manager')
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = new View(
             $this->contextMock,
             $this->registryMock,
@@ -156,7 +165,8 @@ protected function setUp()
             $checkoutSessionMock,
             $checkoutCartMock,
             $this->customerSessionMock,
-            $localeResolverMock
+            $localeResolverMock,
+            $this->moduleManagerMock
         );
     }
 

From 96ce53a98a326eac021360f8684c7f1453926afb Mon Sep 17 00:00:00 2001
From: Anton Guz <aguz@ebay.com>
Date: Thu, 11 Dec 2014 17:58:27 +0200
Subject: [PATCH 269/474] MAGETWO-31703:  Can't Expand Customer Menu if it
 doesn't contains the categories if Responsive

 - Menu will exist always. Empty tab will be skipped.
---
 .../frontend/templates/html/topmenu.phtml     |  3 +-
 lib/web/mage/tabs.js                          | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml b/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
index 13298d49f39d8..10a6fd1622d98 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
@@ -12,10 +12,9 @@
 ?>
 <?php $columnsLimit = $this->getColumnsLimit() ?: 0; ?>
 <?php $_menu = $this->getHtml('level-top', 'submenu', $columnsLimit) ?>
-<?php if ($_menu): ?>
+
 <nav class="navigation" role="navigation">
     <ul data-mage-init='{"menu":{"responsive":true, "expanded":true, "position":{"my":"left top","at":"left bottom"}}}'>
         <?php echo $_menu; ?>
     </ul>
 </nav>
-<?php endif; ?>
diff --git a/lib/web/mage/tabs.js b/lib/web/mage/tabs.js
index e3dcb5645384f..e8b208ea4c98f 100644
--- a/lib/web/mage/tabs.js
+++ b/lib/web/mage/tabs.js
@@ -104,17 +104,42 @@ define([
          * @private
          */
         _processPanels: function() {
+            this.contents = this.element.find(this.options.content);
+
             this.collapsibles = this.element.find(this.options.collapsibleElement);
             this.headers = this.element.find(this.options.header);
             if (this.headers.length === 0) {
                 this.headers = this.collapsibles;
             }
-            this.contents = this.element.find(this.options.content);
             this.triggers = this.element.find(this.options.trigger);
             if (this.triggers.length === 0) {
                 this.triggers = this.headers;
             }
-            this._callCollapsible();
+            this.
+                _skipEmptyTab().
+                _callCollapsible();
+        },
+
+        /**
+         *
+         * @private
+         */
+        _skipEmptyTab: function() {
+            var self = this,
+                newActive = 0;
+            this.contents.each(function(index, el){
+                var text = $.trim($(el).text());
+                if(!text) {
+                    self.options.disabled.push(index);
+                    if(!index && self.contents.length > 1) {
+                        newActive++;
+                    }
+                    if(self.options.active === index) {
+                        self.options.active = newActive;
+                    }
+                }
+            });
+            return this;
         },
 
         /**

From cfe27e0a92e2bcca05bcfe8c16c5973eb7cc849d Mon Sep 17 00:00:00 2001
From: Richard Bates <rbates@x.com>
Date: Thu, 11 Dec 2014 10:00:37 -0600
Subject: [PATCH 270/474] MAGETWO-3315: Functions _camelize and _underscore
 work incorrect with keys that have digits between '_' symbol  - renamed
 constant

---
 app/code/Magento/Paypal/Model/Info.php                     | 4 ++--
 dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Info.php b/app/code/Magento/Paypal/Model/Info.php
index 955fc52a730c3..16e885bdb3b7e 100644
--- a/app/code/Magento/Paypal/Model/Info.php
+++ b/app/code/Magento/Paypal/Model/Info.php
@@ -36,7 +36,7 @@ class Info
 
     const AVS_CODE = 'avs_result';
 
-    const CVV2_MATCH = 'cvv_2_check_result';
+    const CVV_2_MATCH = 'cvv_2_check_result';
 
     const CENTINEL_VPAS = 'centinel_vpas_result';
 
@@ -81,7 +81,7 @@ class Info
         self::FRAUD_FILTERS => self::PAYPAL_FRAUD_FILTERS,
         self::CORRELATION_ID => self::PAYPAL_CORRELATION_ID,
         self::AVS_CODE => self::PAYPAL_AVS_CODE,
-        self::CVV2_MATCH => self::PAYPAL_CVV2_MATCH,
+        self::CVV_2_MATCH => self::PAYPAL_CVV2_MATCH,
         self::CENTINEL_VPAS => self::CENTINEL_VPAS,
         self::CENTINEL_ECI => self::CENTINEL_ECI,
         self::BUYER_TAX_ID => self::BUYER_TAX_ID,
diff --git a/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php b/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php
index ab8a17485a2bd..4c5b6e45d393c 100644
--- a/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php
@@ -223,7 +223,7 @@ public function importToPaymentDataProvider()
                     Info::FRAUD_FILTERS => Info::PAYPAL_FRAUD_FILTERS,
                     Info::CORRELATION_ID => Info::PAYPAL_CORRELATION_ID,
                     Info::AVS_CODE => Info::PAYPAL_AVS_CODE,
-                    Info::CVV2_MATCH => Info::PAYPAL_CVV2_MATCH,
+                    Info::CVV_2_MATCH => Info::PAYPAL_CVV2_MATCH,
                     Info::CENTINEL_VPAS => Info::CENTINEL_VPAS,
                     Info::CENTINEL_ECI => Info::CENTINEL_ECI,
                     Info::BUYER_TAX_ID => Info::BUYER_TAX_ID,

From a254246037276c33db162357efad075f6c56f57d Mon Sep 17 00:00:00 2001
From: Alex Akimov <aakimov@ebay.com>
Date: Thu, 11 Dec 2014 17:56:35 +0200
Subject: [PATCH 271/474] MAGETWO-31632: Reset Customer Password Link Redirects
 to Backend

---
 app/code/Magento/Customer/Model/AccountManagement.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index b9680b1d53405..5d4dec963603d 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -33,7 +33,6 @@
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\String as StringHelper;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\UrlInterface;
 
 /**
  * Handle various customer account actions
@@ -133,7 +132,7 @@ class AccountManagement implements AccountManagementInterface
     private $customerMetadataService;
 
     /**
-     * @var UrlInterface
+     * @var \Magento\Framework\Url
      */
     private $url;
 
@@ -220,7 +219,7 @@ class AccountManagement implements AccountManagementInterface
      * @param AddressRepositoryInterface $addressRepository
      * @param CustomerMetadataInterface $customerMetadataService
      * @param CustomerRegistry $customerRegistry
-     * @param UrlInterface $url
+     * @param \Magento\Framework\Url $url
      * @param Logger $logger
      * @param Encryptor $encryptor
      * @param ConfigShare $configShare
@@ -249,7 +248,7 @@ public function __construct(
         AddressRepositoryInterface $addressRepository,
         CustomerMetadataInterface $customerMetadataService,
         CustomerRegistry $customerRegistry,
-        UrlInterface $url,
+        \Magento\Framework\Url $url,
         Logger $logger,
         Encryptor $encryptor,
         ConfigShare $configShare,
@@ -1057,7 +1056,8 @@ public function sendPasswordReminderEmail($customer, $newPasswordToken)
             'customer/account/createPassword',
             [
                 '_query' => ['id' => $customer->getId(), 'token' => $newPasswordToken],
-                '_store' => $customer->getStoreId()
+                '_store' => $customer->getStoreId(),
+                '_nosid' => true,
             ]
         );
 

From dc2afc7cc4fbe6a07e39d88cf2a7836681d5036c Mon Sep 17 00:00:00 2001
From: Olexii Korshenko <okorshenko@ebay.com>
Date: Thu, 11 Dec 2014 18:13:45 +0200
Subject: [PATCH 272/474] MAGETWO-31637: Customer redirected to 404 after try
 to unsubscribe newsletter

---
 .../Magento/Customer/Block/Newsletter.php     |  2 +-
 .../Magento/Customer/Block/NewsletterTest.php | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php

diff --git a/app/code/Magento/Customer/Block/Newsletter.php b/app/code/Magento/Customer/Block/Newsletter.php
index ba52fb19e574e..9f2c0b08cea43 100644
--- a/app/code/Magento/Customer/Block/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Newsletter.php
@@ -62,6 +62,6 @@ public function getIsSubscribed()
      */
     public function getAction()
     {
-        return $this->getUrl('*/*/save');
+        return $this->getUrl('newsletter/manage/save');
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php
new file mode 100644
index 0000000000000..3bf183a5df67c
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Customer\Block;
+
+class NewsletterTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $urlBuilder;
+
+    /**
+     * @var Newsletter
+     */
+    protected $block;
+
+    protected function setUp()
+    {
+        $this->urlBuilder = $this->getMock('\Magento\Framework\UrlInterface');
+        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->block = $helper->getObject('\Magento\Customer\Block\Newsletter', ['urlBuilder' => $this->urlBuilder]);
+    }
+
+    protected function testGetAction()
+    {
+        $this->urlBuilder->expects($this->once())
+            ->method('getUrl')
+            ->with('newsletter/manage/save', [])
+            ->willReturn('newsletter/manage/save');
+
+        $this->assertEquals('newsletter/manage/save', $this->block->getAction());
+    }
+}

From 35072b8522d5e3675126fa8ad60b590074b842f8 Mon Sep 17 00:00:00 2001
From: Denys Rul <drul@ebay.com>
Date: Thu, 11 Dec 2014 18:14:54 +0200
Subject: [PATCH 273/474] MAGETWO-8915: Gift Card isn't saved if in Amounts
 grid were added two rows with the same value

- Fallback to notification widget when element wasn't found.
---
 .../view/base/web/js/form/element/abstract.js | 31 ++++++-------------
 .../Ui/view/base/web/js/lib/ko/scope.js       | 18 -----------
 .../web/templates/form/element/checkbox.html  |  2 +-
 .../base/web/templates/form/element/date.html |  2 +-
 .../web/templates/form/element/email.html     |  2 +-
 .../web/templates/form/element/input.html     |  2 +-
 .../web/templates/form/element/media.html     |  2 +-
 .../templates/form/element/multiselect.html   |  2 +-
 .../web/templates/form/element/select.html    |  2 +-
 .../web/templates/form/element/textarea.html  |  2 +-
 .../view/base/web/templates/group/field.html  |  2 +-
 lib/web/mage/backend/notification.js          | 20 ++++++++++++
 lib/web/mage/backend/validation.js            | 12 +++++++
 13 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
index b642e5aff236c..ba6e18e8725ec 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js
@@ -14,18 +14,16 @@ define([
             hidden:             false,
             preview:            '',
             focused:            false,
-            tooltip:            null,
             required:           false,
             disabled:           false,
             tmpPath:            'ui/form/element/',
             tooltipTpl:         'ui/form/element/helper/tooltip',
             input_type:         'input',
-            placeholder:        null,
-            noticeid:           null,
+            placeholder:        '',
             description:        '',
             label:              '',
             error:              '',
-            notice:             null
+            notice:             ''
         },
 
         /**
@@ -50,18 +48,15 @@ define([
          * @returns {Abstract} Chainable.
          */
         initObservable: function () {
-            var value = this.getInititalValue(), 
-                rules;
+            var rules = this.validation = this.validation || {};
 
             this._super();
 
-            rules = this.validation = this.validation || {};
-
-            this.initialValue = value;
+            this.initialValue = this.getInititalValue();
 
             this.observe('error disabled focused preview hidden')
                 .observe({
-                    'value':    value,
+                    'value':    this.initialValue,
                     'required': !!rules['required-entry']
                 });
 
@@ -74,11 +69,14 @@ define([
          * @returns {Abstract} Chainable.
          */
         initProperties: function () {
+            var uid = utils.uniqueid();
+
             this._super();
 
             _.extend(this, {
-                'uid':        utils.uniqueid(),
-                'inputName':  utils.serializeName(this.dataScope)
+                'uid':          uid,
+                'noticeId':     'notice-' + this.uid,
+                'inputName':    utils.serializeName(this.dataScope)
             });
 
             _.defaults(this, {
@@ -122,15 +120,6 @@ define([
             return value;
         },
 
-        /**
-         * Defines notice id for the element.
-         * 
-         * @returns {String} Notice id.
-         */
-        getNoticeId: function () {
-            return 'notice-' + this.uid;
-        },
-
         /**
          * Sets value to preview observable
          * 
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/scope.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/scope.js
index 81138a56f2fbf..17903b02635b7 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/ko/scope.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/scope.js
@@ -57,12 +57,6 @@ define([
             return this;
         },
 
-        compute: function (path, defs) {
-            this[path] = ko.computed(defs);
-
-            return this;
-        },
-
         /**
          * Reads it's params from provider and stores it into its params object
          * @return {Object} reference to instance
@@ -104,18 +98,6 @@ define([
         reload: function() {
             this.pushParams()
                 .provider.refresh();
-        },
-
-        updateObservable: function (defs) {
-            var field;
-
-            _.each(defs, function (value, key) {
-                field = this[key];
-                
-                if (ko.isObservable(field)) {
-                    field(value);    
-                }
-            }, this);
         }
     });
 });
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox.html b/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox.html
index 2e9e1150f5ced..e12267216a5ad 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox.html
@@ -16,6 +16,6 @@
     </label>
     
     <!-- ko if: notice -->
-    <div class="note" data-bind="attr: {id: 'notice-' + uid}"><span data-bind="text: notice"></span></div>
+        <div class="note" data-bind="attr: {id: noticeId}"><span data-bind="text: notice"></span></div>
     <!-- /ko -->
 </div>
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/date.html b/app/code/Magento/Ui/view/base/web/templates/form/element/date.html
index 12c98400d84b8..2f15cb8f30941 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/date.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/date.html
@@ -10,6 +10,6 @@
         value: value,
         name: inputName,
         placeholder: placeholder,
-        'aria-describedby': noticeid,
+        'aria-describedby': noticeId,
         disabled: disabled
     }" />
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/email.html b/app/code/Magento/Ui/view/base/web/templates/form/element/email.html
index 714bddc3fe94e..6bd0a7e98c600 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/email.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/email.html
@@ -9,7 +9,7 @@
     attr: {
         name: inputName,
         placeholder: placeholder,
-        'aria-describedby': noticeid,
+        'aria-describedby': noticeId,
         id: uid,
         disabled: disabled
     }"/>
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/input.html b/app/code/Magento/Ui/view/base/web/templates/form/element/input.html
index aca1ef2e9362d..9b9589278ce94 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/input.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/input.html
@@ -9,7 +9,7 @@
     attr: {
         name: inputName,
         placeholder: placeholder,
-        'aria-describedby': noticeid,
+        'aria-describedby': noticeId,
         id: uid, 
         disabled: disabled
     }" />
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/media.html b/app/code/Magento/Ui/view/base/web/templates/form/element/media.html
index dd98e90468139..87b5bfe9d4b1c 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/media.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/media.html
@@ -8,7 +8,7 @@
     attr: {
         name: inputName,
         id: uid,
-        'aria-describedby': noticeid,
+        'aria-describedby': noticeId,
         disabled: disabled 
     },
     hasFocus: focused"
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/multiselect.html b/app/code/Magento/Ui/view/base/web/templates/form/element/multiselect.html
index dc9c313aa86a2..12bd338a57b59 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/multiselect.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/multiselect.html
@@ -9,7 +9,7 @@
         id: uid,
         size: size,
         disabled: disabled,
-        'aria-describedby': noticeid,
+        'aria-describedby': noticeId,
         placeholder: placeholder
     },
     hasFocus: focused,
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/select.html b/app/code/Magento/Ui/view/base/web/templates/form/element/select.html
index e3aa654a1df95..d8502f82ff290 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/select.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/select.html
@@ -8,7 +8,7 @@
         name: inputName,
         id: uid,
         disabled: disabled,
-        'aria-describedby': noticeid,
+        'aria-describedby': noticeId,
         placeholder: placeholder
     },
     hasFocus: focused,
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/textarea.html b/app/code/Magento/Ui/view/base/web/templates/form/element/textarea.html
index 31347b346a230..d10a8703ac74a 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/textarea.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/textarea.html
@@ -10,7 +10,7 @@
         name: inputName,
         cols: cols,
         rows: rows,
-        'aria-describedby': noticeid,
+        'aria-describedby': noticeId,
         placeholder: placeholder,
         id: uid
     }"
diff --git a/app/code/Magento/Ui/view/base/web/templates/group/field.html b/app/code/Magento/Ui/view/base/web/templates/group/field.html
index ae890464e9607..a43266bb8031d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/group/field.html
+++ b/app/code/Magento/Ui/view/base/web/templates/group/field.html
@@ -35,7 +35,7 @@
         <!-- /ko -->
 
         <!-- ko if: element.notice -->
-            <div class="note" data-bind="attr: { id: element.getNoticeId() }"><span data-bind="text: element.notice"></span></div>
+            <div class="note" data-bind="attr: { id: element.noticeId }"><span data-bind="text: element.notice"></span></div>
         <!-- /ko -->
 
         <!-- ko if: $parent.isSingle() -->
diff --git a/lib/web/mage/backend/notification.js b/lib/web/mage/backend/notification.js
index fa23bad8989bf..99b970c176397 100644
--- a/lib/web/mage/backend/notification.js
+++ b/lib/web/mage/backend/notification.js
@@ -41,6 +41,26 @@ define([
                     $('#messages').html(response.html_message);
                 }
             } catch(e) {}
+        },
+
+        /**
+         * Adds new message.
+         *
+         * @param {Object} data - Data with a message to be displayed.
+         */
+        add: function(data){
+            var message = $.tmpl(this.options.templates.global, data);
+
+            $("#messages").append(message);
+
+            return this;
+        },
+
+        /**
+         * Removes error messages.
+         */
+        clear: function(){
+            $('#messages').html('');
         }
     });
     
diff --git a/lib/web/mage/backend/validation.js b/lib/web/mage/backend/validation.js
index 104e423f29a5a..8ace0acd5ab54 100644
--- a/lib/web/mage/backend/validation.js
+++ b/lib/web/mage/backend/validation.js
@@ -151,14 +151,26 @@
                 attributes[data.attribute] = data.message;
             }
 
+            $('body').notification('clear');
+
             _.each(attributes, function(message, code) {
                 element = this._getByCode(code);
 
+                if(!element.length){
+                    $('body').notification('add', {
+                        error: true,
+                        message: message
+                    });
+
+                    return; 
+                }
+                
                 element
                     .addClass('validate-ajax-error')
                     .data('msg-validate-ajax-error', message);
 
                 this.validate.element(element);
+
             }, this);
         },
 

From 26ae357dba52795376cff313dbde0433182caf22 Mon Sep 17 00:00:00 2001
From: Richard Bates <rbates@x.com>
Date: Thu, 11 Dec 2014 10:18:20 -0600
Subject: [PATCH 274/474] MAGETWO-3315: Functions _camelize and _underscore
 work incorrect with keys that have digits between '_' symbol  - undid changes
 that were not required

---
 app/code/Magento/Paypal/Model/Info.php                     | 4 ++--
 dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/Info.php b/app/code/Magento/Paypal/Model/Info.php
index 16e885bdb3b7e..62f12475d0dc5 100644
--- a/app/code/Magento/Paypal/Model/Info.php
+++ b/app/code/Magento/Paypal/Model/Info.php
@@ -36,7 +36,7 @@ class Info
 
     const AVS_CODE = 'avs_result';
 
-    const CVV_2_MATCH = 'cvv_2_check_result';
+    const CVV2_MATCH = 'cvv2_check_result';
 
     const CENTINEL_VPAS = 'centinel_vpas_result';
 
@@ -81,7 +81,7 @@ class Info
         self::FRAUD_FILTERS => self::PAYPAL_FRAUD_FILTERS,
         self::CORRELATION_ID => self::PAYPAL_CORRELATION_ID,
         self::AVS_CODE => self::PAYPAL_AVS_CODE,
-        self::CVV_2_MATCH => self::PAYPAL_CVV2_MATCH,
+        self::CVV2_MATCH => self::PAYPAL_CVV2_MATCH,
         self::CENTINEL_VPAS => self::CENTINEL_VPAS,
         self::CENTINEL_ECI => self::CENTINEL_ECI,
         self::BUYER_TAX_ID => self::BUYER_TAX_ID,
diff --git a/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php b/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php
index 4c5b6e45d393c..ab8a17485a2bd 100644
--- a/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php
@@ -223,7 +223,7 @@ public function importToPaymentDataProvider()
                     Info::FRAUD_FILTERS => Info::PAYPAL_FRAUD_FILTERS,
                     Info::CORRELATION_ID => Info::PAYPAL_CORRELATION_ID,
                     Info::AVS_CODE => Info::PAYPAL_AVS_CODE,
-                    Info::CVV_2_MATCH => Info::PAYPAL_CVV2_MATCH,
+                    Info::CVV2_MATCH => Info::PAYPAL_CVV2_MATCH,
                     Info::CENTINEL_VPAS => Info::CENTINEL_VPAS,
                     Info::CENTINEL_ECI => Info::CENTINEL_ECI,
                     Info::BUYER_TAX_ID => Info::BUYER_TAX_ID,

From 49e7428a80c9c3585dc69f7b77fefea81c0b3853 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Thu, 11 Dec 2014 18:21:47 +0200
Subject: [PATCH 275/474] MAGETWO-31623: Performance degradation investigation

- removed autoload usage
---
 app/autoload.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/autoload.php b/app/autoload.php
index bf25cffe341cb..b7e2620161d43 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -20,11 +20,12 @@
 if (file_exists($vendorAutoload)) {
     $composerAutoloader = include $vendorAutoload;
 }
+/**
 require_once BP . '/lib/internal/Magento/Framework/Autoload/IncludePath.php';
 $includePath = new \Magento\Framework\Autoload\IncludePath();
 $includePath->addIncludePath([BP . '/app/code', BP . '/lib/internal', BP . '/var/generation']);
 spl_autoload_register([$includePath, 'load'], true, true);
-
+*/
 AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
 
 // Sets default autoload mappings, may be overridden in Bootstrap::create

From 87b82e1557397a3d49ab3ebea3d1656efd5f7d05 Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Thu, 11 Dec 2014 18:27:45 +0200
Subject: [PATCH 276/474] MAGETWO-31702: Bundle product page design is broken
 if Paypal Express is enabled

---
 .../Magento/blank/Magento_Bundle/web/css/source/module.less | 1 +
 .../Magento/blank/Magento_Paypal/web/css/source/module.less | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less
index 7b31d2f686814..f5188ca211300 100644
--- a/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/module.less
@@ -80,6 +80,7 @@
         .box-tocart {
             .actions {
                 margin-bottom: @indent-s-base;
+                display: inline-block;
             }
             .action.primary {
                 &:extend(.abs-button-l all);
diff --git a/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less
index 9c7a72ea9f1f0..24229d8a6b207 100644
--- a/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Paypal/web/css/source/module.less
@@ -34,12 +34,12 @@
     }
 }
 
-.product-info-main,
+.box-tocart,
 .block-minicart {
-     .paypal img {
+    .paypal img {
         display: block;
         margin: 0 auto;
-     }
+    }
 }
 
 .form-new-agreement {

From f09dda2f92baf94c60245a0572d9adf290a31c91 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Thu, 11 Dec 2014 18:32:44 +0200
Subject: [PATCH 277/474] MAGETWO-31627: Remove proxy for config classes

- fixed unit test
---
 .../{ConfigTest.php => Config/DeveloperTest.php}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/{ConfigTest.php => Config/DeveloperTest.php} (96%)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php
similarity index 96%
rename from dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/ConfigTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php
index 3b3dacb34572b..cf6342d5c4014 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php
@@ -6,9 +6,9 @@
  * @copyright   {copyright}
  * @license     {license_link}
  */
-namespace Magento\Framework\Interception\ObjectManager;
+namespace Magento\Framework\Interception\ObjectManager\Config;
 
-class ConfigTest extends \PHPUnit_Framework_TestCase
+class DeveloperTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \Magento\Framework\Interception\ObjectManager\Config\Developer

From d949174e2f7945e9f1e50a438a68a79925d6a78c Mon Sep 17 00:00:00 2001
From: Oleksandr Ivashchenko <oivashchenko@ebay.com>
Date: Thu, 11 Dec 2014 18:33:05 +0200
Subject: [PATCH 278/474] MAGETWO-31710: Exception if press "Compare" button

 - Replace deprecated methods
---
 .../Controller/Cart/RemoveFailed.php          | 21 ++++-
 .../Controller/Product/Compare/Index.php      | 59 ++++++++++++-
 .../Adminhtml/Wysiwyg/Directive.php           | 21 ++++-
 .../Controller/Adminhtml/Index/Viewfile.php   | 86 ++++++++++++++++++-
 .../Adminhtml/Googleshopping/Items.php        | 24 ++++--
 .../Googleshopping/Items/ConfirmCaptcha.php   | 28 +++++-
 .../Adminhtml/Googleshopping/Items/Index.php  | 32 +++++--
 .../Rma/Controller/Adminhtml/Rma/Viewfile.php | 47 ++++++++--
 8 files changed, 288 insertions(+), 30 deletions(-)

diff --git a/app/code/Magento/AdvancedCheckout/Controller/Cart/RemoveFailed.php b/app/code/Magento/AdvancedCheckout/Controller/Cart/RemoveFailed.php
index 2c08be2aecb5d..f601d699288ac 100644
--- a/app/code/Magento/AdvancedCheckout/Controller/Cart/RemoveFailed.php
+++ b/app/code/Magento/AdvancedCheckout/Controller/Cart/RemoveFailed.php
@@ -5,8 +5,27 @@
  */
 namespace Magento\AdvancedCheckout\Controller\Cart;
 
+use Magento\Framework\App\Action\Context;
+
 class RemoveFailed extends \Magento\AdvancedCheckout\Controller\Cart
 {
+    /**
+     * @var \Magento\Framework\Url\DecoderInterface
+     */
+    protected $urlDecoder;
+
+    /**
+     * @param Context $context
+     * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+     */
+    public function __construct(
+        Context $context,
+        \Magento\Framework\Url\DecoderInterface $urlDecoder
+    ) {
+        $this->urlDecoder = $urlDecoder;
+        parent::__construct($context);
+    }
+
     /**
      * Remove failed items from storage
      *
@@ -15,7 +34,7 @@ class RemoveFailed extends \Magento\AdvancedCheckout\Controller\Cart
     public function execute()
     {
         $removed = $this->_getFailedItemsCart()->removeAffectedItem(
-            $this->_objectManager->get('Magento\Core\Helper\Url')->urlDecode($this->getRequest()->getParam('sku'))
+            $this->urlDecoder->decode($this->getRequest()->getParam('sku'))
         );
 
         if ($removed) {
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
index 825dea8063df8..d2090e10aaf08 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
@@ -5,8 +5,65 @@
  */
 namespace Magento\Catalog\Controller\Product\Compare;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Core\App\Action\FormKeyValidator;
+use Magento\Framework\Controller\Result;
+use Magento\Framework\View\Result\PageFactory;
+
 class Index extends \Magento\Catalog\Controller\Product\Compare
 {
+    /**
+     * @var \Magento\Framework\Url\DecoderInterface
+     */
+    protected $urlDecoder;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory
+     * @param \Magento\Catalog\Model\Resource\Product\Compare\Item\CollectionFactory $itemCollectionFactory
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Customer\Model\Visitor $customerVisitor
+     * @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
+     * @param \Magento\Catalog\Model\Session $catalogSession
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param FormKeyValidator $formKeyValidator
+     * @param Result\RedirectFactory $resultRedirectFactory
+     * @param PageFactory $resultPageFactory
+     * @param ProductRepositoryInterface $productRepository
+     * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory,
+        \Magento\Catalog\Model\Resource\Product\Compare\Item\CollectionFactory $itemCollectionFactory,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Customer\Model\Visitor $customerVisitor,
+        \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
+        \Magento\Catalog\Model\Session $catalogSession,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        FormKeyValidator $formKeyValidator,
+        Result\RedirectFactory $resultRedirectFactory,
+        PageFactory $resultPageFactory,
+        ProductRepositoryInterface $productRepository,
+        \Magento\Framework\Url\DecoderInterface $urlDecoder
+    ) {
+        $this->urlDecoder = $urlDecoder;
+        parent::__construct(
+            $context,
+            $compareItemFactory,
+            $itemCollectionFactory,
+            $customerSession,
+            $customerVisitor,
+            $catalogProductCompareList,
+            $catalogSession,
+            $storeManager,
+            $formKeyValidator,
+            $resultRedirectFactory,
+            $resultPageFactory,
+            $productRepository
+        );
+    }
+
     /**
      * Compare index action
      *
@@ -19,7 +76,7 @@ public function execute()
         $beforeUrl = $this->getRequest()->getParam(self::PARAM_NAME_URL_ENCODED);
         if ($beforeUrl) {
             $this->_catalogSession->setBeforeCompareUrl(
-                $this->_objectManager->get('Magento\Core\Helper\Data')->urlDecode($beforeUrl)
+                $this->urlDecoder->decode($beforeUrl)
             );
         }
 
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
index 878071667990f..ce64afcf5b7f4 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -5,8 +5,27 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg;
 
+use Magento\Backend\App\Action;
+
 class Directive extends \Magento\Backend\App\Action
 {
+    /**
+     * @var \Magento\Framework\Url\DecoderInterface
+     */
+    protected $urlDecoder;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Framework\Url\DecoderInterface $urlDecoder
+    ) {
+        $this->urlDecoder = $urlDecoder;
+        parent::__construct($context);
+    }
+
     /**
      * Template directives callback
      *
@@ -17,7 +36,7 @@ class Directive extends \Magento\Backend\App\Action
     public function execute()
     {
         $directive = $this->getRequest()->getParam('___directive');
-        $directive = $this->_objectManager->get('Magento\Core\Helper\Data')->urlDecode($directive);
+        $directive = $this->urlDecoder->decode($directive);
         $url = $this->_objectManager->create('Magento\Email\Model\Template\Filter')->filter($directive);
         /** @var \Magento\Framework\Image\Adapter\AdapterInterface $image */
         $image = $this->_objectManager->get('Magento\Framework\Image\AdapterFactory')->create();
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index 4087a265a8def..45180b98c2dbd 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -5,11 +5,91 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressDataBuilder;
+use Magento\Customer\Api\Data\CustomerDataBuilder;
+use Magento\Customer\Model\Address\Mapper;
 use Magento\Framework\App\Action\NotFoundException;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\ObjectFactory;
 
 class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
 {
+    /**
+     * @var \Magento\Framework\Url\DecoderInterface
+     */
+    protected $urlDecoder;
+
+    /**
+     * @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 CustomerDataBuilder $customerDataBuilder
+     * @param AddressDataBuilder $addressDataBuilder
+     * @param \Magento\Customer\Model\Customer\Mapper $customerMapper
+     * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
+     * @param ObjectFactory $objectFactory
+     * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+     */
+    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,
+        CustomerDataBuilder $customerDataBuilder,
+        AddressDataBuilder $addressDataBuilder,
+        \Magento\Customer\Model\Customer\Mapper $customerMapper,
+        \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
+        ObjectFactory $objectFactory,
+        \Magento\Framework\Url\DecoderInterface $urlDecoder
+    ) {
+        $this->urlDecoder  = $urlDecoder;
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $customerFactory,
+            $addressFactory,
+            $formFactory,
+            $subscriberFactory,
+            $viewHelper,
+            $random,
+            $customerRepository,
+            $extensibleDataObjectConverter,
+            $addressMapper,
+            $customerAccountManagement,
+            $addressRepository,
+            $customerDataBuilder,
+            $addressDataBuilder,
+            $customerMapper,
+            $dataObjectProcessor,
+            $objectFactory
+        );
+    }
+
     /**
      * Customer view file action
      *
@@ -24,14 +104,12 @@ public function execute()
         $plain = false;
         if ($this->getRequest()->getParam('file')) {
             // download file
-            $file = $this->_objectManager->get(
-                'Magento\Core\Helper\Data'
-            )->urlDecode(
+            $file = $this->urlDecoder->decode(
                 $this->getRequest()->getParam('file')
             );
         } elseif ($this->getRequest()->getParam('image')) {
             // show plain image
-            $file = $this->_objectManager->get('Magento\Core\Helper\Data')->urlDecode(
+            $file = $this->urlDecoder->decode(
                 $this->getRequest()->getParam('image')
             );
             $plain = true;
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
index fdb673823d877..f33716bc9d6a5 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
@@ -21,11 +21,21 @@ class Items extends \Magento\Backend\App\Action
     protected $notifier;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
+     * @var \Magento\Framework\Url\EncoderInterface
+     */
+    protected $urlEncoder;
+
+    /**
+     * @param Action\Context $context
      * @param NotifierInterface $notifier
+     * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      */
-    public function __construct(Action\Context $context, NotifierInterface $notifier)
-    {
+    public function __construct(
+        Action\Context $context,
+        NotifierInterface $notifier,
+        \Magento\Framework\Url\EncoderInterface $urlEncoder
+    ) {
+        $this->urlEncoder = $urlEncoder;
         parent::__construct($context);
         $this->notifier = $notifier;
     }
@@ -52,12 +62,8 @@ protected function _redirectToCaptcha($e)
             '*/*/index',
             [
                 'store' => $this->_getStore()->getId(),
-                'captcha_token' => $this->_objectManager->get(
-                    'Magento\Core\Helper\Data'
-                )->urlEncode(
-                    $e->getCaptchaToken()
-                ),
-                'captcha_url' => $this->_objectManager->get('Magento\Core\Helper\Data')->urlEncode($e->getCaptchaUrl())
+                'captcha_token' => $this->urlEncoder->encode($e->getCaptchaToken()),
+                'captcha_url' => $this->urlEncoder->encode($e->getCaptchaUrl())
             ]
         );
         if ($this->getRequest()->isAjax()) {
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php
index f1a1bece50558..73368e3a5cba7 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php
@@ -5,8 +5,32 @@
  */
 namespace Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\Items;
 
+use Magento\Backend\App\Action;
+use Magento\Framework\Notification\NotifierInterface;
+
 class ConfirmCaptcha extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\Items
 {
+    /**
+     * @var \Magento\Framework\Url\DecoderInterface
+     */
+    protected $urlDecoder;
+
+    /**
+     * @param Action\Context $context
+     * @param NotifierInterface $notifier
+     * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
+     * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+     */
+    public function __construct(
+        Action\Context $context,
+        NotifierInterface $notifier,
+        \Magento\Framework\Url\EncoderInterface $urlEncoder,
+        \Magento\Framework\Url\DecoderInterface $urlDecoder
+    ) {
+        $this->urlDecoder = $urlDecoder;
+        parent::__construct($context, $notifier, $urlEncoder);
+    }
+
     /**
      * Confirm CAPTCHA
      *
@@ -20,9 +44,7 @@ public function execute()
                 'Magento\GoogleShopping\Model\Service'
             )->getClient(
                 $storeId,
-                $this->_objectManager->get(
-                    'Magento\Core\Helper\Data'
-                )->urlDecode(
+                $this->urlDecoder->decode(
                     $this->getRequest()->getParam('captcha_token')
                 ),
                 $this->getRequest()->getParam('user_confirm')
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
index 7811da5e546a0..24ffb5d4d750f 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
@@ -5,8 +5,32 @@
  */
 namespace Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\Items;
 
+use Magento\Backend\App\Action;
+use Magento\Framework\Notification\NotifierInterface;
+
 class Index extends \Magento\GoogleShopping\Controller\Adminhtml\Googleshopping\Items
 {
+    /**
+     * @var \Magento\Framework\Url\DecoderInterface
+     */
+    protected $urlDecoder;
+
+    /**
+     * @param Action\Context $context
+     * @param NotifierInterface $notifier
+     * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
+     * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+     */
+    public function __construct(
+        Action\Context $context,
+        NotifierInterface $notifier,
+        \Magento\Framework\Url\EncoderInterface $urlEncoder,
+        \Magento\Framework\Url\DecoderInterface $urlDecoder
+    ) {
+        $this->urlDecoder = $urlDecoder;
+        parent::__construct($context, $notifier, $urlEncoder);
+    }
+
     /**
      * Initialize general settings for action
      *
@@ -58,16 +82,12 @@ public function execute()
 
         if ($this->getRequest()->getParam('captcha_token') && $this->getRequest()->getParam('captcha_url')) {
             $contentBlock->setGcontentCaptchaToken(
-                $this->_objectManager->get(
-                    'Magento\Core\Helper\Data'
-                )->urlDecode(
+                $this->urlDecoder->decode(
                     $this->getRequest()->getParam('captcha_token')
                 )
             );
             $contentBlock->setGcontentCaptchaUrl(
-                $this->_objectManager->get(
-                    'Magento\Core\Helper\Data'
-                )->urlDecode(
+                $this->urlDecoder->decode(
                     $this->getRequest()->getParam('captcha_url')
                 )
             );
diff --git a/app/code/Magento/Rma/Controller/Adminhtml/Rma/Viewfile.php b/app/code/Magento/Rma/Controller/Adminhtml/Rma/Viewfile.php
index ede3dc982adb6..1d40f6c9685c5 100644
--- a/app/code/Magento/Rma/Controller/Adminhtml/Rma/Viewfile.php
+++ b/app/code/Magento/Rma/Controller/Adminhtml/Rma/Viewfile.php
@@ -5,11 +5,49 @@
  */
 namespace Magento\Rma\Controller\Adminhtml\Rma;
 
+use Magento\Backend\App\Action;
 use Magento\Framework\App\Action\NotFoundException;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 class Viewfile extends \Magento\Rma\Controller\Adminhtml\Rma
 {
+    /**
+     * @var \Magento\Framework\Url\DecoderInterface
+     */
+    protected $urlDecoder;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Framework\Filesystem $filesystem
+     * @param \Magento\Shipping\Helper\Carrier $carrierHelper
+     * @param \Magento\Rma\Model\Shipping\LabelService $labelService
+     * @param \Magento\Rma\Model\Rma\RmaDataMapper $rmaDataMapper
+     * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Framework\Filesystem $filesystem,
+        \Magento\Shipping\Helper\Carrier $carrierHelper,
+        \Magento\Rma\Model\Shipping\LabelService $labelService,
+        \Magento\Rma\Model\Rma\RmaDataMapper $rmaDataMapper,
+        \Magento\Framework\Url\DecoderInterface $urlDecoder
+    ) {
+        $this->urlDecoder = $urlDecoder;
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $filesystem,
+            $carrierHelper,
+            $labelService,
+            $rmaDataMapper
+        );
+    }
+
     /**
      * Retrieve image MIME type by its extension
      *
@@ -38,13 +76,12 @@ public function execute()
         $plain = false;
         if ($this->getRequest()->getParam('file')) {
             // download file
-            $fileName   = $this->_objectManager->get('Magento\Core\Helper\Data')
-                ->urlDecode($this->getRequest()->getParam('file'));
+            $fileName = $this->urlDecoder->decode(
+                $this->getRequest()->getParam('file')
+            );
         } elseif ($this->getRequest()->getParam('image')) {
             // show plain image
-            $fileName = $this->_objectManager->get(
-                'Magento\Core\Helper\Data'
-            )->urlDecode(
+            $fileName = $this->urlDecoder->decode(
                 $this->getRequest()->getParam('image')
             );
             $plain = true;

From e597834ddbd7efe72eb134048294d6aef6e84478 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 11 Dec 2014 18:35:38 +0200
Subject: [PATCH 279/474] MAGETWO-31629: Online payment methods removal for CE
 release

- magento/module-centinel is not required for ce
---
 app/code/Magento/Payment/composer.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 243b2fec27249..dab6845bf20da 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -6,11 +6,13 @@
         "magento/module-store": "0.1.0-alpha107",
         "magento/module-core": "0.1.0-alpha107",
         "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-centinel": "0.1.0-alpha107",
         "magento/module-checkout": "0.1.0-alpha107",
         "magento/framework": "0.1.0-alpha107",
         "magento/magento-composer-installer": "*"
     },
+    "suggest": {
+        "magento/module-centinel": "0.1.0-alpha107"
+    },
     "type": "magento2-module",
     "version": "0.1.0-alpha107",
     "extra": {

From cd335decb646730176d2eea0ebc77c7de4d36f95 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Thu, 11 Dec 2014 18:40:07 +0200
Subject: [PATCH 280/474] MAGETWO-31627: Remove proxy for config classes

- fixed unit test
---
 .../ObjectManager/Config/ProxyConfigTest.php  | 115 ------------------
 1 file changed, 115 deletions(-)
 delete mode 100644 dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Config/ProxyConfigTest.php

diff --git a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Config/ProxyConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Config/ProxyConfigTest.php
deleted file mode 100644
index 398bc5c186d4c..0000000000000
--- a/dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Config/ProxyConfigTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-namespace Magento\Framework\ObjectManager\Config;
-
-class ProxyConfigTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var \Magento\Framework\ObjectManager\Config\ProxyConfig
-     */
-    protected $_proxyConfig;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $_config;
-
-    protected function setUp()
-    {
-        $this->_config = $this->getMock('Magento\Framework\ObjectManager\ConfigInterface', [], [], '', false);
-        $this->_proxyConfig = new \Magento\Framework\ObjectManager\Config\ProxyConfig($this->_config);
-    }
-
-    public function testSetRelations()
-    {
-        $relation = $this->getMock('Magento\Framework\ObjectManager\RelationsInterface', [], [], '', false);
-        $this->_config->expects($this->once())
-            ->method('setRelations')
-            ->with($relation);
-        $this->_proxyConfig->setRelations($relation);
-    }
-
-    public function testSetCache()
-    {
-        $configCache = $this->getMock('Magento\Framework\ObjectManager\ConfigCacheInterface', [], [], '', false);
-        $this->_config->expects($this->once())
-            ->method('setCache')
-            ->with($configCache);
-        $this->_proxyConfig->setCache($configCache);
-    }
-
-    public function testGetArguments()
-    {
-        $stringArgs = 'string';
-        $this->_config->expects($this->once())
-            ->method('getArguments')
-            ->with($stringArgs)
-            ->willReturn([]);
-        $this->assertEquals([], $this->_proxyConfig->getArguments($stringArgs));
-    }
-
-    /**
-     * @dataProvider isSharedDataProvider
-     */
-    public function testIsShared($returnValue)
-    {
-        $type = 'string';
-        $this->_config->expects($this->once())
-            ->method('isShared')
-            ->with($type)
-            ->willReturn($returnValue);
-        $this->assertEquals($returnValue, $this->_proxyConfig->isShared($type));
-    }
-
-    /**
-     * @return array
-     */
-    public function isSharedDataProvider()
-    {
-        return [
-            [true],
-            [false]
-        ];
-    }
-
-    public function testGetInstanceType()
-    {
-        $instanceName = 'string';
-        $this->_config->expects($this->once())
-            ->method('getInstanceType')
-            ->with($instanceName)
-            ->willReturn('instanceType');
-        $this->assertEquals('instanceType', $this->_proxyConfig->getInstanceType($instanceName));
-    }
-
-    public function testGetPreference()
-    {
-        $type = 'string';
-        $this->_config->expects($this->once())
-            ->method('getPreference')
-            ->with($type)
-            ->willReturn('someString');
-        $this->assertEquals('someString', $this->_proxyConfig->getPreference($type));
-    }
-
-    public function testExtend()
-    {
-        $this->_config->expects($this->once())
-            ->method('extend')
-            ->with([]);
-        $this->_proxyConfig->extend([]);
-    }
-
-    public function testGetVirtualTypes()
-    {
-        $this->_config->expects($this->once())
-            ->method('getVirtualTypes')
-            ->willReturn([]);
-        $this->assertEquals([], $this->_proxyConfig->getVirtualTypes());
-    }
-}

From d64220063a5322fe01e51cbd6444205269ed8db8 Mon Sep 17 00:00:00 2001
From: Olexii Korshenko <okorshenko@ebay.com>
Date: Thu, 11 Dec 2014 18:47:31 +0200
Subject: [PATCH 281/474] MAGETWO-31637: Customer redirected to 404 after try
 to unsubscribe newsletter

---
 .../unit/testsuite/Magento/Customer/Block/NewsletterTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php
index 3bf183a5df67c..4ddb6f8c5c7ba 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/NewsletterTest.php
@@ -23,7 +23,7 @@ protected function setUp()
         $this->block = $helper->getObject('\Magento\Customer\Block\Newsletter', ['urlBuilder' => $this->urlBuilder]);
     }
 
-    protected function testGetAction()
+    public function testGetAction()
     {
         $this->urlBuilder->expects($this->once())
             ->method('getUrl')

From cc5482639a08bf97ce34d54dbb014e3ea57f57dd Mon Sep 17 00:00:00 2001
From: Michael Logvin <mlogvin@ebay.com>
Date: Thu, 11 Dec 2014 16:47:42 +0000
Subject: [PATCH 282/474] MAGETWO-31660: Js validation for "Zip/Postal" code is
 absent

---
 .../Checkout/view/frontend/templates/onepage/billing.phtml      | 2 +-
 .../Checkout/view/frontend/templates/onepage/shipping.phtml     | 2 +-
 .../view/frontend/templates/checkout/onepage/billing.phtml      | 2 +-
 .../view/frontend/templates/checkout/onepage/shipping.phtml     | 2 +-
 .../view/frontend/templates/customer/address/edit.phtml         | 2 +-
 .../view/frontend/templates/customer/form/register.phtml        | 2 +-
 .../GiftRegistry/view/frontend/templates/address/edit.phtml     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
index 01d7aba771945..e3ba09c0a7c55 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
@@ -98,7 +98,7 @@
         <div class="field zip required">
             <label class="label" for="billing:postcode"><span><?php echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'validate-zip-international':true}"/>
+                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}"/>
             </div>
         </div>
 
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
index ea5e740b61cb6..51efdfcab6edf 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
@@ -67,7 +67,7 @@
         <div class="field zip required">
             <label class="label" for="shipping:postcode"><span><?php echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" />
+                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}" />
             </div>
         </div>
         <div class="field country required">
diff --git a/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/checkout/onepage/billing.phtml b/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/checkout/onepage/billing.phtml
index b5d8c016bde3e..331a7f28128a9 100644
--- a/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/checkout/onepage/billing.phtml
+++ b/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/checkout/onepage/billing.phtml
@@ -85,7 +85,7 @@
         <div class="field zip required">
             <label class="label" for="billing:postcode"><span><?php echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'validate-zip-international':true}"/>
+                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}"/>
             </div>
         </div>
 
diff --git a/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/checkout/onepage/shipping.phtml b/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/checkout/onepage/shipping.phtml
index c4c88ab43ee92..52bf6d3055c10 100644
--- a/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/checkout/onepage/shipping.phtml
+++ b/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/checkout/onepage/shipping.phtml
@@ -67,7 +67,7 @@
         <div class="field zip required">
             <label class="label" for="shipping:postcode"><span><?php echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>"/>
+                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}"/>
             </div>
         </div>
         <div class="field country required">
diff --git a/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/customer/address/edit.phtml b/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/customer/address/edit.phtml
index 5a18abb763728..a64a47f3fa4d9 100644
--- a/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/customer/address/edit.phtml
+++ b/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/customer/address/edit.phtml
@@ -85,7 +85,7 @@
         <div class="field zip required">
             <label class="label" for="zip"><span><?php echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>"/>
+                <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}"/>
             </div>
         </div>
         <div class="field country required">
diff --git a/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/customer/form/register.phtml b/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/customer/form/register.phtml
index ceea8fa68fccf..d2275ff1b0c91 100644
--- a/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/customer/form/register.phtml
+++ b/app/code/Magento/CustomerCustomAttributes/view/frontend/templates/customer/form/register.phtml
@@ -117,7 +117,7 @@
         <div class="field zip required">
             <label for="zip" class="label"><span><?php echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>"/>
+                <input type="text" name="postcode" value="<?php echo $this->escapeHtml($this->getFormData()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}"/>
             </div>
         </div>
 
diff --git a/app/code/Magento/GiftRegistry/view/frontend/templates/address/edit.phtml b/app/code/Magento/GiftRegistry/view/frontend/templates/address/edit.phtml
index a287de5048c8a..564f7db05e180 100644
--- a/app/code/Magento/GiftRegistry/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/GiftRegistry/view/frontend/templates/address/edit.phtml
@@ -73,7 +73,7 @@
         <div class="field address postcode required">
             <label for="address:postcode" class="label"><span><?php echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="address[postcode]" id="address:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>"/>
+                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="address[postcode]" id="address:postcode" value="<?php echo $this->escapeHtml($this->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}"/>
             </div>
         </div>
         <div class="field address country required">

From 9725dd8029ba48d2d9036c57464e422bfe238a22 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 11 Dec 2014 18:52:53 +0200
Subject: [PATCH 283/474] MAGETWO-31629: Online payment methods removal for CE
 release

- extra files
---
 dev/build/publication/edition/ee.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/build/publication/edition/ee.txt b/dev/build/publication/edition/ee.txt
index 8bd07df208bec..587e83ad85f94 100644
--- a/dev/build/publication/edition/ee.txt
+++ b/dev/build/publication/edition/ee.txt
@@ -77,6 +77,9 @@ app/design/frontend/Magento/{blank,luma}/Magento_GiftWrapping
 app/design/frontend/Magento/{blank,luma}/Magento_Reward
 app/design/frontend/Magento/{blank,luma}/Magento_Rma
 app/design/frontend/Magento/{blank,luma}/Magento_Invitation
+app/design/frontend/Magento/{black,luma}/Magento_Paypal
+app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_payflowexpress_review.xml
+app/code/Magento/CheckoutAgreements/view/frontend/layout/paypal_express_review.xml
 
 dev/tools/Magento/Tools/SampleData/config/config_ee.php
 dev/tools/Magento/Tools/SampleData/fixtures/GiftCard

From 3a040f3b99bace6f1158cdf30d7a382f2965ca64 Mon Sep 17 00:00:00 2001
From: Richard Bates <rbates@x.com>
Date: Thu, 11 Dec 2014 11:02:46 -0600
Subject: [PATCH 284/474] MAGETWO-3315: Functions _camelize and _underscore
 work incorrect with keys that have digits between '_' symbol  - re-added
 underscores, they are required

---
 app/code/Magento/Paypal/Model/Info.php         | 18 +++++++++---------
 dev/tests/unit/filename                        |  0
 dev/tests/unit/filename.csv                    |  0
 dev/tests/unit/filename.invalid_type           |  0
 .../Magento/Paypal/Model/InfoTest.php          |  4 ++--
 .../Model/_files/additional_info_data.php      | 10 +++++-----
 6 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 dev/tests/unit/filename
 create mode 100644 dev/tests/unit/filename.csv
 create mode 100644 dev/tests/unit/filename.invalid_type

diff --git a/app/code/Magento/Paypal/Model/Info.php b/app/code/Magento/Paypal/Model/Info.php
index 62f12475d0dc5..6ba17ac8da075 100644
--- a/app/code/Magento/Paypal/Model/Info.php
+++ b/app/code/Magento/Paypal/Model/Info.php
@@ -36,7 +36,7 @@ class Info
 
     const AVS_CODE = 'avs_result';
 
-    const CVV2_MATCH = 'cvv2_check_result';
+    const CVV_2_MATCH = 'cvv_2_check_result';
 
     const CENTINEL_VPAS = 'centinel_vpas_result';
 
@@ -81,7 +81,7 @@ class Info
         self::FRAUD_FILTERS => self::PAYPAL_FRAUD_FILTERS,
         self::CORRELATION_ID => self::PAYPAL_CORRELATION_ID,
         self::AVS_CODE => self::PAYPAL_AVS_CODE,
-        self::CVV2_MATCH => self::PAYPAL_CVV2_MATCH,
+        self::CVV_2_MATCH => self::PAYPAL_CVV_2_MATCH,
         self::CENTINEL_VPAS => self::CENTINEL_VPAS,
         self::CENTINEL_ECI => self::CENTINEL_ECI,
         self::BUYER_TAX_ID => self::BUYER_TAX_ID,
@@ -223,7 +223,7 @@ class Info
     /**
      * Paypal cvv2 code key
      */
-    const PAYPAL_CVV2_MATCH = 'paypal_cvv2_match';
+    const PAYPAL_CVV_2_MATCH = 'paypal_cvv_2_match';
 
     /**
      * Item labels key for label codes cache
@@ -565,7 +565,7 @@ protected function _getLabel($key)
                 self::PAYPAL_FRAUD_FILTERS => __('Triggered Fraud Filters'),
                 self::PAYPAL_CORRELATION_ID => __('Last Correlation ID'),
                 self::PAYPAL_AVS_CODE => __('Address Verification System Response'),
-                self::PAYPAL_CVV2_MATCH => __('CVV2 Check Result by PayPal'),
+                self::PAYPAL_CVV_2_MATCH => __('CVV2 Check Result by PayPal'),
                 self::BUYER_TAX_ID => __('Buyer\'s Tax ID'),
                 self::BUYER_TAX_ID_TYPE => __('Buyer\'s Tax ID Type'),
                 self::CENTINEL_VPAS => __('PayPal/Centinel Visa Payer Authentication Service Result'),
@@ -608,7 +608,7 @@ protected function _getValue($value, $key)
             case self::PAYPAL_AVS_CODE:
                 $label = $this->_getAvsLabel($value);
                 break;
-            case self::PAYPAL_CVV2_MATCH:
+            case self::PAYPAL_CVV_2_MATCH:
                 $label = $this->_getCvv2Label($value);
                 break;
             case self::CENTINEL_VPAS:
@@ -682,8 +682,8 @@ protected function _getAvsLabel($value)
      */
     protected function _getCvv2Label($value)
     {
-        if (!isset($this->_labelCodesCache[self::PAYPAL_CVV2_MATCH])) {
-            $this->_labelCodesCache[self::PAYPAL_CVV2_MATCH] = [
+        if (!isset($this->_labelCodesCache[self::PAYPAL_CVV_2_MATCH])) {
+            $this->_labelCodesCache[self::PAYPAL_CVV_2_MATCH] = [
                 // Visa, MasterCard, Discover and American Express
                 'M' => __('Matched (CVV2CSC)'),
                 'N' => __('No match'),
@@ -699,8 +699,8 @@ protected function _getCvv2Label($value)
                 '4' => __('N/A. Service not available'),
             ];
         }
-        return isset($this->_labelCodesCache[self::PAYPAL_CVV2_MATCH][$value])
-            ? $this->_labelCodesCache[self::PAYPAL_CVV2_MATCH][$value]
+        return isset($this->_labelCodesCache[self::PAYPAL_CVV_2_MATCH][$value])
+            ? $this->_labelCodesCache[self::PAYPAL_CVV_2_MATCH][$value]
             : $value;
     }
 
diff --git a/dev/tests/unit/filename b/dev/tests/unit/filename
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/dev/tests/unit/filename.csv b/dev/tests/unit/filename.csv
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/dev/tests/unit/filename.invalid_type b/dev/tests/unit/filename.invalid_type
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php b/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php
index ab8a17485a2bd..0dc9087bc7751 100644
--- a/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Paypal/Model/InfoTest.php
@@ -223,7 +223,7 @@ public function importToPaymentDataProvider()
                     Info::FRAUD_FILTERS => Info::PAYPAL_FRAUD_FILTERS,
                     Info::CORRELATION_ID => Info::PAYPAL_CORRELATION_ID,
                     Info::AVS_CODE => Info::PAYPAL_AVS_CODE,
-                    Info::CVV2_MATCH => Info::PAYPAL_CVV2_MATCH,
+                    Info::CVV_2_MATCH => Info::PAYPAL_CVV_2_MATCH,
                     Info::CENTINEL_VPAS => Info::CENTINEL_VPAS,
                     Info::CENTINEL_ECI => Info::CENTINEL_ECI,
                     Info::BUYER_TAX_ID => Info::BUYER_TAX_ID,
@@ -242,7 +242,7 @@ public function importToPaymentDataProvider()
                     Info::PAYPAL_FRAUD_FILTERS => Info::PAYPAL_FRAUD_FILTERS,
                     Info::PAYPAL_CORRELATION_ID => Info::PAYPAL_CORRELATION_ID,
                     Info::PAYPAL_AVS_CODE => Info::PAYPAL_AVS_CODE,
-                    Info::PAYPAL_CVV2_MATCH => Info::PAYPAL_CVV2_MATCH,
+                    Info::PAYPAL_CVV_2_MATCH => Info::PAYPAL_CVV_2_MATCH,
                     Info::CENTINEL_VPAS => Info::CENTINEL_VPAS,
                     Info::CENTINEL_ECI => Info::CENTINEL_ECI,
                     Info::BUYER_TAX_ID => Info::BUYER_TAX_ID,
diff --git a/dev/tests/unit/testsuite/Magento/Paypal/Model/_files/additional_info_data.php b/dev/tests/unit/testsuite/Magento/Paypal/Model/_files/additional_info_data.php
index c2a0b075a3bfe..2932fc78dee8a 100644
--- a/dev/tests/unit/testsuite/Magento/Paypal/Model/_files/additional_info_data.php
+++ b/dev/tests/unit/testsuite/Magento/Paypal/Model/_files/additional_info_data.php
@@ -17,7 +17,7 @@
             Info::PAYPAL_CORRELATION_ID => Info::PAYPAL_CORRELATION_ID,
             Info::BUYER_TAX_ID => Info::BUYER_TAX_ID,
             Info::PAYPAL_AVS_CODE => 'A',
-            Info::PAYPAL_CVV2_MATCH => 'M',
+            Info::PAYPAL_CVV_2_MATCH => 'M',
             Info::BUYER_TAX_ID_TYPE => Info::BUYER_TAX_ID_TYPE_CNPJ,
             Info::CENTINEL_VPAS => '2',
             Info::CENTINEL_ECI => '01',
@@ -59,7 +59,7 @@
                 'label' => 'Address Verification System Response',
                 'value' => '#A: Matched Address only (no ZIP)',
             ],
-            Info::PAYPAL_CVV2_MATCH => [
+            Info::PAYPAL_CVV_2_MATCH => [
                 'label' => 'CVV2 Check Result by PayPal',
                 'value' => '#M: Matched (CVV2CSC)',
             ],
@@ -97,7 +97,7 @@
             Info::PAYPAL_CORRELATION_ID => Info::PAYPAL_CORRELATION_ID,
             Info::BUYER_TAX_ID => Info::BUYER_TAX_ID,
             Info::PAYPAL_AVS_CODE => Info::PAYPAL_AVS_CODE,
-            Info::PAYPAL_CVV2_MATCH => Info::PAYPAL_CVV2_MATCH,
+            Info::PAYPAL_CVV_2_MATCH => Info::PAYPAL_CVV_2_MATCH,
             Info::BUYER_TAX_ID_TYPE => Info::BUYER_TAX_ID_TYPE,
             Info::CENTINEL_VPAS => Info::CENTINEL_VPAS,
             Info::CENTINEL_ECI => Info::CENTINEL_ECI,
@@ -139,9 +139,9 @@
                 'label' => 'Address Verification System Response',
                 'value' => '#paypal_avs_code',
             ],
-            Info::PAYPAL_CVV2_MATCH => [
+            Info::PAYPAL_CVV_2_MATCH => [
                 'label' => 'CVV2 Check Result by PayPal',
-                'value' => '#paypal_cvv2_match',
+                'value' => '#paypal_cvv_2_match',
             ],
             Info::CENTINEL_VPAS => [
                 'label' => 'PayPal/Centinel Visa Payer Authentication Service Result',

From 41ec0c279a9e05d842362333ef0f94905223d1bb Mon Sep 17 00:00:00 2001
From: Arkadii Chyzhov <achyzhov@ebay.com>
Date: Thu, 11 Dec 2014 19:06:23 +0200
Subject: [PATCH 285/474] MAGETWO-31708: Merge Core sql scripts and rename file
 with suffix 2.0.0

---
 .../data/core_setup/data-install-2.0.0.php    |  79 ++
 .../data-upgrade-1.6.0.10-1.6.0.11.php        |  23 -
 .../data-upgrade-1.6.0.12-1.6.0.13.php        |  22 -
 .../data-upgrade-1.6.0.3-1.6.0.4.php          |  29 -
 .../data-upgrade-1.6.0.4-1.6.0.5.php          |  22 -
 .../data-upgrade-1.6.0.5-1.6.0.6.php          |  17 -
 app/code/Magento/Core/etc/module.xml          |   2 +-
 .../Core/sql/core_setup/install-1.6.0.0.php   | 510 ----------
 .../Core/sql/core_setup/install-2.0.0.php     | 955 ++++++++++++++++++
 .../core_setup/upgrade-1.6.0.1-1.6.0.2.php    |  19 -
 .../core_setup/upgrade-1.6.0.10-1.6.0.11.php  |  37 -
 .../core_setup/upgrade-1.6.0.11-1.6.0.12.php  | 130 ---
 .../core_setup/upgrade-1.6.0.12-1.6.0.13.php  |  19 -
 .../core_setup/upgrade-1.6.0.13-1.6.0.14.php  |  11 -
 .../core_setup/upgrade-1.6.0.14-1.6.0.15.php  |  20 -
 .../core_setup/upgrade-1.6.0.3-1.6.0.4.php    |  79 --
 .../core_setup/upgrade-1.6.0.5-1.6.0.6.php    |  95 --
 .../core_setup/upgrade-1.6.0.6-1.6.0.7.php    |  81 --
 .../core_setup/upgrade-1.6.0.7-1.6.0.8.php    |  24 -
 .../core_setup/upgrade-1.6.0.8-1.6.0.9.php    |  69 --
 .../core_setup/upgrade-1.6.0.9-1.6.0.10.php   |  81 --
 21 files changed, 1035 insertions(+), 1289 deletions(-)
 create mode 100644 app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
 delete mode 100644 app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.10-1.6.0.11.php
 delete mode 100644 app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.12-1.6.0.13.php
 delete mode 100644 app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.3-1.6.0.4.php
 delete mode 100644 app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.4-1.6.0.5.php
 delete mode 100644 app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.5-1.6.0.6.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/install-1.6.0.0.php
 create mode 100644 app/code/Magento/Core/sql/core_setup/install-2.0.0.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.11-1.6.0.12.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.12-1.6.0.13.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.13-1.6.0.14.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.14-1.6.0.15.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.php
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.php

diff --git a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
new file mode 100644
index 0000000000000..b0626addfb93b
--- /dev/null
+++ b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+/** @var $this \Magento\Core\Model\Resource\Setup */
+$installer = $this->createMigrationSetup();
+$installer->startSetup();
+
+$installer->appendClassAliasReplace(
+    'core_config_data',
+    'value',
+    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
+    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
+    array('config_id')
+);
+$installer->appendClassAliasReplace(
+    'core_layout_update',
+    'xml',
+    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
+    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
+    array('layout_update_id')
+);
+$installer->doUpdateClassAliases();
+
+/**
+ * Delete rows by condition from authorization_rule
+ */
+$tableName = $installer->getTable('authorization_rule');
+if ($tableName) {
+    $installer->getConnection()->delete($tableName, array('resource_id = ?' => 'admin/system/tools/compiler'));
+}
+
+/**
+ * Delete rows by condition from core_resource
+ */
+$tableName = $installer->getTable('core_resource');
+if ($tableName) {
+    $installer->getConnection()->delete($tableName, array('code = ?' => 'admin_setup'));
+}
+
+/**
+ * Update rows in core_theme
+ */
+$installer->getConnection()->update(
+    $installer->getTable('core_theme'),
+    array('area' => 'frontend'), array('area = ?' => '')
+);
+
+/**
+ * Update theme's data
+ */
+$fileCollection = $this->createThemeFactory();
+$fileCollection->addDefaultPattern('*');
+$fileCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
+
+$resourceCollection = $this->createThemeResourceFactory();
+$resourceCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
+
+/** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+foreach ($resourceCollection as $theme) {
+    $themeType = $fileCollection->hasTheme($theme)
+        ? \Magento\Framework\View\Design\ThemeInterface::TYPE_PHYSICAL
+        : \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL;
+    $theme->setType($themeType)->save();
+}
+
+/** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+foreach ($fileCollection as $theme) {
+    $dbTheme = $themeDbCollection->getThemeByFullPath($theme->getFullPath());
+    $dbTheme->setCode($theme->getCode());
+    $dbTheme->save();
+}
+
+$installer->endSetup();
+$installer->getEventManager()->dispatch('theme_registration_from_filesystem');
diff --git a/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.10-1.6.0.11.php b/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.10-1.6.0.11.php
deleted file mode 100644
index 0b837cc13f593..0000000000000
--- a/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.10-1.6.0.11.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/** @var $this \Magento\Core\Model\Resource\Setup */
-
-$fileCollection = $this->createThemeFactory();
-$fileCollection->addDefaultPattern('*');
-$fileCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
-
-$resourceCollection = $this->createThemeResourceFactory();
-$resourceCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
-/** @var $theme \Magento\Framework\View\Design\ThemeInterface */
-foreach ($resourceCollection as $theme) {
-    $themeType = $fileCollection->hasTheme($theme)
-        ? \Magento\Framework\View\Design\ThemeInterface::TYPE_PHYSICAL
-        : \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL;
-    $theme->setType($themeType)->save();
-}
diff --git a/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.12-1.6.0.13.php b/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.12-1.6.0.13.php
deleted file mode 100644
index 34077329f1adc..0000000000000
--- a/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.12-1.6.0.13.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/** @var $this \Magento\Core\Model\Resource\Setup */
-$fileCollection = $this->createThemeFactory();
-$fileCollection->addDefaultPattern('*');
-$fileCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
-
-$themeDbCollection = $this->createThemeResourceFactory();
-$themeDbCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
-
-/** @var $theme \Magento\Framework\View\Design\ThemeInterface */
-foreach ($fileCollection as $theme) {
-    $dbTheme = $themeDbCollection->getThemeByFullPath($theme->getFullPath());
-    $dbTheme->setCode($theme->getCode());
-    $dbTheme->save();
-}
diff --git a/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.3-1.6.0.4.php b/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.3-1.6.0.4.php
deleted file mode 100644
index c3650ba80fdd8..0000000000000
--- a/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.3-1.6.0.4.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/** @var $this \Magento\Core\Model\Resource\Setup */
-$installer = $this->createMigrationSetup();
-$installer->startSetup();
-
-$installer->appendClassAliasReplace(
-    'core_config_data',
-    'value',
-    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_MODEL,
-    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
-    array('config_id')
-);
-$installer->appendClassAliasReplace(
-    'core_layout_update',
-    'xml',
-    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
-    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
-    array('layout_update_id')
-);
-$installer->doUpdateClassAliases();
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.4-1.6.0.5.php b/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.4-1.6.0.5.php
deleted file mode 100644
index 6862fdc281b04..0000000000000
--- a/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.4-1.6.0.5.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/** @var $installer \Magento\Core\Model\Resource\Setup */
-$installer = $this;
-$installer->startSetup();
-
-$tableName = $installer->getTable('authorization_rule');
-if ($tableName) {
-    $installer->getConnection()->delete($tableName, array('resource_id = ?' => 'admin/system/tools/compiler'));
-}
-$tableName = $installer->getTable('core_resource');
-if ($tableName) {
-    $installer->getConnection()->delete($tableName, array('code = ?' => 'admin_setup'));
-}
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.5-1.6.0.6.php b/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.5-1.6.0.6.php
deleted file mode 100644
index 32c5a34aab6c4..0000000000000
--- a/app/code/Magento/Core/data/core_setup/data-upgrade-1.6.0.5-1.6.0.6.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/** @var $installer \Magento\Core\Model\Resource\Setup */
-$installer = $this;
-$installer->startSetup();
-
-$connection = $installer->getConnection();
-$connection->update($installer->getTable('core_theme'), array('area' => 'frontend'), array('area = ?' => ''));
-
-$installer->endSetup();
-$installer->getEventManager()->dispatch('theme_registration_from_filesystem');
diff --git a/app/code/Magento/Core/etc/module.xml b/app/code/Magento/Core/etc/module.xml
index e12ab17008bd8..94bdb15bc9bcb 100644
--- a/app/code/Magento/Core/etc/module.xml
+++ b/app/code/Magento/Core/etc/module.xml
@@ -8,6 +8,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Magento_Core" schema_version="1.6.0.16">
+    <module name="Magento_Core" schema_version="2.0.0">
     </module>
 </config>
diff --git a/app/code/Magento/Core/sql/core_setup/install-1.6.0.0.php b/app/code/Magento/Core/sql/core_setup/install-1.6.0.0.php
deleted file mode 100644
index de2e64ea5ad0b..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/install-1.6.0.0.php
+++ /dev/null
@@ -1,510 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-
-/**
- * Create table 'core_resource'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_resource')
-)->addColumn(
-    'code',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    50,
-    array('nullable' => false, 'primary' => true),
-    'Resource Code'
-)->addColumn(
-    'version',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    50,
-    array(),
-    'Resource Version'
-)->addColumn(
-    'data_version',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    50,
-    array(),
-    'Data Version'
-)->setComment(
-    'Resources'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'core_config_data'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_config_data')
-)->addColumn(
-    'config_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
-    'Config Id'
-)->addColumn(
-    'scope',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    8,
-    array('nullable' => false, 'default' => 'default'),
-    'Config Scope'
-)->addColumn(
-    'scope_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('nullable' => false, 'default' => '0'),
-    'Config Scope Id'
-)->addColumn(
-    'path',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array('nullable' => false, 'default' => 'general'),
-    'Config Path'
-)->addColumn(
-    'value',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    '64k',
-    array(),
-    'Config Value'
-)->addIndex(
-    $installer->getIdxName(
-        'core_config_data',
-        array('scope', 'scope_id', 'path'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    array('scope', 'scope_id', 'path'),
-    array('type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE)
-)->setComment(
-    'Config Data'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'core_layout_update'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_layout_update')
-)->addColumn(
-    'layout_update_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
-    'Layout Update Id'
-)->addColumn(
-    'handle',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array(),
-    'Handle'
-)->addColumn(
-    'xml',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    '64k',
-    array(),
-    'Xml'
-)->addColumn(
-    'sort_order',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    array('nullable' => false, 'default' => '0'),
-    'Sort Order'
-)->addIndex(
-    $installer->getIdxName('core_layout_update', array('handle')),
-    array('handle')
-)->setComment(
-    'Layout Updates'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'core_layout_link'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_layout_link')
-)->addColumn(
-    'layout_link_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
-    'Link Id'
-)->addColumn(
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
-    'Store Id'
-)->addColumn(
-    'area',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    64,
-    array(),
-    'Area'
-)->addColumn(
-    'package',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    64,
-    array(),
-    'Package'
-)->addColumn(
-    'theme',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    64,
-    array(),
-    'Theme'
-)->addColumn(
-    'layout_update_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
-    'Layout Update Id'
-)->addIndex(
-    $installer->getIdxName(
-        'core_layout_link',
-        array('store_id', 'package', 'theme', 'layout_update_id'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    array('store_id', 'package', 'theme', 'layout_update_id'),
-    array('type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE)
-)->addIndex(
-    $installer->getIdxName('core_layout_link', array('layout_update_id')),
-    array('layout_update_id')
-)->addForeignKey(
-    $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id'),
-    'store_id',
-    $installer->getTable('store'),
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->addForeignKey(
-    $installer->getFkName('core_layout_link', 'layout_update_id', 'core_layout_update', 'layout_update_id'),
-    'layout_update_id',
-    $installer->getTable('core_layout_update'),
-    'layout_update_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->setComment(
-    'Layout Link'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'core_session'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_session')
-)->addColumn(
-    'session_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array('nullable' => false, 'primary' => true),
-    'Session Id'
-)->addColumn(
-    'session_expires',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
-    'Date of Session Expiration'
-)->addColumn(
-    'session_data',
-    \Magento\Framework\DB\Ddl\Table::TYPE_BLOB,
-    '2M',
-    array('nullable' => false),
-    'Session Data'
-)->setComment(
-    'Database Sessions Storage'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'design_change'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('design_change')
-)->addColumn(
-    'design_change_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'nullable' => false, 'primary' => true),
-    'Design Change Id'
-)->addColumn(
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
-    'Store Id'
-)->addColumn(
-    'design',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array(),
-    'Design'
-)->addColumn(
-    'date_from',
-    \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-    null,
-    array(),
-    'First Date of Design Activity'
-)->addColumn(
-    'date_to',
-    \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
-    null,
-    array(),
-    'Last Date of Design Activity'
-)->addIndex(
-    $installer->getIdxName('design_change', array('store_id')),
-    array('store_id')
-)->addForeignKey(
-    $installer->getFkName('design_change', 'store_id', 'store', 'store_id'),
-    'store_id',
-    $installer->getTable('store'),
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->setComment(
-    'Design Changes'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'core_variable'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_variable')
-)->addColumn(
-    'variable_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
-    'Variable Id'
-)->addColumn(
-    'code',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array(),
-    'Variable Code'
-)->addColumn(
-    'name',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array(),
-    'Variable Name'
-)->addIndex(
-    $installer->getIdxName(
-        'core_variable',
-        array('code'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    array('code'),
-    array('type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE)
-)->setComment(
-    'Variables'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'core_variable_value'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_variable_value')
-)->addColumn(
-    'value_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
-    'Variable Value Id'
-)->addColumn(
-    'variable_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
-    'Variable Id'
-)->addColumn(
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
-    'Store Id'
-)->addColumn(
-    'plain_value',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    '64k',
-    array(),
-    'Plain Text Value'
-)->addColumn(
-    'html_value',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    '64k',
-    array(),
-    'Html Value'
-)->addIndex(
-    $installer->getIdxName(
-        'core_variable_value',
-        array('variable_id', 'store_id'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    array('variable_id', 'store_id'),
-    array('type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE)
-)->addIndex(
-    $installer->getIdxName('core_variable_value', array('store_id')),
-    array('store_id')
-)->addForeignKey(
-    $installer->getFkName('core_variable_value', 'store_id', 'store', 'store_id'),
-    'store_id',
-    $installer->getTable('store'),
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->addForeignKey(
-    $installer->getFkName('core_variable_value', 'variable_id', 'core_variable', 'variable_id'),
-    'variable_id',
-    $installer->getTable('core_variable'),
-    'variable_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->setComment(
-    'Variable Value'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'core_cache'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_cache')
-)->addColumn(
-    'id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    200,
-    array('nullable' => false, 'primary' => true),
-    'Cache Id'
-)->addColumn(
-    'data',
-    \Magento\Framework\DB\Ddl\Table::TYPE_BLOB,
-    '2M',
-    array(),
-    'Cache Data'
-)->addColumn(
-    'create_time',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array(),
-    'Cache Creation Time'
-)->addColumn(
-    'update_time',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array(),
-    'Time of Cache Updating'
-)->addColumn(
-    'expire_time',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array(),
-    'Cache Expiration Time'
-)->addIndex(
-    $installer->getIdxName('core_cache', array('expire_time')),
-    array('expire_time')
-)->setComment(
-    'Caches'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'core_cache_tag'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_cache_tag')
-)->addColumn(
-    'tag',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    100,
-    array('nullable' => false, 'primary' => true),
-    'Tag'
-)->addColumn(
-    'cache_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    200,
-    array('nullable' => false, 'primary' => true),
-    'Cache Id'
-)->addIndex(
-    $installer->getIdxName('core_cache_tag', array('cache_id')),
-    array('cache_id')
-)->setComment(
-    'Tag Caches'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'core_cache_option'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_cache_option')
-)->addColumn(
-    'code',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    32,
-    array('nullable' => false, 'primary' => true),
-    'Code'
-)->addColumn(
-    'value',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    array(),
-    'Value'
-)->setComment(
-    'Cache Options'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Create table 'core_flag'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_flag')
-)->addColumn(
-    'flag_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
-    'Flag Id'
-)->addColumn(
-    'flag_code',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array('nullable' => false),
-    'Flag Code'
-)->addColumn(
-    'state',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
-    'Flag State'
-)->addColumn(
-    'flag_data',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    '64k',
-    array(),
-    'Flag Data'
-)->addColumn(
-    'last_update',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-    null,
-    array('nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE),
-    'Date of Last Flag Update'
-)->addIndex(
-    $installer->getIdxName('core_flag', array('last_update')),
-    array('last_update')
-)->setComment(
-    'Flag'
-);
-$installer->getConnection()->createTable($table);
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
new file mode 100644
index 0000000000000..40bd12f12534f
--- /dev/null
+++ b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
@@ -0,0 +1,955 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+/* @var $installer \Magento\Setup\Module\SetupModule */
+$installer = $this;
+
+/* @var $connection \Magento\Framework\DB\Adapter\AdapterInterface */
+$connection = $installer->getConnection();
+
+$installer->startSetup();
+
+/**
+ * Create table 'core_resource'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_resource')
+)->addColumn(
+    'code',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    50,
+    array('nullable' => false, 'primary' => true),
+    'Resource Code'
+)->addColumn(
+    'version',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    50,
+    array(),
+    'Resource Version'
+)->addColumn(
+    'data_version',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    50,
+    array(),
+    'Data Version'
+)->setComment(
+    'Resources'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'core_config_data'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_config_data')
+)->addColumn(
+    'config_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
+    'Config Id'
+)->addColumn(
+    'scope',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    8,
+    array('nullable' => false, 'default' => 'default'),
+    'Config Scope'
+)->addColumn(
+    'scope_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('nullable' => false, 'default' => '0'),
+    'Config Scope Id'
+)->addColumn(
+    'path',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array('nullable' => false, 'default' => 'general'),
+    'Config Path'
+)->addColumn(
+    'value',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    '64k',
+    array(),
+    'Config Value'
+)->addIndex(
+    $installer->getIdxName(
+        'core_config_data',
+        array('scope', 'scope_id', 'path'),
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+    ),
+    array('scope', 'scope_id', 'path'),
+    array('type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE)
+)->setComment(
+    'Config Data'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'core_layout_update'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_layout_update')
+)->addColumn(
+    'layout_update_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
+    'Layout Update Id'
+)->addColumn(
+    'handle',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array(),
+    'Handle'
+)->addColumn(
+    'xml',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    '64k',
+    array(),
+    'Xml'
+)->addColumn(
+    'sort_order',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
+    array('nullable' => false, 'default' => '0'),
+    'Sort Order'
+)->addIndex(
+    $installer->getIdxName('core_layout_update', array('handle')),
+    array('handle')
+)->setComment(
+    'Layout Updates'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'core_layout_link'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_layout_link')
+)->addColumn(
+    'layout_link_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
+    'Link Id'
+)->addColumn(
+    'store_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
+    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
+    'Store Id'
+)->addColumn(
+    'area',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    64,
+    array(),
+    'Area'
+)->addColumn(
+    'package',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    64,
+    array(),
+    'Package'
+)->addColumn(
+    'theme',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    64,
+    array(),
+    'Theme'
+)->addColumn(
+    'layout_update_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
+    'Layout Update Id'
+)->addIndex(
+    $installer->getIdxName(
+        'core_layout_link',
+        array('store_id', 'package', 'theme', 'layout_update_id'),
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+    ),
+    array('store_id', 'package', 'theme', 'layout_update_id'),
+    array('type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE)
+)->addIndex(
+    $installer->getIdxName('core_layout_link', array('layout_update_id')),
+    array('layout_update_id')
+)->addForeignKey(
+    $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id'),
+    'store_id',
+    $installer->getTable('store'),
+    'store_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->addForeignKey(
+    $installer->getFkName('core_layout_link', 'layout_update_id', 'core_layout_update', 'layout_update_id'),
+    'layout_update_id',
+    $installer->getTable('core_layout_update'),
+    'layout_update_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->setComment(
+    'Layout Link'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'core_session'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_session')
+)->addColumn(
+    'session_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array('nullable' => false, 'primary' => true),
+    'Session Id'
+)->addColumn(
+    'session_expires',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
+    'Date of Session Expiration'
+)->addColumn(
+    'session_data',
+    \Magento\Framework\DB\Ddl\Table::TYPE_BLOB,
+    '2M',
+    array('nullable' => false),
+    'Session Data'
+)->setComment(
+    'Database Sessions Storage'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'design_change'
+ */
+$table = $connection->newTable(
+    $installer->getTable('design_change')
+)->addColumn(
+    'design_change_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('identity' => true, 'nullable' => false, 'primary' => true),
+    'Design Change Id'
+)->addColumn(
+    'store_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
+    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
+    'Store Id'
+)->addColumn(
+    'design',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array(),
+    'Design'
+)->addColumn(
+    'date_from',
+    \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
+    null,
+    array(),
+    'First Date of Design Activity'
+)->addColumn(
+    'date_to',
+    \Magento\Framework\DB\Ddl\Table::TYPE_DATE,
+    null,
+    array(),
+    'Last Date of Design Activity'
+)->addIndex(
+    $installer->getIdxName('design_change', array('store_id')),
+    array('store_id')
+)->addForeignKey(
+    $installer->getFkName('design_change', 'store_id', 'store', 'store_id'),
+    'store_id',
+    $installer->getTable('store'),
+    'store_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->setComment(
+    'Design Changes'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'core_variable'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_variable')
+)->addColumn(
+    'variable_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
+    'Variable Id'
+)->addColumn(
+    'code',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array(),
+    'Variable Code'
+)->addColumn(
+    'name',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array(),
+    'Variable Name'
+)->addIndex(
+    $installer->getIdxName(
+        'core_variable',
+        array('code'),
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+    ),
+    array('code'),
+    array('type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE)
+)->setComment(
+    'Variables'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'core_variable_value'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_variable_value')
+)->addColumn(
+    'value_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
+    'Variable Value Id'
+)->addColumn(
+    'variable_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
+    'Variable Id'
+)->addColumn(
+    'store_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
+    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
+    'Store Id'
+)->addColumn(
+    'plain_value',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    '64k',
+    array(),
+    'Plain Text Value'
+)->addColumn(
+    'html_value',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    '64k',
+    array(),
+    'Html Value'
+)->addIndex(
+    $installer->getIdxName(
+        'core_variable_value',
+        array('variable_id', 'store_id'),
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+    ),
+    array('variable_id', 'store_id'),
+    array('type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE)
+)->addIndex(
+    $installer->getIdxName('core_variable_value', array('store_id')),
+    array('store_id')
+)->addForeignKey(
+    $installer->getFkName('core_variable_value', 'store_id', 'store', 'store_id'),
+    'store_id',
+    $installer->getTable('store'),
+    'store_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->addForeignKey(
+    $installer->getFkName('core_variable_value', 'variable_id', 'core_variable', 'variable_id'),
+    'variable_id',
+    $installer->getTable('core_variable'),
+    'variable_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->setComment(
+    'Variable Value'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'core_cache'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_cache')
+)->addColumn(
+    'id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    200,
+    array('nullable' => false, 'primary' => true),
+    'Cache Id'
+)->addColumn(
+    'data',
+    \Magento\Framework\DB\Ddl\Table::TYPE_BLOB,
+    '2M',
+    array(),
+    'Cache Data'
+)->addColumn(
+    'create_time',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array(),
+    'Cache Creation Time'
+)->addColumn(
+    'update_time',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array(),
+    'Time of Cache Updating'
+)->addColumn(
+    'expire_time',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array(),
+    'Cache Expiration Time'
+)->addIndex(
+    $installer->getIdxName('core_cache', array('expire_time')),
+    array('expire_time')
+)->setComment(
+    'Caches'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'core_cache_tag'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_cache_tag')
+)->addColumn(
+    'tag',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    100,
+    array('nullable' => false, 'primary' => true),
+    'Tag'
+)->addColumn(
+    'cache_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    200,
+    array('nullable' => false, 'primary' => true),
+    'Cache Id'
+)->addIndex(
+    $installer->getIdxName('core_cache_tag', array('cache_id')),
+    array('cache_id')
+)->setComment(
+    'Tag Caches'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'core_cache_option'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_cache_option')
+)->addColumn(
+    'code',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    32,
+    array('nullable' => false, 'primary' => true),
+    'Code'
+)->addColumn(
+    'value',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
+    array(),
+    'Value'
+)->setComment(
+    'Cache Options'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'core_flag'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_flag')
+)->addColumn(
+    'flag_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
+    'Flag Id'
+)->addColumn(
+    'flag_code',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array('nullable' => false),
+    'Flag Code'
+)->addColumn(
+    'state',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
+    array('unsigned' => true, 'nullable' => false, 'default' => '0'),
+    'Flag State'
+)->addColumn(
+    'flag_data',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    '64k',
+    array(),
+    'Flag Data'
+)->addColumn(
+    'last_update',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+    null,
+    array('nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE),
+    'Date of Last Flag Update'
+)->addIndex(
+    $installer->getIdxName('core_flag', array('last_update')),
+    array('last_update')
+)->setComment(
+    'Flag'
+);
+$connection->createTable($table);
+
+/**
+ * Drop Foreign Key on core_cache_tag.cache_id
+ */
+$connection->dropForeignKey(
+    $installer->getTable('core_cache_tag'),
+    $installer->getFkName('core_cache_tag', 'cache_id', 'core_cache', 'id')
+);
+
+/**
+ * Create table 'core_theme'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_theme')
+)->addColumn(
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
+    'Theme identifier'
+)->addColumn(
+    'parent_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('nullable' => true),
+    'Parent Id'
+)->addColumn(
+    'theme_path',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array('nullable' => true),
+    'Theme Path'
+)->addColumn(
+    'theme_version',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array('nullable' => false),
+    'Theme Version'
+)->addColumn(
+    'theme_title',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array('nullable' => false),
+    'Theme Title'
+)->addColumn(
+    'preview_image',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array('nullable' => true),
+    'Preview Image'
+)->addColumn(
+    'magento_version_from',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array('nullable' => false),
+    'Magento Version From'
+)->addColumn(
+    'magento_version_to',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array('nullable' => false),
+    'Magento Version To'
+)->addColumn(
+    'is_featured',
+    \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+    null,
+    array('nullable' => false, 'default' => 0),
+    'Is Theme Featured'
+)->setComment(
+    'Core theme'
+);
+$connection->createTable($table);
+
+/**
+ * Modifying 'core_layout_link' table. Replace columns area, package, theme to theme_id
+ */
+$tableCoreLayoutLink = $installer->getTable('core_layout_link');
+
+$connection->dropForeignKey(
+    $tableCoreLayoutLink,
+    $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id')
+);
+
+$connection->dropIndex(
+    $tableCoreLayoutLink,
+    $installer->getIdxName(
+        'core_layout_link',
+        array('store_id', 'package', 'theme', 'layout_update_id'),
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+    )
+);
+
+$connection->dropColumn($tableCoreLayoutLink, 'area');
+
+$connection->dropColumn($tableCoreLayoutLink, 'package');
+
+$connection->changeColumn(
+    $tableCoreLayoutLink,
+    'theme',
+    'theme_id',
+    array(
+        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+        'unsigned' => true,
+        'nullable' => false,
+        'comment' => 'Theme id'
+    )
+);
+
+$connection->addIndex(
+    $tableCoreLayoutLink,
+    $installer->getIdxName(
+        'core_layout_link',
+        array('store_id', 'theme_id', 'layout_update_id'),
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+    ),
+    array('store_id', 'theme_id', 'layout_update_id'),
+    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+);
+
+$connection->addForeignKey(
+    $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id'),
+    $tableCoreLayoutLink,
+    'store_id',
+    $installer->getTable('store'),
+    'store_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+);
+
+$connection->addForeignKey(
+    $installer->getFkName('core_layout_link', 'theme_id', 'core_theme', 'theme_id'),
+    $tableCoreLayoutLink,
+    'theme_id',
+    $installer->getTable('core_theme'),
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+);
+
+/**
+ * Add column 'area' to 'core_theme'
+ */
+$connection->addColumn(
+    $installer->getTable('core_theme'),
+    'area',
+    array(
+        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+        'length' => '255',
+        'nullable' => false,
+        'comment' => 'Theme Area'
+    )
+);
+
+/**
+ * Modifying 'core_layout_link' table. Adding 'is_temporary' column
+ */
+$tableCoreLayoutLink = $installer->getTable('core_layout_link');
+
+$connection->addColumn(
+    $tableCoreLayoutLink,
+    'is_temporary',
+    array(
+        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+        'nullable' => false,
+        'default' => '0',
+        'comment' => 'Defines whether Layout Update is Temporary'
+    )
+);
+
+// we must drop next 2 foreign keys to have an ability to drop index
+$connection->dropForeignKey(
+    $tableCoreLayoutLink,
+    $installer->getFkName($tableCoreLayoutLink, 'store_id', 'store', 'store_id')
+);
+$connection->dropForeignKey(
+    $tableCoreLayoutLink,
+    $installer->getFkName($tableCoreLayoutLink, 'theme_id', 'core_theme', 'theme_id')
+);
+
+$connection->dropIndex(
+    $tableCoreLayoutLink,
+    $installer->getIdxName(
+        $tableCoreLayoutLink,
+        array('store_id', 'theme_id', 'layout_update_id'),
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+    )
+);
+
+$connection->addIndex(
+    $tableCoreLayoutLink,
+    $installer->getIdxName(
+        $tableCoreLayoutLink,
+        array('store_id', 'theme_id', 'layout_update_id', 'is_temporary'),
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+    ),
+    array('store_id', 'theme_id', 'layout_update_id', 'is_temporary'),
+    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+);
+
+// recreate 2 dropped foreign keys to have an ability to drop index
+$connection->addForeignKey(
+    $installer->getFkName($tableCoreLayoutLink, 'store_id', 'store', 'store_id'),
+    $tableCoreLayoutLink,
+    'store_id',
+    $installer->getTable('store'),
+    'store_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+);
+$connection->addForeignKey(
+    $installer->getFkName($tableCoreLayoutLink, 'theme_id', 'core_theme', 'theme_id'),
+    $tableCoreLayoutLink,
+    'theme_id',
+    $installer->getTable('core_theme'),
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+);
+
+/**
+ * Add column 'updated_at' to 'core_layout_update'
+ */
+$connection->addColumn(
+    $installer->getTable('core_layout_update'),
+    'updated_at',
+    array(
+        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+        'nullable' => true,
+        'comment' => 'Last Update Timestamp'
+    )
+);
+
+/**
+ * Create table 'core_theme_files'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_theme_files')
+)->addColumn(
+    'theme_files_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
+    'Theme files identifier'
+)->addColumn(
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('nullable' => false, 'unsigned' => true),
+    'Theme Id'
+)->addColumn(
+    'file_name',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    array('nullable' => false),
+    'File Name'
+)->addColumn(
+    'file_type',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    32,
+    array('nullable' => false),
+    'File Type'
+)->addColumn(
+    'content',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    \Magento\Framework\DB\Ddl\Table::MAX_TEXT_SIZE,
+    array('nullable' => false),
+    'File Content'
+)->addColumn(
+    'order',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('nullable' => false, 'default' => 0),
+    'Order'
+)->addForeignKey(
+    $installer->getFkName('core_theme_files', 'theme_id', 'core_theme', 'theme_id'),
+    'theme_id',
+    $installer->getTable('core_theme'),
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->setComment(
+    'Core theme files'
+);
+$connection->createTable($table);
+
+/**
+ * Add column 'type' to 'core_theme'
+ */
+$connection->addColumn(
+    $installer->getTable('core_theme'),
+    'type',
+    array(
+        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+        'nullable' => false,
+        'comment' => 'Theme type: 0:physical, 1:virtual, 2:staging'
+    )
+);
+
+/**
+ * Rename table
+ */
+$wrongName = 'core_theme_files';
+$rightName = 'core_theme_file';
+if ($installer->tableExists($wrongName)) {
+    $connection->renameTable($installer->getTable($wrongName), $installer->getTable($rightName));
+}
+
+$oldName = 'core_theme_files_link';
+$newName = 'core_theme_file_update';
+
+$oldTableName = $installer->getTable($oldName);
+
+/**
+ * Drop foreign key and index
+ */
+$connection->dropForeignKey($oldTableName, $installer->getFkName($oldName, 'theme_id', 'core_theme', 'theme_id'));
+$connection->dropIndex($oldTableName, $installer->getFkName($oldName, 'theme_id', 'core_theme', 'theme_id'));
+
+/**
+ * Rename table
+ */
+if ($installer->tableExists($oldName)) {
+    $connection->renameTable($installer->getTable($oldName), $installer->getTable($newName));
+}
+
+$newTableName = $installer->getTable($newName);
+
+/**
+ * Rename column
+ */
+$oldColumn = 'files_link_id';
+$newColumn = 'file_update_id';
+$connection->changeColumn(
+    $newTableName,
+    $oldColumn,
+    $newColumn,
+    array(
+        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+        'primary' => true,
+        'nullable' => false,
+        'unsigned' => true,
+        'comment' => 'Customization file update id'
+    )
+);
+
+/**
+ * Rename column
+ */
+$oldColumn = 'layout_link_id';
+$newColumn = 'layout_update_id';
+$connection->changeColumn(
+    $newTableName,
+    $oldColumn,
+    $newColumn,
+    array(
+        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+        'nullable' => false,
+        'unsigned' => true,
+        'comment' => 'Theme layout update id'
+    )
+);
+
+/**
+ * Add foreign keys and indexes
+ */
+$connection->addIndex(
+    $newTableName,
+    $installer->getIdxName(
+        $newTableName,
+        'theme_id',
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+    ),
+    'theme_id',
+    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+);
+$connection->addForeignKey(
+    $installer->getFkName($newTableName, 'theme_id', 'core_theme', 'theme_id'),
+    $newTableName,
+    'theme_id',
+    $installer->getTable('core_theme'),
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+);
+$connection->addIndex(
+    $newTableName,
+    $installer->getIdxName(
+        $newTableName,
+        'layout_update_id',
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
+    ),
+    'layout_update_id',
+    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
+);
+$connection->addForeignKey(
+    $installer->getFkName($newTableName, 'layout_update_id', 'core_layout_update', 'layout_update_id'),
+    $newTableName,
+    'layout_update_id',
+    $installer->getTable('core_layout_update'),
+    'layout_update_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+);
+
+/**
+ * Change data
+ */
+$select = $connection->select()->from(
+    $newTableName
+)->join(
+    array('link' => $installer->getTable('core_layout_link')),
+    sprintf('link.layout_link_id = %s.layout_update_id', $newTableName)
+);
+$rows = $connection->fetchAll($select);
+foreach ($rows as $row) {
+    $connection->update(
+        $newTableName,
+        array('layout_update_id' => $row['layout_update_id']),
+        'file_update_id = ' . $row['file_update_id']
+    );
+}
+
+/**
+ * Add column 'code' into 'core_theme'
+ */
+$connection->addColumn(
+    $installer->getTable('core_theme'),
+    'code',
+    array('type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, 'comment' => 'Full theme code, including package')
+);
+
+/**
+ * Drop table 'core_theme_file_update'
+ */
+$connection->dropTable('core_theme_file_update');
+
+/**
+ * Drop columns 'magento_version_from' and 'magento_version_to' in 'core_theme'
+ */
+$table = $installer->getTable('core_theme');
+$connection->dropColumn($table, 'magento_version_from');
+$connection->dropColumn($table, 'magento_version_to');
+
+$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php
deleted file mode 100644
index 4f9bece91324a..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.1-1.6.0.2.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-
-$installer->getConnection()->dropForeignKey(
-    $installer->getTable('core_cache_tag'),
-    $installer->getFkName('core_cache_tag', 'cache_id', 'core_cache', 'id')
-);
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php
deleted file mode 100644
index daae0603d94e7..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.10-1.6.0.11.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-$connection = $installer->getConnection();
-
-/**
- * Add column 'type' to 'core_theme'
- */
-$connection->addColumn(
-    $installer->getTable('core_theme'),
-    'type',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-        'nullable' => false,
-        'comment' => 'Theme type: 0:physical, 1:virtual, 2:staging'
-    )
-);
-
-/**
- * Rename table
- */
-$wrongName = 'core_theme_files';
-$rightName = 'core_theme_file';
-if ($installer->tableExists($wrongName)) {
-    $connection->renameTable($installer->getTable($wrongName), $installer->getTable($rightName));
-}
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.11-1.6.0.12.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.11-1.6.0.12.php
deleted file mode 100644
index e34c292bd6600..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.11-1.6.0.12.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-$connection = $installer->getConnection();
-
-$oldName = 'core_theme_files_link';
-$newName = 'core_theme_file_update';
-
-$oldTableName = $installer->getTable($oldName);
-
-/**
- * Drop foreign key and index
- */
-$connection->dropForeignKey($oldTableName, $installer->getFkName($oldName, 'theme_id', 'core_theme', 'theme_id'));
-$connection->dropIndex($oldTableName, $installer->getFkName($oldName, 'theme_id', 'core_theme', 'theme_id'));
-
-/**
- * Rename table
- */
-if ($installer->tableExists($oldName)) {
-    $connection->renameTable($installer->getTable($oldName), $installer->getTable($newName));
-}
-
-$newTableName = $installer->getTable($newName);
-
-/**
- * Rename column
- */
-$oldColumn = 'files_link_id';
-$newColumn = 'file_update_id';
-$connection->changeColumn(
-    $newTableName,
-    $oldColumn,
-    $newColumn,
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-        'primary' => true,
-        'nullable' => false,
-        'unsigned' => true,
-        'comment' => 'Customization file update id'
-    )
-);
-
-/**
- * Rename column
- */
-$oldColumn = 'layout_link_id';
-$newColumn = 'layout_update_id';
-$connection->changeColumn(
-    $newTableName,
-    $oldColumn,
-    $newColumn,
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-        'nullable' => false,
-        'unsigned' => true,
-        'comment' => 'Theme layout update id'
-    )
-);
-
-/**
- * Add foreign keys and indexes
- */
-$connection->addIndex(
-    $newTableName,
-    $installer->getIdxName(
-        $newTableName,
-        'theme_id',
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    'theme_id',
-    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-);
-$connection->addForeignKey(
-    $installer->getFkName($newTableName, 'theme_id', 'core_theme', 'theme_id'),
-    $newTableName,
-    'theme_id',
-    $installer->getTable('core_theme'),
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-$connection->addIndex(
-    $newTableName,
-    $installer->getIdxName(
-        $newTableName,
-        'layout_update_id',
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-    ),
-    'layout_update_id',
-    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-);
-$connection->addForeignKey(
-    $installer->getFkName($newTableName, 'layout_update_id', 'core_layout_update', 'layout_update_id'),
-    $newTableName,
-    'layout_update_id',
-    $installer->getTable('core_layout_update'),
-    'layout_update_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-
-/**
- * Change data
- */
-$select = $connection->select()->from(
-    $newTableName
-)->join(
-    array('link' => $installer->getTable('core_layout_link')),
-    sprintf('link.layout_link_id = %s.layout_update_id', $newTableName)
-);
-$rows = $connection->fetchAll($select);
-foreach ($rows as $row) {
-    $connection->update(
-        $newTableName,
-        array('layout_update_id' => $row['layout_update_id']),
-        'file_update_id = ' . $row['file_update_id']
-    );
-}
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.12-1.6.0.13.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.12-1.6.0.13.php
deleted file mode 100644
index 41964f5795473..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.12-1.6.0.13.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-$installer->startSetup();
-
-$installer->getConnection()->addColumn(
-    $installer->getTable('core_theme'),
-    'code',
-    array('type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, 'comment' => 'Full theme code, including package')
-);
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.13-1.6.0.14.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.13-1.6.0.14.php
deleted file mode 100644
index fa5c9bbb04583..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.13-1.6.0.14.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $this \Magento\Setup\Module\SetupModule */
-$connection = $this->getConnection();
-$connection->dropTable('core_theme_file_update');
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.14-1.6.0.15.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.14-1.6.0.15.php
deleted file mode 100644
index 497bd6ed6404b..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.14-1.6.0.15.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-
-$connection = $installer->getConnection();
-$table = $installer->getTable('core_theme');
-
-$connection->dropColumn($table, 'magento_version_from');
-$connection->dropColumn($table, 'magento_version_to');
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php
deleted file mode 100644
index ece1b9fc1047a..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-
-/**
- * Create table 'core_theme'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_theme')
-)->addColumn(
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
-    'Theme identifier'
-)->addColumn(
-    'parent_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('nullable' => true),
-    'Parent Id'
-)->addColumn(
-    'theme_path',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array('nullable' => true),
-    'Theme Path'
-)->addColumn(
-    'theme_version',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array('nullable' => false),
-    'Theme Version'
-)->addColumn(
-    'theme_title',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array('nullable' => false),
-    'Theme Title'
-)->addColumn(
-    'preview_image',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array('nullable' => true),
-    'Preview Image'
-)->addColumn(
-    'magento_version_from',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array('nullable' => false),
-    'Magento Version From'
-)->addColumn(
-    'magento_version_to',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array('nullable' => false),
-    'Magento Version To'
-)->addColumn(
-    'is_featured',
-    \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-    null,
-    array('nullable' => false, 'default' => 0),
-    'Is Theme Featured'
-)->setComment(
-    'Core theme'
-);
-
-$installer->getConnection()->createTable($table);
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.php
deleted file mode 100644
index 0fcaa06d8c6cd..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.5-1.6.0.6.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-$connection = $installer->getConnection();
-
-/**
- * Modifying 'core_layout_link' table. Replace columns area, package, theme to theme_id
- */
-$tableCoreLayoutLink = $installer->getTable('core_layout_link');
-
-$connection->dropForeignKey(
-    $tableCoreLayoutLink,
-    $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id')
-);
-
-$connection->dropIndex(
-    $tableCoreLayoutLink,
-    $installer->getIdxName(
-        'core_layout_link',
-        array('store_id', 'package', 'theme', 'layout_update_id'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    )
-);
-
-$connection->dropColumn($tableCoreLayoutLink, 'area');
-
-$connection->dropColumn($tableCoreLayoutLink, 'package');
-
-$connection->changeColumn(
-    $tableCoreLayoutLink,
-    'theme',
-    'theme_id',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-        'unsigned' => true,
-        'nullable' => false,
-        'comment' => 'Theme id'
-    )
-);
-
-$connection->addIndex(
-    $tableCoreLayoutLink,
-    $installer->getIdxName(
-        'core_layout_link',
-        array('store_id', 'theme_id', 'layout_update_id'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    array('store_id', 'theme_id', 'layout_update_id'),
-    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-);
-
-$connection->addForeignKey(
-    $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id'),
-    $tableCoreLayoutLink,
-    'store_id',
-    $installer->getTable('store'),
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-
-$connection->addForeignKey(
-    $installer->getFkName('core_layout_link', 'theme_id', 'core_theme', 'theme_id'),
-    $tableCoreLayoutLink,
-    'theme_id',
-    $installer->getTable('core_theme'),
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-
-/**
- * Add column 'area' to 'core_theme'
- */
-$connection->addColumn(
-    $installer->getTable('core_theme'),
-    'area',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-        'length' => '255',
-        'nullable' => false,
-        'comment' => 'Theme Area'
-    )
-);
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php
deleted file mode 100644
index b63a3508e02c5..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.6-1.6.0.7.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-$connection = $installer->getConnection();
-
-/**
- * Modifying 'core_layout_link' table. Adding 'is_temporary' column
- */
-$tableCoreLayoutLink = $installer->getTable('core_layout_link');
-
-$connection->addColumn(
-    $tableCoreLayoutLink,
-    'is_temporary',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-        'nullable' => false,
-        'default' => '0',
-        'comment' => 'Defines whether Layout Update is Temporary'
-    )
-);
-
-// we must drop next 2 foreign keys to have an ability to drop index
-$connection->dropForeignKey(
-    $tableCoreLayoutLink,
-    $installer->getFkName($tableCoreLayoutLink, 'store_id', 'store', 'store_id')
-);
-$connection->dropForeignKey(
-    $tableCoreLayoutLink,
-    $installer->getFkName($tableCoreLayoutLink, 'theme_id', 'core_theme', 'theme_id')
-);
-
-$connection->dropIndex(
-    $tableCoreLayoutLink,
-    $installer->getIdxName(
-        $tableCoreLayoutLink,
-        array('store_id', 'theme_id', 'layout_update_id'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    )
-);
-
-$connection->addIndex(
-    $tableCoreLayoutLink,
-    $installer->getIdxName(
-        $tableCoreLayoutLink,
-        array('store_id', 'theme_id', 'layout_update_id', 'is_temporary'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    array('store_id', 'theme_id', 'layout_update_id', 'is_temporary'),
-    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-);
-
-// recreate 2 dropped foreign keys to have an ability to drop index
-$connection->addForeignKey(
-    $installer->getFkName($tableCoreLayoutLink, 'store_id', 'store', 'store_id'),
-    $tableCoreLayoutLink,
-    'store_id',
-    $installer->getTable('store'),
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-$connection->addForeignKey(
-    $installer->getFkName($tableCoreLayoutLink, 'theme_id', 'core_theme', 'theme_id'),
-    $tableCoreLayoutLink,
-    'theme_id',
-    $installer->getTable('core_theme'),
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php
deleted file mode 100644
index b72dbb0baa2a1..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.7-1.6.0.8.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-$connection = $installer->getConnection();
-
-/**
- * Add column 'updated_at' to 'core_layout_update'
- */
-$connection->addColumn(
-    $installer->getTable('core_layout_update'),
-    'updated_at',
-    array('type' => \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP, 'nullable' => true, 'comment' => 'Last Update Timestamp')
-);
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.php
deleted file mode 100644
index d9fcae2a25431..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.8-1.6.0.9.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-$connection = $installer->getConnection();
-
-/**
- * Create table 'core_theme_files'
- */
-$table = $installer->getConnection()->newTable(
-    $installer->getTable('core_theme_files')
-)->addColumn(
-    'theme_files_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true),
-    'Theme files identifier'
-)->addColumn(
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('nullable' => false, 'unsigned' => true),
-    'Theme Id'
-)->addColumn(
-    'file_name',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    array('nullable' => false),
-    'File Name'
-)->addColumn(
-    'file_type',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    32,
-    array('nullable' => false),
-    'File Type'
-)->addColumn(
-    'content',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    \Magento\Framework\DB\Ddl\Table::MAX_TEXT_SIZE,
-    array('nullable' => false),
-    'File Content'
-)->addColumn(
-    'order',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('nullable' => false, 'default' => 0),
-    'Order'
-)->addForeignKey(
-    $installer->getFkName('core_theme_files', 'theme_id', 'core_theme', 'theme_id'),
-    'theme_id',
-    $installer->getTable('core_theme'),
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->setComment(
-    'Core theme files'
-);
-
-$installer->getConnection()->createTable($table);
-
-$installer->endSetup();
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.php
deleted file mode 100644
index bf979ed429150..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.9-1.6.0.10.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-
-/* @var $installer \Magento\Setup\Module\SetupModule */
-$installer = $this;
-
-$installer->startSetup();
-$connection = $installer->getConnection();
-
-$connection->addColumn(
-    $installer->getTable('core_theme_files'),
-    'is_temporary',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-        'nullable' => false,
-        'default' => 0,
-        'comment' => 'Is Temporary File'
-    )
-);
-
-$connection->changeColumn(
-    $installer->getTable('core_theme_files'),
-    'file_name',
-    'file_path',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-        'length' => 255,
-        'nullable' => true,
-        'comment' => 'Relative path to file'
-    )
-);
-
-$connection->changeColumn(
-    $installer->getTable('core_theme_files'),
-    'order',
-    'sort_order',
-    array('type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT)
-);
-
-/**
- * Create table 'core_theme_files_link'
- */
-$table = $connection->newTable(
-    $installer->getTable('core_theme_files_link')
-)->addColumn(
-    'files_link_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'nullable' => false, 'unsigned' => true, 'primary' => true),
-    'Customization link id'
-)->addColumn(
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('nullable' => false, 'unsigned' => true),
-    'Theme Id'
-)->addColumn(
-    'layout_link_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('nullable' => false, 'unsigned' => true),
-    'Theme layout link id'
-)->addForeignKey(
-    $installer->getFkName('core_theme_files_link', 'theme_id', 'core_theme', 'theme_id'),
-    'theme_id',
-    $installer->getTable('core_theme'),
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->setComment(
-    'Core theme link on layout update'
-);
-
-$installer->getConnection()->createTable($table);
-
-$installer->endSetup();

From 7b8ce3c21ed860351abdcd181830ee43825e1e6e Mon Sep 17 00:00:00 2001
From: Richard Bates <rbates@x.com>
Date: Thu, 11 Dec 2014 11:16:35 -0600
Subject: [PATCH 286/474] MAGETWO-3315: Functions _camelize and _underscore
 work incorrect with keys that have digits between '_' symbol  - removing
 accidentally commited test files

---
 dev/tests/unit/filename              | 0
 dev/tests/unit/filename.csv          | 0
 dev/tests/unit/filename.invalid_type | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 dev/tests/unit/filename
 delete mode 100644 dev/tests/unit/filename.csv
 delete mode 100644 dev/tests/unit/filename.invalid_type

diff --git a/dev/tests/unit/filename b/dev/tests/unit/filename
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/dev/tests/unit/filename.csv b/dev/tests/unit/filename.csv
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/dev/tests/unit/filename.invalid_type b/dev/tests/unit/filename.invalid_type
deleted file mode 100644
index e69de29bb2d1d..0000000000000

From b6e75acf394b237e5a5b2f1d5b73bb3da7a49f30 Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Thu, 11 Dec 2014 11:17:01 -0600
Subject: [PATCH 287/474] MAGETWO-10108: Comments for fields number_limit and
 text_limit in wishlist are not localized

---
 app/code/Magento/Wishlist/i18n/de_DE.csv | 2 ++
 app/code/Magento/Wishlist/i18n/en_US.csv | 2 ++
 app/code/Magento/Wishlist/i18n/es_ES.csv | 2 ++
 app/code/Magento/Wishlist/i18n/fr_FR.csv | 2 ++
 app/code/Magento/Wishlist/i18n/nl_NL.csv | 2 ++
 app/code/Magento/Wishlist/i18n/pt_BR.csv | 2 ++
 app/code/Magento/Wishlist/i18n/zh_CN.csv | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/app/code/Magento/Wishlist/i18n/de_DE.csv b/app/code/Magento/Wishlist/i18n/de_DE.csv
index f73d9f1b6bd0e..43fc5de10f58c 100644
--- a/app/code/Magento/Wishlist/i18n/de_DE.csv
+++ b/app/code/Magento/Wishlist/i18n/de_DE.csv
@@ -95,7 +95,9 @@ Message,Nachricht
 "General Options","General Options"
 "Share Options","Share Options"
 "Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"10 by default. Max - 10000","10 by default. Max - 10000"
 "Email Text Length Limit","Email Text Length Limit"
+"255 by default","255 by default"
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
diff --git a/app/code/Magento/Wishlist/i18n/en_US.csv b/app/code/Magento/Wishlist/i18n/en_US.csv
index f87bcc62d780b..125f7266ade2b 100644
--- a/app/code/Magento/Wishlist/i18n/en_US.csv
+++ b/app/code/Magento/Wishlist/i18n/en_US.csv
@@ -95,7 +95,9 @@ Message,Message
 "General Options","General Options"
 "Share Options","Share Options"
 "Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"10 by default. Max - 10000","10 by default. Max - 10000"
 "Email Text Length Limit","Email Text Length Limit"
+"255 by default","255 by default"
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
diff --git a/app/code/Magento/Wishlist/i18n/es_ES.csv b/app/code/Magento/Wishlist/i18n/es_ES.csv
index 8b59b17ff1726..cd8aab6a37915 100644
--- a/app/code/Magento/Wishlist/i18n/es_ES.csv
+++ b/app/code/Magento/Wishlist/i18n/es_ES.csv
@@ -95,7 +95,9 @@ Message,Mensaje
 "General Options","General Options"
 "Share Options","Share Options"
 "Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"10 by default. Max - 10000","10 by default. Max - 10000"
 "Email Text Length Limit","Email Text Length Limit"
+"255 by default","255 by default"
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
diff --git a/app/code/Magento/Wishlist/i18n/fr_FR.csv b/app/code/Magento/Wishlist/i18n/fr_FR.csv
index 2728681ff8475..512c6ad4ec38d 100644
--- a/app/code/Magento/Wishlist/i18n/fr_FR.csv
+++ b/app/code/Magento/Wishlist/i18n/fr_FR.csv
@@ -95,7 +95,9 @@ Message,Message
 "General Options","General Options"
 "Share Options","Share Options"
 "Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"10 by default. Max - 10000","10 by default. Max - 10000"
 "Email Text Length Limit","Email Text Length Limit"
+"255 by default","255 by default"
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
diff --git a/app/code/Magento/Wishlist/i18n/nl_NL.csv b/app/code/Magento/Wishlist/i18n/nl_NL.csv
index 1cc87637e2282..9a25398b7cdad 100644
--- a/app/code/Magento/Wishlist/i18n/nl_NL.csv
+++ b/app/code/Magento/Wishlist/i18n/nl_NL.csv
@@ -95,7 +95,9 @@ Message,Boodschap
 "General Options","General Options"
 "Share Options","Share Options"
 "Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"10 by default. Max - 10000","10 by default. Max - 10000"
 "Email Text Length Limit","Email Text Length Limit"
+"255 by default","255 by default"
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
diff --git a/app/code/Magento/Wishlist/i18n/pt_BR.csv b/app/code/Magento/Wishlist/i18n/pt_BR.csv
index 166bb8a60612b..9e297438a2bcf 100644
--- a/app/code/Magento/Wishlist/i18n/pt_BR.csv
+++ b/app/code/Magento/Wishlist/i18n/pt_BR.csv
@@ -95,7 +95,9 @@ Message,Mensagem
 "General Options","General Options"
 "Share Options","Share Options"
 "Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"10 by default. Max - 10000","10 by default. Max - 10000"
 "Email Text Length Limit","Email Text Length Limit"
+"255 by default","255 by default"
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"
diff --git a/app/code/Magento/Wishlist/i18n/zh_CN.csv b/app/code/Magento/Wishlist/i18n/zh_CN.csv
index 1311c54dc871b..9c0338dae0053 100644
--- a/app/code/Magento/Wishlist/i18n/zh_CN.csv
+++ b/app/code/Magento/Wishlist/i18n/zh_CN.csv
@@ -95,7 +95,9 @@ Message,信息
 "General Options","General Options"
 "Share Options","Share Options"
 "Max Emails Allowed to be Sent","Max Emails Allowed to be Sent"
+"10 by default. Max - 10000","10 by default. Max - 10000"
 "Email Text Length Limit","Email Text Length Limit"
+"255 by default","255 by default"
 "My Wish List Link","My Wish List Link"
 "Display Wish List Summary","Display Wish List Summary"
 "No Items Found","No Items Found"

From 5defd115247d8ad8cac2f64555109028d33a8822 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 11 Dec 2014 19:17:36 +0200
Subject: [PATCH 288/474] MAGETWO-31629: Online payment methods removal for CE
 release

- fix
---
 app/code/Magento/Payment/composer.json | 4 +---
 dev/build/publication/edition/ee.txt   | 3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index dab6845bf20da..243b2fec27249 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -6,13 +6,11 @@
         "magento/module-store": "0.1.0-alpha107",
         "magento/module-core": "0.1.0-alpha107",
         "magento/module-sales": "0.1.0-alpha107",
+        "magento/module-centinel": "0.1.0-alpha107",
         "magento/module-checkout": "0.1.0-alpha107",
         "magento/framework": "0.1.0-alpha107",
         "magento/magento-composer-installer": "*"
     },
-    "suggest": {
-        "magento/module-centinel": "0.1.0-alpha107"
-    },
     "type": "magento2-module",
     "version": "0.1.0-alpha107",
     "extra": {
diff --git a/dev/build/publication/edition/ee.txt b/dev/build/publication/edition/ee.txt
index 587e83ad85f94..036d379fd20a9 100644
--- a/dev/build/publication/edition/ee.txt
+++ b/dev/build/publication/edition/ee.txt
@@ -40,7 +40,6 @@ dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Logging
 {app/code,dev/tests/{integration,unit}/testsuite}/Magento/PromotionPermissions
 {app/code,dev/tests/{integration,unit}/testsuite}/Magento/Reminder
 {app/code,dev/tests/{integration,unit}/testsuite}/Magento/Authorizenet
-{app/code,dev/tests/{integration,unit}/testsuite}/Magento/Centinel
 {app/code,dev/tests/{integration,unit}/testsuite}/Magento/Ogone
 {app/code,dev/tests/{integration,unit}/testsuite}/Magento/Paypal
 
@@ -90,8 +89,6 @@ dev/tools/Magento/Tools/SampleData/fixtures/TargetRule
 dev/tools/Magento/Tools/SampleData/Module/TargetRule
 
 dev/tests/integration/testsuite/Magento/Test/Design/Frontend/Enterprise
-dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Centinel
-app/code/Magento/Payment/Model/Method/Cc.php
 
 dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ee.php
 dev/tests/static/testsuite/Magento/Test/Js/_files/{whitelist,blacklist}/ee.txt

From 91497d356a6d77e099d0d29ac924ab7d0206732b Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Thu, 11 Dec 2014 19:26:40 +0200
Subject: [PATCH 289/474] MAGETWO-31627: Remove proxy for config classes

- fixed unit, static, integration tests
---
 .../Framework/Interception/GeneralTest.php    |  2 +-
 .../Php/_files/phpcpd/blacklist/common.txt    |  2 +
 .../Interception/Config/ConfigTest.php        |  8 +--
 .../ObjectManager/Config/DeveloperTest.php    | 61 +++----------------
 .../PluginList/PluginListTest.php             |  5 +-
 5 files changed, 15 insertions(+), 63 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
index 4106449fc9de2..c86409cc9c009 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
@@ -28,7 +28,7 @@ class GeneralTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $config = new \Magento\Framework\Interception\ObjectManager\Config\Developer(new ObjectManagerConfig());
+        $config = new \Magento\Framework\Interception\ObjectManager\Config\Developer();
         $factory = new \Magento\Framework\ObjectManager\Factory\Dynamic\Developer($config, null);
 
         $this->_configReader = $this->getMock('Magento\Framework\Config\ReaderInterface');
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index 98b72fd8be40e..dd76eee06307f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -144,3 +144,5 @@ app/code/Magento/CatalogInventory/Api/Data
 app/code/Magento/Sales/Model/Spi
 Magento/Catalog/Model/ProductLink
 Magento/GroupedProduct/Model/Resource/Product/Type/Grouped
+Magento/Framework/Interception/ObjectManager/Config/Developer
+Magento/Framework/Interception/ObjectManager/Config/Compiled
\ No newline at end of file
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/Config/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/Config/ConfigTest.php
index 98d687fc933c7..deef87e9271d0 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/Config/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/Config/ConfigTest.php
@@ -53,12 +53,8 @@ protected function setUp()
         );
         $this->configScopeMock = $this->getMock('Magento\Framework\Config\ScopeListInterface');
         $this->cacheMock = $this->getMock('Magento\Framework\Cache\FrontendInterface');
-        $this->omConfigMock = $this->getMock(
-            'Magento\Framework\Interception\ObjectManager\Config',
-            [],
-            [],
-            '',
-            false
+        $this->omConfigMock = $this->getMockForAbstractClass(
+            'Magento\Framework\Interception\ObjectManager\ConfigInterface'
         );
         $this->definitionMock = $this->getMock('Magento\Framework\ObjectManager\DefinitionInterface');
     }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php
index cf6342d5c4014..e9c6894539cb9 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php
@@ -16,85 +16,42 @@ class DeveloperTest extends \PHPUnit_Framework_TestCase
     private $model;
 
     /**
-     * @var \Magento\Framework\Interception\Config | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Interception\ConfigInterface | \PHPUnit_Framework_MockObject_MockObject
      */
     private $interceptionConfig;
 
-    /** @var  \Magento\Framework\ObjectManager\Config\Config | \PHPUnit_Framework_MockObject_MockObject */
-    private $subjectConfigMock;
-
     protected function setUp()
     {
         $this->interceptionConfig = $this->getMock('\Magento\Framework\Interception\ConfigInterface');
-
-        $this->subjectConfigMock = $this->getMockBuilder('\Magento\Framework\ObjectManager\Config\Config')
-            ->disableOriginalConstructor()
-            ->setMethods(['getInstanceType'])
-            ->getMock();
-
-        $this->model = new Developer($this->subjectConfigMock);
+        $this->model = new Developer();
     }
 
     public function testGetInstanceTypeReturnsInterceptorClass()
     {
-        $instanceName = 'SomeClass';
-
-        $this->interceptionConfig->expects($this->once())
-            ->method('hasPlugins')
-            ->willReturn(true);
-
-        $this->subjectConfigMock->expects($this->once())
-            ->method('getInstanceType')
-            ->with($instanceName)
-            ->willReturn($instanceName);
-
+        $this->interceptionConfig->expects($this->once())->method('hasPlugins')->will($this->returnValue(true));
         $this->model->setInterceptionConfig($this->interceptionConfig);
 
-        $this->assertEquals('SomeClass\Interceptor', $this->model->getInstanceType($instanceName));
+        $this->assertEquals('SomeClass\Interceptor', $this->model->getInstanceType('SomeClass'));
     }
 
     public function testGetInstanceTypeReturnsSimpleClassIfNoPluginsAreDeclared()
     {
-        $instanceName = 'SomeClass';
-
-        $this->subjectConfigMock->expects($this->once())
-            ->method('getInstanceType')
-            ->with($instanceName)
-            ->willReturn($instanceName);
-
         $this->model->setInterceptionConfig($this->interceptionConfig);
 
-        $this->assertEquals('SomeClass', $this->model->getInstanceType($instanceName));
+        $this->assertEquals('SomeClass', $this->model->getInstanceType('SomeClass'));
     }
 
     public function testGetInstanceTypeReturnsSimpleClassIfInterceptionConfigIsNotSet()
     {
-        $instanceName = 'SomeClass';
-
-        $this->subjectConfigMock->expects($this->once())
-            ->method('getInstanceType')
-            ->with($instanceName)
-            ->willReturn($instanceName);
-
-        $this->assertEquals('SomeClass', $this->model->getInstanceType($instanceName));
+        $this->assertEquals('SomeClass', $this->model->getInstanceType('SomeClass'));
     }
 
     public function testGetOriginalInstanceTypeReturnsInterceptedClass()
     {
-        $this->interceptionConfig->expects($this->once())
-            ->method('hasPlugins')
-            ->willReturn(true);
-
-        $instanceName = 'SomeClass';
-
-        $this->subjectConfigMock->expects($this->exactly(2))
-            ->method('getInstanceType')
-            ->with($instanceName)
-            ->willReturn($instanceName);
-
+        $this->interceptionConfig->expects($this->once())->method('hasPlugins')->will($this->returnValue(true));
         $this->model->setInterceptionConfig($this->interceptionConfig);
 
-        $this->assertEquals('SomeClass\Interceptor', $this->model->getInstanceType($instanceName));
-        $this->assertEquals('SomeClass', $this->model->getOriginalInstanceType($instanceName));
+        $this->assertEquals('SomeClass\Interceptor', $this->model->getInstanceType('SomeClass'));
+        $this->assertEquals('SomeClass', $this->model->getOriginalInstanceType('SomeClass'));
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/PluginList/PluginListTest.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/PluginList/PluginListTest.php
index f80a0f2ddb8bc..97cd06ddd6d5a 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/PluginList/PluginListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/PluginList/PluginListTest.php
@@ -50,10 +50,7 @@ protected function setUp()
             ->method('get')
             ->will($this->returnValue(false));
 
-        $omConfigMock =  $this->getMockBuilder('Magento\Framework\Interception\ObjectManager\Config')
-            ->disableOriginalConstructor()
-            ->setMethods(['getOriginalInstanceType'])
-            ->getMock();
+        $omConfigMock =  $this->getMockForAbstractClass('Magento\Framework\Interception\ObjectManager\ConfigInterface');
 
         $omConfigMock->expects($this->any())->method('getOriginalInstanceType')->will($this->returnArgument(0));
 

From ddd3937f0a5f2c59f44fcd2a180a96a0967aa9fb Mon Sep 17 00:00:00 2001
From: Denys Rul <drul@ebay.com>
Date: Thu, 11 Dec 2014 19:29:20 +0200
Subject: [PATCH 290/474] MAGETWO-31244: Unable to place order within
 Authorize.net Direct Post from backend

- Skip most of the rules with more than 2 arguments
---
 lib/web/mage/validation.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index d65820da0d883..6a9e5617ff1f5 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -81,11 +81,13 @@
         }
     });
 
-    $.validator.addMethod = function (name, method, message) {
+    $.validator.addMethod = function (name, method, message, dontSkip) {
         $.validator.methods[name] = method;
         $.validator.messages[name] = message !== undefined ? message : $.validator.messages[name];
         
-        $.validator.addClassRules(name, $.validator.normalizeRule(name));
+        if (method.length < 3 || dontSkip) {
+            $.validator.addClassRules(name, $.validator.normalizeRule(name));
+        }
     };
 
     /**
@@ -668,7 +670,8 @@
 
                 return result;
             },
-            'The value is not within the specified range.'
+            'The value is not within the specified range.',
+            true
         ],
         "validate-digits": [
             function(v) {
@@ -714,7 +717,8 @@
 
                 return result;
             },
-            'The value is not within the specified range.'
+            'The value is not within the specified range.',
+            true
         ],
         'validate-range': [
             function(v, elm) {

From 2744b88b534471c8d265994d1a2ffb5887c0730d Mon Sep 17 00:00:00 2001
From: Oleg Zinoviev <ozinoviev@ebay.com>
Date: Thu, 11 Dec 2014 19:43:08 +0200
Subject: [PATCH 291/474] MAGETWO-24703: Backend UI issues: improvements

- QA updates for customer form ie9 (margin collapsing)
---
 .../Magento_Ui/web/css/source/formelements.less       | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/formelements.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/formelements.less
index ffd7979f5d926..09c353c16f52e 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/formelements.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/formelements.less
@@ -132,12 +132,15 @@
        font-weight: 500;
        box-sizing: border-box;
        max-width: 380px;
-        .no-flexbox.no-flexboxlegacy & {
-            display: inline-block;
-            width: 100%;
+    }
+    .control-addon {
+        + .mage-error {
+            .no-flexbox.no-flexboxlegacy & {
+                display: inline-block;
+                width: 100%;
+            }
         }
     }
-
 }
 
 .form__field {

From 58172ccc0e83372f7dde2182955a2f2333b7e922 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Thu, 11 Dec 2014 19:45:35 +0200
Subject: [PATCH 292/474] MAGETWO-31655: Remove deprecated code from
 Payment/Shipping modules

---
 .../Paypal/Block/Payflow/Advanced/Review.php  | 16 ------------
 .../Paypal/Block/Payflow/Link/Review.php      | 25 -------------------
 app/code/Magento/Paypal/Model/Config.php      | 20 ---------------
 app/code/Magento/Paypal/Model/Observer.php    | 11 --------
 .../Config/Source/AuthorizationAmounts.php    | 22 ----------------
 app/code/Magento/Usps/Model/Carrier.php       |  8 ------
 .../Test/Legacy/_files/obsolete_classes.php   |  3 +++
 7 files changed, 3 insertions(+), 102 deletions(-)
 delete mode 100644 app/code/Magento/Paypal/Block/Payflow/Advanced/Review.php
 delete mode 100644 app/code/Magento/Paypal/Block/Payflow/Link/Review.php
 delete mode 100644 app/code/Magento/Paypal/Model/System/Config/Source/AuthorizationAmounts.php

diff --git a/app/code/Magento/Paypal/Block/Payflow/Advanced/Review.php b/app/code/Magento/Paypal/Block/Payflow/Advanced/Review.php
deleted file mode 100644
index cd5e45dfc924f..0000000000000
--- a/app/code/Magento/Paypal/Block/Payflow/Advanced/Review.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-
-/**
- * Paypal Payflow Advanced Express Onepage checkout block
- *
- * @deprecated since 1.6.2.0
- * @author      Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Paypal\Block\Payflow\Advanced;
-
-class Review extends \Magento\Paypal\Block\Payflow\Link\Review
-{
-}
diff --git a/app/code/Magento/Paypal/Block/Payflow/Link/Review.php b/app/code/Magento/Paypal/Block/Payflow/Link/Review.php
deleted file mode 100644
index 09fb9fdbcc87c..0000000000000
--- a/app/code/Magento/Paypal/Block/Payflow/Link/Review.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-
-/**
- * Paypal PayflowLink Express Onepage checkout block
- *
- * @deprecated since 1.6.2.0
- * @author      Magento Core Team <core@magentocommerce.com>
- */
-namespace Magento\Paypal\Block\Payflow\Link;
-
-class Review extends \Magento\Paypal\Block\Express\Review
-{
-    /**
-     * Retrieve payment method and assign additional template values
-     *
-     * @return \Magento\Paypal\Block\Express\Review
-     */
-    protected function _beforeToHtml()
-    {
-        return parent::_beforeToHtml();
-    }
-}
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 667f56a04d822..41c842ed330cf 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -84,15 +84,6 @@ class Config
 
     const PAYMENT_ACTION_AUTH = 'Authorization';
 
-    /**#@-*/
-
-    /**#@+
-     * Authorization amounts for Account Verification
-     *
-     * @deprecated since 1.6.2.0
-     */
-    const AUTHORIZATION_AMOUNT_ZERO = 0;
-
     const AUTHORIZATION_AMOUNT_ONE = 1;
 
     const AUTHORIZATION_AMOUNT_FULL = 2;
@@ -1364,17 +1355,6 @@ public function getPaymentAction()
         }
     }
 
-    /**
-     * Returns array of possible Authorization Amounts for Account Verification
-     *
-     * @deprecated since 1.6.2.0
-     * @return array
-     */
-    public function getAuthorizationAmounts()
-    {
-        return [];
-    }
-
     /**
      * Express Checkout "solution types" source getter
      * "sole" = "Express Checkout for Auctions" - PayPal allows guest checkout
diff --git a/app/code/Magento/Paypal/Model/Observer.php b/app/code/Magento/Paypal/Model/Observer.php
index 98b0435f5f265..bc259105f60cc 100644
--- a/app/code/Magento/Paypal/Model/Observer.php
+++ b/app/code/Magento/Paypal/Model/Observer.php
@@ -119,17 +119,6 @@ public function fetchReports()
         }
     }
 
-    /**
-     * Clean unfinished transaction
-     *
-     * @deprecated since 1.6.2.0
-     * @return $this
-     */
-    public function cleanTransactions()
-    {
-        return $this;
-    }
-
     /**
      * Save order into registry to use it in the overloaded controller.
      *
diff --git a/app/code/Magento/Paypal/Model/System/Config/Source/AuthorizationAmounts.php b/app/code/Magento/Paypal/Model/System/Config/Source/AuthorizationAmounts.php
deleted file mode 100644
index 41d0fd6d98f8c..0000000000000
--- a/app/code/Magento/Paypal/Model/System/Config/Source/AuthorizationAmounts.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-namespace Magento\Paypal\Model\System\Config\Source;
-
-/**
- * Source model for available Authorization Amounts for Account Verification
- *
- * @deprecated since 1.6.2.0
- * @author      Magento Core Team <core@magentocommerce.com>
- */
-class AuthorizationAmounts implements \Magento\Framework\Option\ArrayInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function toOptionArray()
-    {
-        return [];
-    }
-}
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 14b501c6e3180..d6aebb495fcf7 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -59,14 +59,6 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      */
     protected $_code = self::CODE;
 
-    /**
-     * Destination Zip Code required flag
-     *
-     * @var boolean
-     * @deprecated since 1.7.0 functionality implemented in \Magento\Shipping\Model\Carrier\AbstractCarrierOnline
-     */
-    protected $_isZipCodeRequired;
-
     /**
      * Rate request data
      *
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 737135f1bf5fa..13f38b975be45 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -2826,4 +2826,7 @@
     ['Magento\GiftMessage\Helper\Url'],
     ['Magento\Rss\Helper\Data'],
     ['Magento\Sales\Model\ConverterInterface'],
+    ['Magento\Paypal\Block\Payflow\Advanced\Review'],
+    ['Magento\Paypal\Block\Payflow\Link\Review'],
+    ['Magento\Paypal\Model\System\Config\Source\AuthorizationAmounts']
 ];

From b5aebda7fcc0cfc144e592a6a302befca4a49d45 Mon Sep 17 00:00:00 2001
From: Leonid Poluyanov <lpoluyanov@ebay.com>
Date: Thu, 11 Dec 2014 20:18:53 +0200
Subject: [PATCH 293/474] MAGETWO-31717: It's not possible to add conditions to
 the "Catalog Products List" widget.

---
 .../templates/product/widget/conditions.phtml        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml b/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
index 1c2febd39ba72..b54dfd4f97718 100644
--- a/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
+++ b/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
@@ -27,11 +27,11 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' . $this->getUiId('
 
 
 <script type="text/javascript">
-require([
-    "prototype",
-    "Magento_Rule/rules"
-], function(){
-    window.<?php echo $this->getHtmlId() ?> = new VarienRulesForm('<?php echo $this->getHtmlId() ?>', '<?php echo $this->getNewChildUrl() ?>');
-});
+    require([
+        "Magento_Rule/rules",
+        "prototype"
+    ], function(VarienRulesForm){
+        window.<?php echo $this->getHtmlId() ?> = new VarienRulesForm('<?php echo $this->getHtmlId() ?>', '<?php echo $this->getNewChildUrl() ?>');
+    });
 </script>
 

From 1f113f821a7bca4c8f2ce9f78c3c16579cd9c891 Mon Sep 17 00:00:00 2001
From: Robert He <rohe@ebay.com>
Date: Thu, 11 Dec 2014 12:27:31 -0600
Subject: [PATCH 294/474] MAGETWO-31532: Saving product with FPT always throws
 validation error for state dropdown (when * is selected)

 -- When '*' is selected as state, save as 0 as the value.
---
 app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
index 456dc199b29e2..d9d09e6511f66 100644
--- a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -140,7 +140,7 @@ public function afterSave($object)
             if (isset($tax['state']) && $tax['state']) {
                 $state = $tax['state'];
             } else {
-                $state = '*';
+                $state = '0';
             }
 
             $data = [];

From b04523a962ed6a5c2dead7ed35243502315ae573 Mon Sep 17 00:00:00 2001
From: Oleksandr Ivashchenko <oivashchenko@ebay.com>
Date: Thu, 11 Dec 2014 21:57:59 +0200
Subject: [PATCH 295/474] MAGETWO-31710: Exception if press "Compare" button

 - CR changes
---
 .../AdvancedCheckout/Controller/Cart/RemoveFailed.php        | 2 +-
 .../Magento/Catalog/Controller/Product/Compare/Index.php     | 4 +++-
 .../Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php   | 2 +-
 .../Magento/Customer/Controller/Adminhtml/Index/Viewfile.php | 5 ++++-
 .../Controller/Adminhtml/Googleshopping/Items.php            | 2 +-
 .../Adminhtml/Googleshopping/Items/ConfirmCaptcha.php        | 2 +-
 .../Controller/Adminhtml/Googleshopping/Items/Index.php      | 2 +-
 app/code/Magento/Rma/Controller/Adminhtml/Rma/Viewfile.php   | 2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/AdvancedCheckout/Controller/Cart/RemoveFailed.php b/app/code/Magento/AdvancedCheckout/Controller/Cart/RemoveFailed.php
index f601d699288ac..c637edacc6af5 100644
--- a/app/code/Magento/AdvancedCheckout/Controller/Cart/RemoveFailed.php
+++ b/app/code/Magento/AdvancedCheckout/Controller/Cart/RemoveFailed.php
@@ -22,8 +22,8 @@ public function __construct(
         Context $context,
         \Magento\Framework\Url\DecoderInterface $urlDecoder
     ) {
-        $this->urlDecoder = $urlDecoder;
         parent::__construct($context);
+        $this->urlDecoder = $urlDecoder;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
index d2090e10aaf08..60700d407579f 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
@@ -31,6 +31,8 @@ class Index extends \Magento\Catalog\Controller\Product\Compare
      * @param PageFactory $resultPageFactory
      * @param ProductRepositoryInterface $productRepository
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -47,7 +49,6 @@ public function __construct(
         ProductRepositoryInterface $productRepository,
         \Magento\Framework\Url\DecoderInterface $urlDecoder
     ) {
-        $this->urlDecoder = $urlDecoder;
         parent::__construct(
             $context,
             $compareItemFactory,
@@ -62,6 +63,7 @@ public function __construct(
             $resultPageFactory,
             $productRepository
         );
+        $this->urlDecoder = $urlDecoder;
     }
 
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
index ce64afcf5b7f4..29019f02ee3e8 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -22,8 +22,8 @@ public function __construct(
         Action\Context $context,
         \Magento\Framework\Url\DecoderInterface $urlDecoder
     ) {
-        $this->urlDecoder = $urlDecoder;
         parent::__construct($context);
+        $this->urlDecoder = $urlDecoder;
     }
 
     /**
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index 45180b98c2dbd..69242e4d29f84 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -43,6 +43,9 @@ class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
      * @param ObjectFactory $objectFactory
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -66,7 +69,6 @@ public function __construct(
         ObjectFactory $objectFactory,
         \Magento\Framework\Url\DecoderInterface $urlDecoder
     ) {
-        $this->urlDecoder  = $urlDecoder;
         parent::__construct(
             $context,
             $coreRegistry,
@@ -88,6 +90,7 @@ public function __construct(
             $dataObjectProcessor,
             $objectFactory
         );
+        $this->urlDecoder  = $urlDecoder;
     }
 
     /**
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
index f33716bc9d6a5..32cd0e31bbadb 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
@@ -35,8 +35,8 @@ public function __construct(
         NotifierInterface $notifier,
         \Magento\Framework\Url\EncoderInterface $urlEncoder
     ) {
-        $this->urlEncoder = $urlEncoder;
         parent::__construct($context);
+        $this->urlEncoder = $urlEncoder;
         $this->notifier = $notifier;
     }
 
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php
index 73368e3a5cba7..ed8d3b3a98a69 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/ConfirmCaptcha.php
@@ -27,8 +27,8 @@ public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         \Magento\Framework\Url\DecoderInterface $urlDecoder
     ) {
-        $this->urlDecoder = $urlDecoder;
         parent::__construct($context, $notifier, $urlEncoder);
+        $this->urlDecoder = $urlDecoder;
     }
 
     /**
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
index 24ffb5d4d750f..a4d0d85baec6e 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
@@ -27,8 +27,8 @@ public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         \Magento\Framework\Url\DecoderInterface $urlDecoder
     ) {
-        $this->urlDecoder = $urlDecoder;
         parent::__construct($context, $notifier, $urlEncoder);
+        $this->urlDecoder = $urlDecoder;
     }
 
     /**
diff --git a/app/code/Magento/Rma/Controller/Adminhtml/Rma/Viewfile.php b/app/code/Magento/Rma/Controller/Adminhtml/Rma/Viewfile.php
index 1d40f6c9685c5..8e4b14afe128f 100644
--- a/app/code/Magento/Rma/Controller/Adminhtml/Rma/Viewfile.php
+++ b/app/code/Magento/Rma/Controller/Adminhtml/Rma/Viewfile.php
@@ -36,7 +36,6 @@ public function __construct(
         \Magento\Rma\Model\Rma\RmaDataMapper $rmaDataMapper,
         \Magento\Framework\Url\DecoderInterface $urlDecoder
     ) {
-        $this->urlDecoder = $urlDecoder;
         parent::__construct(
             $context,
             $coreRegistry,
@@ -46,6 +45,7 @@ public function __construct(
             $labelService,
             $rmaDataMapper
         );
+        $this->urlDecoder = $urlDecoder;
     }
 
     /**

From 98f20c361b144e6924bba07aa103dfbd3fc1e887 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Thu, 11 Dec 2014 14:12:35 -0600
Subject: [PATCH 296/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- updated license notice of newly added files
---
 .../Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php        | 5 +----
 .../framework/Magento/TestFramework/Annotation/Cache.php     | 5 +----
 .../Magento/TestFramework/Isolation/DeploymentConfig.php     | 5 +----
 .../Backend/Controller/Adminhtml/Cache/MassActionTest.php    | 5 +----
 .../testsuite/Magento/Framework/TranslateCachingTest.php     | 5 +----
 .../testsuite/Magento/Tools/SampleData/TestLogger.php        | 5 +----
 .../Magento/Test/Legacy/_files/obsolete_classes.php          | 3 +--
 .../testsuite/Magento/Framework/App/Cache/ManagerTest.php    | 5 +----
 .../Magento/Framework/App/Cache/Type/ConfigSegmentTest.php   | 5 +----
 .../unit/testsuite/Magento/Framework/App/SetupInfoTest.php   | 5 +----
 dev/tools/Magento/Tools/SampleData/InstallerApp.php          | 5 +----
 lib/internal/Magento/Framework/App/Cache/Manager.php         | 5 +----
 .../Magento/Framework/App/Cache/Type/ConfigSegment.php       | 5 +----
 lib/internal/Magento/Framework/App/SetupInfo.php             | 5 +----
 lib/internal/Magento/Framework/DB/Adapter/DdlCache.php       | 5 +----
 setup/module/Magento/Setup/src/Controller/AddDatabase.php    | 5 +----
 .../Magento/Setup/src/Controller/CreateAdminAccount.php      | 5 +----
 setup/module/Magento/Setup/src/Controller/Environment.php    | 5 +----
 setup/module/Magento/Setup/src/Controller/Install.php        | 1 +
 setup/module/Magento/Setup/src/Controller/Navigation.php     | 5 +----
 setup/module/Magento/Setup/src/Controller/ReadinessCheck.php | 5 +----
 setup/module/Magento/Setup/src/Controller/Success.php        | 5 +----
 .../module/Magento/Setup/src/Controller/WebConfiguration.php | 5 +----
 setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php | 5 +----
 setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php  | 5 +----
 .../Magento/Setup/src/Mvc/Console/VerboseValidator.php       | 5 +----
 26 files changed, 26 insertions(+), 98 deletions(-)

diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php
index 917110595ee3c..0777681baf761 100644
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php
+++ b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 /* @var $this \Magento\Setup\Module\SetupModule */
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
index 481a4571c46bd..d0962a6ba7fef 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/Cache.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\TestFramework\Annotation;
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php b/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
index b0a9c24b85ad9..fde5833296801 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\TestFramework\Isolation;
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
index 6a44625a80e16..a65aa58bb6478 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Backend\Controller\Adminhtml\Cache;
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
index 4b27178091b44..dbb19ab123310 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Framework;
 
diff --git a/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLogger.php b/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLogger.php
index 2d5ff83af944e..6e12e594a8aa8 100644
--- a/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLogger.php
+++ b/dev/tests/integration/testsuite/Magento/Tools/SampleData/TestLogger.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Tools\SampleData;
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 9b100f72a3e87..5c715fcbcab5a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -2826,7 +2826,6 @@
     ['Magento\GiftMessage\Helper\Url'],
     ['Magento\Rss\Helper\Data'],
     ['Magento\Sales\Model\ConverterInterface'],
-];
     ['Magento\Framework\App\Cache\State\Options', 'Magento\Framework\App\Cache\State'],
     ['Magento\Framework\App\Cache\State\OptionsInterface', 'Magento\Framework\App\Cache\State'],
-);
+];
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php
index b67a4905cf10a..50c4849b40b15 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/ManagerTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Framework\App\Cache;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/Type/ConfigSegmentTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/Type/ConfigSegmentTest.php
index 2b06dfa4be0f9..0faf133d77fc5 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Cache/Type/ConfigSegmentTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Cache/Type/ConfigSegmentTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Framework\App\Cache\Type;
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php
index c678919206e0a..19c76c1271360 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Framework\App;
diff --git a/dev/tools/Magento/Tools/SampleData/InstallerApp.php b/dev/tools/Magento/Tools/SampleData/InstallerApp.php
index da665fc33477c..e1c1f7a775e9a 100644
--- a/dev/tools/Magento/Tools/SampleData/InstallerApp.php
+++ b/dev/tools/Magento/Tools/SampleData/InstallerApp.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Tools\SampleData;
 
diff --git a/lib/internal/Magento/Framework/App/Cache/Manager.php b/lib/internal/Magento/Framework/App/Cache/Manager.php
index c3c84a02f5e40..995bd4db465bf 100644
--- a/lib/internal/Magento/Framework/App/Cache/Manager.php
+++ b/lib/internal/Magento/Framework/App/Cache/Manager.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Framework\App\Cache;
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/ConfigSegment.php b/lib/internal/Magento/Framework/App/Cache/Type/ConfigSegment.php
index 0de501f898325..a763237597dc5 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/ConfigSegment.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/ConfigSegment.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Framework\App\Cache\Type;
diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php
index 917826a78bf56..da707f20519da 100644
--- a/lib/internal/Magento/Framework/App/SetupInfo.php
+++ b/lib/internal/Magento/Framework/App/SetupInfo.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Framework\App;
diff --git a/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php b/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
index 58fdf497e9b04..341acd87e1d7a 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Framework\DB\Adapter;
diff --git a/setup/module/Magento/Setup/src/Controller/AddDatabase.php b/setup/module/Magento/Setup/src/Controller/AddDatabase.php
index a5e2a25c0a2f5..486b5839d82a6 100644
--- a/setup/module/Magento/Setup/src/Controller/AddDatabase.php
+++ b/setup/module/Magento/Setup/src/Controller/AddDatabase.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Setup\Controller;
 
diff --git a/setup/module/Magento/Setup/src/Controller/CreateAdminAccount.php b/setup/module/Magento/Setup/src/Controller/CreateAdminAccount.php
index a7daab6aea748..ed59fc9ee33bc 100644
--- a/setup/module/Magento/Setup/src/Controller/CreateAdminAccount.php
+++ b/setup/module/Magento/Setup/src/Controller/CreateAdminAccount.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Setup\Controller;
 
diff --git a/setup/module/Magento/Setup/src/Controller/Environment.php b/setup/module/Magento/Setup/src/Controller/Environment.php
index 2205286607f5d..36f0ba789a0c6 100644
--- a/setup/module/Magento/Setup/src/Controller/Environment.php
+++ b/setup/module/Magento/Setup/src/Controller/Environment.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Setup\Controller;
 
diff --git a/setup/module/Magento/Setup/src/Controller/Install.php b/setup/module/Magento/Setup/src/Controller/Install.php
index d14ec63f98317..9d34e888f9194 100644
--- a/setup/module/Magento/Setup/src/Controller/Install.php
+++ b/setup/module/Magento/Setup/src/Controller/Install.php
@@ -15,6 +15,7 @@
 use Zend\Json\Json;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\JsonModel;
+use Zend\View\Model\ViewModel;
 
 class Install extends AbstractActionController
 {
diff --git a/setup/module/Magento/Setup/src/Controller/Navigation.php b/setup/module/Magento/Setup/src/Controller/Navigation.php
index 23c1ef1572a77..1c86b21fbb3e8 100644
--- a/setup/module/Magento/Setup/src/Controller/Navigation.php
+++ b/setup/module/Magento/Setup/src/Controller/Navigation.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Setup\Controller;
 
diff --git a/setup/module/Magento/Setup/src/Controller/ReadinessCheck.php b/setup/module/Magento/Setup/src/Controller/ReadinessCheck.php
index d02c77b43ac21..7c7b5acbede96 100644
--- a/setup/module/Magento/Setup/src/Controller/ReadinessCheck.php
+++ b/setup/module/Magento/Setup/src/Controller/ReadinessCheck.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Setup\Controller;
 
diff --git a/setup/module/Magento/Setup/src/Controller/Success.php b/setup/module/Magento/Setup/src/Controller/Success.php
index 67c87f5eca2bb..c8451a8397b95 100644
--- a/setup/module/Magento/Setup/src/Controller/Success.php
+++ b/setup/module/Magento/Setup/src/Controller/Success.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Setup\Controller;
 
diff --git a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
index 60e5f96feabde..c7708bbf10ce1 100644
--- a/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
+++ b/setup/module/Magento/Setup/src/Controller/WebConfiguration.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Setup\Controller;
 
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php b/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
index 89897dd193d7d..eca1a7d4cd119 100644
--- a/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/RouteListener.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license   {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Setup\Mvc\Console;
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php b/setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php
index 646210c4afe8a..73ca0ba368959 100644
--- a/setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/RouteMatcher.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license   {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Setup\Mvc\Console;
diff --git a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
index 2c56e63a3ec4c..8bbf4c4633635 100644
--- a/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
+++ b/setup/module/Magento/Setup/src/Mvc/Console/VerboseValidator.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright {copyright}
- * @license   {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Setup\Mvc\Console;

From be8d58683e79d18278a966a7f1ea1b2949ed6d40 Mon Sep 17 00:00:00 2001
From: Oleksandr Ivashchenko <oivashchenko@ebay.com>
Date: Thu, 11 Dec 2014 22:07:14 +0200
Subject: [PATCH 297/474] MAGETWO-31710: Exception if press "Compare" button

 - CR changes
---
 .../Controller/Product/Compare/IndexTest.php  | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php

diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
new file mode 100644
index 0000000000000..d77a02e754e5c
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Catalog\Controller\Product\Compare;
+
+use Magento\Catalog\Model\Resource\Product\Compare\Item;
+
+class IndexTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Catalog\Controller\Product\Compare\Index */
+    protected $index;
+
+    /** @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject */
+    protected $contextMock;
+
+    /** @var \Magento\Catalog\Model\Product\Compare\ItemFactory|\PHPUnit_Framework_MockObject_MockObject */
+    protected $itemFactoryMock;
+
+    /** @var Item\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject */
+    protected $collectionFactoryMock;
+
+    /** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
+    protected $sessionMock;
+
+    /** @var \Magento\Customer\Model\Visitor|\PHPUnit_Framework_MockObject_MockObject */
+    protected $visitorMock;
+
+    /** @var \Magento\Catalog\Model\Product\Compare\ListCompare|\PHPUnit_Framework_MockObject_MockObject */
+    protected $listCompareMock;
+
+    /** @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
+    protected $catalogSession;
+
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $storeManagerMock;
+
+    /** @var \Magento\Core\App\Action\FormKeyValidator|\PHPUnit_Framework_MockObject_MockObject */
+    protected $formKeyValidatorMock;
+
+    /** @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject */
+    protected $redirectFactoryMock;
+
+    /** @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject */
+    protected $pageFactoryMock;
+
+    /** @var \Magento\Catalog\Api\ProductRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $productRepositoryMock;
+
+    /** @var \Magento\Framework\Url\DecoderInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $decoderMock;
+
+    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $request;
+
+    /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $response;
+
+    protected function setUp()
+    {
+        $this->contextMock = $this->getMock('Magento\Framework\App\Action\Context',
+            ['getRequest', 'getResponse'],
+            [],
+            '',
+            false
+        );
+        $this->request = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false);
+        $this->response = $this->getMock('Magento\Framework\App\ResponseInterface', [], [], '', false);
+        $this->contextMock->expects($this->any())
+            ->method('getRequest')
+            ->willReturn($this->request);
+        $this->contextMock->expects($this->any())
+            ->method('getResponse')
+            ->willReturn($this->response);
+
+        $this->itemFactoryMock = $this->getMock('Magento\Catalog\Model\Product\Compare\ItemFactory', [], [], '', false);
+        $this->collectionFactoryMock = $this->getMock(
+            'Magento\Catalog\Model\Resource\Product\Compare\Item\CollectionFactory',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->sessionMock = $this->getMock('Magento\Customer\Model\Session', [], [], '', false);
+        $this->visitorMock = $this->getMock('Magento\Customer\Model\Visitor', [], [], '', false);
+        $this->listCompareMock = $this->getMock('Magento\Catalog\Model\Product\Compare\ListCompare', [], [], '', false);
+        $this->catalogSession = $this->getMock('Magento\Catalog\Model\Session', ['setBeforeCompareUrl'], [], '', false);
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+        $this->formKeyValidatorMock = $this->getMock('Magento\Core\App\Action\FormKeyValidator', [], [], '', false);
+        $this->redirectFactoryMock = $this->getMock(
+            'Magento\Framework\Controller\Result\RedirectFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+        $this->pageFactoryMock = $this->getMock('Magento\Framework\View\Result\PageFactory', [], [], '', false);
+        $this->productRepositoryMock = $this->getMock('Magento\Catalog\Api\ProductRepositoryInterface');
+        $this->decoderMock = $this->getMock('Magento\Framework\Url\DecoderInterface');
+
+        $this->index = new Index(
+            $this->contextMock,
+            $this->itemFactoryMock,
+            $this->collectionFactoryMock,
+            $this->sessionMock,
+            $this->visitorMock,
+            $this->listCompareMock,
+            $this->catalogSession,
+            $this->storeManagerMock,
+            $this->formKeyValidatorMock,
+            $this->redirectFactoryMock,
+            $this->pageFactoryMock,
+            $this->productRepositoryMock,
+            $this->decoderMock
+        );
+    }
+
+    public function testExecute()
+    {
+        $beforeUrl = 'test_url';
+        $this->request->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                    ['items', null, null],
+                    ['uenc', null, $beforeUrl],
+                ]);
+        $this->decoderMock->expects($this->once())
+            ->method('decode')
+            ->with($beforeUrl)
+            ->willReturn($beforeUrl . '1');
+        $this->catalogSession->expects($this->once())
+            ->method('setBeforeCompareUrl')
+            ->with($beforeUrl . '1')
+            ->willReturnSelf();
+        $this->listCompareMock->expects($this->never())->method('addProducts');
+        $this->redirectFactoryMock->expects($this->never())->method('create');
+        $this->index->execute();
+    }
+
+    public function testExecuteWithItems()
+    {
+        $this->request->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap([
+                    ['items', null, '1,2,3'],
+                    ['uenc', null, null],
+                ]);
+        $this->decoderMock->expects($this->never())->method('decode');
+        $this->catalogSession->expects($this->never())->method('setBeforeCompareUrl');
+
+        $this->listCompareMock->expects($this->once())
+            ->method('addProducts')
+            ->with([1,2,3]);
+        $redirect = $this->getMock('Magento\Framework\Controller\Result\Redirect', ['setPath'], [], '', false);
+        $redirect->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/*');
+        $this->redirectFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($redirect);
+        $this->index->execute();
+    }
+}

From e339b6a261656ac0c8573586c00ae9fe5f7f27af Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Thu, 11 Dec 2014 14:46:27 -0600
Subject: [PATCH 298/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- fix static obsolete test
- fix integration fatal error
---
 .../Controller/Adminhtml/CacheTest.php        | 92 -------------------
 .../Legacy/_files/obsolete_classes_ee.php     |  2 +-
 2 files changed, 1 insertion(+), 93 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
index 26ce2b787a2d5..c9cad685d772e 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/CacheTest.php
@@ -58,98 +58,6 @@ public function testFlushSystemAction()
         }
     }
 
-    /**
-     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_disabled.php
-     * @dataProvider massActionsDataProvider
-     * @param array $typesToEnable
-     */
-    public function testMassEnableAction($typesToEnable = [])
-    {
-        $this->getRequest()->setParams(['types' => $typesToEnable]);
-        $this->dispatch('backend/admin/cache/massEnable');
-
-        /** @var  \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList */
-        $cacheTypeList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\TypeListInterface'
-        );
-        $types = array_keys($cacheTypeList->getTypes());
-        /** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
-        $cacheState = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\StateInterface'
-        );
-        foreach ($types as $type) {
-            if (in_array($type, $typesToEnable)) {
-                $this->assertTrue($cacheState->isEnabled($type), "Type '{$type}' has not been enabled");
-            } else {
-                $this->assertFalse($cacheState->isEnabled($type), "Type '{$type}' must remain disabled");
-            }
-        }
-    }
-
-    /**
-     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_enabled.php
-     * @dataProvider massActionsDataProvider
-     * @param array $typesToDisable
-     */
-    public function testMassDisableAction($typesToDisable = [])
-    {
-        $this->getRequest()->setParams(['types' => $typesToDisable]);
-        $this->dispatch('backend/admin/cache/massDisable');
-
-        /** @var  \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList */
-        $cacheTypeList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\TypeListInterface'
-        );
-        $types = array_keys($cacheTypeList->getTypes());
-        /** @var $cacheState \Magento\Framework\App\Cache\StateInterface */
-        $cacheState = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\StateInterface'
-        );
-        foreach ($types as $type) {
-            if (in_array($type, $typesToDisable)) {
-                $this->assertFalse($cacheState->isEnabled($type), "Type '{$type}' has not been disabled");
-            } else {
-                $this->assertTrue($cacheState->isEnabled($type), "Type '{$type}' must remain enabled");
-            }
-        }
-    }
-
-    /**
-     * @magentoDataFixture Magento/Backend/controllers/_files/cache/all_types_invalidated.php
-     * @dataProvider massActionsDataProvider
-     * @param array $typesToRefresh
-     */
-    public function testMassRefreshAction($typesToRefresh = [])
-    {
-        $this->getRequest()->setParams(['types' => $typesToRefresh]);
-        $this->dispatch('backend/admin/cache/massRefresh');
-
-        /** @var $cacheTypeList \Magento\Framework\App\Cache\TypeListInterface */
-        $cacheTypeList = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Framework\App\Cache\TypeListInterface'
-        );
-        $invalidatedTypes = array_keys($cacheTypeList->getInvalidated());
-        $failed = array_intersect($typesToRefresh, $invalidatedTypes);
-        $this->assertEmpty($failed, 'Could not refresh following cache types: ' . join(', ', $failed));
-    }
-
-    /**
-     * @return array
-     */
-    public function massActionsDataProvider()
-    {
-        return [
-            'no types' => [[]],
-            'existing types' => [
-                [
-                    \Magento\Framework\App\Cache\Type\Config::TYPE_IDENTIFIER,
-                    \Magento\Framework\App\Cache\Type\Layout::TYPE_IDENTIFIER,
-                    \Magento\Framework\App\Cache\Type\Block::TYPE_IDENTIFIER,
-                ],
-            ]
-        ];
-    }
-
     /**
      * @dataProvider massActionsInvalidTypesDataProvider
      * @param $action
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes_ee.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes_ee.php
index 7566b2188cf53..301f33227b988 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes_ee.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes_ee.php
@@ -146,4 +146,4 @@
         'Magento\CustomerSegment\Block\Adminhtml\Widget\Chooser\Daterange'
     ],
     ['Magento\Pci\Model\Encryption', 'Magento\Framework\Encryption\Encryptor'],
-);
+];

From a68c0c9c8f2376561a62b5c5fcd2ccf081eedbfd Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Thu, 11 Dec 2014 14:48:30 -0600
Subject: [PATCH 299/474] MAGETWO-29419: Tax summary and detail differ by 1
 cent in invoice and credit memo for partial invoice when discount and fpt are
 applied

---
 .../Sales/sql/sales_setup/install-2.0.0.php   |  12 +
 app/code/Magento/Tax/Helper/Data.php          | 139 ++++----
 .../Weee/Model/Total/Creditmemo/Weee.php      |  16 +-
 .../Magento/Weee/Model/Total/Invoice/Weee.php |  16 +-
 .../testsuite/Magento/Tax/Helper/DataTest.php | 311 ++++++++++++------
 .../Weee/Model/Total/Creditmemo/WeeeTest.php  |  24 +-
 .../Weee/Model/Total/Invoice/WeeeTest.php     |  26 +-
 7 files changed, 356 insertions(+), 188 deletions(-)

diff --git a/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php b/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php
index 5fb8066334fd6..4f7e9d5d8fde0 100644
--- a/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php
+++ b/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php
@@ -3147,6 +3147,12 @@
     '12,4',
     [],
     'Base Hidden Tax Amount'
+)->addColumn(
+    'tax_ratio',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    512,
+    array(),
+    'Ratio of tax invoiced over tax of the order item'
 )->addIndex(
     $this->getIdxName('sales_invoice_item', ['parent_id']),
     ['parent_id']
@@ -3893,6 +3899,12 @@
     '12,4',
     [],
     'Base Hidden Tax Amount'
+)->addColumn(
+    'tax_ratio',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    512,
+    array(),
+    'Ratio of tax in the creditmemo item over tax of the order item'
 )->addIndex(
     $this->getIdxName('sales_creditmemo_item', ['parent_id']),
     ['parent_id']
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index e0ce1a0427a9e..9fc834568fc69 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -150,25 +150,25 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $priceCurrency;
 
     /**
-     * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Core\Helper\Data $coreData
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param Config $taxConfig
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Locale\FormatInterface $localeFormat
-     * @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
-     * @param \Magento\Tax\Model\Resource\Sales\Order\Tax\ItemFactory $taxItemFactory
+     * @param \Magento\Framework\App\Helper\Context                         $context
+     * @param \Magento\Core\Helper\Data                                     $coreData
+     * @param \Magento\Framework\Registry                                   $coreRegistry
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface            $scopeConfig
+     * @param Config                                                        $taxConfig
+     * @param \Magento\Store\Model\StoreManagerInterface                    $storeManager
+     * @param \Magento\Framework\Locale\FormatInterface                     $localeFormat
+     * @param \Magento\Eav\Model\Entity\AttributeFactory                    $attributeFactory
+     * @param \Magento\Tax\Model\Resource\Sales\Order\Tax\ItemFactory       $taxItemFactory
      * @param \Magento\Tax\Model\Resource\Sales\Order\Tax\CollectionFactory $orderTaxCollectionFactory
-     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @param QuoteDetailsDataBuilder $quoteDetailsBuilder
-     * @param QuoteDetailsItemDataBuilder $quoteDetailsItemBuilder
-     * @param TaxClassKeyDataBuilder $taxClassKeyBuilder
-     * @param TaxCalculationInterface $taxCalculation
-     * @param CustomerSession $customerSession
-     * @param \Magento\Catalog\Helper\Data $catalogHelper
-     * @param OrderTaxManagementInterface $orderTaxManagement
-     * @param PriceCurrencyInterface $priceCurrency
+     * @param \Magento\Framework\Locale\ResolverInterface                   $localeResolver
+     * @param QuoteDetailsDataBuilder                                       $quoteDetailsBuilder
+     * @param QuoteDetailsItemDataBuilder                                   $quoteDetailsItemBuilder
+     * @param TaxClassKeyDataBuilder                                        $taxClassKeyBuilder
+     * @param TaxCalculationInterface                                       $taxCalculation
+     * @param CustomerSession                                               $customerSession
+     * @param \Magento\Catalog\Helper\Data                                  $catalogHelper
+     * @param OrderTaxManagementInterface                                   $orderTaxManagement
+     * @param PriceCurrencyInterface                                        $priceCurrency
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
@@ -223,6 +223,7 @@ public function getPostCodeSubStringLength()
         if ($len <= 0) {
             $len = 10;
         }
+
         return $len;
     }
 
@@ -239,8 +240,8 @@ public function getConfig()
     /**
      * Check if product prices inputed include tax
      *
-     * @param   null|int|string|Store $store
-     * @return  bool
+     * @param  null|int|string|Store $store
+     * @return bool
      */
     public function priceIncludesTax($store = null)
     {
@@ -250,8 +251,8 @@ public function priceIncludesTax($store = null)
     /**
      * Check what taxes should be applied after discount
      *
-     * @param   null|int|string|Store $store
-     * @return  bool
+     * @param  null|int|string|Store $store
+     * @return bool
      */
     public function applyTaxAfterDiscount($store = null)
     {
@@ -264,7 +265,7 @@ public function applyTaxAfterDiscount($store = null)
      *  2 - Including tax
      *  3 - Both
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return int
      */
     public function getPriceDisplayType($store = null)
@@ -276,7 +277,7 @@ public function getPriceDisplayType($store = null)
      * Check if necessary do product price conversion
      * If it necessary will be returned conversion type (minus or plus)
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function needPriceConversion($store = null)
@@ -287,7 +288,7 @@ public function needPriceConversion($store = null)
     /**
      * Check if need display full tax summary information in totals block
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displayFullSummary($store = null)
@@ -298,7 +299,7 @@ public function displayFullSummary($store = null)
     /**
      * Check if need display zero tax in subtotal
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displayZeroTax($store = null)
@@ -309,7 +310,7 @@ public function displayZeroTax($store = null)
     /**
      * Check if need display cart prices included tax
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displayCartPriceInclTax($store = null)
@@ -320,7 +321,7 @@ public function displayCartPriceInclTax($store = null)
     /**
      * Check if need display cart prices excluding price
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displayCartPriceExclTax($store = null)
@@ -331,7 +332,7 @@ public function displayCartPriceExclTax($store = null)
     /**
      * Check if need display cart prices excluding and including tax
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displayCartBothPrices($store = null)
@@ -342,7 +343,7 @@ public function displayCartBothPrices($store = null)
     /**
      * Check if need display order prices included tax
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displaySalesPriceInclTax($store = null)
@@ -353,7 +354,7 @@ public function displaySalesPriceInclTax($store = null)
     /**
      * Check if need display order prices excluding price
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displaySalesPriceExclTax($store = null)
@@ -364,7 +365,7 @@ public function displaySalesPriceExclTax($store = null)
     /**
      * Check if need display order prices excluding and including tax
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displaySalesBothPrices($store = null)
@@ -375,7 +376,7 @@ public function displaySalesBothPrices($store = null)
     /**
      * Check if we need display price include and exclude tax for order/invoice subtotal
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displaySalesSubtotalBoth($store = null)
@@ -386,7 +387,7 @@ public function displaySalesSubtotalBoth($store = null)
     /**
      * Check if we need display price include tax for order/invoice subtotal
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displaySalesSubtotalInclTax($store = null)
@@ -397,7 +398,7 @@ public function displaySalesSubtotalInclTax($store = null)
     /**
      * Check if we need display price exclude tax for order/invoice subtotal
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return bool
      */
     public function displaySalesSubtotalExclTax($store = null)
@@ -408,7 +409,7 @@ public function displaySalesSubtotalExclTax($store = null)
     /**
      * Get prices javascript format json
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return string
      */
     public function getPriceFormat($store = null)
@@ -419,6 +420,7 @@ public function getPriceFormat($store = null)
         if ($store) {
             $priceFormat['pattern'] = $this->_storeManager->getStore($store)->getCurrentCurrency()->getOutputFormat();
         }
+
         return $this->_coreData->jsonEncode($priceFormat);
     }
 
@@ -456,7 +458,7 @@ public function displayBothPrices($store = null)
     /**
      * Check if shipping prices include tax
      *
-     * @param null|string|bool|int|Store $store
+     * @param  null|string|bool|int|Store $store
      * @return bool
      */
     public function shippingPriceIncludesTax($store = null)
@@ -467,7 +469,7 @@ public function shippingPriceIncludesTax($store = null)
     /**
      * Get shipping price display type
      *
-     * @param null|string|bool|int|Store $store
+     * @param  null|string|bool|int|Store $store
      * @return int
      */
     public function getShippingPriceDisplayType($store = null)
@@ -508,7 +510,7 @@ public function displayShippingBothPrices()
     /**
      * Get tax class id specified for shipping tax estimation
      *
-     * @param null|string|bool|int|Store $store
+     * @param  null|string|bool|int|Store $store
      * @return int
      */
     public function getShippingTaxClass($store)
@@ -519,11 +521,11 @@ public function getShippingTaxClass($store)
     /**
      * Get shipping price
      *
-     * @param float $price
-     * @param bool|null $includingTax
-     * @param Address|null $shippingAddress
-     * @param int|null $ctc
-     * @param null|string|bool|int|Store $store
+     * @param  float                      $price
+     * @param  bool|null                  $includingTax
+     * @param  Address|null               $shippingAddress
+     * @param  int|null                   $ctc
+     * @param  null|string|bool|int|Store $store
      * @return float
      */
     public function getShippingPrice($price, $includingTax = null, $shippingAddress = null, $ctc = null, $store = null)
@@ -546,13 +548,14 @@ public function getShippingPrice($price, $includingTax = null, $shippingAddress
             $store,
             $this->shippingPriceIncludesTax($store)
         );
+
         return $price;
     }
 
     /**
      * Get configuration setting "Apply Discount On Prices Including Tax" value
      *
-     * @param null|string|bool|int|Store $store
+     * @param  null|string|bool|int|Store $store
      * @return bool
      */
     public function discountTax($store = null)
@@ -563,7 +566,7 @@ public function discountTax($store = null)
     /**
      * Get value of "Apply Tax On" custom/original price configuration settings
      *
-     * @param null|string|bool|int|Store $store
+     * @param  null|string|bool|int|Store $store
      * @return string|null
      */
     public function getTaxBasedOn($store = null)
@@ -578,12 +581,12 @@ public function getTaxBasedOn($store = null)
     /**
      * Check if tax can be applied to custom price
      *
-     * @param null|string|bool|int|Store $store
+     * @param  null|string|bool|int|Store $store
      * @return bool
      */
     public function applyTaxOnCustomPrice($store = null)
     {
-        return (int)$this->_scopeConfig->getValue(
+        return (int) $this->_scopeConfig->getValue(
             Config::CONFIG_XML_PATH_APPLY_ON,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -593,12 +596,12 @@ public function applyTaxOnCustomPrice($store = null)
     /**
      * Check if tax should be applied just to original price
      *
-     * @param null|string|bool|int|Store $store
+     * @param  null|string|bool|int|Store $store
      * @return bool
      */
     public function applyTaxOnOriginalPrice($store = null)
     {
-        return (int)$this->_scopeConfig->getValue(
+        return (int) $this->_scopeConfig->getValue(
             Config::CONFIG_XML_PATH_APPLY_ON,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
@@ -611,7 +614,7 @@ public function applyTaxOnOriginalPrice($store = null)
      * This sequence depends on "Catalog price include tax", "Apply Tax After Discount"
      * and "Apply Discount On Prices Including Tax" configuration options.
      *
-     * @param null|int|string|Store $store
+     * @param  null|int|string|Store $store
      * @return string
      */
     public function getCalculationSequence($store = null)
@@ -622,7 +625,7 @@ public function getCalculationSequence($store = null)
     /**
      * Get tax calculation algorithm code
      *
-     * @param null|string|bool|int|Store $store
+     * @param  null|string|bool|int|Store $store
      * @return string
      */
     public function getCalculationAgorithm($store = null)
@@ -643,7 +646,7 @@ public function getCalculationAgorithm($store = null)
      *  )
      * )
      *
-     * @param \Magento\Sales\Model\Order|\Magento\Sales\Model\Order\Invoice|\Magento\Sales\Model\Order\Creditmemo $source
+     * @param  \Magento\Sales\Model\Order|\Magento\Sales\Model\Order\Invoice|\Magento\Sales\Model\Order\Creditmemo $source
      * @return array
      */
     public function getCalculatedTaxes($source)
@@ -683,9 +686,9 @@ public function getCalculatedTaxes($source)
      *  )
      * )
      *
-     * @param array $taxClassAmount
-     * @param OrderTaxDetailsItemInterface $itemTaxDetail
-     * @param float $ratio
+     * @param  array                        $taxClassAmount
+     * @param  OrderTaxDetailsItemInterface $itemTaxDetail
+     * @param  float                        $ratio
      * @return array
      */
     private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
@@ -709,13 +712,14 @@ private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $
                 $taxClassAmount[$taxCode]['base_tax_amount'] += $baseTaxAmount;
             }
         }
+
         return $taxClassAmount;
     }
 
     /**
      * Returns the array of tax rates for the order
      *
-     * @param \Magento\Sales\Model\Order $order
+     * @param  \Magento\Sales\Model\Order $order
      * @return array
      */
     protected function _getTaxRateSubtotals($order)
@@ -752,16 +756,16 @@ public function getDefaultProductTaxClass()
     /**
      * Return whether cross border trade is enabled or not
      *
-     * @param   null|int|string|Store $store
-     * @return  bool
+     * @param  null|int|string|Store $store
+     * @return bool
      */
     public function isCrossBorderTradeEnabled($store = null)
     {
-        return (bool)$this->_config->crossBorderTradeEnabled($store);
+        return (bool) $this->_config->crossBorderTradeEnabled($store);
     }
 
     /**
-     * @param EntityInterface $current
+     * @param  EntityInterface $current
      * @return array
      */
     protected function calculateTaxForOrder(EntityInterface $current)
@@ -777,12 +781,13 @@ protected function calculateTaxForOrder(EntityInterface $current)
             $taxClassAmount[$taxCode]['title'] = $appliedTax->getTitle();
             $taxClassAmount[$taxCode]['percent'] = $appliedTax->getPercent();
         }
+
         return $taxClassAmount;
     }
 
     /**
-     * @param EntityInterface $order
-     * @param EntityInterface $salesItem
+     * @param  EntityInterface $order
+     * @param  EntityInterface $salesItem
      * @return array
      */
     protected function calculateTaxForItems(EntityInterface $order, EntityInterface $salesItem)
@@ -828,13 +833,17 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
                 } elseif ($itemTaxDetail->getAssociatedItemId() == $orderItemId) {
                     $taxableItemType = $itemTaxDetail->getType();
                     $ratio = $itemRatio;
-                    if ($item->getTaxRatio() && isset($item->getTaxRatio()[$taxableItemType])) {
-                        $ratio = $item->getTaxRatio()[$taxableItemType];
+                    if ($item->getTaxRatio()) {
+                        $taxRatio = unserialize($item->getTaxRatio());
+                        if (isset($taxRatio[$taxableItemType])) {
+                            $ratio = $taxRatio[$taxableItemType];
+                        }
                     }
                     $taxClassAmount = $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $ratio);
                 }
             }
         }
+
         return $taxClassAmount;
     }
 }
diff --git a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
index 655bc0a6c6146..0dfc5cebce1c6 100644
--- a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
@@ -24,7 +24,7 @@ class Weee extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
      * attributes This behavior may change in child classes
      *
      * @param \Magento\Weee\Helper\Data $weeeData
-     * @param array $data
+     * @param array                     $data
      */
     public function __construct(\Magento\Weee\Helper\Data $weeeData, array $data = [])
     {
@@ -35,7 +35,7 @@ public function __construct(\Magento\Weee\Helper\Data $weeeData, array $data = [
     /**
      * Collect Weee amounts for the credit memo
      *
-     * @param Creditmemo $creditmemo
+     * @param  Creditmemo $creditmemo
      * @return $this
      */
     public function collect(Creditmemo $creditmemo)
@@ -113,12 +113,12 @@ public function collect(Creditmemo $creditmemo)
             //Set the ratio of the tax amount in invoice item compared to tax amount in order item
             //This information is needed to calculate tax per tax rate later
             if ($orderItemTaxAmount != 0) {
-                if (!$item->getTaxRatio()) {
-                    $item->setTaxRatio([]);
+                $taxRatio = [];
+                if ($item->getTaxRatio()) {
+                    $taxRatio = unserialize($item->getTaxRatio());
                 }
-                $taxRatio = $item->getTaxRatio();
                 $taxRatio[\Magento\Weee\Model\Total\Quote\Weee::ITEM_TYPE] = $itemTaxAmount / $orderItemTaxAmount;
-                $item->setTaxRatio($taxRatio);
+                $item->setTaxRatio(serialize($taxRatio));
             }
 
             $totalWeeeAmountInclTax += $weeeAmountInclTax;
@@ -128,11 +128,11 @@ public function collect(Creditmemo $creditmemo)
             $applied = $this->_weeeData->getApplied($orderItem);
             foreach ($applied as $one) {
                 $title = $one['title'];
-                $one['base_row_amount'] = $creditmemo->roundPrice($one['base_row_amount'] * $ratio, $title . '_base');
+                $one['base_row_amount'] = $creditmemo->roundPrice($one['base_row_amount'] * $ratio, $title.'_base');
                 $one['row_amount'] = $creditmemo->roundPrice($one['row_amount'] * $ratio, $title);
                 $one['base_row_amount_incl_tax'] = $creditmemo->roundPrice(
                     $one['base_row_amount_incl_tax'] * $ratio,
-                    $title . '_base'
+                    $title.'_base'
                 );
                 $one['row_amount_incl_tax'] = $creditmemo->roundPrice($one['row_amount_incl_tax'] * $ratio, $title);
 
diff --git a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
index 14aa8c37feddb..d0539a81325c0 100644
--- a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
@@ -22,7 +22,7 @@ class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
      * attributes This behavior may change in child classes
      *
      * @param \Magento\Weee\Helper\Data $weeeData
-     * @param array $data
+     * @param array                     $data
      */
     public function __construct(\Magento\Weee\Helper\Data $weeeData, array $data = [])
     {
@@ -33,7 +33,7 @@ public function __construct(\Magento\Weee\Helper\Data $weeeData, array $data = [
     /**
      * Collect Weee amounts for the invoice
      *
-     * @param \Magento\Sales\Model\Order\Invoice $invoice
+     * @param  \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
      */
     public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
@@ -87,12 +87,12 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
             //Set the ratio of the tax amount in invoice item compared to tax amount in order item
             //This information is needed to calculate tax per tax rate later
             if ($orderItemWeeeTax != 0) {
-                if (!$item->getTaxRatio()) {
-                    $item->setTaxRatio([]);
+                $taxRatio = [];
+                if ($item->getTaxRatio()) {
+                    $taxRatio = unserialize($item->getTaxRatio());
                 }
-                $taxRatio = $item->getTaxRatio();
                 $taxRatio[\Magento\Weee\Model\Total\Quote\Weee::ITEM_TYPE] = $itemWeeeTax / $orderItemWeeeTax;
-                $item->setTaxRatio($taxRatio);
+                $item->setTaxRatio(serialize($taxRatio));
             }
 
             $item->setWeeeTaxAppliedRowAmount($weeeAmount);
@@ -101,11 +101,11 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
             $applied = $this->_weeeData->getApplied($orderItem);
             foreach ($applied as $one) {
                 $title = $one['title'];
-                $one['base_row_amount'] = $invoice->roundPrice($one['base_row_amount'] * $ratio, $title . '_base');
+                $one['base_row_amount'] = $invoice->roundPrice($one['base_row_amount'] * $ratio, $title.'_base');
                 $one['row_amount'] = $invoice->roundPrice($one['row_amount'] * $ratio, $title);
                 $one['base_row_amount_incl_tax'] = $invoice->roundPrice(
                     $one['base_row_amount_incl_tax'] * $ratio,
-                    $title . '_base'
+                    $title.'_base'
                 );
                 $one['row_amount_incl_tax'] = $invoice->roundPrice($one['row_amount_incl_tax'] * $ratio, $title);
 
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
index 02534b33c9d4f..472ed49c19c8f 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
@@ -4,7 +4,8 @@
  */
 namespace Magento\Tax\Helper;
 
-use Magento\Sales\Model\Quote\Address;
+use Magento\Framework\Object as MagentoObject;
+use Magento\TestFramework\Event\Magento;
 
 /**
  * Class DataTest
@@ -32,6 +33,7 @@ public function setUp()
         $this->priceCurrencyMock = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')
             ->disableOriginalConstructor()
             ->getMock();
+
         $this->helper = $objectManager->getObject(
             'Magento\Tax\Helper\Data',
             [
@@ -114,52 +116,79 @@ public function testGetCalculatedTaxesForOrder()
         $this->assertEquals($itemPercent, $result[0]['percent']);
     }
 
-    public function testGetCalculatedTaxesForOrderItems()
+    /**
+     * Creat OrderTaxDetails mock from array of data
+     *
+     * @param $inputArray
+     * @return \PHPUnit_Framework_MockObject_MockObject|\Magento\Tax\Api\Data\OrderTaxDetailsInterface
+     */
+    protected function mapOrderTaxItemDetail($inputArray)
     {
-        $orderId = 1;
-        $itemShippingTaxAmount = 1;
-        $orderShippingTaxAmount = 1;
-        $itemCode = 'test_code';
-        $itemAmount = 1;
-        $itemBaseAmount = 2;
-        $itemTitle = 'Test title';
-        $itemPercent = 0.1;
-        $failedTaxAmount = "0.00000";
-
-        $expectedAmount = 2;
-        $expectedBaseAmount = 4;
-
-        $orderDetailsItemNormal = $this->getMockBuilder('Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface')
-            ->disableOriginalConstructor()
+        $orderTaxItemDetailsMock = $this->getMockBuilder('\Magento\Tax\Api\Data\OrderTaxDetailsInterface')
             ->getMock();
-        $orderDetailsItemNormal->expects($this->once())
-            ->method('getCode')
-            ->willReturn($itemCode);
-        $orderDetailsItemNormal->expects($this->once())
-            ->method('getAmount')
-            ->willReturn($itemAmount);
-        $orderDetailsItemNormal->expects($this->once())
-            ->method('getBaseAmount')
-            ->willReturn($itemBaseAmount);
-        $orderDetailsItemNormal->expects($this->once())
-            ->method('getTitle')
-            ->willReturn($itemTitle);
-        $orderDetailsItemNormal->expects($this->once())
-            ->method('getPercent')
-            ->willReturn($itemPercent);
+        $itemMocks = [];
+        foreach ($inputArray['items'] as $orderTaxDetailsItemData) {
+            $itemId = isset($orderTaxDetailsItemData['item_id']) ? $orderTaxDetailsItemData['item_id'] : null;
+            $associatedItemId = isset($orderTaxDetailsItemData['associated_item_id'])
+                ? $orderTaxDetailsItemData['associated_item_id']
+                : null;
+            $itemType = isset($orderTaxDetailsItemData['type']) ? $orderTaxDetailsItemData['type'] : null;
+            $appliedTaxesData = $orderTaxDetailsItemData['applied_taxes'];
+            $appliedTaxesMocks = [];
+            foreach ($appliedTaxesData as $appliedTaxData) {
+                $appliedTaxesMock = $this->getMockBuilder('\Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface')
+                    ->getMock();
+                $appliedTaxesMock->expects($this->any())
+                    ->method('getAmount')
+                    ->will($this->returnValue($appliedTaxData['amount']));
+                $appliedTaxesMock->expects($this->any())
+                    ->method('getBaseAmount')
+                    ->will($this->returnValue($appliedTaxData['base_amount']));
+                $appliedTaxesMock->expects($this->any())
+                    ->method('getCode')
+                    ->will($this->returnValue($appliedTaxData['code']));
+                $appliedTaxesMock->expects($this->any())
+                    ->method('getTitle')
+                    ->will($this->returnValue($appliedTaxData['title']));
+                $appliedTaxesMock->expects($this->any())
+                    ->method('getPercent')
+                    ->will($this->returnValue($appliedTaxData['percent']));
+                $appliedTaxesMocks[] = $appliedTaxesMock;
+            }
+            $orderTaxDetailsItemMock = $this->getMockBuilder('\Magento\Tax\Api\Data\OrderTaxDetailsItemInterface')
+                ->getMock();
+            $orderTaxDetailsItemMock->expects($this->any())
+                ->method('getItemId')
+                ->will($this->returnValue($itemId));
+            $orderTaxDetailsItemMock->expects($this->any())
+                ->method('getAssociatedItemId')
+                ->will($this->returnValue($associatedItemId));
+            $orderTaxDetailsItemMock->expects($this->any())
+                ->method('getType')
+                ->will($this->returnValue($itemType));
+            $orderTaxDetailsItemMock->expects($this->any())
+                ->method('getAppliedTaxes')
+                ->will($this->returnValue($appliedTaxesMocks));
 
-        $orderDetailsItemZeroAmount = $this->getMockBuilder('Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderDetailsItemZeroAmount->expects($this->once())
-            ->method('getAmount')
-            ->willReturn(0);
-        $orderDetailsItemZeroAmount->expects($this->once())
-            ->method('getBaseAmount')
-            ->willReturn(0);
+            $itemMocks[] = $orderTaxDetailsItemMock;
+        }
+        $orderTaxItemDetailsMock->expects($this->any())
+            ->method('getItems')
+            ->will($this->returnValue($itemMocks));
 
-        $appliedTaxes = [$orderDetailsItemNormal, $orderDetailsItemZeroAmount];
+        return $orderTaxItemDetailsMock;
+    }
+
+    /**
+     * @dataProvider getCalculatedTaxesForOrderItemsDataProvider
+     */
+    public function testGetCalculatedTaxesForOrderItems($orderData, $invoiceData, $expectedResults)
+    {
+        $orderId = $orderData['order_id'];
+        $orderShippingTaxAmount = isset($orderData['shipping_tax_amount']) ? $orderData['shipping_tax_amount'] : 0;
+        $orderTaxDetails = $orderData['order_tax_details'];
 
+        /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Sales\Model\Order $orderMock */
         $orderMock = $this->getMockBuilder('Magento\Sales\Model\Order')
             ->disableOriginalConstructor()
             ->getMock();
@@ -170,46 +199,17 @@ public function testGetCalculatedTaxesForOrderItems()
             ->method('getShippingTaxAmount')
             ->willReturn($orderShippingTaxAmount);
 
-        $taxDetailsData = $this->getMockBuilder('Magento\Tax\Api\Data\OrderTaxDetailsItemInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $taxDetailsData->expects($this->once())
-            ->method('getType')
-            ->willReturn(Address::TYPE_SHIPPING);
-        $taxDetailsData->expects($this->once())
-            ->method('getAppliedTaxes')
-            ->willReturn($appliedTaxes);
-
-        $orderDetails = $this->getMockBuilder('Magento\Tax\Api\Data\OrderTaxDetailsInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderDetails->expects($this->once())
-            ->method('getItems')
-            ->willReturn([$taxDetailsData]);
-
-        $this->orderTaxManagementMock->expects($this->once())
+        $orderTaxDetailsMock = $this->mapOrderTaxItemDetail($orderTaxDetails);
+        $this->orderTaxManagementMock->expects($this->any())
             ->method('getOrderTaxDetails')
             ->with($orderId)
-            ->willReturn($orderDetails);
-
-        $orderItemMock = $this->getMockBuilder('Magento\Sales\Model\Order\Item')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $orderItemMock->expects($this->once())
-            ->method('getTaxAmount')
-            ->willReturn($failedTaxAmount);
+            ->will($this->returnValue($orderTaxDetailsMock));
 
-        $invoiceItemFailed = $this->getMockBuilder('Magento\Sales\Model\Order\Invoice\Item')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $invoiceItemFailed->expects($this->once())
-            ->method('getOrderItem')
-            ->willReturn($orderItemMock);
-        $invoiceItemFailed->expects($this->once())
-            ->method('getTaxAmount')
-            ->willReturn(1);
-
-        $source = $this->getMockBuilder('Magento\Sales\Model\Order\Creditmemo')
+        $invoiceShippingTaxAmount =
+            isset($invoiceData['shipping_tax_amount']) ? $invoiceData['shipping_tax_amount'] : 0;
+        $invoiceItems = $invoiceData['invoice_items'];
+        /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Sales\Model\Order\Invoice $source */
+        $source = $this->getMockBuilder('Magento\Sales\Model\Order\Invoice')
             ->disableOriginalConstructor()
             ->getMock();
         $source->expects($this->once())
@@ -217,24 +217,151 @@ public function testGetCalculatedTaxesForOrderItems()
             ->willReturn($orderMock);
         $source->expects($this->once())
             ->method('getShippingTaxAmount')
-            ->willReturn($itemShippingTaxAmount);
+            ->willReturn($invoiceShippingTaxAmount);
         $source->expects($this->once())
             ->method('getItemsCollection')
-            ->willReturn([$invoiceItemFailed]);
+            ->willReturn($invoiceItems);
 
-        $roundValues = [
-            [$itemAmount, $expectedAmount],
-            [$itemBaseAmount, $expectedBaseAmount],
-        ];
-        $this->priceCurrencyMock->expects($this->exactly(2))
+        $this->priceCurrencyMock->expects($this->any())
             ->method('round')
-            ->will($this->returnValueMap($roundValues));
+            ->will($this->returnCallback(function ($arg) {return round($arg, 2);}));
 
         $result = $this->helper->getCalculatedTaxes($source);
-        $this->assertCount(1, $result);
-        $this->assertEquals($expectedAmount, $result[0]['tax_amount']);
-        $this->assertEquals($expectedBaseAmount, $result[0]['base_tax_amount']);
-        $this->assertEquals($itemTitle, $result[0]['title']);
-        $this->assertEquals($itemPercent, $result[0]['percent']);
+        foreach ($result as $index => $appliedTax) {
+            $expectedTax = $expectedResults[$index];
+            foreach ($appliedTax as $attr => $value) {
+                $this->assertEquals($expectedTax[$attr], $value, "The ".$attr." of tax does not match");
+            }
+        }
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return array
+     */
+    public function getCalculatedTaxesForOrderItemsDataProvider()
+    {
+        $data = [
+            //Scenario 1: two items, one item with 0 tax
+            'two_items_with_one_zero_tax' => [
+                'order' => [
+                    'order_id' => 1,
+                    'shipping_tax_amount' => 0,
+                    'order_tax_details' => [
+                            'items' => [
+                                'itemTax1' => [
+                                    'item_id' => 1,
+                                    'applied_taxes' => [
+                                        [
+                                            'amount' => 5.0,
+                                            'base_amount' => 5.0,
+                                            'code' => 'US-CA',
+                                            'title' => 'US-CA-Sales-Tax',
+                                            'percent' => 20.0,
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                ],
+                'invoice' => [
+                    'invoice_items' => [
+                        'item1' => new MagentoObject(
+                                [
+                                    'order_item' => new MagentoObject(
+                                            [
+                                                'id' => 1,
+                                                'tax_amount' => 5.00,
+                                            ]
+                                        ),
+                                    'tax_amount' => 2.50,
+                                ]
+                            ),
+                        'item2' => new MagentoObject(
+                                [
+                                    'order_item' => new MagentoObject(
+                                            [
+                                                'id' => 2,
+                                                'tax_amount' => 0.0,
+                                            ]
+                                        ),
+                                    'tax_amount' => 0.0,
+                                ]
+                            ),
+                    ],
+                ],
+                'expected_results' => [
+                    [
+                        'title' => 'US-CA-Sales-Tax',
+                        'percent' => 20.0,
+                        'tax_amount' => 2.5,
+                        'base_tax_amount' => 2.5,
+                    ],
+                ],
+            ],
+            //Scenario 2: one item with associated weee tax
+            'item_with_weee_tax_partial_invoice' => [
+                'order' => [
+                    'order_id' => 1,
+                    'shipping_tax_amount' => 0,
+                    'order_tax_details' => [
+                            'items' => [
+                                'itemTax1' => [
+                                    'item_id' => 1,
+                                    'applied_taxes' => [
+                                        [
+                                            'amount' => 5.0,
+                                            'base_amount' => 5.0,
+                                            'code' => 'US-CA',
+                                            'title' => 'US-CA-Sales-Tax',
+                                            'percent' => 20.0,
+                                        ],
+                                    ],
+                                ],
+                                'weeeTax1' => [
+                                    'associated_item_id' => 1,
+                                    'type' => 'weee',
+                                    'applied_taxes' => [
+                                        [
+                                            'amount' => 3.0,
+                                            'base_amount' => 3.0,
+                                            'code' => 'US-CA',
+                                            'title' => 'US-CA-Sales-Tax',
+                                            'percent' => 20.0,
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                ],
+                'invoice' => [
+                    'invoice_items' => [
+                        'item1' => new MagentoObject(
+                                [
+                                    'order_item' => new MagentoObject(
+                                            [
+                                                'id' => 1,
+                                                'tax_amount' => 5.00,
+                                            ]
+                                        ),
+                                    'tax_amount' => 5.0,
+                                    //half of weee tax is invoiced
+                                    'tax_ratio' => serialize(['weee' => 0.5]),
+                                ]
+                            ),
+                    ],
+                ],
+                'expected_results' => [
+                    [
+                        'title' => 'US-CA-Sales-Tax',
+                        'percent' => 20.0,
+                        'tax_amount' => 6.5,
+                        'base_tax_amount' => 6.5,
+                    ],
+                ],
+            ],
+        ];
+
+        return $data;
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Creditmemo/WeeeTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Creditmemo/WeeeTest.php
index eee57aaca2407..789fbbe420c51 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Creditmemo/WeeeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Creditmemo/WeeeTest.php
@@ -4,7 +4,6 @@
  */
 namespace Magento\Weee\Model\Total\Creditmemo;
 
-
 class WeeeTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -128,6 +127,7 @@ function ($price, $type) use (&$roundingDelta) {
                     }
                     $roundedPrice = round($price + $roundingDelta[$type], 2);
                     $roundingDelta[$type] = $price - $roundedPrice;
+
                     return $roundedPrice;
                 }
             ));
@@ -139,18 +139,24 @@ function ($price, $type) use (&$roundingDelta) {
             $this->assertEquals(
                 $value,
                 $this->creditmemo->getData($key),
-                'Creditmemo data field ' . $key . ' is incorrect'
+                'Creditmemo data field '.$key.' is incorrect'
             );
         }
         //verify invoice item data
         foreach ($expectedResults['creditmemo_items'] as $itemKey => $itemData) {
             $creditmemoItem = $creditmemoItems[$itemKey];
             foreach ($itemData as $key => $value) {
-                $this->assertEquals(
-                    $value,
-                    $creditmemoItem->getData($key),
-                    'Creditmemo item field ' . $key . ' is incorrect'
-                );
+                if ($key == 'tax_ratio') {
+                    $taxRatio = unserialize($creditmemoItem->getData($key));
+                    $expectedTaxRatio = unserialize($itemData[$key]);
+                    $this->assertEquals($expectedTaxRatio['weee'], $taxRatio['weee'], "Tax ratio is incorrect");
+                } else {
+                    $this->assertEquals(
+                        $value,
+                        $creditmemoItem->getData($key),
+                        'Creditmemo item field '.$key.' is incorrect'
+                    );
+                }
             }
         }
     }
@@ -226,6 +232,7 @@ public function collectDataProvider()
                                 'row_amount_incl_tax' => 32.47,
                             ],
                         ],
+                        'tax_ratio' => serialize(['weee' => 1.0]),
                         'weee_tax_applied_row_amount' => 30,
                         'base_weee_tax_applied_row_amount' => 30,
 
@@ -309,6 +316,7 @@ public function collectDataProvider()
                                 'row_amount_incl_tax' => 21.65,
                             ],
                         ],
+                        'tax_ratio' => serialize(['weee' => 1.65 / 2.47]),
                         'weee_tax_applied_row_amount' => 20,
                         'base_weee_tax_applied_row_amount' => 20,
 
@@ -392,6 +400,7 @@ public function collectDataProvider()
                                 'row_amount_incl_tax' => 10.82,
                             ],
                         ],
+                        'tax_ratio' => serialize(['weee' => 0.83 / 2.47]),
                         'weee_tax_applied_row_amount' => 10,
                         'base_weee_tax_applied_row_amount' => 10,
 
@@ -410,6 +419,7 @@ public function collectDataProvider()
                 ],
             ],
         ];
+
         return $result;
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Invoice/WeeeTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Invoice/WeeeTest.php
index cc1c0ad19bc72..8325747574ad7 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Invoice/WeeeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Total/Invoice/WeeeTest.php
@@ -4,7 +4,6 @@
  */
 namespace Magento\Weee\Model\Total\Invoice;
 
-
 class WeeeTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -135,6 +134,7 @@ function ($price, $type) use (&$roundingDelta) {
                     }
                     $roundedPrice = round($price + $roundingDelta[$type], 2);
                     $roundingDelta[$type] = $price - $roundedPrice;
+
                     return $roundedPrice;
                 }
             ));
@@ -143,17 +143,23 @@ function ($price, $type) use (&$roundingDelta) {
 
         //verify invoice data
         foreach ($expectedResults['invoice_data'] as $key => $value) {
-            $this->assertEquals($value, $this->invoice->getData($key), 'Invoice data field ' . $key . ' is incorrect');
+            $this->assertEquals($value, $this->invoice->getData($key), 'Invoice data field '.$key.' is incorrect');
         }
         //verify invoice item data
         foreach ($expectedResults['invoice_items'] as $itemKey => $itemData) {
             $invoiceItem = $invoiceItems[$itemKey];
             foreach ($itemData as $key => $value) {
-                $this->assertEquals(
-                    $value,
-                    $invoiceItem->getData($key),
-                    'Invoice item field ' . $key . ' is incorrect'
-                );
+                if ($key == 'tax_ratio') {
+                    $taxRatio = unserialize($invoiceItem->getData($key));
+                    $expectedTaxRatio = unserialize($itemData[$key]);
+                    $this->assertEquals($expectedTaxRatio['weee'], $taxRatio['weee'], "Tax ratio is incorrect");
+                } else {
+                    $this->assertEquals(
+                        $value,
+                        $invoiceItem->getData($key),
+                        'Invoice item field '.$key.' is incorrect'
+                    );
+                }
             }
         }
     }
@@ -250,7 +256,7 @@ public function collectDataProvider()
                         ],
                         'weee_tax_applied_row_amount' => 30,
                         'base_weee_tax_applied_row_amount' => 30,
-
+                        'tax_ratio' => serialize(['weee' => 1.0]),
                     ],
                 ],
                 'invoice_data' => [
@@ -350,6 +356,7 @@ public function collectDataProvider()
                                 'row_amount_incl_tax' => 21.65,
                             ],
                         ],
+                        'tax_ratio' => serialize(['weee' => 1.65 / 2.47]),
                         'weee_tax_applied_row_amount' => 20,
                         'base_weee_tax_applied_row_amount' => 20,
 
@@ -453,6 +460,7 @@ public function collectDataProvider()
                                 'row_amount_incl_tax' => 10.82,
                             ],
                         ],
+                        'tax_ratio' => serialize(['weee' => 0.82 / 2.47]),
                         'weee_tax_applied_row_amount' => 10,
                         'base_weee_tax_applied_row_amount' => 10,
 
@@ -556,6 +564,7 @@ public function collectDataProvider()
                                 'row_amount_incl_tax' => 10.82,
                             ],
                         ],
+                        'tax_ratio' => serialize(['weee' => 0.83 / 2.47]),
                         'weee_tax_applied_row_amount' => 10,
                         'base_weee_tax_applied_row_amount' => 10,
 
@@ -574,6 +583,7 @@ public function collectDataProvider()
                 ],
             ],
         ];
+
         return $result;
     }
 

From 2af3306223cd19f843510e7d79aa9c818582b539 Mon Sep 17 00:00:00 2001
From: Yuxing Zheng <yuxzheng@ebay.com>
Date: Thu, 11 Dec 2014 15:21:38 -0600
Subject: [PATCH 300/474] MAGETWO-31119: Doubled error message when create
 admin role

 - Fixed the issue where error messages were added to exception twice
---
 lib/internal/Magento/Framework/Model/AbstractModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index 9bf7cd8b94129..cf2ebfd60db19 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -448,7 +448,7 @@ public function validateBeforeSave()
         $validator = $this->_getValidatorBeforeSave();
         if ($validator && !$validator->isValid($this)) {
             $errors = $validator->getMessages();
-            $exception = new \Magento\Framework\Model\Exception(implode(PHP_EOL, $errors));
+            $exception = new \Magento\Framework\Model\Exception();
             foreach ($errors as $errorMessage) {
                 $exception->addMessage(new \Magento\Framework\Message\Error($errorMessage));
             }

From 8f10fcdb753b872d3f1387f7160f70a0e44b619f Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Thu, 11 Dec 2014 15:36:35 -0600
Subject: [PATCH 301/474] MAGETWO-31413: Mainline Contribution of Bug Fixes

- fix code style
---
 app/code/Magento/Pbridge/Model/Encryption.php |  2 +-
 .../Adminhtml/Cache/MassActionTest.php        | 26 +++++++++----------
 .../Magento/Framework/TranslateTest.php       |  2 +-
 .../Framework/Encryption/EncryptorTest.php    | 22 ++++++++--------
 .../Framework/Encryption/Encryptor.php        |  2 +-
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/code/Magento/Pbridge/Model/Encryption.php b/app/code/Magento/Pbridge/Model/Encryption.php
index 98a812fb2a72f..d727cf6c87add 100644
--- a/app/code/Magento/Pbridge/Model/Encryption.php
+++ b/app/code/Magento/Pbridge/Model/Encryption.php
@@ -23,7 +23,7 @@ public function __construct(
         $key
     ) {
         parent::__construct($randomGenerator, $deploymentConfig);
-        $this->keys = array($key);
+        $this->keys = [$key];
         $this->keyVersion = 0;
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
index a65aa58bb6478..205aeaaea81e2 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/Cache/MassActionTest.php
@@ -40,11 +40,11 @@ protected function tearDown()
      * @dataProvider massActionsDataProvider
      * @param array $typesToEnable
      */
-    public function testMassEnableAction($typesToEnable = array())
+    public function testMassEnableAction($typesToEnable = [])
     {
         $this->setAll(false);
 
-        $this->getRequest()->setParams(array('types' => $typesToEnable));
+        $this->getRequest()->setParams(['types' => $typesToEnable]);
         $this->dispatch('backend/admin/cache/massEnable');
 
         Bootstrap::getInstance()->reinitialize();
@@ -67,11 +67,11 @@ public function testMassEnableAction($typesToEnable = array())
      * @dataProvider massActionsDataProvider
      * @param array $typesToDisable
      */
-    public function testMassDisableAction($typesToDisable = array())
+    public function testMassDisableAction($typesToDisable = [])
     {
         $this->setAll(true);
 
-        $this->getRequest()->setParams(array('types' => $typesToDisable));
+        $this->getRequest()->setParams(['types' => $typesToDisable]);
         $this->dispatch('backend/admin/cache/massDisable');
 
         Bootstrap::getInstance()->reinitialize();
@@ -111,9 +111,9 @@ private function setAll($isEnabled)
      * @dataProvider massActionsDataProvider
      * @param array $typesToRefresh
      */
-    public function testMassRefreshAction($typesToRefresh = array())
+    public function testMassRefreshAction($typesToRefresh = [])
     {
-        $this->getRequest()->setParams(array('types' => $typesToRefresh));
+        $this->getRequest()->setParams(['types' => $typesToRefresh]);
         $this->dispatch('backend/admin/cache/massRefresh');
 
         /** @var $cacheTypeList \Magento\Framework\App\Cache\TypeListInterface */
@@ -128,15 +128,15 @@ public function testMassRefreshAction($typesToRefresh = array())
      */
     public function massActionsDataProvider()
     {
-        return array(
-            'no types' => array(array()),
-            'existing types' => array(
-                array(
+        return [
+            'no types' => [[]],
+            'existing types' => [
+                [
                     \Magento\Framework\App\Cache\Type\Config::TYPE_IDENTIFIER,
                     \Magento\Framework\App\Cache\Type\Layout::TYPE_IDENTIFIER,
                     \Magento\Framework\App\Cache\Type\Block::TYPE_IDENTIFIER
-                )
-            )
-        );
+                ]
+            ]
+        ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
index 1b21fc7690014..2a5ee17745f0a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
@@ -29,7 +29,7 @@ protected function setUp()
             );
 
         /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
-        $theme = $this->getMock('Magento\Framework\View\Design\ThemeInterface', array());
+        $theme = $this->getMock('Magento\Framework\View\Design\ThemeInterface', []);
         $theme->expects($this->any())->method('getId')->will($this->returnValue(10));
 
         $viewFileSystem->expects($this->any())->method('getDesignTheme')->will($this->returnValue($theme));
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php b/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
index dff74c7a1d858..7c527ccea7115 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Encryption/EncryptorTest.php
@@ -20,8 +20,8 @@ class EncryptorTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_randomGenerator = $this->getMock('Magento\Framework\Math\Random', array(), array(), '', false);
-        $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', array(), array(), '', false);
+        $this->_randomGenerator = $this->getMock('Magento\Framework\Math\Random', [], [], '', false);
+        $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', [], [], '', false);
         $deploymentConfigMock->expects($this->any())
             ->method('get')
             ->with(Encryptor::PARAM_CRYPT_KEY)
@@ -84,12 +84,12 @@ public function testValidateHash($password, $hash, $expected)
 
     public function validateHashDataProvider()
     {
-        return array(
-            array('password', 'hash', false),
-            array('password', 'hash:salt', false),
-            array('password', '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8', true),
-            array('password', '67a1e09bb1f83f5007dc119c14d663aa:salt', true)
-        );
+        return [
+            ['password', 'hash', false],
+            ['password', 'hash:salt', false],
+            ['password', '5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8', true],
+            ['password', '67a1e09bb1f83f5007dc119c14d663aa:salt', true],
+        ];
     }
 
     /**
@@ -121,7 +121,7 @@ public function encryptWithEmptyKeyDataProvider()
      */
     public function testDecryptWithEmptyKey($key)
     {
-        $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', array(), array(), '', false);
+        $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', [], [], '', false);
         $deploymentConfigMock->expects($this->any())
             ->method('get')
             ->with(Encryptor::PARAM_CRYPT_KEY)
@@ -133,7 +133,7 @@ public function testDecryptWithEmptyKey($key)
 
     public function decryptWithEmptyKeyDataProvider()
     {
-        return array(array(null), array(0), array(''), array('0'));
+        return [[null], [0], [''], ['0']];
     }
 
     public function testEncrypt()
@@ -173,7 +173,7 @@ public function testDecrypt()
 
     public function testEncryptDecryptNewKeyAdded()
     {
-        $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', array(), array(), '', false);
+        $deploymentConfigMock = $this->getMock('\Magento\Framework\App\DeploymentConfig', [], [], '', false);
         $deploymentConfigMock->expects($this->at(0))
             ->method('get')
             ->with(Encryptor::PARAM_CRYPT_KEY)
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
index f47efac77a31e..eb7c2d57b0305 100644
--- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -90,7 +90,7 @@ public function __construct(
      */
     public function validateCipher($version)
     {
-        $types = array(self::CIPHER_BLOWFISH, self::CIPHER_RIJNDAEL_128, self::CIPHER_RIJNDAEL_256);
+        $types = [self::CIPHER_BLOWFISH, self::CIPHER_RIJNDAEL_128, self::CIPHER_RIJNDAEL_256];
 
         $version = (int)$version;
         if (!in_array($version, $types, true)) {

From 96531aadb41aa04111cf3b5bb43d1878bcb5765d Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Thu, 11 Dec 2014 16:21:10 -0600
Subject: [PATCH 302/474] MAGETWO-29419: Tax summary and detail differ by 1
 cent in invoice and credit memo for partial invoice when discount and fpt are
 applied

    - Fixed coding style error
---
 app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php | 4 ++--
 dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php b/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php
index 4f7e9d5d8fde0..1cd89f1a30ecf 100644
--- a/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php
+++ b/app/code/Magento/Sales/sql/sales_setup/install-2.0.0.php
@@ -3151,7 +3151,7 @@
     'tax_ratio',
     \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
     512,
-    array(),
+    [],
     'Ratio of tax invoiced over tax of the order item'
 )->addIndex(
     $this->getIdxName('sales_invoice_item', ['parent_id']),
@@ -3903,7 +3903,7 @@
     'tax_ratio',
     \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
     512,
-    array(),
+    [],
     'Ratio of tax in the creditmemo item over tax of the order item'
 )->addIndex(
     $this->getIdxName('sales_creditmemo_item', ['parent_id']),
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
index 472ed49c19c8f..9dc1444ad0fb6 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
@@ -224,7 +224,12 @@ public function testGetCalculatedTaxesForOrderItems($orderData, $invoiceData, $e
 
         $this->priceCurrencyMock->expects($this->any())
             ->method('round')
-            ->will($this->returnCallback(function ($arg) {return round($arg, 2);}));
+            ->will($this->returnCallback(
+                    function ($arg) {
+                        return round($arg, 2);
+                    }
+                )
+            );
 
         $result = $this->helper->getCalculatedTaxes($source);
         foreach ($result as $index => $appliedTax) {

From 1b703691d73510f2ec02f753dae1d4e67580f649 Mon Sep 17 00:00:00 2001
From: Bryant Luk <bluk@ebay.com>
Date: Wed, 10 Dec 2014 16:04:41 -0600
Subject: [PATCH 303/474] MAGETWO-30989: Frontend is down when enable Website
 Restrictions

- Correct case where URL is not used but URLFactory is called
---
 .../WebsiteRestriction/Model/Restrictor.php   |  12 +-
 .../Model/RestrictorTest.php                  | 191 ++++++++++++++++++
 2 files changed, 197 insertions(+), 6 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/WebsiteRestriction/Model/RestrictorTest.php

diff --git a/app/code/Magento/WebsiteRestriction/Model/Restrictor.php b/app/code/Magento/WebsiteRestriction/Model/Restrictor.php
index 5f5410fdb85b8..3ec7e2c8583cc 100644
--- a/app/code/Magento/WebsiteRestriction/Model/Restrictor.php
+++ b/app/code/Magento/WebsiteRestriction/Model/Restrictor.php
@@ -15,9 +15,9 @@ class Restrictor
     protected $_config;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var \Magento\Framework\UrlFactory
      */
-    protected $_url;
+    protected $_urlFactory;
 
     /**
      * @var \Magento\Framework\App\ActionFlag
@@ -75,7 +75,7 @@ public function __construct(
         $this->_customerSession = $customerSession;
         $this->_session = $session;
         $this->_scopeConfig = $scopeConfig;
-        $this->_url = $urlFactory;
+        $this->_urlFactory = $urlFactory;
         $this->_actionFlag = $actionFlag;
     }
 
@@ -134,11 +134,11 @@ public function restrict($request, $response, $isCustomerLoggedIn)
                             || $request->getFullActionName() === $cmsPageViewAction
                             && $request->getAlias('rewrite_request_path') !== $pageIdentifier
                         ) {
-                            $redirectUrl = $this->_url->getUrl('', ['_direct' => $pageIdentifier]);
+                            $redirectUrl = $this->_urlFactory->create()->getUrl('', ['_direct' => $pageIdentifier]);
                         }
                     } elseif (!in_array($request->getFullActionName(), $allowedActionNames)) {
                         // to login form
-                        $redirectUrl = $this->_url->getUrl('customer/account/login');
+                        $redirectUrl = $this->_urlFactory->create()->getUrl('customer/account/login');
                     }
 
                     if ($redirectUrl) {
@@ -152,7 +152,7 @@ public function restrict($request, $response, $isCustomerLoggedIn)
                     if ($redirectToDashboard) {
                         $afterLoginUrl = $this->customerUrl->getDashboardUrl();
                     } else {
-                        $afterLoginUrl = $this->_url->getUrl();
+                        $afterLoginUrl = $this->_urlFactory->create()->getUrl();
                     }
                     $this->_session->setWebsiteRestrictionAfterLoginUrl($afterLoginUrl);
                 } elseif ($this->_session->hasWebsiteRestrictionAfterLoginUrl()) {
diff --git a/dev/tests/unit/testsuite/Magento/WebsiteRestriction/Model/RestrictorTest.php b/dev/tests/unit/testsuite/Magento/WebsiteRestriction/Model/RestrictorTest.php
new file mode 100644
index 0000000000000..e19b9132012d2
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/WebsiteRestriction/Model/RestrictorTest.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\WebsiteRestriction\Model;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class RestrictorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\WebsiteRestriction\Model\Restrictor
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $config;
+
+    /**
+     * @var \Magento\Framework\UrlFactory
+     */
+    protected $urlFactory;
+
+    /**
+     * @var \Magento\Framework\Session\Generic
+     */
+    protected $session;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->config = $this->getMockBuilder('Magento\WebsiteRestriction\Model\ConfigInterface')
+            ->getMockForAbstractClass();
+        $this->config->expects($this->once())
+            ->method('getMode')
+            ->will($this->returnValue(\Magento\WebsiteRestriction\Model\Mode::ALLOW_LOGIN));
+
+        $customerSession = $this->getMockBuilder('Magento\Customer\Model\Session')
+            ->disableOriginalConstructor()
+            ->setMethods(['isLoggedIn'])
+            ->getMock();
+        $customerSession->expects($this->once())
+            ->method('isLoggedIn')
+            ->will($this->returnValue(false));
+
+        $this->session = $this->getMockBuilder('Magento\Framework\Session\Generic')
+            ->disableOriginalConstructor()
+            ->setMethods(['setWebsiteRestrictionAfterLoginUrl'])
+            ->getMock();
+
+        $this->urlFactory = $this->getMockBuilder('Magento\Framework\UrlFactory')
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+
+        $this->model = $objectManager->getObject(
+            'Magento\WebsiteRestriction\Model\Restrictor',
+            [
+                'config' => $this->config,
+                'session' => $this->session,
+                'urlFactory' => $this->urlFactory,
+                'customerSession' => $customerSession,
+            ]
+        );
+    }
+
+    public function testRestrictRedirectNot302Landing()
+    {
+        $requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
+            ->setMethods(['getFullActionName', 'setControllerName'])
+            ->getMockForAbstractClass();
+        $requestMock->expects($this->once())
+            ->method('getFullActionName')
+            ->will($this->returnValue(''));
+        $responseMock = $this->getMockBuilder('Magento\Framework\App\ResponseInterface')
+            ->setMethods(['setRedirect'])
+            ->getMockForAbstractClass();
+        $isCustomerLoggedIn = false;
+
+        $this->config->expects($this->once())
+            ->method('getGenericActions')
+            ->will($this->returnValue(['generic_actions']));
+        $this->config->expects($this->once())
+            ->method('getHTTPRedirectCode')
+            ->will($this->returnValue(0));
+
+        $urlMock = $this->getMockBuilder('Magento\Framework\Url')
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrl'])
+            ->getMock();
+
+        $this->urlFactory->expects($this->at(0))
+            ->method('create')
+            ->will($this->returnValue($urlMock));
+
+        $urlValue = 'url_value';
+        $urlMock->expects($this->once())
+            ->method('getUrl')
+            ->with('customer/account/login')
+            ->will($this->returnValue($urlValue));
+
+        $responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->will($this->returnValue($urlValue));
+
+        $urlMock = $this->getMockBuilder('Magento\Framework\Url')
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrl'])
+            ->getMock();
+        $this->urlFactory->expects($this->at(1))
+            ->method('create')
+            ->will($this->returnValue($urlMock));
+        $urlValue = 'url_value2';
+        $urlMock->expects($this->once())
+            ->method('getUrl')
+            ->will($this->returnValue($urlValue));
+
+        $this->session->expects($this->once())
+            ->method('setWebsiteRestrictionAfterLoginUrl')
+            ->with($urlValue);
+
+        $this->model->restrict($requestMock, $responseMock, $isCustomerLoggedIn);
+    }
+
+    public function testRestrictRedirect302Landing()
+    {
+        $requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
+            ->setMethods(['getFullActionName', 'setControllerName'])
+            ->getMockForAbstractClass();
+        $requestMock->expects($this->once())
+            ->method('getFullActionName')
+            ->will($this->returnValue(''));
+        $responseMock = $this->getMockBuilder('Magento\Framework\App\ResponseInterface')
+            ->setMethods(['setRedirect'])
+            ->getMockForAbstractClass();
+        $isCustomerLoggedIn = false;
+
+        $this->config->expects($this->once())
+            ->method('getGenericActions')
+            ->will($this->returnValue(['generic_actions']));
+        $this->config->expects($this->once())
+            ->method('getHTTPRedirectCode')
+            ->will($this->returnValue(\Magento\WebsiteRestriction\Model\Mode::HTTP_302_LANDING));
+
+        $landingPageCode = 'landing_page_code';
+        $this->config->expects($this->once())
+            ->method('getLandingPageCode')
+            ->will($this->returnValue($landingPageCode));
+
+        $urlMock = $this->getMockBuilder('Magento\Framework\Url')
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrl'])
+            ->getMock();
+
+        $this->urlFactory->expects($this->at(0))
+            ->method('create')
+            ->will($this->returnValue($urlMock));
+
+        $urlValue = 'url_value';
+        $urlMock->expects($this->once())
+            ->method('getUrl')
+            ->with('', ['_direct' => $landingPageCode])
+            ->will($this->returnValue($urlValue));
+
+        $responseMock->expects($this->once())
+            ->method('setRedirect')
+            ->will($this->returnValue($urlValue));
+
+        $urlMock = $this->getMockBuilder('Magento\Framework\Url')
+            ->disableOriginalConstructor()
+            ->setMethods(['getUrl'])
+            ->getMock();
+        $this->urlFactory->expects($this->at(1))
+            ->method('create')
+            ->will($this->returnValue($urlMock));
+        $urlValue = 'url_value2';
+        $urlMock->expects($this->once())
+            ->method('getUrl')
+            ->will($this->returnValue($urlValue));
+
+        $this->session->expects($this->once())
+            ->method('setWebsiteRestrictionAfterLoginUrl')
+            ->with($urlValue);
+
+        $this->model->restrict($requestMock, $responseMock, $isCustomerLoggedIn);
+    }
+}

From 8b801377666ebe508854cb3cbefaa10375fba392 Mon Sep 17 00:00:00 2001
From: Alex Bomko <abomko@ebay.com>
Date: Thu, 27 Nov 2014 18:04:56 +0200
Subject: [PATCH 304/474] MAGETWO-31002: [Spike] Investigate methods of
 publishing sample data packages

---
 dev/build/publication/edition/internal.txt            |  2 ++
 dev/tools/Magento/Tools/Composer/Package/Reader.php   |  2 +-
 .../Tools/Composer/etc/magento_components_list.txt    | 11 ++++++-----
 dev/tools/Magento/Tools/SampleData/composer.json      |  7 +++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dev/build/publication/edition/internal.txt b/dev/build/publication/edition/internal.txt
index 4578fe1e4e0d2..9934e0ed1943a 100644
--- a/dev/build/publication/edition/internal.txt
+++ b/dev/build/publication/edition/internal.txt
@@ -1,6 +1,8 @@
 # Files included in testing builds, but nor ready/approved for publication
 
 dev/tools/Magento/Tools/SampleData
+dev/tests/integration/testsuite/Magento/Tools/SampleData
+
 dev/tools/Magento/Tools/Formatter
 dev/tools/PHP-Parser
 
diff --git a/dev/tools/Magento/Tools/Composer/Package/Reader.php b/dev/tools/Magento/Tools/Composer/Package/Reader.php
index d0cf31c27ae4b..b9dfd6a94de4e 100644
--- a/dev/tools/Magento/Tools/Composer/Package/Reader.php
+++ b/dev/tools/Magento/Tools/Composer/Package/Reader.php
@@ -64,7 +64,7 @@ public function readMagentoPackages()
     {
         $result = [];
         foreach ($this->patterns as $pattern) {
-            foreach (glob("{$this->rootDir}/{$pattern}/*", GLOB_ONLYDIR) as $dir) {
+            foreach (glob("{$this->rootDir}/{$pattern}", GLOB_ONLYDIR) as $dir) {
                 $package = $this->readFile($dir . '/composer.json');
                 if (false === $package) {
                     throw new \LogicException("Missing composer.json file in the directory: {$dir}");
diff --git a/dev/tools/Magento/Tools/Composer/etc/magento_components_list.txt b/dev/tools/Magento/Tools/Composer/etc/magento_components_list.txt
index e7afc7bfa8298..70d47494a3146 100644
--- a/dev/tools/Magento/Tools/Composer/etc/magento_components_list.txt
+++ b/dev/tools/Magento/Tools/Composer/etc/magento_components_list.txt
@@ -1,5 +1,6 @@
-app/code/Magento
-app/design/adminhtml/Magento
-app/design/frontend/Magento
-app/i18n/magento
-lib/internal/Magento
+app/code/Magento/*
+app/design/adminhtml/Magento/*
+app/design/frontend/Magento/*
+app/i18n/magento/*
+lib/internal/Magento/*
+dev/tools/Magento/Tools/SampleData
diff --git a/dev/tools/Magento/Tools/SampleData/composer.json b/dev/tools/Magento/Tools/SampleData/composer.json
index 0a6f6c233aa9f..c2bb788ea5175 100644
--- a/dev/tools/Magento/Tools/SampleData/composer.json
+++ b/dev/tools/Magento/Tools/SampleData/composer.json
@@ -1,12 +1,11 @@
 {
     "name": "magento/sample-data-scripts",
     "description": "Sample Data scripts",
-    "version": "0.1.0-alpha102",
+    "version": "0.1.0-alpha107",
     "require": {
-        "magento/framework": "0.1.0-alpha102",
+        "magento/framework": "0.1.0-alpha107",
         "magento/magento-composer-installer": "*",
-        "magento/sample-data-media": "dev-master",
-        "magento/sample-data-styles": "dev-master"
+        "magento/sample-data-media": "*"
     },
     "type": "magento2-component",
     "extra": {

From 5cf7e23dd3277558cf8384b6de79b6ff7ab9c7b9 Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Thu, 11 Dec 2014 19:31:54 -0600
Subject: [PATCH 305/474] MAGETWO-31622: (Fatal Error)No redirect to "setup"
 folder during installation

- fix for incorrect dependency injection in constructor
---
 .../Framework/App/Request/HttpTest.php        | 38 +++++++++----------
 .../Magento/Framework/App/Request/Http.php    | 13 ++++---
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/Request/HttpTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/Request/HttpTest.php
index 065f3589dcacf..48140770efc35 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/Request/HttpTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/Request/HttpTest.php
@@ -31,14 +31,9 @@ class HttpTest extends \PHPUnit_Framework_TestCase
     protected $cookieReaderMock;
 
     /**
-     * @var \Magento\TestFramework\Helper\ObjectManager
+     * @var \Magento\TestFramework\Helper\ObjectManager | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_objectManager;
-
-    /**
-     * @var \Magento\Framework\App\Config\ReinitableConfigInterface | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $configMock;
+    protected $objectManager;
 
     /**
      * @var array
@@ -47,7 +42,6 @@ class HttpTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
 
         $this->_routerListMock = $this->getMock(
             'Magento\Framework\App\Route\ConfigInterface\Proxy',
@@ -59,7 +53,7 @@ protected function setUp()
         $this->_infoProcessorMock = $this->getMock('Magento\Framework\App\Request\PathInfoProcessorInterface');
         $this->_infoProcessorMock->expects($this->any())->method('process')->will($this->returnArgument(1));
         $this->cookieReaderMock = $this->getMock('Magento\Framework\Stdlib\Cookie\CookieReaderInterface');
-        $this->configMock = $this->getMock('Magento\Framework\App\Config\ReinitableConfigInterface');
+        $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface');
 
         // Stash the $_SERVER array to protect it from modification in test
         $this->serverArray = $_SERVER;
@@ -80,15 +74,12 @@ public function testGetOriginalPathInfoWithTestUri()
 
     private function getModel($uri = null)
     {
-        return $this->_objectManager->getObject(
-            'Magento\Framework\App\Request\Http',
-            [
-                'pathInfoProcessor' => $this->_infoProcessorMock,
-                'routeConfig' => $this->_routerListMock,
-                'cookieReader' => $this->cookieReaderMock,
-                'uri' => $uri,
-                'config' => $this->configMock
-            ]
+        return new \Magento\Framework\App\Request\Http(
+                $this->_routerListMock,
+                $this->_infoProcessorMock,
+                $this->cookieReaderMock,
+                $this->objectManager,
+                $uri
         );
     }
 
@@ -554,10 +545,19 @@ public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $header
     {
         $this->_model = $this->getModel();
         $configOffloadHeader = 'Header-From-Proxy';
-        $this->configMock->expects($this->exactly($configCall))
+        $configMock = $this->getMockBuilder('Magento\Framework\App\Config')
+            ->disableOriginalConstructor()
+            ->setMethods(['getValue'])
+            ->getMock();
+        $configMock->expects($this->exactly($configCall))
             ->method('getValue')
             ->with(Request::XML_PATH_OFFLOADER_HEADER, ScopeInterface::SCOPE_DEFAULT)
             ->willReturn($configOffloadHeader);
+        $this->objectManager->expects($this->exactly($configCall))
+            ->method('get')
+            ->with('Magento\Framework\App\Config')
+            ->will($this->returnValue($configMock));
+
         $_SERVER[$headerOffloadKey] = $headerOffloadValue;
         $_SERVER['HTTPS'] = $serverHttps;
 
diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 1eb3d868fc1e0..5ec046bad8fb1 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -90,15 +90,15 @@ class Http extends \Zend_Controller_Request_Http implements
     protected $cookieReader;
 
     /**
-     * @var \Magento\Framework\App\Config\ReinitableConfigInterface
+     * @var \Magento\Framework\ObjectManagerInterface
      */
-    protected $_config;
+    protected $_objectManager;
 
     /**
      * @param \Magento\Framework\App\Route\ConfigInterface\Proxy $routeConfig
      * @param PathInfoProcessorInterface $pathInfoProcessor
      * @param \Magento\Framework\Stdlib\Cookie\CookieReaderInterface $cookieReader
-     * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
+     * @param \Magento\Framework\ObjectManagerInterface  $objectManager,
      * @param string|null $uri
      * @param array $directFrontNames
      */
@@ -106,11 +106,11 @@ public function __construct(
         \Magento\Framework\App\Route\ConfigInterface\Proxy $routeConfig,
         PathInfoProcessorInterface $pathInfoProcessor,
         \Magento\Framework\Stdlib\Cookie\CookieReaderInterface $cookieReader,
-        \Magento\Framework\App\Config\ReinitableConfigInterface $config,
+        \Magento\Framework\ObjectManagerInterface $objectManager,
         $uri = null,
         $directFrontNames = []
     ) {
-        $this->_config = $config;
+        $this->_objectManager = $objectManager;
         $this->_routeConfig = $routeConfig;
         $this->_directFrontNames = $directFrontNames;
         parent::__construct($uri);
@@ -646,8 +646,9 @@ public function isSecure()
             return true;
         }
         // Check if a proxy sent a header indicating an initial secure request
+        $config = $this->_objectManager->get('Magento\Framework\App\Config');
         $offLoaderHeader = trim(
-            (string)$this->_config->getValue(
+            (string)$config->getValue(
                 self::XML_PATH_OFFLOADER_HEADER,
                 \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT
             )

From a99b317601cb0ae68498e7e5ce8a179f1054acfb Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Thu, 11 Dec 2014 20:27:16 -0600
Subject: [PATCH 306/474] MAGETWO-31622: (Fatal Error)No redirect to "setup"
 folder during installation

- fixing test failure
---
 .../Controller/Varien/Router/StandardTest.php          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php
index bc4b30a03a8b7..c08db0f674fea 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php
@@ -74,7 +74,7 @@ public function testMatch(
      */
     public function matchDataProvider()
     {
-        $configMock = $this->getMock('Magento\Framework\App\Config\ReinitableConfigInterface');
+        $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
         $this->_cookieReaderMock = $this->getMock('Magento\Framework\Stdlib\Cookie\CookieReaderInterface');
         $uri    = self::TEST_HOST . '/' . self::VDE_FRONT_NAME . self::TEST_PATH;
         $notVdeUrl = self::TEST_HOST . self::TEST_PATH;
@@ -96,7 +96,7 @@ public function matchDataProvider()
         $matchedRequest = $this->getMock(
             'Magento\Framework\App\Request\Http',
             ['_isFrontArea'],
-            [$routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $configMock, $uri]
+            [$routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $objectManagerMock, $uri]
         );
 
         $matchedController = $this->getMockForAbstractClass(
@@ -135,7 +135,7 @@ public function matchDataProvider()
             'not vde request' => [
                 '$request' => $this->getMock(
                         'Magento\Framework\App\Request\Http', ['_isFrontArea'], [
-                            $routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $configMock, $notVdeUrl
+                            $routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $objectManagerMock, $notVdeUrl
                         ]
                     ),
                 '$isVde'           => false,
@@ -145,7 +145,7 @@ public function matchDataProvider()
                 '$request' => $this->getMock(
                         'Magento\Framework\App\Request\Http',
                         ['_isFrontArea'],
-                        [$routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $configMock, $uri]
+                        [$routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $objectManagerMock, $uri]
                     ),
                 '$isVde'           => true,
                 '$isLoggedIn'      => false,
@@ -154,7 +154,7 @@ public function matchDataProvider()
                 '$request' => $this->getMock(
                         'Magento\Framework\App\Request\Http',
                         ['_isFrontArea'],
-                        [$routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $configMock, $uri]
+                        [$routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $objectManagerMock, $uri]
                     ),
                 '$isVde'           => true,
                 '$isLoggedIn'      => true,

From 0da414428b1cf2360dad5dfcd553c64aea58e0fb Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Thu, 11 Dec 2014 20:41:51 -0600
Subject: [PATCH 307/474] MAGETWO-31622: (Fatal Error)No redirect to "setup"
 folder during installation

- fixed failing tests
---
 .../framework/tests/unit/testsuite/Magento/Test/RequestTest.php | 2 +-
 .../testsuite/Magento/Test/TestCase/ControllerAbstractTest.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/RequestTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/RequestTest.php
index 19d772d34ccfd..2d60675519cf4 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/RequestTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/RequestTest.php
@@ -17,7 +17,7 @@ protected function setUp()
             $this->getMock('Magento\Framework\App\Route\ConfigInterface\Proxy', [], [], '', false),
             $this->getMock('Magento\Framework\App\Request\PathInfoProcessorInterface', [], [], '', false),
             $this->getMock('Magento\Framework\Stdlib\Cookie\CookieReaderInterface'),
-            $this->getMock('Magento\Framework\App\Config\ReinitableConfigInterface')
+            $this->getMock('Magento\Framework\ObjectManagerInterface')
         );
     }
 
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php
index 145ce5f3e62ed..cf46839d580dc 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php
@@ -21,7 +21,7 @@ protected function setUp()
             $this->getMock('Magento\Framework\App\Route\ConfigInterface\Proxy', [], [], '', false),
             $this->getMock('Magento\Framework\App\Request\PathInfoProcessorInterface', [], [], '', false),
             $this->getMock('Magento\Framework\Stdlib\Cookie\CookieReaderInterface'),
-            $this->getMock('Magento\Framework\App\Config\ReinitableConfigInterface')
+            $this->getMock('Magento\Framework\ObjectManagerInterface')
         );
         $response = new \Magento\TestFramework\Response(
             $this->getMock('Magento\Framework\Stdlib\CookieManagerInterface'),

From 2dc68cd631c0e5829d6978bcaef347b2f9a05fa0 Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Thu, 11 Dec 2014 23:14:59 -0600
Subject: [PATCH 308/474] MAGETWO-31658: Some locales are absent in 'Store
 Default Language' select while installation

- Implemented the expected result.
---
 .../module/Magento/Setup/src/Model/Lists.php  | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/Lists.php b/setup/module/Magento/Setup/src/Model/Lists.php
index 214db7f94af04..d0aa70e571989 100644
--- a/setup/module/Magento/Setup/src/Model/Lists.php
+++ b/setup/module/Magento/Setup/src/Model/Lists.php
@@ -6,6 +6,7 @@
 namespace Magento\Setup\Model;
 
 use Zend_Locale;
+use Magento\Framework\Locale\Config;
 
 class Lists
 {
@@ -16,14 +17,23 @@ class Lists
      */
     protected $zendLocale;
 
+    /**
+     * List of allowed locales
+     *
+     * @var array
+     */
+    protected $allowedLocales;
+
     /**
      * Constructor
      *
      * @param Zend_Locale $zendLocale
+     * @param Config $localeConfig
      */
-    public function __construct(Zend_Locale $zendLocale)
+    public function __construct(Zend_Locale $zendLocale, Config $localeConfig)
     {
         $this->zendLocale = $zendLocale;
+        $this->allowedLocales = $localeConfig->getAllowedLocales();
     }
 
     /**
@@ -67,15 +77,30 @@ public function getLocaleList()
     {
         $languages = $this->zendLocale->getTranslationList('Language');
         $countries = $this->zendLocale->getTranslationList('Territory');
-        $locale = $this->zendLocale->getLocaleList();
+        $locales = $this->zendLocale->getLocaleList();
+
+        $allowedAliases = [];
+        foreach ($this->allowedLocales as $code) {
+            $allowedAliases[$this->zendLocale->getAlias($code)] = $code;
+        }
+        //Internal locale codes translated from Zend locale codes
+        $processedLocales = [];
+        foreach ($locales as $code => $active) {
+            if (array_key_exists($code, $allowedAliases)) {
+                $processedLocales[$allowedAliases[$code]] = $active;
+            } else {
+                $processedLocales[$code] = $active;
+            }
+        }
+
         $list = [];
-        foreach ($locale as $key => $value) {
-            if (strstr($key, '_')) {
-                $data = explode('_', $key);
+        foreach ($processedLocales as $code => $active) {
+            if (strstr($code, '_')) {
+                $data = explode('_', $code);
                 if (!isset($languages[$data[0]]) || !isset($countries[$data[1]])) {
                     continue;
                 }
-                $list[$key] = $languages[$data[0]] . ' (' . $countries[$data[1]] . ')';
+                $list[$code] = $languages[$data[0]] . ' (' . $countries[$data[1]] . ')';
             }
         }
         asort($list);

From 8f8cfaa86800084c8b4cf13753962adfa5a1072a Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Fri, 12 Dec 2014 09:50:06 +0200
Subject: [PATCH 309/474] MAGETWO-31631: BasicPromoTest randomly failed on CICD
 L1 plan (BAT EE)

---
 .../Test/Block/Adminhtml/Edit/FormPageActions.php     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/FormPageActions.php
index 697cd9bd57ac5..56cdc9c12dd37 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/FormPageActions.php
@@ -29,4 +29,15 @@ public function createOrder()
     {
         $this->_rootElement->find($this->createOrderButton)->click();
     }
+
+    /**
+     * Wait for User before click on any Button which calls JS validation on correspondent form.
+     * See details in MAGETWO-31121.
+     *
+     * @return void
+     */
+    protected function waitBeforeClick()
+    {
+        sleep(0.1);
+    }
 }

From 75f8b54258073108bea1706c3b1437ad5e0b12a7 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Thu, 11 Dec 2014 23:25:50 -0600
Subject: [PATCH 310/474] MAGETWO-31705: Missing static files in production
 mode

- removed too early check of area and theme
---
 dev/tools/Magento/Tools/View/Deployer.php     | 32 ++++---------------
 .../Magento/Framework/View/Asset/File.php     |  2 +-
 .../View/Asset/File/NotFoundException.php     | 10 ++++++
 3 files changed, 18 insertions(+), 26 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php

diff --git a/dev/tools/Magento/Tools/View/Deployer.php b/dev/tools/Magento/Tools/View/Deployer.php
index 4d81956c213cd..51a7aa85b5665 100644
--- a/dev/tools/Magento/Tools/View/Deployer.php
+++ b/dev/tools/Magento/Tools/View/Deployer.php
@@ -92,8 +92,8 @@ public function deploy(ObjectManagerFactory $omFactory, array $locales)
                     $this->count = 0;
                     $this->errorCount = 0;
                     foreach ($appFiles as $info) {
-                        list($fileArea, $fileThemePath, , $module, $filePath) = $info;
-                        $this->deployAppFile($area, $fileArea, $themePath, $fileThemePath, $locale, $module, $filePath);
+                        list(, , , $module, $filePath) = $info;
+                        $this->deployFile($filePath, $area, $themePath, $locale, $module);
                     }
                     foreach ($libFiles as $filePath) {
                         $this->deployFile($filePath, $area, $themePath, $locale, null);
@@ -166,29 +166,6 @@ private function emulateApplicationArea($areaCode)
         $this->assetPublisher = $objectManager->get('Magento\Framework\App\View\Asset\Publisher');
     }
 
-    /**
-     * Deploy a static view file that belongs to the application
-     *
-     * @param string $area
-     * @param string $fileArea
-     * @param string $themePath
-     * @param string $fileThemePath
-     * @param string $locale
-     * @param string $module
-     * @param string $filePath
-     * @return void
-     */
-    private function deployAppFile($area, $fileArea, $themePath, $fileThemePath, $locale, $module, $filePath)
-    {
-        if ($fileArea && $fileArea != $area) {
-            return;
-        }
-        if ($fileThemePath && $fileThemePath != $themePath) {
-            return;
-        }
-        $this->deployFile($filePath, $area, $themePath, $locale, $module);
-    }
-
     /**
      * Deploy a static view file
      *
@@ -218,6 +195,11 @@ private function deployFile($filePath, $area, $themePath, $locale, $module)
                 $this->assetPublisher->publish($asset);
             }
             $this->count++;
+        } catch (\Magento\Framework\View\Asset\File\NotFoundException $e) {
+            // File was not found by Fallback (possibly because it's wrong context for it) - there is nothing to publish
+            $this->logger->logDebug(
+                "\tNotice: Could not find file '$filePath'. Potentially because of wrong context."
+            );
         } catch (\Exception $e) {
             $this->logger->logError("{$logModule} {$filePath}");
             $this->logger->logDebug((string)$e);
diff --git a/lib/internal/Magento/Framework/View/Asset/File.php b/lib/internal/Magento/Framework/View/Asset/File.php
index d61a8933f2be7..6e742ffd775da 100644
--- a/lib/internal/Magento/Framework/View/Asset/File.php
+++ b/lib/internal/Magento/Framework/View/Asset/File.php
@@ -107,7 +107,7 @@ public function getSourceFile()
         if (null === $this->resolvedFile) {
             $this->resolvedFile = $this->source->getFile($this);
             if (false === $this->resolvedFile) {
-                throw new \LogicException("Unable to resolve the source file for '{$this->getPath()}'");
+                throw new File\NotFoundException("Unable to resolve the source file for '{$this->getPath()}'");
             }
         }
         return $this->resolvedFile;
diff --git a/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php b/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php
new file mode 100644
index 0000000000000..617cf5580692c
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Framework\View\Asset\File;
+
+class NotFoundException extends \LogicException
+{
+}

From 6f32a392cbfc593580ae5068d0d35b96db2530f2 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 12 Dec 2014 02:38:31 -0600
Subject: [PATCH 311/474] MAGETWO-26736: Errors after execution View Files
 Population Tool

- consider non-error situation when LESS compiler error happens
- fixed processing of empty LESS files
- added  dot-style logging for default mode
---
 .../Magento/Tools/View/Deployer/LogTest.php   | 31 +++++++++++++++++--
 dev/tools/Magento/Tools/View/Deployer.php     | 15 +++++++--
 dev/tools/Magento/Tools/View/Deployer/Log.php | 27 +++++++++++++++-
 .../Framework/Css/PreProcessor/Less.php       |  2 +-
 4 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Tools/View/Deployer/LogTest.php b/dev/tests/unit/testsuite/Magento/Tools/View/Deployer/LogTest.php
index eadc24150ace7..46eecc68c7c9f 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/View/Deployer/LogTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/View/Deployer/LogTest.php
@@ -12,14 +12,14 @@ class LogTest extends \PHPUnit_Framework_TestCase
     /**
      * @param string $method
      * @param int $verbosity
-     * @param string $exepctedMsg
+     * @param string $expectedMsg
      * @dataProvider logDataProvider
      */
-    public function testLog($method, $verbosity, $exepctedMsg)
+    public function testLog($method, $verbosity, $expectedMsg)
     {
         $object = new Log($verbosity);
         $object->$method('foo');
-        $this->expectOutputString($exepctedMsg);
+        $this->expectOutputString($expectedMsg);
     }
 
     /**
@@ -44,4 +44,29 @@ public function logDataProvider()
             ['logDebug',   Log::ERROR | Log::DEBUG, $foo],
         ];
     }
+
+    /**
+     * @param int $verbosity
+     * @param string $expectedMsg
+     *
+     * @dataProvider logDebugAltDataProvider
+     */
+    public function testLogDebugAlt($verbosity, $expectedMsg)
+    {
+        $object = new Log($verbosity);
+        $object->logDebug('foo', '[alt]');
+        $this->expectOutputString($expectedMsg);
+    }
+
+    /**
+     * @return array
+     */
+    public function logDebugAltDataProvider()
+    {
+        return[
+            'debug mode' => [Log::DEBUG, "foo\n"],
+            'default mode' => [Log::ERROR, '[alt]'],
+            'silent mode' => [Log::SILENT, '']
+        ];
+    }
 }
diff --git a/dev/tools/Magento/Tools/View/Deployer.php b/dev/tools/Magento/Tools/View/Deployer.php
index 51a7aa85b5665..917f321fe523a 100644
--- a/dev/tools/Magento/Tools/View/Deployer.php
+++ b/dev/tools/Magento/Tools/View/Deployer.php
@@ -182,13 +182,17 @@ private function deployFile($filePath, $area, $themePath, $locale, $module)
         if (substr($filePath, -5) == '.less') {
             $requestedPath = preg_replace('/.less$/', '.css', $filePath);
         }
-        $logModule = $module ? "<{$module}>" : (null === $module ? '<lib>' : '<theme>');
+        $logMessage = "Processing file '$filePath' for area '$area', theme '$themePath', locale '$locale'";
+        if ($module) {
+            $logMessage .= ", module '$module'";
+        }
+        $this->logger->logDebug($logMessage);
         try {
             $asset = $this->assetRepo->createAsset(
                 $requestedPath,
                 ['area' => $area, 'theme' => $themePath, 'locale' => $locale, 'module' => $module]
             );
-            $this->logger->logDebug("{$logModule} {$filePath} -> {$asset->getPath()}");
+            $this->logger->logDebug("\Deploying the file to '{$asset->getPath()}'", '.');
             if ($this->isDryRun) {
                 $asset->getContent();
             } else {
@@ -200,8 +204,13 @@ private function deployFile($filePath, $area, $themePath, $locale, $module)
             $this->logger->logDebug(
                 "\tNotice: Could not find file '$filePath'. Potentially because of wrong context."
             );
+        } catch (\Less_Exception_Compiler $e) {
+            $this->logger->logDebug(
+                "\tNotice: Could not parse LESS file '$filePath'. "
+                . "Potentially because it's a partial LESS file intended for inclusion by another LESS file."
+            );
         } catch (\Exception $e) {
-            $this->logger->logError("{$logModule} {$filePath}");
+            $this->logger->logError($e->getMessage() . " ($logMessage)");
             $this->logger->logDebug((string)$e);
             $this->errorCount++;
         }
diff --git a/dev/tools/Magento/Tools/View/Deployer/Log.php b/dev/tools/Magento/Tools/View/Deployer/Log.php
index 438da0297dc4c..59233bc46d890 100644
--- a/dev/tools/Magento/Tools/View/Deployer/Log.php
+++ b/dev/tools/Magento/Tools/View/Deployer/Log.php
@@ -23,6 +23,13 @@ class Log
      */
     private $verbosity;
 
+    /**
+     * If last output printed inline
+     *
+     * @var bool
+     */
+    private $isInline = false;
+
     /**
      * @param int $verbosity
      */
@@ -40,6 +47,7 @@ public function __construct($verbosity)
     public function logMessage($msg)
     {
         if ($this->verbosity !== self::SILENT) {
+            $this->terminateLine();
             echo "{$msg}\n";
         }
     }
@@ -53,6 +61,7 @@ public function logMessage($msg)
     public function logError($msg)
     {
         if ($this->verbosity & self::ERROR) {
+            $this->terminateLine();
             echo "ERROR: {$msg}\n";
         }
     }
@@ -61,12 +70,28 @@ public function logError($msg)
      * Log a debug message
      *
      * @param string $msg
+     * @param string $altInline Alternative message for normal mode (printed inline)
      * @return void
      */
-    public function logDebug($msg)
+    public function logDebug($msg, $altInline = '')
     {
         if ($this->verbosity & self::DEBUG) {
+            $this->terminateLine();
             echo "{$msg}\n";
+        } elseif ($altInline && $this->verbosity !== self::SILENT) {
+            echo $altInline;
+            $this->isInline = true;
+        }
+    }
+
+    /**
+     * Ensures the next log message will be printed on new line
+     */
+    private function terminateLine()
+    {
+        if ($this->isInline) {
+            $this->isInline = false;
+            echo "\n";
         }
     }
 }
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Less.php b/lib/internal/Magento/Framework/Css/PreProcessor/Less.php
index 6ee1e44b8b93b..c67d0934bf558 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Less.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Less.php
@@ -42,7 +42,7 @@ public function process(\Magento\Framework\View\Asset\PreProcessor\Chain $chain)
         $cssTrimmedContent = trim($cssContent);
         if (!empty($cssTrimmedContent)) {
             $chain->setContent($cssContent);
-            $chain->setContentType('css');
         }
+        $chain->setContentType('css');
     }
 }

From 70c82a9abc0e1f0feb4ed776a3428cef36084add Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Fri, 12 Dec 2014 10:57:42 +0200
Subject: [PATCH 312/474] MAGETWO-31716: "Compare Products" block is present
 for mobile devices

---
 .../luma/Magento_Catalog/web/css/source/module.less   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module.less
index a962298d28b60..7e5e17d0ba360 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module.less
@@ -849,10 +849,6 @@ body.catalog-product-compare-index {
     }
 }
 
-.compare.wrapper {
-    display: none;
-}
-
 }
 
 //
@@ -869,13 +865,18 @@ body.catalog-product-compare-index {
         }
     }
 }
+.responsive-max-m(@break) when (@break = @screen-m) {
+    .compare.wrapper,
+    [class*="block-compare"] {
+        display: none;
+    }
+}
 
 //
 //    Desktop
 //--------------------------------------
 .responsive-min-l(@break) when (@break = @screen-m) {
     .compare.wrapper {
-        display: block;
         float: right;
         .list-reset-styles();
         .action.compare {

From 3f5565d47b244e7cecf2b5eae0395f6ca6ccba30 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 11:14:21 +0200
Subject: [PATCH 313/474] MAGETWO-31629: Online payment methods removal for CE
 release

- fix test
---
 .../unit/testsuite/Magento/Centinel/Model/ObserverTest.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php
index 9fae33ea29383..706386aa08582 100644
--- a/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php
@@ -10,7 +10,7 @@ public function testPaymentFormBlockToHtmlBefore()
     {
         $method = $this->getMock(
             'Magento\Paypal\Model\Payflowpro',
-            ['getIsCentinelValidationEnabled'],
+            ['getIsCentinelValidationEnabled', 'getCode'],
             [],
             '',
             false
@@ -19,6 +19,9 @@ public function testPaymentFormBlockToHtmlBefore()
             ->method('getIsCentinelValidationEnabled')
             ->will($this->returnValue(true));
 
+        $method->expects($this->once())
+            ->method('getCode');
+
         $blockLogo = $this->getMock(
             'Magento\Centinel\Block\Logo',
             ['setMethod'],

From 69f0f3dccdc5cf5122146061452759f524a20a70 Mon Sep 17 00:00:00 2001
From: Oleksandr Ivashchenko <oivashchenko@ebay.com>
Date: Fri, 12 Dec 2014 11:29:12 +0200
Subject: [PATCH 314/474] MAGETWO-31710: Exception if press "Compare" button

 - CR changes
---
 .../Magento/Customer/Controller/Adminhtml/Index/Viewfile.php  | 4 +++-
 .../Magento/Catalog/Controller/Product/Compare/IndexTest.php  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index 69242e4d29f84..12ebc5b01068d 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -15,6 +15,9 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\ObjectFactory;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
 {
     /**
@@ -45,7 +48,6 @@ class Viewfile extends \Magento\Customer\Controller\Adminhtml\Index
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
index d77a02e754e5c..a46b5a2806a0c 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
@@ -151,7 +151,7 @@ public function testExecuteWithItems()
 
         $this->listCompareMock->expects($this->once())
             ->method('addProducts')
-            ->with([1,2,3]);
+            ->with([1, 2, 3]);
         $redirect = $this->getMock('Magento\Framework\Controller\Result\Redirect', ['setPath'], [], '', false);
         $redirect->expects($this->once())
             ->method('setPath')

From 66f4c8ef03671650d697c897470da7f795fd98d2 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Fri, 12 Dec 2014 11:29:19 +0200
Subject: [PATCH 315/474] MAGETWO-31668: It's impossible to move Product from
 found Wishlist to Shopping Cart

---
 .../Magento/MultipleWishlist/Controller/Search/AddtocartTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/AddtocartTest.php b/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/AddtocartTest.php
index fb47b0d3f1f70..bbb5ed536e352 100644
--- a/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/AddtocartTest.php
+++ b/dev/tests/unit/testsuite/Magento/MultipleWishlist/Controller/Search/AddtocartTest.php
@@ -115,6 +115,7 @@ protected function setUp()
             ->getMock();
         $this->itemFactoryMock = $this->getMockBuilder('Magento\Wishlist\Model\ItemFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $searchFactoryMock = $this->getMockBuilder('Magento\MultipleWishlist\Model\SearchFactory')
             ->disableOriginalConstructor()

From 148aa2a354f3dfd74a36f03b262f44eca762cf72 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 11:33:11 +0200
Subject: [PATCH 316/474] MAGETWO-31629: Online payment methods removal for CE
 release

- fix test
---
 .../unit/testsuite/Magento/Centinel/Model/ObserverTest.php     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php
index 706386aa08582..5cbfd51b3907a 100644
--- a/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php
@@ -20,7 +20,8 @@ public function testPaymentFormBlockToHtmlBefore()
             ->will($this->returnValue(true));
 
         $method->expects($this->once())
-            ->method('getCode');
+            ->method('getCode')
+            ->willReturn('payflowprocentinel');
 
         $blockLogo = $this->getMock(
             'Magento\Centinel\Block\Logo',

From d1bf7f85f434406827bb00d75b26f0065a9c23ef Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Fri, 12 Dec 2014 11:33:15 +0200
Subject: [PATCH 317/474] MAGETWO-31631: BasicPromoTest randomly failed on CICD
 L1 plan (BAT EE)

---
 .../Customer/Test/Block/Adminhtml/Edit/FormPageActions.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/FormPageActions.php
index 56cdc9c12dd37..5d185b181e8c4 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/FormPageActions.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/FormPageActions.php
@@ -38,6 +38,6 @@ public function createOrder()
      */
     protected function waitBeforeClick()
     {
-        sleep(0.1);
+        sleep(0.2);
     }
 }

From 53da57bec9bd1988a07aba6e7b635b201844fb10 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 11:45:09 +0200
Subject: [PATCH 318/474] MAGETWO-31655: Remove deprecated code from
 Payment/Shipping modules

- fix
---
 .../testsuite/Magento/Test/Legacy/_files/obsolete_methods.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 3387494f98295..8deab3b1860bb 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -1994,4 +1994,6 @@
     ['getScriptTranslation', 'Magento\Framework\LocaleInterface'],
     ['getCountryTranslation', 'Magento\Framework\LocaleInterface'],
     ['getTerritoryTranslation', 'Magento\Framework\LocaleInterface'],
+    ['getAuthorizationAmounts', 'Magento\Paypal\Model\Config'],
+    ['cleanTransactions', 'Magento\Paypal\Model\Observer']
 ];

From 7a3c12186951dff9b429d55b95e8af3e73502357 Mon Sep 17 00:00:00 2001
From: Arkadii Chyzhov <achyzhov@ebay.com>
Date: Fri, 12 Dec 2014 11:57:08 +0200
Subject: [PATCH 319/474] MAGETWO-31708: Merge Core sql scripts and rename file
 with suffix 2.0.0

- Merged upgrade-1.6.0.10-1.6.0.11.php into install-2.0.0.php
---
 .../Core/sql/core_setup/install-2.0.0.php     | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
index 40bd12f12534f..22f65e1b1ddeb 100644
--- a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
+++ b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
@@ -794,6 +794,74 @@
 );
 $connection->createTable($table);
 
+/**
+ * Add and change columns in 'core_theme_files'
+ */
+$connection->addColumn(
+    $installer->getTable('core_theme_files'),
+    'is_temporary',
+    array(
+        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+        'nullable' => false,
+        'default' => 0,
+        'comment' => 'Is Temporary File'
+    )
+);
+
+$connection->changeColumn(
+    $installer->getTable('core_theme_files'),
+    'file_name',
+    'file_path',
+    array(
+        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+        'length' => 255,
+        'nullable' => true,
+        'comment' => 'Relative path to file'
+    )
+);
+
+$connection->changeColumn(
+    $installer->getTable('core_theme_files'),
+    'order',
+    'sort_order',
+    array('type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT)
+);
+
+/**
+ * Create table 'core_theme_files_link'
+ */
+$table = $connection->newTable(
+    $installer->getTable('core_theme_files_link')
+)->addColumn(
+    'files_link_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('identity' => true, 'nullable' => false, 'unsigned' => true, 'primary' => true),
+    'Customization link id'
+)->addColumn(
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('nullable' => false, 'unsigned' => true),
+    'Theme Id'
+)->addColumn(
+    'layout_link_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('nullable' => false, 'unsigned' => true),
+    'Theme layout link id'
+)->addForeignKey(
+    $installer->getFkName('core_theme_files_link', 'theme_id', 'core_theme', 'theme_id'),
+    'theme_id',
+    $installer->getTable('core_theme'),
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->setComment(
+    'Core theme link on layout update'
+);
+$installer->getConnection()->createTable($table);
+
 /**
  * Add column 'type' to 'core_theme'
  */

From 9e49caf8be2186bcde97f135eaff897e250dadef Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Fri, 12 Dec 2014 11:57:57 +0200
Subject: [PATCH 320/474] MAGETWO-30317: Css minificator works incorrectly

---
 .../Css/PreProcessor/Adapter/OyejorgeTest.php       | 13 -------------
 .../Css/PreProcessor/_files/minificate.css          |  1 -
 .../Framework/Css/PreProcessor/_files/oyejorge.css  |  2 +-
 .../Css/PreProcessor/_files/oyejorge_dev.css        |  4 ++--
 4 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/OyejorgeTest.php b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/OyejorgeTest.php
index 758d5af0a4e08..7322fe411904d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/OyejorgeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/Adapter/OyejorgeTest.php
@@ -39,17 +39,4 @@ public function testProcess()
             : file_get_contents(__DIR__ . '/../_files/oyejorge.css');
         $this->assertEquals($expectedCss, $this->model->process($sourceFilePath));
     }
-
-    /**
-     *  Patch in MAGETWO-30317
-     */
-    public function testMinificatorProcess()
-    {
-        $sourceFilePath = realpath(__DIR__ . '/../_files/oyejorge.less');
-        $options = array('relativeUrls' => false, 'compress' => true);
-        $parser = new \Less_Parser($options);
-        $parser->parseFile($sourceFilePath, '');
-        $expectedCss = file_get_contents(__DIR__ . '/../_files/minificate.css');
-        $this->assertEquals($expectedCss, $parser->getCss());
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css
deleted file mode 100644
index 95412618c8a2c..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/minificate.css
+++ /dev/null
@@ -1 +0,0 @@
-#header{color:#4d926f}h2{color:#4d926f}#header{-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;-o-border-radius:5px;border-radius:5px}#footer{-webkit-border-radius:10px;-moz-border-radius:10px;-ms-border-radius:10px;-o-border-radius:10px;border-radius:10px}#header h1{font-size:26px;font-weight:bold}#header p{font-size:12px}#header p a{text-decoration:none}#header p a:hover{border-width:1px}#header{color:#333;border-left:1px;border-right:2px}#footer{color:#141;border-color:#7d2717}body{background-image:url(Magento_Theme::validation_advice_bg.gif)}.overflow{overflow-y:hidden;overflow-x:auto}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
index a892b39cc0950..95412618c8a2c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
@@ -1 +1 @@
-#header{color: #4d926f}h2{color: #4d926f}#header{-webkit-border-radius: 5px;-moz-border-radius: 5px;-ms-border-radius: 5px;-o-border-radius: 5px;border-radius: 5px}#footer{-webkit-border-radius: 10px;-moz-border-radius: 10px;-ms-border-radius: 10px;-o-border-radius: 10px;border-radius: 10px}#header h1{font-size: 26px;font-weight: bold}#header p{font-size: 12px}#header p a{text-decoration: none}#header p a:hover{border-width: 1px}#header{color: #333;border-left: 1px;border-right: 2px}#footer{color: #141;border-color: #7d2717}body{background-image: url(Magento_Theme::validation_advice_bg.gif)}.overflow{overflow-y: hidden;overflow-x: auto}
+#header{color:#4d926f}h2{color:#4d926f}#header{-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;-o-border-radius:5px;border-radius:5px}#footer{-webkit-border-radius:10px;-moz-border-radius:10px;-ms-border-radius:10px;-o-border-radius:10px;border-radius:10px}#header h1{font-size:26px;font-weight:bold}#header p{font-size:12px}#header p a{text-decoration:none}#header p a:hover{border-width:1px}#header{color:#333;border-left:1px;border-right:2px}#footer{color:#141;border-color:#7d2717}body{background-image:url(Magento_Theme::validation_advice_bg.gif)}.overflow{overflow-y:hidden;overflow-x:auto}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css
index ffee09ead620e..fe619ac8d0884 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css
@@ -44,6 +44,6 @@ body {
   background-image: url(Magento_Theme::validation_advice_bg.gif);
 }
 .overflow {
-    overflow-y: hidden;
-    overflow-x: auto;
+  overflow-y: hidden;
+  overflow-x: auto;
 }

From 859d355144c09e69c7fab4f33969b37ba01220f9 Mon Sep 17 00:00:00 2001
From: Steve Johnson <stevjohnson@ebay.com>
Date: Thu, 11 Dec 2014 17:49:13 -0600
Subject: [PATCH 321/474] MAGEDOC-1960: Update Magento 2 Readme.md when install
 guide is published

- Referencing the Magento 2 installation guide now published at devdocs.mangento.com and removing instructions from Readme.md. Users can now fork and create issues directly in the documentation, which is hosted on GitHub.
---
 .../publication/extra_files/ce/README.md      | 841 +-----------------
 1 file changed, 27 insertions(+), 814 deletions(-)

diff --git a/dev/build/publication/extra_files/ce/README.md b/dev/build/publication/extra_files/ce/README.md
index 5a4d56047c98b..c960876710193 100644
--- a/dev/build/publication/extra_files/ce/README.md
+++ b/dev/build/publication/extra_files/ce/README.md
@@ -1,71 +1,22 @@
 [![Build Status](https://travis-ci.org/magento/magento2.svg?branch=master)](https://travis-ci.org/magento/magento2)
-
+<h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
 
-#### Contents 
-
-*	<a href="#magento-2-system-requirements">Magento 2 system requirements</a>
-*	<a href="#composer-and-magento">Composer and Magento</a>
-*	<a href="#high-level-installation-roadmap">High-level installation roadmap</a>
-*	<a href="#required-server-permissions">Required server permissions</a>
-*	<a href="#prerequisites">Prerequisites</a>
-*	<a href="#installing-composer">Installing Composer</a>
-*	<a href="#cloning-the-magento-2-github-repository">Cloning the Magento 2 GitHub repository</a>
-*	<a href="#installing-or-reinstalling-the-magento-2-software">Installing or reinstalling the Magento software</a>
-*	<a href="#verifying-the-installation">Verifying the installation</a>
-*	<a href="#troubleshooting">Troubleshooting</a>
-
-<h2>Magento 2 system requirements</h2>
-
-Before you install Magento 2, make sure your system meets or exceeds the following requirements:
-
-*	Operating systems
-
-	Linux distributions such as RedHat Enterprise Linux (RHEL), CentOS, Ubuntu, Debian, and so on
-	
-*	<a href="https://getcomposer.org/download/" >Composer</a> (latest stable version)
-*	<a href="http://httpd.apache.org/download.cgi" >Apache 2.2</a> or later
-*	PHP 5.4.11 or 5.5.x 
-*	Required PHP extensions:
-
-	*	PDO/MySQL
-	*	mbstring
-	*	mcrypt
-	*	mhash
-	*	simplexml
-	*	curl
-	*	gd2, ImageMagick 6.3.7 (or later) or both
-	*	soap
-	
-*	<a href="http://dev.mysql.com/doc/refman/5.6/en/installing.html" >MySQL 5.6.x</a>
-*	Mail Transfer Agent (MTA) or an SMTP server
-*	Optional but recommended: 
-
-	*	<a href="http://xdebug.org/download.php" >php_xdebug2.2.0</a> or later (development environments only; can have an adverse effect on performance)
-    *	PHPUnit (as a command-line tool) 4.1 or later 
-	
-<h2 id="instgde-overview-composer">Composer and Magento</h2>
-
-We now use <a href="https://getcomposer.org/" >Composer</a> to install the Magento 2 software. Composer enables us to manage Magento 2, extensions, and their dependencies.
+The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v1.0/install-gde/bk-install-guide.html" target="_blank">guide</a>.
 
-Composer provides you with the following advantages:
+<h2>New to Magento? Need some help?</h2>
+If you're not sure about the following, you probably need a little help before you start installing the Magento software:
 
-*	Enables you to reuse third-party libraries without bundling them with source code
-*	Component-based architecture with robust dependency management
-*	Manages dependencies to reduce extension conflicts and compatibility issues
-*	Versioned dependencies
-*	<a href="https://getcomposer.org/doc/01-basic-usage.md#package-versions" >Semantic versioning</a>
-*	Supports PHP Framework Interoperability standards
+*	Is the Magento software <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_magento-installed.html">installed already</a>?
+*	What's a <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_login.html">terminal, command prompt, or Secure Shell (ssh)</a>?
+*	Where's my <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_login.html">Magento server</a> and how do I access it?
+*	What's <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_software.html">PHP</a>?
+*	What's <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_software.html">Apache</a>?
+*	What's <a href="http://devdocs.magento.com/guides/v1.0/install-gde/basics/basics_software.html">MySQL</a>?
 
-We'll have more information soon on how developers can use Composer to package extensions to distribute to Magento merchants and to other developers.
+<h2>Step 1: Verify your prerequisites</h2>
 
-<h2 id="instgde-overview-roadmap">High-level installation roadmap</h2>
-
-Following is a brief overview of how to install the Magento 2 software.
-
-<h3>Step 1: Verify your prerequisites</h3>
-
-Use the following table to verify you have the correct prerequisites to install the Magento 2 software.
+Use the following table to verify you have the correct prerequisites to install the Magento software.
 
 <table>
 	<tbody>
@@ -75,772 +26,34 @@ Use the following table to verify you have the correct prerequisites to install
 			<th>For more information</th>
 		</tr>
 	<tr>
-		<td>Apache 2.2 or later</td>
+		<td>Apache 2.2 or 2.4</td>
 		<td>Ubuntu: <code>apache -v</code><br>
 		CentOS: <code>httpd -v</code></td>
-		<td><a href="#apache" >Apache</a></td>
+		<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/apache.html">Apache</a></td>
 	</tr>
 	<tr>
-		<td>PHP 5.4.11 or 5.5.x</td>
+		<td>PHP 5.4.x (where x = 11 or later) or 5.5.x</td>
 		<td><code>php -v</code></td>
-		<td><a href="#php" >PHP</a></td>
+		<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
 	</tr>
 	<tr><td>MySQL 5.6.x</td>
 	<td><code>mysql -u [root user name] -p</code></td>
-	<td><a href="#mysql" >MySQL</a></td>
+	<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/mysql.html">MySQL</a></td>
 	</tr>
 </tbody>
 </table>
 
-<h3>Step 2: Prepare to install</h3>
-
-After verifying your prerequisites, perform the following tasks in order to prepare to install the Magento 2 software.
-
-1.	<a href="#installing-composer">Installing Composer</a>
-2.	<a href="#cloning-the-magento-2-github-repository">Cloning the Magento 2 GitHub repository</a>
-	
-<h3>Step 3: Install and verify</h3>
-
-1.	<a href="#installing-or-reinstalling-the-magento-2-software">Installing or reinstalling the Magento software</a>
-2.	<a href="#verifying-the-installation">Verifying the installation</a>
-
-<h2>Required server permissions</h2>
-
-Unless otherwise noted, all commands in this Readme must be entered as a user with `root` privileges and permission to write to the web server docroot. Depending on your system, that might mean you must use different user accounts or add users to the web server user group&mdash;provided that group has sufficient privileges.
-
-Installing software on Linux typically requires `root` privileges. You should generally not install the Magento 2 software in the web server docroot using `root` privileges; however, that is up to you.
-
-<h2 id="readme-prereq">Prerequisites</h2>
-
-This section discusses how to install software required to install Magento 2.
-
-See one of the following sections:
-
-*	<a href="#before-you-begin">Before you begin</a>
-*	<a href="#apache">Apache</a>
-*	<a href="#php">PHP</a>
-*	<a href="#mysql">MySQL</a>
-
-
-<h3 id="instgde-prereq-overview">Before you begin</h3>
-
-Before you install Magento, you must do all of the following:
-
-*	Set up one or more hosts that meet the <a href="#magento-2-system-requirements">Magento 2 system requirements</a>.
-*	Make sure you can back up your entire system at various points during the installation so you can roll back in the event of issues.
-
-<h3>Apache</h3>
-
-<h4>Installing Apache on Ubuntu</h4>
-
-<ol><li>Install Apache using the guidelines on the <a href="https://help.ubuntu.com/10.04/serverguide/httpd.html" target="_blank">Ubuntu site</a>. </li>
-<li>Enable server rewrites:
-<ul><li>Apache 2.2: Use the guidelines on <a href="http://askubuntu.com/questions/48362/how-to-enable-mod-rewrite-in-apache" target="_blank">askubuntu</a>.</li>
-<li>Apache 2.4: Enter the following command: <code>a2enmod rewrite</code></li></ul>
-</li>
-<li>Specify the type of directives that can be used in <code>.htaccess</code>. Magento uses <code>.htaccess</code> for redirects. For guidelines, see:
-<ul><li>Apache 2.2: The <a href="http://httpd.apache.org/docs/2.2/mod/core.html#allowoverride" target="_blank">Apache 2.2 documentation</a>.</li>
-<li>Apache 2.4: The <a href="http://httpd.apache.org/docs/current/mod/core.html#allowoverride" target="_blank">Apache 2.4 documentation</a>.<br>
-Note that in Apache 2.4, the server's default site configuration file is <code>/etc/apache2/sites-available/000-default.conf</code><br>
-For example, you can add the following to the bottom of <code>000-default.conf</code>:<br>
-<pre>&lt;Directory "/var/www">
-AllowOverride [value from Apache site]
-&lt;/Directory></pre>
-<strong>Note</strong>: You must change the value of <code>AllowOverride</code> in the directive for the directory to which you expect to install the Magento software. For example, to install in the web server docroot, edit the directive in <code>&lt;Directory /var/www></code>.</li></ul>
-</li>
-<li>Restart Apache: <code>service apache2 restart</code></li></ol>
-
-<h4>Installing Apache on CentOS</h4>
-
-1.	Install Apache:
-
-	`yum -y install httpd`
-	
-	For additional information, see the <a href="http://httpd.apache.org/docs/2.4/platform/rpm.html" target="_blank">Apache site</a>. 
-	
-2.	Enable <a href="http://unix.stackexchange.com/questions/57946/enable-apache-mod-rewrites-to-load-clean-urls" target="_blank">server rewrites</a>.
-
-	**Note**: You must change the value of <code>Allow Override</code> in the directive for the directory to which you expect to install the Magento software. For example, to install in the web server docroot, edit the directive in <code>&lt;Directory "/var/www/html"></code>.
-	
-2.	Set the type of directives that can be used in `.htaccess`. Magento uses `.htaccess` for redirects. <a href="http://httpd.apache.org/docs/2.2/mod/core.html#allowoverride" target="_blank">Apache documentation</a>.
-
-3.	Restart Apache: `service httpd restart`
-
-<h3>MySQL</h3>
-
-<h4>Installing MySQL on Ubuntu</h4>
-
-1.	Install MySQL on <a href="https://rtcamp.com/tutorials/mysql/mysql-5-6-ubuntu-12-04/" target="_blank">Ubuntu 12</a> or <a href="http://www.tocker.ca/2014/04/21/installing-mysql-5-6-on-ubuntu-14-04-trusty-tahr.html" target="_blank">Ubuntu 14</a>. 
-2.	Configure the database instance.
-
-<h4>Installing and configuring MySQL on CentOS</h4>
-
-The following procedure is based on <a href="http://sharadchhetri.com/2013/12/26/install-mysql-server-5-6-in-centos-6-x-and-red-hat-6-x-linux/" target="_blank">Install MySQL Server 5.6 in CentOS 6.x and Red Hat 6.x Linux</a>.
-
-1.	Install the MySQL database:
-
-	<pre>cd /tmp
-wget http://repo.mysql.com/mysql-community-release-el6-5.noarch.rpm
-rpm -ivh mysql-community-release-el6-5.noarch.rpm
-yum -y install mysql-server</pre>
-	
-2.	Start MySQL.
-
-	`service mysqld start`
-	
-3.	Set a password for the <tt>root</tt> user and set other security-related options. Enter the following command and follow the prompts on your screen to complete the configuration.
-
-	`mysql_secure_installation`
-
-<h4>Configuring the Magento database instance</h4>
-
-This section discusses how to create a new database instance for Magento. Although a new database instance is recommended, you can optionally install Magento into an existing database instance.
-
-To configure a MySQL database instance:
-
-1.	Log in to your database server as any user.
-2.	Enter the following command to get to a MySQL command prompt:
-	
-	`mysql -u root -p`
-
-3.	Enter the MySQL `root` user's password when prompted.
-4.	Enter the following commands in the order shown to create a database instance named `magento` with user name `magento`:
-	<pre>create database magento;
-GRANT ALL ON magento.* TO magento@localhost IDENTIFIED BY 'magento';</pre>
-
-5.	Enter `exit` to quit the command prompt.
-
-<h3>PHP</h3>
-
-Magento 2 requires PHP 5.4.11 or later or PHP 5.5.x.
-
-**Note**: Magento 2 does *not* support PHP 5.6.
-
-<h3>PHP 5.5 or 5.4 on Ubuntu</h3>
-
-<h5>Install PHP 5.5 on Ubuntu 14</h5>
-
-To install PHP 5.5 on Ubuntu 14:
-
-1.	Enter the following command:
-
-	`apt-get -y install php5`
-	
-2.	Verify the PHP version by entering `php -v`. Messages similar to the following should display:
-
-	<pre>PHP 5.5.9-1ubuntu4.4 (cli) (built: Sep  4 2014 06:56:34)
-	Copyright (c) 1997-2014 The PHP Group
-	Zend Engine v2.5.0, Copyright (c) 1998-2014 Zend Technologies
-    with Zend OPcache v7.0.3, Copyright (c) 1999-2014, by Zend Technologies</pre>
-	
-<h5>Install PHP 5.5 on Ubuntu 12</h5>	
-
-1.	Use the following commands from <a href="http://www.dev-metal.com/how-to-setup-latest-version-of-php-5-5-on-ubuntu-12-04-lts/" target="_blank">dev-metal</a>:
-
-	<pre>add-apt-repository ppa:ondrej/php5
-	apt-get update
-	sudo apt-get install php5</pre>
-	
-2.	Verify the PHP version by entering `php -v`. Messages similar to the following should display:
-
-	<pre>PHP 5.5.18-1+deb.sury.org~precise+1 (cli) (built: Oct 17 2014 15:11:34)
-	Copyright (c) 1997-2014 The PHP Group
-	Zend Engine v2.5.0, Copyright (c) 1998-2014 Zend Technologies
-    with Zend OPcache v7.0.4-dev, Copyright (c) 1999-2014, by Zend Technologies</pre>
-	
-<h5>Install PHP 5.4 on Ubuntu 12</h5>
-
-To install PHP 5.4 on Ubuntu 12:
-
-1.	Use the following instructions from <a href="http://askubuntu.com/questions/109404/how-do-i-install-latest-php-in-supported-ubuntu-versions-like-5-4-x-in-ubuntu-1" target="_blank">askubuntu</a>:
-
-	<pre>add-apt-repository ppa:ondrej/php5-oldstable
-	apt-get update
-	apt-get upgrade
-	apt-get install php5</pre>
-
-2.	Verify the PHP version by entering `php -v`. Messages similar to the following should display:
-
-	<pre>PHP 5.4.33-2+deb.sury.org~precise+1 (cli) (built: Sep 25 2014 09:06:25)
-	Copyright (c) 1997-2014 The PHP Group
-	Zend Engine v2.4.0, Copyright (c) 1998-2014 Zend Technologies</pre>
-
-3.	Restart Apache: `service apache2 restart`
-
-<h5>Upgrade to PHP 5.4 on Ubuntu</h5>
-
-To upgrade to PHP 5.4 on Ubuntu:
-
-1.	Use the instructions on <a href="http://phpave.com/upgrade-php-5-3-php-5-5-ubuntu-12-04-lts/" target="_blank">phpave</a>.
-2.	After upgrading, verify the PHP version by entering `php -v`. Messages similar to the following should display:
-
-	<pre>PHP 5.4.33-2+deb.sury.org~precise+1 (cli) (built: Sep 25 2014 09:06:25)
-	Copyright (c) 1997-2014 The PHP Group
-	Zend Engine v2.4.0, Copyright (c) 1998-2014 Zend Technologies</pre>
-
-3.	Restart Apache: `service apache2 restart`
-
-<h4>Install required PHP extensions on Ubuntu</h4>
-
-Enter the following command to install required PHP extensions:
-
-<pre>apt-get -y install php5 php5-mhash php5-mcrypt php5-curl php5-cli php5-mysql php5-gd</pre>
-
-<h4>Ubuntu 14 only: workaround for mcrypt issue</h4>
-
-There is a <a href="https://bugs.launchpad.net/ubuntu/+source/php-mcrypt/+bug/1240590" target="_blank">known issue</a> in Ubuntu 14 with the `mcrypt` PHP extension. To work around the issue, see <a href="http://askubuntu.com/questions/450825/ubuntu-14-04-phpmyadmin-cant-find-mcrypt-extension" target="_blank">askubuntu</a>.
-
-<h4>PHP 5.5 or 5.4 on CentOS</h4>
-
-PHP 5.3 is the default PHP version on CentOS distributions. Upgrade to PHP 5.4 using a repository like <a href="http://blog.famillecollet.com/pages/Config-en" target="_blank">remi</a>. 
-
-The following resources are also available:
-
-*	<a href="http://kb.parallels.com/en/115875" target="_blank">kb.parallels</a>
-*	<a href="http://stackoverflow.com/questions/21502656/upgrading-php-on-centos-6-5-final" target="_blank">stackoverflow</a>
-*	<a href="http://rpms.famillecollet.com/" target="_blank">remi repository</a>
-
-To verify if PHP is installed already, enter `php -v`. If PHP is *not* installed, install it by entering the following command:
-
-<pre>yum -y install php php-xml</pre>
-
-<h5>PHP 5.5 on CentOS</h5>
-
-To upgrade to PHP 5.5:
-
-There is more than one way to upgrade CentOS 6.5 to PHP 5.5; the following is a suggestion only. Consult a reference for additional options.
-
-Enter the following commands in the order shown.
-
-<pre>cd /tmp
-rpm -Uvh https://mirror.webtatic.com/yum/el6/latest.rpm
-yum -y remove php-common-5.3.3-40.el6_6.x86_64
-yum -y install php55w php55w-opcache</pre>
-
-Restart Apache: `service httpd restart`
-
-<h5>PHP 5.4 on CentOS</h5>
-
-To upgrade to PHP 5.4:
-
-1.	Enter the following commands:
-
-	<pre>cd /tmp
-	rpm -Uvh http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm
-	rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
-	yum -y --enablerepo=remi install httpd php php-common</pre>
-
-2.	To verify PHP 5.4 is installed, enter `php -v`. The command displays results similar to the following:
-
-	<pre>PHP 5.4.33 (cli) (built: Sep 20 2014 16:20:03)
-	Copyright (c) 1997-2014 The PHP Group
-	Zend Engine v2.4.0, Copyright (c) 1998-2014 Zend Technologies</pre>
-
-3.	Restart Apache: `service httpd restart`
-
-<h4>Install required PHP extensions on CentOS</h4>
-
-Enter the following command to install required PHP extensions:
-
-`yum -y --enablerepo=remi install php-xml php-mcrypt.x86_64 gd gd-devel php-gd php-mysql`
-
-<h4>Setting the PHP timezone (all operating systems)</h4>
-
-Before you install Magento, you might need to set the system time zone for PHP; otherwise, errors like the following display during the installation and time-related operations like cron might not work:
-
-`PHP Warning:  date(): It is not safe to rely on the system's timezone settings.` [more messages follow]
-
-To set your time zone:
-
-1.	Locate your server's time zone in the available <a href="http://php.net/manual/en/timezones.php" target="_blank">time zone settings</a>.
-2.	Locate `php.ini` by entering the following command:
-
-	`php -i | grep "Loaded Configuration File"`
-	
-	Typical locations follow:
-	
-	Ubuntu: `/etc/php5/cli/php.ini`
-	
-	CentOS: `/etc/php.ini`
-	
-3.	Open `php.ini` in a text editor.
-
-4.	Locate the following setting and uncomment it if necessary:
-
-	`date.timezone =`
-	
-5.	Add the time zone setting you found in step 1.
-6.	Save your changes to `php.ini` and exit the text editor.
-
-<h4>Setting the PHP memory limit (all operating systems)</h4>
-
-Increase `memory_limit` in `php.ini` to at least 512MB for normal operation or 2GB for testing:
-
-1.	Open one of the following in a text editor:
-
-	*	Ubuntu: `/etc/php5/apache2/php.ini`
-	*	CentOS: `/etc/php.ini`
-2.	Change `memory_limit` to:
-
-	`memory_limit = 512M` or more for normal operation
-	
-	`memory_limit = 2G` or more for testing
-	
-3.	Save your changes and exit the text editor. 
-
-4.	Restart Apache:
-
-	Ubuntu: `service apache2 restart`
-	
-	CentOS: `service httpd restart`
-
-
-<h2 id="installing-composer">Installing Composer</h2>
-
-To install Composer:
-
-1.	Change to or create an empty directory on your Magento server.
-
-2.	Enter the following commands:
-
-	<pre>curl -sS https://getcomposer.org/installer | php
-	mv composer.phar /usr/local/bin/composer</pre>
-	
-	For additional installation options, see the <a href="https://getcomposer.org/download/" target="_blank">Composer installation documentation</a>.
-	
-<h2 id="instgde-prereq-compose-clone">Cloning the Magento 2 GitHub repository</h2>
-
-To clone the Magento 2 GitHub repository:
-
-1.	Change to your web server's docroot directory.
-
-	Typically, for Ubuntu, it's `/var/www` and for CentOS it's `/var/www/html`.
-
-2.	Enter any of the following commands as a user with privileges to write to the web server docroot:
-
-	To clone using HTTPS, use either of the following:
-
-	`git clone https://github.com/magento/magento2.git`
-	
-	`git clone https://[your github.com user name]:[password]@github.com/magento/magento2.git`
-	
-	To clone using SSH: `git clone git@github.com:magento/magento2.git`
-	
-3.	Wait for the repository to clone on your server.
-
-**Note**: If you get an error that includes `Permission denied (publickey)`, see <a href="#troubleshooting">Troubleshooting</a>.
-
-<h2>Installing or reinstalling the Magento 2 software</h2>
-
-Before you begin, make sure that:
-
-1.	Your system meets the requirements discussed in <a href="#magento-2-system-requirements">Magento 2 system requirements</a>.
-2.	You completed all prerequisite tasks discussed in <a href="#prerequisites">Prerequisites.</a>
-3.	You <a href="#installing-composer">installed Composer</a>.
-4.	You <a href="#cloning-the-magento-2-github-repository">cloned the Magento 2 GitHub repository</a>.
-
-<h3>Setting file system permissions and ownership before you install</h3>
-
-To make sure the installation completes successfully, we suggest the following file system permissions and ownership:
-
-*	All files and directories owned by the web server user
-*	Certain directories must be writable
-
-<h4>Finding the web server user</h4>
-
-To find the web server user, enter one of the following commands:
-
-*	Ubuntu: `ps -ef | grep apache2`
-*	CentOS: `grep User /etc/httpd/conf/httpd.conf`
-
-<h4>Pre-installation permissions and ownership</h4>
-
-Before the installation, set the following permissions:
-
-*	All directories have 700 permissions `(drwx------)`.
-
-	700 permissions give full control (that is, read/write/execute) to the owner and no permissions to anyone else.
-	
-*	All files have 600 permissions `(-rw-------)`.
-
-	600 permissions mean the owner can read and write but other users have no permissions.
-	
-<h4>Setting permissions and ownership</h4>
-
-1.	To set ownership, enter the following commands as a user with `root` privileges:
-
-	<pre>cd [your Magento installation directory]
-	chown -R [web server user name] .</pre>
-	
-	CentOS example:
-	
-	<pre>cd /var/www/html/magento2
-	chown -R apache .</pre>
-	
-	Ubuntu example:
-	
-	<pre>cd /var/www/magento2
-	chown -R www-data .</pre>
-	
-2.	Set file and directory permissions:
-
-	<pre>find . -type d -exec chmod 700 {} \;
-	find . -type f -exec chmod 600 {} \;</pre>
-
-<h3>Getting started with your installation</h3>
-
-After you complete the tasks discussed in the preceding section, update Composer and run the installer:
-
-1.	Log in to your Magento server as a user with `root` privileges.
-2.	Change to the Magento 2 installation directory. For example,
-
-	`cd /var/www/html/magento2`
-	
-	**Note**: On Ubuntu, you might have to use the `sudo -s` or equivalent command to access this directory.
-	
-3.	As user with privileges to write to the web server docroot, enter `composer install`
-
-	This command updates package dependencies and can take a few minutes to complete.
-	
-4.	Change to the Magento 2 `setup` subdirectory and enter `composer install`.
-
-**Note**: You must run `composer install` from *both* directories.
-	
-<h3>Running the Magento 2 installer</h3>
-
-This section discusses how to run the command-line installer for Magento 2. 
-
-**Note**: You must install Magento from its `setup` subdirectory.
-
-The installer is designed to be run multiple times if necessary so you can:
-
-*	Provide different values 
-
-	For example, after you configure your web server for Secure Sockets Layer (SSL), you can run the installer to set SSL options.
-*	Correct mistakes in previous installations
-*	Install Magento in a different database instance
-
-**Note**: By default, the installer doesn't overwrite the Magento database if you install the Magento software in the same database instance. You can use the optional <tt>clean_database</tt> parameter to change this behavior.
-
-**Note**: If you get errors during the installation, see <a href="#troubleshooting">Troubleshooting</a>.
-
-Before you begin, you can run the following commands to find values for some required options:
-
-<table>
-	<tbody>
-		<tr>
-			<th>Installer option</th>
-			<th>Command</th>
-		</tr>
-	<tr>
-		<td>Language</td>
-		<td><code>php -f index.php help languages</code></td>
-	</tr>
-	<tr>
-		<td>Time zone</td>
-		<td><code>php -f index.php help timezones</code></td>
-	</tr>
-	<tr>
-		<td>Currency</td>
-		<td><code>php -f index.php help currencies</code></td>
-	</tr>
-	</tbody>
-	</table>
-	
-	<p>The format of the command follows:</p>
-
-	<code>php -f index.php install [--[installation option name]=[installation option value] ...</code>
-
-	<p>The following table discusses the meanings of installation option names and values. An example is provided in <a href="#sample-localhost-installation">Sample localhost installation</a>.</p>
-
-<table>
-	<tbody>
-		<tr>
-			<th>Name</th>
-			<th>Value</th>
-			<th>Required?</th>
-		</tr>
-		<tr>
-		<td>base_url</td>
-		<td><p>Base URL to use to access your Magento Admin and storefront in the format <tt>http[s]://[host or ip]/[your Magento base dir]/</tt>.</p>
-		<p><strong>Note</strong>: The scheme (<code>http://</code> or <code>https://</code>) and a trailing slash are <em>both</em> required.</p>
-		<p><tt>[your Magento base dir]</tt> is the docroot-relative path in which to install the Magento 2 software. Depending on how you set up your web server and virtual hosts, the path might be <tt>magento2</tt> or it might be blank.</p>
-		<p>To access Magento on localhost, you can use either <code>http://localhost/[your Magento base dir]/</code> or <code>http://127.0.0.1/[your Magento base dir]/</code>.</p>
-		</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>backend_frontname</td>
-		<td>Path to access the Magento Admin. This path is appended to Base URL.
-For example, if Base URL is http://www.example.com and Admin Path is <code>admin</code>, the Admin Panel's URL is <code>http://www.example.com/admin</code>&mdash;provided you configured your web server for server rewrites.</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-	<tr>
-		<td>db_host</td>
-		<td><p>Use any of the following:</p>
-		<ul><li>The database server's fully qualified host name or IP address.</li>
-		<li><code>localhost</code> if your database serve is on the same host as your web server.</li>
-		<li>UNIX socket; for example, <code>/var/run/mysqld/mysqld.sock</code></li></ul>
-		<p><strong>Note</strong>: You can optionally specify the database server port in its host name like <code>www.example.com:9000</code></p>
-</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>db_name</td>
-		<td>Name of the Magento database instance in which you want to install the Magento database tables.</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>db_user</td>
-		<td>User name of the Magento database instance owner.</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>db_pass</td>
-		<td>Magento database instance owner's password.</td>
-		<td>No</td>
-	</tr>
-	<tr>
-		<td>db_prefix</td>
-		<td><p>Use only if you're installing the Magento database tables in a database instance that has Magento tables in it already.</p>
-		<p>In that case, use a prefix to identify the Magento tables for this installation. Some customers have more than one Magento instance running on a server with all tables in the same database.</p>
-		<p>This option enables those customers to share the database server with more than one Magento installation.</p></td>
-		<td>No</td>
-	</tr>
-
-		<td>admin_firstname</td>
-		<td>Magento administrator user's first name.</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>admin_lastname</td>
-		<td>Magento administrator user's last name.</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>admin_email</td>
-		<td>Magento administrator user's e-mail address.</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>admin_username</td>
-		<td>Magento administrator user name.</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>admin_password</td>
-		<td>Magento administrator user password.</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>language</td>
-		<td>Language code to use in the Admin and storefront. (If you have not done so already, you can view the list of language codes by entering <code>php -f index.php help languages</code> from the <code>setup</code> directory.)</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>currency</td>
-		<td>Default currency to use in the storefront. (If you have not done so already, you can view the list of currencies by entering <code>php -f index.php help currencies</code> from the <code>setup</code> directory.)</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>timezone</td>
-		<td>Default time zone to use in the Admin and storefront. (If you have not done so already, you can view the list of time zones by entering <code>php -f index.php help timezones</code> from the <code>setup</code> directory.)</td>
-		<td>Yes</td>
-	</tr>
-	<tr>
-		<td>use_secure</td>
-		<td><p><code>1</code> enables the use of Secure Sockets Layer (SSL) in all URLs (both Admin and storefront). Make sure your web server supports SSL before you select this option.</p>
-		<p><code>0</code> disables the use of SSL with Magento. In this case, all other secure URL options are assumed to also be <code>0</code>.</p></td>
-		<td>No</td>
-	</tr>
-	<tr>
-		<td>base_secure_url</td>
-		<td><p><code>1</code> means SSL is preferred in Magento URLs designed to use it (for example, the checkout page). Make sure your web server supports SSL before you select this option.</p>
-		<p><code>0</code> means SSL is not used.</p></td>
-		<td>No</td>
-	</tr>
-	
-	<tr>
-		<td>use_secure_admin</td>
-		<td><p><code>1</code> means you use SSL to access the Magento Admin. Make sure your web server supports SSL before you select this option.</p>
-		<p><code>0</code> means you do not use SSL with the Admin.</p></td>
-		<td>No</td>
-	</tr>
-	<tr>
-		<td>admin_use_security_key</td>
-		<td><p><code>1</code> causes the Magento software to use a randomly generated key value to access pages in the Magento Admin and in forms. These key values help prevent <a href="https://www.owasp.org/index.php/Cross-Site_Request_Forgery_%28CSRF%29" target="_blank">cross-site script forgery attacks</a>.</p>
-		<p><code>0</code> disables the use of the key.</p></td>
-		<td>No</td>
-	</tr>
-	<tr>
-		<td>session_save</td>
-		<td><p>Use any of the following:</p>
-		<ul><li><code>files</code> to store session data in the file system. File-based session storage is appropriate unless the Magento file system access is slow or you have a clustered database.</li>
-		<li><code>db.files</code> to store session data in the database. Choose database storage if you have a clustered database; otherwise, there might not be much benefit over file-based storage.</li></ul></td>
-		<td>No</td>
-	</tr>
-	<tr>
-		<td>key</td>
-		<td>If you have one, specify a key to encrypt sensitive data in the Magento database. (This includes passwords and personally identifiable customer information.) If you don't have one, Magento generates one for you.</td>
-		<td>No</td>
-	</tr>
-	<tr>
-		<td>cleanup_database</td>
-		<td>To drop database tables before installing the Magento 2 software, specify this parameter without a value. Otherwise, the Magento database is left intact.</td>
-		<td>No</td>
-	</tr>
-	<tr>
-		<td>db_init_statements</td>
-		<td>Advanced MySQL configuration parameter. Uses database initialization statements to run when connecting to the MySQL database. Consult a reference similar to <a href="http://dev.mysql.com/doc/refman/5.6/en/server-options.html" target="_blank">this one</a> before you set any values.</td>
-		<td>No</td>
-	</tr>
-	<tr>
-		<td>sales_order_increment_prefix</td>
-		<td>Specify a string value to use as a prefix for sales orders. Typically, this is used to guarantee unique order numbers for payment processors.</td>
-		<td>No</td>
-	</tr>
-	
-	</tbody>
-</table>
-
-<h4>Sample localhost installation</h4>
-
-The following example installs Magento with the following options:
-
-*	The Magento software is installed in the `magento2` directory relative to the web server docroot on `localhost` and the path to the Magento Admin is `admin`; therefore:
-
-	Your storefront URL is `http://localhost` and you can access the Magento Admin at `http://localhost/admin`
-	
-*	The database server is on the same host as the web server.
-
-	The database name is `magento`, and the user name and password are both `magento`
-	
-*	The Magento administrator has the following properties:
-
-	*	First and last name are is `Magento User`
-	*	User name is `admin` and the password is `iamtheadmin`
-	*	E-mail address is `user@example.com`
-
-*	Default language is `en_US` (U.S. English)
-*	Default currency is U.S. dollars
-*	Default time zone is U.S. Central (America/Chicago)
-
-<pre>php -f index.php install --base_url=http://localhost/magento2/
-	--backend_frontname=admin 
-	--db_host=localhost --db_name=magento 
-	--db_user=magento --db_pass=magento 
-	--admin_firstname=Magento --admin_lastname=User 
-	--admin_email=user@example.com 	--admin_username=admin 
-	--admin_password=iamtheadmin --language=en_US
-	--currency=USD --timezone=America/Chicago</pre>
-
-<h3 id="instgde-install-magento-reinstall">Reinstalling the Magento 2 software</h3>
-
-This section discusses how to install the Magento 2 software after you installed it previously. You might do this in an development environment especially to get all the latest code changes.
-
-To reinstall the Magento 2 software:
-
-1.	Optionally delete and re-create the database instance.
-2.	Log in to your Magento server as a user with permissions to modify files in the Magento file system.
-3.	Enter the following commands in the order shown:
-
-	<pre>cd [your Magento install dir]
-git pull
-composer install
-cd setup
-composer install</pre>
-
-4.	Repeat the tasks discussed in <a href="#installing-or-reinstalling-the-magento-2-software">Installing or reinstalling the Magento 2 software</a>.
-
-<h2>Verifying the installation</h2>
-
-<h3>Verifying the storefront</h3>
-
-Go to the storefront in a web browser. For example, if your Magento 2 installation base URL is `http://www.example.com`, enter it in your browser's address or location bar.
-
-The following figure shows a sample storefront page. If it displays as follows, your installation was a success!
-
-<p><img src="success.png" alt="Magento storefront which verifies a successful installation"></p>
-
-If the page appears unconfigured (no styles, only text), see <a href="troubleshooting">Troubleshooting</a>.
-
-<h3>Verifying the Magento Admin</h3>
-
-Go to the Magento Admin in a web browser. For example, if your Magento 2 installation base URL is `http://www.example.com`, and the Admin URL is `admin`, enter `http://www.example.com/admin` in your browser's address or location bar.
-
-(The Admin URL is specified by the value of the `backend_frontname` installation parameter.)
-
-When prompted, log in as a Magento Administrator.
-
-The following figure shows a sample Magento Admin page. If it displays as follows, your installation was a success!
-
-<p><img src="success_admin.png" alt="Magento Admin which verifies a successful installation"></p>
-
-If the page appears unconfigured (no styles, only text), see <a href="troubleshooting">Troubleshooting</a>.
-
-If you get a 404 (Not Found) error similar to the following, see <a href="troubleshooting">Troubleshooting</a>:
-
-`The requested URL /magento2index.php/admin/admin/dashboard/index/key/0c81957145a968b697c32a846598dc2e/ was not found on this server.`
-
-<h2>Troubleshooting</h2>
-
-### Problem: Cannot clone the Magento 2 GitHub repository
-
-**Detail**: Error is similar to the following:
-
-<pre>Cloning into 'magento2'...
-Permission denied (publickey).
-fatal: The remote end hung up unexpectedly</pre>
-
-**Solution**: Upload your SSH key to GitHub as discussed in <a href="https://help.github.com/articles/generating-ssh-keys" target="_blank">the GitHub help page</a>.
-
-### Problem: Cannot run 'composer install'
-
-**Suggestion**: Change to the directory in which you installed Composer and enter the following command:
-
-`mv composer.phar /usr/local/bin/composer`
-
-### Problem: During installation, PHP date warning
-
-**Details**: During the installation, the following message displays: 
-
-`PHP Warning:  date(): It is not safe to rely on the system's timezone settings. [more]`
-
-**Solution**: <a href="#php">Set the PHP timezone properly</a>.
-
-### Problem: During installation, the following fatal error displays:
-
-`PHP Fatal error:  Class 'PDO' not found in /var/www/html/magento2/setup/module/Magento/Setup/src/Module/Setup/ConnectionFactory.php on line 44`
-
-**Solution**: Make sure you installed all required <a href="#php">PHP extensions</a>.
-
-### Problem: You cannot access Magento in a web browser
-
-**Details**: The following message displays when you try to access the Magento storefront or Admin:
-
-<pre>Whoops, it looks like you have an invalid PHP version.
-Magento supports PHP 5.4.11 or newer. </pre>
-
-**Solution**: Either <a href="#php">upgrade PHP</a> or restart Apache (Apache might not be using the same PHP version as is on the file system).
-
-To restart Apache:
-
-*	Ubuntu: `service apache2 restart`
-*	CentOS: `service httpd restart`
-
-### Problem: Error after logging in to the Magento Admin:
-
-`The requested URL /magento2index.php/admin/admin/dashboard/index/key/0c81957145a968b697c32a846598dc2e/ was not found on this server.`
-
-Note the lack of a slash character between <tt>magento2</tt> and <tt>index.php</tt> in the URL.
-
-**Solution**: The base URL is not correct. The base URL must start with <tt>http://</tt> or <tt>https://</tt> *and* it must end with a slash (/). Run the installation again with a valid value.
+<h2>Step 2: Prepare to install</h2>
 
-### Problem: After installing, images and stylesheets do not load; only text displays, no graphics. 
+After verifying your prerequisites, perform the following tasks in order to prepare to install the Magento software.
 
-**Details**: The path to images and stylesheets is not correct, either because of an incorrect base URL or because <a href="#apache">server rewrites</a> are not set up properly. To confirm this is the case, use a web browser inspector to check the paths to static assets and verify those assets are located on the Magento file system.
+1.	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-install">Install Composer</a>
+2.	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/composer-clone.html#instgde-prereq-compose-clone">Clone the Magento repository</a>
 
-Magento 2 static assets should be located under `[your Magento install dir]/pub/static/` (there should be `frontend` and `adminhtml` directories).
+<h2>Step 3: Install and verify the installation</h2>
 
-Verify your server rewrites setting and your base URL and try again.
+1.	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/prepare-install.html">Update installation dependencies</a>
+2.	Install Magento:
+	*	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-web.html">Install Magento software using the web interface</a>
+	*	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/install-cli.html">Install Magento software using the command line</a>
+2.	<a href="http://devdocs.magento.com/guides/v1.0/install-gde/install/verify.html">Verify the installation</a>

From 06f0c0a4af458a232c95ea3eacf0c1b0ded54752 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Fri, 12 Dec 2014 12:06:42 +0200
Subject: [PATCH 322/474] MAGETWO-30317: Css minificator works incorrectly

---
 .../Magento/Framework/Css/PreProcessor/_files/oyejorge.css      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
index 95412618c8a2c..de2d6b90bf747 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
@@ -1 +1 @@
-#header{color:#4d926f}h2{color:#4d926f}#header{-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;-o-border-radius:5px;border-radius:5px}#footer{-webkit-border-radius:10px;-moz-border-radius:10px;-ms-border-radius:10px;-o-border-radius:10px;border-radius:10px}#header h1{font-size:26px;font-weight:bold}#header p{font-size:12px}#header p a{text-decoration:none}#header p a:hover{border-width:1px}#header{color:#333;border-left:1px;border-right:2px}#footer{color:#141;border-color:#7d2717}body{background-image:url(Magento_Theme::validation_advice_bg.gif)}.overflow{overflow-y:hidden;overflow-x:auto}
+#header{color:#4d926f}h2{color:#4d926f}#header{-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;-o-border-radius:5px;border-radius:5px}#footer{-webkit-border-radius:10px;-moz-border-radius:10px;-ms-border-radius:10px;-o-border-radius:10px;border-radius:10px}#header h1{font-size:26px;font-weight:bold}#header p{font-size:12px}#header p a{text-decoration:none}#header p a:hover{border-width:1px}#header{color:#333;border-left:1px;border-right:2px}#footer{color:#141;border-color:#7d2717}body{background-image:url(Magento_Theme::validation_advice_bg.gif)}.overflow{overflow-y:hidden;overflow-x:auto}
\ No newline at end of file

From 95cdb52498583a31f76fb039af04276abad75310 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Fri, 12 Dec 2014 12:08:17 +0200
Subject: [PATCH 323/474] MAGETWO-31711: Unable to open editing page for CMS
 Page after filtering on grid

---
 app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php b/app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php
index 08c8309cfc7a3..8c10225dd3e7a 100644
--- a/app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php
+++ b/app/code/Magento/Cms/Ui/DataProvider/Page/Row/Actions.php
@@ -16,7 +16,7 @@ class Actions implements RowInterface
     /**
      * Url path
      */
-    const URL_PATH = '*/*/edit';
+    const URL_PATH = 'adminhtml/cms_page/edit';
 
     /**
      * @var UrlBuilder

From 1609b6475405b30084b5906885965314ca02fb2c Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Fri, 12 Dec 2014 12:10:01 +0200
Subject: [PATCH 324/474] MAGETWO-24703: Backend UI issues: improvements

---
 lib/web/css/source/lib/responsive.less | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/web/css/source/lib/responsive.less b/lib/web/css/source/lib/responsive.less
index dccfb07e94d1c..ffff15b4413a6 100644
--- a/lib/web/css/source/lib/responsive.less
+++ b/lib/web/css/source/lib/responsive.less
@@ -35,11 +35,6 @@
 
 .responsive-min-l(@break) {}
 
-@media all and (min-width: @screen-s),
-print {
-    .responsive-min-l(@screen-s);
-}
-
 @media all and (min-width: @screen-m),
 print {
     .responsive-min-l(@screen-m);

From 1dd5900362d587cdb6101e7b4618592fc6fee8e3 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 12:16:32 +0200
Subject: [PATCH 325/474] MAGETWO-31629: Online payment methods removal for CE
 release

- fix
---
 .../unit/testsuite/Magento/Centinel/Model/ObserverTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php
index 5cbfd51b3907a..8a9b8f188a6f2 100644
--- a/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Centinel/Model/ObserverTest.php
@@ -21,7 +21,7 @@ public function testPaymentFormBlockToHtmlBefore()
 
         $method->expects($this->once())
             ->method('getCode')
-            ->willReturn('payflowprocentinel');
+            ->willReturn('payflowpro');
 
         $blockLogo = $this->getMock(
             'Magento\Centinel\Block\Logo',

From 2ebf4824c77c6498559ccd687698f33057bcdfe8 Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Fri, 12 Dec 2014 12:23:30 +0200
Subject: [PATCH 326/474] MAGETWO-24703: Backend UI issues: improvements

- fix copyright
---
 .../Review/view/adminhtml/templates/rating/form.phtml    | 9 +--------
 .../Magento_VersionsCms/web/css/source/module.less       | 6 +-----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
index 044c507f83330..0f4b8c6bd6dd8 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
@@ -1,15 +1,8 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
- */
-/**
- * @var $this \Magento\Review\Block\Adminhtml\Rating\Edit\Tab\Form
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 ?>
-
 <div class="message info">
     <div><?php echo __('Please specify a rating title for a store, or we\'ll just use the default value.'); ?></div>
 </div>
diff --git a/app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/module.less
index 3ea599854917a..3e2ef7780f343 100644
--- a/app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/module.less
@@ -1,9 +1,5 @@
 // /**
-//  * {license_notice}
-//  *
-//  * @category    design
-//  * @copyright   {copyright}
-//  * @license     {license_link}
+//  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
 //  */
 
 .version-fieldset {

From 0026df3780a91cae1d3a0ad16ade1050a7218ef4 Mon Sep 17 00:00:00 2001
From: Alexander Paliarush <apaliarush@ebay.com>
Date: Fri, 12 Dec 2014 12:30:23 +0200
Subject: [PATCH 327/474] MAGETWO-31644: Lib Package
 lib\internal\Magento\Framework\Api

---
 .../testsuite/Magento/Test/Legacy/_files/obsolete_methods.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 99fc87c6fa218..ffef9325ddc5a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -1824,6 +1824,8 @@
     ['_detectTheme', 'Magento\Core\Helper\Theme'],
     ['_detectGroup', 'Magento\Core\Helper\Theme'],
     ['_sortThemesByHierarchy', 'Magento\Core\Helper\Theme'],
+    ['set', 'Magento\Framework\Api\ExtensibleObjectBuilder'],
+    ['toFlatArrayStatic', 'Magento\Framework\Api\ExtensibleDataObjectConverter'],
     ['_sortArrayByArray', 'Magento\Core\Helper\Theme'],
     ['_getGroupLabels', 'Magento\Core\Helper\Theme'],
     ['_sortGroupFilesCallback', 'Magento\Core\Helper\Theme'],

From a8a3fc2346f7c187a50b1e52336ea3fd44cb7682 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com>
Date: Fri, 12 Dec 2014 12:41:56 +0200
Subject: [PATCH 328/474] MAGETWO-31639: Unable to update customer balance

---
 .../CustomerBalance/Model/Balance/HistoryTest.php     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/CustomerBalance/Model/Balance/HistoryTest.php b/dev/tests/unit/testsuite/Magento/CustomerBalance/Model/Balance/HistoryTest.php
index 1a56b54a0f98c..b76ae786668c6 100644
--- a/dev/tests/unit/testsuite/Magento/CustomerBalance/Model/Balance/HistoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/CustomerBalance/Model/Balance/HistoryTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\CustomerBalance\Model\Balance;
 
@@ -82,8 +79,8 @@ protected function setUp()
             ['getIdFieldName', 'markAsSent']
         );
         $this->customerRegistryMock = $this->getMock('\Magento\Customer\Model\CustomerRegistry', [], [], '', false);
-        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
-        $this->designMock = $this->getMock('\Magento\Framework\View\DesignInterface', [], [], '', false);
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
+        $this->designMock = $this->getMock('\Magento\Framework\View\DesignInterface');
         $objectHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
         $this->model = $objectHelper->getObject(
             '\Magento\CustomerBalance\Model\Balance\History',
@@ -114,7 +111,7 @@ public function testAfterSave()
         $customerDataMock = $this->getMock('\Magento\Customer\Model\Data\Customer', ['getId'], [], '', false);
         $customerMock = $this->getMock('\Magento\Customer\Model\Customer', ['getEmail', 'getName'], [], '', false);
         $storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
-        $transportMock = $this->getMock('\Magento\Framework\Mail\TransportInterface', [], [], '', false);
+        $transportMock = $this->getMock('\Magento\Framework\Mail\TransportInterface');
         $websiteMock = $this->getMock('\Magento\Store\Model\Website', [], [], '', false);
         $currencyMock = $this->getMock('\Magento\Directory\Model\Currency', [], [], '', false);
         $this->balanceModelMock->expects($this->once())->method('getNotifyByEmail')->willReturn(true);

From 5e1bac9f59169f1861bdcfe20baea6995d1c4483 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 12 Dec 2014 12:47:00 +0200
Subject: [PATCH 329/474] MAGETWO-31627: Remove proxy for config classes

- fixed intergration GeneralTest to use Interception/ObjectManager/ConfigInterface
- fixed notice config fixture on mainline
---
 .../testsuite/Magento/Framework/Interception/GeneralTest.php  | 2 +-
 .../integration/testsuite/Magento/Store/Model/StoreTest.php   | 2 +-
 .../Magento/Test/Php/_files/phpcpd/blacklist/common.txt       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
index c86409cc9c009..05e9ea66beda2 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/GeneralTest.php
@@ -84,7 +84,7 @@ public function setUp()
                 'Magento\Framework\Config\ReaderInterface' => $this->_configReader,
                 'Magento\Framework\ObjectManager\RelationsInterface' => $relations,
                 'Magento\Framework\ObjectManager\ConfigInterface' => $config,
-                'Magento\Framework\Interception\ObjectManager\Config' => $config,
+                'Magento\Framework\Interception\ObjectManager\ConfigInterface' => $config,
                 'Magento\Framework\ObjectManager\DefinitionInterface' => $definitions,
                 'Magento\Framework\Interception\DefinitionInterface' => $interceptionDefinitions
             )
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
index c3e84863f297b..de563928d12ef 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -455,7 +455,7 @@ public function isCurrentlySecureDataProvider()
 
     /**
      * @magentoConfigFixture current_store web/secure/offloader_header SSL_OFFLOADED
-     * @magentoConfigFixture current_store web/secure/base_url
+     * @magentoConfigFixture current_store web/secure/base_url 
      */
     public function testIsCurrentlySecureNoSecureBaseUrl()
     {
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index dd76eee06307f..e176241dd0a0b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -144,5 +144,5 @@ app/code/Magento/CatalogInventory/Api/Data
 app/code/Magento/Sales/Model/Spi
 Magento/Catalog/Model/ProductLink
 Magento/GroupedProduct/Model/Resource/Product/Type/Grouped
-Magento/Framework/Interception/ObjectManager/Config/Developer
-Magento/Framework/Interception/ObjectManager/Config/Compiled
\ No newline at end of file
+lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer
+lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled
\ No newline at end of file

From 720366d9c01e36b3c065eed5b8aa987b6c0aeac6 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@ebay.com>
Date: Fri, 12 Dec 2014 12:52:26 +0200
Subject: [PATCH 330/474] MAGETWO-31621: Blank page during multiple checkout
 for customer without address

---
 .../Customer/Model/Resource/Address.php        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/code/Magento/Customer/Model/Resource/Address.php b/app/code/Magento/Customer/Model/Resource/Address.php
index dddf1e3d0d3c5..4cda0ee8fb84d 100644
--- a/app/code/Magento/Customer/Model/Resource/Address.php
+++ b/app/code/Magento/Customer/Model/Resource/Address.php
@@ -149,4 +149,22 @@ public function delete($object)
         $object->setData([]);
         return $result;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function _afterDelete(\Magento\Framework\Object $address)
+    {
+        if ($address->getId()) {
+            $customer = $this->_createCustomer()->load($address->getCustomerId());
+            if ($customer->getDefaultBilling() == $address->getId()) {
+                $customer->setDefaultBilling(null);
+            }
+            if ($customer->getDefaultShipping() == $address->getId()) {
+                $customer->setDefaultShipping(null);
+            }
+            $customer->save();
+        }
+        return parent::_afterDelete($address);
+    }
 }

From db34b0450b23e1a5031e852c55f4b792b7812330 Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com>
Date: Fri, 12 Dec 2014 12:51:44 +0200
Subject: [PATCH 331/474] MAGETWO-31696: Can't save config at "Admin" section

---
 app/code/Magento/Backend/etc/adminhtml/system.xml | 2 +-
 lib/web/mage/validation.js                        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 85606547aad08..46b73ca4621c4 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -401,7 +401,7 @@
                 <field id="password_reset_link_expiration_period" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Recovery Link Expiration Period (days)</label>
                     <comment>Please enter a number 1 or greater in this field.</comment>
-                    <validate>required-entry validate-digits validate-digits-range digits-range-1-</validate>
+                    <validate>required-entry integer validate-greater-than-zero</validate>
                     <backend_model>Magento\Backend\Model\Config\Backend\Admin\Password\Link\Expirationperiod</backend_model>
                 </field>
             </group>
diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index bb95f1cc81ab5..80404eef56f0a 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -706,7 +706,6 @@
                         range = classes[ii];
                         m = classNameRange.exec(range);
                         if (m) {
-                            m[2] = m[2] || null;
                             result = result && $.mage.isBetween(numValue, m[1], m[2]);
                             break;
                         }

From 982edb4f858875e7bd819b5937b773058ec53fc2 Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Fri, 12 Dec 2014 13:28:28 +0200
Subject: [PATCH 332/474] MAGETWO-24703: Backend UI issues: improvements

---
 dev/build/publication/edition/ee.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/build/publication/edition/ee.txt b/dev/build/publication/edition/ee.txt
index b859f74c8ba92..b3c49d1f4286e 100644
--- a/dev/build/publication/edition/ee.txt
+++ b/dev/build/publication/edition/ee.txt
@@ -59,6 +59,7 @@ LICENSE_EE.txt
 app/design/adminhtml/Magento/backend/Magento_Enterprise/
 app/design/adminhtml/Magento/backend/Magento_GiftRegistry/
 app/design/adminhtml/Magento/backend/Magento_Rma/
+app/design/adminhtml/Magento/backend/Magento_VersionsCms/
 app/design/frontend/Magento/{blank,luma}/Magento_AdvancedCheckout
 app/design/frontend/Magento/{blank,luma}/Magento_Banner
 app/design/frontend/Magento/{blank,luma}/Magento_CatalogEvent

From 6de526c4577a509f6d82b565bae39ecd56d0c437 Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@ebay.com>
Date: Fri, 12 Dec 2014 13:43:39 +0200
Subject: [PATCH 333/474] MAGETWO-31572: Refactor and cover by unit tests
 Magento\GoogleShopping\Model\Attribute\SalePriceEffectiveDate::convertAttribute

---
 .../Model/Attribute/SalePriceEffectiveDateTest.php             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php
index 712fc333a4fc1..f8eea22a8a453 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php
@@ -60,6 +60,9 @@ public function testConvertAttribute($dateFrom, $dataTo)
         $this->assertEquals($entry, $model->convertAttribute($product, $entry));
     }
 
+    /**
+     * @return array
+     */
     public function testConvertAttributeDataProvider()
     {
         $dateFrom = date(DATE_ATOM, strtotime("-2 day"));

From 1fb147ee1fe23007e6dd740e5da701c065421d49 Mon Sep 17 00:00:00 2001
From: Yaroslav Onischenko <yonischenko@ebay.com>
Date: Fri, 12 Dec 2014 13:52:35 +0200
Subject: [PATCH 334/474] MAGETWO-31704: [Modularity] Export is not available
 if modules for Products Import/Export are removed

---
 app/code/Magento/CustomerFinance/etc/export.xml      | 1 +
 app/code/Magento/CustomerImportExport/etc/export.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/CustomerFinance/etc/export.xml b/app/code/Magento/CustomerFinance/etc/export.xml
index 1f6087d46c311..01d42502267e9 100644
--- a/app/code/Magento/CustomerFinance/etc/export.xml
+++ b/app/code/Magento/CustomerFinance/etc/export.xml
@@ -6,4 +6,5 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../ImportExport/etc/export.xsd">
     <entity name="customer_finance" label="Customer Finances" model="Magento\CustomerFinance\Model\Export\Customer\Finance" entityAttributeFilterType="customer"/>
+    <fileFormat name="csv" label="CSV" model="Magento\ImportExport\Model\Export\Adapter\Csv" />
 </config>
diff --git a/app/code/Magento/CustomerImportExport/etc/export.xml b/app/code/Magento/CustomerImportExport/etc/export.xml
index fcba24cfe012c..633d3693c07ba 100644
--- a/app/code/Magento/CustomerImportExport/etc/export.xml
+++ b/app/code/Magento/CustomerImportExport/etc/export.xml
@@ -7,4 +7,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../ImportExport/etc/export.xsd">
     <entity name="customer" label="Customers Main File" model="Magento\CustomerImportExport\Model\Export\Customer" entityAttributeFilterType="customer"/>
     <entity name="customer_address" label="Customer Addresses" model="Magento\CustomerImportExport\Model\Export\Address" entityAttributeFilterType="customer" />
+    <fileFormat name="csv" label="CSV" model="Magento\ImportExport\Model\Export\Adapter\Csv" />
 </config>

From a5de470f0d6b3459d0b96931aa6cd75be082482b Mon Sep 17 00:00:00 2001
From: Alex Bomko <abomko@ebay.com>
Date: Fri, 12 Dec 2014 14:21:07 +0200
Subject: [PATCH 335/474] MAGETWO-31002: [Spike] Investigate methods of
 publishing sample data packages

---
 dev/build/publication/edition/internal.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev/build/publication/edition/internal.txt b/dev/build/publication/edition/internal.txt
index 9934e0ed1943a..2693867a01ac6 100644
--- a/dev/build/publication/edition/internal.txt
+++ b/dev/build/publication/edition/internal.txt
@@ -1,8 +1,5 @@
 # Files included in testing builds, but nor ready/approved for publication
 
-dev/tools/Magento/Tools/SampleData
-dev/tests/integration/testsuite/Magento/Tools/SampleData
-
 dev/tools/Magento/Tools/Formatter
 dev/tools/PHP-Parser
 

From 82832c982919cc71d724e20eb2288e23329c4fb9 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 14:27:38 +0200
Subject: [PATCH 336/474] MAGETWO-31049: M2 GitHub Update (version
 0.1.0-alpha108)

---
 .../publication/extra_files/ce/CHANGELOG.md   | 164 ++++++++++++++++++
 1 file changed, 164 insertions(+)

diff --git a/dev/build/publication/extra_files/ce/CHANGELOG.md b/dev/build/publication/extra_files/ce/CHANGELOG.md
index 8808060ef8cdd..1f1889649a33e 100644
--- a/dev/build/publication/extra_files/ce/CHANGELOG.md
+++ b/dev/build/publication/extra_files/ce/CHANGELOG.md
@@ -1,3 +1,167 @@
+0.1.0-alpha108
+=============
+* Service Contracts:
+    * Implemented Bundle Product API (MAGETWO-30985)
+    * Removed Address Converter model. Use Address Mapper instead. (MAGETWO-31098)
+    * Refactored Customer web service routes and API functional tests to use latest service layer (MAGETWO-29282 and MAGETWO-30842)
+    * Fixed issue where path parameter routes were matched incorrectly in REST web services (MAGETWO-29964)
+    * Implemented Configurable Product Module API (MAGETWO-29420)
+    * Removed obsolete namespace Magento\Catalog\Service (MAGETWO-31488)
+* Price calculation logic improvement:
+    * implemented complex price calculation not to be performed on Frontend (MAGETWO-21532)
+* JS library updatings:
+    * updated jQuery 1.11 is used all over the Masgento now (MAGETWO-30011)
+* Fixed bugs:
+    * $0.00 price not be be displayed for variations of Configurable Product (MAGETWO-30011)
+    * Fatal error when user with read-only permissions try to open existing cart price rule (MAGETWO-31325)
+    * Text message 'An order with subscription items was registered.' is displayed on order if the order has been placed with online payment method (MAGETWO-31236)
+    * 'Warning: Division by zero' is displayed while opening invoice for order which has been placed with online payment method (MAGETWO-31217)
+    * Simple product created using API service leads to Exception page on frontend (MAGETWO-31323)
+    * Impossible perform advanced search for price from 0 to 0 (MAGETWO-30816)
+    * Search Terms Report page is broken (MAGETWO-30819)
+    * Search Terms page is broken (MAGETWO-30820)
+    * Notice in advanced search when try to search using custom multiselect attribute (MAGETWO-30821)
+    * Search does not work if word-request contain hyphen (MAGETWO-30828)
+    * Search for Bundle Options Title return empty result (MAGETWO-30872)
+    * Maximum Query Length does not applied to quick search (MAGETWO-30877)
+    * Suggested Search does not work (MAGETWO-30983)
+    * Add wildcard prefix for all search word in search request for Match query (MAGETWO-30986)
+    * Wrong dependency of MySQL search adapter on CatalogSearch (MAGETWO-31040)
+    * Wrong dependency of Search library on MySQL adapter (MAGETWO-31041)
+    * Advanced Search for multiselect product attribute always return empty result (MAGETWO-31163)
+    * After Delete search terms via mass action admin redirected to 404 (MAGETWO-31182)
+    * Rename frontend properties for product attribute (MAGETWO-31203)
+    * New product page freezes when trying to save configurable product if another dropdown attribute already exists in default template (MAGETWO-30470)
+    * Cannot place order for downloadable product with link (MAGETWO-31130)
+    * Parent category displayed in layered navigation on Search results page (MAGETWO-27178)
+    * Price attribute in Layered Navigation is not displayed correct if search was made by this attribute (MAGETWO-25199)
+    * Import configurable products creates entities out of stock (MAGETWO-27177)
+    * [IE9] Dropdown lists are closing by themselves (MAGETWO-31181)
+    * can't place order with Payments Pro and 3D Secure (MAGETWO-28789)
+    * Bundle items always show "user defined" as checked (MAGETWO-31252)
+    * View management selectors don't work on Catalog frontend page (MAGETWO-31319)
+    * Base Image label is not set on Product Details tab after upload of first image (MAGETWO-31338)
+    * Edit product lead to data loss and broken media links (MAGETWO-31120)
+    * Fixed an issue whith delete action that does not work for google attribute on attribute set mapping page (MAGETWO-26764)
+    * Fixed an issue when Catalog Product unassigned from category when restricted user edit price (MAGETWO-28908)
+    * Fixen an issue when fatal error appears in RSS page for new products and special products (MAGETWO-30704)
+    * Fixed the issue with Exception occured when user clicks Customer Address Attribute ->Add New Attribute (MAGETWO-31421)
+    * Can not install Magento with some time zones (MAGETWO-31374)
+    * compiler fails (MAGETWO-31095)
+    * Some locales are absent in Interface Locale drop-down (MAGETWO-30883)
+    * Offloader header in Magento 2 backend does not appear to work. (MAGETWO-15253)
+    * failure to autoload custom classes (MAGETWO-31123)
+    * Products do not Disappear from Shopping Cart after Checkout (MAGETWO-30998)
+    * Change Quantity Action in the Shopping Cart Removes Product Completely (MAGETWO-31075)
+    * Persistent Shopping Cart Feature 'Not username?' is not Available under Luma Theme (MAGETWO-29451)
+    * Category Tree Becomes Broken in Specific Case (MAGETWO-31250)
+    * Bundle Configuration does not Update the "Price as Configured" Price (MAGETWO-31385)
+    * [FPT] Final price is not displayed on product and category when weee display is set to "Excluding FPT, FPT description, final price" (MAGETWO-29617)
+    * Incorrect From: To: Price display for Bundle Product (MAGETWO-31173)
+    * HTTP 500 error on Share Wishlist page (MAGETWO-31452)
+    * Wrong order of dispatching event adminhtml_cms_page_edit_tab_content_prepare_form and setting form values in Admin area (MAGETWO-8125)
+    * Breadcrumbs not displaying full path (MAGETWO-21129)
+    * CMS page created with 4 widgets of which only top 2 are functional. Bottom two do not have any (MAGETWO-18285)
+    * Unable to save changed locale for admin account (MAGETWO-28804)
+    * Frontend: Icons are not loaded on non-secure pages if secure urls are used on frontend (MAGETWO-28877)
+    * Layout overriding doesn't work after theme renaming (MAGETWO-23521)
+    * Permission tree is not displayed during activation of integration (MAGETWO-30270)
+    * Corrupted and Duplicated Page Layouts (MAGETWO-30976)
+    * "Number of Products per Page" option doens't work for Widgets of List type (MAGETWO-30045)
+    * HTTP and HTTPS cache of the same page is shared (MAGETWO-31178)
+    * "Use Billing Address" checkbox does not affect checkout experience (MAGETWO-31076)
+    * Cannot create shipping label (MAGETWO-31443)
+    * Billing Agreement contains empty Payment Method on frontend if BA was created during checkout (MAGETWO-19627)
+    * [TD] Fix integration test according to story MAGETWO-23885 (MAGETWO-24796)
+    * Fixed an issue when Catalog Rule Product indexer invalidated price index (MAGETWO-31322)
+    * [FF] Advanced Search: Price top range field UI is broken (MAGETWO-31126)
+    * Product base image is scaled up on "View Product" frontend page (MAGETWO-31199)
+    * Layout issue on Contact Us form (MAGETWO-31045)
+    * [Responsive themes] Search suggestions are not clickable (MAGETWO-31378)
+    * [Responsive themes] Products are overlapped with footer on category page Win8 IE11 (MAGETWO-31379)
+    * Blank & Luma Themes UI bugs (Part 4) (MAGETWO-31466)
+    * Exception if move category to another category which contain category with same url key (MAGETWO-30988)
+    * Incorrect product displays on Reviews tab for Configurable product (MAGETWO-30916)
+    * Resolved fatal errors when calling id() on a null store object (MAGETWO-25949)
+    * Improved API functional test invocation. You no longer have to use Ant to setup the tests (MAGETWO-31340)
+    * Refactored StoreManagerInterface not to violate modularity principle (MAGETWO-29245)
+    * Bug related to dashboard tab (MAGETWO-30999)
+    * Incorrect price for bundle product on category view and search view (MAGETWO-30471)
+    * Fixed issue where custom Customer & Customer Address attributes aren't displayed on "Create / Edit Customer" backend form (MAGETWO-30827)
+    * There is no validation for create option for bundle (MAGETWO-31320)
+    * Bundle product, created using API service, cannot be presented on frontend (MAGETWO-31357)
+    * Fixed clumsy logic in isSubtotal method of Magento\Reports\Model\Resource\Report\Collection\AbstractCollection (MAGETWO-31127)
+    * Fixed missing entity ID for product thumbnail labels values (MAGETWO-20120)
+    * Fixed bad return from indexer launch (MAGETWO-29829)
+    * Fixed issue when chooser for attribute 'SKU' redirected to Dashboard in shopping cart price rules edit page (MAGETWO-31414)
+    * Fixed issue where Search Term Reports and Search Tesm in backend did not work (MAGETWO-31391)
+    * Fixed error while configuring Google API (MAGETWO-31456)
+    * It's impossible to add Configurable Product variation while Order creating in backend (MAGETWO-31393)
+    * There is no confirmation to delete CMS Page / Block (MAGETWO-29306)
+    * Edit product lead to data loss and broken media links (MAGETWO-31120)
+    * Customer validation has wrong behaviour for "Quick Search" frontend input field (MAGETWO-31202)
+    * Cannot check grid row on CMS Pages and CMS Blocks (MAGETWO-31564)
+    * Min/max text length validation of Customer & Customer Address attributes' values doesn't work on "Create / Edit Customer" backend form (MAGETWO-31502)
+    * "validate-digits-range" validation is broken (MAGETWO-25640)
+    * Unable to delete Attribute Set (MAGETWO-31188)
+    * Products aren't shown on second website (MAGETWO-31190)
+    * Customer Group for grouped price is empty on create product page (MAGETWO-31179)
+    * Incorrect interval in LN(equalize product counts) for small values (MAGETWO-30818)
+    * Price attribute isn't displayed in layered navigation (MAGETWO-31560)
+    * Failure testCreateCustomer in parallel run (MAGETWO-31435)
+    * Bill-to' name is always displayed instead of 'Ship-to' customer name in all order-related grids (MAGETWO-31087)
+    * Error on submitting order from backend with different shipping and billing addresses (MAGETWO-31439)
+    * Navigation menu is absent on product page with Varnish if product sku contains space (MAGETWO-31638)
+    * MAGETWO-3315 - Fixed _underscore handling of digits
+    * MAGETWO-10108 - Fixed Comments for fields number_limit and text_limit in wishlist are not localized
+    * MAGETWO-24665 - Fixed Joining the Same Table with Different Aliases in Collection
+* Sample data:
+    * Created Luma Sample Data script (MAGETWO-23477)
+* GitHub requests:
+    * [#775](https://github.com/magento/magento2/issues/775) -- Can't save changes in configuration in Configuration->Advanced->System #775
+    * [#716](https://github.com/magento/magento2/issues/716) -- Wrong mimetype returned by getMimeType from Magento library #716
+    * [#681](https://github.com/magento/magento2/issues/681) -- Magento\Framework\Xml\Parser class issues #681
+    * [#758](https://github.com/magento/magento2/issues/758) -- Coding standards: arrays #758 - short array syntax applied to the whole code base and enforced by phpcs sniff
+    * [#169](https://github.com/magento/magento2/issues/169) -- DDL cache should be tagged
+    * [#738](https://github.com/magento/magento2/issues/738) -- pub/setup missing in 0.1.0-alpha103
+* Various improvements:
+    * Removed obsolete code from Tax and Weee module (MAGETWO-31057)
+    * Merged AdminNotification, Integration, Authorization, and WebAPI sql scripts (MAGETWO-31525)
+    * Removed Customer Converter model and Address Converter model. (MAGETWO-31228, MAGETWO-31416)
+    * Created AJAX Authentication Endpoint for frontend (MAGETWO-31353)
+    * Removed Customer\Service\V1 service implementation. Use the Customer\Api service implementation instead (MAGETWO-31046)
+    * Recurring Billing Functionality Removal (MAGETWO-31434)
+    * Modularity Work (composer.json suggest) (MAGETWO-31437)
+    * Consolidated SQL install and data scripts for many modules (MAGETWO-31588, MAGETWO-31612, MAGETWO-31073)
+    * Created static test to check that README.md file exist in modules (MAGETWO-31392)
+    * Remove Unused Code (MAGETWO-4098)
+    * License Notices in Files (MAGETWO-1225)
+    * CatalogRule modularity enhancements (MAGETWO-28282)
+    * Remove @deprecated methods from code base - PS Domain (MAGETWO-31055)
+    * Remove @deprecated methods from code base - MX Domain (MAGETWO-31054)
+    * Test enforcing @covers annotation refers to only existing classes and methods (MAGETWO-31424)
+    * PHP Coding Standards Fixer configuration file added to project root (MAGETWO-31426)
+    * Git hook for coding style automatic correction before actual push (MAGETWO-31426)
+    * Ability to enforce no error log messages during tests execution (MAGETWO-31423)
+    * Remove Api Interfaces from Cms module (MAGETWO-31483)
+* Framework improvements:
+    * Added copy of dependencies for Magento components to the root composer.json in order to make Composer validate them (MAGETWO-29704)
+* Setup Tool improvements (MAGETWO-29035 & MAGETWO-29704):
+    * Moved dependencies from setup/composer.json to the root composer.json and removed the former one. No necessity to run composer install/update under setup folder anymore
+    * Removed dependencies on unnecessary ZF2 libraries to reduce amount of downloaded libraries
+    * Removed dependency on exec() calls
+    * Removed tool dev/shell/run_data_fixtures.php in favor of Setup Toolphp setup/index.php install-data
+    * Removed tool dev/shell/user_config_data.php in favor of Setup Tool php setup/index.php install-user-configuration
+    * Validation of the required information in each installation step in setup tool (MAGETWO-27306):
+        * Web UI
+            * Removed 'test connection' button in web setup UI, functionality is now performed when 'Next' button is clicked (MAGETWO-30951)
+            * Validation of URL format in web setup UI (MAGETWO-30953)
+            * Automatically adding trailing slash to base URL field if user did not provide one (MAGETWO-30953)
+            * Validation of admin user password in web setup UI (MAGETWO-30834)
+            * Validation of HTTPS configuration in web setup UI (MAGETWO-30859)
+        * CLI
+            * Validation of CLI, display missing/extra parameters and missing/unnecessary parameter values (MAGETWO-31004)
+
 0.1.0-alpha107
 =============
 * Various improvements:

From 1d8a3afaa0a310b03ff3b80a316fbf1bda10c324 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 12 Dec 2014 14:31:08 +0200
Subject: [PATCH 337/474] MAGETWO-31627: Remove proxy for config classes

- phpcpd blacklist extended with Interception/ObjectManager/Config
---
 .../Magento/Test/Php/_files/phpcpd/blacklist/common.txt        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
index e176241dd0a0b..f848b84c9da3a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -144,5 +144,4 @@ app/code/Magento/CatalogInventory/Api/Data
 app/code/Magento/Sales/Model/Spi
 Magento/Catalog/Model/ProductLink
 Magento/GroupedProduct/Model/Resource/Product/Type/Grouped
-lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer
-lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled
\ No newline at end of file
+lib/internal/Magento/Framework/Interception/ObjectManager/Config

From 78b2145ba66dc15fbf1ff167ec242a39fb92431d Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 14:34:09 +0200
Subject: [PATCH 338/474] MAGETWO-31049: M2 GitHub Update (version
 0.1.0-alpha108)

---
 app/code/Magento/AdminGws/composer.json       | 38 ++++++-------
 .../Magento/AdminNotification/composer.json   | 10 ++--
 .../Magento/AdvancedCheckout/composer.json    | 40 +++++++-------
 app/code/Magento/Authorization/composer.json  |  6 +--
 app/code/Magento/Authorizenet/composer.json   | 20 +++----
 app/code/Magento/Backend/composer.json        | 34 ++++++------
 app/code/Magento/Backup/composer.json         | 12 ++---
 app/code/Magento/Banner/composer.json         | 22 ++++----
 .../BannerCustomerSegment/composer.json       |  8 +--
 app/code/Magento/Bundle/composer.json         | 30 +++++------
 .../Magento/CacheInvalidate/composer.json     |  6 +--
 app/code/Magento/Captcha/composer.json        | 14 ++---
 app/code/Magento/Catalog/composer.json        | 48 ++++++++---------
 app/code/Magento/CatalogEvent/composer.json   | 20 +++----
 .../Magento/CatalogImportExport/composer.json | 20 +++----
 .../Magento/CatalogInventory/composer.json    | 18 +++----
 .../Magento/CatalogPermissions/composer.json  | 20 +++----
 app/code/Magento/CatalogRule/composer.json    | 20 +++----
 app/code/Magento/CatalogSearch/composer.json  | 24 ++++-----
 .../Magento/CatalogUrlRewrite/composer.json   | 18 +++----
 app/code/Magento/CatalogWidget/composer.json  | 22 ++++----
 app/code/Magento/Centinel/composer.json       | 14 ++---
 app/code/Magento/Checkout/composer.json       | 38 ++++++-------
 .../Magento/CheckoutAgreements/composer.json  | 10 ++--
 app/code/Magento/Cms/composer.json            | 20 +++----
 app/code/Magento/CmsUrlRewrite/composer.json  | 10 ++--
 .../ConfigurableImportExport/composer.json    | 14 ++---
 .../Magento/ConfigurableProduct/composer.json | 28 +++++-----
 app/code/Magento/Contact/composer.json        | 12 ++---
 app/code/Magento/Core/composer.json           | 16 +++---
 app/code/Magento/Cron/composer.json           |  8 +--
 app/code/Magento/CurrencySymbol/composer.json | 14 ++---
 .../CustomAttributeManagement/composer.json   | 10 ++--
 app/code/Magento/Customer/composer.json       | 38 ++++++-------
 .../Magento/CustomerBalance/composer.json     | 20 +++----
 .../CustomerCustomAttributes/composer.json    | 22 ++++----
 .../Magento/CustomerFinance/composer.json     | 22 ++++----
 .../CustomerImportExport/composer.json        | 18 +++----
 .../Magento/CustomerSegment/composer.json     | 28 +++++-----
 app/code/Magento/DesignEditor/composer.json   | 14 ++---
 app/code/Magento/Dhl/composer.json            | 22 ++++----
 app/code/Magento/Directory/composer.json      | 10 ++--
 app/code/Magento/Doc/composer.json            | 10 ++--
 app/code/Magento/Downloadable/composer.json   | 34 ++++++------
 app/code/Magento/Eav/composer.json            | 12 ++---
 app/code/Magento/Email/composer.json          | 12 ++---
 app/code/Magento/Enterprise/composer.json     | 54 +++++++++----------
 app/code/Magento/Fedex/composer.json          | 18 +++----
 app/code/Magento/GiftCard/composer.json       | 24 ++++-----
 .../Magento/GiftCardAccount/composer.json     | 20 +++----
 app/code/Magento/GiftMessage/composer.json    | 22 ++++----
 app/code/Magento/GiftRegistry/composer.json   | 38 ++++++-------
 app/code/Magento/GiftWrapping/composer.json   | 26 ++++-----
 app/code/Magento/GoogleAdwords/composer.json  |  8 +--
 .../Magento/GoogleAnalytics/composer.json     |  8 +--
 .../Magento/GoogleOptimizer/composer.json     | 14 ++---
 app/code/Magento/GoogleShopping/composer.json | 20 +++----
 .../Magento/GroupedImportExport/composer.json | 14 ++---
 app/code/Magento/GroupedProduct/composer.json | 24 ++++-----
 app/code/Magento/ImportExport/composer.json   | 14 ++---
 app/code/Magento/Indexer/composer.json        |  8 +--
 app/code/Magento/Integration/composer.json    | 16 +++---
 app/code/Magento/Invitation/composer.json     | 18 +++----
 .../Magento/LayeredNavigation/composer.json   |  8 +--
 app/code/Magento/Log/composer.json            | 14 ++---
 app/code/Magento/Logging/composer.json        | 16 +++---
 app/code/Magento/Msrp/composer.json           | 24 ++++-----
 .../Magento/MultipleWishlist/composer.json    | 30 +++++------
 app/code/Magento/Multishipping/composer.json  | 20 +++----
 app/code/Magento/Newsletter/composer.json     | 22 ++++----
 .../Magento/OfflinePayments/composer.json     |  6 +--
 .../Magento/OfflineShipping/composer.json     | 20 +++----
 app/code/Magento/Ogone/composer.json          | 12 ++---
 app/code/Magento/PageCache/composer.json      |  8 +--
 app/code/Magento/Payment/composer.json        | 14 ++---
 app/code/Magento/Paypal/composer.json         | 32 +++++------
 app/code/Magento/Pbridge/composer.json        | 24 ++++-----
 app/code/Magento/PbridgePaypal/composer.json  | 16 +++---
 app/code/Magento/Pci/composer.json            |  8 +--
 app/code/Magento/Persistent/composer.json     | 16 +++---
 .../Magento/PersistentHistory/composer.json   | 20 +++----
 .../Magento/PricePermissions/composer.json    | 18 +++----
 app/code/Magento/ProductAlert/composer.json   | 12 ++---
 .../PromotionPermissions/composer.json        | 14 ++---
 app/code/Magento/Reminder/composer.json       | 22 ++++----
 app/code/Magento/Reports/composer.json        | 36 ++++++-------
 app/code/Magento/RequireJs/composer.json      |  4 +-
 app/code/Magento/Review/composer.json         | 22 ++++----
 app/code/Magento/Reward/composer.json         | 32 +++++------
 app/code/Magento/Rma/composer.json            | 36 ++++++-------
 app/code/Magento/Rss/composer.json            | 10 ++--
 app/code/Magento/Rule/composer.json           | 12 ++---
 app/code/Magento/Sales/composer.json          | 46 ++++++++--------
 app/code/Magento/SalesArchive/composer.json   | 10 ++--
 app/code/Magento/SalesRule/composer.json      | 32 +++++------
 .../ScheduledImportExport/composer.json       | 12 ++---
 app/code/Magento/Search/composer.json         | 10 ++--
 app/code/Magento/Sendfriend/composer.json     | 14 ++---
 app/code/Magento/Shipping/composer.json       | 30 +++++------
 app/code/Magento/Sitemap/composer.json        | 18 +++----
 app/code/Magento/Solr/composer.json           | 24 ++++-----
 app/code/Magento/Store/composer.json          | 10 ++--
 app/code/Magento/TargetRule/composer.json     | 30 +++++------
 app/code/Magento/Tax/composer.json            | 26 ++++-----
 .../Magento/TaxImportExport/composer.json     | 12 ++---
 app/code/Magento/Theme/composer.json          | 18 +++----
 app/code/Magento/Translation/composer.json    | 10 ++--
 app/code/Magento/Ui/composer.json             | 10 ++--
 app/code/Magento/Ups/composer.json            | 18 +++----
 app/code/Magento/UrlRewrite/composer.json     | 18 +++----
 app/code/Magento/User/composer.json           | 18 +++----
 app/code/Magento/Usps/composer.json           | 18 +++----
 app/code/Magento/VersionsCms/composer.json    | 18 +++----
 app/code/Magento/Webapi/composer.json         | 16 +++---
 .../Magento/WebsiteRestriction/composer.json  | 12 ++---
 app/code/Magento/Weee/composer.json           | 22 ++++----
 app/code/Magento/Widget/composer.json         | 14 ++---
 app/code/Magento/Wishlist/composer.json       | 34 ++++++------
 .../adminhtml/Magento/backend/composer.json   |  4 +-
 .../frontend/Magento/blank/composer.json      |  4 +-
 .../frontend/Magento/luma/composer.json       |  6 +--
 app/i18n/magento/de_de/composer.json          |  4 +-
 app/i18n/magento/en_us/composer.json          |  4 +-
 app/i18n/magento/es_es/composer.json          |  4 +-
 app/i18n/magento/fr_fr/composer.json          |  4 +-
 app/i18n/magento/nl_nl/composer.json          |  4 +-
 app/i18n/magento/pt_br/composer.json          |  4 +-
 app/i18n/magento/zh_cn/composer.json          |  4 +-
 composer.json                                 |  6 +--
 .../Magento/Framework/AppInterface.php        |  2 +-
 lib/internal/Magento/Framework/composer.json  |  2 +-
 131 files changed, 1166 insertions(+), 1166 deletions(-)

diff --git a/app/code/Magento/AdminGws/composer.json b/app/code/Magento/AdminGws/composer.json
index 95bef6be8503b..7ae3f03cf6df9 100644
--- a/app/code/Magento/AdminGws/composer.json
+++ b/app/code/Magento/AdminGws/composer.json
@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-authorization": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-review": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-catalog-event": "0.1.0-alpha107",
-        "magento/module-checkout-agreements": "0.1.0-alpha107",
-        "magento/module-gift-registry": "0.1.0-alpha107",
-        "magento/module-catalog-rule": "0.1.0-alpha107",
-        "magento/module-sales-rule": "0.1.0-alpha107",
-        "magento/module-reminder": "0.1.0-alpha107",
-        "magento/module-customer-segment": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-user": "0.1.0-alpha107",
-        "magento/module-url-rewrite": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-authorization": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-review": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-catalog-event": "0.1.0-alpha108",
+        "magento/module-checkout-agreements": "0.1.0-alpha108",
+        "magento/module-gift-registry": "0.1.0-alpha108",
+        "magento/module-catalog-rule": "0.1.0-alpha108",
+        "magento/module-sales-rule": "0.1.0-alpha108",
+        "magento/module-reminder": "0.1.0-alpha108",
+        "magento/module-customer-segment": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-user": "0.1.0-alpha108",
+        "magento/module-url-rewrite": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index 7ba3d56311ed3..88913e187d7de 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/AdvancedCheckout/composer.json b/app/code/Magento/AdvancedCheckout/composer.json
index 9a956d7ce611a..f19329505557f 100644
--- a/app/code/Magento/AdvancedCheckout/composer.json
+++ b/app/code/Magento/AdvancedCheckout/composer.json
@@ -3,29 +3,29 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-reports": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-product-alert": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-gift-card": "0.1.0-alpha107",
-        "magento/module-downloadable": "0.1.0-alpha107",
-        "magento/module-msrp": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-reports": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-product-alert": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-gift-card": "0.1.0-alpha108",
+        "magento/module-downloadable": "0.1.0-alpha108",
+        "magento/module-msrp": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index 1ba2cad3ffcff..71d8c8417bbbb 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.4.11|~5.5.0",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
index f886854abd08b..afb76898e10a7 100644
--- a/app/code/Magento/Authorizenet/composer.json
+++ b/app/code/Magento/Authorizenet/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-centinel": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-centinel": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index 709375aa75774..05df2a2799ec6 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -3,26 +3,26 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-cron": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-reports": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-user": "0.1.0-alpha107",
-        "magento/module-backup": "0.1.0-alpha107",
-        "magento/module-email": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-translation": "0.1.0-alpha107",
-        "magento/module-require-js": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-cron": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-reports": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-user": "0.1.0-alpha108",
+        "magento/module-backup": "0.1.0-alpha108",
+        "magento/module-email": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-translation": "0.1.0-alpha108",
+        "magento/module-require-js": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index 331f3547ca906..736fe39278ff5 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-cron": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-cron": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Banner/composer.json b/app/code/Magento/Banner/composer.json
index 9252a28a83c77..6322d4e5d44fd 100644
--- a/app/code/Magento/Banner/composer.json
+++ b/app/code/Magento/Banner/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-catalog-rule": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-sales-rule": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-catalog-rule": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-sales-rule": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/BannerCustomerSegment/composer.json b/app/code/Magento/BannerCustomerSegment/composer.json
index 10e35159a110c..f03e92d877c5f 100644
--- a/app/code/Magento/BannerCustomerSegment/composer.json
+++ b/app/code/Magento/BannerCustomerSegment/composer.json
@@ -3,13 +3,13 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-banner": "0.1.0-alpha107",
-        "magento/module-customer-segment": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-banner": "0.1.0-alpha108",
+        "magento/module-customer-segment": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
index 2c71fe3be245a..06a885ddc94bd 100644
--- a/app/code/Magento/Bundle/composer.json
+++ b/app/code/Magento/Bundle/composer.json
@@ -3,24 +3,24 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-catalog-rule": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-gift-message": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-webapi": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-catalog-rule": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-gift-message": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-webapi": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
index 53190e686328f..062b0339ca492 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.4.11|~5.5.0",
-        "magento/module-page-cache": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-page-cache": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index 91f19d1f7e735..4278c18adb3f4 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 607b31bc7a307..f0b89746bede9 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -3,33 +3,33 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-indexer": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-log": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-msrp": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-catalog-rule": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-product-alert": "0.1.0-alpha107",
-        "magento/module-url-rewrite": "0.1.0-alpha107",
-        "magento/module-catalog-url-rewrite": "0.1.0-alpha107",
-        "magento/module-page-cache": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-indexer": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-log": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-msrp": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-catalog-rule": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-product-alert": "0.1.0-alpha108",
+        "magento/module-url-rewrite": "0.1.0-alpha108",
+        "magento/module-catalog-url-rewrite": "0.1.0-alpha108",
+        "magento/module-page-cache": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogEvent/composer.json b/app/code/Magento/CatalogEvent/composer.json
index ad6b40e241fe1..adb5829c84184 100644
--- a/app/code/Magento/CatalogEvent/composer.json
+++ b/app/code/Magento/CatalogEvent/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index 72fa41c190eb5..f48b9111f2128 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.4.11|~5.5.0",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-import-export": "0.1.0-alpha107",
-        "magento/module-indexer": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-import-export": "0.1.0-alpha108",
+        "magento/module-indexer": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "ext-ctype": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index eb095df595f68..861e69da48fe2 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-indexer": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-indexer": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogPermissions/composer.json b/app/code/Magento/CatalogPermissions/composer.json
index 74b075c2c1a30..3db204038a48c 100644
--- a/app/code/Magento/CatalogPermissions/composer.json
+++ b/app/code/Magento/CatalogPermissions/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-indexer": "0.1.0-alpha107",
-        "magento/module-import-export": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-indexer": "0.1.0-alpha108",
+        "magento/module-import-export": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
index 27c49eb581068..eac9e919ed86f 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-rule": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-indexer": "0.1.0-alpha107",
-        "magento/module-import-export": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-rule": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-indexer": "0.1.0-alpha108",
+        "magento/module-import-export": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 592cb8e1df51e..d399a5d163f2f 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -3,21 +3,21 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-search": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-indexer": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-search": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-indexer": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index d8b61a16b9808..63ff62c8ece81 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.4.11|~5.5.0",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-catalog-import-export": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-import-export": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-url-rewrite": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-catalog-import-export": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-import-export": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-url-rewrite": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
index 236077628d3ce..ec0575cc3fdcd 100644
--- a/app/code/Magento/CatalogWidget/composer.json
+++ b/app/code/Magento/CatalogWidget/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-rule": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-rule": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json
index 0482a82cd02d1..c758ae8b393b9 100644
--- a/app/code/Magento/Centinel/composer.json
+++ b/app/code/Magento/Centinel/composer.json
@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index 72a29caec819c..6bc5de2a32665 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-authorization": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-gift-message": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/module-page-cache": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-msrp": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-authorization": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-gift-message": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/module-page-cache": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-msrp": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index 8f27bb7a04dc4..a251d39f5b2cf 100644
--- a/app/code/Magento/CheckoutAgreements/composer.json
+++ b/app/code/Magento/CheckoutAgreements/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index 11958cef5fe42..f3185cd2d3381 100644
--- a/app/code/Magento/Cms/composer.json
+++ b/app/code/Magento/Cms/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-email": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-email": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index cfc4ba403fcd3..00a381ba612d4 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.4.11|~5.5.0",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-url-rewrite": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-url-rewrite": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index 3c1ca48af6a3e..2ef9c71b0feb1 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.4.11|~5.5.0",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-catalog-import-export": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-import-export": "0.1.0-alpha107",
-        "magento/module-configurable-product": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-catalog-import-export": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-import-export": "0.1.0-alpha108",
+        "magento/module-configurable-product": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 3f25041f36dcd..92b118ba8d616 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -3,23 +3,23 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-catalog-rule": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-webapi": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-catalog-rule": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-webapi": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index 9fe62f80f6058..76cb3dba93312 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json
index 7dc99c15655db..d08e7912339fb 100644
--- a/app/code/Magento/Core/composer.json
+++ b/app/code/Magento/Core/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-cron": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-page-cache": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-cron": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-page-cache": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index 0ba991eccbb44..ca61c8c84bac6 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index b0c71715f4c7c..86629bd73e60d 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-page-cache": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-page-cache": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CustomAttributeManagement/composer.json b/app/code/Magento/CustomAttributeManagement/composer.json
index 305ae8ee98c9b..0a50bc0d9b640 100644
--- a/app/code/Magento/CustomAttributeManagement/composer.json
+++ b/app/code/Magento/CustomAttributeManagement/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
index 46fabaea615f5..6f1e96c3b1ba0 100644
--- a/app/code/Magento/Customer/composer.json
+++ b/app/code/Magento/Customer/composer.json
@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-newsletter": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-review": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-page-cache": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-authorization": "0.1.0-alpha107",
-        "magento/module-integration": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-newsletter": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-review": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-page-cache": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-authorization": "0.1.0-alpha108",
+        "magento/module-integration": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CustomerBalance/composer.json b/app/code/Magento/CustomerBalance/composer.json
index 98386160bdcce..42d5b244dce8a 100644
--- a/app/code/Magento/CustomerBalance/composer.json
+++ b/app/code/Magento/CustomerBalance/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CustomerCustomAttributes/composer.json b/app/code/Magento/CustomerCustomAttributes/composer.json
index 464c07102653b..90cdb23dbad0e 100644
--- a/app/code/Magento/CustomerCustomAttributes/composer.json
+++ b/app/code/Magento/CustomerCustomAttributes/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-custom-attribute-management": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-custom-attribute-management": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CustomerFinance/composer.json b/app/code/Magento/CustomerFinance/composer.json
index 47ba9aae5ff13..677860140f316 100644
--- a/app/code/Magento/CustomerFinance/composer.json
+++ b/app/code/Magento/CustomerFinance/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-customer-balance": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-import-export": "0.1.0-alpha107",
-        "magento/module-customer-import-export": "0.1.0-alpha107",
-        "magento/module-reward": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-customer-balance": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-import-export": "0.1.0-alpha108",
+        "magento/module-customer-import-export": "0.1.0-alpha108",
+        "magento/module-reward": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index f14244f18d454..28941cb7ca47e 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-import-export": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-import-export": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/CustomerSegment/composer.json b/app/code/Magento/CustomerSegment/composer.json
index f4eef4075324e..dbc1e76039c36 100644
--- a/app/code/Magento/CustomerSegment/composer.json
+++ b/app/code/Magento/CustomerSegment/composer.json
@@ -3,23 +3,23 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-rule": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-newsletter": "0.1.0-alpha107",
-        "magento/module-catalog-rule": "0.1.0-alpha107",
-        "magento/module-page-cache": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-rule": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-newsletter": "0.1.0-alpha108",
+        "magento/module-catalog-rule": "0.1.0-alpha108",
+        "magento/module-page-cache": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json
index 7c5edfb4e974b..e03b624c0beb7 100644
--- a/app/code/Magento/DesignEditor/composer.json
+++ b/app/code/Magento/DesignEditor/composer.json
@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
index 98b9b76a7a2aa..0e24645dd3a1c 100644
--- a/app/code/Magento/Dhl/composer.json
+++ b/app/code/Magento/Dhl/composer.json
@@ -3,21 +3,21 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-shipping": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-shipping": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
index 03e273e3145b1..85f885a5e41b3 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Doc/composer.json b/app/code/Magento/Doc/composer.json
index bdee96e97343f..c49b7be16c472 100644
--- a/app/code/Magento/Doc/composer.json
+++ b/app/code/Magento/Doc/composer.json
@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-theme": "0.1.0-alpha107"
+        "magento/module-theme": "0.1.0-alpha108"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index 8426f674a2565..afe28e1458e22 100644
--- a/app/code/Magento/Downloadable/composer.json
+++ b/app/code/Magento/Downloadable/composer.json
@@ -3,26 +3,26 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/module-gift-message": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-msrp": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/module-gift-message": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-msrp": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
index 6e28f9c3702be..2b6531a557402 100644
--- a/app/code/Magento/Eav/composer.json
+++ b/app/code/Magento/Eav/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index 19465fa02032a..f649537c160ec 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Enterprise/composer.json b/app/code/Magento/Enterprise/composer.json
index 4ff58e776148e..936527a2634bc 100644
--- a/app/code/Magento/Enterprise/composer.json
+++ b/app/code/Magento/Enterprise/composer.json
@@ -3,36 +3,36 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog-event": "0.1.0-alpha107",
-        "magento/module-catalog-permissions": "0.1.0-alpha107",
-        "magento/module-customer-segment": "0.1.0-alpha107",
-        "magento/module-gift-card": "0.1.0-alpha107",
-        "magento/module-gift-card-account": "0.1.0-alpha107",
-        "magento/module-gift-registry": "0.1.0-alpha107",
-        "magento/module-gift-wrapping": "0.1.0-alpha107",
-        "magento/module-scheduled-import-export": "0.1.0-alpha107",
-        "magento/module-price-permissions": "0.1.0-alpha107",
-        "magento/module-promotion-permissions": "0.1.0-alpha107",
-        "magento/module-sales-archive": "0.1.0-alpha107",
-        "magento/module-target-rule": "0.1.0-alpha107",
-        "magento/module-rma": "0.1.0-alpha107",
-        "magento/module-banner": "0.1.0-alpha107",
-        "magento/module-advanced-checkout": "0.1.0-alpha107",
-        "magento/module-versions-cms": "0.1.0-alpha107",
-        "magento/module-customer-custom-attributes": "0.1.0-alpha107",
-        "magento/module-invitation": "0.1.0-alpha107",
-        "magento/module-logging": "0.1.0-alpha107",
-        "magento/module-pci": "0.1.0-alpha107",
-        "magento/module-reminder": "0.1.0-alpha107",
-        "magento/module-reward": "0.1.0-alpha107",
-        "magento/module-multiple-wishlist": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog-event": "0.1.0-alpha108",
+        "magento/module-catalog-permissions": "0.1.0-alpha108",
+        "magento/module-customer-segment": "0.1.0-alpha108",
+        "magento/module-gift-card": "0.1.0-alpha108",
+        "magento/module-gift-card-account": "0.1.0-alpha108",
+        "magento/module-gift-registry": "0.1.0-alpha108",
+        "magento/module-gift-wrapping": "0.1.0-alpha108",
+        "magento/module-scheduled-import-export": "0.1.0-alpha108",
+        "magento/module-price-permissions": "0.1.0-alpha108",
+        "magento/module-promotion-permissions": "0.1.0-alpha108",
+        "magento/module-sales-archive": "0.1.0-alpha108",
+        "magento/module-target-rule": "0.1.0-alpha108",
+        "magento/module-rma": "0.1.0-alpha108",
+        "magento/module-banner": "0.1.0-alpha108",
+        "magento/module-advanced-checkout": "0.1.0-alpha108",
+        "magento/module-versions-cms": "0.1.0-alpha108",
+        "magento/module-customer-custom-attributes": "0.1.0-alpha108",
+        "magento/module-invitation": "0.1.0-alpha108",
+        "magento/module-logging": "0.1.0-alpha108",
+        "magento/module-pci": "0.1.0-alpha108",
+        "magento/module-reminder": "0.1.0-alpha108",
+        "magento/module-reward": "0.1.0-alpha108",
+        "magento/module-multiple-wishlist": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index f4e50fce741cb..cd722684b5915 100644
--- a/app/code/Magento/Fedex/composer.json
+++ b/app/code/Magento/Fedex/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-shipping": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-shipping": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GiftCard/composer.json b/app/code/Magento/GiftCard/composer.json
index 4333a12157fcc..559c68da39ed9 100644
--- a/app/code/Magento/GiftCard/composer.json
+++ b/app/code/Magento/GiftCard/composer.json
@@ -3,21 +3,21 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GiftCardAccount/composer.json b/app/code/Magento/GiftCardAccount/composer.json
index 3deff49354252..643d1ee21de99 100644
--- a/app/code/Magento/GiftCardAccount/composer.json
+++ b/app/code/Magento/GiftCardAccount/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-customer-balance": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-customer-balance": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index 999f262665e51..311cca96c393e 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-multishipping": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-multishipping": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GiftRegistry/composer.json b/app/code/Magento/GiftRegistry/composer.json
index d29877bc38973..4ed7ddbb3caac 100644
--- a/app/code/Magento/GiftRegistry/composer.json
+++ b/app/code/Magento/GiftRegistry/composer.json
@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-gift-card": "0.1.0-alpha107",
-        "magento/module-newsletter": "0.1.0-alpha107",
-        "magento/module-multishipping": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-gift-card": "0.1.0-alpha108",
+        "magento/module-newsletter": "0.1.0-alpha108",
+        "magento/module-multishipping": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GiftWrapping/composer.json b/app/code/Magento/GiftWrapping/composer.json
index 25b1dab7fad42..8ee227a588b70 100644
--- a/app/code/Magento/GiftWrapping/composer.json
+++ b/app/code/Magento/GiftWrapping/composer.json
@@ -3,22 +3,22 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-gift-message": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-gift-message": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index 4c61a94548962..bee35a673bf7a 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json
index c1e98ce96cbdf..ce8f12d6e4d82 100644
--- a/app/code/Magento/GoogleAnalytics/composer.json
+++ b/app/code/Magento/GoogleAnalytics/composer.json
@@ -3,13 +3,13 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
index 89467f6ec0c43..bfe88e67fba72 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-google-analytics": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-google-analytics": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json
index c8ecd6ddb8595..b69240a10c610 100644
--- a/app/code/Magento/GoogleShopping/composer.json
+++ b/app/code/Magento/GoogleShopping/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
index 6248d6171d29d..dcc7c763cc1df 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.4.11|~5.5.0",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-import-export": "0.1.0-alpha107",
-        "magento/module-catalog-import-export": "0.1.0-alpha107",
-        "magento/module-grouped-product": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-import-export": "0.1.0-alpha108",
+        "magento/module-catalog-import-export": "0.1.0-alpha108",
+        "magento/module-grouped-product": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index a5f635c75f815..9ad1453a1e382 100644
--- a/app/code/Magento/GroupedProduct/composer.json
+++ b/app/code/Magento/GroupedProduct/composer.json
@@ -3,21 +3,21 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-msrp": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-msrp": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index fb456a81c8cb1..3d9ad7513549e 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-indexer": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-indexer": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "ext-ctype": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json
index 01b62704b0fc0..b825e659d83ee 100644
--- a/app/code/Magento/Indexer/composer.json
+++ b/app/code/Magento/Indexer/composer.json
@@ -3,13 +3,13 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-page-cache": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-page-cache": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index d42fcaa004dd5..2c296f9e50d6f 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -3,17 +3,17 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-user": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-authorization": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-user": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-authorization": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Invitation/composer.json b/app/code/Magento/Invitation/composer.json
index 89e48410aa068..aebd10a4ef042 100644
--- a/app/code/Magento/Invitation/composer.json
+++ b/app/code/Magento/Invitation/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-reports": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-newsletter": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-reports": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-newsletter": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json
index c20b0a39ec701..d847fc7820a64 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.4.11|~5.5.0",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json
index 87b4712265e8b..e3c551d3ca470 100644
--- a/app/code/Magento/Log/composer.json
+++ b/app/code/Magento/Log/composer.json
@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Logging/composer.json b/app/code/Magento/Logging/composer.json
index 6c4254475e305..96b17c2e23b5b 100644
--- a/app/code/Magento/Logging/composer.json
+++ b/app/code/Magento/Logging/composer.json
@@ -3,17 +3,17 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-user": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-pci": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-user": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-pci": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 9171355041bdb..5ffc39216a8ff 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -3,21 +3,21 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-bundle": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-configurable-product": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-downloadable": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-grouped-product": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-bundle": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-configurable-product": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-downloadable": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-grouped-product": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/MultipleWishlist/composer.json b/app/code/Magento/MultipleWishlist/composer.json
index 9dd134916626a..a5b607f47b830 100644
--- a/app/code/Magento/MultipleWishlist/composer.json
+++ b/app/code/Magento/MultipleWishlist/composer.json
@@ -3,26 +3,26 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-advanced-checkout": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-advanced-checkout": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-reports": "0.1.0-alpha107"
+        "magento/module-reports": "0.1.0-alpha108"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index bc3cbd8eec61f..c69cdb0d32d53 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index 2e74c05f7c8dc..a0d81c9588e9c 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-email": "0.1.0-alpha107",
-        "magento/module-cron": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-email": "0.1.0-alpha108",
+        "magento/module-cron": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index ad0cd38c6ef41..d45c7212a27c9 100644
--- a/app/code/Magento/OfflinePayments/composer.json
+++ b/app/code/Magento/OfflinePayments/composer.json
@@ -3,12 +3,12 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index 178ad7ac2ebee..5728f7e83a269 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-shipping": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-sales-rule": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-shipping": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-sales-rule": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Ogone/composer.json b/app/code/Magento/Ogone/composer.json
index 2a5bdb5158a45..3f2787cce5605 100644
--- a/app/code/Magento/Ogone/composer.json
+++ b/app/code/Magento/Ogone/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index ac5530438b4e1..46db836900a14 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -3,13 +3,13 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 58ba4eb649962..d3aa20a10f0a8 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-centinel": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-centinel": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
index 37ea51999d5a3..41b5ef5edf95c 100644
--- a/app/code/Magento/Paypal/composer.json
+++ b/app/code/Magento/Paypal/composer.json
@@ -3,26 +3,26 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-centinel": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-centinel": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Pbridge/composer.json b/app/code/Magento/Pbridge/composer.json
index 16033506e2a37..78aa4aa53e4cb 100644
--- a/app/code/Magento/Pbridge/composer.json
+++ b/app/code/Magento/Pbridge/composer.json
@@ -3,21 +3,21 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-centinel": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-centinel": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/PbridgePaypal/composer.json b/app/code/Magento/PbridgePaypal/composer.json
index 0fb69dc804a00..0ea7071c0ef9b 100644
--- a/app/code/Magento/PbridgePaypal/composer.json
+++ b/app/code/Magento/PbridgePaypal/composer.json
@@ -3,17 +3,17 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-pbridge": "0.1.0-alpha107",
-        "magento/module-paypal": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-centinel": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-pbridge": "0.1.0-alpha108",
+        "magento/module-paypal": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-centinel": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Pci/composer.json b/app/code/Magento/Pci/composer.json
index 4114f1c54f083..ced31dee05926 100644
--- a/app/code/Magento/Pci/composer.json
+++ b/app/code/Magento/Pci/composer.json
@@ -3,13 +3,13 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-user": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-user": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json
index d97b8434ebb04..adedb09775a1b 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-cron": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-cron": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/PersistentHistory/composer.json b/app/code/Magento/PersistentHistory/composer.json
index ca2e306f24d91..c4083731b2106 100644
--- a/app/code/Magento/PersistentHistory/composer.json
+++ b/app/code/Magento/PersistentHistory/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-persistent": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/module-reports": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-persistent": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/module-reports": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/PricePermissions/composer.json b/app/code/Magento/PricePermissions/composer.json
index 9d66414b9b62b..b6afaac1ce396 100644
--- a/app/code/Magento/PricePermissions/composer.json
+++ b/app/code/Magento/PricePermissions/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-bundle": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-downloadable": "0.1.0-alpha107",
-        "magento/module-gift-card": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-msrp": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-bundle": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-downloadable": "0.1.0-alpha108",
+        "magento/module-gift-card": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-msrp": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json
index a8113feacbd78..d6810509eb8e4 100644
--- a/app/code/Magento/ProductAlert/composer.json
+++ b/app/code/Magento/ProductAlert/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/PromotionPermissions/composer.json b/app/code/Magento/PromotionPermissions/composer.json
index e1410abb53c42..64016e3df7df8 100644
--- a/app/code/Magento/PromotionPermissions/composer.json
+++ b/app/code/Magento/PromotionPermissions/composer.json
@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-banner": "0.1.0-alpha107",
-        "magento/module-reminder": "0.1.0-alpha107",
-        "magento/module-catalog-rule": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-banner": "0.1.0-alpha108",
+        "magento/module-reminder": "0.1.0-alpha108",
+        "magento/module-catalog-rule": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*",
-        "magento/module-sales-rule": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107"
+        "magento/module-sales-rule": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Reminder/composer.json b/app/code/Magento/Reminder/composer.json
index ac90abded75b1..0450c996f7785 100644
--- a/app/code/Magento/Reminder/composer.json
+++ b/app/code/Magento/Reminder/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-sales-rule": "0.1.0-alpha107",
-        "magento/module-rule": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-catalog-rule": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-sales-rule": "0.1.0-alpha108",
+        "magento/module-rule": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-catalog-rule": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index 58439372714d4..67c3875efcf78 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -3,27 +3,27 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-log": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/module-review": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-downloadable": "0.1.0-alpha107",
-        "magento/module-sales-rule": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-log": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/module-review": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-downloadable": "0.1.0-alpha108",
+        "magento/module-sales-rule": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json
index dda8112f82d4b..335ef79628263 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.4.11|~5.5.0",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index 5fcfa4f60977f..c0d1ce3385bab 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-newsletter": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-newsletter": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Reward/composer.json b/app/code/Magento/Reward/composer.json
index 7cd444fd81835..6a10927216669 100644
--- a/app/code/Magento/Reward/composer.json
+++ b/app/code/Magento/Reward/composer.json
@@ -3,25 +3,25 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-invitation": "0.1.0-alpha107",
-        "magento/module-newsletter": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-authorization": "0.1.0-alpha107",
-        "magento/module-sales-rule": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-invitation": "0.1.0-alpha108",
+        "magento/module-newsletter": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-authorization": "0.1.0-alpha108",
+        "magento/module-sales-rule": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Rma/composer.json b/app/code/Magento/Rma/composer.json
index 71f7033c8e4a6..2c259080b5fbd 100644
--- a/app/code/Magento/Rma/composer.json
+++ b/app/code/Magento/Rma/composer.json
@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-custom-attribute-management": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-shipping": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-customer-custom-attributes": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-authorization": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-custom-attribute-management": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-shipping": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-customer-custom-attributes": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-authorization": "0.1.0-alpha108",
         "ext-gd": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index 3bd82567206c8..7c32665a8450b 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json
index ad484578953eb..2d66f205d8d8f 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.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index f249f12c5ee06..6d804ffd3b84c 100644
--- a/app/code/Magento/Sales/composer.json
+++ b/app/code/Magento/Sales/composer.json
@@ -3,32 +3,32 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-authorization": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-sales-rule": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-gift-message": "0.1.0-alpha107",
-        "magento/module-reports": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-wishlist": "0.1.0-alpha107",
-        "magento/module-email": "0.1.0-alpha107",
-        "magento/module-shipping": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-authorization": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-sales-rule": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-gift-message": "0.1.0-alpha108",
+        "magento/module-reports": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-wishlist": "0.1.0-alpha108",
+        "magento/module-email": "0.1.0-alpha108",
+        "magento/module-shipping": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SalesArchive/composer.json b/app/code/Magento/SalesArchive/composer.json
index 6230df140ccc6..858a50fd9f786 100644
--- a/app/code/Magento/SalesArchive/composer.json
+++ b/app/code/Magento/SalesArchive/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
index 5dc80bc7a7316..f81f1bde2345c 100644
--- a/app/code/Magento/SalesRule/composer.json
+++ b/app/code/Magento/SalesRule/composer.json
@@ -3,25 +3,25 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-rule": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-shipping": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-reports": "0.1.0-alpha107",
-        "magento/module-catalog-rule": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-rule": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-shipping": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-reports": "0.1.0-alpha108",
+        "magento/module-catalog-rule": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/ScheduledImportExport/composer.json b/app/code/Magento/ScheduledImportExport/composer.json
index fa11cfe2a8730..863f3420ff6f7 100644
--- a/app/code/Magento/ScheduledImportExport/composer.json
+++ b/app/code/Magento/ScheduledImportExport/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-import-export": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-cron": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-import-export": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-cron": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index f60768e53f680..eba2fa71e5b23 100644
--- a/app/code/Magento/Search/composer.json
+++ b/app/code/Magento/Search/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-reports": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-reports": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json
index c7d39b37f1358..4de648ebc2aa2 100644
--- a/app/code/Magento/Sendfriend/composer.json
+++ b/app/code/Magento/Sendfriend/composer.json
@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index fb2aa855d2e16..fd8deb4b4397b 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -3,27 +3,27 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-contact": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-payment": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-contact": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-payment": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "ext-gd": "*",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-fedex": "0.1.0-alpha107",
-        "magento/module-ups": "0.1.0-alpha107"
+        "magento/module-fedex": "0.1.0-alpha108",
+        "magento/module-ups": "0.1.0-alpha108"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index cc23d349b9301..0434892300242 100644
--- a/app/code/Magento/Sitemap/composer.json
+++ b/app/code/Magento/Sitemap/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog-url-rewrite": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog-url-rewrite": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Solr/composer.json b/app/code/Magento/Solr/composer.json
index 13346cdae4932..0509396b8e04d 100644
--- a/app/code/Magento/Solr/composer.json
+++ b/app/code/Magento/Solr/composer.json
@@ -3,21 +3,21 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog-search": "0.1.0-alpha107",
-        "magento/module-search": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-indexer": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog-search": "0.1.0-alpha108",
+        "magento/module-search": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-indexer": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index 7fc270613f011..0aac9d8f09e72 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/TargetRule/composer.json b/app/code/Magento/TargetRule/composer.json
index 9b2c91b171882..c372bef118264 100644
--- a/app/code/Magento/TargetRule/composer.json
+++ b/app/code/Magento/TargetRule/composer.json
@@ -3,24 +3,24 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-rule": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-customer-segment": "0.1.0-alpha107",
-        "magento/module-indexer": "0.1.0-alpha107",
-        "magento/module-page-cache": "0.1.0-alpha107",
-        "magento/module-import-export": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-rule": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-customer-segment": "0.1.0-alpha108",
+        "magento/module-indexer": "0.1.0-alpha108",
+        "magento/module-page-cache": "0.1.0-alpha108",
+        "magento/module-import-export": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index 2d23a1282b800..1cc1ae2c1c93e 100644
--- a/app/code/Magento/Tax/composer.json
+++ b/app/code/Magento/Tax/composer.json
@@ -3,22 +3,22 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-shipping": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-reports": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-shipping": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-reports": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index b8869f3e5d112..fcc2dc7de627d 100644
--- a/app/code/Magento/TaxImportExport/composer.json
+++ b/app/code/Magento/TaxImportExport/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index 0f3c6e2062839..2aec9c687ed28 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-require-js": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-require-js": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-translation": "0.1.0-alpha107"
+        "magento/module-translation": "0.1.0-alpha108"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index 2849dd2623859..a9d1c7cad17c2 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index 245631abc35ba..e89e925a69078 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json
index e57b8f880b519..c1370e7426f6f 100644
--- a/app/code/Magento/Ups/composer.json
+++ b/app/code/Magento/Ups/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-shipping": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-shipping": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json
index 1a6e0d2391e48..9674b31b22ecb 100644
--- a/app/code/Magento/UrlRewrite/composer.json
+++ b/app/code/Magento/UrlRewrite/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog-url-rewrite": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-cms-url-rewrite": "0.1.0-alpha107",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog-url-rewrite": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-cms-url-rewrite": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index cb32db654f251..d0ee6d7f45794 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-authorization": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-integration": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-require-js": "0.1.0-alpha107",
+        "magento/module-authorization": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-integration": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-require-js": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index ebef2f7cd1f65..8424859cebbe6 100644
--- a/app/code/Magento/Usps/composer.json
+++ b/app/code/Magento/Usps/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-shipping": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-shipping": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/VersionsCms/composer.json b/app/code/Magento/VersionsCms/composer.json
index 3891071fc6e15..d8f80629a7fe6 100644
--- a/app/code/Magento/VersionsCms/composer.json
+++ b/app/code/Magento/VersionsCms/composer.json
@@ -3,18 +3,18 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-widget": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-user": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-widget": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-user": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
index 25fc9a05d73dc..ddd77845a7a70 100644
--- a/app/code/Magento/Webapi/composer.json
+++ b/app/code/Magento/Webapi/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-authorization": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-integration": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-authorization": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-integration": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-user": "0.1.0-alpha107"
+        "magento/module-user": "0.1.0-alpha108"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/WebsiteRestriction/composer.json b/app/code/Magento/WebsiteRestriction/composer.json
index 7ec9f9e9a61f3..c082b8a34d8f9 100644
--- a/app/code/Magento/WebsiteRestriction/composer.json
+++ b/app/code/Magento/WebsiteRestriction/composer.json
@@ -3,17 +3,17 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-theme": "0.1.0-alpha107"
+        "magento/module-theme": "0.1.0-alpha108"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json
index d1110d875d92c..dc740b5e71034 100644
--- a/app/code/Magento/Weee/composer.json
+++ b/app/code/Magento/Weee/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-directory": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-directory": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index ad2b72c6a2dc7..7f36bf1a53a6b 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -3,16 +3,16 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-cms": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-cms": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index 935967b72518e..68decafc77964 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-customer": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-checkout": "0.1.0-alpha107",
-        "magento/module-theme": "0.1.0-alpha107",
-        "magento/module-catalog-inventory": "0.1.0-alpha107",
-        "magento/module-rss": "0.1.0-alpha107",
-        "magento/module-backend": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-grouped-product": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
-        "magento/module-ui": "0.1.0-alpha107",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-customer": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-checkout": "0.1.0-alpha108",
+        "magento/module-theme": "0.1.0-alpha108",
+        "magento/module-catalog-inventory": "0.1.0-alpha108",
+        "magento/module-rss": "0.1.0-alpha108",
+        "magento/module-backend": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-grouped-product": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
+        "magento/module-ui": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-configurable-product": "0.1.0-alpha107",
-        "magento/module-downloadable": "0.1.0-alpha107",
-        "magento/module-bundle": "0.1.0-alpha107"
+        "magento/module-configurable-product": "0.1.0-alpha108",
+        "magento/module-downloadable": "0.1.0-alpha108",
+        "magento/module-bundle": "0.1.0-alpha108"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json
index 626b5da294324..801a7e061ea94 100644
--- a/app/design/adminhtml/Magento/backend/composer.json
+++ b/app/design/adminhtml/Magento/backend/composer.json
@@ -3,11 +3,11 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-theme",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index 043c9997962fd..30452ec592d84 100644
--- a/app/design/frontend/Magento/blank/composer.json
+++ b/app/design/frontend/Magento/blank/composer.json
@@ -3,11 +3,11 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-theme",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
index 6bf89d6a12aaf..32ffb035bfdc4 100644
--- a/app/design/frontend/Magento/luma/composer.json
+++ b/app/design/frontend/Magento/luma/composer.json
@@ -3,12 +3,12 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/theme-frontend-blank": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/theme-frontend-blank": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-theme",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/i18n/magento/de_de/composer.json b/app/i18n/magento/de_de/composer.json
index c3f84920c6c65..45c4e058908a9 100644
--- a/app/i18n/magento/de_de/composer.json
+++ b/app/i18n/magento/de_de/composer.json
@@ -1,13 +1,13 @@
 {
     "name": "magento/language-de_de",
     "description": "German (Germany) language",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-language",
diff --git a/app/i18n/magento/en_us/composer.json b/app/i18n/magento/en_us/composer.json
index 525dfdbdb298c..78f32008c4c82 100644
--- a/app/i18n/magento/en_us/composer.json
+++ b/app/i18n/magento/en_us/composer.json
@@ -1,13 +1,13 @@
 {
     "name": "magento/language-en_us",
     "description": "English (United States) language",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-language",
diff --git a/app/i18n/magento/es_es/composer.json b/app/i18n/magento/es_es/composer.json
index 58f0832c99c5b..0a74fdc4543ab 100644
--- a/app/i18n/magento/es_es/composer.json
+++ b/app/i18n/magento/es_es/composer.json
@@ -1,13 +1,13 @@
 {
     "name": "magento/language-es_es",
     "description": "Spanish (Spain) language",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-language",
diff --git a/app/i18n/magento/fr_fr/composer.json b/app/i18n/magento/fr_fr/composer.json
index 8206762a233b5..d915ee76f3399 100644
--- a/app/i18n/magento/fr_fr/composer.json
+++ b/app/i18n/magento/fr_fr/composer.json
@@ -1,13 +1,13 @@
 {
     "name": "magento/language-fr_fr",
     "description": "French (France) language",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-language",
diff --git a/app/i18n/magento/nl_nl/composer.json b/app/i18n/magento/nl_nl/composer.json
index 3d2a5bd9bd092..65bba789606d5 100644
--- a/app/i18n/magento/nl_nl/composer.json
+++ b/app/i18n/magento/nl_nl/composer.json
@@ -1,13 +1,13 @@
 {
     "name": "magento/language-nl_nl",
     "description": "Dutch (Netherlands) language",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-language",
diff --git a/app/i18n/magento/pt_br/composer.json b/app/i18n/magento/pt_br/composer.json
index 1c3d2f00e2620..1990858131225 100644
--- a/app/i18n/magento/pt_br/composer.json
+++ b/app/i18n/magento/pt_br/composer.json
@@ -1,13 +1,13 @@
 {
     "name": "magento/language-pt_br",
     "description": "Portuguese (Brazil) language",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-language",
diff --git a/app/i18n/magento/zh_cn/composer.json b/app/i18n/magento/zh_cn/composer.json
index f37be23fd6cb2..5b4acb09b6a31 100644
--- a/app/i18n/magento/zh_cn/composer.json
+++ b/app/i18n/magento/zh_cn/composer.json
@@ -1,13 +1,13 @@
 {
     "name": "magento/language-zh_cn",
     "description": "Chinese (China) language",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-language",
diff --git a/composer.json b/composer.json
index 33875d57f50b8..6101c20283754 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/project-mainline",
     "description": "Magento project mainline",
     "type": "project",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -195,8 +195,8 @@
         "tinymce/tinymce": "3.4.7"
     },
     "suggest": {
-        "magento/module-fedex": "0.1.0-alpha107",
-        "magento/module-ups": "0.1.0-alpha107"
+        "magento/module-fedex": "0.1.0-alpha108",
+        "magento/module-ups": "0.1.0-alpha108"
     },
     "extra": {
         "component_paths": {
diff --git a/lib/internal/Magento/Framework/AppInterface.php b/lib/internal/Magento/Framework/AppInterface.php
index 88815304ed899..0d7eba988973a 100644
--- a/lib/internal/Magento/Framework/AppInterface.php
+++ b/lib/internal/Magento/Framework/AppInterface.php
@@ -16,7 +16,7 @@ interface AppInterface
     /**
      * Magento version
      */
-    const VERSION = '0.1.0-alpha107';
+    const VERSION = '0.1.0-alpha108';
 
     /**
      * Launch application
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index 7b3377e150e8e..81eab2eb3ae61 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/framework",
     "description": "N/A",
     "type": "magento2-library",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

From dc8351b2cde51cf6cd6178e21b512c4a87b14f29 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 14:38:49 +0200
Subject: [PATCH 339/474] MAGETWO-31049: M2 GitHub Update (version
 0.1.0-alpha108)

- not requred changes (internal)
---
 dev/build/publication/edition/internal.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/build/publication/edition/internal.txt b/dev/build/publication/edition/internal.txt
index 4578fe1e4e0d2..9934e0ed1943a 100644
--- a/dev/build/publication/edition/internal.txt
+++ b/dev/build/publication/edition/internal.txt
@@ -1,6 +1,8 @@
 # Files included in testing builds, but nor ready/approved for publication
 
 dev/tools/Magento/Tools/SampleData
+dev/tests/integration/testsuite/Magento/Tools/SampleData
+
 dev/tools/Magento/Tools/Formatter
 dev/tools/PHP-Parser
 

From 4db511c0091ec28c16aaf4a9d9528d5501a303bf Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 14:42:20 +0200
Subject: [PATCH 340/474] MAGETWO-31049: M2 GitHub Update (version
 0.1.0-alpha108)

- composer lock
---
 composer.lock | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/composer.lock b/composer.lock
index 984a771f63549..4cb34eef437d6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "86858723fa34f34a20ea8dfa7ed6d9f9",
+    "hash": "7f476cdbf96cb6a904a0c30eb9343069",
     "packages": [
         {
             "name": "composer/composer",
@@ -1711,16 +1711,16 @@
         },
         {
             "name": "fabpot/php-cs-fixer",
-            "version": "v1.2",
+            "version": "v1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "7aa4cff18c037935d07c27281a01fd4248a002c1"
+                "reference": "653cefbf33241185b58f7323157f1829552e370d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/7aa4cff18c037935d07c27281a01fd4248a002c1",
-                "reference": "7aa4cff18c037935d07c27281a01fd4248a002c1",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/653cefbf33241185b58f7323157f1829552e370d",
+                "reference": "653cefbf33241185b58f7323157f1829552e370d",
                 "shasum": ""
             },
             "require": {
@@ -1739,7 +1739,7 @@
             "type": "application",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
@@ -1752,13 +1752,17 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
+                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
                 }
             ],
             "description": "A script to automatically fix Symfony Coding Standard",
-            "time": "2014-11-30 13:11:14"
+            "time": "2014-12-12 06:09:01"
         },
         {
             "name": "league/climate",
@@ -2913,9 +2917,7 @@
             "time": "2014-12-02 20:19:20"
         }
     ],
-    "aliases": [
-
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
         "composer/composer": 15,

From 7ac15f0cf3c7e3007b7ad67acf710727989146b3 Mon Sep 17 00:00:00 2001
From: Arkadii Chyzhov <achyzhov@ebay.com>
Date: Fri, 12 Dec 2014 14:57:28 +0200
Subject: [PATCH 341/474] MAGETWO-31708: Merge Core sql scripts and rename file
 with suffix 2.0.0

- Changes for updating existing data structure has been merged into initial creation of data structure
---
 .../data/core_setup/data-install-2.0.0.php    |   2 +-
 .../Core/sql/core_setup/install-2.0.0.php     | 491 +++---------------
 2 files changed, 63 insertions(+), 430 deletions(-)

diff --git a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
index b0626addfb93b..9b20adfeecff3 100644
--- a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
@@ -70,7 +70,7 @@
 
 /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
 foreach ($fileCollection as $theme) {
-    $dbTheme = $themeDbCollection->getThemeByFullPath($theme->getFullPath());
+    $dbTheme = $resourceCollection->getThemeByFullPath($theme->getFullPath());
     $dbTheme->setCode($theme->getCode());
     $dbTheme->save();
 }
diff --git a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
index 22f65e1b1ddeb..4df4fcc54212e 100644
--- a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
+++ b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
@@ -119,6 +119,12 @@
     null,
     array('nullable' => false, 'default' => '0'),
     'Sort Order'
+)->addColumn(
+    'updated_at',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+    null,
+    array('nullable' => true),
+    'Last Update Timestamp'
 )->addIndex(
     $installer->getIdxName('core_layout_update', array('handle')),
     array('handle')
@@ -145,40 +151,40 @@
     array('unsigned' => true, 'nullable' => false, 'default' => '0'),
     'Store Id'
 )->addColumn(
-    'area',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    64,
-    array(),
-    'Area'
-)->addColumn(
-    'package',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    64,
-    array(),
-    'Package'
-)->addColumn(
-    'theme',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    64,
-    array(),
-    'Theme'
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    array('unsigned' => true, 'nullable' => false),
+    'Theme id'
 )->addColumn(
     'layout_update_id',
     \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
     null,
     array('unsigned' => true, 'nullable' => false, 'default' => '0'),
     'Layout Update Id'
+)->addColumn(
+    'is_temporary',
+    \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+    null,
+    array('nullable' => false, 'default' => '0'),
+    'Defines whether Layout Update is Temporary'
+)->addIndex(
+    $installer->getIdxName('core_layout_link', array('layout_update_id')),
+    array('layout_update_id')
+)->addForeignKey(
+    $installer->getFkName('core_layout_link', 'layout_update_id', 'core_layout_update', 'layout_update_id'),
+    'layout_update_id',
+    $installer->getTable('core_layout_update'),
+    'layout_update_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
 )->addIndex(
     $installer->getIdxName(
         'core_layout_link',
-        array('store_id', 'package', 'theme', 'layout_update_id'),
+        array('store_id', 'theme_id', 'layout_update_id', 'is_temporary'),
         \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
     ),
-    array('store_id', 'package', 'theme', 'layout_update_id'),
-    array('type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE)
-)->addIndex(
-    $installer->getIdxName('core_layout_link', array('layout_update_id')),
-    array('layout_update_id')
+    array('store_id', 'theme_id', 'layout_update_id', 'is_temporary')
 )->addForeignKey(
     $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id'),
     'store_id',
@@ -187,10 +193,10 @@
     \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
     \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
 )->addForeignKey(
-    $installer->getFkName('core_layout_link', 'layout_update_id', 'core_layout_update', 'layout_update_id'),
-    'layout_update_id',
-    $installer->getTable('core_layout_update'),
-    'layout_update_id',
+    $installer->getFkName('core_layout_link', 'theme_id', 'core_theme', 'theme_id'),
+    'theme_id',
+    $installer->getTable('core_theme'),
+    'theme_id',
     \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
     \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
 )->setComment(
@@ -560,192 +566,39 @@
     array('nullable' => true),
     'Preview Image'
 )->addColumn(
-    'magento_version_from',
+    'is_featured',
+    \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+    null,
+    array('nullable' => false, 'default' => 0),
+    'Is Theme Featured'
+)->addColumn(
+    'area',
     \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
     255,
     array('nullable' => false),
-    'Magento Version From'
+    'Theme Area'
 )->addColumn(
-    'magento_version_to',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
+    'type',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
     array('nullable' => false),
-    'Magento Version To'
+    'Theme type: 0:physical, 1:virtual, 2:staging'
 )->addColumn(
-    'is_featured',
-    \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+    'code',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
     null,
-    array('nullable' => false, 'default' => 0),
-    'Is Theme Featured'
+    array(),
+    'Full theme code, including package'
 )->setComment(
     'Core theme'
 );
 $connection->createTable($table);
 
-/**
- * Modifying 'core_layout_link' table. Replace columns area, package, theme to theme_id
- */
-$tableCoreLayoutLink = $installer->getTable('core_layout_link');
-
-$connection->dropForeignKey(
-    $tableCoreLayoutLink,
-    $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id')
-);
-
-$connection->dropIndex(
-    $tableCoreLayoutLink,
-    $installer->getIdxName(
-        'core_layout_link',
-        array('store_id', 'package', 'theme', 'layout_update_id'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    )
-);
-
-$connection->dropColumn($tableCoreLayoutLink, 'area');
-
-$connection->dropColumn($tableCoreLayoutLink, 'package');
-
-$connection->changeColumn(
-    $tableCoreLayoutLink,
-    'theme',
-    'theme_id',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-        'unsigned' => true,
-        'nullable' => false,
-        'comment' => 'Theme id'
-    )
-);
-
-$connection->addIndex(
-    $tableCoreLayoutLink,
-    $installer->getIdxName(
-        'core_layout_link',
-        array('store_id', 'theme_id', 'layout_update_id'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    array('store_id', 'theme_id', 'layout_update_id'),
-    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-);
-
-$connection->addForeignKey(
-    $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id'),
-    $tableCoreLayoutLink,
-    'store_id',
-    $installer->getTable('store'),
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-
-$connection->addForeignKey(
-    $installer->getFkName('core_layout_link', 'theme_id', 'core_theme', 'theme_id'),
-    $tableCoreLayoutLink,
-    'theme_id',
-    $installer->getTable('core_theme'),
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-
-/**
- * Add column 'area' to 'core_theme'
- */
-$connection->addColumn(
-    $installer->getTable('core_theme'),
-    'area',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-        'length' => '255',
-        'nullable' => false,
-        'comment' => 'Theme Area'
-    )
-);
-
-/**
- * Modifying 'core_layout_link' table. Adding 'is_temporary' column
- */
-$tableCoreLayoutLink = $installer->getTable('core_layout_link');
-
-$connection->addColumn(
-    $tableCoreLayoutLink,
-    'is_temporary',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-        'nullable' => false,
-        'default' => '0',
-        'comment' => 'Defines whether Layout Update is Temporary'
-    )
-);
-
-// we must drop next 2 foreign keys to have an ability to drop index
-$connection->dropForeignKey(
-    $tableCoreLayoutLink,
-    $installer->getFkName($tableCoreLayoutLink, 'store_id', 'store', 'store_id')
-);
-$connection->dropForeignKey(
-    $tableCoreLayoutLink,
-    $installer->getFkName($tableCoreLayoutLink, 'theme_id', 'core_theme', 'theme_id')
-);
-
-$connection->dropIndex(
-    $tableCoreLayoutLink,
-    $installer->getIdxName(
-        $tableCoreLayoutLink,
-        array('store_id', 'theme_id', 'layout_update_id'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    )
-);
-
-$connection->addIndex(
-    $tableCoreLayoutLink,
-    $installer->getIdxName(
-        $tableCoreLayoutLink,
-        array('store_id', 'theme_id', 'layout_update_id', 'is_temporary'),
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    array('store_id', 'theme_id', 'layout_update_id', 'is_temporary'),
-    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-);
-
-// recreate 2 dropped foreign keys to have an ability to drop index
-$connection->addForeignKey(
-    $installer->getFkName($tableCoreLayoutLink, 'store_id', 'store', 'store_id'),
-    $tableCoreLayoutLink,
-    'store_id',
-    $installer->getTable('store'),
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-$connection->addForeignKey(
-    $installer->getFkName($tableCoreLayoutLink, 'theme_id', 'core_theme', 'theme_id'),
-    $tableCoreLayoutLink,
-    'theme_id',
-    $installer->getTable('core_theme'),
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-
-/**
- * Add column 'updated_at' to 'core_layout_update'
- */
-$connection->addColumn(
-    $installer->getTable('core_layout_update'),
-    'updated_at',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-        'nullable' => true,
-        'comment' => 'Last Update Timestamp'
-    )
-);
-
 /**
  * Create table 'core_theme_files'
  */
 $table = $connection->newTable(
-    $installer->getTable('core_theme_files')
+    $installer->getTable('core_theme_file')
 )->addColumn(
     'theme_files_id',
     \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
@@ -759,11 +612,11 @@
     array('nullable' => false, 'unsigned' => true),
     'Theme Id'
 )->addColumn(
-    'file_name',
+    'file_path',
     \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
     255,
-    array('nullable' => false),
-    'File Name'
+    array('nullable' => true),
+    'Relative path to file'
 )->addColumn(
     'file_type',
     \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
@@ -777,11 +630,17 @@
     array('nullable' => false),
     'File Content'
 )->addColumn(
-    'order',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    'sort_order',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
+    array('nullable' => false, 'default' => 0),
+    'Sort Order'
+)->addColumn(
+    'is_temporary',
+    \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
     null,
     array('nullable' => false, 'default' => 0),
-    'Order'
+    'Is Temporary File'
 )->addForeignKey(
     $installer->getFkName('core_theme_files', 'theme_id', 'core_theme', 'theme_id'),
     'theme_id',
@@ -794,230 +653,4 @@
 );
 $connection->createTable($table);
 
-/**
- * Add and change columns in 'core_theme_files'
- */
-$connection->addColumn(
-    $installer->getTable('core_theme_files'),
-    'is_temporary',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-        'nullable' => false,
-        'default' => 0,
-        'comment' => 'Is Temporary File'
-    )
-);
-
-$connection->changeColumn(
-    $installer->getTable('core_theme_files'),
-    'file_name',
-    'file_path',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-        'length' => 255,
-        'nullable' => true,
-        'comment' => 'Relative path to file'
-    )
-);
-
-$connection->changeColumn(
-    $installer->getTable('core_theme_files'),
-    'order',
-    'sort_order',
-    array('type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT)
-);
-
-/**
- * Create table 'core_theme_files_link'
- */
-$table = $connection->newTable(
-    $installer->getTable('core_theme_files_link')
-)->addColumn(
-    'files_link_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('identity' => true, 'nullable' => false, 'unsigned' => true, 'primary' => true),
-    'Customization link id'
-)->addColumn(
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('nullable' => false, 'unsigned' => true),
-    'Theme Id'
-)->addColumn(
-    'layout_link_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    array('nullable' => false, 'unsigned' => true),
-    'Theme layout link id'
-)->addForeignKey(
-    $installer->getFkName('core_theme_files_link', 'theme_id', 'core_theme', 'theme_id'),
-    'theme_id',
-    $installer->getTable('core_theme'),
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->setComment(
-    'Core theme link on layout update'
-);
-$installer->getConnection()->createTable($table);
-
-/**
- * Add column 'type' to 'core_theme'
- */
-$connection->addColumn(
-    $installer->getTable('core_theme'),
-    'type',
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-        'nullable' => false,
-        'comment' => 'Theme type: 0:physical, 1:virtual, 2:staging'
-    )
-);
-
-/**
- * Rename table
- */
-$wrongName = 'core_theme_files';
-$rightName = 'core_theme_file';
-if ($installer->tableExists($wrongName)) {
-    $connection->renameTable($installer->getTable($wrongName), $installer->getTable($rightName));
-}
-
-$oldName = 'core_theme_files_link';
-$newName = 'core_theme_file_update';
-
-$oldTableName = $installer->getTable($oldName);
-
-/**
- * Drop foreign key and index
- */
-$connection->dropForeignKey($oldTableName, $installer->getFkName($oldName, 'theme_id', 'core_theme', 'theme_id'));
-$connection->dropIndex($oldTableName, $installer->getFkName($oldName, 'theme_id', 'core_theme', 'theme_id'));
-
-/**
- * Rename table
- */
-if ($installer->tableExists($oldName)) {
-    $connection->renameTable($installer->getTable($oldName), $installer->getTable($newName));
-}
-
-$newTableName = $installer->getTable($newName);
-
-/**
- * Rename column
- */
-$oldColumn = 'files_link_id';
-$newColumn = 'file_update_id';
-$connection->changeColumn(
-    $newTableName,
-    $oldColumn,
-    $newColumn,
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-        'primary' => true,
-        'nullable' => false,
-        'unsigned' => true,
-        'comment' => 'Customization file update id'
-    )
-);
-
-/**
- * Rename column
- */
-$oldColumn = 'layout_link_id';
-$newColumn = 'layout_update_id';
-$connection->changeColumn(
-    $newTableName,
-    $oldColumn,
-    $newColumn,
-    array(
-        'type' => \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-        'nullable' => false,
-        'unsigned' => true,
-        'comment' => 'Theme layout update id'
-    )
-);
-
-/**
- * Add foreign keys and indexes
- */
-$connection->addIndex(
-    $newTableName,
-    $installer->getIdxName(
-        $newTableName,
-        'theme_id',
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    'theme_id',
-    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-);
-$connection->addForeignKey(
-    $installer->getFkName($newTableName, 'theme_id', 'core_theme', 'theme_id'),
-    $newTableName,
-    'theme_id',
-    $installer->getTable('core_theme'),
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-$connection->addIndex(
-    $newTableName,
-    $installer->getIdxName(
-        $newTableName,
-        'layout_update_id',
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-    ),
-    'layout_update_id',
-    \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX
-);
-$connection->addForeignKey(
-    $installer->getFkName($newTableName, 'layout_update_id', 'core_layout_update', 'layout_update_id'),
-    $newTableName,
-    'layout_update_id',
-    $installer->getTable('core_layout_update'),
-    'layout_update_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-);
-
-/**
- * Change data
- */
-$select = $connection->select()->from(
-    $newTableName
-)->join(
-    array('link' => $installer->getTable('core_layout_link')),
-    sprintf('link.layout_link_id = %s.layout_update_id', $newTableName)
-);
-$rows = $connection->fetchAll($select);
-foreach ($rows as $row) {
-    $connection->update(
-        $newTableName,
-        array('layout_update_id' => $row['layout_update_id']),
-        'file_update_id = ' . $row['file_update_id']
-    );
-}
-
-/**
- * Add column 'code' into 'core_theme'
- */
-$connection->addColumn(
-    $installer->getTable('core_theme'),
-    'code',
-    array('type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, 'comment' => 'Full theme code, including package')
-);
-
-/**
- * Drop table 'core_theme_file_update'
- */
-$connection->dropTable('core_theme_file_update');
-
-/**
- * Drop columns 'magento_version_from' and 'magento_version_to' in 'core_theme'
- */
-$table = $installer->getTable('core_theme');
-$connection->dropColumn($table, 'magento_version_from');
-$connection->dropColumn($table, 'magento_version_to');
-
 $installer->endSetup();

From ae669e4fc4b61f41c983609973e8c5ac1c56dc95 Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Fri, 12 Dec 2014 15:37:23 +0200
Subject: [PATCH 342/474] Merge branch 'develop-mainline' into team develop
 branch

- fix conflict resolving typo
---
 .../testsuite/Magento/Test/Legacy/_files/obsolete_classes.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index d1c364c9780e3..6fcec83427e0a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -2829,7 +2829,7 @@
     ['Magento\Paypal\Block\System\Config\Fieldset\Location'],
     ['Magento\Paypal\Block\Payflow\Advanced\Review'],
     ['Magento\Paypal\Block\Payflow\Link\Review'],
-    ['Magento\Paypal\Model\System\Config\Source\AuthorizationAmounts']
+    ['Magento\Paypal\Model\System\Config\Source\AuthorizationAmounts'],
     ['Magento\Rule\Model\Rule', 'Magento\Rule\Model\AbstractModel'],
     ['Magento\Framework\App\Cache\State\Options', 'Magento\Framework\App\Cache\State'],
     ['Magento\Framework\App\Cache\State\OptionsInterface', 'Magento\Framework\App\Cache\State'],

From 5e7aefac08317b2d077878b801bdbf88dab9e519 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 16:16:11 +0200
Subject: [PATCH 343/474] MAGETWO-31629: Online payment methods removal for CE
 release

- skipped test
---
 dev/build/publication/edition/ee.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/build/publication/edition/ee.txt b/dev/build/publication/edition/ee.txt
index 036d379fd20a9..320d28b2ab4b8 100644
--- a/dev/build/publication/edition/ee.txt
+++ b/dev/build/publication/edition/ee.txt
@@ -89,6 +89,7 @@ dev/tools/Magento/Tools/SampleData/fixtures/TargetRule
 dev/tools/Magento/Tools/SampleData/Module/TargetRule
 
 dev/tests/integration/testsuite/Magento/Test/Design/Frontend/Enterprise
+dev/tests/integration/testsuite/Magento/Centinel/CreateOrderTest.php
 
 dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ee.php
 dev/tests/static/testsuite/Magento/Test/Js/_files/{whitelist,blacklist}/ee.txt

From 524667aaea2c34f068fcb8b34b9e5a3780453bdd Mon Sep 17 00:00:00 2001
From: Olexii Korshenko <okorshenko@ebay.com>
Date: Fri, 12 Dec 2014 16:18:22 +0200
Subject: [PATCH 344/474] MAGETWO-31738: Bugs for contribution. December kanban
 week 2

- fixed unit tests
---
 .../Adminhtml/Category/AbstractCategoryTest.php |  2 +-
 .../Magento/Catalog/Model/CategoryTest.php      | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
index 3c41b1cc44f29..4f77589816fc3 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
@@ -68,7 +68,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
index 07abdac6da914..a918e7be095e2 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -90,16 +90,27 @@ protected function setUp()
         $this->registry = $this->getMock('Magento\Framework\Registry');
         $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->categoryTreeResource = $this->getMock('Magento\Catalog\Model\Resource\Category\Tree', [], [], '', false);
-        $this->categoryTreeFactory = $this->getMock('Magento\Catalog\Model\Resource\Category\TreeFactory', ['create']);
+        $this->categoryTreeFactory = $this->getMock(
+            'Magento\Catalog\Model\Resource\Category\TreeFactory',
+            ['create'],
+            [],
+            '',
+            false);
         $this->categoryRepository = $this->getMock('Magento\Catalog\Api\CategoryRepositoryInterface');
         $this->storeCollectionFactory = $this->getMock(
             'Magento\Store\Model\Resource\Store\CollectionFactory',
-            ['create']
+            ['create'],
+            [],
+            '',
+            false
         );
         $this->url = $this->getMock('Magento\Framework\UrlInterface');
         $this->productCollectionFactory = $this->getMock(
             'Magento\Catalog\Model\Resource\Product\CollectionFactory',
-            ['create']
+            ['create'],
+            [],
+            '',
+            false
         );
         $this->catalogConfig = $this->getMock('Magento\Catalog\Model\Config', [], [], '', false);
         $this->filterManager = $this->getMock(

From 482c590bdf999fb2aa2b0da6368a118d776439eb Mon Sep 17 00:00:00 2001
From: Anton Kril <akril@ebay.com>
Date: Fri, 12 Dec 2014 16:17:15 +0200
Subject: [PATCH 345/474] MAGETWO-31735: Impossible delete product in Wishlist
 on backend

---
 .../Wishlist/view/adminhtml/layout/customer_index_wishlist.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
index 6662a31b1eea8..a94b31b3176eb 100644
--- a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
+++ b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
@@ -109,5 +109,6 @@
                 </arguments>
             </block>
         </block>
+        <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Configure" template="Magento_Catalog::catalog/product/composite/configure.phtml" name="configure.popup"/>
     </container>
 </layout>

From a56e9ddeeb861e27ab08c6d72228c68c5e24d028 Mon Sep 17 00:00:00 2001
From: Olexii Korshenko <okorshenko@ebay.com>
Date: Fri, 12 Dec 2014 16:23:33 +0200
Subject: [PATCH 346/474] MAGETWO-31738: Bugs for contribution. December kanban
 week 2

- fixed static tests
---
 .../testsuite/Magento/Sales/Model/Resource/OrderTest.php | 6 +-----
 .../Block/Adminhtml/Category/AbstractCategoryTest.php    | 5 +----
 .../Multishipping/Block/Checkout/Address/SelectTest.php  | 7 +------
 .../Controller/Checkout/Address/EditAddressTest.php      | 7 +------
 .../Controller/Checkout/Address/EditBillingTest.php      | 7 +------
 .../Controller/Checkout/Address/EditShippingTest.php     | 7 +------
 .../Controller/Checkout/Address/NewBillingTest.php       | 7 +------
 .../Controller/Checkout/Address/NewShippingTest.php      | 7 +------
 .../Controller/Checkout/Address/ShippingSavedTest.php    | 5 +----
 .../Magento/Tax/Model/TaxRateCollectionTest.php          | 9 ++-------
 .../Magento/Tax/Model/TaxRateManagementTest.php          | 5 +----
 .../Magento/Tax/Model/TaxRuleCollectionTest.php          | 9 ++-------
 12 files changed, 14 insertions(+), 67 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
index 477791d778b6d..15172f7324cd4 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
@@ -1,10 +1,6 @@
 <?php
 /**
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Sales\Model\Resource;
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
index 4f77589816fc3..be0554b982b1f 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Catalog\Block\Adminhtml\Category;
 
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
index b050b067626e3..2b87525d0ba73 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
@@ -1,12 +1,7 @@
 <?php
 /**
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-
 namespace Magento\Multishipping\Block\Checkout\Address;
 
 use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php
index b8a9bfcb95bd7..a16266fae67fb 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditAddressTest.php
@@ -1,12 +1,7 @@
 <?php
 /**
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-
 namespace Magento\Multishipping\Controller\Checkout\Address;
 
 use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditBillingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditBillingTest.php
index 446e4288b7231..3ba5dec09094e 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditBillingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditBillingTest.php
@@ -1,12 +1,7 @@
 <?php
 /**
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-
 namespace Magento\Multishipping\Controller\Checkout\Address;
 
 use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditShippingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditShippingTest.php
index 7640963e91831..fd8ca0515670a 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/EditShippingTest.php
@@ -1,12 +1,7 @@
 <?php
 /**
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-
 namespace Magento\Multishipping\Controller\Checkout\Address;
 
 use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewBillingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewBillingTest.php
index 270442e2e309f..0c3925db9b7c7 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewBillingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewBillingTest.php
@@ -1,12 +1,7 @@
 <?php
 /**
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-
 namespace Magento\Multishipping\Controller\Checkout\Address;
 
 use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewShippingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewShippingTest.php
index 3177165b1ba00..a0e703c3e20cc 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/NewShippingTest.php
@@ -1,12 +1,7 @@
 <?php
 /**
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-
 namespace Magento\Multishipping\Controller\Checkout\Address;
 
 use Magento\TestFramework\Helper\ObjectManager;
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php
index 75a48b539eb7d..3db9b6ee8fe20 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Multishipping\Controller\Checkout\Address;
 
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
index fffc4348a6fa8..5d1ecef858b10 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateCollectionTest.php
@@ -1,12 +1,7 @@
 <?php
-/** 
- * 
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-
 namespace Magento\Tax\Model;
  
 class TaxRateCollectionTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateManagementTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateManagementTest.php
index 529313ce6b05f..5d573a75d72ce 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRateManagementTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Tax\Model;
 
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php
index e516deef46316..4dbdc586e4cfa 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxRuleCollectionTest.php
@@ -1,12 +1,7 @@
 <?php
-/** 
- * 
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-
 namespace Magento\Tax\Model;
  
 class TaxRuleCollectionTest extends \PHPUnit_Framework_TestCase

From 4153e57452685dbcefe330e7337942871585e3cf Mon Sep 17 00:00:00 2001
From: Olexii Korshenko <okorshenko@ebay.com>
Date: Fri, 12 Dec 2014 16:52:31 +0200
Subject: [PATCH 347/474] MAGETWO-31738: Bugs for contribution. December kanban
 week 2

- fixed static tests
---
 .../Model/Adminhtml/Balance/History.php             |  4 ++--
 .../Solr/Model/Layer/Category/Filter/Category.php   | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/CustomerBalance/Model/Adminhtml/Balance/History.php b/app/code/Magento/CustomerBalance/Model/Adminhtml/Balance/History.php
index 806e8e6943e56..677aea6a985a1 100644
--- a/app/code/Magento/CustomerBalance/Model/Adminhtml/Balance/History.php
+++ b/app/code/Magento/CustomerBalance/Model/Adminhtml/Balance/History.php
@@ -23,8 +23,8 @@ class History extends \Magento\CustomerBalance\Model\Balance\History
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Customer\Model\CustomerRegistry $customerRegistry
+     * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -36,8 +36,8 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Backend\Model\Auth\Session $authSession,
         \Magento\Customer\Model\CustomerRegistry $customerRegistry,
+        \Magento\Backend\Model\Auth\Session $authSession,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
diff --git a/app/code/Magento/Solr/Model/Layer/Category/Filter/Category.php b/app/code/Magento/Solr/Model/Layer/Category/Filter/Category.php
index b92bc1938cbd7..4a34fed9d1c54 100644
--- a/app/code/Magento/Solr/Model/Layer/Category/Filter/Category.php
+++ b/app/code/Magento/Solr/Model/Layer/Category/Filter/Category.php
@@ -4,7 +4,7 @@
  */
 namespace Magento\Solr\Model\Layer\Category\Filter;
 
-use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Layer\Filter\DataProvider\CategoryFactory;
 
 /**
  * Layer category filter
@@ -26,9 +26,7 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\Category
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Catalog\Model\Layer\Filter\DataProvider\CategoryFactory $categoryFactory
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param CategoryRepositoryInterface $categoryRepository
+     * @param CategoryFactory $categoryDataProviderFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param array $data
      */
@@ -38,20 +36,17 @@ public function __construct(
         \Magento\Catalog\Model\Layer $layer,
         \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
         \Magento\Framework\Escaper $escaper,
-        \Magento\Catalog\Model\Layer\Filter\DataProvider\CategoryFactory $categoryFactory,
-        \Magento\Framework\Registry $coreRegistry,
-        CategoryRepositoryInterface $categoryRepository,
+        CategoryFactory $categoryDataProviderFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         array $data = []
     ) {
-        $this->_scopeConfig = $scopeConfig;
         parent::__construct(
             $filterItemFactory,
             $storeManager,
             $layer,
             $itemDataBuilder,
             $escaper,
-            $categoryFactory,
+            $categoryDataProviderFactory,
             $data
         );
     }

From b2e874147a9cc2a8b84761dcc481b162097919e6 Mon Sep 17 00:00:00 2001
From: Arkadii Chyzhov <achyzhov@ebay.com>
Date: Fri, 12 Dec 2014 17:06:32 +0200
Subject: [PATCH 348/474] MAGETWO-31708: Merge Core sql scripts and rename file
 with suffix 2.0.0

- Changes for fixing integrity test
---
 .../Core/data/core_setup/data-install-2.0.0.php       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
index 9b20adfeecff3..65b0253d9d851 100644
--- a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
@@ -49,6 +49,7 @@
     $installer->getTable('core_theme'),
     array('area' => 'frontend'), array('area = ?' => '')
 );
+$installer->getEventManager()->dispatch('theme_registration_from_filesystem');
 
 /**
  * Update theme's data
@@ -68,12 +69,18 @@
     $theme->setType($themeType)->save();
 }
 
+$fileCollection = $this->createThemeFactory();
+$fileCollection->addDefaultPattern('*');
+$fileCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
+
+$themeDbCollection = $this->createThemeResourceFactory();
+$themeDbCollection->setItemObjectClass('Magento\Core\Model\Theme\Data');
+
 /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
 foreach ($fileCollection as $theme) {
-    $dbTheme = $resourceCollection->getThemeByFullPath($theme->getFullPath());
+    $dbTheme = $themeDbCollection->getThemeByFullPath($theme->getFullPath());
     $dbTheme->setCode($theme->getCode());
     $dbTheme->save();
 }
 
 $installer->endSetup();
-$installer->getEventManager()->dispatch('theme_registration_from_filesystem');

From 7812da1bc60b020074a63181af1bd5ad8a9217e8 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 17:07:19 +0200
Subject: [PATCH 349/474] MAGETWO-31049: M2 GitHub Update (version
 0.1.0-alpha108)

---
 .../integration/testsuite/Magento/AdminGws/Model/BlocksTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/AdminGws/Model/BlocksTest.php b/dev/tests/integration/testsuite/Magento/AdminGws/Model/BlocksTest.php
index c791799b2ba7b..93edda1aae439 100644
--- a/dev/tests/integration/testsuite/Magento/AdminGws/Model/BlocksTest.php
+++ b/dev/tests/integration/testsuite/Magento/AdminGws/Model/BlocksTest.php
@@ -50,7 +50,7 @@ public function testValidateCatalogPermissionsStoreGroups()
         $this->dispatch('backend/catalog/category/edit/id/3');
         $this->assertRegExp(
             '/title\="New Permission"\s+type\="button"\s+' .
-            'class="action-\w*\s+scalable\s+delete\s+disabled\s+disabled"/',
+            'class="action-\w*\s+scalable\s+delete(\s+disabled){2,}"/',
             $this->getResponse()->getBody()
         );
     }

From 5c80659dffa7e01ac8233c998b91f37af63881c3 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 12 Dec 2014 17:07:53 +0200
Subject: [PATCH 350/474] MAGETWO-31623: Performance degradation investigation

- type casting and type compare is used for OM arguments resolving
---
 app/autoload.php                              |  7 +-
 .../Framework/Autoload/IncludePath.php        | 76 -------------------
 lib/internal/Magento/Framework/Object.php     | 16 ++--
 .../ObjectManager/Config/Compiled.php         |  2 +-
 .../ObjectManager/Factory/AbstractFactory.php |  6 +-
 .../ObjectManager/Factory/Compiled.php        |  6 +-
 .../Factory/Dynamic/Production.php            |  2 +-
 7 files changed, 17 insertions(+), 98 deletions(-)
 delete mode 100644 lib/internal/Magento/Framework/Autoload/IncludePath.php

diff --git a/app/autoload.php b/app/autoload.php
index b7e2620161d43..b2cac68f237a6 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -20,12 +20,7 @@
 if (file_exists($vendorAutoload)) {
     $composerAutoloader = include $vendorAutoload;
 }
-/**
-require_once BP . '/lib/internal/Magento/Framework/Autoload/IncludePath.php';
-$includePath = new \Magento\Framework\Autoload\IncludePath();
-$includePath->addIncludePath([BP . '/app/code', BP . '/lib/internal', BP . '/var/generation']);
-spl_autoload_register([$includePath, 'load'], true, true);
-*/
+
 AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
 
 // Sets default autoload mappings, may be overridden in Bootstrap::create
diff --git a/lib/internal/Magento/Framework/Autoload/IncludePath.php b/lib/internal/Magento/Framework/Autoload/IncludePath.php
deleted file mode 100644
index e2acfb3e6b610..0000000000000
--- a/lib/internal/Magento/Framework/Autoload/IncludePath.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * An autoloader that uses include path. Compliant with PSR-0 standard
- *
- * {license_notice}
- *
- * @copyright  {copyright}
- * @license    {license_link}
- */
-namespace Magento\Framework\Autoload;
-
-class IncludePath
-{
-    /**
-     * Namespaces separator
-     */
-    const NS_SEPARATOR = '\\';
-
-    /**
-     * Find a file in include path
-     *
-     * @param string $class
-     * @return string|bool
-     */
-    public function getFile($class)
-    {
-        $relativePath = $this->getFilePath($class);
-        return stream_resolve_include_path($relativePath);
-    }
-
-    /**
-     * Get relative file path for specified class
-     *
-     * @static
-     * @param string $class
-     * @return string
-     */
-    public function getFilePath($class)
-    {
-        return ltrim(str_replace(array('_',self::NS_SEPARATOR), '/', $class), '/') . '.php';
-    }
-
-    /**
-     * Add specified path(s) to the current include_path
-     *
-     * @param string|array $path
-     * @param bool $prepend Whether to prepend paths or to append them
-     * @return void
-     */
-    public function addIncludePath($path, $prepend = true)
-    {
-        $includePathExtra = implode(PATH_SEPARATOR, (array)$path);
-        $includePath = get_include_path();
-        $pathSeparator = $includePath && $includePathExtra ? PATH_SEPARATOR : '';
-        if ($prepend) {
-            $includePath = $includePathExtra . $pathSeparator . $includePath;
-        } else {
-            $includePath = $includePath . $pathSeparator . $includePathExtra;
-        }
-        set_include_path($includePath);
-    }
-
-    /**
-     * Resolve a class file and include it
-     *
-     * @param string $class
-     * @return void
-     */
-    public function load($class)
-    {
-        $file = $this->getFile($class);
-        if ($file) {
-            include $file;
-        }
-    }
-}
diff --git a/lib/internal/Magento/Framework/Object.php b/lib/internal/Magento/Framework/Object.php
index 39d9e1c1f27e2..5f9ba9b6647ad 100644
--- a/lib/internal/Magento/Framework/Object.php
+++ b/lib/internal/Magento/Framework/Object.php
@@ -170,7 +170,7 @@ public function addData(array $arr)
      */
     public function setData($key, $value = null)
     {
-        if (is_array($key)) {
+        if ($key === (array)$key) {
             if ($this->_data !== $key) {
                 $this->_hasDataChanges = true;
             }
@@ -192,14 +192,14 @@ public function setData($key, $value = null)
      */
     public function unsetData($key = null)
     {
-        if (is_null($key)) {
+        if ($key === null) {
             $this->setData(array());
         } elseif (is_string($key)) {
-            if (array_key_exists($key, $this->_data)) {
+            if (isset($this->_data[$key]) || array_key_exists($key, $this->_data)) {
                 $this->_hasDataChanges = true;
                 unset($this->_data[$key]);
             }
-        } elseif (is_array($key)) {
+        } elseif ($key === (array)$key) {
             foreach ($key as $element) {
                 $this->unsetData($element);
             }
@@ -236,7 +236,7 @@ public function getData($key = '', $index = null)
         }
 
         if ($index !== null) {
-            if (is_array($data)) {
+            if ($data === (array)$data) {
                 $data = isset($data[$index]) ? $data[$index] : null;
             } elseif (is_string($data)) {
                 $data = explode("\n", $data);
@@ -586,7 +586,7 @@ public function serialize($keys = array(), $valueSeparator = '=', $fieldSeparato
      */
     public function setOrigData($key = null, $data = null)
     {
-        if (is_null($key)) {
+        if ($key === null) {
             $this->_origData = $this->_data;
         } else {
             $this->_origData[$key] = $data;
@@ -602,7 +602,7 @@ public function setOrigData($key = null, $data = null)
      */
     public function getOrigData($key = null)
     {
-        if (is_null($key)) {
+        if ($key === null) {
             return $this->_origData;
         }
         return isset($this->_origData[$key]) ? $this->_origData[$key] : null;
@@ -685,7 +685,7 @@ public function offsetSet($offset, $value)
      */
     public function offsetExists($offset)
     {
-        return array_key_exists($offset, $this->_data);
+        return isset($this->_data[$offset]) || array_key_exists($offset, $this->_data);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
index 03a806c32d9c9..7e4952e0694f6 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
@@ -77,7 +77,7 @@ public function setCache(ConfigCacheInterface $cache)
     public function getArguments($type)
     {
         if (isset($this->arguments[$type])) {
-            if (is_string($this->arguments[$type])) {
+            if ($this->arguments[$type] === (string)$this->arguments[$type]) {
                 $this->arguments[$type] = unserialize($this->arguments[$type]);
             }
             return $this->arguments[$type];
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index c661d433e981d..aa315788a82de 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -167,7 +167,7 @@ protected function createObject($type, $args)
     protected function resolveArgument(&$argument, $paramType, $paramDefault, $paramName, $requestedType)
     {
         if ($paramType && $argument !== $paramDefault && !is_object($argument)) {
-            if (!isset($argument['instance']) || !is_array($argument)) {
+            if (!isset($argument['instance']) || $argument !== (array)$argument) {
                 throw new \UnexpectedValueException(
                     'Invalid parameter configuration provided for $' . $paramName . ' argument of ' . $requestedType
                 );
@@ -178,7 +178,7 @@ protected function resolveArgument(&$argument, $paramType, $paramDefault, $param
             $argument = $isShared
                 ? $this->objectManager->get($argument['instance'])
                 : $this->objectManager->create($argument['instance']);
-        } else if (is_array($argument)) {
+        } else if ($argument === (array)$argument) {
             if (isset($argument['argument'])) {
                 $argument = isset($this->globalArguments[$argument['argument']])
                     ? $this->globalArguments[$argument['argument']]
@@ -199,7 +199,7 @@ protected function resolveArgument(&$argument, $paramType, $paramDefault, $param
     protected function parseArray(&$array)
     {
         foreach ($array as $key => $item) {
-            if (is_array($item)) {
+            if ($item === (array)$item) {
                 if (isset($item['instance'])) {
                     $isShared = (isset($item['shared']))
                         ? $item['shared']
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
index a01014d9cfd2d..ed95c09738902 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
@@ -32,10 +32,10 @@ public function create($requestedType, array $arguments = array())
             if (isset($arguments[$key])) {
                 $argument = $arguments[$key];
             } else {
-                if (is_array($argument)) {
-                    if (array_key_exists('__val__', $argument)) {
+                if ($argument === (array)$argument) {
+                    if (isset($argument['__val__']) || array_key_exists('__val__', $argument)) {
                         $argument = $argument['__val__'];
-                        if (is_array($argument)) {
+                        if ($argument === (array)$argument) {
                             $this->parseArray($argument);
                         }
                     } elseif (isset($argument['__non_shared__'])) {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Production.php b/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Production.php
index e89dc89b88604..9cbe4bbfeec57 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Production.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/Dynamic/Production.php
@@ -30,7 +30,7 @@ protected function _resolveArguments($requestedType, array $parameters, array $a
         foreach ($parameters as $parameter) {
             list($paramName, $paramType, $paramRequired, $paramDefault) = $parameter;
             $argument = null;
-            if (!empty($arguments) && array_key_exists($paramName, $arguments)) {
+            if (!empty($arguments) && (isset($arguments[$paramName]) || array_key_exists($paramName, $arguments))) {
                 $argument = $arguments[$paramName];
             } else if ($paramRequired) {
                 $argument = ['instance' => $paramType];

From 144d4dc1e49cfb47b9ae9208e0913a6711ae4807 Mon Sep 17 00:00:00 2001
From: Olexii Korshenko <okorshenko@ebay.com>
Date: Fri, 12 Dec 2014 17:11:09 +0200
Subject: [PATCH 351/474] MAGETWO-31738: Bugs for contribution. December kanban
 week 2

- fixed static tests
---
 .../Sales/Model/Resource/OrderTest.php        |  6 +-
 .../Checkout/Address/ShippingSavedTest.php    |  9 ++-
 .../Model/Calculation/RateRepositoryTest.php  | 78 +++++++++----------
 3 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
index 15172f7324cd4..f9da905c795cc 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
@@ -50,7 +50,7 @@ protected function tearDown()
      */
     public function testSaveOrder()
     {
-        $addressData = array(
+        $addressData = [
             'region' => 'CA',
             'postcode' => '11111',
             'lastname' => 'lastname',
@@ -60,9 +60,9 @@ public function testSaveOrder()
             'email' => 'admin@example.com',
             'telephone' => '11111111',
             'country_id' => 'US'
-        );
+        ];
 
-        $billingAddress = $this->objectManager->create('Magento\Sales\Model\Order\Address', array('data' => $addressData));
+        $billingAddress = $this->objectManager->create('Magento\Sales\Model\Order\Address', ['data' => $addressData]);
         $billingAddress->setAddressType('billing');
 
         $shippingAddress = clone $billingAddress;
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php
index 3db9b6ee8fe20..28136ff1454f6 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Controller/Checkout/Address/ShippingSavedTest.php
@@ -92,7 +92,7 @@ public function testExecuteResetsCheckoutIfCustomerHasAddedNewShippingAddressAnd
 
         $this->mockCustomerAddressRepository(
             $customerId,
-            array($this->getMock('Magento\Customer\Api\Data\AddressInterface'))
+            [$this->getMock('Magento\Customer\Api\Data\AddressInterface')]
         );
 
         // check that checkout is reset
@@ -109,10 +109,10 @@ public function testExecuteDoesNotResetCheckoutIfCustomerHasMoreThanOneAddress()
 
         $this->mockCustomerAddressRepository(
             $customerId,
-            array(
+            [
                 $this->getMock('Magento\Customer\Api\Data\AddressInterface'),
                 $this->getMock('Magento\Customer\Api\Data\AddressInterface'),
-            )
+            ]
         );
 
         // check that checkout is not reset
@@ -126,7 +126,8 @@ public function testExecuteDoesNotResetCheckoutIfCustomerHasMoreThanOneAddress()
      * @param int $customerId
      * @param array $addresses list of customer addresses
      */
-    private function mockCustomerAddressRepository($customerId, array $addresses) {
+    private function mockCustomerAddressRepository($customerId, array $addresses)
+    {
         $filterMock = $this->getMock('Magento\Framework\Api\Filter', [], [], '', false);
         $this->filterBuilderMock->expects($this->once())->method('setField')->with('parent_id')->willReturnSelf();
         $this->filterBuilderMock->expects($this->once())->method('setValue')->with($customerId)->willReturnSelf();
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
index a370fe9c4cd1d..387a864c25de2 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Calculation/RateRepositoryTest.php
@@ -287,34 +287,33 @@ private function getTaxRateMock(array $taxRateData)
     public function testSaveThrowsExceptionIfCannotSaveTitles($expectedException, $exceptionType, $exceptionMessage)
     {
         $countryCode = 'US';
-        $countryMock = $this->getMock('Magento\Directory\Model\Country', array(), array(), '', false);
+        $countryMock = $this->getMock('Magento\Directory\Model\Country', [], [], '', false);
         $countryMock->expects($this->any())->method('getId')->will($this->returnValue(1));
         $countryMock->expects($this->any())->method('loadByCode')->with($countryCode)->will($this->returnSelf());
         $this->countryFactoryMock->expects($this->once())->method('create')->will($this->returnValue($countryMock));
 
         $regionId = 2;
-        $regionMock = $this->getMock('Magento\Directory\Model\Region', array(), array(), '', false);
+        $regionMock = $this->getMock('Magento\Directory\Model\Region', [], [], '', false);
         $regionMock->expects($this->any())->method('getId')->will($this->returnValue($regionId));
         $regionMock->expects($this->any())->method('load')->with($regionId)->will($this->returnSelf());
         $this->regionFactoryMock->expects($this->once())->method('create')->will($this->returnValue($regionMock));
 
-        $rateTitles = array(
-            'Label 1',
-            'Label 2',
+        $rateTitles = ['Label 1', 'Label 2'];
+        $rateMock = $this->getTaxRateMock(
+            [
+                'id' => null,
+                'tax_country_id' => $countryCode,
+                'tax_region_id' => $regionId,
+                'region_name' => null,
+                'tax_postcode' => null,
+                'zip_is_range' => true,
+                'zip_from' => 90000,
+                'zip_to' => 90005,
+                'rate' => 7.5,
+                'code' => 'Tax Rate Code',
+                'titles' => $rateTitles,
+            ]
         );
-        $rateMock = $this->getTaxRateMock(array(
-            'id' => null,
-            'tax_country_id' => $countryCode,
-            'tax_region_id' => $regionId,
-            'region_name' => null,
-            'tax_postcode' => null,
-            'zip_is_range' => true,
-            'zip_from' => 90000,
-            'zip_to' => 90005,
-            'rate' => 7.5,
-            'code' => 'Tax Rate Code',
-            'titles' => $rateTitles,
-        ));
         $this->rateConverterMock->expects($this->once())->method('createTitleArrayFromServiceObject')
             ->with($rateMock)->will($this->returnValue($rateTitles));
         $this->rateResourceMock->expects($this->once())->method('save')->with($rateMock);
@@ -363,8 +362,8 @@ public function testGetListWhenFilterGroupExists()
         $filterMock->expects($this->once())->method('getField')->willReturn('region_name');
         $filterMock->expects($this->once())->method('getValue')->willReturn('condition_value');
         $objectManager = new ObjectManager($this);
-        $rateMock = $this->getTaxRateMock(array());
-        $items = array($rateMock);
+        $rateMock = $this->getTaxRateMock([]);
+        $items = [$rateMock];
         $collectionMock = $objectManager->getCollectionMock(
             'Magento\Tax\Model\Resource\Calculation\Rate\Collection',
             $items
@@ -377,7 +376,7 @@ public function testGetListWhenFilterGroupExists()
         $searchCriteriaMock
             ->expects($this->any())
             ->method('getSortOrders')
-            ->will($this->returnValue(array($sortOrderMock)));
+            ->will($this->returnValue([$sortOrderMock]));
         $sortOrderMock->expects($this->once())->method('getField')->willReturn('field_name');
         $sortOrderMock->expects($this->once())->method('getDirection')->willReturn(SearchCriteria::SORT_ASC);
         $collectionMock->expects($this->once())->method('addOrder')->with('main_table.field_name', 'ASC');
@@ -385,7 +384,7 @@ public function testGetListWhenFilterGroupExists()
         $pageSize = 100;
         $searchCriteriaMock->expects($this->any())->method('getCurrentPage')->will($this->returnValue($currentPage));
         $searchCriteriaMock->expects($this->any())->method('getPageSize')->will($this->returnValue($pageSize));
-        $rateMock = $this->getTaxRateMock(array());
+        $rateMock = $this->getTaxRateMock([]);
 
 
         $collectionMock->expects($this->once())->method('joinRegionTable');
@@ -415,27 +414,26 @@ public function testGetListWhenFilterGroupExists()
     public function testValidate()
     {
         $regionId = 2;
-        $rateTitles = array(
-            'Label 1',
-            'Label 2',
-        );
-        $regionMock = $this->getMock('Magento\Directory\Model\Region', array(), array(), '', false);
+        $rateTitles = ['Label 1', 'Label 2'];
+        $regionMock = $this->getMock('Magento\Directory\Model\Region', [], [], '', false);
         $regionMock->expects($this->any())->method('getId')->will($this->returnValue(''));
         $regionMock->expects($this->any())->method('load')->with($regionId)->will($this->returnSelf());
         $this->regionFactoryMock->expects($this->once())->method('create')->will($this->returnValue($regionMock));
-        $rateMock = $this->getTaxRateMock(array(
-            'id' => null,
-            'tax_country_id' => '',
-            'tax_region_id' => $regionId,
-            'region_name' => null,
-            'tax_postcode' => null,
-            'zip_is_range' => true,
-            'zip_from' => -90000,
-            'zip_to' => '',
-            'rate' => '',
-            'code' => '',
-            'titles' => $rateTitles,
-        ));
+        $rateMock = $this->getTaxRateMock(
+            [
+                'id' => null,
+                'tax_country_id' => '',
+                'tax_region_id' => $regionId,
+                'region_name' => null,
+                'tax_postcode' => null,
+                'zip_is_range' => true,
+                'zip_from' => -90000,
+                'zip_to' => '',
+                'rate' => '',
+                'code' => '',
+                'titles' => $rateTitles,
+            ]
+        );
         $this->model->save($rateMock);
     }
 }

From 8bc521d766a368b4a8412fed460b8a33e43aa203 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 12 Dec 2014 17:22:53 +0200
Subject: [PATCH 352/474] MAGETWO-31623: Performance degradation investigation

- removed proxy method usage in Magento\Framework\Object
---
 lib/internal/Magento/Framework/Object.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Object.php b/lib/internal/Magento/Framework/Object.php
index 5f9ba9b6647ad..76a7e850f808c 100644
--- a/lib/internal/Magento/Framework/Object.php
+++ b/lib/internal/Magento/Framework/Object.php
@@ -232,7 +232,7 @@ public function getData($key = '', $index = null)
         if (strpos($key, '/')) {
             $data = $this->getDataByPath($key);
         } else {
-            $data = $this->getDataByKey($key);
+            $data = $this->_getData($key);
         }
 
         if ($index !== null) {

From 0186aad785540407ba3cb50315e5ea4259a319c9 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 12 Dec 2014 17:32:31 +0200
Subject: [PATCH 353/474] MAGETWO-31623: Performance degradation investigation

- reverted Compiled config reverted
---
 .../Magento/Framework/ObjectManager/Config/Compiled.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
index 7e4952e0694f6..03a806c32d9c9 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
@@ -77,7 +77,7 @@ public function setCache(ConfigCacheInterface $cache)
     public function getArguments($type)
     {
         if (isset($this->arguments[$type])) {
-            if ($this->arguments[$type] === (string)$this->arguments[$type]) {
+            if (is_string($this->arguments[$type])) {
                 $this->arguments[$type] = unserialize($this->arguments[$type]);
             }
             return $this->arguments[$type];

From cfa561f7ab018d6b450db52f5af95569813ef496 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 17:36:30 +0200
Subject: [PATCH 354/474] MAGETWO-31049: M2 GitHub Update (version
 0.1.0-alpha108)

- fixed ChangeLog
---
 .../publication/extra_files/ce/CHANGELOG.md   | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/dev/build/publication/extra_files/ce/CHANGELOG.md b/dev/build/publication/extra_files/ce/CHANGELOG.md
index 1f1889649a33e..f3c14bcb9e4d3 100644
--- a/dev/build/publication/extra_files/ce/CHANGELOG.md
+++ b/dev/build/publication/extra_files/ce/CHANGELOG.md
@@ -2,35 +2,31 @@
 =============
 * Service Contracts:
     * Implemented Bundle Product API (MAGETWO-30985)
-    * Removed Address Converter model. Use Address Mapper instead. (MAGETWO-31098)
+    * Replaced Address Converted model with Address Mapper (MAGETWO-31098)
     * Refactored Customer web service routes and API functional tests to use latest service layer (MAGETWO-29282 and MAGETWO-30842)
-    * Fixed issue where path parameter routes were matched incorrectly in REST web services (MAGETWO-29964)
     * Implemented Configurable Product Module API (MAGETWO-29420)
     * Removed obsolete namespace Magento\Catalog\Service (MAGETWO-31488)
-* Price calculation logic improvement:
-    * implemented complex price calculation not to be performed on Frontend (MAGETWO-21532)
-* JS library updatings:
-    * updated jQuery 1.11 is used all over the Masgento now (MAGETWO-30011)
+* Price calculation logic:
+    * Removed complex JS price calculation on the frontend (MAGETWO-21532)
 * Fixed bugs:
-    * $0.00 price not be be displayed for variations of Configurable Product (MAGETWO-30011)
-    * Fatal error when user with read-only permissions try to open existing cart price rule (MAGETWO-31325)
-    * Text message 'An order with subscription items was registered.' is displayed on order if the order has been placed with online payment method (MAGETWO-31236)
-    * 'Warning: Division by zero' is displayed while opening invoice for order which has been placed with online payment method (MAGETWO-31217)
-    * Simple product created using API service leads to Exception page on frontend (MAGETWO-31323)
-    * Impossible perform advanced search for price from 0 to 0 (MAGETWO-30816)
-    * Search Terms Report page is broken (MAGETWO-30819)
-    * Search Terms page is broken (MAGETWO-30820)
-    * Notice in advanced search when try to search using custom multiselect attribute (MAGETWO-30821)
-    * Search does not work if word-request contain hyphen (MAGETWO-30828)
-    * Search for Bundle Options Title return empty result (MAGETWO-30872)
-    * Maximum Query Length does not applied to quick search (MAGETWO-30877)
-    * Suggested Search does not work (MAGETWO-30983)
-    * Add wildcard prefix for all search word in search request for Match query (MAGETWO-30986)
-    * Wrong dependency of MySQL search adapter on CatalogSearch (MAGETWO-31040)
+    * Fixed an issue where the path parameter routes were incorrectly matched in the REST web services (MAGETWO-29964)
+    * Fixed an issue where $0.00 was shown as a configurable product price if variation did not add anything to product price
+    * Fixed an issue where the fatal error occurred when a user with read-only permissions for cart price rules attempted to open an existing cart price rule
+    * Fixed an issue where the 'An order with subscription items was registered.' message was displayed in an order if it has been placed using an online payment method
+    * Fixed an issue where the 'Warning: Division by zero' message was displayed when an invoice was opened for an order placed using an online payment method
+    * Fixed an issue where creating simple product through using API service led to an exception on the frontend
+    * Fixed an issue where it was impossible to perform advanced search for price range of 0 to 0
+    * Fixed an issue with the broken Search Terms Report page
+    * Fixed an issue with the broken Search Terms page
+    * Fixed an issue with a notice appearing in the Advanced Search when searching by a custom multiselect attribute
+    * Fixed an issue where Search did not work if word-request contained a hyphen
+    * Fixed an issue where searching by a title of bundle option returned empty result
+    * Fixed an issue where Maximum Query Length was not applied to Quick Search
+    * Fixed an issue where searching by product name did not return suggested search terms
+    * Fixed an issue with an incorrect dependency of the MySQL search adapter on CatalogSearch
     * Wrong dependency of Search library on MySQL adapter (MAGETWO-31041)
-    * Advanced Search for multiselect product attribute always return empty result (MAGETWO-31163)
-    * After Delete search terms via mass action admin redirected to 404 (MAGETWO-31182)
-    * Rename frontend properties for product attribute (MAGETWO-31203)
+    * Fixed an issue where Advanced Search always returned empty result for multiselect product attributes
+    * Fixed an issue where an admin user was redirected to the 404 page after deleting search terms through using mass action
     * New product page freezes when trying to save configurable product if another dropdown attribute already exists in default template (MAGETWO-30470)
     * Cannot place order for downloadable product with link (MAGETWO-31130)
     * Parent category displayed in layered navigation on Search results page (MAGETWO-27178)
@@ -144,6 +140,9 @@
     * Git hook for coding style automatic correction before actual push (MAGETWO-31426)
     * Ability to enforce no error log messages during tests execution (MAGETWO-31423)
     * Remove Api Interfaces from Cms module (MAGETWO-31483)
+    * Updated jQuery used to version 1.11
+    * Added wildcard prefix for all search words in search requests for Match query
+    * Renamed frontend properties for some of the product attributes
 * Framework improvements:
     * Added copy of dependencies for Magento components to the root composer.json in order to make Composer validate them (MAGETWO-29704)
 * Setup Tool improvements (MAGETWO-29035 & MAGETWO-29704):

From 9123d4c41882ff62b1e5bf8d7c6bcaf87dba4819 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Thu, 11 Dec 2014 17:50:21 +0200
Subject: [PATCH 355/474] MAGETWO-31398: Create pull request for bug fixing
 round. Part 3

---
 .../testsuite/Magento/Reports/Model/Event/ObserverTest.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
index 86c194f7e3672..7a3e9abaec7ed 100644
--- a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
@@ -49,6 +49,7 @@ public function setUp()
             ->disableOriginalConstructor()->getMock();
 
         $productIndexFactoryMock = $this->getMockBuilder('Magento\Reports\Model\Product\Index\ViewedFactory')
+            ->setMethods(['create'])
             ->disableOriginalConstructor()->getMock();
         $this->productIndexMock = $this->getMockBuilder('Magento\Reports\Model\Product\Index\Viewed')
             ->disableOriginalConstructor()->getMock();
@@ -66,9 +67,8 @@ public function setUp()
             ->method('create')
             ->willReturn($this->reportEventMock);
 
-        /** @var \Magento\Framework\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject $storeManager */
-        $storeManager = $this->getMockBuilder('Magento\Framework\StoreManagerInterface')
-            ->getMockForAbstractClass();
+        /** @var \Magento\Store\Model\StoreManagerInterfac|\PHPUnit_Framework_MockObject_MockObject $storeManager */
+        $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
 
         $this->storeMock = $this->getMockBuilder('\Magento\Store\Model\Store')
             ->disableOriginalConstructor()->getMock();

From 025700e0fc8f7bf7030535701c4901aab32510bc Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Thu, 11 Dec 2014 20:35:57 -0600
Subject: [PATCH 356/474] MAGETWO-31728: fixed error while trying to save
 timezones

---
 .../testsuite/Magento/Framework/Locale/ListsTest.php     | 5 +++++
 lib/internal/Magento/Framework/Locale/Lists.php          | 9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/Locale/ListsTest.php b/dev/tests/unit/testsuite/Magento/Framework/Locale/ListsTest.php
index 5b186550fea77..e8d9c772e049d 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Locale/ListsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Locale/ListsTest.php
@@ -218,6 +218,11 @@ public function testGetOptionTimezones()
         foreach ($expectedResults as $value) {
             $this->assertContains($value, $timeZones);
         }
+
+        $timeZoneList = \DateTimeZone::listIdentifiers(\DateTimeZone::ALL_WITH_BC);
+        foreach ($timeZones as $timeZone) {
+            $this->assertContains($timeZone['value'], $timeZoneList);
+        }
     }
 
     public function testGetOptionLocales()
diff --git a/lib/internal/Magento/Framework/Locale/Lists.php b/lib/internal/Magento/Framework/Locale/Lists.php
index 9f84d707126f3..006f998a1f3b4 100644
--- a/lib/internal/Magento/Framework/Locale/Lists.php
+++ b/lib/internal/Magento/Framework/Locale/Lists.php
@@ -126,11 +126,10 @@ protected function _getOptionLocales($translatedName = false)
     public function getOptionTimezones()
     {
         $options = [];
-        $zones = $this->getTranslationList('windowstotimezone');
-        ksort($zones);
-        foreach ($zones as $code => $name) {
-            $name = trim($name);
-            $options[] = ['label' => empty($name) ? $code : $name . ' (' . $code . ')', 'value' => $code];
+        $zones = $this->getTranslationList('timezonetowindows');
+        foreach ($zones as $windowsTimezones => $isoTimezones) {
+            $windowsTimezones = trim($windowsTimezones);
+            $options[] = ['label' => empty($windowsTimezones) ? $isoTimezones : $windowsTimezones . ' (' . $isoTimezones . ')', 'value' => $isoTimezones];
         }
         return $this->_sortOptionArray($options);
     }

From 2f670659c275649b40aba0a5c694395ccb988e18 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Thu, 11 Dec 2014 18:52:46 +0200
Subject: [PATCH 357/474] MAGETWO-31398: Create pull request for bug fixing
 round. Part 3

---
 .../Magento/AdminGws/Model/Containers.php     |  4 ++--
 .../Magento/AdminGws/Model/Controllers.php    |  4 ++--
 .../Magento/Store/Model/StoreTest.php         |  2 +-
 .../AdminGws/Model/ControllersTest.php        | 24 +++++++++----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/AdminGws/Model/Containers.php b/app/code/Magento/AdminGws/Model/Containers.php
index 467a96d5a9002..1f432dbb664fe 100644
--- a/app/code/Magento/AdminGws/Model/Containers.php
+++ b/app/code/Magento/AdminGws/Model/Containers.php
@@ -391,8 +391,8 @@ public function removeCmsHierarchyFormButtons(ContainerInterface $container)
         }
 
         if (!$this->_role->getIsAll()) {
-            if (!$this->_role->hasExclusiveAccess(array($websiteId)) || is_null($websiteId)) {
-                if (!$this->_role->hasExclusiveStoreAccess(array($storeId)) || is_null($storeId)) {
+            if (!$this->_role->hasExclusiveAccess([$websiteId]) || is_null($websiteId)) {
+                if (!$this->_role->hasExclusiveStoreAccess([$storeId]) || is_null($storeId)) {
                     $container->removeButton('save');
                 }
             }
diff --git a/app/code/Magento/AdminGws/Model/Controllers.php b/app/code/Magento/AdminGws/Model/Controllers.php
index b8886a54b27ec..97ab46c6a502a 100644
--- a/app/code/Magento/AdminGws/Model/Controllers.php
+++ b/app/code/Magento/AdminGws/Model/Controllers.php
@@ -1131,8 +1131,8 @@ public function validateCmsHierarchyAction()
             }
         }
         if (!$this->_role->getIsAll()) {
-            if (!$this->_role->hasExclusiveAccess(array($websiteId)) || is_null($websiteId)) {
-                if (!$this->_role->hasExclusiveStoreAccess(array($storeId)) || is_null($storeId)) {
+            if (!$this->_role->hasExclusiveAccess([$websiteId]) || is_null($websiteId)) {
+                if (!$this->_role->hasExclusiveStoreAccess([$storeId]) || is_null($storeId)) {
                     $this->_forward();
                     return false;
                 }
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
index 3b52bb3c9e9e9..0ea734328df31 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -68,7 +68,7 @@ protected function tearDown()
 
     public function testSetCookie()
     {
-        $model = $this->getMock('Magento\Store\Model\Store', array('getStorePath'), $this->modelParams);
+        $model = $this->getMock('Magento\Store\Model\Store', ['getStorePath'], $this->modelParams);
         $model->expects($this->once())
             ->method('getStorePath')
             ->will($this->returnValue('/'));
diff --git a/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php b/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php
index ab41981297392..24e2c6cb019b1 100644
--- a/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php
+++ b/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php
@@ -367,7 +367,7 @@ public function testValidateCmsHierarchyAction(array $post, $isAll, $result)
         $websiteId = (isset($post['website']))? $post['website'] : 1;
         $websiteMock = $this->getMockBuilder('\Magento\Store\Model\Website')
             ->disableOriginalConstructor()
-            ->setMethods(array('getId'))
+            ->setMethods(['getId'])
             ->getMock();
         $websiteMock->expects($this->any())
             ->method('getId')
@@ -376,7 +376,7 @@ public function testValidateCmsHierarchyAction(array $post, $isAll, $result)
         $storeId = (isset($post['store']))? $post['store'] : 1;
         $storeMock = $this->getMockBuilder('\Magento\Store\Model\Store')
             ->disableOriginalConstructor()
-            ->setMethods(array('getId', 'getWebsite'))
+            ->setMethods(['getId', 'getWebsite'])
             ->getMock();
         $storeMock->expects($this->any())
             ->method('getId')
@@ -389,8 +389,8 @@ public function testValidateCmsHierarchyAction(array $post, $isAll, $result)
             ->method('getStore')
             ->will($this->returnValue($storeMock));
 
-        $hasExclusiveAccess = in_array($websiteMock->getId(), array(1));
-        $hasExclusiveStoreAccess = in_array($storeMock->getId(), array(2));
+        $hasExclusiveAccess = in_array($websiteMock->getId(), [1]);
+        $hasExclusiveStoreAccess = in_array($storeMock->getId(), [2]);
 
         $this->_roleMock->expects($this->any())
             ->method('hasExclusiveAccess')
@@ -404,7 +404,7 @@ public function testValidateCmsHierarchyAction(array $post, $isAll, $result)
             ->method('getIsAll')
             ->will($this->returnValue($isAll));
 
-        $this->assertEquals($result,$this->_model->validateCmsHierarchyAction());
+        $this->assertEquals($result, $this->_model->validateCmsHierarchyAction());
     }
 
     /**
@@ -414,13 +414,13 @@ public function testValidateCmsHierarchyAction(array $post, $isAll, $result)
      */
     public function validateCmsHierarchyActionDataProvider()
     {
-        return array(
-            array(array(), true, true),
-            array(array(), false, false),
-            array(array('website'=>1, 'store'=>1), false, false),
-            array(array('store'=>2), false, true),
-            array(array('store'=>1), false, false),
-        );
+        return [
+            [[], true, true],
+            [[], false, false],
+            [['website' => 1, 'store' => 1], false, false],
+            [['store' => 2], false, true],
+            [['store' => 1], false, false],
+        ];
     }
 
     /*

From 29ff9b4f7f357fc139a72b7aeda04d1377f57b0c Mon Sep 17 00:00:00 2001
From: Ievgen Shakhsuvarov <ishakhsuvarov@ebay.com>
Date: Fri, 12 Dec 2014 18:04:26 +0200
Subject: [PATCH 358/474] MAGETWO-31714: Impossible to create new Theme

---
 app/code/Magento/DesignEditor/etc/adminhtml/menu.xml  | 11 -----------
 .../Theme/Block/Adminhtml/System/Design/Theme.php     |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 app/code/Magento/DesignEditor/etc/adminhtml/menu.xml

diff --git a/app/code/Magento/DesignEditor/etc/adminhtml/menu.xml b/app/code/Magento/DesignEditor/etc/adminhtml/menu.xml
deleted file mode 100644
index 450ccb62e23d6..0000000000000
--- a/app/code/Magento/DesignEditor/etc/adminhtml/menu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../Backend/etc/menu.xsd">
-    <menu>
-        <add id="Magento_DesignEditor::system_design_editor" title="Store Designer" module="Magento_DesignEditor" sortOrder="20" parent="Magento_Backend::system_design" action="adminhtml/system_design_editor" resource="Magento_DesignEditor::editor"/>
-    </menu>
-</config>
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
index 239dbf69718f7..469630e6a7b61 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
@@ -23,7 +23,7 @@ public function _construct()
             $this->getLayout()->getBlock('page-title')->setPageTitle('Themes');
         }
 
-        $this->buttonList->update('add', 'label', __('Add New Theme'));
+        $this->buttonList->remove('add');
     }
 
     /**

From 9bca4aeb434514a836d74c45713b64e6bb062fbe Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Thu, 11 Dec 2014 18:55:44 +0200
Subject: [PATCH 359/474] MAGETWO-31398: Create pull request for bug fixing
 round. Part 3

---
 app/code/Magento/AdminGws/Model/Containers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/AdminGws/Model/Containers.php b/app/code/Magento/AdminGws/Model/Containers.php
index 1f432dbb664fe..f11a1d7fbf250 100644
--- a/app/code/Magento/AdminGws/Model/Containers.php
+++ b/app/code/Magento/AdminGws/Model/Containers.php
@@ -36,7 +36,7 @@ class Containers implements CallbackProcessorInterface
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
-    protected  $storeManager;
+    protected $storeManager;
 
     /**
      * @param Role $role

From 99c3d719f9126b646cd416c0f17008379586cba1 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Thu, 11 Dec 2014 17:36:13 +0200
Subject: [PATCH 360/474] MAGETWO-31398: Create pull request for bug fixing
 round. Part 3

---
 .../testsuite/Magento/Reports/Model/Event/ObserverTest.php   | 5 +----
 .../Rss/App/Action/Plugin/BackendAuthenticationTest.php      | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
index 7a3e9abaec7ed..941fb7843d459 100644
--- a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Reports\Model\Event;
 
diff --git a/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php b/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
index 6169924937562..93d29e8173414 100644
--- a/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rss/App/Action/Plugin/BackendAuthenticationTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Rss\App\Action\Plugin;
 

From 7645f775c26259b9a40455a3dda3cdead8c2d513 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Thu, 11 Dec 2014 16:17:19 +0200
Subject: [PATCH 361/474] MAGETWO-28245: Store Views are switched by themselves

---
 .../Magento/Store/Model/StoreTest.php         | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
index 976d7aaeaccf6..27915e5bd7a1e 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
@@ -50,7 +50,7 @@ public function setUp()
         $this->cookieManagerMock = $this->getMock('Magento\Framework\Stdlib\CookieManagerInterface');
         $this->cookieMetadataFactoryMock = $this->getMock(
             'Magento\Framework\Stdlib\Cookie\CookieMetadataFactory',
-            [],
+            ['createPublicCookieMetadata'],
             [],
             '',
             false
@@ -448,13 +448,9 @@ public function testGetAllowedCurrencies()
     public function testSetCookie()
     {
         $storeCode = 'store code';
-        $cookieMetadata = $this->getMock(
-            'Magento\Framework\Stdlib\Cookie\PublicCookieMetadata',
-            [],
-            [],
-            '',
-            false
-        );
+        $cookieMetadata = $this->getMockBuilder('Magento\Framework\Stdlib\Cookie\PublicCookieMetadata')
+            ->disableOriginalConstructor()
+            ->getMock();
         $cookieMetadata->expects($this->once())
             ->method('setHttpOnly')
             ->with(true)
@@ -462,6 +458,9 @@ public function testSetCookie()
         $cookieMetadata->expects($this->once())
             ->method('setDurationOneYear')
             ->willReturnSelf();
+        $cookieMetadata->expects($this->once())
+            ->method('setPath')
+            ->willReturnSelf();
         $this->cookieMetadataFactoryMock->expects($this->once())
             ->method('createPublicCookieMetadata')
             ->will($this->returnValue($cookieMetadata));
@@ -496,9 +495,18 @@ public function testGetStoreCodeFromCookie()
 
     public function testDeleteCookie()
     {
+        $cookieMetadata = $this->getMockBuilder('Magento\Framework\Stdlib\Cookie\PublicCookieMetadata')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->cookieMetadataFactoryMock->expects($this->once())
+            ->method('createPublicCookieMetadata')
+            ->will($this->returnValue($cookieMetadata));
+        $cookieMetadata->expects($this->once())
+            ->method('setPath')
+            ->willReturnSelf();
         $this->cookieManagerMock->expects($this->once())
             ->method('deleteCookie')
-            ->with(Store::COOKIE_NAME);
+            ->with(Store::COOKIE_NAME, $cookieMetadata);
         /** @var \Magento\Store\Model\Store $model */
         $model = $this->objectManagerHelper->getObject(
             'Magento\Store\Model\Store',

From d99810b9410f876615e0eb0919224774f8c660c2 Mon Sep 17 00:00:00 2001
From: Arkadii Chyzhov <achyzhov@ebay.com>
Date: Fri, 12 Dec 2014 18:13:57 +0200
Subject: [PATCH 362/474] MAGETWO-31708: Merge Core sql scripts and rename file
 with suffix 2.0.0

- Changes for fixing test ST-EE-L64
---
 .../testsuite/Magento/Test/Php/_files/whitelist/common.txt       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
index c0e44ce809bc9..1d53a63755720 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
@@ -41,7 +41,6 @@ app/code/Magento/Core/Model/Resource/Theme.php
 app/code/Magento/Core/Model/Theme
 app/code/Magento/Core/Model/Theme.php
 app/code/Magento/Core/Model/Url/SecurityInfo.php
-app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.3-1.6.0.4.php
 app/code/Magento/Cron/Model/Config/Converter
 app/code/Magento/Cron/Model/Config/Reader
 app/code/Magento/Cron/Model/Config/Data.php

From 1e86615bec147078ca87f1eb48904bdbbd20c5b6 Mon Sep 17 00:00:00 2001
From: Alex Bomko <abomko@ebay.com>
Date: Fri, 12 Dec 2014 18:38:57 +0200
Subject: [PATCH 363/474] MAGETWO-31002: [Spike] Investigate methods of
 publishing sample data packages

- fix tests
---
 dev/build/publication/edition/ee.txt                          | 4 ++++
 dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php     | 3 ++-
 .../SampleData/Module/Wishlist/Setup/Wishlist/Helper.php      | 2 +-
 dev/tools/Magento/Tools/SampleData/fixtures/Cms/styles.css    | 3 +++
 .../Magento/Tools/SampleData/fixtures/Contact/styles.css      | 3 +++
 .../Magento/Tools/SampleData/fixtures/GiftCard/styles.css     | 3 +++
 6 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dev/build/publication/edition/ee.txt b/dev/build/publication/edition/ee.txt
index b3c49d1f4286e..e87410538825b 100644
--- a/dev/build/publication/edition/ee.txt
+++ b/dev/build/publication/edition/ee.txt
@@ -82,6 +82,10 @@ dev/tools/Magento/Tools/SampleData/fixtures/Widget/cmsblock_giftcard.csv
 dev/tools/Magento/Tools/SampleData/Module/GiftCard
 dev/tools/Magento/Tools/SampleData/fixtures/TargetRule
 dev/tools/Magento/Tools/SampleData/Module/TargetRule
+dev/tools/Magento/Tools/SampleData/fixtures/GiftRegistry
+dev/tools/Magento/Tools/SampleData/Module/GiftRegistry
+dev/tools/Magento/Tools/SampleData/fixtures/MultipleWishlist
+dev/tools/Magento/Tools/SampleData/Module/MultipleWishlist
 
 dev/tests/integration/testsuite/Magento/Test/Design/Frontend/Enterprise
 
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php b/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php
index 2665f47c3fbd9..6a9f01e751381 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php
@@ -147,7 +147,8 @@ protected function addHeadInclude()
             if (!$fileName) {
                 continue;
             }
-            $styleContent .= file_get_contents($fileName);
+            $style = file_get_contents($fileName);
+            $styleContent .= preg_replace('/^\/\*[\s\S]+\*\//', '', $style);
         }
         if (empty($styleContent)) {
             return;
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Wishlist/Setup/Wishlist/Helper.php b/dev/tools/Magento/Tools/SampleData/Module/Wishlist/Setup/Wishlist/Helper.php
index fec6fd6e460de..37f20b4a95193 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Wishlist/Setup/Wishlist/Helper.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Wishlist/Setup/Wishlist/Helper.php
@@ -5,7 +5,7 @@
 namespace Magento\Tools\SampleData\Module\Wishlist\Setup\Wishlist;
 
 /**
- * Common functionality for installation of sample data for both Wishlist and MultipleWishlist modules
+ * Common functionality for installation of sample data for Wishlists
  */
 class Helper
 {
diff --git a/dev/tools/Magento/Tools/SampleData/fixtures/Cms/styles.css b/dev/tools/Magento/Tools/SampleData/fixtures/Cms/styles.css
index afc79d02c6f27..89929ebc46f40 100644
--- a/dev/tools/Magento/Tools/SampleData/fixtures/Cms/styles.css
+++ b/dev/tools/Magento/Tools/SampleData/fixtures/Cms/styles.css
@@ -1 +1,4 @@
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
 .cms-index-index .page-title{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.widget .block-promo img{max-width:none}.block-promo{box-sizing:border-box;overflow:hidden;position:relative;display:block;width:100%;color:#333 !important}.block-promo:hover{text-decoration:none}.block-promo .content{display:block;box-sizing:border-box;position:absolute;z-index:1;overflow:hidden;padding:25px 35px 35px}.block-promo .title{display:block;font-weight:300;font-size:3.2rem;line-height:1.2;margin-bottom:15px}.block-promo .info{display:block;font-weight:300;font-size:2.2rem;margin-bottom:20px}.block-promo .more{font-size:1.6rem}.block-promo .icon.more{display:inline-block;text-decoration:none}.block-promo .icon.more:after{font-family:'icons-blank-theme';content:'\e608';font-size:12px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:normal;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center;margin:0 0 0 5px}.block-promo .button.more{font-size:1.8rem;background-image:none;background:#1979c3;padding:7px 15px;color:#fff;border:1px solid #1979c3;cursor:pointer;display:inline-block;font-family:'Helvetica Neue',Helvetica,Arial,sans-serif;font-size:1.4rem;font-weight:700;box-sizing:border-box;vertical-align:middle;border-radius:3px;text-decoration:none;padding:10px 15px}.block-promo .button.more:focus,.block-promo .button.more:active{background:#006bb4;border:1px solid #006bb4;color:#fff}.block-promo .button.more:hover{background:#006bb4;border:1px solid #006bb4;color:#fff}.block-promo .button.more.disabled,.block-promo .button.more[disabled],fieldset[disabled] .block-promo .button.more{cursor:default;pointer-events:none;opacity:.5}.block-promo .title+.button{margin-top:10px}.block-promo sup{top:-0.2em}.block-promo-2columns .content{padding:20px 25px}.womens-main .content,.womens-pants .content,.training-main .content,.training-erin .content,.sale-main .content,.sale-women .content,.mens-main .content,.mens-pants .content,.gear-main .content,.gear-equipment .content,.new-main .content,.new-eco .content,.home-main .content,.home-performance .content,.home-eco .content,.collection-eco .content,.collection-performance .content{background-color:rgba(255,255,255,0.9)}.sale-main,.mens-main,.gear-main,.womens-main{max-width:1080px}.sale-women,.sale-mens,.mens-pants,.womens-pants,.gear-fitnes,.gear-equipment,.new-performance,.new-eco{max-width:580px}.training-main,.training-erin,.collection-eco,.collection-performance,.home-main{max-width:1280px}.home-pants .content{top:0;left:0;width:80%}.home-pants .title{display:block;font-weight:600;font-family:Halvetica Neue,Helvetica,Arial,sans-serif;white-space:nowrap;margin-bottom:0}.home-t-shirts{background:#ffdd16}.home-erin{height:373px}.home-erin .content{top:0;right:0;width:60%}.home-performance{height:664px}.home-performance .content{top:25px;right:25px;left:25px}.home-eco{height:274px}.new-performance .icon.more{white-space:nowrap}.block-promo-hp .bg-white,.block-promo-hp .home-erin .content{padding:20px}.womens-erin{background:#f4f4f4}.womens-erin .content{padding:20px 35px}.training-main{height:372px}.training-main .title{margin-bottom:0;line-height:1.4}.training-main .title span{font-weight:600}.training-erin{height:214px}.training-erin .content{padding:15px;text-align:center}.training-erin .info{margin-bottom:0}.training-on-demand,.training-videos{color:#fff !important}.training-on-demand .content,.training-videos .content{position:static;text-align:center}.training-on-demand .icon.calendar,.training-videos .icon.calendar,.training-on-demand .icon.download,.training-videos .icon.download{margin-top:-10px;display:block;text-decoration:none}.training-on-demand .icon.calendar>span,.training-videos .icon.calendar>span,.training-on-demand .icon.download>span,.training-videos .icon.download>span{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.training-on-demand .icon.calendar:before,.training-videos .icon.calendar:before,.training-on-demand .icon.download:before,.training-videos .icon.download:before{font-family:'icons-blank-theme';font-size:32px;line-height:inherit;color:inherit;overflow:hidden;speak:none;font-weight:normal;-webkit-font-smoothing:antialiased;display:inline-block;vertical-align:middle;text-align:center}.training-on-demand .icon.calendar:before,.training-videos .icon.calendar:before{content:'\e612'}.training-on-demand .icon.download:before,.training-videos .icon.download:before{content:'\e626'}.training-on-demand .icon.more,.training-videos .icon.more{position:absolute;left:0;right:0;bottom:25px}.training-on-demand .info,.training-videos .info{font-size:16px}.training-on-demand{background:#00ade2}.training-videos{background:#5a5e62}.sale-women,.sale-mens{height:372px}.sale-mens .content{top:0;right:0;width:60%}.sale-20-off .content,.sale-free-shipping .content,.sale-womens-t-shirts .content{padding:15px 20px}.sale-20-off{background:#f4f4f4}.sale-20-off .title{font-size:4rem;font-weight:700;white-space:nowrap}.sale-20-off img{position:absolute;z-index:0;bottom:0;right:0}.sale-20-off .content{width:75%;position:relative}.sale-free-shipping{background:#71b54e;color:#fff !important}.sale-free-shipping .content{position:static}.sale-free-shipping img{display:block;margin:0 auto 10px;max-width:100% !important}.sale-womens-t-shirts{background:#fedd16}.sale-womens-t-shirts .content{position:static}.sale-womens-t-shirts img{max-width:95% !important}.mens-main .content{width:45%}.womens-main,.home-main,.mens-main,.new-main,.sale-main,.gear-main{height:450px}.womens-t-shirts,.mens-t-shirts{background:#ffdd17}.womens-t-shirts img,.mens-t-shirts img{max-width:100% !important}.womens-t-shirts .content,.mens-t-shirts .content{position:static}.womens-pants,.mens-pants,.gear-fitnes,.gear-equipment,.new-performance,.new-eco{height:372px}.womens-pants .info span,.mens-pants .info span{display:block;font-size:4.4rem;font-family:Halvetica Neue,Helvetica,Arial,sans-serif;line-height:1.2;font-weight:600;white-space:nowrap}.womens-category-pants,.womens-category-tanks,.womens-category-shorts,.mens-category-tees,.mens-category-hoodies,.mens-category-shorts,.gear-category-bags,.gear-category-equipment,.gear-category-watches{background:#f4f4f4;min-height:170px}.womens-category-pants img,.womens-category-tanks img,.womens-category-shorts img,.mens-category-tees img,.mens-category-hoodies img,.mens-category-shorts img,.gear-category-bags img,.gear-category-equipment img,.gear-category-watches img{max-width:100% !important;position:absolute;z-index:0;top:0;right:0;left:60%}.womens-category-pants .content,.womens-category-tanks .content,.womens-category-shorts .content,.mens-category-tees .content,.mens-category-hoodies .content,.mens-category-shorts .content,.gear-category-bags .content,.gear-category-equipment .content,.gear-category-watches .content{padding:20px 0 50px 20px !important;position:static;width:60%;z-index:1}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title,.womens-category-pants .info,.womens-category-tanks .info,.womens-category-shorts .info,.mens-category-tees .info,.mens-category-hoodies .info,.mens-category-shorts .info,.gear-category-bags .info,.gear-category-equipment .info,.gear-category-watches .info{font-size:1.8rem}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title{font-weight:400;margin-bottom:5px}.womens-category-pants .more,.womens-category-tanks .more,.womens-category-shorts .more,.mens-category-tees .more,.mens-category-hoodies .more,.mens-category-shorts .more,.gear-category-bags .more,.gear-category-equipment .more,.gear-category-watches .more{position:absolute;z-index:1;bottom:20px}.gear-fitnes .content,.new-performance .content{right:0;top:0;width:65%}.collection-eco,.collection-performance{height:200px}.collection-eco .content,.collection-performance .content{padding:15px;text-align:center}.collection-eco .info,.collection-performance .info{margin-bottom:0}.collection-erin{background:#f4f4f4}.collection-erin .content{padding:20px 35px}.content-heading{text-align:center;margin:10px 0 25px}.content-heading .title{margin:0 0 5px}.content-heading .info{margin-bottom:0}.categories-menu .title{text-transform:uppercase;margin-bottom:10px;display:block}.categories-menu a:link,.categories-menu a:visited,.categories-menu a:hover,.categories-menu a:active{color:#333}.categories-menu .items{margin-bottom:40px}.categories-menu .items:last-child{margin-bottom:0}.cms-content-important{display:block;background:#f5f5f5}.cms-content-important h2{margin-top:0}.cms-content table{border:none}.cms-content table>thead>tr>th,.cms-content table>tbody>tr>th,.cms-content table>tfoot>tr>th,.cms-content table>thead>tr>td,.cms-content table>tbody>tr>td,.cms-content table>tfoot>tr>td{border:none}.cms-content table>thead>tr>th,.cms-content table>thead>tr>td{border-bottom:1px solid #d1d1d1}.cms-content table>tbody>tr:nth-child(even)>td,.cms-content table>tbody>tr:nth-child(even)>th{background:#f7f7f7}.cms-content table th{font-weight:400}.cms-content table td{font-weight:600}.cms-content .block .block-title{margin-bottom:15px}.cms-content .block .block-title>strong{display:none}.cms-content .block .box-title{display:inline-block;margin:0 0 15px}.cms-content .block .box-title>span{font-size:1.8rem;line-height:1.1;margin-top:1.5rem;margin-bottom:1rem;font-weight:300}.cms-content .block .block-content p:last-child{margin-bottom:0}@media only screen and (max-width:399px){.womens-pants img{width:250%;float:right;margin:-70px -140px 0 0}.mens-main img{margin-left:-180px}.training-main img,.gear-main img,.womens-main img{margin-left:-210px}.home-main img{margin-left:-310px}.sale-main img,.mens-pants img,.home-eco img{margin-left:-150px}.sale-mens img,.gear-fitnes img,.new-performance img{margin-left:-60px}.new-main img,.sale-women img,.training-erin img,.gear-equipment img{margin-left:-120px}.new-eco img{margin-left:-80px}.home-pants,.home-performance{height:580px}.home-pants img,.home-performance img{margin-left:-50px}}@media only screen and (max-width:767px){.home-pants{max-width:417px}.home-erin{max-width:426px}.home-performance{max-width:415px}.home-eco{max-width:858px}.home-pants,.home-performance{height:580px}.womens-main .content,.mens-main .content,.gear-main .content,.new-main .content,.home-main .content,.training-main .content,.sale-main .content{top:20px;right:0;width:65%}.training-main .title{font-size:2rem}.womens-erin .content,.collection-erin .content{position:static}.womens-erin img,.collection-erin img{display:block;margin:0 auto;max-width:75% !important}.sale-women .content{width:60%;bottom:20px;left:0}.sale-main .content{top:auto;bottom:20px}.sale-20-off{min-height:185px}.sale-20-off .title{font-size:4rem}.womens-category-pants .title,.womens-category-tanks .title,.womens-category-shorts .title,.mens-category-tees .title,.mens-category-hoodies .title,.mens-category-shorts .title,.gear-category-bags .title,.gear-category-equipment .title,.gear-category-watches .title{font-size:1.6rem}.womens-category-pants .info,.womens-category-tanks .info,.womens-category-shorts .info,.mens-category-tees .info,.mens-category-hoodies .info,.mens-category-shorts .info,.gear-category-bags .info,.gear-category-equipment .info,.gear-category-watches .info{font-size:1.4rem}.womens-pants .info span,.mens-pants .info span{font-size:4rem}.womens-pants .content,.mens-pants .content{max-width:220px;bottom:20px}.home-eco .content{width:65%;top:20px;right:0}.gear-fitnes .content,.new-performance .content,.home-erin .content{padding-top:30px}.gear-equipment .content,.new-eco .content{left:0;bottom:20px;max-width:220px}.training-erin .content{right:10px;bottom:10px;left:10px}.training-erin .title{margin-bottom:10px;font-size:1.8rem}.training-erin .info{font-size:1.2rem;margin-bottom:0}.training-on-demand .content,.training-videos .content{padding-top:25px;padding-bottom:45px}.home-pants img{position:absolute;z-index:0;bottom:-10px}.home-pants .title{font-size:4rem}.home-performance img{position:absolute;z-index:0;top:-20px}.womens-main .content,.training-main .content,.gear-main .content{top:auto;bottom:20px}.home-t-shirts .image{display:block;padding:20px 20px 0}.home-t-shirts img{max-width:100% !important}.home-t-shirts .content{position:static}.collection-eco .content,.collection-performance .content{right:10px;bottom:10px;left:10px}.collection-eco .title,.collection-performance .title{margin-bottom:10px;font-size:1.8rem}.collection-eco .info,.collection-performance .info{font-size:1.2rem}.collection-erin .title{font-size:1.8rem}.collection-erin .info{font-size:1.2rem}.content-heading .title{font-size:3rem}.content-heading .info{font-size:1.4rem}.cms-content-important{padding:15px;margin:0 -15px 15px}.cms-content table{margin:10px 0 0}.cms-content table thead th{font-size:1.1rem}.cms-content ul li{margin-bottom:5px}.cms-content .block .box{margin-bottom:30px}.blocks-promo{margin-left:-15px;margin-right:-15px}.block-promo{margin-bottom:8px}.block-promo .title{font-size:2.2rem}.block-promo .info{font-size:1.6rem;margin-bottom:10px}.block-promo .more{font-size:1.4rem}.block-promo .icon.more:after{font-size:1rem}.block-promo .button.more{font-size:1.2rem}.block-promo .content{padding:15px 20px 20px}.block-promo .button.more{padding:8px 12px}}@media all and (min-width:640px),print{.block-promo{margin-bottom:16px}.block-promo-wrapper:before,.block-promo-wrapper:after{content:"";display:table}.block-promo-wrapper:after{clear:both}.block-promo-wrapper .block-promo{float:left;border-right:16px solid #fff}.block-promo-2columns .block-promo{width:50%}.block-promo-3columns .block-promo{width:33.3%}.block-promo-2columns .block-promo:nth-child(2n),.block-promo-3columns .block-promo:nth-child(3n){border-right:0}}@media all and (min-width:768px),print{.block-promo-hp{margin:0 -8px}.block-promo-hp .block-promo{border-left:8px solid #fff;border-right:8px solid #fff}.block-promo-wrapper .home-performance{float:right}.home-pants,.home-erin,.home-performance{width:33.3%}.home-t-shirts,.home-eco{width:66.7%}.womens-main .content,.mens-main .content,.gear-main .content,.new-main .content,.home-main .content,.training-main .content,.sale-main .content{top:40px;right:40px;width:40%}.womens-t-shirts,.mens-t-shirts{height:372px}.womens-pants .content,.mens-pants .content{width:47%;left:20px;top:20px}.womens-erin,.home-t-shirts,.collection-erin{display:table}.womens-erin .content,.home-t-shirts .content,.collection-erin .content,.womens-erin .image,.home-t-shirts .image,.collection-erin .image{display:table-cell}.womens-erin .content,.home-t-shirts .content,.collection-erin .content{position:static}.womens-erin .image,.home-t-shirts .image,.collection-erin .image{vertical-align:bottom}.womens-erin img,.home-t-shirts img,.collection-erin img{float:right}.home-t-shirts{height:276px}.home-t-shirts .content{width:40%}.home-t-shirts .image{width:60%;vertical-align:middle;text-align:center;padding-left:10px}.home-t-shirts img{max-width:100% !important}.womens-category-pants,.womens-category-tanks,.womens-category-shorts,.mens-category-tees,.mens-category-hoodies,.mens-category-shorts,.gear-category-bags,.gear-category-equipment,.gear-category-watches{height:210px}.sale-women .content{width:50%;left:20px;bottom:20px}.sale-20-off .title{font-size:4.4rem}.sale-20-off .info{font-size:1.8rem}.sale-20-off,.sale-free-shipping,.sale-womens-t-shirts{height:205px}.sale-free-shipping .title{font-size:2.5rem}.sale-free-shipping .info{font-size:1.6rem}.sale-womens-t-shirts .title{font-size:2rem;margin-bottom:5px}.sale-womens-t-shirts .info{font-size:1.6rem;margin-bottom:5px}.home-eco .content{width:70%;top:45px;right:45px}.gear-equipment .content,.new-eco .content{left:20px;bottom:20px;width:60%}.new-eco .content{width:70%}.training-erin .content{width:73%;top:16px;bottom:16px;right:16px}.training-erin .info{font-size:1.6rem;display:block;padding:0 10%}.training-on-demand,.training-videos{height:208px}.home-pants{height:664px}.home-pants .title{font-size:44px !important;font-size:4.4rem !important;line-height:1.2}.collection-eco .content,.collection-performance .content{width:60%;top:16px;bottom:16px;left:50%;margin-left:-30%}.collection-eco .title,.collection-performance .title{font-size:4rem}.collection-eco .info,.collection-performance .info{font-size:2.2rem;display:block;padding:0 10%}.collection-erin{height:164px}.collection-erin .content{width:70%}.collection-erin .image{width:30%}.collection-erin .title{font-size:4rem}.collection-erin .info{font-size:2.2rem}.content-heading{position:relative}.content-heading:before{content:'';display:block;height:1px;width:100%;background:-moz-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:-webkit-gradient(radial, center center, 0, center center, 100%, color-stop(25%, #fff), color-stop(100%, #cecece));background:-webkit-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:-ms-radial-gradient(center, ellipse cover, #fff 25%, #cecece 100%);background:radial-gradient(ellipse at center, #fff 25%, #cecece 100%);position:absolute;top:50%;z-index:0}.content-heading .title,.content-heading .info{position:relative;z-index:1}.content-heading .title{font-size:3.8rem}.content-heading .info{font-size:1.8rem}.cms-content-important{font-size:2.2rem;font-weight:300;padding:20px;margin:0 0 35px -20px}.cms-content table{margin:40px 0 0}.cms-content ul li{margin-bottom:15px}.cms-content .block .block-content:before,.cms-content .block .block-content:after{content:"";display:table}.cms-content .block .block-content:after{clear:both}.cms-content .block .box{width:48%;margin-bottom:40px}.cms-content .block .box:nth-child(1){float:left;clear:left}.cms-content .block .box:nth-child(2){float:right}.cms-content .block .box:nth-child(2)+*{clear:both}.cms-content .block .box:nth-last-child(1),.cms-content .block .box:nth-last-child(2){margin-bottom:0}.privacy-policy-content{box-sizing:border-box;width:77.7%;float:right;padding-left:2%}.privacy-policy .block-collapsible-nav{box-sizing:border-box;width:22.3%;float:left}}
\ No newline at end of file
diff --git a/dev/tools/Magento/Tools/SampleData/fixtures/Contact/styles.css b/dev/tools/Magento/Tools/SampleData/fixtures/Contact/styles.css
index fb713c6281ddc..9d2655aa5de94 100644
--- a/dev/tools/Magento/Tools/SampleData/fixtures/Contact/styles.css
+++ b/dev/tools/Magento/Tools/SampleData/fixtures/Contact/styles.css
@@ -1 +1,4 @@
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
 .contact-index-index .fieldset{margin-bottom:20px}.contact-index-index .fieldset .legend{padding-bottom:0}.contact-info-number{display:block;font-size:36px;font-size:3.6rem;line-height:36px;font-weight:300}@media only screen and (max-width:767px){.contact-info-number{font-weight:300;margin-bottom:10px}}@media all and (min-width:768px),print{._rwd_width{min-width:0 !important;max-width:auto !important}._rwd_width_float{width:100% !important;float:none !important}.contact-index-index .fieldset .legend{border:none}.contact-index-index .column.main .widget.static.block{float:left;width:70%}.contact-info-number{margin-bottom:15px}.column:not(.sidebar-main) .form.contact,.column:not(.sidebar-additional) .form.contact{width:27%;float:right}}
\ No newline at end of file
diff --git a/dev/tools/Magento/Tools/SampleData/fixtures/GiftCard/styles.css b/dev/tools/Magento/Tools/SampleData/fixtures/GiftCard/styles.css
index 4ba64bd806695..37b9199124fd2 100644
--- a/dev/tools/Magento/Tools/SampleData/fixtures/GiftCard/styles.css
+++ b/dev/tools/Magento/Tools/SampleData/fixtures/GiftCard/styles.css
@@ -1 +1,4 @@
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
 .giftcard-mailed{background:#fedd16}.giftcard-mailed .content{position:static}.giftcard-mailed img{max-width:100% !important;margin-left:20px;position:absolute;z-index:0;bottom:0}.giftcard-virtual .content{left:0;top:0;width:65%}.giftcard-virtual img{position:absolute;z-index:0;bottom:0;right:0;max-width:100% !important}@media only screen and (max-width:767px){.giftcard-mailed,.giftcard-virtual{min-height:275px}.giftcard-virtual img{max-width:80% !important}}@media all and (min-width:768px),print{.giftcard-virtual,.giftcard-mailed{height:420px}.womens-erin{height:164px}.womens-erin .content{width:70%}.womens-erin .image{width:30%}}
\ No newline at end of file

From 527a8bd80b1a293bb3b1904e74f3dd16d8b163b1 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Fri, 12 Dec 2014 10:39:25 -0600
Subject: [PATCH 364/474] MAGETWO-31534: Ogres Bugfixes Contribution to
 Mainline

- fix sanity check fail
---
 .../static/testsuite/Magento/Test/Legacy/FilesystemTest.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
index 599a0cf5bbebd..39bb30ba20f2c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
@@ -37,7 +37,6 @@ public function relocationsDataProvider()
         return array(
             'Relocated to pub/errors' => array('errors'),
             'Eliminated with Magento_Compiler' => array('includes'),
-            'Eliminated with Magento_GoogleCheckout' => array('lib/googlecheckout'),
             'Relocated to lib/web' => array('js'),
             'Relocated to pub/media' => array('media'),
             'Eliminated as not needed' => array('pkginfo'),

From 5077a799957a224de1b2a6a30b81fb5d53cb6416 Mon Sep 17 00:00:00 2001
From: Robert He <rohe@ebay.com>
Date: Fri, 12 Dec 2014 10:42:26 -0600
Subject: [PATCH 365/474] MAGETWO-31532: Saving product with FPT always throws
 validation error for state dropdown (when * is selected)

 -- added unit test
---
 .../Model/Attribute/Backend/Weee/TaxTest.php  | 219 ++++++++++++++++++
 1 file changed, 219 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php

diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
new file mode 100644
index 0000000000000..bc5148964a501
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
@@ -0,0 +1,219 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+/**
+ * Test class for \Magento\Weee\Model\Attribute\Backend\Weee\Tax
+ */
+namespace Magento\Weee\Model\Attribute\Backend\Weee;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+class TaxTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Weee\Model\Attribute\Backend\Weee\Tax
+     */
+    protected $model;
+
+    public function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->model = $this->objectManager->getObject('Magento\Weee\Model\Attribute\Backend\Weee\Tax');
+    }
+
+    public function testGetBackendModelName()
+    {
+        $this->assertEquals('Magento\Weee\Model\Attribute\Backend\Weee\Tax', $this->model->getBackendModelName());
+    }
+
+    public function testValidate()
+    {
+        $attributeMock = $this->getMockBuilder('Magento\Eav\Model\Attribute')
+            ->setMethods(['getName'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeMock
+            ->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('weeeTax'));
+
+        $modelMock = $this->getMockBuilder('Magento\Weee\Model\Attribute\Backend\Weee\Tax')
+            ->setMethods(['getAttribute'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $modelMock
+            ->expects($this->any())
+            ->method('getAttribute')
+            ->will($this->returnValue($attributeMock));
+
+        $taxes = array(array('state' => 'Texas', 'country' => 'US', 'website_id' => '1'));
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->setMethods(['getData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productMock
+            ->expects($this->any())
+            ->method('getData')
+            ->will($this->returnValue($taxes));
+
+        // No exception
+        $modelMock->validate($productMock);
+
+        $taxes = array(array('state' => 'Texas', 'country' => 'US', 'website_id' => '1'),
+            array('state' => 'Texas', 'country' => 'US', 'website_id' => '1'));
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->setMethods(['getData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productMock
+            ->expects($this->any())
+            ->method('getData')
+            ->will($this->returnValue($taxes));
+
+        // Exception caught
+        $this->setExpectedException('Exception', 'We found a duplicate of website, country and state fields for a fixed product tax');
+        $modelMock->validate($productMock);
+    }
+
+    public function testAfterLoad()
+    {
+        $data = array(array('website_id' => 1, 'value' => 1));
+
+        $attributeTaxMock = $this->getMockBuilder('Magento\Weee\Model\Resource\Attribute\Backend\Weee\Tax')
+            ->setMethods(['loadProductData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeTaxMock
+            ->expects($this->any())
+            ->method('loadProductData')
+            ->will($this->returnValue($data));
+
+        $attributeMock = $this->getMockBuilder('Magento\Eav\Model\Attribute')
+            ->setMethods(['getName'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeMock
+            ->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('weeeTax'));
+
+        $model = $this->objectManager->getObject('Magento\Weee\Model\Attribute\Backend\Weee\Tax',
+            [
+                'attributeTax' => $attributeTaxMock,
+                '_attribute' => $attributeMock
+            ]
+        );
+
+        $model->setAttribute($attributeMock);
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->setMethods(['setData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $model->afterLoad($productMock);
+    }
+
+    public function testAfterSave()
+    {
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->setMethods(['getOrigData', 'getData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $taxes1 = array(array('state' => 'TX', 'country' => 'US', 'website_id' => '1'));
+        $taxes2 = array(array('state' => 'TX', 'country' => 'US', 'website_id' => '2', 'price' => 100));
+        $productMock
+            ->expects($this->once())
+            ->method('getOrigData')
+            ->will($this->returnValue($taxes1));
+        $productMock
+            ->expects($this->any())
+            ->method('getData')
+            ->will($this->returnValue($taxes2));
+
+        $data = array('state' => 'TX', 'country' => 'US', 'website_id' => '2', 'value' => 100, 'attribute_id' => 1);
+
+        $attributeTaxMock = $this->getMockBuilder('Magento\Weee\Model\Resource\Attribute\Backend\Weee\Tax')
+            ->setMethods(['deleteProductData', 'insertProductData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeTaxMock
+            ->expects($this->once())
+            ->method('deleteProductData')
+            ->will($this->returnValue(null));
+        $attributeTaxMock
+            ->expects($this->once())
+            ->method('insertProductData')
+            ->with($productMock, $data)
+            ->will($this->returnValue(null));
+
+        $attributeMock = $this->getMockBuilder('Magento\Eav\Model\Attribute')
+            ->setMethods(['getName', 'getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeMock
+            ->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('weeeTax'));
+        $attributeMock
+            ->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue(1));
+
+        $model = $this->objectManager->getObject('Magento\Weee\Model\Attribute\Backend\Weee\Tax',
+            [
+                'attributeTax' => $attributeTaxMock,
+                '_attribute' => $attributeMock
+            ]
+        );
+
+        $model->setAttribute($attributeMock);
+
+
+        $model->afterSave($productMock);
+    }
+
+    public function testAfterDelete()
+    {
+        $attributeTaxMock = $this->getMockBuilder('Magento\Weee\Model\Resource\Attribute\Backend\Weee\Tax')
+            ->setMethods(['deleteProductData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeTaxMock
+            ->expects($this->once())
+            ->method('deleteProductData')
+            ->with(null, null)
+            ->will($this->returnValue(null));
+
+        $model = $this->objectManager->getObject('Magento\Weee\Model\Attribute\Backend\Weee\Tax',
+            [
+                'attributeTax' => $attributeTaxMock,
+            ]
+        );
+
+        $model->afterDelete(null);
+    }
+
+    public function testGetTable()
+    {
+        $attributeTaxMock = $this->getMockBuilder('Magento\Weee\Model\Resource\Attribute\Backend\Weee\Tax')
+            ->setMethods(['getTable'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeTaxMock
+            ->expects($this->once())
+            ->method('getTable')
+            ->with('weee_tax')
+            ->will($this->returnValue(null));
+
+        $model = $this->objectManager->getObject('Magento\Weee\Model\Attribute\Backend\Weee\Tax',
+            [
+                'attributeTax' => $attributeTaxMock,
+            ]
+        );
+
+        $model->getTable();
+    }
+}

From 0d8efb298221b389a4fe08596627ff43af078d22 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 12 Dec 2014 10:43:32 -0600
Subject: [PATCH 366/474] MAGETWO-26736: Errors after execution View Files
 Population Tool

- fixed code style
---
 dev/tools/Magento/Tools/View/Deployer/Log.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tools/Magento/Tools/View/Deployer/Log.php b/dev/tools/Magento/Tools/View/Deployer/Log.php
index 59233bc46d890..61b98343ff32f 100644
--- a/dev/tools/Magento/Tools/View/Deployer/Log.php
+++ b/dev/tools/Magento/Tools/View/Deployer/Log.php
@@ -86,6 +86,8 @@ public function logDebug($msg, $altInline = '')
 
     /**
      * Ensures the next log message will be printed on new line
+     *
+     * @return void
      */
     private function terminateLine()
     {

From 0f879553c5776b9ef356d3d85a97aaf595ba6f9e Mon Sep 17 00:00:00 2001
From: Robert He <rohe@ebay.com>
Date: Fri, 12 Dec 2014 10:46:03 -0600
Subject: [PATCH 367/474] MAGETWO-31532: Saving product with FPT always throws
 validation error for state dropdown (when * is selected)

 -- added unit test
---
 .../Model/Attribute/Backend/Weee/TaxTest.php  | 58 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
index bc5148964a501..80ea015ad0dd5 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
@@ -115,7 +115,7 @@ public function testAfterLoad()
         $model->afterLoad($productMock);
     }
 
-    public function testAfterSave()
+    public function testAfterSave1()
     {
         $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
             ->setMethods(['getOrigData', 'getData'])
@@ -170,8 +170,64 @@ public function testAfterSave()
         );
 
         $model->setAttribute($attributeMock);
+        $model->afterSave($productMock);
+    }
+
+    public function testAfterSave2()
+    {
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->setMethods(['getOrigData', 'getData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $taxes1 = array(array('state' => '0', 'country' => 'US', 'website_id' => '1'));
+        $taxes2 = array(array('state' => '0', 'country' => 'US', 'website_id' => '2', 'price' => 100));
+        $productMock
+            ->expects($this->once())
+            ->method('getOrigData')
+            ->will($this->returnValue($taxes1));
+        $productMock
+            ->expects($this->any())
+            ->method('getData')
+            ->will($this->returnValue($taxes2));
+
+        $data = array('state' => '0', 'country' => 'US', 'website_id' => '2', 'value' => 100, 'attribute_id' => 1);
+
+        $attributeTaxMock = $this->getMockBuilder('Magento\Weee\Model\Resource\Attribute\Backend\Weee\Tax')
+            ->setMethods(['deleteProductData', 'insertProductData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeTaxMock
+            ->expects($this->once())
+            ->method('deleteProductData')
+            ->will($this->returnValue(null));
+        $attributeTaxMock
+            ->expects($this->once())
+            ->method('insertProductData')
+            ->with($productMock, $data)
+            ->will($this->returnValue(null));
+
+        $attributeMock = $this->getMockBuilder('Magento\Eav\Model\Attribute')
+            ->setMethods(['getName', 'getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $attributeMock
+            ->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue('weeeTax'));
+        $attributeMock
+            ->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue(1));
 
+        $model = $this->objectManager->getObject('Magento\Weee\Model\Attribute\Backend\Weee\Tax',
+            [
+                'attributeTax' => $attributeTaxMock,
+                '_attribute' => $attributeMock
+            ]
+        );
 
+        $model->setAttribute($attributeMock);
         $model->afterSave($productMock);
     }
 

From 01f12883edac5cedfc039cc31e3fb6f44cae3fa3 Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Fri, 12 Dec 2014 10:49:51 -0600
Subject: [PATCH 368/474] MAGETWO-31622: (Fatal Error)No redirect to "setup"
 folder during installation

- adding detailed comment for fix
---
 lib/internal/Magento/Framework/App/Request/Http.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 5ec046bad8fb1..718377b52041e 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -645,6 +645,8 @@ public function isSecure()
         if ($this->immediateRequestSecure()) {
             return true;
         }
+        /* TODO: Untangle Config dependence on Scope, so that this class can be instantiated even if app is not
+        installed MAGETWO-31756 */
         // Check if a proxy sent a header indicating an initial secure request
         $config = $this->_objectManager->get('Magento\Framework\App\Config');
         $offLoaderHeader = trim(

From f313aef138496dc258d6ab467996e9d8f11c6c18 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Fri, 12 Dec 2014 18:51:47 +0200
Subject: [PATCH 369/474] MAGETWO-31398: Create pull request for bug fixing
 round. Part 3

---
 .../unit/testsuite/Magento/AdminGws/Model/ControllersTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php b/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php
index 24e2c6cb019b1..30501ff5ac7ad 100644
--- a/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php
+++ b/dev/tests/unit/testsuite/Magento/AdminGws/Model/ControllersTest.php
@@ -43,8 +43,8 @@ protected function setUp()
         $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
         $this->_roleMock = $this->getMock('Magento\AdminGws\Model\Role', [], [], '', false);
         $this->_objectFactory = $this->getMock('Magento\Framework\ObjectManagerInterface');
-        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManager', array(), array(), '', false);
-        $response = $this->getMock('Magento\Framework\App\ResponseInterface', array(), array(), '', false);
+        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManager', [], [], '', false);
+        $response = $this->getMock('Magento\Framework\App\ResponseInterface', [], [], '', false);
 
         $this->_controllerMock = $this->getMock('\Magento\Backend\App\Action', [], [], '', false);
         $this->_ctrlRequestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);

From 9371f23862c09a4d173afb67910d48646eeec53f Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Fri, 12 Dec 2014 10:55:13 -0600
Subject: [PATCH 370/474] MAGETWO-31658: Some locales are absent in 'Store
 Default Language' select while installation

- Using ConfigInterface now based on CR feedback.
---
 setup/module/Magento/Setup/config/di.config.php | 1 +
 setup/module/Magento/Setup/src/Model/Lists.php  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup/module/Magento/Setup/config/di.config.php b/setup/module/Magento/Setup/config/di.config.php
index 97d33e744c6f7..27696d1ae693e 100644
--- a/setup/module/Magento/Setup/config/di.config.php
+++ b/setup/module/Magento/Setup/config/di.config.php
@@ -26,6 +26,7 @@
                 'Zend\EventManager\EventManagerInterface' => 'EventManager',
                 'Zend\ServiceManager\ServiceLocatorInterface' => 'ServiceManager',
                 'Magento\Framework\DB\LoggerInterface' => 'Magento\Framework\DB\Logger\Null',
+                'Magento\Framework\Locale\ConfigInterface' => 'Magento\Framework\Locale\Config',
             ],
         ],
     ],
diff --git a/setup/module/Magento/Setup/src/Model/Lists.php b/setup/module/Magento/Setup/src/Model/Lists.php
index d0aa70e571989..92d417e67110d 100644
--- a/setup/module/Magento/Setup/src/Model/Lists.php
+++ b/setup/module/Magento/Setup/src/Model/Lists.php
@@ -6,7 +6,7 @@
 namespace Magento\Setup\Model;
 
 use Zend_Locale;
-use Magento\Framework\Locale\Config;
+use Magento\Framework\Locale\ConfigInterface;
 
 class Lists
 {
@@ -28,9 +28,9 @@ class Lists
      * Constructor
      *
      * @param Zend_Locale $zendLocale
-     * @param Config $localeConfig
+     * @param ConfigInterface $localeConfig
      */
-    public function __construct(Zend_Locale $zendLocale, Config $localeConfig)
+    public function __construct(Zend_Locale $zendLocale, ConfigInterface $localeConfig)
     {
         $this->zendLocale = $zendLocale;
         $this->allowedLocales = $localeConfig->getAllowedLocales();

From a7ca9f8d4a572397efa4bac25260ae551c72027b Mon Sep 17 00:00:00 2001
From: Anton Guz <aguz@ebay.com>
Date: Fri, 12 Dec 2014 19:06:01 +0200
Subject: [PATCH 371/474] MAGETWO-31703:  Can't Expand Customer Menu if it
 doesn't contains the categories if Responsive

 - Revert tab behavior: empty tab.
---
 lib/web/mage/tabs.js | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/lib/web/mage/tabs.js b/lib/web/mage/tabs.js
index e8b208ea4c98f..5c0a9110eaefe 100644
--- a/lib/web/mage/tabs.js
+++ b/lib/web/mage/tabs.js
@@ -115,31 +115,7 @@ define([
             if (this.triggers.length === 0) {
                 this.triggers = this.headers;
             }
-            this.
-                _skipEmptyTab().
-                _callCollapsible();
-        },
-
-        /**
-         *
-         * @private
-         */
-        _skipEmptyTab: function() {
-            var self = this,
-                newActive = 0;
-            this.contents.each(function(index, el){
-                var text = $.trim($(el).text());
-                if(!text) {
-                    self.options.disabled.push(index);
-                    if(!index && self.contents.length > 1) {
-                        newActive++;
-                    }
-                    if(self.options.active === index) {
-                        self.options.active = newActive;
-                    }
-                }
-            });
-            return this;
+            this._callCollapsible();
         },
 
         /**

From 5109fc651b49cce9313b9685cdbfe70cb155ac48 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 12 Dec 2014 19:06:07 +0200
Subject: [PATCH 372/474] MAGETWO-31623: Performance degradation investigation

- ternary operators replaced with ifelse statements for config usage
---
 .../Framework/Interception/Config/Config.php  |  5 +-
 lib/internal/Magento/Framework/Object.php     | 19 +++++--
 .../ObjectManager/Config/Compiled.php         | 10 +++-
 .../Framework/ObjectManager/Config/Config.php |  7 +--
 .../ObjectManager/Factory/AbstractFactory.php | 53 ++++++++++++-------
 .../ObjectManager/Factory/Compiled.php        |  8 +--
 6 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/lib/internal/Magento/Framework/Interception/Config/Config.php b/lib/internal/Magento/Framework/Interception/Config/Config.php
index 935b60e67a66b..616e06428defb 100644
--- a/lib/internal/Magento/Framework/Interception/Config/Config.php
+++ b/lib/internal/Magento/Framework/Interception/Config/Config.php
@@ -169,6 +169,9 @@ protected function _inheritInterception($type)
      */
     public function hasPlugins($type)
     {
-        return isset($this->_intercepted[$type]) ? $this->_intercepted[$type] : $this->_inheritInterception($type);
+        if (isset($this->_intercepted[$type])) {
+            return $this->_intercepted[$type];
+        }
+        return $this->_inheritInterception($type);
     }
 }
diff --git a/lib/internal/Magento/Framework/Object.php b/lib/internal/Magento/Framework/Object.php
index 76a7e850f808c..c6699f5c08c92 100644
--- a/lib/internal/Magento/Framework/Object.php
+++ b/lib/internal/Magento/Framework/Object.php
@@ -239,7 +239,7 @@ public function getData($key = '', $index = null)
             if ($data === (array)$data) {
                 $data = isset($data[$index]) ? $data[$index] : null;
             } elseif (is_string($data)) {
-                $data = explode("\n", $data);
+                $data = explode('\n', $data);
                 $data = isset($data[$index]) ? $data[$index] : null;
             } elseif ($data instanceof \Magento\Framework\Object) {
                 $data = $data->getData($index);
@@ -264,7 +264,7 @@ public function getDataByPath($path)
 
         $data = $this->_data;
         foreach ($keys as $key) {
-            if (is_array($data) && isset($data[$key])) {
+            if ((array)$data === $data && isset($data[$key])) {
                 $data = $data[$key];
             } elseif ($data instanceof \Magento\Framework\Object) {
                 $data = $data->getDataByKey($key);
@@ -294,7 +294,10 @@ public function getDataByKey($key)
      */
     protected function _getData($key)
     {
-        return isset($this->_data[$key]) ? $this->_data[$key] : null;
+        if (isset($this->_data[$key])) {
+            return $this->_data[$key];
+        }
+        return null;
     }
 
     /**
@@ -605,7 +608,10 @@ public function getOrigData($key = null)
         if ($key === null) {
             return $this->_origData;
         }
-        return isset($this->_origData[$key]) ? $this->_origData[$key] : null;
+        if (isset($this->_origData[$key])) {
+            return $this->_origData[$key];
+        }
+        return null;
     }
 
     /**
@@ -709,6 +715,9 @@ public function offsetUnset($offset)
      */
     public function offsetGet($offset)
     {
-        return isset($this->_data[$offset]) ? $this->_data[$offset] : null;
+        if (isset($this->_data[$offset])) {
+            return $this->_data[$offset];
+        }
+        return null;
     }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
index 03a806c32d9c9..7cdbe5cec9d73 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
@@ -105,7 +105,10 @@ public function isShared($type)
      */
     public function getInstanceType($instanceName)
     {
-        return isset($this->virtualTypes[$instanceName]) ? $this->virtualTypes[$instanceName] : $instanceName;
+        if (isset($this->virtualTypes[$instanceName])) {
+            return $this->virtualTypes[$instanceName];
+        }
+        return $instanceName;
     }
 
     /**
@@ -117,7 +120,10 @@ public function getInstanceType($instanceName)
      */
     public function getPreference($type)
     {
-        return isset($this->preferences[$type]) ? $this->preferences[$type] : $type;
+        if (isset($this->preferences[$type])) {
+            return $this->preferences[$type];
+        }
+        return $type;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
index 8cdee0f74b755..2b9db774c23ef 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
@@ -116,9 +116,10 @@ public function setCache(ConfigCacheInterface $cache)
      */
     public function getArguments($type)
     {
-        return isset($this->_mergedArguments[$type])
-            ? $this->_mergedArguments[$type]
-            : $this->_collectConfiguration($type);
+        if (isset($this->_mergedArguments[$type])) {
+            return $this->_mergedArguments[$type];
+        }
+        return $this->_collectConfiguration($type);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index aa315788a82de..a55aac72d8b71 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -172,17 +172,26 @@ protected function resolveArgument(&$argument, $paramType, $paramDefault, $param
                     'Invalid parameter configuration provided for $' . $paramName . ' argument of ' . $requestedType
                 );
             }
-            $isShared = (isset($argument['shared'])
-                ? $argument['shared']
-                : $this->config->isShared($argument['instance']));
-            $argument = $isShared
-                ? $this->objectManager->get($argument['instance'])
-                : $this->objectManager->create($argument['instance']);
+
+            if (isset($argument['shared'])) {
+                $isShared = $argument['shared'];
+            } else {
+                $isShared = $this->config->isShared($argument['instance']);
+            }
+
+            if ($isShared) {
+                $argument = $this->objectManager->get($argument['instance']);
+            } else {
+                $argument = $this->objectManager->create($argument['instance']);
+            }
+
         } else if ($argument === (array)$argument) {
             if (isset($argument['argument'])) {
-                $argument = isset($this->globalArguments[$argument['argument']])
-                    ? $this->globalArguments[$argument['argument']]
-                    : $paramDefault;
+                if (isset($this->globalArguments[$argument['argument']])) {
+                    $argument = $this->globalArguments[$argument['argument']];
+                } else {
+                    $argument = $paramDefault;
+                }
             } else if (!empty($argument)) {
                 $this->parseArray($argument);
             }
@@ -201,16 +210,24 @@ protected function parseArray(&$array)
         foreach ($array as $key => $item) {
             if ($item === (array)$item) {
                 if (isset($item['instance'])) {
-                    $isShared = (isset($item['shared']))
-                        ? $item['shared']
-                        : $this->config->isShared($item['instance']);
-                    $array[$key] = $isShared
-                        ? $this->objectManager->get($item['instance'])
-                        : $this->objectManager->create($item['instance']);
+                    if (isset($item['shared'])) {
+                        $isShared = $item['shared'];
+                    } else {
+                        $isShared = $this->config->isShared($item['instance']);
+                    }
+
+                    if ($isShared) {
+                        $array[$key] = $this->objectManager->get($item['instance']);
+                    } else {
+                        $array[$key] = $this->objectManager->create($item['instance']);
+                    }
+
                 } elseif (isset($item['argument'])) {
-                    $array[$key] = isset($this->globalArguments[$item['argument']])
-                        ? $this->globalArguments[$item['argument']]
-                        : null;
+                    if (isset($this->globalArguments[$item['argument']])) {
+                        $array[$key] = $this->globalArguments[$item['argument']];
+                    } else {
+                        $array[$key] = null;
+                    }
                 } else {
                     $this->parseArray($array[$key]);
                 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
index ed95c09738902..ed849dd9389a4 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
@@ -41,9 +41,11 @@ public function create($requestedType, array $arguments = array())
                     } elseif (isset($argument['__non_shared__'])) {
                         $argument = $this->objectManager->create($argument['__instance__']);
                     } elseif (isset($argument['__arg__'])) {
-                        $argument = isset($this->globalArguments[$argument['__arg__']])
-                            ? $this->globalArguments[$argument['__arg__']]
-                            : $argument['__default__'];
+                        if (isset($this->globalArguments[$argument['__arg__']])) {
+                            $argument = $this->globalArguments[$argument['__arg__']];
+                        } else {
+                            $argument = $argument['__default__'];
+                        }
                     }
                 } else {
                     $argument = $this->objectManager->get($argument);

From a2d98def03ba7e8c86fbc4a394671bdafbf93ad1 Mon Sep 17 00:00:00 2001
From: Arkadii Chyzhov <achyzhov@ebay.com>
Date: Fri, 12 Dec 2014 19:34:19 +0200
Subject: [PATCH 373/474] MAGETWO-31708: Merge Core sql scripts and rename file
 with suffix 2.0.0

- Changes for fixing test ST-EE-L64 - fix 2
---
 app/code/Magento/Core/data/core_setup/data-install-2.0.0.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
index 65b0253d9d851..4612ac0520399 100644
--- a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
@@ -47,7 +47,8 @@
  */
 $installer->getConnection()->update(
     $installer->getTable('core_theme'),
-    array('area' => 'frontend'), array('area = ?' => '')
+    array('area' => 'frontend'),
+    array('area = ?' => '')
 );
 $installer->getEventManager()->dispatch('theme_registration_from_filesystem');
 

From 956ac2cb95cb838da6b06bafa8961ac5c64b04ff Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Fri, 12 Dec 2014 19:35:57 +0200
Subject: [PATCH 374/474] MAGETWO-31574: Exception on Manage Shopping Cart from
 Customer page in backend

---
 .../AdvancedCheckout/Controller/Adminhtml/IndexTest.php   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php b/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php
index 8cce627966021..4f31dfd5b8ebe 100644
--- a/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php
@@ -29,7 +29,13 @@ class IndexTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->objectManager = $this->getMock('Magento\Framework\ObjectManager\ObjectManager', [], [], '', false);
-        $this->customerBuilder = $this->getMock('Magento\Customer\Api\Data\CustomerDataBuilder', [], [], '', false);
+        $this->customerBuilder = $this->getMock(
+            'Magento\Customer\Api\Data\CustomerDataBuilder',
+            ['populateWithArray', 'create'],
+            [],
+            '',
+            false
+        );
 
         $this->request = $this->getMock('Magento\Framework\App\Request\Http', ['getPost', 'getParam'], [], '', false);
         $response = $this->getMock('Magento\Framework\App\ResponseInterface');

From 22b01799a8a395150b1f639004035a8de1f74c40 Mon Sep 17 00:00:00 2001
From: Robert He <rohe@ebay.com>
Date: Fri, 12 Dec 2014 11:37:05 -0600
Subject: [PATCH 375/474] MAGETWO-31532: Saving product with FPT always throws
 validation error for state dropdown (when * is selected)

 -- added unit test
---
 .../Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
index 80ea015ad0dd5..bb2685a3d91c3 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
@@ -115,7 +115,7 @@ public function testAfterLoad()
         $model->afterLoad($productMock);
     }
 
-    public function testAfterSave1()
+    public function testAfterSaveWithRegion()
     {
         $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
             ->setMethods(['getOrigData', 'getData'])
@@ -173,7 +173,7 @@ public function testAfterSave1()
         $model->afterSave($productMock);
     }
 
-    public function testAfterSave2()
+    public function testAfterSaveWithNoRegion()
     {
         $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
             ->setMethods(['getOrigData', 'getData'])

From 1a3e1f20b8031eeddd6a759a61eb7e5ae7f01595 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Fri, 12 Dec 2014 19:47:39 +0200
Subject: [PATCH 376/474] MAGETWO-31623: Performance degradation investigation

- fixed unit test
---
 lib/internal/Magento/Framework/Object.php     |  3 +-
 .../ObjectManager/Factory/AbstractFactory.php | 51 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Object.php b/lib/internal/Magento/Framework/Object.php
index c6699f5c08c92..80f7c62755e3a 100644
--- a/lib/internal/Magento/Framework/Object.php
+++ b/lib/internal/Magento/Framework/Object.php
@@ -222,6 +222,7 @@ public function unsetData($key = null)
      * @param string|int $index
      * @return mixed
      */
+
     public function getData($key = '', $index = null)
     {
         if ('' === $key) {
@@ -239,7 +240,7 @@ public function getData($key = '', $index = null)
             if ($data === (array)$data) {
                 $data = isset($data[$index]) ? $data[$index] : null;
             } elseif (is_string($data)) {
-                $data = explode('\n', $data);
+                $data = explode(PHP_EOL, $data);
                 $data = isset($data[$index]) ? $data[$index] : null;
             } elseif ($data instanceof \Magento\Framework\Object) {
                 $data = $data->getData($index);
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index a55aac72d8b71..cf146b74f6197 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -145,6 +145,57 @@ protected function createObject($type, $args)
                     $args[10],
                     $args[11]
                 );
+            case 13:
+                return new $type(
+                    $args[0],
+                    $args[1],
+                    $args[2],
+                    $args[3],
+                    $args[4],
+                    $args[5],
+                    $args[6],
+                    $args[7],
+                    $args[8],
+                    $args[9],
+                    $args[10],
+                    $args[11],
+                    $args[12]
+                );
+            case 14:
+                return new $type(
+                    $args[0],
+                    $args[1],
+                    $args[2],
+                    $args[3],
+                    $args[4],
+                    $args[5],
+                    $args[6],
+                    $args[7],
+                    $args[8],
+                    $args[9],
+                    $args[10],
+                    $args[11],
+                    $args[12],
+                    $args[13]
+                );
+            case 15:
+                return new $type(
+                    $args[0],
+                    $args[1],
+                    $args[2],
+                    $args[3],
+                    $args[4],
+                    $args[5],
+                    $args[6],
+                    $args[7],
+                    $args[8],
+                    $args[9],
+                    $args[10],
+                    $args[11],
+                    $args[12],
+                    $args[13],
+                    $args[14]
+                );
             default:
                 $reflection = new \ReflectionClass($type);
                 return $reflection->newInstanceArgs($args);

From c275af6e513a0c6fea9b70c9809a886469fe375e Mon Sep 17 00:00:00 2001
From: Robert He <rohe@ebay.com>
Date: Fri, 12 Dec 2014 11:48:31 -0600
Subject: [PATCH 377/474] MAGETWO-31532: Saving product with FPT always throws
 validation error for state dropdown (when * is selected)

 -- clean up unit test
---
 .../Model/Attribute/Backend/Weee/TaxTest.php  | 95 ++++++-------------
 1 file changed, 28 insertions(+), 67 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
index bb2685a3d91c3..2448d0d47d079 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
@@ -48,7 +48,7 @@ public function testValidate()
             ->method('getAttribute')
             ->will($this->returnValue($attributeMock));
 
-        $taxes = array(array('state' => 'Texas', 'country' => 'US', 'website_id' => '1'));
+        $taxes = [['state' => 'Texas', 'country' => 'US', 'website_id' => '1']];
         $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
             ->setMethods(['getData'])
             ->disableOriginalConstructor()
@@ -61,8 +61,8 @@ public function testValidate()
         // No exception
         $modelMock->validate($productMock);
 
-        $taxes = array(array('state' => 'Texas', 'country' => 'US', 'website_id' => '1'),
-            array('state' => 'Texas', 'country' => 'US', 'website_id' => '1'));
+        $taxes = [['state' => 'Texas', 'country' => 'US', 'website_id' => '1'],
+            ['state' => 'Texas', 'country' => 'US', 'website_id' => '1']];
         $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
             ->setMethods(['getData'])
             ->disableOriginalConstructor()
@@ -79,7 +79,7 @@ public function testValidate()
 
     public function testAfterLoad()
     {
-        $data = array(array('website_id' => 1, 'value' => 1));
+        $data = [['website_id' => 1, 'value' => 1]];
 
         $attributeTaxMock = $this->getMockBuilder('Magento\Weee\Model\Resource\Attribute\Backend\Weee\Tax')
             ->setMethods(['loadProductData'])
@@ -115,25 +115,29 @@ public function testAfterLoad()
         $model->afterLoad($productMock);
     }
 
-    public function testAfterSaveWithRegion()
+    /**
+     * Tests the specific method with various regions
+     *
+     * @param array $origData
+     * @param array $currentData
+     * @param array $expectedData
+     * @dataProvider dataProviderAfterSaveWithRegion
+     */
+    public function testAfterSaveWithRegion($origData, $currentData, $expectedData)
     {
         $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
             ->setMethods(['getOrigData', 'getData'])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $taxes1 = array(array('state' => 'TX', 'country' => 'US', 'website_id' => '1'));
-        $taxes2 = array(array('state' => 'TX', 'country' => 'US', 'website_id' => '2', 'price' => 100));
         $productMock
             ->expects($this->once())
             ->method('getOrigData')
-            ->will($this->returnValue($taxes1));
+            ->will($this->returnValue($origData));
         $productMock
             ->expects($this->any())
             ->method('getData')
-            ->will($this->returnValue($taxes2));
-
-        $data = array('state' => 'TX', 'country' => 'US', 'website_id' => '2', 'value' => 100, 'attribute_id' => 1);
+            ->will($this->returnValue($currentData));
 
         $attributeTaxMock = $this->getMockBuilder('Magento\Weee\Model\Resource\Attribute\Backend\Weee\Tax')
             ->setMethods(['deleteProductData', 'insertProductData'])
@@ -146,7 +150,7 @@ public function testAfterSaveWithRegion()
         $attributeTaxMock
             ->expects($this->once())
             ->method('insertProductData')
-            ->with($productMock, $data)
+            ->with($productMock, $expectedData)
             ->will($this->returnValue(null));
 
         $attributeMock = $this->getMockBuilder('Magento\Eav\Model\Attribute')
@@ -173,62 +177,19 @@ public function testAfterSaveWithRegion()
         $model->afterSave($productMock);
     }
 
-    public function testAfterSaveWithNoRegion()
+    /**
+     * @return array
+     */
+    public function dataProviderAfterSaveWithRegion()
     {
-        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
-            ->setMethods(['getOrigData', 'getData'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $taxes1 = array(array('state' => '0', 'country' => 'US', 'website_id' => '1'));
-        $taxes2 = array(array('state' => '0', 'country' => 'US', 'website_id' => '2', 'price' => 100));
-        $productMock
-            ->expects($this->once())
-            ->method('getOrigData')
-            ->will($this->returnValue($taxes1));
-        $productMock
-            ->expects($this->any())
-            ->method('getData')
-            ->will($this->returnValue($taxes2));
-
-        $data = array('state' => '0', 'country' => 'US', 'website_id' => '2', 'value' => 100, 'attribute_id' => 1);
-
-        $attributeTaxMock = $this->getMockBuilder('Magento\Weee\Model\Resource\Attribute\Backend\Weee\Tax')
-            ->setMethods(['deleteProductData', 'insertProductData'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $attributeTaxMock
-            ->expects($this->once())
-            ->method('deleteProductData')
-            ->will($this->returnValue(null));
-        $attributeTaxMock
-            ->expects($this->once())
-            ->method('insertProductData')
-            ->with($productMock, $data)
-            ->will($this->returnValue(null));
-
-        $attributeMock = $this->getMockBuilder('Magento\Eav\Model\Attribute')
-            ->setMethods(['getName', 'getId'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $attributeMock
-            ->expects($this->any())
-            ->method('getName')
-            ->will($this->returnValue('weeeTax'));
-        $attributeMock
-            ->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue(1));
-
-        $model = $this->objectManager->getObject('Magento\Weee\Model\Attribute\Backend\Weee\Tax',
-            [
-                'attributeTax' => $attributeTaxMock,
-                '_attribute' => $attributeMock
-            ]
-        );
-
-        $model->setAttribute($attributeMock);
-        $model->afterSave($productMock);
+        return [
+            [[['state' => 'TX', 'country' => 'US', 'website_id' => '1']],
+             [['state' => 'TX', 'country' => 'US', 'website_id' => '2', 'price' => 100]],
+             ['state' => 'TX', 'country' => 'US', 'website_id' => '2', 'value' => 100, 'attribute_id' => 1]],
+            [[['state' => '0', 'country' => 'US', 'website_id' => '1']],
+             [['state' => '0', 'country' => 'US', 'website_id' => '2', 'price' => 100]],
+             ['state' => '0', 'country' => 'US', 'website_id' => '2', 'value' => 100, 'attribute_id' => 1]]
+        ];
     }
 
     public function testAfterDelete()

From 4305b1d5f6b491bc78c594b5e8c5321ed9d5284c Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Fri, 12 Dec 2014 19:59:02 +0200
Subject: [PATCH 378/474] MAGETWO-31763: Design of "Compare Products"
 functionality on Blank Theme in responsive is broken

---
 .../Magento/blank/Magento_Catalog/web/css/source/module.less   | 3 ---
 app/design/frontend/Magento/blank/web/css/source/tables.less   | 2 +-
 .../Magento/luma/Magento_Catalog/web/css/source/module.less    | 3 ---
 app/design/frontend/Magento/luma/web/css/source/tables.less    | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less
index ca11877ac9366..d265e43b02fbe 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/module.less
@@ -468,9 +468,6 @@
         &:extend(.abs-revert-field-type-desktop all);
     }
 
-    .table-wrapper.comparison {
-        .table-overflow();
-    }
 }
 
 //
diff --git a/app/design/frontend/Magento/blank/web/css/source/tables.less b/app/design/frontend/Magento/blank/web/css/source/tables.less
index 2f7993414733e..bded4ea48e3a8 100644
--- a/app/design/frontend/Magento/blank/web/css/source/tables.less
+++ b/app/design/frontend/Magento/blank/web/css/source/tables.less
@@ -45,7 +45,7 @@ table {
     .table-wrapper {
         .table-overflow();
         position: relative; // to hide unnecessary horizontal scrollbar in Safari
-        .table:not(.cart):not(.totals) {
+        .table:not(.cart):not(.totals):not(.table-comparison) {
             .table-responsive();
             tbody > tr {
                 > td:first-child {
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module.less
index 7e5e17d0ba360..6c26974875092 100644
--- a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module.less
+++ b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module.less
@@ -902,9 +902,6 @@ body.catalog-product-compare-index {
             }
         }
     }
-    .table-wrapper.comparison {
-        .table-overflow();
-    }
 }
 
 //
diff --git a/app/design/frontend/Magento/luma/web/css/source/tables.less b/app/design/frontend/Magento/luma/web/css/source/tables.less
index 4ee6c68778c82..45c887c3ccc12 100644
--- a/app/design/frontend/Magento/luma/web/css/source/tables.less
+++ b/app/design/frontend/Magento/luma/web/css/source/tables.less
@@ -47,7 +47,7 @@ table {
         border-top: @table-border-width @table-border-style @table-border-color;
         .table-overflow();
         position: relative; // to hide unnecessary horizontal scrollbar in Safari
-        .table:not(.totals):not(.cart) {
+        .table:not(.totals):not(.cart):not(.table-comparison) {
             .table-responsive();
             tbody {
                 > tr {

From 66aaf7aef1f46477a6d303dce1d188eab2cc64c5 Mon Sep 17 00:00:00 2001
From: Anton Kril <akril@ebay.com>
Date: Fri, 12 Dec 2014 20:04:28 +0200
Subject: [PATCH 379/474] MAGETWO-31743: Fedex is absent on onepagecheckout

---
 app/code/Magento/Directory/Model/Country.php                 | 4 ----
 app/code/Magento/Fedex/Model/Carrier.php                     | 4 ++--
 app/code/Magento/Ups/Model/Carrier.php                       | 4 ++--
 dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Directory/Model/Country.php b/app/code/Magento/Directory/Model/Country.php
index 160c355838f45..6088a6c6cc209 100644
--- a/app/code/Magento/Directory/Model/Country.php
+++ b/app/code/Magento/Directory/Model/Country.php
@@ -10,10 +10,6 @@
  * @method \Magento\Directory\Model\Resource\Country getResource()
  * @method string getCountryId()
  * @method \Magento\Directory\Model\Country setCountryId(string $value)
- * @method string getIso2Code()
- * @method \Magento\Directory\Model\Country setIso2Code(string $value)
- * @method string getIso3Code()
- * @method \Magento\Directory\Model\Country setIso3Code(string $value)
  */
 namespace Magento\Directory\Model;
 
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index 7da84404894b7..c614c29600937 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -301,7 +301,7 @@ public function setRequest(RateRequest $request)
                 $request->getStoreId()
             );
         }
-        $r->setOrigCountry($this->_countryFactory->create()->load($origCountry)->getIso2Code());
+        $r->setOrigCountry($this->_countryFactory->create()->load($origCountry)->getData('iso2_code'));
 
         if ($request->getOrigPostcode()) {
             $r->setOrigPostal($request->getOrigPostcode());
@@ -320,7 +320,7 @@ public function setRequest(RateRequest $request)
         } else {
             $destCountry = self::USA_COUNTRY_ID;
         }
-        $r->setDestCountry($this->_countryFactory->create()->load($destCountry)->getIso2Code());
+        $r->setDestCountry($this->_countryFactory->create()->load($destCountry)->getData('iso2_code'));
 
         if ($request->getDestPostcode()) {
             $r->setDestPostal($request->getDestPostcode());
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 6b72c10d40d7f..86a2f8b5bb2f7 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -249,7 +249,7 @@ public function setRequest(RateRequest $request)
             );
         }
 
-        $rowRequest->setOrigCountry($this->_countryFactory->create()->load($origCountry)->getIso2Code());
+        $rowRequest->setOrigCountry($this->_countryFactory->create()->load($origCountry)->getData('iso2_code'));
 
         if ($request->getOrigRegionCode()) {
             $origRegionCode = $request->getOrigRegionCode();
@@ -307,7 +307,7 @@ public function setRequest(RateRequest $request)
             $destCountry = self::GUAM_COUNTRY_ID;
         }
 
-        $rowRequest->setDestCountry($this->_countryFactory->create()->load($destCountry)->getIso2Code());
+        $rowRequest->setDestCountry($this->_countryFactory->create()->load($destCountry)->getData('iso2_code'));
 
         $rowRequest->setDestRegionCode($request->getDestRegionCode());
 
diff --git a/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
index 1ed68fb871b59..c770c8f10b3a7 100644
--- a/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
@@ -33,7 +33,7 @@ public function setUp()
         $scopeConfig->expects($this->any())->method('getValue')->will($this->returnValue('ServiceType'));
         $country = $this->getMock(
             'Magento\Directory\Model\Country',
-            ['load', 'getIso2Code', '__wakeup'],
+            ['load', 'getData', '__wakeup'],
             [],
             '',
             false

From da3bfac8ff6a1e809c2776d459a11bcb79e46ee9 Mon Sep 17 00:00:00 2001
From: Robert He <rohe@ebay.com>
Date: Fri, 12 Dec 2014 12:12:48 -0600
Subject: [PATCH 380/474] MAGETWO-31532: Saving product with FPT always throws
 validation error for state dropdown (when * is selected)

 -- clean up unit test
---
 .../Model/Attribute/Backend/Weee/TaxTest.php  | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
index 2448d0d47d079..6a47ac0eea7f1 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Attribute/Backend/Weee/TaxTest.php
@@ -73,7 +73,8 @@ public function testValidate()
             ->will($this->returnValue($taxes));
 
         // Exception caught
-        $this->setExpectedException('Exception', 'We found a duplicate of website, country and state fields for a fixed product tax');
+        $this->setExpectedException('Exception',
+            'We found a duplicate of website, country and state fields for a fixed product tax');
         $modelMock->validate($productMock);
     }
 
@@ -183,12 +184,16 @@ public function testAfterSaveWithRegion($origData, $currentData, $expectedData)
     public function dataProviderAfterSaveWithRegion()
     {
         return [
-            [[['state' => 'TX', 'country' => 'US', 'website_id' => '1']],
-             [['state' => 'TX', 'country' => 'US', 'website_id' => '2', 'price' => 100]],
-             ['state' => 'TX', 'country' => 'US', 'website_id' => '2', 'value' => 100, 'attribute_id' => 1]],
-            [[['state' => '0', 'country' => 'US', 'website_id' => '1']],
-             [['state' => '0', 'country' => 'US', 'website_id' => '2', 'price' => 100]],
-             ['state' => '0', 'country' => 'US', 'website_id' => '2', 'value' => 100, 'attribute_id' => 1]]
+            'withRegion' => [
+                'origData' => [['state' => 'TX', 'country' => 'US', 'website_id' => '1']],
+                'currentData' => [['state' => 'TX', 'country' => 'US', 'website_id' => '2', 'price' => 100]],
+                'expectedData' => ['state' => 'TX', 'country' => 'US', 'website_id' => '2', 'value' => 100,
+                                   'attribute_id' => 1]],
+            'withNoRegion' => [
+                'origData' => [['state' => '0', 'country' => 'US', 'website_id' => '1']],
+                'currentData' => [['state' => '0', 'country' => 'US', 'website_id' => '2', 'price' => 100]],
+                'expectedData' => ['state' => '0', 'country' => 'US', 'website_id' => '2', 'value' => 100,
+                                   'attribute_id' => 1]]
         ];
     }
 

From 9cb8865746a7e67c6045afbe8e9246926c50a926 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 12 Dec 2014 12:28:12 -0600
Subject: [PATCH 381/474] MAGETWO-26736: Errors after execution View Files
 Population Tool

- fixed deployer.php tool when used with DI compiler
---
 dev/tools/Magento/Tools/Di/compiler.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev/tools/Magento/Tools/Di/compiler.php b/dev/tools/Magento/Tools/Di/compiler.php
index c327ffaef1956..f838a21987b9a 100644
--- a/dev/tools/Magento/Tools/Di/compiler.php
+++ b/dev/tools/Magento/Tools/Di/compiler.php
@@ -42,7 +42,11 @@
     $relationsFile = $diDir . '/relations.php';
     $pluginDefFile = $diDir . '/plugins.php';
 
-    $compilationDirs = [$rootDir . '/app/code', $rootDir . '/lib/internal/Magento'];
+    $compilationDirs = [
+        $rootDir . '/app/code',
+        $rootDir . '/lib/internal/Magento',
+        $rootDir . '/dev/tools/Magento/Tools/View'
+    ];
 
     /** @var Writer\WriterInterface $logWriter Writer model for success messages */
     $logWriter = $opt->getOption('v') ? new Writer\Console() : new Writer\Quiet();

From 36bd70b816b4a0552426682ad483db0cdeb343e2 Mon Sep 17 00:00:00 2001
From: Maddy Chellathurai <mchellathura@ebay.com>
Date: Fri, 12 Dec 2014 12:46:44 -0600
Subject: [PATCH 382/474] MAGETWO-31622: (Fatal Error)No redirect to "setup"
 folder during installation

- fixing phpcs error
---
 .../DesignEditor/Controller/Varien/Router/StandardTest.php  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php
index c08db0f674fea..165e730f0af39 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php
@@ -135,7 +135,11 @@ public function matchDataProvider()
             'not vde request' => [
                 '$request' => $this->getMock(
                         'Magento\Framework\App\Request\Http', ['_isFrontArea'], [
-                            $routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $objectManagerMock, $notVdeUrl
+                            $routerListMock,
+                            $infoProcessorMock,
+                            $this->_cookieReaderMock,
+                            $objectManagerMock,
+                            $notVdeUrl
                         ]
                     ),
                 '$isVde'           => false,

From 68a4ccb2bb3d40b1cb35173027ab0423a088be50 Mon Sep 17 00:00:00 2001
From: Yaroslav Onischenko <yonischenko@ebay.com>
Date: Fri, 12 Dec 2014 20:46:50 +0200
Subject: [PATCH 383/474] MAGETWO-31002: [Spike] Investigate methods of
 publishing sample data packages

---
 dev/build/publication/edition/ee.txt          |  1 +
 .../Module/CustomerBalance/Observer.php       | 28 +++++++++
 .../Module/Sales/Setup/Order/Processor.php    | 51 +++++++++++-----
 .../Tools/SampleData/Module/Theme/Setup.php   |  3 +-
 .../Tools/SampleData/ObserverManager.php      | 59 +++++++++++++++++++
 5 files changed, 126 insertions(+), 16 deletions(-)
 create mode 100644 dev/tools/Magento/Tools/SampleData/Module/CustomerBalance/Observer.php
 create mode 100644 dev/tools/Magento/Tools/SampleData/ObserverManager.php

diff --git a/dev/build/publication/edition/ee.txt b/dev/build/publication/edition/ee.txt
index e87410538825b..01017afe93766 100644
--- a/dev/build/publication/edition/ee.txt
+++ b/dev/build/publication/edition/ee.txt
@@ -86,6 +86,7 @@ dev/tools/Magento/Tools/SampleData/fixtures/GiftRegistry
 dev/tools/Magento/Tools/SampleData/Module/GiftRegistry
 dev/tools/Magento/Tools/SampleData/fixtures/MultipleWishlist
 dev/tools/Magento/Tools/SampleData/Module/MultipleWishlist
+dev/tools/Magento/Tools/SampleData/Module/CustomerBalance
 
 dev/tests/integration/testsuite/Magento/Test/Design/Frontend/Enterprise
 
diff --git a/dev/tools/Magento/Tools/SampleData/Module/CustomerBalance/Observer.php b/dev/tools/Magento/Tools/SampleData/Module/CustomerBalance/Observer.php
new file mode 100644
index 0000000000000..ed1e3d3e65b0e
--- /dev/null
+++ b/dev/tools/Magento/Tools/SampleData/Module/CustomerBalance/Observer.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Tools\SampleData\Module\CustomerBalance;
+
+/**
+ * Class Observer
+  */
+class Observer
+{
+    /**
+     * @param \Magento\Framework\Object $params
+     * @return mixed
+     */
+    public function getCreditmemoData(\Magento\Framework\Object $params)
+    {
+        /** @var \Magento\Sales\Model\Order\Item $orderItem */
+        $orderItem = $params->getOrderItem();
+        $data = $params->getCreditMemo();
+        if ($orderItem->getOrder()->getBaseGrandTotal()) {
+            $data['refund_customerbalance_return_enable'] = '1';
+            $data['refund_customerbalance_return'] = $orderItem->getOrder()->getBaseGrandTotal();
+        }
+
+        return $data;
+    }
+}
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order/Processor.php b/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order/Processor.php
index b212177f333be..43d1b28d68a44 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order/Processor.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order/Processor.php
@@ -3,6 +3,7 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Tools\SampleData\Module\Sales\Setup\Order;
+use Magento\Framework\Object;
 
 /**
  * Class Processor
@@ -61,6 +62,11 @@ class Processor
      */
     protected $storeManager;
 
+    /**
+     * @var \Magento\Tools\SampleData\ObserverManager
+     */
+    protected $observerManager;
+
     /**
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Phrase\Renderer\CompositeFactory $rendererCompositeFactory
@@ -73,6 +79,7 @@ class Processor
      * @param \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoaderFactory $shipmentLoaderFactory
      * @param \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoaderFactory $creditmemoLoaderFactory
      * @param \Magento\Tools\SampleData\Helper\StoreManager $storeManager
+     * @param \Magento\Tools\SampleData\ObserverManager $observerManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -86,7 +93,8 @@ public function __construct(
         \Magento\Sales\Model\Service\OrderFactory $serviceOrderFactory,
         \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoaderFactory $shipmentLoaderFactory,
         \Magento\Sales\Controller\Adminhtml\Order\CreditmemoLoaderFactory $creditmemoLoaderFactory,
-        \Magento\Tools\SampleData\Helper\StoreManager $storeManager
+        \Magento\Tools\SampleData\Helper\StoreManager $storeManager,
+        \Magento\Tools\SampleData\ObserverManager $observerManager
     ) {
         $this->coreRegistry = $coreRegistry;
         $this->rendererCompositeFactory = $rendererCompositeFactory;
@@ -99,6 +107,7 @@ public function __construct(
         $this->shipmentLoaderFactory = $shipmentLoaderFactory;
         $this->creditmemoLoaderFactory = $creditmemoLoaderFactory;
         $this->storeManager = $storeManager;
+        $this->observerManager = $observerManager;
     }
 
     /**
@@ -123,11 +132,11 @@ public function createOrder($orderData)
             $order = $orderCreateModel
                 ->importPostData($orderData['order'])
                 ->createOrder();
-            $transactionOrder = $this->getOrderItemForTransaction($order);
-            $this->invoiceOrder($transactionOrder);
-            $this->shipOrder($transactionOrder);
+            $orderItem = $this->getOrderItemForTransaction($order);
+            $this->invoiceOrder($orderItem);
+            $this->shipOrder($orderItem);
             if ($orderData['refund'] === "yes") {
-                $this->refundOrder($transactionOrder, $order->getBaseGrandTotal());
+                $this->refundOrder($orderItem);
             }
             $registryItems = [
                 'rule_data',
@@ -239,21 +248,13 @@ protected function shipOrder(\Magento\Sales\Model\Order\Item $orderItem)
 
     /**
      * @param \Magento\Sales\Model\Order\Item $orderItem
-     * @param string $storeCreditAmount
      * @return void
      */
-    protected function refundOrder(\Magento\Sales\Model\Order\Item $orderItem, $storeCreditAmount = '')
+    protected function refundOrder(\Magento\Sales\Model\Order\Item $orderItem)
     {
-        $creditmemoData = [
-            $orderItem->getId() => $orderItem->getQtyToRefund(),
-        ];
-        if (!empty($storeCreditAmount)) {
-            $creditmemoData['refund_customerbalance_return_enable'] = '1';
-            $creditmemoData['refund_customerbalance_return'] = '32';
-        }
         $creditmemoLoader = $this->creditmemoLoaderFactory->create();
         $creditmemoLoader->setOrderId($orderItem->getOrderId());
-        $creditmemoLoader->setCreditmemo($creditmemoData);
+        $creditmemoLoader->setCreditmemo($this->getCreditmemoData($orderItem));
         $creditmemo = $creditmemoLoader->load();
         if ($creditmemo && $creditmemo->isValidGrandTotal()) {
             $creditmemo->setOfflineRequested(true);
@@ -265,6 +266,26 @@ protected function refundOrder(\Magento\Sales\Model\Order\Item $orderItem, $stor
         }
     }
 
+    /**
+     * @param \Magento\Sales\Model\Order\Item $orderItem
+     * @return array
+     */
+    public function getCreditmemoData(\Magento\Sales\Model\Order\Item $orderItem)
+    {
+        $data = [$orderItem->getId() => $orderItem->getQtyToRefund()];
+        foreach ($this->observerManager->getObservers() as $observer) {
+            if (is_callable([$observer, 'getCreditmemoData'])) {
+                $params = new Object([
+                    'order_item' => $orderItem,
+                    'credit_memo' => $data
+                ]);
+                $data = $observer->getCreditmemoData($params);
+            }
+        }
+
+        return $data;
+    }
+
     /**
      * Set phrase renderer
      * @return void
diff --git a/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php b/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php
index 6a9f01e751381..6ea7e6fa1bd49 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Theme/Setup.php
@@ -112,9 +112,10 @@ public function __construct(
      */
     public function run()
     {
-        $this->logger->log('Installing theme...');
+        $this->logger->log('Installing theme:');
         $this->assignTheme();
         $this->addHeadInclude();
+        $this->logger->log('.');
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/ObserverManager.php b/dev/tools/Magento/Tools/SampleData/ObserverManager.php
new file mode 100644
index 0000000000000..120fd04a82197
--- /dev/null
+++ b/dev/tools/Magento/Tools/SampleData/ObserverManager.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Tools\SampleData;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Module\ModuleListInterface;
+
+/**
+ * Class ObserverManager
+  */
+class ObserverManager
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var ModuleListInterface
+     */
+    protected $moduleList;
+
+    /**
+     * @var array
+     */
+    protected $observers;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager, ModuleListInterface $moduleList)
+    {
+        $this->objectManager = $objectManager;
+        $this->moduleList = $moduleList;
+    }
+
+    /**
+     * @return array
+     */
+    public function getObservers()
+    {
+        if (!is_null($this->observers)) {
+            return $this->observers;
+        }
+
+        $this->observers = [];
+        foreach ($this->moduleList->getNames() as $module) {
+            $parts = explode('_', $module);
+            $class = 'Magento\Tools\SampleData\Module\\' . $parts[1] . '\Observer';
+            if (class_exists($class)) {
+                $this->observers[] = $this->objectManager->get($class);
+            }
+        }
+
+        return $this->observers;
+    }
+}

From 57f0244b15b639f835694796d08d989999262510 Mon Sep 17 00:00:00 2001
From: Kostiantyn Poida <kpoida@ebay.com>
Date: Fri, 12 Dec 2014 20:51:04 +0200
Subject: [PATCH 384/474] MAGETWO-31049: M2 GitHub Update (version
 0.1.0-alpha108)

- fixed ChangeLog
---
 .../publication/extra_files/ce/CHANGELOG.md   | 256 +++++++++---------
 1 file changed, 127 insertions(+), 129 deletions(-)

diff --git a/dev/build/publication/extra_files/ce/CHANGELOG.md b/dev/build/publication/extra_files/ce/CHANGELOG.md
index f3c14bcb9e4d3..42f7ae6ca9371 100644
--- a/dev/build/publication/extra_files/ce/CHANGELOG.md
+++ b/dev/build/publication/extra_files/ce/CHANGELOG.md
@@ -1,15 +1,15 @@
 0.1.0-alpha108
 =============
 * Service Contracts:
-    * Implemented Bundle Product API (MAGETWO-30985)
-    * Replaced Address Converted model with Address Mapper (MAGETWO-31098)
-    * Refactored Customer web service routes and API functional tests to use latest service layer (MAGETWO-29282 and MAGETWO-30842)
-    * Implemented Configurable Product Module API (MAGETWO-29420)
-    * Removed obsolete namespace Magento\Catalog\Service (MAGETWO-31488)
+    * Implemented Bundle Product API
+    * Replaced Address Converted model with Address Mapper
+    * Refactored Customer web service routes and API functional tests to use latest service layer
+    * Implemented Configurable Product Module API
+    * Removed obsolete namespace Magento\Catalog\Service
 * Price calculation logic:
-    * Removed complex JS price calculation on the frontend (MAGETWO-21532)
+    * Removed complex JS price calculation on the frontend
 * Fixed bugs:
-    * Fixed an issue where the path parameter routes were incorrectly matched in the REST web services (MAGETWO-29964)
+    * Fixed an issue where the path parameter routes were incorrectly matched in the REST web services
     * Fixed an issue where $0.00 was shown as a configurable product price if variation did not add anything to product price
     * Fixed an issue where the fatal error occurred when a user with read-only permissions for cart price rules attempted to open an existing cart price rule
     * Fixed an issue where the 'An order with subscription items was registered.' message was displayed in an order if it has been placed using an online payment method
@@ -24,142 +24,140 @@
     * Fixed an issue where Maximum Query Length was not applied to Quick Search
     * Fixed an issue where searching by product name did not return suggested search terms
     * Fixed an issue with an incorrect dependency of the MySQL search adapter on CatalogSearch
-    * Wrong dependency of Search library on MySQL adapter (MAGETWO-31041)
+    * Fixed an issue with incorrect dependency of the Search library on the MySQL adapter
     * Fixed an issue where Advanced Search always returned empty result for multiselect product attributes
     * Fixed an issue where an admin user was redirected to the 404 page after deleting search terms through using mass action
-    * New product page freezes when trying to save configurable product if another dropdown attribute already exists in default template (MAGETWO-30470)
-    * Cannot place order for downloadable product with link (MAGETWO-31130)
-    * Parent category displayed in layered navigation on Search results page (MAGETWO-27178)
-    * Price attribute in Layered Navigation is not displayed correct if search was made by this attribute (MAGETWO-25199)
-    * Import configurable products creates entities out of stock (MAGETWO-27177)
-    * [IE9] Dropdown lists are closing by themselves (MAGETWO-31181)
-    * can't place order with Payments Pro and 3D Secure (MAGETWO-28789)
-    * Bundle items always show "user defined" as checked (MAGETWO-31252)
-    * View management selectors don't work on Catalog frontend page (MAGETWO-31319)
-    * Base Image label is not set on Product Details tab after upload of first image (MAGETWO-31338)
-    * Edit product lead to data loss and broken media links (MAGETWO-31120)
-    * Fixed an issue whith delete action that does not work for google attribute on attribute set mapping page (MAGETWO-26764)
-    * Fixed an issue when Catalog Product unassigned from category when restricted user edit price (MAGETWO-28908)
-    * Fixen an issue when fatal error appears in RSS page for new products and special products (MAGETWO-30704)
-    * Fixed the issue with Exception occured when user clicks Customer Address Attribute ->Add New Attribute (MAGETWO-31421)
-    * Can not install Magento with some time zones (MAGETWO-31374)
-    * compiler fails (MAGETWO-31095)
-    * Some locales are absent in Interface Locale drop-down (MAGETWO-30883)
-    * Offloader header in Magento 2 backend does not appear to work. (MAGETWO-15253)
-    * failure to autoload custom classes (MAGETWO-31123)
-    * Products do not Disappear from Shopping Cart after Checkout (MAGETWO-30998)
-    * Change Quantity Action in the Shopping Cart Removes Product Completely (MAGETWO-31075)
-    * Persistent Shopping Cart Feature 'Not username?' is not Available under Luma Theme (MAGETWO-29451)
-    * Category Tree Becomes Broken in Specific Case (MAGETWO-31250)
-    * Bundle Configuration does not Update the "Price as Configured" Price (MAGETWO-31385)
-    * [FPT] Final price is not displayed on product and category when weee display is set to "Excluding FPT, FPT description, final price" (MAGETWO-29617)
-    * Incorrect From: To: Price display for Bundle Product (MAGETWO-31173)
-    * HTTP 500 error on Share Wishlist page (MAGETWO-31452)
-    * Wrong order of dispatching event adminhtml_cms_page_edit_tab_content_prepare_form and setting form values in Admin area (MAGETWO-8125)
-    * Breadcrumbs not displaying full path (MAGETWO-21129)
-    * CMS page created with 4 widgets of which only top 2 are functional. Bottom two do not have any (MAGETWO-18285)
-    * Unable to save changed locale for admin account (MAGETWO-28804)
-    * Frontend: Icons are not loaded on non-secure pages if secure urls are used on frontend (MAGETWO-28877)
-    * Layout overriding doesn't work after theme renaming (MAGETWO-23521)
-    * Permission tree is not displayed during activation of integration (MAGETWO-30270)
-    * Corrupted and Duplicated Page Layouts (MAGETWO-30976)
-    * "Number of Products per Page" option doens't work for Widgets of List type (MAGETWO-30045)
-    * HTTP and HTTPS cache of the same page is shared (MAGETWO-31178)
-    * "Use Billing Address" checkbox does not affect checkout experience (MAGETWO-31076)
-    * Cannot create shipping label (MAGETWO-31443)
-    * Billing Agreement contains empty Payment Method on frontend if BA was created during checkout (MAGETWO-19627)
-    * [TD] Fix integration test according to story MAGETWO-23885 (MAGETWO-24796)
-    * Fixed an issue when Catalog Rule Product indexer invalidated price index (MAGETWO-31322)
-    * [FF] Advanced Search: Price top range field UI is broken (MAGETWO-31126)
-    * Product base image is scaled up on "View Product" frontend page (MAGETWO-31199)
-    * Layout issue on Contact Us form (MAGETWO-31045)
-    * [Responsive themes] Search suggestions are not clickable (MAGETWO-31378)
-    * [Responsive themes] Products are overlapped with footer on category page Win8 IE11 (MAGETWO-31379)
-    * Blank & Luma Themes UI bugs (Part 4) (MAGETWO-31466)
-    * Exception if move category to another category which contain category with same url key (MAGETWO-30988)
-    * Incorrect product displays on Reviews tab for Configurable product (MAGETWO-30916)
-    * Resolved fatal errors when calling id() on a null store object (MAGETWO-25949)
-    * Improved API functional test invocation. You no longer have to use Ant to setup the tests (MAGETWO-31340)
-    * Refactored StoreManagerInterface not to violate modularity principle (MAGETWO-29245)
-    * Bug related to dashboard tab (MAGETWO-30999)
-    * Incorrect price for bundle product on category view and search view (MAGETWO-30471)
-    * Fixed issue where custom Customer & Customer Address attributes aren't displayed on "Create / Edit Customer" backend form (MAGETWO-30827)
-    * There is no validation for create option for bundle (MAGETWO-31320)
-    * Bundle product, created using API service, cannot be presented on frontend (MAGETWO-31357)
-    * Fixed clumsy logic in isSubtotal method of Magento\Reports\Model\Resource\Report\Collection\AbstractCollection (MAGETWO-31127)
-    * Fixed missing entity ID for product thumbnail labels values (MAGETWO-20120)
-    * Fixed bad return from indexer launch (MAGETWO-29829)
-    * Fixed issue when chooser for attribute 'SKU' redirected to Dashboard in shopping cart price rules edit page (MAGETWO-31414)
-    * Fixed issue where Search Term Reports and Search Tesm in backend did not work (MAGETWO-31391)
-    * Fixed error while configuring Google API (MAGETWO-31456)
-    * It's impossible to add Configurable Product variation while Order creating in backend (MAGETWO-31393)
-    * There is no confirmation to delete CMS Page / Block (MAGETWO-29306)
-    * Edit product lead to data loss and broken media links (MAGETWO-31120)
-    * Customer validation has wrong behaviour for "Quick Search" frontend input field (MAGETWO-31202)
-    * Cannot check grid row on CMS Pages and CMS Blocks (MAGETWO-31564)
-    * Min/max text length validation of Customer & Customer Address attributes' values doesn't work on "Create / Edit Customer" backend form (MAGETWO-31502)
-    * "validate-digits-range" validation is broken (MAGETWO-25640)
-    * Unable to delete Attribute Set (MAGETWO-31188)
-    * Products aren't shown on second website (MAGETWO-31190)
-    * Customer Group for grouped price is empty on create product page (MAGETWO-31179)
-    * Incorrect interval in LN(equalize product counts) for small values (MAGETWO-30818)
-    * Price attribute isn't displayed in layered navigation (MAGETWO-31560)
-    * Failure testCreateCustomer in parallel run (MAGETWO-31435)
-    * Bill-to' name is always displayed instead of 'Ship-to' customer name in all order-related grids (MAGETWO-31087)
-    * Error on submitting order from backend with different shipping and billing addresses (MAGETWO-31439)
-    * Navigation menu is absent on product page with Varnish if product sku contains space (MAGETWO-31638)
-    * MAGETWO-3315 - Fixed _underscore handling of digits
-    * MAGETWO-10108 - Fixed Comments for fields number_limit and text_limit in wishlist are not localized
-    * MAGETWO-24665 - Fixed Joining the Same Table with Different Aliases in Collection
+    * Fixed an issue where a product page was frozen when a configurable attribute was added to a current product template during saving a configurable product
+    * Fixed an issue where it was impossible to place an order with downloadable product that contained a link
+    * Fixed an issue where only parent category was displayed in layered navigation on the Search results page
+    * Fixed an issue where the Price attribute was incorrectly displayed in layered navigation if searching by this attribute
+    * Fixed an issue where importing configurable products set them out of stock
+    * Fixed an issue where drop-down lists were closing by themselves in Internet Explorer 9
+    * Fixed an issue where it was impossible to place an order using PayPal Payment Pro and 3D Secure
+    * Fixed an issue where bundle items were always marked as 'User Defined'
+    * Fixed an issue where view management selectors did not work in categories on the frontend
+    * Fixed an issue where the 'Base' image label was not applied to a first product image uploaded
+    * Fixed an issue where editing a product led to data loss and broken media links
+    * Fixed an issue where attributes could not be deleted from the Google Content Attributes page
+    * Fixed an issue where a product was unassigned from a category after it was edited by an admin user with read/edit permissions for product price only
+    * Fixed an issue where the fatal error occurred on the RSS page for new products and special products
+    * Fixed an issue where the fatal error occurred when adding a new Customer Address Attribute
+    * Fixed an issue where it was impossible to install Magento when specific time zones were set
+    * Fixed an issue where compiler.php failed not handle inheritance from virtual classes
+    * Fixed an issue where some locales were absent in the 'Interface Locales' drop-down in the backend
+    * Fixed an issue where the Offloader header did not work in the backend
+    * Fixed an issue where autoloader failed to load custom classes
+    * Fixed an issue where products did not disappear from the shopping cart after checkout
+    * Fixed an issue where changing quantity of a product in the shopping cart removed product from cart
+    * Fixed an issue where the Persistent Shopping Cart functionality was not available if Luma theme was applied
+    * Fixed an issue where the category tree was broken if editing a category name in specific cases
+    * Fixed an issue where 'Price as Configured' value was not updated for a bundle product after changing the value of the 'Price View' field
+    * Fixed an issue where the final product price was displayed incorrectly in a category and a product page if price display setting was set to exclude FPT, FPT description, and final price
+    * Fixed an issue where product price range was displayed incorrectly for bundle products
+    * Fixed an issue where the HTTP 500 error occurred on the Share Wishlist page
+    * Fixed an issue with the incorrect order of dispatching event adminhtml_cms_page_edit_tab_content_prepare_form and setting form values in the backend
+    * Fixed an issue where breadcrumbs were not displaying the fullpath
+    * Fixed an issue where only two of four widgets added to a CMS page were displayed
+    * Fixed an issue where it was impossible to save locale for an admin account after changing it
+    * Fixed an issue where icons were not loaded on a non-secure pages if secure URLs were used in the frontend
+    * Fixed an issue where overriding layouts did not work after renaming a theme
+    * Fixed an issue where the Permissions tree was not displayed when activating an integration
+    * Fixed an issue with duplicated and corrupted page layouts
+    * Fixed an issue where the 'Number of Products per Page' option did not work for widgets of the 'List' type
+    * Fixed an issue where HTTP and HTTPS pages shared cache content
+    * Fixed an issue where the 'Use Billing Address' checkbox did not affect did not affect the checkout experience
+    * Fixed an issue where it was impossible to create shipping labels
+    * Fixed an issue where the 'Payment Method' section was empty in billing agreements in the frontend if a billing agreement was created during the checkout
+    * Fixed an issue with Catalog Rule Product indexer invalidating the price index
+    * Fixed an issue where one of the price range fields was corrupted in the Advanced Search page
+    * Fixed an issue where a base product image that was smaller than the gallery image container was scaled up to fill the container on the View Product page in the frontend
+    * Fixed the layout issue on the Contact Us page
+    * Fixed an issue where search queries were not submitted when a search suggestion was clicked
+    * Fixed an issue where page footer overlapped products in categories in Internet Explorer 11
+    * Fixed UI issues in the Luma theme
+    * Fixed an issue when the fatal error occurred if a category was moved to another category that already contained category with the same URL key
+    * Fixed an issue where incorrect products were displayed on the Reviews tab for a configurable product
+    * Fixed an issue where fatal errors occurred when calling id() on a null store object
+    * Fixed an issue where navigation through the tabs on the Dashboard did not work properly
+    * Fixed an issue where prices for bundle products were incorrect on the category view and search view pages
+    * Fixed an issue where custom Customer attributes and Customer Address attributes were not displayed on the 'Create/Edit Customer' page in thebackend
+    * Fixed an issue where there were no validation for whether an option of a bundle product was created through the API
+    * Fixed an issue where bundle products created through using the API were not appearing in the frontend
+    * Fixed an issue where entity ID was missing for product thumbnail labels values
+    * Fixed an issue with the bad return from the Indexer launch() method
+    * Fixed an issue where an attempt to select product SKU in a shopping cart price rule redirected to the Dashboard
+    * Fixed an issue where the Search Terms Reports and Search Terms list did not work
+    * Fixed an issue where an error occurred when configuring Google API
+    * Fixed an issue where it was impossible to add a configurable product variation to an order in the backend
+    * Fixed an issue where there were no confirmation on deleting CMS pages/Blocks
+    * Fixed an issue with incorrect behavior of validation in the Quick Search field in the frontend
+    * Fixed an issue where it was impossible to select a row in the grid of CMS pages and CMS Blocks
+    * Fixed an issue where validation for minimum and maximum field value length was not performed for Customer attributes and Customer Address attributes when creating or editing a customer in the backend
+    * Fixed an issue with broken 'validate-digits-range' validation
+    * Fixed an issue where it was impossible to delete product templates
+    * Fixed an issue where products were not shown on a second website
+    * Fixed an issue where customer group was empty when adding group price during creating a product
+    * Fixed an issue with incorrect interval in LN for small values
+    * Fixed an issue where product attribute of the Price type was not displayed in layered navigation
+    * Fixed an issue with testCreateCustomer failing in parallel run
+    * Fixed an issue with the value of the 'Bill to Name' field always displayed instead of the value of the 'Ship to Name' in all order-related grids
+    * Fixed an issue where an error occurred when submitting an order int he backend when shipping and billing addresses were different
+    * Fixed an issue where the navigation menu was absent on product pages with Varnish used
+    * Fixed an issue where the underscore character was incorrectly handled when used with digits
+    * Fixed an issue where it was impossible to localize comments in the 'Max Emails Allowed to be Sent' and 'Email Text Length Limit' fields in the Wishlist configuration
+    * Fixed an issue where there were a logical error in joining the same table two times with different aliases
 * Sample data:
-    * Created Luma Sample Data script (MAGETWO-23477)
+    * Created Luma Sample Data script
 * GitHub requests:
-    * [#775](https://github.com/magento/magento2/issues/775) -- Can't save changes in configuration in Configuration->Advanced->System #775
-    * [#716](https://github.com/magento/magento2/issues/716) -- Wrong mimetype returned by getMimeType from Magento library #716
-    * [#681](https://github.com/magento/magento2/issues/681) -- Magento\Framework\Xml\Parser class issues #681
-    * [#758](https://github.com/magento/magento2/issues/758) -- Coding standards: arrays #758 - short array syntax applied to the whole code base and enforced by phpcs sniff
+    * [#775](https://github.com/magento/magento2/issues/775) -- Can't save changes in configuration in Configuration->Advanced->System
+    * [#716](https://github.com/magento/magento2/issues/716) -- Wrong mimetype returned by getMimeType from Magento library
+    * [#681](https://github.com/magento/magento2/issues/681) -- Magento\Framework\Xml\Parser class issues
+    * [#758](https://github.com/magento/magento2/issues/758) -- Coding standards: arrays
     * [#169](https://github.com/magento/magento2/issues/169) -- DDL cache should be tagged
     * [#738](https://github.com/magento/magento2/issues/738) -- pub/setup missing in 0.1.0-alpha103
 * Various improvements:
-    * Removed obsolete code from Tax and Weee module (MAGETWO-31057)
-    * Merged AdminNotification, Integration, Authorization, and WebAPI sql scripts (MAGETWO-31525)
-    * Removed Customer Converter model and Address Converter model. (MAGETWO-31228, MAGETWO-31416)
-    * Created AJAX Authentication Endpoint for frontend (MAGETWO-31353)
-    * Removed Customer\Service\V1 service implementation. Use the Customer\Api service implementation instead (MAGETWO-31046)
-    * Recurring Billing Functionality Removal (MAGETWO-31434)
-    * Modularity Work (composer.json suggest) (MAGETWO-31437)
-    * Consolidated SQL install and data scripts for many modules (MAGETWO-31588, MAGETWO-31612, MAGETWO-31073)
-    * Created static test to check that README.md file exist in modules (MAGETWO-31392)
-    * Remove Unused Code (MAGETWO-4098)
-    * License Notices in Files (MAGETWO-1225)
-    * CatalogRule modularity enhancements (MAGETWO-28282)
-    * Remove @deprecated methods from code base - PS Domain (MAGETWO-31055)
-    * Remove @deprecated methods from code base - MX Domain (MAGETWO-31054)
-    * Test enforcing @covers annotation refers to only existing classes and methods (MAGETWO-31424)
-    * PHP Coding Standards Fixer configuration file added to project root (MAGETWO-31426)
-    * Git hook for coding style automatic correction before actual push (MAGETWO-31426)
-    * Ability to enforce no error log messages during tests execution (MAGETWO-31423)
-    * Remove Api Interfaces from Cms module (MAGETWO-31483)
+    * Removed obsolete code from the Tax and Weee modules
+    * Merged the AdminNotification, Integration, Authorization, and WebAPI SQL scripts
+    * Removed the Customer Converter model and Address Converter model
+    * Created AJAX Authentication Endpoint for the frontend
+    * Removed Customer\Service\V1 service implementation in favor of the Customer\Api service implementation
+    * Removed the Recurring Billing functionality
+    * Added the 'suggest' node to composer.json files to mark modules that are optional
+    * Consolidated SQL install and data scripts for the rest of the modules
+    * Added static test verifying that README.md file exist in modules
+    * Removed obsolete code
+    * Removed license notices in files
+    * Eliminated invalid dependencies of the CatalogRule module
+    * Removed @deprecated methods from the code base
+    * Added test enforcing @covers annotation refers to only existing classes and methods
+    * Added the PHP Coding Standards Fixer configuration file to the project root
+    * Added Git hook to automatically correct coding style before actual push
+    * Added the ability to enforce no error log messages during tests execution
+    * Removed API interfaces from the Cms module
     * Updated jQuery used to version 1.11
     * Added wildcard prefix for all search words in search requests for Match query
     * Renamed frontend properties for some of the product attributes
+    * Fixed the Magento\Centinel\CreateOrderTest integration test
+    * Improved invoking for functional tests
+    * Refactored StoreManagerInterface to avoid violating the modularity principle
+    * Improved the logic in the isSubtotal method in Magento\Reports\Model\Resource\Report\Collection\AbstractCollection
 * Framework improvements:
-    * Added copy of dependencies for Magento components to the root composer.json in order to make Composer validate them (MAGETWO-29704)
-* Setup Tool improvements (MAGETWO-29035 & MAGETWO-29704):
-    * Moved dependencies from setup/composer.json to the root composer.json and removed the former one. No necessity to run composer install/update under setup folder anymore
-    * Removed dependencies on unnecessary ZF2 libraries to reduce amount of downloaded libraries
+    * Added a copy of dependencies for Magento components to the root composer.json file
+* Setup Tool improvements:
+    * Moved dependencies from setup/composer.json to the root composer.json and removed the former one
+    * Removed dependencies on unnecessary ZF2 libraries
     * Removed dependency on exec() calls
     * Removed tool dev/shell/run_data_fixtures.php in favor of Setup Toolphp setup/index.php install-data
     * Removed tool dev/shell/user_config_data.php in favor of Setup Tool php setup/index.php install-user-configuration
-    * Validation of the required information in each installation step in setup tool (MAGETWO-27306):
-        * Web UI
-            * Removed 'test connection' button in web setup UI, functionality is now performed when 'Next' button is clicked (MAGETWO-30951)
-            * Validation of URL format in web setup UI (MAGETWO-30953)
-            * Automatically adding trailing slash to base URL field if user did not provide one (MAGETWO-30953)
-            * Validation of admin user password in web setup UI (MAGETWO-30834)
-            * Validation of HTTPS configuration in web setup UI (MAGETWO-30859)
-        * CLI
-            * Validation of CLI, display missing/extra parameters and missing/unnecessary parameter values (MAGETWO-31004)
+    * Added validation of the required information on each installation step in the Setup tool:
+        * Web UI:
+            * Removed the 'Test Connection' button in web setup UI; checking connection to the database server is now performed when the 'Next' button is clicked
+            * Added validation of URL format
+            * Added automatic adding of the trailing slash to the base URL field if a user did not provide one
+            * Added validation of admin user password
+            * Added validation of HTTPS configuration
+        * CLI:
+            * Added validation of CLI to display missing/extra parameters and missing/unnecessary parameter values
 
 0.1.0-alpha107
 =============

From 53ca85899c71ba4b1583e54da490f9663cda173a Mon Sep 17 00:00:00 2001
From: Anup Dugar <anup@x.com>
Date: Fri, 12 Dec 2014 14:22:03 -0600
Subject: [PATCH 385/474] MAGETWO-31415: View Files population tool doesn't
 work when application is not installed

- Fix exception message as requested by UX in the issue comment
---
 dev/tools/Magento/Tools/View/deploy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/Magento/Tools/View/deploy.php b/dev/tools/Magento/Tools/View/deploy.php
index d4d322e9ae5df..1a156a7d64019 100644
--- a/dev/tools/Magento/Tools/View/deploy.php
+++ b/dev/tools/Magento/Tools/View/deploy.php
@@ -53,7 +53,7 @@
 $deploymentConfig = $objectManager->get('Magento\Framework\App\DeploymentConfig');
 $isAppInstalled = $deploymentConfig->isAvailable();
 if (!$isAppInstalled) {
-    throw new \Exception('Application is not installed yet.');
+    throw new \Exception('Please install the Magento application before running this process.');
 }
 
 $logger = new \Magento\Tools\View\Deployer\Log($verbosity);

From 46686a2e1aac3a9c582a3b44dc21cb32a086d00b Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Fri, 12 Dec 2014 14:35:46 -0600
Subject: [PATCH 386/474] MAGETWO-29419: Tax summary and detail differ by 1
 cent in invoice and credit memo for partial invoice when discount and fpt are
 applied

    - Fixed problem with credit memo tax details
---
 .../Magento/Sales/Model/Order/Creditmemo.php  | 13 +--
 .../Sales/Model/Order/CreditmemoTest.php      | 81 +++++++++++++++++--
 2 files changed, 82 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 324f9af688ddb..2a4c7be38c3b1 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -296,13 +296,16 @@ public function getShippingAddress()
      */
     public function getItemsCollection()
     {
-        $collection = $this->_cmItemCollectionFactory->create()->setCreditmemoFilter($this->getId());
-        if ($this->getId()) {
-            foreach ($collection as $item) {
-                $item->setCreditmemo($this);
+        if (!$this->hasData(CreditmemoInterface::ITEMS)) {
+            $this->setItems($this->_cmItemCollectionFactory->create()->setCreditmemoFilter($this->getId()));
+
+            if ($this->getId()) {
+                foreach ($this->getItems() as $item) {
+                    $item->setCreditmemo($this);
+                }
             }
         }
-        return $collection;
+        return $this->getItems();
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
index 5dfe0f258c31a..a111816f19bca 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
@@ -6,6 +6,8 @@
 
 use Magento\Sales\Model\Resource\OrderFactory;
 use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory;
+use Magento\Sales\Model\Resource\Order\Creditmemo\Item\Collection as ItemCollection;
 
 /**
  * Class CreditmemoTest
@@ -22,6 +24,11 @@ class CreditmemoTest extends \PHPUnit_Framework_TestCase
      */
     protected $creditmemo;
 
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $cmItemCollectionFactoryMock;
+
     public function setUp()
     {
         $this->orderFactory = $this->getMock(
@@ -33,6 +40,14 @@ public function setUp()
         );
 
         $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->cmItemCollectionFactoryMock = $this->getMock(
+            'Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory',
+            [],
+            [],
+            '',
+            false
+        );
+
         $arguments = [
             'context' => $this->getMock('Magento\Framework\Model\Context', [], [], '', false),
             'registry' => $this->getMock('Magento\Framework\Registry', [], [], '', false),
@@ -40,13 +55,7 @@ public function setUp()
             'dateTime' => $this->getMock('Magento\Framework\Stdlib\DateTime', [], [], '', false),
             'creditmemoConfig' => $this->getMock('Magento\Sales\Model\Order\Creditmemo\Config', [], [], '', false),
             'orderFactory' => $this->orderFactory,
-            'cmItemCollectionFactory' => $this->getMock(
-                    'Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory',
-                    [],
-                    [],
-                    '',
-                    false
-                ),
+            'cmItemCollectionFactory' => $this->cmItemCollectionFactoryMock,
             'calculatorFactory' => $this->getMock('Magento\Framework\Math\CalculatorFactory', [], [], '', false),
             'storeManager' => $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
             'commentFactory' => $this->getMock(
@@ -128,4 +137,62 @@ public function testGetIncrementId()
         $this->creditmemo->setIncrementId('test_increment_id');
         $this->assertEquals('test_increment_id', $this->creditmemo->getIncrementId());
     }
+
+    public function testGetItemsCollectionWithId()
+    {
+        $id = 1;
+        $this->creditmemo->setId($id);
+
+        $items = [];
+        $itemMock = $this->getMockBuilder('\Magento\Sales\Model\Order\Creditmemo\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $itemMock->expects($this->once())
+            ->method('setCreditmemo')
+            ->with($this->creditmemo);
+        $items[] = $itemMock;
+
+        /** @var ItemCollection|\PHPUnit_Framework_MockObject_MockObject $itemCollectionMock */
+        $itemCollectionMock = $this->getMockBuilder('\Magento\Sales\Model\Resource\Order\Creditmemo\Item\Collection')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $itemCollectionMock->expects($this->once())
+            ->method('setCreditmemoFilter')
+            ->with($id)
+            ->will($this->returnValue($items));
+
+        $this->cmItemCollectionFactoryMock->expects($this->any())
+            ->method('create')
+            ->will($this->returnValue($itemCollectionMock));
+
+        $itemsCollection = $this->creditmemo->getItemsCollection();
+        $this->assertEquals($items, $itemsCollection);
+    }
+
+    public function testGetItemsCollectionWithoutId()
+    {
+        $items = [];
+        $itemMock = $this->getMockBuilder('\Magento\Sales\Model\Order\Creditmemo\Item')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $itemMock->expects($this->never())
+            ->method('setCreditmemo');
+        $items[] = $itemMock;
+
+        /** @var ItemCollection|\PHPUnit_Framework_MockObject_MockObject $itemCollectionMock */
+        $itemCollectionMock = $this->getMockBuilder('\Magento\Sales\Model\Resource\Order\Creditmemo\Item\Collection')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $itemCollectionMock->expects($this->once())
+            ->method('setCreditmemoFilter')
+            ->with(null)
+            ->will($this->returnValue($items));
+
+        $this->cmItemCollectionFactoryMock->expects($this->any())
+            ->method('create')
+            ->will($this->returnValue($itemCollectionMock));
+
+        $itemsCollection = $this->creditmemo->getItemsCollection();
+        $this->assertEquals($items, $itemsCollection);
+    }
 }

From 7a8da830bb094c98a89efa4f6a2aed94b544606c Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Fri, 12 Dec 2014 15:27:10 -0600
Subject: [PATCH 387/474] MAGETWO-31658: Some locales are absent in 'Store
 Default Language' select while installation

- Simplified the loops.
---
 setup/module/Magento/Setup/src/Model/Lists.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/setup/module/Magento/Setup/src/Model/Lists.php b/setup/module/Magento/Setup/src/Model/Lists.php
index 92d417e67110d..206095b1febcf 100644
--- a/setup/module/Magento/Setup/src/Model/Lists.php
+++ b/setup/module/Magento/Setup/src/Model/Lists.php
@@ -83,18 +83,12 @@ public function getLocaleList()
         foreach ($this->allowedLocales as $code) {
             $allowedAliases[$this->zendLocale->getAlias($code)] = $code;
         }
-        //Internal locale codes translated from Zend locale codes
-        $processedLocales = [];
+
+        $list = [];
         foreach ($locales as $code => $active) {
             if (array_key_exists($code, $allowedAliases)) {
-                $processedLocales[$allowedAliases[$code]] = $active;
-            } else {
-                $processedLocales[$code] = $active;
+                $code = $allowedAliases[$code];
             }
-        }
-
-        $list = [];
-        foreach ($processedLocales as $code => $active) {
             if (strstr($code, '_')) {
                 $data = explode('_', $code);
                 if (!isset($languages[$data[0]]) || !isset($countries[$data[1]])) {

From c8d965a7aa495f0296de8bf7e36e0cd63d7ef941 Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Fri, 12 Dec 2014 15:36:34 -0600
Subject: [PATCH 388/474] MAGETWO-29419: Tax summary and detail differ by 1
 cent in invoice and credit memo for partial invoice when discount and fpt are
 applied

    - Fixed unit test error
---
 .../Magento/Sales/Model/Order/CreditmemoTest.php     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
index a111816f19bca..7e746c92e6900 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
@@ -40,13 +40,11 @@ public function setUp()
         );
 
         $objectManagerHelper = new ObjectManagerHelper($this);
-        $this->cmItemCollectionFactoryMock = $this->getMock(
-            'Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory',
-            [],
-            [],
-            '',
-            false
-        );
+        $this->cmItemCollectionFactoryMock = $this->getMockBuilder(
+            '\Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory'
+        )->disableOriginalConstructor()
+        ->setMethods(['create'])
+        ->getMock();
 
         $arguments = [
             'context' => $this->getMock('Magento\Framework\Model\Context', [], [], '', false),

From eed3bdf661befeaaeb5c125e74a09b40a5332580 Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Fri, 12 Dec 2014 15:38:58 -0600
Subject: [PATCH 389/474] MAGETWO-31745: fixed Exploited Session ID in second
 browser leads to Error

---
 .../testsuite/Magento/Framework/App/HttpTest.php |  9 +++++++++
 .../Magento/Framework/Session/Validator.php      | 16 +++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php
index f0d6bc4524b13..34fab7b34c4aa 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/HttpTest.php
@@ -190,6 +190,15 @@ public function testHandleDeveloperMode()
         $this->assertTrue($this->http->catchException($bootstrap, new \Exception('Test')));
     }
 
+    public function testCatchExceptionSessionException()
+    {
+        $this->responseMock->expects($this->once())->method('setRedirect');
+        $this->responseMock->expects($this->once())->method('sendHeaders');
+        $bootstrap = $this->getMock('Magento\Framework\App\Bootstrap', [], [], '', false);
+        $bootstrap->expects($this->once())->method('isDeveloperMode')->willReturn(false);
+        $this->assertTrue($this->http->catchException($bootstrap, new \Magento\Framework\Session\Exception('Test')));
+    }
+
     /**
      * Prepares a mock of bootstrap in "not installed" state
      *
diff --git a/lib/internal/Magento/Framework/Session/Validator.php b/lib/internal/Magento/Framework/Session/Validator.php
index 0d2edbe70f5a2..dd751deda02f5 100644
--- a/lib/internal/Magento/Framework/Session/Validator.php
+++ b/lib/internal/Magento/Framework/Session/Validator.php
@@ -77,10 +77,12 @@ public function validate(SessionManagerInterface $session)
         if (!isset($_SESSION[self::VALIDATOR_KEY])) {
             $_SESSION[self::VALIDATOR_KEY] = $this->_getSessionEnvironment();
         } else {
-            if (!$this->_validate()) {
+            try {
+                $this->_validate();
+            } catch (Exception $e) {
                 $session->destroy(['clear_storage' => false]);
                 // throw core session exception
-                throw new Exception('');
+                throw $e;
             }
         }
     }
@@ -89,7 +91,7 @@ public function validate(SessionManagerInterface $session)
      * Validate data
      *
      * @return bool
-     *
+     * @throws Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _validate()
@@ -102,14 +104,14 @@ protected function _validate()
             $this->_scopeType
         ) && $sessionData[self::VALIDATOR_REMOTE_ADDR_KEY] != $validatorData[self::VALIDATOR_REMOTE_ADDR_KEY]
         ) {
-            return false;
+            throw new Exception('Invalid session ' . self::VALIDATOR_REMOTE_ADDR_KEY . ' value.');
         }
         if ($this->_scopeConfig->getValue(
             self::XML_PATH_USE_HTTP_VIA,
             $this->_scopeType
         ) && $sessionData[self::VALIDATOR_HTTP_VIA_KEY] != $validatorData[self::VALIDATOR_HTTP_VIA_KEY]
         ) {
-            return false;
+            throw new Exception('Invalid session ' . self::VALIDATOR_HTTP_VIA_KEY . ' value.');
         }
 
         $httpXForwardedKey = $sessionData[self::VALIDATOR_HTTP_X_FORWARDED_FOR_KEY];
@@ -119,7 +121,7 @@ protected function _validate()
             $this->_scopeType
         ) && $httpXForwardedKey != $validatorXForwarded
         ) {
-            return false;
+            throw new Exception('Invalid session ' . self::VALIDATOR_HTTP_X_FORWARDED_FOR_KEY . ' value.');
         }
         if ($this->_scopeConfig->getValue(
             self::XML_PATH_USE_USER_AGENT,
@@ -131,7 +133,7 @@ protected function _validate()
                     return true;
                 }
             }
-            return false;
+            throw new Exception('Invalid session ' . self::VALIDATOR_HTTP_USER_AGENT_KEY . ' value.');
         }
 
         return true;

From a603e4be13737b77fb6679cfafa3c28da0f3a00b Mon Sep 17 00:00:00 2001
From: Safwan Khan <safwkhan@paypal.com>
Date: Fri, 12 Dec 2014 15:53:02 -0600
Subject: [PATCH 390/474] MAGETWO-31658: Some locales are absent in 'Store
 Default Language' select while installation

- Fixed unused code.
---
 setup/module/Magento/Setup/src/Model/Lists.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/Lists.php b/setup/module/Magento/Setup/src/Model/Lists.php
index 206095b1febcf..6fed03c6b3af1 100644
--- a/setup/module/Magento/Setup/src/Model/Lists.php
+++ b/setup/module/Magento/Setup/src/Model/Lists.php
@@ -85,7 +85,7 @@ public function getLocaleList()
         }
 
         $list = [];
-        foreach ($locales as $code => $active) {
+        foreach (array_keys($locales) as $code) {
             if (array_key_exists($code, $allowedAliases)) {
                 $code = $allowedAliases[$code];
             }

From 2630bc02ea8f97ee46682671c318c0fb4ce5924d Mon Sep 17 00:00:00 2001
From: Anup Dugar <anup@x.com>
Date: Fri, 12 Dec 2014 15:59:51 -0600
Subject: [PATCH 391/474] MAGETWO-31613: [github]
 https://github.com/magento/magento2/issues/790

- Minor CR fixes
---
 app/code/Magento/Webapi/Controller/Request.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Webapi/Controller/Request.php b/app/code/Magento/Webapi/Controller/Request.php
index ed1a6ed5bcf2f..ca37b0b20007d 100644
--- a/app/code/Magento/Webapi/Controller/Request.php
+++ b/app/code/Magento/Webapi/Controller/Request.php
@@ -63,10 +63,9 @@ public function getHeader($header)
         if ($headerValue == false) {
             /** Workaround for php-fpm environment */
             $header = strtoupper(str_replace('-', '_', $header));
-            if (isset($_SERVER[$header]) && in_array($header, array('CONTENT_TYPE', 'CONTENT_LENGTH'))) {
+            if (isset($_SERVER[$header]) && in_array($header, ['CONTENT_TYPE', 'CONTENT_LENGTH'])) {
                 $headerValue = $_SERVER[$header];
             }
-
         }
         return $headerValue;
     }

From f17285745f351a4efbe35546a197838ab02a96a2 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 12 Dec 2014 16:03:28 -0600
Subject: [PATCH 392/474] MAGETWO-31705: Missing static files in production
 mode

- fixed code style
---
 lib/internal/Magento/Framework/View/Asset/File.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/Asset/File.php b/lib/internal/Magento/Framework/View/Asset/File.php
index 6e742ffd775da..f0d43f7edd0ae 100644
--- a/lib/internal/Magento/Framework/View/Asset/File.php
+++ b/lib/internal/Magento/Framework/View/Asset/File.php
@@ -100,7 +100,7 @@ private function join($path, $item)
 
     /**
      * {@inheritdoc}
-     * @throws \LogicException if file cannot be resolved
+     * @throws File\NotFoundException if file cannot be resolved
      */
     public function getSourceFile()
     {

From 2c76c42eaaf5bb36001063bab6b1947392356c24 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 12 Dec 2014 16:05:23 -0600
Subject: [PATCH 393/474] MAGETWO-26736: Errors after execution View Files
 Population Tool

- fixed log message
---
 dev/tools/Magento/Tools/View/Deployer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/Magento/Tools/View/Deployer.php b/dev/tools/Magento/Tools/View/Deployer.php
index 917f321fe523a..7d5ceb6800953 100644
--- a/dev/tools/Magento/Tools/View/Deployer.php
+++ b/dev/tools/Magento/Tools/View/Deployer.php
@@ -192,7 +192,7 @@ private function deployFile($filePath, $area, $themePath, $locale, $module)
                 $requestedPath,
                 ['area' => $area, 'theme' => $themePath, 'locale' => $locale, 'module' => $module]
             );
-            $this->logger->logDebug("\Deploying the file to '{$asset->getPath()}'", '.');
+            $this->logger->logDebug("\tDeploying the file to '{$asset->getPath()}'", '.');
             if ($this->isDryRun) {
                 $asset->getContent();
             } else {

From 8e18bf0f2c2b4940275a245c94948343c526e1f9 Mon Sep 17 00:00:00 2001
From: Bryant Luk <bluk@ebay.com>
Date: Fri, 12 Dec 2014 16:40:53 -0600
Subject: [PATCH 394/474] MAGETWO-31708: Merge Core sql scripts and rename file
 with suffix 2.0.0

- Fix foreign key name
---
 app/code/Magento/Core/sql/core_setup/install-2.0.0.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
index 4df4fcc54212e..526c21c54a955 100644
--- a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
+++ b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
@@ -595,7 +595,7 @@
 $connection->createTable($table);
 
 /**
- * Create table 'core_theme_files'
+ * Create table 'core_theme_file'
  */
 $table = $connection->newTable(
     $installer->getTable('core_theme_file')
@@ -642,7 +642,7 @@
     array('nullable' => false, 'default' => 0),
     'Is Temporary File'
 )->addForeignKey(
-    $installer->getFkName('core_theme_files', 'theme_id', 'core_theme', 'theme_id'),
+    $installer->getFkName('core_theme_file', 'theme_id', 'core_theme', 'theme_id'),
     'theme_id',
     $installer->getTable('core_theme'),
     'theme_id',

From ceaeb15846344469be08daa831b50cded0c018a8 Mon Sep 17 00:00:00 2001
From: Alex Bomko <abomko@ebay.com>
Date: Sat, 13 Dec 2014 00:49:24 +0200
Subject: [PATCH 395/474] MAGETWO-31002: [Spike] Investigate methods of
 publishing sample data packages

- fix tests
---
 .../Tools/SampleData/Module/CustomerBalance/Observer.php      | 2 +-
 dev/tools/Magento/Tools/SampleData/ObserverManager.php        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/tools/Magento/Tools/SampleData/Module/CustomerBalance/Observer.php b/dev/tools/Magento/Tools/SampleData/Module/CustomerBalance/Observer.php
index ed1e3d3e65b0e..02d4a97dd4a60 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/CustomerBalance/Observer.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/CustomerBalance/Observer.php
@@ -6,7 +6,7 @@
 
 /**
  * Class Observer
-  */
+ */
 class Observer
 {
     /**
diff --git a/dev/tools/Magento/Tools/SampleData/ObserverManager.php b/dev/tools/Magento/Tools/SampleData/ObserverManager.php
index 120fd04a82197..2f9f474cfcb93 100644
--- a/dev/tools/Magento/Tools/SampleData/ObserverManager.php
+++ b/dev/tools/Magento/Tools/SampleData/ObserverManager.php
@@ -2,6 +2,7 @@
 /**
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
+
 namespace Magento\Tools\SampleData;
 
 use Magento\Framework\ObjectManagerInterface;
@@ -9,7 +10,7 @@
 
 /**
  * Class ObserverManager
-  */
+ */
 class ObserverManager
 {
     /**
@@ -29,6 +30,7 @@ class ObserverManager
 
     /**
      * @param ObjectManagerInterface $objectManager
+     * @param ModuleListInterface $moduleList
      */
     public function __construct(ObjectManagerInterface $objectManager, ModuleListInterface $moduleList)
     {

From 5da303ef736399bd4eb5fd7e2b8f3f178200f959 Mon Sep 17 00:00:00 2001
From: Alex Bomko <abomko@ebay.com>
Date: Sat, 13 Dec 2014 00:52:05 +0200
Subject: [PATCH 396/474] MAGETWO-31002: [Spike] Investigate methods of
 publishing sample data packages

- fix tests
---
 .../Tools/SampleData/Module/Sales/Setup/Order/Processor.php      | 1 +
 dev/tools/Magento/Tools/SampleData/ObserverManager.php           | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order/Processor.php b/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order/Processor.php
index 43d1b28d68a44..45fe6a45cf454 100644
--- a/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order/Processor.php
+++ b/dev/tools/Magento/Tools/SampleData/Module/Sales/Setup/Order/Processor.php
@@ -3,6 +3,7 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Tools\SampleData\Module\Sales\Setup\Order;
+
 use Magento\Framework\Object;
 
 /**
diff --git a/dev/tools/Magento/Tools/SampleData/ObserverManager.php b/dev/tools/Magento/Tools/SampleData/ObserverManager.php
index 2f9f474cfcb93..09b4e4f78fdbf 100644
--- a/dev/tools/Magento/Tools/SampleData/ObserverManager.php
+++ b/dev/tools/Magento/Tools/SampleData/ObserverManager.php
@@ -2,7 +2,6 @@
 /**
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-
 namespace Magento\Tools\SampleData;
 
 use Magento\Framework\ObjectManagerInterface;

From e0310cd8fa0caf40d78e17251fd9fff41fb1d54f Mon Sep 17 00:00:00 2001
From: Anup Dugar <anup@x.com>
Date: Fri, 12 Dec 2014 17:14:39 -0600
Subject: [PATCH 397/474] MAGETWO-31782: Unable to login anonymously into a
 customer account using REST API

- Fixed eligible apis to allow anonymous access
---
 app/code/Magento/Customer/etc/webapi.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/etc/webapi.xml b/app/code/Magento/Customer/etc/webapi.xml
index 78a2fa940e54a..03d5643eb5a89 100644
--- a/app/code/Magento/Customer/etc/webapi.xml
+++ b/app/code/Magento/Customer/etc/webapi.xml
@@ -181,7 +181,7 @@
     <route url="/V1/customers/login" method="POST">
         <service class="Magento\Customer\Api\AccountManagementInterface" method="authenticate"/>
         <resources>
-            <resource ref="Magento_Customer::customer"/>
+            <resource ref="anonymous"/>
         </resources>
     </route>
     <route url="/V1/customers/me/password" method="PUT">
@@ -196,13 +196,13 @@
     <route url="/V1/customers/:customerId/password/resetLinkToken/:resetPasswordLinkToken" method="GET">
         <service class="Magento\Customer\Api\AccountManagementInterface" method="validateResetPasswordLinkToken"/>
         <resources>
-            <resource ref="Magento_Customer::customer"/>
+            <resource ref="anonymous"/>
         </resources>
     </route>
     <route url="/V1/customers/password" method="PUT">
         <service class="Magento\Customer\Api\AccountManagementInterface" method="initiatePasswordReset"/>
         <resources>
-            <resource ref="Magento_Customer::manage"/>
+            <resource ref="anonymous"/>
         </resources>
     </route>
     <route url="/V1/customers/:customerId/password" method="PUT">
@@ -244,7 +244,7 @@
     <route url="/V1/customers/isEmailAvailable" method="POST">
         <service class="Magento\Customer\Api\AccountManagementInterface" method="isEmailAvailable"/>
         <resources>
-            <resource ref="Magento_Customer::manage"/>
+            <resource ref="anonymous"/>
         </resources>
     </route>
 

From 1750f78ab3152d0dcad9cc68033a098a7952340b Mon Sep 17 00:00:00 2001
From: Yuxing Zheng <yuxzheng@ebay.com>
Date: Fri, 12 Dec 2014 17:17:03 -0600
Subject: [PATCH 398/474] MAGETWO-31119: Doubled error message when create
 admin role

 - Reverted change made on AbstractModel
 - Added fix by removing duplicated effort to add error message in admin user save controller
---
 app/code/Magento/User/Controller/Adminhtml/User/Save.php | 3 ---
 lib/internal/Magento/Framework/Model/AbstractModel.php   | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index df41a697c17e3..04535940a90b7 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -62,9 +62,6 @@ public function execute()
             $this->_redirect('adminhtml/*/');
         } catch (\Magento\Framework\Model\Exception $e) {
             $this->messageManager->addMessages($e->getMessages());
-            if ($e->getMessage()) {
-                $this->messageManager->addError($e->getMessage());
-            }
             $this->_getSession()->setUserData($data);
             $arguments = $model->getId() ? ['user_id' => $model->getId()] : [];
             $arguments = array_merge($arguments, ['_current' => true]);
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index cf2ebfd60db19..9bf7cd8b94129 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -448,7 +448,7 @@ public function validateBeforeSave()
         $validator = $this->_getValidatorBeforeSave();
         if ($validator && !$validator->isValid($this)) {
             $errors = $validator->getMessages();
-            $exception = new \Magento\Framework\Model\Exception();
+            $exception = new \Magento\Framework\Model\Exception(implode(PHP_EOL, $errors));
             foreach ($errors as $errorMessage) {
                 $exception->addMessage(new \Magento\Framework\Message\Error($errorMessage));
             }

From 1f4afd2a1d5d84a9d92e769196d9d8eee9962557 Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Fri, 12 Dec 2014 17:23:02 -0600
Subject: [PATCH 399/474] MAGETWO-29419: Tax summary and detail differ by 1
 cent in invoice and credit memo for partial invoice when discount and fpt are
 applied

    - Fixed cyclic recursive call
---
 app/code/Magento/Sales/Model/Order/Creditmemo.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 2a4c7be38c3b1..7055ee7402314 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -297,15 +297,16 @@ public function getShippingAddress()
     public function getItemsCollection()
     {
         if (!$this->hasData(CreditmemoInterface::ITEMS)) {
-            $this->setItems($this->_cmItemCollectionFactory->create()->setCreditmemoFilter($this->getId()));
+            $collection = $this->_cmItemCollectionFactory->create()->setCreditmemoFilter($this->getId());
+            $this->setItems($collection);
 
             if ($this->getId()) {
-                foreach ($this->getItems() as $item) {
+                foreach ($collection as $item) {
                     $item->setCreditmemo($this);
                 }
             }
         }
-        return $this->getItems();
+        return $this->getData(CreditmemoInterface::ITEMS);
     }
 
     /**

From d3383820fde29541b09919c8423d766f322d2d6f Mon Sep 17 00:00:00 2001
From: Anup Dugar <anup@x.com>
Date: Fri, 12 Dec 2014 17:31:20 -0600
Subject: [PATCH 400/474] MAGETWO-31782: Unable to login anonymously into a
 customer account using REST API

- Removed the login api since we have the Ajax/login controller for ajax applications. This login is no more needed since it does not even establish a customer session. If needed we can get it back as an authenticate webapi but there is no use case for now.
---
 app/code/Magento/Customer/etc/webapi.xml      |  6 ------
 .../Customer/Api/AccountManagementTest.php    | 20 -------------------
 2 files changed, 26 deletions(-)

diff --git a/app/code/Magento/Customer/etc/webapi.xml b/app/code/Magento/Customer/etc/webapi.xml
index 03d5643eb5a89..df2d11cb16d9f 100644
--- a/app/code/Magento/Customer/etc/webapi.xml
+++ b/app/code/Magento/Customer/etc/webapi.xml
@@ -178,12 +178,6 @@
             <resource ref="Magento_Customer::manage"/>
         </resources>
     </route>
-    <route url="/V1/customers/login" method="POST">
-        <service class="Magento\Customer\Api\AccountManagementInterface" method="authenticate"/>
-        <resources>
-            <resource ref="anonymous"/>
-        </resources>
-    </route>
     <route url="/V1/customers/me/password" method="PUT">
         <service class="Magento\Customer\Api\AccountManagementInterface" method="changePasswordById"/>
         <resources>
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
index 1229cb0f4be50..7511184acfb9e 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementTest.php
@@ -251,26 +251,6 @@ public function testGetCustomerActivateCustomer()
         $this->assertFalse(isset($customerResponseData[Customer::CONFIRMATION]));
     }
 
-    public function testAuthenticateCustomer()
-    {
-        $customerData = $this->_createCustomer();
-
-        $serviceInfo = [
-            'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . '/login',
-                'httpMethod' => RestConfig::HTTP_METHOD_POST,
-            ],
-            'soap' => [
-                'service' => self::SERVICE_NAME,
-                'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_NAME . 'Authenticate',
-            ],
-        ];
-        $requestData = ['email' => $customerData[Customer::EMAIL], 'password' => CustomerHelper::PASSWORD];
-        $customerResponseData = $this->_webApiCall($serviceInfo, $requestData);
-        $this->assertEquals($customerData[Customer::ID], $customerResponseData[Customer::ID]);
-    }
-
     public function testValidateResetPasswordLinkToken()
     {
         $customerData = $this->_createCustomer();

From d0ee5ac3894bea9629595d0d9e486e1a762d74ad Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Fri, 12 Dec 2014 17:51:10 -0600
Subject: [PATCH 401/474] MAGETWO-31534: Ogres Bugfixes Contribution to
 Mainline

- fix sanity check fail
---
 .../Magento/Framework/Module/DbVersionInfoTest.php         | 7 ++-----
 lib/internal/Magento/Framework/Module/DbVersionInfo.php    | 6 +-----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionInfoTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionInfoTest.php
index 879364c2e99f2..62f18125d8e12 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionInfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/DbVersionInfoTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Framework\Module;
 
@@ -26,7 +23,7 @@ class DbVersionInfoTest extends \PHPUnit_Framework_TestCase
     private $moduleResource;
 
     /**
-     * @var Magento\Framework\Module\ResourceResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Module\ResourceResolverInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $resourceResolver;
 
diff --git a/lib/internal/Magento/Framework/Module/DbVersionInfo.php b/lib/internal/Magento/Framework/Module/DbVersionInfo.php
index 3cc8efb097539..30dabf861ad9d 100644
--- a/lib/internal/Magento/Framework/Module/DbVersionInfo.php
+++ b/lib/internal/Magento/Framework/Module/DbVersionInfo.php
@@ -1,10 +1,6 @@
 <?php
 /**
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Framework\Module;
 

From 32a41d99fe0a7d2bf9b1039a4ca6f96eb5555e61 Mon Sep 17 00:00:00 2001
From: Yuxing Zheng <yuxzheng@ebay.com>
Date: Fri, 12 Dec 2014 18:03:19 -0600
Subject: [PATCH 402/474] Merge remote-tracking branch 'mainline/develop' into
 MAGETWO-31588-Rename-And-Merge-Install-Script-For-Tango

---
 .../Cms/data/cms_setup/data-install-2.0.0.php | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Cms/data/cms_setup/data-install-2.0.0.php b/app/code/Magento/Cms/data/cms_setup/data-install-2.0.0.php
index 6c86fdb592c50..f396184b43084 100644
--- a/app/code/Magento/Cms/data/cms_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Cms/data/cms_setup/data-install-2.0.0.php
@@ -5,8 +5,8 @@
 
 /** @var $this \Magento\Cms\Model\Resource\Setup */
 
-$cmsPages = array(
-    array(
+$cmsPages = [
+    [
         'title' => '404 Not Found',
         'page_layout' => '2columns-right',
         'meta_keywords' => 'Page keywords',
@@ -15,29 +15,29 @@
         'content_heading' => 'Whoops, our bad...',
         'content' => "<dl>\r\n<dt>The page you requested was not found, and we have a fine guess why.</dt>\r\n<dd>\r\n<ul class=\"disc\">\r\n<li>If you typed the URL directly, please make sure the spelling is correct.</li>\r\n<li>If you clicked on a link to get here, the link is outdated.</li>\r\n</ul></dd>\r\n</dl>\r\n<dl>\r\n<dt>What can you do?</dt>\r\n<dd>Have no fear, help is near! There are many ways you can get back on track with Magento Store.</dd>\r\n<dd>\r\n<ul class=\"disc\">\r\n<li><a href=\"#\" onclick=\"history.go(-1); return false;\">Go back</a> to the previous page.</li>\r\n<li>Use the search bar at the top of the page to search for your products.</li>\r\n<li>Follow these links to get you back on track!<br /><a href=\"{{store url=\"\"}}\">Store Home</a> <span class=\"separator\">|</span> <a href=\"{{store url=\"customer/account\"}}\">My Account</a></li></ul></dd></dl>\r\n",
         'is_active' => 1,
-        'stores' => array(0),
+        'stores' => [0],
         'sort_order' => 0
-    ),
-    array(
+    ],
+    [
         'title' => 'Home page',
         'page_layout' => '1column',
         'identifier' => 'home',
         'content_heading' => 'Home Page',
         'content' => "<p>CMS homepage content goes here.</p>\r\n",
         'is_active' => 1,
-        'stores' => array(0),
+        'stores' => [0],
         'sort_order' => 0
-    ),
-    array(
+    ],
+    [
         'title' => 'Enable Cookies',
         'page_layout' => '1column',
         'identifier' => 'enable-cookies',
         'content_heading' => 'What are Cookies?',
         'content' => "<div class=\"message notice\">\r\n            <div>Please enable cookies in your web browser to continue.</div>\r\n            </div>\r\n            <p>Cookies are short pieces of data that are sent to your computer when you visit a website. On later visits, this data is then returned to that website. Cookies allow us to recognize you automatically whenever you visit our site so that we can personalize your experience and provide you with better service. We also use cookies (and similar browser data, such as Flash cookies) for fraud prevention and other purposes. If your web browser is set to refuse cookies from our website, you will not be able to complete a purchase or take advantage of certain features of our website, such as storing items in your Shopping Cart or receiving personalized recommendations. As a result, we strongly encourage you to configure your web browser to accept cookies from our website.</p>\r\n    <h2 class=\"subtitle\">Enabling Cookies</h2>\r\n    <ul class=\"disc\">\r\n        <li><a href=\"#ie7\">Internet Explorer 7.x</a></li>\r\n        <li><a href=\"#ie6\">Internet Explorer 6.x</a></li>\r\n        <li><a href=\"#firefox\">Mozilla/Firefox</a></li>\r\n        <li><a href=\"#opera\">Opera 7.x</a></li>\r\n    </ul>\r\n    <h3><a name=\"ie7\"></a>Internet Explorer 7.x</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Start Internet Explorer</p>\r\n        </li>\r\n        <li>\r\n            <p>Under the <strong>Tools</strong> menu, click <strong>Internet Options</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-1.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click the <strong>Privacy</strong> tab</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-2.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click the <strong>Advanced</strong> button</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-3.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Put a check mark in the box for <strong>Override Automatic Cookie Handling</strong>, put another check mark in the <strong>Always accept session cookies </strong>box</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-4.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click <strong>OK</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-5.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click <strong>OK</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie7-6.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Restart Internet Explore</p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n    <h3><a name=\"ie6\"></a>Internet Explorer 6.x</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Select <strong>Internet Options</strong> from the Tools menu</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie6-1.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Privacy</strong> tab</p>\r\n        </li>\r\n        <li>\r\n            <p>Click the <strong>Default</strong> button (or manually slide the bar down to <strong>Medium</strong>) under <strong>Settings</strong>. Click <strong>OK</strong></p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/ie6-2.gif\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n    <h3><a name=\"firefox\"></a>Mozilla/Firefox</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Click on the <strong>Tools</strong>-menu in Mozilla</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Options...</strong> item in the menu - a new window open</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Privacy</strong> selection in the left part of the window. (See image below)</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/firefox.png\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>Expand the <strong>Cookies</strong> section</p>\r\n        </li>\r\n        <li>\r\n            <p>Check the <strong>Enable cookies</strong> and <strong>Accept cookies normally</strong> checkboxes</p>\r\n        </li>\r\n        <li>\r\n            <p>Save changes by clicking <strong>Ok</strong>.</p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n    <h3><a name=\"opera\"></a>Opera 7.x</h3>\r\n    <ol>\r\n        <li>\r\n            <p>Click on the <strong>Tools</strong> menu in Opera</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Preferences...</strong> item in the menu - a new window open</p>\r\n        </li>\r\n        <li>\r\n            <p>Click on the <strong>Privacy</strong> selection near the bottom left of the window. (See image below)</p>\r\n            <p><img src=\"{{view url=\"Magento_Cms::images/cookies/opera.png\"  area=frontend}}\" alt=\"\" /></p>\r\n        </li>\r\n        <li>\r\n            <p>The <strong>Enable cookies</strong> checkbox must be checked, and <strong>Accept all cookies</strong> should be selected in the &quot;<strong>Normal cookies</strong>&quot; drop-down</p>\r\n        </li>\r\n        <li>\r\n            <p>Save changes by clicking <strong>Ok</strong></p>\r\n        </li>\r\n    </ol>\r\n    <p class=\"a-top\"><a href=\"#top\">Back to Top</a></p>\r\n",
         'is_active' => 1,
-        'stores' => array(0)
-    )
-);
+        'stores' => [0]
+    ]
+];
 
 /**
  * Insert default and system pages
@@ -290,28 +290,28 @@
     'content',
     \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
     \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_WIKI,
-    array('block_id')
+    ['block_id']
 );
 $installer->appendClassAliasReplace(
     'cms_page',
     'content',
     \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
     \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_WIKI,
-    array('page_id')
+    ['page_id']
 );
 $installer->appendClassAliasReplace(
     'cms_page',
     'layout_update_xml',
     \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
     \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
-    array('page_id')
+    ['page_id']
 );
 $installer->appendClassAliasReplace(
     'cms_page',
     'custom_layout_update_xml',
     \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
     \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
-    array('page_id')
+    ['page_id']
 );
 
 $installer->doUpdateClassAliases();

From ac224eabfc80c1102dd034af8cfde9761267f66b Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Fri, 12 Dec 2014 18:04:50 -0600
Subject: [PATCH 403/474] MAGETWO-31534: Ogres Bugfixes Contribution to
 Mainline

- made changes according to CR feedback
---
 setup/module/Magento/Setup/src/Model/Installer.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup/module/Magento/Setup/src/Model/Installer.php b/setup/module/Magento/Setup/src/Model/Installer.php
index d21162185d83d..dc215a7db0cd9 100644
--- a/setup/module/Magento/Setup/src/Model/Installer.php
+++ b/setup/module/Magento/Setup/src/Model/Installer.php
@@ -26,7 +26,6 @@
 use Magento\Setup\Module\SetupFactory;
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
 use Magento\Store\Model\Store;
-use Symfony\Component\Process\PhpExecutableFinder;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
 /**

From 19ba49fb4b22fd137023fd47f18fa2595d2afa29 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@ebay.com>
Date: Fri, 12 Dec 2014 18:11:04 -0600
Subject: [PATCH 404/474] MAGETWO-26736: Errors after execution View Files
 Population Tool

- fixed messages
---
 dev/tools/Magento/Tools/View/Deployer.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/tools/Magento/Tools/View/Deployer.php b/dev/tools/Magento/Tools/View/Deployer.php
index 7d5ceb6800953..5a7572c707848 100644
--- a/dev/tools/Magento/Tools/View/Deployer.php
+++ b/dev/tools/Magento/Tools/View/Deployer.php
@@ -202,12 +202,13 @@ private function deployFile($filePath, $area, $themePath, $locale, $module)
         } catch (\Magento\Framework\View\Asset\File\NotFoundException $e) {
             // File was not found by Fallback (possibly because it's wrong context for it) - there is nothing to publish
             $this->logger->logDebug(
-                "\tNotice: Could not find file '$filePath'. Potentially because of wrong context."
+                "\tNotice: Could not find file '$filePath'. This file may not be relevant for the theme or area."
             );
         } catch (\Less_Exception_Compiler $e) {
             $this->logger->logDebug(
                 "\tNotice: Could not parse LESS file '$filePath'. "
-                . "Potentially because it's a partial LESS file intended for inclusion by another LESS file."
+                . "This may indicate that the file is incomplete, but this is acceptable. "
+                . "The file '$filePath' will be combined with another LESS file."
             );
         } catch (\Exception $e) {
             $this->logger->logError($e->getMessage() . " ($logMessage)");

From eb41914a781fb968308ee2ae9b62fcba00ac6a90 Mon Sep 17 00:00:00 2001
From: Anup Dugar <anup@x.com>
Date: Fri, 12 Dec 2014 18:31:22 -0600
Subject: [PATCH 405/474] MAGETWO-31708: Merge Core sql scripts and rename file
 with suffix 2.0.0

- Removed unused core_cache_option table and associated references
- Fixed copyright block
---
 .../data/core_setup/data-install-2.0.0.php    |  5 +----
 .../Core/sql/core_setup/install-2.0.0.php     | 22 -------------------
 .../core_setup/upgrade-1.6.0.15-1.6.0.16.php  |  8 -------
 .../_files/dependency_test/tables_ce.php      |  1 -
 .../factory_table_names/replace_ce.php        |  1 -
 5 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php

diff --git a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
index b34ad04ea4031..f0eeaebc507e2 100644
--- a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 /** @var $this \Magento\Core\Model\Resource\Setup */
diff --git a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
index 9f1f60800ebdf..ef6037e881bc2 100644
--- a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
+++ b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
@@ -448,28 +448,6 @@
 );
 $connection->createTable($table);
 
-/**
- * Create table 'core_cache_option'
- */
-$table = $connection->newTable(
-    $installer->getTable('core_cache_option')
-)->addColumn(
-    'code',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    32,
-    ['nullable' => false, 'primary' => true],
-    'Code'
-)->addColumn(
-    'value',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    [],
-    'Value'
-)->setComment(
-    'Cache Options'
-);
-$connection->createTable($table);
-
 /**
  * Create table 'core_flag'
  */
diff --git a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php b/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php
deleted file mode 100644
index 0777681baf761..0000000000000
--- a/app/code/Magento/Core/sql/core_setup/upgrade-1.6.0.15-1.6.0.16.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-
-/* @var $this \Magento\Setup\Module\SetupModule */
-$connection = $this->getConnection();
-$connection->dropTable('core_cache_option');
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
index c2dfbd76a1026..fb76a64799d13 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
@@ -106,7 +106,6 @@
     'cms_page' => 'Magento_Cms',
     'cms_page_store' => 'Magento_Cms',
     'core_cache' => 'Magento_Core',
-    'core_cache_option' => 'Magento_Core',
     'core_cache_tag' => 'Magento_Core',
     'core_config_data' => 'Magento_Core',
     'core_config_field' => 'Magento_Core',
diff --git a/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php b/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php
index b76d8dbc92d8d..701a2fba5f047 100644
--- a/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php
+++ b/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php
@@ -123,7 +123,6 @@
     'cms/page_store' => 'cms_page_store',
     'compiler/configuration' => 'compiler_configuration',
     'core/cache' => 'core_cache',
-    'core/cache_option' => 'core_cache_option',
     'core/cache_tag' => 'core_cache_tag',
     'core/config_data' => 'core_config_data',
     'core/config_field' => 'core_config_field',

From 3fafb3e1c674670539793a96762b1f37151db4a5 Mon Sep 17 00:00:00 2001
From: Anup Dugar <anup@x.com>
Date: Fri, 12 Dec 2014 19:00:17 -0600
Subject: [PATCH 406/474] MAGETWO-31782: Unable to login anonymously into a
 customer account using REST API

- Removed and replaced login based api test references
---
 .../Customer/Api/AccountManagementMeTest.php  | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php
index 1c2eb23501c57..32eca4e225633 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/AccountManagementMeTest.php
@@ -10,7 +10,6 @@
 use Magento\Integration\Model\Oauth\Token as TokenModel;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Helper\Customer as CustomerHelper;
-use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\Webapi\Model\Rest\Config as RestConfig;
 
 /**
@@ -31,9 +30,9 @@ class AccountManagementMeTest extends \Magento\TestFramework\TestCase\WebapiAbst
     private $customerRepository;
 
     /**
-     * @var CustomerBuilder
+     * @var AccountManagementInterface
      */
-    private $customerBuilder;
+    private $customerAccountManagement;
 
     /**
      * @var CustomerRegistry
@@ -75,9 +74,10 @@ public function setUp()
             'Magento\Customer\Api\CustomerRepositoryInterface',
             ['customerRegistry' => $this->customerRegistry]
         );
-        $this->customerBuilder = Bootstrap::getObjectManager()->create(
-            'Magento\Customer\Api\Data\CustomerDataBuilder'
-        );
+
+        $this->customerAccountManagement = Bootstrap::getObjectManager()
+            ->get('Magento\Customer\Api\AccountManagementInterface');
+
         $this->customerHelper = new CustomerHelper();
         $this->customerData = $this->customerHelper->createSampleCustomer();
 
@@ -118,15 +118,9 @@ public function testChangePassword()
         $requestData = ['currentPassword' => 'test@123', 'newPassword' => '123@test'];
         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
 
-        $serviceInfo = [
-            'rest' => [
-                'resourcePath' => '/V1/customers/login',
-                'httpMethod' => RestConfig::HTTP_METHOD_POST,
-            ],
-        ];
-        $requestData = ['email' => $this->customerData[CustomerInterface::EMAIL], 'password' => '123@test'];
-        $customerResponseData = $this->_webApiCall($serviceInfo, $requestData);
-        $this->assertEquals($this->customerData[CustomerInterface::ID], $customerResponseData[CustomerInterface::ID]);
+        $customerResponseData = $this->customerAccountManagement
+            ->authenticate($this->customerData[CustomerInterface::EMAIL], '123@test');
+        $this->assertEquals($this->customerData[CustomerInterface::ID], $customerResponseData->getId());
     }
 
     public function testUpdateCustomer()
@@ -210,7 +204,7 @@ public function testGetCustomerActivateCustomer()
      */
     protected function _getCustomerData($customerId)
     {
-        $data =  $this->customerRepository->getById($customerId);
+        $data = $this->customerRepository->getById($customerId);
         $this->customerRegistry->remove($customerId);
         return $data;
     }

From 69f611835f7cc2e432077e58f099870dab22d53e Mon Sep 17 00:00:00 2001
From: Paul Lewis <plewis@ebay.com>
Date: Fri, 12 Dec 2014 22:24:31 -0600
Subject: [PATCH 407/474] MAGETWO-31534: Ogres Bugfixes Contribution to
 Mainline

 - use short array definitions
---
 .../Magento/Test/Legacy/FilesystemTest.php    | 32 +++++++++----------
 .../Magento/Framework/Module/ManagerTest.php  |  8 ++---
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
index 3ecf08158ada9..ddf6d23984089 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/FilesystemTest.php
@@ -31,26 +31,26 @@ function ($path) {
      */
     public function relocationsDataProvider()
     {
-        return array(
-            'Relocated to pub/errors' => array('errors'),
-            'Eliminated with Magento_Compiler' => array('includes'),
-            'Relocated to lib/web' => array('js'),
-            'Relocated to pub/media' => array('media'),
-            'Eliminated as not needed' => array('pkginfo'),
-            'Dissolved into themes under app/design ' => array('skin'),
-            'Dissolved into different modules\' view/frontend' => array('app/design/frontend/base'),
-            'Dissolved into different modules\' view/email/*.html' => array('app/locale/en_US/template'),
-            'The "core" code pool no longer exists. Use root namespace as specified in PSR-0 standard' => array(
+        return [
+            'Relocated to pub/errors' => ['errors'],
+            'Eliminated with Magento_Compiler' => ['includes'],
+            'Relocated to lib/web' => ['js'],
+            'Relocated to pub/media' => ['media'],
+            'Eliminated as not needed' => ['pkginfo'],
+            'Dissolved into themes under app/design ' => ['skin'],
+            'Dissolved into different modules\' view/frontend' => ['app/design/frontend/base'],
+            'Dissolved into different modules\' view/email/*.html' => ['app/locale/en_US/template'],
+            'The "core" code pool no longer exists. Use root namespace as specified in PSR-0 standard' => [
                 'app/code/core'
-            ),
-            'The "local" code pool no longer exists. Use root namespace as specified in PSR-0 standard' => array(
+            ],
+            'The "local" code pool no longer exists. Use root namespace as specified in PSR-0 standard' => [
                 'app/code/local'
-            ),
-            'The "community" code pool no longer exists. Use root namespace as specified in PSR-0 standard' => array(
+            ],
+            'The "community" code pool no longer exists. Use root namespace as specified in PSR-0 standard' => [
                 'app/code/community'
-            ),
+            ],
             'Eliminated Magento/plushe theme' => ['app/design/frontend/Magento/plushe'],
-        );
+        ];
     }
 
     public function testObsoleteDirectories()
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
index 823b68f893c7f..f19b4828ab7fb 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Module/ManagerTest.php
@@ -101,9 +101,9 @@ public function testIsOutputEnabledCustomConfigPath($configValue, $expectedResul
 
     public function isOutputEnabledCustomConfigPathDataProvider()
     {
-        return array(
-            'path literal, output disabled' => array(false, false),
-            'path literal, output enabled'  => array(true, true),
-        );
+        return [
+            'path literal, output disabled' => [false, false],
+            'path literal, output enabled'  => [true, true],
+        ];
     }
 }

From 2f50bfe1299dc9b815f387dc189e4aa3d03c4449 Mon Sep 17 00:00:00 2001
From: Yu Tang <ytang1@ebay.com>
Date: Sat, 13 Dec 2014 00:01:59 -0600
Subject: [PATCH 408/474] MAGETWO-29419: Tax summary and detail differ by 1
 cent in invoice and credit memo for partial invoice when discount and fpt are
 applied

    - Fixed API test error
---
 app/code/Magento/Sales/Model/Order/Creditmemo.php   | 13 +++++--------
 app/code/Magento/Tax/Helper/Data.php                |  2 +-
 .../unit/testsuite/Magento/Tax/Helper/DataTest.php  |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 7055ee7402314..b8ef9173022b8 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -296,17 +296,14 @@ public function getShippingAddress()
      */
     public function getItemsCollection()
     {
-        if (!$this->hasData(CreditmemoInterface::ITEMS)) {
-            $collection = $this->_cmItemCollectionFactory->create()->setCreditmemoFilter($this->getId());
-            $this->setItems($collection);
+        $collection = $this->_cmItemCollectionFactory->create()->setCreditmemoFilter($this->getId());
 
-            if ($this->getId()) {
-                foreach ($collection as $item) {
-                    $item->setCreditmemo($this);
-                }
+        if ($this->getId()) {
+            foreach ($collection as $item) {
+                $item->setCreditmemo($this);
             }
         }
-        return $this->getData(CreditmemoInterface::ITEMS);
+        return $collection;
     }
 
     /**
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 9fc834568fc69..26e3386435f47 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -815,7 +815,7 @@ protected function calculateTaxForItems(EntityInterface $order, EntityInterface
 
         // Apply any taxes for the items
         /** @var $item \Magento\Sales\Model\Order\Invoice\Item|\Magento\Sales\Model\Order\Creditmemo\Item */
-        foreach ($salesItem->getItemsCollection() as $item) {
+        foreach ($salesItem->getItems() as $item) {
             $orderItem = $item->getOrderItem();
             $orderItemId = $orderItem->getId();
             $orderItemTax = $orderItem->getTaxAmount();
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
index 9dc1444ad0fb6..01af7e215929c 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Helper/DataTest.php
@@ -219,7 +219,7 @@ public function testGetCalculatedTaxesForOrderItems($orderData, $invoiceData, $e
             ->method('getShippingTaxAmount')
             ->willReturn($invoiceShippingTaxAmount);
         $source->expects($this->once())
-            ->method('getItemsCollection')
+            ->method('getItems')
             ->willReturn($invoiceItems);
 
         $this->priceCurrencyMock->expects($this->any())

From 005f17794058a08a0b1c9323dea6ad9781b08f24 Mon Sep 17 00:00:00 2001
From: Olexandr Lysenko <olysenko@ebay.com>
Date: Sat, 13 Dec 2014 10:42:05 +0200
Subject: [PATCH 409/474] MAGETWO-31574: Exception on Manage Shopping Cart from
 Customer page in backend

---
 .../AdvancedCheckout/Controller/Adminhtml/IndexTest.php   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php b/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php
index 4f31dfd5b8ebe..7bc2c0032f016 100644
--- a/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/AdvancedCheckout/Controller/Adminhtml/IndexTest.php
@@ -63,7 +63,13 @@ public function testInitData()
             ->method('getParam')
             ->willReturn(true);
 
-        $customerModel = $this->getMock('Magento\Customer\Model\Customer', ['getWebsiteId', 'load', 'getId'], [], '', false);
+        $customerModel = $this->getMock(
+            'Magento\Customer\Model\Customer',
+            ['getWebsiteId', 'load', 'getId'],
+            [],
+            '',
+            false
+        );
         $customerModel->expects($this->once())
             ->method('load')
             ->willReturnSelf();

From f025f8ba8716a7f22b82b96825f015b842f5220e Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Sat, 13 Dec 2014 14:37:57 +0200
Subject: [PATCH 410/474] MTA-1201: Remove incomplete in functional tests for
 fixed bugs

---
 dev/build/core_dev/functional/build.xml       |  1 +
 .../Selenium/Element/GlobalsearchElement.php  |  5 +-
 .../test.csv                                  | 40 +++++++--------
 .../CreateWidgetOrderBySkuTest/test.csv       |  4 +-
 .../test.csv                                  | 12 ++---
 .../Magento/Backend/Test/Block/Page/Main.php  |  5 +-
 .../app/Magento/Banner/Test/Block/Cart.php    |  2 +-
 .../Banner/Test/Block/Category/View.php       |  2 +-
 ...ignRelatedPromotionsToBannerEntityTest.php |  2 +-
 .../TestCase/CreateWidgetBannerTest/test.csv  |  6 +--
 .../CreateBundleProductEntityTest/test.csv    | 30 ++++++------
 .../Category/DeleteCategoryEntityTest.php     |  1 +
 .../testCreate.csv                            | 38 +++++++-------
 .../testCreate.csv                            | 16 +++---
 .../UpdateVirtualProductEntityTest/test.csv   | 24 ++++-----
 ...ductAttributeEntityFromProductPageTest.php |  1 -
 .../test.csv                                  | 10 ++--
 .../testCreateProductAttribute.csv            |  2 +-
 .../DeleteAttributeSetTest.php                |  1 -
 .../Constraint/AssertCatalogEventInGrid.php   |  4 +-
 .../AdvancedSearchEntityTest/test.csv         | 26 +++++-----
 .../Checkout/Test/Block/Cart/CartItem.php     |  2 +-
 .../Checkout/Test/Block/Cart/Totals.php       |  2 +-
 .../Checkout/Test/Block/Onepage/Billing.php   |  9 +++-
 .../Checkout/Test/Block/Onepage/Login.php     |  9 +++-
 .../Test/Block/Onepage/Payment/Methods.php    |  9 +++-
 .../Test/Block/Onepage/Shipping/Method.php    |  9 +++-
 .../TestCase/CreateCmsBlockEntityTest.php     |  1 -
 .../Test/TestCase/CreateCmsPageEntityTest.php |  1 -
 .../Cms/Test/TestCase/CreatePageTest.php      |  2 +-
 .../TestCase/DeleteCmsBlockEntityTest.php     |  1 -
 .../Test/TestCase/DeleteCmsPageEntityTest.php |  1 -
 .../TestCase/UpdateCmsBlockEntityTest.php     |  1 -
 .../Test/TestCase/UpdateCmsPageEntityTest.php |  2 +-
 .../Block/Adminhtml/Edit/Tab/Addresses.php    |  4 +-
 .../Block/Adminhtml/Edit/Tab/Addresses.xml    | 30 ++++++------
 .../Test/Handler/CustomerInjectable/Curl.php  | 30 +++++++-----
 .../Test/Repository/CustomerInjectable.php    |  1 +
 .../testCreateCustomerBackendEntity.csv       | 12 ++---
 .../testUpdateCustomerBackendEntity.csv       |  6 +--
 .../Test/TestCase/VatGroupAssignmentTest.php  |  1 -
 .../DeleteStoreCreditFromCurrentQuoteTest.php |  2 -
 ...erCustomAttributeErrorDuplicateMessage.php |  4 +-
 ...CodeCustomerCustomAttributesEntityTest.php |  1 -
 .../CreateCustomerSegmentEntityTest.php       |  1 -
 .../UpdateCustomerSegmentEntityTest.php       |  1 -
 .../test.csv                                  | 30 ++++++------
 .../Test/Repository/GiftCardProduct.php       |  2 +-
 .../TestCase/CheckoutWithGiftMessagesTest.php |  1 -
 .../CreateGiftRegistryFrontendEntityTest.php  |  3 +-
 .../UpdateGiftRegistryFrontendEntityTest.php  |  1 -
 .../TestCase/CreateGiftWrappingEntityTest.php |  1 -
 .../TestCase/DeleteGiftWrappingEntityTest.php |  1 -
 .../MassActionsGiftWrappingEntityTest.php     |  1 -
 .../TestCase/UpdateGiftWrappingEntityTest.php |  1 -
 .../Install/Test/Block/CreateAdmin.php        |  5 +-
 .../Install/Test/Block/CreateAdmin.xml        |  5 +-
 .../Install/Test/Block/CustomizeStore.php     |  5 +-
 .../Install/Test/Block/CustomizeStore.xml     |  5 +-
 .../Magento/Install/Test/Block/Database.php   |  5 +-
 .../Magento/Install/Test/Block/Database.xml   |  5 +-
 .../Magento/Install/Test/Block/Install.php    |  5 +-
 .../Magento/Install/Test/Block/Landing.php    |  5 +-
 .../Magento/Install/Test/Block/License.php    |  5 +-
 .../Magento/Install/Test/Block/Readiness.php  |  5 +-
 .../Install/Test/Block/WebConfiguration.php   |  5 +-
 .../Install/Test/Block/WebConfiguration.xml   |  5 +-
 .../Constraint/AssertAgreementTextPresent.php |  5 +-
 .../Constraint/AssertCurrencySelected.php     |  5 +-
 .../Test/Constraint/AssertKeyCreated.php      |  5 +-
 .../Constraint/AssertLanguageSelected.php     |  5 +-
 .../Test/Constraint/AssertRewritesEnabled.php |  5 +-
 .../Constraint/AssertSecureUrlEnabled.php     |  5 +-
 .../Constraint/AssertSuccessDbConnection.php  |  5 +-
 .../Test/Constraint/AssertSuccessInstall.php  |  5 +-
 .../AssertSuccessfulReadinessCheck.php        |  5 +-
 .../Magento/Install/Test/Fixture/Install.php  |  5 +-
 .../Magento/Install/Test/Fixture/Install.xml  |  5 +-
 .../app/Magento/Install/Test/Page/Install.xml |  5 +-
 .../Install/Test/TestCase/InstallTest.php     |  5 +-
 .../Magento/Install/Test/etc/constraint.xml   |  5 +-
 .../app/Magento/Install/Test/etc/fixture.xml  |  5 +-
 .../app/Magento/Install/Test/etc/page.xml     |  5 +-
 .../ActivateIntegrationEntityTest.php         |  1 -
 .../Magento/Invitation/Test/Block/Form.php    | 12 +++++
 .../Magento/Invitation/Test/Block/Form.xml    | 10 ++--
 .../Page/Category/CatalogCategoryView.xml     |  2 +-
 .../AddProductToMultipleWishListTest.php      |  2 -
 .../AddProductToMultipleWishListTest/test.csv | 14 +++---
 ...CopyProductToAnotherWishlistEntityTest.php |  1 -
 .../test.csv                                  | 14 +++---
 ...MoveProductToAnotherWishlistEntityTest.php |  1 -
 .../TestCase/ShareMultipleWishlistTest.php    |  3 +-
 .../AbandonedCartsReportEntityTest.php        |  1 +
 .../DownloadProductsReportEntityTest.php      |  1 -
 .../SalesCouponReportEntityTest/test.csv      | 10 ++--
 .../SalesInvoiceReportEntityTest/test.csv     |  8 +--
 .../SalesOrderReportEntityTest/test.csv       |  8 +--
 .../SalesRefundsReportEntityTest/test.csv     |  8 +--
 .../TestCase/SalesTaxReportEntityTest.php     | 35 ++++++++-----
 .../SalesTaxReportEntityTest/test.csv         |  8 +--
 .../Test/Block/Adminhtml/ReviewsTab.php       |  2 +-
 .../RewardPoints/RewardPointsInformation.php  |  3 +-
 .../Constraint/AssertRewardPointsBalance.php  |  2 +-
 ...eExchangeRateForRewardPointsEntityTest.php |  8 +--
 .../RemoveRewardPointsOnCheckoutTest.php      | 20 +++-----
 .../AssertRmaOnFrontendForGuest.php           |  2 +-
 .../Magento/Rma/Test/Fixture/ReturnItem.php   |  2 +-
 .../CreateRmaEntityOnBackendTest/test.csv     | 10 ++--
 .../app/Magento/Rma/Test/TestCase/RmaTest.php |  3 +-
 .../Buttons.php => View/ActionsToolbar.php}   | 23 ++-------
 .../Sales/Test/Block/Widget/Guest/Form.php    |  2 +-
 .../Sales/Test/Page/SalesGuestView.php        | 49 -------------------
 .../Sales/Test/Page/SalesGuestView.xml        | 20 ++++++++
 .../CreateCreditMemoEntityTest/test.csv       |  8 +--
 .../TestCase/CreateOrderBackendTest/test.csv  | 32 ++++++------
 .../TestStep/PrintOrderOnFrontendStep.php     |  2 +-
 .../TestCase/CreateSalesRuleEntityTest.php    | 15 +-----
 .../Tax/Test/Constraint/AssertTaxRateForm.php |  1 +
 .../AssertTaxRuleIsAppliedToAllPrices.php     |  8 +--
 .../Tax/Test/TestCase/TaxCalculationTest.php  |  2 +-
 .../Block/Adminhtml/Catalog/Category/Tree.php |  4 +-
 .../UpdateCustomUrlRewriteEntityTest/test.csv |  6 +--
 .../Magento/User/Test/Handler/User/Curl.php   |  2 +-
 .../CreateAdminUserEntityTest/test.csv        | 14 +++---
 .../testUpdateAdminUserRolesEntity.csv        |  6 +--
 ...geVersionsEntityForExistingCmsPageTest.php |  6 +--
 ...CmsPageVersionsEntityForNewCmsPageTest.php |  6 +--
 .../test.csv                                  |  4 +-
 .../DeleteCmsPageVersionsEntityTest.php       |  1 -
 .../MassDeleteCmsPageRevisionEntityTest.php   |  1 -
 .../MassDeleteCmsVersionsEntityTest.php       |  1 -
 .../PublishCmsPageRevisionEntityTest.php      |  6 +--
 .../SaveNewRevisionInNewVersionTest.php       |  1 -
 .../SaveNewVersionOfVersionsCmsEntityTest.php |  1 -
 .../UpdateCmsPageRevisionEntityTest.php       |  1 -
 .../UpdateCmsPageVersionsEntityTest.php       |  1 -
 .../Magento/Weee/Test/Block/Cart/Totals.php   |  2 +-
 .../TestCase/CreateTaxWithFptTest/test.csv    | 24 ++++-----
 .../TestCase/CreateWidgetEntityTest/test.csv  |  2 +-
 .../AssertProductDetailsInWishlist.php        |  5 +-
 ...ductIsPresentInCustomerBackendWishlist.php |  2 +-
 .../AddProductToWishlistEntityTest.php        |  1 -
 ...CartFromCustomerWishlistOnFrontendTest.php |  1 -
 ...roductInCustomerWishlistOnFrontendTest.php |  1 -
 ...oductFromCustomerWishlistOnBackendTest.php |  1 -
 .../Test/TestCase/ShareWishlistEntityTest.php |  1 -
 ...ProductInCustomerWishlistOnBackendTest.php |  2 -
 .../InjectableTests/installation.xml          |  5 +-
 149 files changed, 432 insertions(+), 584 deletions(-)
 rename dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/{Info/Buttons.php => View/ActionsToolbar.php} (53%)
 delete mode 100644 dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.xml

diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index 4552fda1236c2..173f231765a82 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -279,6 +279,7 @@
             <param name="target_composer_dir" value="${basedir}/dev/tests/functional"/>
         </antcall>
 
+        <!-- Property which defines whether Magento console installation is performed -->
         <condition property="env.bamboo_is_magento_installed" value="1">
             <not><isset property="env.bamboo_is_magento_installed"/></not>
         </condition>
diff --git a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php
index 8fa5dfe807be2..6d59992fcdfa3 100644
--- a/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php
+++ b/dev/tests/functional/lib/Mtf/Client/Driver/Selenium/Element/GlobalsearchElement.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Mtf\Client\Driver\Selenium\Element;
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromCustomerAccountTest/test.csv b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromCustomerAccountTest/test.csv
index 0b7e03a589d9d..57c7448311cc2 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromCustomerAccountTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromCustomerAccountTest/test.csv
@@ -1,20 +1,20 @@
-"description";"products";"cartBlock";"orderOptions/sku";"orderOptions/qty";"config";"constraint";"issue"
-"Two Simple products";"catalogProductSimple::default, catalogProductSimple::default";"cart, cart";"-, -";"1, 1";"-";"assertProductsAddBySkuSuccessMessage, assertProductPresentInShoppingCart";""
-"Simple product";"catalogProductSimple::default";"cart";"-";"1";"-";"assertProductsAddBySkuSuccessMessage, assertProductPresentInShoppingCart";""
-"Simple Out Of Stock";"catalogProductSimple::out_of_stock";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertProductIsOutOfStockFailMessage, assertCartIsEmpty";""
-"Simple product with qty > than available";"catalogProductSimple::default";"required_attention";"-";"26";"-";"assertProductRequiredAttentionFailMessage, assertQtyIsNotEnoughFailMessage, assertCartIsEmpty";""
-"Simple offline product";"catalogProductSimple::offline";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertSkuNotFoundFailMessage, assertCartIsEmpty";""
-"Product, for which Visibility is set to Not Visible Individually";"catalogProductSimple::not_visible_individually";"cart";"-";"1";"-";"assertProductsAddBySkuSuccessMessage, assertProductIsNotEditable";""
-"Product, for which Qty is less than minimum allowed in cart";"catalogProductSimple::simple_with_cart_limits";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertMinRequestedQtyFailMessage, assertCartIsEmpty";""
-"Product, for which Qty exceeds maximum allowed in cart";"catalogProductSimple::simple_with_cart_limits";"required_attention";"-";"6";"-";"assertProductRequiredAttentionFailMessage, assertMaxRequestedQtyFailMessage, assertCartIsEmpty";""
-"Configurable  product";"configurableProductInjectable::default";"required_attention";"-";"2";"-";"assertProductRequiredAttentionFailMessage, assertSpecifyProductOptionsLink, assertCartIsEmpty, assertProductConfiguringFromRequiringAttention";""
-"Bundle dynamic product ";"bundleProduct::bundle_dynamic_product";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertSpecifyProductOptionsLink, assertCartIsEmpty";""
-"Bundle fixed product";"bundleProduct::bundle_fixed_product";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertSpecifyProductOptionsLink, assertCartIsEmpty";""
-"Simple product with custom options";"catalogProductSimple::with_one_custom_option";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertSpecifyProductOptionsLink, assertCartIsEmpty";""
-"Simple product with custom options by compound sku";"catalogProductSimple::with_one_custom_option";"cart";"simpleWithOptionCompoundSku";"1";"-";"assertProductsAddBySkuSuccessMessage, assertProductPresentInShoppingCart";""
-"Simple product with qty increments";"catalogProductSimple::simple_with_qty_increments";"required_attention";"-";"3";"-";"assertProductRequiredAttentionFailMessage, assertQtyIncrementsFailMessage, assertCartIsEmpty";"Bug: MAGETWO-1541"
-"Configurable product where all sub-items are disabled";"configurableProductInjectable::with_out_of_stock_item";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertProductIsOutOfStockFailMessage, assertCartIsEmpty";""
-"Simple product with tier price and qty > than available";"catalogProductSimple::simple_with_tier_price_and_qty";"required_attention";"-";"26";"-";"assertProductRequiredAttentionFailMessage, assertProductTierPriceMessage, assertCartIsEmpty";""
-"Product with displaying prices considering MAP settings";"catalogProductSimple::with_msrp";"required_attention";"-";"26";"msrp";"assertProductRequiredAttentionFailMessage, assertMsrpNotice, assertCartIsEmpty";""
-"Nonexistent product";"-";"required_attention";"nonExistentSku";"1";"-";"assertProductRequiredAttentionFailMessage, assertCartIsEmpty";""
-"Product with not valid qty";"catalogProductSimple::default";"required_attention";"-";"abc";"-";"assertCartIsEmpty";""
+"description";"products";"cartBlock";"orderOptions/sku";"orderOptions/qty";"config";"constraint";
+"Two Simple products";"catalogProductSimple::default, catalogProductSimple::default";"cart, cart";"-, -";"1, 1";"-";"assertProductsAddBySkuSuccessMessage, assertProductPresentInShoppingCart"
+"Simple product";"catalogProductSimple::default";"cart";"-";"1";"-";"assertProductsAddBySkuSuccessMessage, assertProductPresentInShoppingCart"
+"Simple Out Of Stock";"catalogProductSimple::out_of_stock";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertProductIsOutOfStockFailMessage, assertCartIsEmpty"
+"Simple product with qty > than available";"catalogProductSimple::default";"required_attention";"-";"26";"-";"assertProductRequiredAttentionFailMessage, assertQtyIsNotEnoughFailMessage, assertCartIsEmpty"
+"Simple offline product";"catalogProductSimple::offline";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertSkuNotFoundFailMessage, assertCartIsEmpty"
+"Product, for which Visibility is set to Not Visible Individually";"catalogProductSimple::not_visible_individually";"cart";"-";"1";"-";"assertProductsAddBySkuSuccessMessage, assertProductIsNotEditable"
+"Product, for which Qty is less than minimum allowed in cart";"catalogProductSimple::simple_with_cart_limits";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertMinRequestedQtyFailMessage, assertCartIsEmpty"
+"Product, for which Qty exceeds maximum allowed in cart";"catalogProductSimple::simple_with_cart_limits";"required_attention";"-";"6";"-";"assertProductRequiredAttentionFailMessage, assertMaxRequestedQtyFailMessage, assertCartIsEmpty"
+"Configurable  product";"configurableProductInjectable::default";"required_attention";"-";"2";"-";"assertProductRequiredAttentionFailMessage, assertSpecifyProductOptionsLink, assertCartIsEmpty, assertProductConfiguringFromRequiringAttention"
+"Bundle dynamic product ";"bundleProduct::bundle_dynamic_product";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertSpecifyProductOptionsLink, assertCartIsEmpty"
+"Bundle fixed product";"bundleProduct::bundle_fixed_product";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertSpecifyProductOptionsLink, assertCartIsEmpty"
+"Simple product with custom options";"catalogProductSimple::with_one_custom_option";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertSpecifyProductOptionsLink, assertCartIsEmpty"
+"Simple product with custom options by compound sku";"catalogProductSimple::with_one_custom_option";"cart";"simpleWithOptionCompoundSku";"1";"-";"assertProductsAddBySkuSuccessMessage, assertProductPresentInShoppingCart"
+"Simple product with qty increments";"catalogProductSimple::simple_with_qty_increments";"required_attention";"-";"3";"-";"assertProductRequiredAttentionFailMessage, assertQtyIncrementsFailMessage, assertCartIsEmpty";
+"Configurable product where all sub-items are disabled";"configurableProductInjectable::with_out_of_stock_item";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertProductIsOutOfStockFailMessage, assertCartIsEmpty"
+"Simple product with tier price and qty > than available";"catalogProductSimple::simple_with_tier_price_and_qty";"required_attention";"-";"26";"-";"assertProductRequiredAttentionFailMessage, assertProductTierPriceMessage, assertCartIsEmpty"
+"Product with displaying prices considering MAP settings";"catalogProductSimple::with_msrp";"required_attention";"-";"26";"msrp";"assertProductRequiredAttentionFailMessage, assertMsrpNotice, assertCartIsEmpty"
+"Nonexistent product";"-";"required_attention";"nonExistentSku";"1";"-";"assertProductRequiredAttentionFailMessage, assertCartIsEmpty"
+"Product with not valid qty";"catalogProductSimple::default";"required_attention";"-";"abc";"-";"assertCartIsEmpty"
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/CreateWidgetOrderBySkuTest/test.csv b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/CreateWidgetOrderBySkuTest/test.csv
index fac4ea5c8a76c..b1c992dcdb28e 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/CreateWidgetOrderBySkuTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/CreateWidgetOrderBySkuTest/test.csv
@@ -1,2 +1,2 @@
-"widget/data/widgetOptions/preset";"widget/data/code";"widget/data/theme_id";"widget/data/title";"widget/data/store_ids/dataSet";"widget/data/layout/preset";"constraint";"issue"
-"orderBySku";"Order by SKU";"Magento Blank";"Title_%isolation%";"All Store Views";"order_by_sku_on_all_pages";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetOrderBySkuOnCategoryPage";"Bug: MAGETWO-29008"
+"widget/data/widgetOptions/preset";"widget/data/code";"widget/data/theme_id";"widget/data/title";"widget/data/store_ids/dataSet";"widget/data/layout/preset";"constraint";
+"orderBySku";"Order by SKU";"Magento Blank";"Title_%isolation%";"All Store Views";"order_by_sku_on_all_pages";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetOrderBySkuOnCategoryPage";
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/DeleteProductsFromCartOfAdvancedCheckoutEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/DeleteProductsFromCartOfAdvancedCheckoutEntityTest/test.csv
index 279d54938d2ae..14e560294579e 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/DeleteProductsFromCartOfAdvancedCheckoutEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/DeleteProductsFromCartOfAdvancedCheckoutEntityTest/test.csv
@@ -1,6 +1,6 @@
-"products";"orderOptions/qty";"orderOptions/sku";"constraint";"issue"
-"catalogProductSimple::offline, catalogProductSimple::simple_with_cart_limits";"1, 6";"-, -";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart";""
-"catalogProductSimple::out_of_stock";"1";"-";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart";""
-"configurableProductInjectable::default";"2";"-";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart";""
-"bundleProduct::bundle_dynamic_product";"1";"-";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart";""
-"-";"1";"nonExistentSku";"assertRequiringAttentionProductSuccessDeleteMessage, assertCartIsEmpty";""
\ No newline at end of file
+"products";"orderOptions/qty";"orderOptions/sku";"constraint";
+"catalogProductSimple::offline, catalogProductSimple::simple_with_cart_limits";"1, 6";"-, -";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart"
+"catalogProductSimple::out_of_stock";"1";"-";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart"
+"configurableProductInjectable::default";"2";"-";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart"
+"bundleProduct::bundle_dynamic_product";"1";"-";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart"
+"-";"1";"nonExistentSku";"assertRequiringAttentionProductSuccessDeleteMessage, assertCartIsEmpty"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
index 98c7584fc4f24..69fbab87303b4 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Page/Main.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Backend\Test\Block\Page;
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Cart.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Cart.php
index a4370c18433cc..64ffd25c7739f 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Cart.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Cart.php
@@ -19,7 +19,7 @@ class Cart extends \Magento\Checkout\Test\Block\Cart
      *
      * @var string
      */
-    protected $widgetBanner = '//div[contains(@class, "widget banners")]/ul/li[text()="%s"]';
+    protected $widgetBanner = '//div[contains(@class, "block-banners")]/ul/li/div[contains(text(),"%s")]';
 
     /**
      * Header welcome message selector.
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Category/View.php b/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Category/View.php
index bc68667687361..9e080b8b13de4 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Category/View.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/Block/Category/View.php
@@ -20,7 +20,7 @@ class View extends \Magento\Catalog\Test\Block\Category\View
      *
      * @var string
      */
-    protected $widgetBanner = '//div[contains(@class, "widget banners")]/ul/li[text()="%s"]';
+    protected $widgetBanner = '//div[contains(@class, "block-banners")]/ul/li/div[contains(text(),"%s")]';
 
     /**
      * Header welcome message selector.
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/AssignRelatedPromotionsToBannerEntityTest.php b/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/AssignRelatedPromotionsToBannerEntityTest.php
index 66617ff0208ae..fe78b05eeed9a 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/AssignRelatedPromotionsToBannerEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/AssignRelatedPromotionsToBannerEntityTest.php
@@ -265,7 +265,7 @@ protected function createWidget($widget, BannerInjectable $banner)
      *
      * @return void
      */
-    public static function tearDown()
+    public function tearDown()
     {
         ObjectManager::getInstance()->create('Magento\CatalogRule\Test\TestStep\DeleteAllCatalogRulesStep')->run();
         ObjectManager::getInstance()->create('Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep')->run();
diff --git a/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/CreateWidgetBannerTest/test.csv b/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/CreateWidgetBannerTest/test.csv
index 53be8b7afb771..06959205c1eeb 100644
--- a/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/CreateWidgetBannerTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Banner/Test/TestCase/CreateWidgetBannerTest/test.csv
@@ -1,3 +1,3 @@
-"widget/data/widgetOptions/preset";"widget/data/code";"widget/data/theme_id";"widget/data/title";"widget/data/store_ids/dataSet";"widget/data/layout/preset";"constraint";"issue"
-"bannerRotatorShoppingCartRules";"Banner Rotator";"Magento Blank";"Title_%isolation%";"All Store Views";"banner_on_all_pages";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetBannerRotator";""
-"bannerRotatorCatalogRules";"Banner Rotator";"Magento Blank";"Title_%isolation%";"All Store Views";"for_virtual_product";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetBannerRotatorOnProductPage";"Bug: MAGETWO-28836"
\ No newline at end of file
+"widget/data/widgetOptions/preset";"widget/data/code";"widget/data/theme_id";"widget/data/title";"widget/data/store_ids/dataSet";"widget/data/layout/preset";"constraint"
+"bannerRotatorShoppingCartRules";"Banner Rotator";"Magento Blank";"Title_%isolation%";"All Store Views";"banner_on_all_pages";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetBannerRotator"
+"bannerRotatorCatalogRules";"Banner Rotator";"Magento Blank";"Title_%isolation%";"All Store Views";"for_virtual_product";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetBannerRotatorOnProductPage"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv
index c53c7a9219f24..53d0c45423592 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest/test.csv
@@ -1,15 +1,15 @@
-"product/data/name";"product/data/sku_type";"product/data/sku";"product/data/status";"product/data/price_type";"product/data/price/value";"product/data/price/preset";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/is_in_stock";"product/data/weight_type";"product/data/weight";"product/data/category";"product/data/description";"product/data/group_price/preset";"product/data/special_price";"product/data/special_from_date/pattern";"product/data/special_to_date/pattern";"product/data/tier_price/preset";"product/data/price_view";"product/data/stock_data/use_config_manage_stock";"product/data/stock_data/manage_stock";"product/data/shipment_type";"product/data/bundle_selections/preset";"product/data/bundle_selections/products";"product/data/checkout_data/preset";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"product/data/use_config_gift_message_available";"product/data/gift_message_available";"constraint";"issue"
-"BundleProduct %isolation%";"-";"bundle_sku_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Bundle Product Dynamic Required";"-";"-";"-";"-";"-";"-";"No";"No";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage";""
-"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product offline";"Dynamic";"-";"-";"-";"Out of Stock";"Dynamic";"-";"category_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Separately";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage,  assertProductNotSearchableBySku";""
-"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"Product online";"Dynamic";"-";"dynamic-200";"-";"In Stock";"Dynamic";"-";"category_%isolation%";"Bundle Product Dynamic";"-";"-";"-";"-";"-";"Price Range";"-";"-";"Together";"all_types_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_options";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertProductInStock, assertBundleItemsOnProductPage, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType";""
-"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"-";"Fixed";"10";"fixed-15";"None";"-";"Fixed";"10";"-";"Bundle Product Fixed Required";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_fixed";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage";""
-"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"100";"fixed-24";"Taxable Goods";"In Stock";"Fixed";"10";"category_%isolation%";"Bundle Product Fixed";"default";"-";"-";"-";"-";"As Low as";"-";"-";"Separately";"all_types_fixed";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_fixed_and_custom_options";"all_types";"-";"Catalog, Search";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductVisibleInCategory, assertBundleProductPage, assertProductInStock, assertGroupedPriceOnBundleProductPage, assertBundleItemsOnProductPage, assertBundlePriceView, assertBundlePriceType";"MAGETWO-31179"
-"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"10";"fixed-1";"Taxable Goods";"Out of Stock";"Fixed";"10";"category_%isolation%";"-";"-";"10";"m/d/Y";"m/d/Y +3 days";"-";"Price Range";"No";"Yes";"Together";"with_not_required_options";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"with_not_required_options";"-";"-";"Catalog";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm,  assertBundleProductPage, assertProductOutOfStock, assertBundlePriceView";"Bug: MAGETWO-26980"
-"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"-";"Dynamic";"-";"dynamic-50";"-";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"default";"As Low as";"No";"No";"Together";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Search";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage, assertTierPriceOnBundleProductPage";""
-"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-8";"-";"-";"-";"-";"-";"-";"-";"20";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory";""
-"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-32";"-";"-";"-";"-";"-";"-";"MAGETWO-23061";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";"MAGETWO-31179"
-"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-40";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";""
-"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-115";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_1";"drop_down_with_one_option_fixed_price";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType, assertProductCustomOptionsOnBundleProductPage";""
-"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-159";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_2";"drop_down_with_one_option_percent_price";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType";""
-"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage";""
-"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage";""
+"product/data/name";"product/data/sku_type";"product/data/sku";"product/data/status";"product/data/price_type";"product/data/price/value";"product/data/price/preset";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/is_in_stock";"product/data/weight_type";"product/data/weight";"product/data/category";"product/data/description";"product/data/group_price/preset";"product/data/special_price";"product/data/special_from_date/pattern";"product/data/special_to_date/pattern";"product/data/tier_price/preset";"product/data/price_view";"product/data/stock_data/use_config_manage_stock";"product/data/stock_data/manage_stock";"product/data/shipment_type";"product/data/bundle_selections/preset";"product/data/bundle_selections/products";"product/data/checkout_data/preset";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"product/data/use_config_gift_message_available";"product/data/gift_message_available";"constraint"
+"BundleProduct %isolation%";"-";"bundle_sku_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Bundle Product Dynamic Required";"-";"-";"-";"-";"-";"-";"No";"No";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleItemsOnProductPage"
+"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product offline";"Dynamic";"-";"-";"-";"Out of Stock";"Dynamic";"-";"category_%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Separately";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage,  assertProductNotSearchableBySku"
+"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"Product online";"Dynamic";"-";"dynamic-200";"-";"In Stock";"Dynamic";"-";"category_%isolation%";"Bundle Product Dynamic";"-";"-";"-";"-";"-";"Price Range";"-";"-";"Together";"all_types_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_options";"-";"-";"Catalog, Search";"No";"Yes";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertProductInStock, assertBundleItemsOnProductPage, assertProductVisibleInCategory, assertBundlePriceView, assertBundlePriceType"
+"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"-";"Fixed";"10";"fixed-15";"None";"-";"Fixed";"10";"-";"Bundle Product Fixed Required";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_fixed";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage"
+"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"100";"fixed-24";"Taxable Goods";"In Stock";"Fixed";"10";"category_%isolation%";"Bundle Product Fixed";"default";"-";"-";"-";"-";"As Low as";"-";"-";"Separately";"all_types_fixed";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"all_types_bundle_fixed_and_custom_options";"all_types";"-";"Catalog, Search";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductVisibleInCategory, assertBundleProductPage, assertProductInStock, assertGroupedPriceOnBundleProductPage, assertBundleItemsOnProductPage, assertBundlePriceView, assertBundlePriceType"
+"BundleProduct %isolation%";"Fixed";"bundle_sku_%isolation%";"Product online";"Fixed";"10";"fixed-1";"Taxable Goods";"Out of Stock";"Fixed";"10";"category_%isolation%";"-";"-";"10";"m/d/Y";"m/d/Y +3 days";"-";"Price Range";"No";"Yes";"Together";"with_not_required_options";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product|catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"with_not_required_options";"-";"-";"Catalog";"No";"No";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm,  assertBundleProductPage, assertProductOutOfStock, assertBundlePriceView"
+"BundleProduct %isolation%";"Dynamic";"bundle_sku_%isolation%";"-";"Dynamic";"-";"dynamic-50";"-";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"default";"As Low as";"No";"No";"Together";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductVirtual::50_dollar_product";"default";"-";"-";"Search";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertBundleProductForm, assertProductSearchableBySku, assertBundleProductPage, assertBundleItemsOnProductPage, assertTierPriceOnBundleProductPage"
+"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-8";"-";"-";"-";"-";"-";"-";"-";"20";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory"
+"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-32";"-";"-";"-";"-";"-";"-";"MAGETWO-23061";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType"
+"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"dynamic-40";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType"
+"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-115";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_1";"drop_down_with_one_option_fixed_price";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType, assertProductCustomOptionsOnBundleProductPage"
+"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"110";"fixed-159";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"with_custom_options_2";"drop_down_with_one_option_percent_price";"-";"-";"-";"-";"assertProductSaveMessage, assertBundleInCategory, assertBundlePriceView, assertBundlePriceType"
+"Bundle Dynamic %isolation%";"Dynamic";"sku_bundle_dynamic_%isolation%";"-";"Dynamic";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"default_dynamic";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage"
+"Bundle Fixed %isolation%";"Fixed";"sku_bundle_fixed_%isolation%";"-";"Fixed";"10";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"second";"catalogProductSimple::100_dollar_product,catalogProductSimple::40_dollar_product";"default";"-";"-";"-";"-";"-";"assertProductSaveMessage"
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
index eccfa2397e59c..e337834ed3c59 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/DeleteCategoryEntityTest.php
@@ -64,6 +64,7 @@ public function __inject(CatalogCategoryIndex $catalogCategoryIndex, CatalogCate
      */
     public function test(CatalogCategory $category)
     {
+        $this->markTestIncomplete('MAGETWO-31723');
         $category->persist();
         $this->catalogCategoryIndex->open();
         $this->catalogCategoryIndex->getTreeCategories()->selectCategory($category);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv
index 7de15e64d1dbe..bcce9e2518fce 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest/testCreate.csv
@@ -1,19 +1,19 @@
-"product/data/name";"product/data/sku";"product/data/tax_class_id/dataSet";"product/data/price/value";"product/data/special_price";"product/data/short_description";"product/data/description";"product/data/weight";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/visibility";"product/data/custom_options/preset";"product/data/checkout_data/preset";"product/data/custom_options/import_products";"product/data/price/preset";"product/data/group_price/preset";"product/data/tier_price/preset";"constraint";"issue"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10000";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"50";"657";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"drop_down_with_one_option_fixed_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10001";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"51";"658";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"drop_down_with_one_option_percent_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10002";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"52";"659";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10003";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"53";"660";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10004";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"54";"661";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"Bug: MAGETWO-31179"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10005";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"55";"662";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";"Bug: MAGETWO-31179"
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10006";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"56";"663";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10007";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"57";"664";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10008";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"58";"665";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductVisibleInCategory, assertProductPage";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10009";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"59";"75";"In Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInStock";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10010";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"60";"0";"Out of Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10011";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"61";"138";"-";"Search";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductSearchableBySku";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10012";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"62";"139";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductSearchableBySku, assertProductPage";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10013";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"63";"140";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10014";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"64";"141";"-";"-";"-";"-";"-";"-";"default";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductGroupedPriceOnProductPage";"Bug: MAGETWO-31179"
-"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10015";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"65";"142";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductSpecialPriceOnProductPage";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"None";"10016";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"66";"143";"-";"-";"-";"-";"-";"-";"-";"default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductTierPriceOnProductPage";""
-"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10017";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"67";"144";"-";"-";"options-suite";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductCustomOptionsOnProductPage";""
+"product/data/name";"product/data/sku";"product/data/tax_class_id/dataSet";"product/data/price/value";"product/data/special_price";"product/data/short_description";"product/data/description";"product/data/weight";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/visibility";"product/data/custom_options/preset";"product/data/checkout_data/preset";"product/data/custom_options/import_products";"product/data/price/preset";"product/data/group_price/preset";"product/data/tier_price/preset";"constraint"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10000";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"50";"657";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"drop_down_with_one_option_fixed_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10001";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"51";"658";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"drop_down_with_one_option_percent_price";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10002";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"52";"659";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10003";"90";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"53";"660";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10004";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"54";"661";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10005";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"55";"662";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"MAGETWO-23055";"-";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10006";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"56";"663";"-";"-";"drop_down_with_one_option_percent_price";"drop_down_with_one_option_percent_price";"-";"MAGETWO-23030";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10007";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"57";"664";"-";"-";"drop_down_with_one_option_fixed_price";"drop_down_with_one_option_fixed_price";"-";"MAGETWO-23029";"-";"MAGETWO-23002";"assertProductSaveMessage, assertProductInGrid, assertProductInCategory, assertProductPage, assertProductInCart"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10008";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"58";"665";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductVisibleInCategory, assertProductPage"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10009";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"59";"75";"In Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInStock"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10010";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"60";"0";"Out of Stock";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductOutOfStock"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10011";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"61";"138";"-";"Search";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductSearchableBySku"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10012";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"62";"139";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductSearchableBySku, assertProductPage"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10013";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"63";"140";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage"
+"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10014";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"64";"141";"-";"-";"-";"-";"-";"-";"default";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductGroupedPriceOnProductPage"
+"Simple Product %isolation%";"simple_sku_%isolation%";"Taxable Goods";"10015";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"65";"142";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductSpecialPriceOnProductPage"
+"Simple Product %isolation%";"simple_sku_%isolation%";"None";"10016";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"66";"143";"-";"-";"-";"-";"-";"-";"-";"default";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductTierPriceOnProductPage"
+"Simple Product %isolation%";"simple_sku_%isolation%";"-";"10017";"-";"Simple Product short_description %isolation%";"Simple Product description %isolation%";"67";"144";"-";"-";"options-suite";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductInStock, assertProductVisibleInCategory, assertProductPage, assertProductCustomOptionsOnProductPage"
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv
index a71fbe94bb308..cbc73ef8063d8 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest/testCreate.csv
@@ -1,8 +1,8 @@
-"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category";"product/data/group_price/preset";"product/data/price/preset";"product/data/tier_price/preset";"product/data/inventory_manage_stock";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"constraint";"issue"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid";""
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"None";"999";"Yes";"category_%isolation%";"-";"-";"MAGETWO-23002";"Yes";"In Stock";"-";"-";"Catalog, Search";"assertProductSaveMessage, assertProductVisibleInCategory, assertProductForm, assertProductSearchableBySku";""
-"VirtualProduct %isolation%";"-";"10";"Taxable Goods";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"-";"Out of Stock";"-";"-";"Search";"assertProductSaveMessage, assertProductForm, assertProductSkuAutoGenerated, assertProductSearchableBySku";""
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"category_%isolation%";"MAGETWO-23055";"-";"-";"-";"-";"-";"-";"Catalog";"assertProductSaveMessage, assertProductForm, assertProductVisibleInCategory";"Bug: MAGETWO-31179"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"-";"-";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"assertProductSaveMessage, assertProductSearchableBySku, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductCustomOptionsOnProductPage";"Bug: MAGETWO-31179"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"No";"In Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductInStock";""
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"999";"Yes";"-";"-";"-";"default";"-";"Out of Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductTierPriceOnProductPage, assertProductOutOfStock";""
+"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category";"product/data/group_price/preset";"product/data/price/preset";"product/data/tier_price/preset";"product/data/inventory_manage_stock";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/visibility";"constraint"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductSaveMessage, assertProductInGrid"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"None";"999";"Yes";"category_%isolation%";"-";"-";"MAGETWO-23002";"Yes";"In Stock";"-";"-";"Catalog, Search";"assertProductSaveMessage, assertProductVisibleInCategory, assertProductForm, assertProductSearchableBySku"
+"VirtualProduct %isolation%";"-";"10";"Taxable Goods";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"-";"Out of Stock";"-";"-";"Search";"assertProductSaveMessage, assertProductForm, assertProductSkuAutoGenerated, assertProductSearchableBySku"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"-";"Yes";"category_%isolation%";"MAGETWO-23055";"-";"-";"-";"-";"-";"-";"Catalog";"assertProductSaveMessage, assertProductForm, assertProductVisibleInCategory"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"-";"-";"options-suite";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"assertProductSaveMessage, assertProductSearchableBySku, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductCustomOptionsOnProductPage"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"10";"-";"999";"Yes";"-";"-";"MAGETWO-23030";"-";"No";"In Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductInStock"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"9000";"-";"999";"Yes";"-";"-";"-";"default";"-";"Out of Stock";"-";"-";"-";"assertProductSaveMessage, assertProductPage, assertProductTierPriceOnProductPage, assertProductOutOfStock"
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv
index a77032186810c..c7ce0a25c7ea6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest/test.csv
@@ -1,12 +1,12 @@
-"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category_ids/presets";"product/data/group_price/preset";"product/data/special_price";"product/data/tier_price/preset";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/visibility";"constraint";"issue"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductTierPriceOnProductPage, assertProductSearchableBySku";""
-"virtual_product_%isolation%";"virtual_sku_%isolation%";"120.00";"Taxable Goods";"999";"Yes";"-";"-";"45";"-";"In Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductSearchableBySku";""
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"185.00";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductPage, assertProductOutOfStock, assertProductTierPriceOnProductPage, assertProductSearchableBySku";""
-"virtual_product_%isolation%";"virtual_sku_%isolation%";"99.99";"Taxable Goods";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku";""
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"5.00";"None";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku";""
-"virtual_product_%isolation%";"virtual_sku_%isolation%";"145.00";"Taxable Goods";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductSearchableBySku";"Bug: MAGETWO-31179"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"-";"Yes";"default_subcategory";"-";"45";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku";""
-"virtual_product_%isolation%";"virtual_sku_%isolation%";"5.00";"Taxable Goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock,  assertProductSearchableBySku";"Bug: MAGETWO-31179"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"120.00";"None";"999";"Yes";"default_subcategory";"-";"-";"-";"In Stock";"options-suite";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku";""
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"Taxable Goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku";"Bug: MAGETWO-31179"
-"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductSpecialPriceOnProductPage, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductInCategory, assertProductSearchableBySku";"Bug: MAGETWO-31179"
+"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/is_virtual";"product/data/category_ids/presets";"product/data/group_price/preset";"product/data/special_price";"product/data/tier_price/preset";"product/data/quantity_and_stock_status/is_in_stock";"product/data/custom_options/preset";"product/data/visibility";"constraint"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductTierPriceOnProductPage, assertProductSearchableBySku"
+"virtual_product_%isolation%";"virtual_sku_%isolation%";"120.00";"Taxable Goods";"999";"Yes";"-";"-";"45";"-";"In Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductInCategory, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductSearchableBySku"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"185.00";"None";"999";"Yes";"default_subcategory";"-";"-";"MAGETWO-23002";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductPage, assertProductOutOfStock, assertProductTierPriceOnProductPage, assertProductSearchableBySku"
+"virtual_product_%isolation%";"virtual_sku_%isolation%";"99.99";"Taxable Goods";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"5.00";"None";"-";"Yes";"-";"-";"-";"-";"Out of Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku"
+"virtual_product_%isolation%";"virtual_sku_%isolation%";"145.00";"Taxable Goods";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductSearchableBySku"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"-";"Yes";"default_subcategory";"-";"45";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku"
+"virtual_product_%isolation%";"virtual_sku_%isolation%";"5.00";"Taxable Goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock,  assertProductSearchableBySku"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"120.00";"None";"999";"Yes";"default_subcategory";"-";"-";"-";"In Stock";"options-suite";"Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductSpecialPriceOnProductPage, assertProductCustomOptionsOnProductPage, assertProductSearchableBySku"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"Taxable Goods";"-";"Yes";"-";"MAGETWO-23055";"-";"-";"Out of Stock";"-";"Catalog, Search";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductOutOfStock, assertProductSearchableBySku"
+"VirtualProduct %isolation%";"virtual_sku_%isolation%";"99.99";"None";"999";"Yes";"default_subcategory";"MAGETWO-23055";"-";"MAGETWO-23002";"In Stock";"-";"Catalog";"assertProductSaveMessage, assertProductInGrid, assertProductForm, assertProductPage, assertProductVisibleInCategory, assertProductSpecialPriceOnProductPage, assertProductPage, assertProductGroupedPriceOnProductPage, assertProductTierPriceOnProductPage, assertProductInCategory, assertProductSearchableBySku"
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
index 4d3d817031d32..c7e3ce96bf0b5 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php
@@ -64,7 +64,6 @@ public function __prepare(FixtureFactory $fixtureFactory)
      */
     public function test(CatalogProductAttribute $attribute)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-31183");
         $this->attribute = $attribute;
         $this->executeScenario();
     }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest/test.csv
index fee0264704c24..85c887a70ea56 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest/test.csv
@@ -1,5 +1,5 @@
-"attribute/data/frontend_label";"attribute/data/frontend_input";"attribute/data/options/preset";"attribute/data/is_required";"attribute/data/attribute_code";"attribute/data/is_global";"attribute/data/default_value_text";"attribute/data/default_value_textarea";"attribute/data/is_unique";"attribute/data/is_configurable";"attribute/data/manage_frontend_label";"attribute/data/is_searchable";"attribute/data/is_visible_in_advanced_search";"attribute/data/is_comparable";"attribute/data/is_filterable";"attribute/data/is_filterable_in_search";"attribute/data/is_used_for_promo_rules";"attribute/data/is_html_allowed_on_front";"attribute/data/is_visible_on_front";"attribute/data/used_in_product_listing";"attribute/data/used_for_sort_by";"constraint";"issue"
-"Text_Field_Admin_%isolation%";"Text Field";"-";"No";"attr_text_%isolation%";"Global";"<b><i>default_value_text%isolation%</i></b>";"-";"Yes";"-";"-";"Yes";"Yes";"Yes";"-";"-";"-";"Yes";"Yes";"-";"Yes";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable, assertProductAttributeIsHtmlAllowed, assertProductAttributeIsUsedInSortOnFrontend";""
-"Dropdown_Admin_%isolation%";"Dropdown";"default";"No";"attr_dropdown_%isolation%";"Global";"-";"-";"-";"Yes";"-";"-";"-";"-";"Filterable (with results)";"Yes";"-";"-";"-";"-";"-";"assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch, assertProductAttributeIsConfigurable";""
-"Text_Field_Admin_%isolation%";"Text Field";"-";"Yes";"attr_text_%isolation%";"-";"default_value_text%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeIsRequired";""
-"Text_Field_Admin_%isolation%";"Text Field";"-";"No";"attr_text_%isolation%";"-";"default_value_text%isolation%";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeIsUnique";"BUG: MAGETWO-30474"
\ No newline at end of file
+"attribute/data/frontend_label";"attribute/data/frontend_input";"attribute/data/options/preset";"attribute/data/is_required";"attribute/data/attribute_code";"attribute/data/is_global";"attribute/data/default_value_text";"attribute/data/default_value_textarea";"attribute/data/is_unique";"attribute/data/is_configurable";"attribute/data/manage_frontend_label";"attribute/data/is_searchable";"attribute/data/is_visible_in_advanced_search";"attribute/data/is_comparable";"attribute/data/is_filterable";"attribute/data/is_filterable_in_search";"attribute/data/is_used_for_promo_rules";"attribute/data/is_html_allowed_on_front";"attribute/data/is_visible_on_front";"attribute/data/used_in_product_listing";"attribute/data/used_for_sort_by";"constraint"
+"Text_Field_Admin_%isolation%";"Text Field";"-";"No";"attr_text_%isolation%";"Global";"<b><i>default_value_text%isolation%</i></b>";"-";"Yes";"-";"-";"Yes";"Yes";"Yes";"-";"-";"-";"Yes";"Yes";"-";"Yes";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsComparable, assertProductAttributeIsHtmlAllowed, assertProductAttributeIsUsedInSortOnFrontend"
+"Dropdown_Admin_%isolation%";"Dropdown";"default";"No";"attr_dropdown_%isolation%";"Global";"-";"-";"-";"Yes";"-";"-";"-";"-";"Filterable (with results)";"Yes";"-";"-";"-";"-";"-";"assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch, assertProductAttributeIsConfigurable"
+"Text_Field_Admin_%isolation%";"Text Field";"-";"Yes";"attr_text_%isolation%";"-";"default_value_text%isolation%";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeIsRequired"
+"Text_Field_Admin_%isolation%";"Text Field";"-";"No";"attr_text_%isolation%";"-";"default_value_text%isolation%";"-";"Yes";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeIsUnique"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
index 7f074165faa27..c17decc4632f6 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest/testCreateProductAttribute.csv
@@ -7,4 +7,4 @@
 "custom_attribute_set";"Dropdown_Admin_%isolation%";"Dropdown";"default";"Yes";"attr_dropdown_%isolation%";"Global";"-";"-";"-";"-";"No";"Yes";"-";"Yes";"Yes";"Yes";"Filterable (with results)";"Yes";"-";"Yes";"Yes";"Yes";"Yes";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertProductAttributeIsRequired, assertProductAttributeIsGlobal, assertProductAttributeDisplayingOnFrontend, assertProductAttributeDisplayingOnSearchForm, assertAttributeSearchableByLabel, assertProductAttributeIsComparable, assertProductAttributeIsUsedInSortOnFrontend, assertProductAttributeIsFilterable, assertProductAttributeIsConfigurable, assertProductAttributeIsFilterableInSearch, assertAttributeOptionsOnProductForm";""
 "custom_attribute_set";"Price_Admin_%isolation%";"Price";"-";"No";"attr_price_%isolation%";"-";"1000";"-";"-";"-";"No";"-";"Price_StoreView";"Yes";"Yes";"No";"Filterable (with results)";"Yes";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm, assertAttributeSearchableByLabel, assertProductAttributeDisplayingOnSearchForm, assertProductAttributeIsFilterable, assertProductAttributeIsFilterableInSearch";"Bug:MAGETWO-31560"
 "custom_attribute_set";"Fixed_Product_Tax_Admin_%isolation%";"Fixed Product Tax";"-";"-";"attr_fpt_code_%isolation%";"-";"-";"-";"-";"-";"-";"-";"Fixed_Product_Tax_Storeview";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeInGrid, assertAttributeForm, assertAddedProductAttributeOnProductForm";""
-"custom_attribute_set";"Text_Field_Admin_%isolation%";"Text Field";"-";"Yes";"attr_textfield_%isolation%";"Store View";"default_value_text%isolation%";"-";"-";"-";"Yes";"-";"Area_Field%isolation%";"Yes";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeIsUnique";"Bug: MAGETWO-30474"
\ No newline at end of file
+"custom_attribute_set";"Text_Field_Admin_%isolation%";"Text Field";"-";"Yes";"attr_textfield_%isolation%";"Store View";"default_value_text%isolation%";"-";"-";"-";"Yes";"-";"Area_Field%isolation%";"Yes";"Yes";"Yes";"-";"-";"-";"-";"-";"-";"-";"assertProductAttributeIsUnique";""
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
index a30380f01b8aa..152f0a9f468d0 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/DeleteAttributeSetTest.php
@@ -69,7 +69,6 @@ public function __inject(
      */
     public function test(FixtureFactory $fixtureFactory, CatalogAttributeSet $productTemplate)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-31188");
         // Precondition
         $productTemplate->persist();
         $product = $fixtureFactory->createByCode(
diff --git a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php
index de1ebb55deac6..09e1a7d1d1347 100755
--- a/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogEvent/Test/Constraint/AssertCatalogEventInGrid.php
@@ -80,9 +80,9 @@ public function processAssert(
             $sortOrder = "";
         }
 
-        $dateStart = strftime("%b %#d, %Y", $dateStart);
+        $dateStart = strftime("%b %e, %Y", $dateStart);
         $filter['start_on'] = $dateStart;
-        $dateEnd = strftime("%b %#d, %Y", $dateEnd);
+        $dateEnd = strftime("%b %e, %Y", $dateEnd);
         $filter['end_on'] = $dateEnd;
 
         $filter = [
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest/test.csv
index 25bbad9bcc99f..687344b622bc9 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest/test.csv
@@ -1,13 +1,13 @@
-"products/simple_1";"products/simple_2";"productSearch/data/name";"productSearch/data/sku";"productSearch/data/description";"productSearch/data/short_description";"productSearch/data/price/value/price_from";"productSearch/data/price/value/price_to";"constraint";"issue"
-"Yes";"-";"abc_dfj";"abc_dfj";"adc_Full";"abc_short";49;500;"assertAdvancedSearchProductsResult";""
-"Yes";"-";"abc";"-";"-";"-";"-";"-";"assertAdvancedSearchProductsResult";"MAGETWO-30318"
-"-";"Yes";"adc_123";"-";"-";"-";"-";"-";"assertAdvancedSearchProductsResult";""
-"Yes";"-";"-";"abc";"-";"-";"-";"-";"assertAdvancedSearchProductsResult";""
-"Yes";"-";"-";"abc_dfj";"-";"-";"-";"-";"assertAdvancedSearchProductsResult";""
-"Yes";"-";"-";"abc";"full";"-";"-";"-";"assertAdvancedSearchProductsResult";"MAGETWO-30318"
-"-";"Yes";"-";"-";"dfj_full";"-";"-";"-";"assertAdvancedSearchProductsResult";""
-"Yes";"-";"-";"-";"-";"short";"-";"-";"assertAdvancedSearchProductsResult";"MAGETWO-30318"
-"-";"-";"-";"-";"-";"dfj_short";"-";"-";"assertAdvancedSearchProductsResult";""
-"Yes";"-";"-";"-";"-";"-";50;50;"assertAdvancedSearchProductsResult";"MAGETWO-30318"
-"Yes";"Yes";"-";"-";"-";"-";"-";100;"assertAdvancedSearchProductsResult";"MAGETWO-30318"
-"Yes";"-";"abc_dfj";"abc_dfj";"adc_Full";"abc_short";49;50;"assertAdvancedSearchProductsResult";"MAGETWO-30318"
+"products/simple_1";"products/simple_2";"productSearch/data/name";"productSearch/data/sku";"productSearch/data/description";"productSearch/data/short_description";"productSearch/data/price/value/price_from";"productSearch/data/price/value/price_to";"constraint"
+"Yes";"-";"abc_dfj";"abc_dfj";"adc_Full";"abc_short";49;500;"assertAdvancedSearchProductsResult"
+"Yes";"-";"abc";"-";"-";"-";"-";"-";"assertAdvancedSearchProductsResult"
+"-";"Yes";"adc_123";"-";"-";"-";"-";"-";"assertAdvancedSearchProductsResult"
+"Yes";"-";"-";"abc";"-";"-";"-";"-";"assertAdvancedSearchProductsResult"
+"Yes";"-";"-";"abc_dfj";"-";"-";"-";"-";"assertAdvancedSearchProductsResult"
+"Yes";"-";"-";"abc";"adc_full";"-";"-";"-";"assertAdvancedSearchProductsResult"
+"-";"Yes";"-";"-";"dfj_full";"-";"-";"-";"assertAdvancedSearchProductsResult"
+"Yes";"-";"-";"-";"-";"abc_short";"-";"-";"assertAdvancedSearchProductsResult"
+"-";"-";"-";"-";"-";"dfj_short";"-";"-";"assertAdvancedSearchProductsResult"
+"Yes";"-";"-";"-";"-";"-";50;50;"assertAdvancedSearchProductsResult"
+"Yes";"Yes";"-";"-";"-";"-";"-";100;"assertAdvancedSearchProductsResult"
+"Yes";"-";"abc_dfj";"abc_dfj";"adc_Full";"abc_short";49;50;"assertAdvancedSearchProductsResult"
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
index 326152515a195..c16fd46bb9660 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/CartItem.php
@@ -39,7 +39,7 @@ class CartItem extends AbstractCartItem
      *
      * @var string
      */
-    protected $wishlistButton = '.actions .towishlist';
+    protected $wishlistButton = '.towishlist';
 
     /**
      * Quantity input selector
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
index a08c1320d5687..a9db2d568234b 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
@@ -75,7 +75,7 @@ class Totals extends Block
      *
      * @var string
      */
-    protected $discount = '//tr[normalize-space(td)="Discount"]//span';
+    protected $discount = '//tr[normalize-space(th)="Discount"]//span';
 
     /**
      * Get shipping price including tax selector
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php
index f127a7525187c..be98db0bcc84d 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php
@@ -69,6 +69,13 @@ public function fillBilling(
     public function clickContinue()
     {
         $this->_rootElement->find($this->continue)->click();
-        $this->waitForElementNotVisible($this->waitElement);
+        $browser = $this->browser;
+        $selector = $this->waitElement;
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isVisible() == false ? true : null;
+            }
+        );
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php
index 598d38b084600..bbc8045a33a9c 100755
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Login.php
@@ -110,6 +110,13 @@ public function loginCustomer(FixtureInterface $customer)
     public function clickContinue()
     {
         $this->_rootElement->find($this->continue)->click();
-        $this->waitForElementNotVisible($this->loadingMask);
+        $browser = $this->browser;
+        $selector = $this->loadingMask;
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isVisible() == false ? true : null;
+            }
+        );
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php
index 06a00f980a0da..6860ff962305c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Payment/Methods.php
@@ -97,6 +97,13 @@ public function selectPaymentMethod(array $payment)
     public function clickContinue()
     {
         $this->_rootElement->find($this->continue)->click();
-        $this->waitForElementNotVisible($this->waitElement);
+        $browser = $this->browser;
+        $selector = $this->waitElement;
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isVisible() == false ? true : null;
+            }
+        );
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
index 740e62309ff2a..8d78df6e28b03 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/Method.php
@@ -57,6 +57,13 @@ public function selectShippingMethod(array $method)
     public function clickContinue()
     {
         $this->_rootElement->find($this->continue)->click();
-        $this->waitForElementNotVisible($this->waitElement);
+        $browser = $this->browser;
+        $selector = $this->waitElement;
+        $browser->waitUntil(
+            function () use ($browser, $selector) {
+                $element = $browser->find($selector);
+                return $element->isVisible() == false ? true : null;
+            }
+        );
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php
index e67b95ee703f6..6e96872106de4 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsBlockEntityTest.php
@@ -35,7 +35,6 @@ class CreateCmsBlockEntityTest extends AbstractCmsBlockEntityTest
      */
     public function test(CmsBlock $cmsBlock)
     {
-        $this->markTestIncomplete('MAGETWO-28916, MAGETWO-30362');
         // Prepare data for tearDown
         $this->storeName = $cmsBlock->getStores();
 
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php
index 6bdea75561e6c..9bca655fbcdd1 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreateCmsPageEntityTest.php
@@ -62,7 +62,6 @@ public function __inject(CmsIndex $cmsIndex, CmsNew $cmsNew)
      */
     public function test(CmsPageFixture $cms)
     {
-        $this->markTestIncomplete('MAGETWO-30362');
         // Steps
         $this->cmsIndex->open();
         $this->cmsIndex->getPageActionsBlock()->addNew();
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreatePageTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreatePageTest.php
index 2e57c2a33da9a..9596d8fca7bdd 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreatePageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/CreatePageTest.php
@@ -20,7 +20,7 @@ class CreatePageTest extends Functional
      */
     protected function setUp()
     {
-        $this->markTestIncomplete('MAGETWO-29634, MAGETWO-30362');
+        $this->markTestIncomplete('MAGETWO-29634');
         Factory::getApp()->magentoBackendLoginUser();
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.php
index afd31a625d651..a921942a35338 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsBlockEntityTest.php
@@ -67,7 +67,6 @@ public function __inject(
      */
     public function test(CmsBlock $cmsBlock)
     {
-        $this->markTestIncomplete('MAGETWO-28916, MAGETWO-30362');
         // Precondition
         $cmsBlock->persist();
 
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.php
index 81e360b6e731d..47574ebb71a95 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/DeleteCmsPageEntityTest.php
@@ -65,7 +65,6 @@ public function __inject(CmsIndex $cmsIndex, CmsNew $cmsNew)
      */
     public function test(CmsPage $cmsPage)
     {
-        $this->markTestIncomplete('MAGETWO-30362');
         // Preconditions
         $cmsPage->persist();
         $filter = [
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.php
index 2f2322985147f..791e8e6fd2e4d 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsBlockEntityTest.php
@@ -37,7 +37,6 @@ class UpdateCmsBlockEntityTest extends AbstractCmsBlockEntityTest
      */
     public function test(CmsBlock $initialCmsBlock, CmsBlock $cmsBlock)
     {
-        $this->markTestIncomplete('MAGETWO-28916, MAGETWO-30362');
         // Precondition
         $initialCmsBlock->persist();
 
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.php
index 102abee0fc164..17e31a45a5e3d 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageEntityTest.php
@@ -80,7 +80,7 @@ public function __inject(CmsIndex $cmsIndex, CmsNew $cmsNew, CmsPage $cmsOrigina
      */
     public function test(CmsPage $cms, CmsPage $cmsOriginal)
     {
-        $this->markTestIncomplete('MAGETWO-29634, MAGETWO-30362');
+        $this->markTestIncomplete('MAGETWO-29634');
         // Steps
         $this->cmsIndex->open();
         $filter = ['title' => $cmsOriginal->getTitle()];
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
index 7cf921551e869..3fa6c1f373f8e 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.php
@@ -22,14 +22,14 @@ class Addresses extends Tab
      *
      * @var string
      */
-    protected $addNewAddress = '#add_address_button';
+    protected $addNewAddress = '.address-list-actions .add';
 
     /**
      * Open customer address
      *
      * @var string
      */
-    protected $customerAddress = '//*[@id="address_list"]/li[%d]/a';
+    protected $customerAddress = '//*[contains(@class, "address-list-item")][%d]';
 
     /**
      * Magento loader
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
index 1b28870768415..beb5cb2346fa7 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
@@ -7,65 +7,65 @@
 <mapping strict="0">
     <fields>
         <prefix>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[prefix]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[prefix]"]</selector>
             <strategy>css selector</strategy>
         </prefix>
         <firstname>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[firstname]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[firstname]"]</selector>
             <strategy>css selector</strategy>
         </firstname>
         <middlename>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[middlename]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[middlename]"]</selector>
             <strategy>css selector</strategy>
         </middlename>
         <lastname>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[lastname]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[lastname]"]</selector>
             <strategy>css selector</strategy>
         </lastname>
         <suffix>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[suffix]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[suffix]"]</selector>
             <strategy>css selector</strategy>
         </suffix>
         <company>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[company]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[company]"]</selector>
             <strategy>css selector</strategy>
         </company>
         <street>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[street][0]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[street][0]"]</selector>
             <strategy>css selector</strategy>
         </street>
         <city>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[city]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[city]"]</selector>
             <strategy>css selector</strategy>
         </city>
         <country_id>
             <input>select</input>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[country_id]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[country_id]"]</selector>
             <strategy>css selector</strategy>
         </country_id>
         <region_id>
             <input>select</input>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[region_id]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[region_id]"]</selector>
             <strategy>css selector</strategy>
         </region_id>
         <region>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[region]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[region]"]</selector>
             <strategy>css selector</strategy>
         </region>
         <postcode>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[postcode]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[postcode]"]</selector>
             <strategy>css selector</strategy>
         </postcode>
         <telephone>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[telephone]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[telephone]"]</selector>
             <strategy>css selector</strategy>
         </telephone>
         <fax>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[fax]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[fax]"]</selector>
             <strategy>css selector</strategy>
         </fax>
         <vat_id>
-            <selector>#address_form_container [aria-hidden="false"] [name^="address"][name$="[vat_id]"]</selector>
+            <selector>.address-item-edit[style=""] [name$="[vat_id]"]</selector>
             <strategy>css selector</strategy>
         </vat_id>
         <default_billing>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php
index 5c3268cc44aff..737a31217f859 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Handler/CustomerInjectable/Curl.php
@@ -22,7 +22,7 @@ class Curl extends AbstractCurl implements CustomerInjectableInterface
     /**
      * Default customer group
      */
-    const GENERAL_GROUP = 'General';
+    const GENERAL_GROUP = '1';
 
     /**
      * Mapping values for data
@@ -30,13 +30,8 @@ class Curl extends AbstractCurl implements CustomerInjectableInterface
      * @var array
      */
     protected $mappingData = [
-        'group_id' => [
-            self::GENERAL_GROUP => 1,
-            'Wholesale' => 2,
-            'Retailer' => 3,
-        ],
         'country_id' => [
-            'United States' => 'US',
+            'United States' => 'US'
         ],
         'region_id' => [
             'California' => 12,
@@ -58,8 +53,8 @@ class Curl extends AbstractCurl implements CustomerInjectableInterface
             'email',
             'dob',
             'taxvat',
-            'gender',
-        ],
+            'gender'
+        ]
     ];
 
     /**
@@ -76,6 +71,7 @@ public function persist(FixtureInterface $customer = null)
         /** @var CustomerInjectable $customer */
         $url = $_ENV['app_frontend_url'] . 'customer/account/createpost/?nocookie=true';
         $data = $customer->getData();
+        $data['group_id'] = $this->getCustomerGroup($customer);
 
         if ($customer->hasData('address')) {
             $address = $customer->getAddress();
@@ -120,6 +116,19 @@ protected function getCustomerId($email)
         return empty($match[1]) ? null : $match[1];
     }
 
+    /**
+     * Prepare customer for curl
+     *
+     * @param FixtureInterface $customer
+     * @return string
+     */
+    protected function getCustomerGroup(FixtureInterface $customer)
+    {
+        return $customer->hasData('group_id')
+            ? $customer->getDataFieldConfig('group_id')['source']->getCustomerGroup()->getCustomerGroupId()
+            : self::GENERAL_GROUP;
+    }
+
     /**
      * Add addresses in to customer account
      *
@@ -140,9 +149,6 @@ protected function addAddress(array $data)
             }
         }
         unset($data['password'], $data['password_confirmation']);
-        $curlData['account']['group_id'] = isset($curlData['account']['group_id'])
-            ? $curlData['account']['group_id']
-            : self::GENERAL_GROUP;
 
         $curlData = $this->replaceMappingData(array_merge($curlData, $data));
         $curlData = $this->prepareAddressData($curlData);
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php
index 55d3af3d2ec2b..9a0b737ef2733 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerInjectable.php
@@ -64,6 +64,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = [])
         ];
 
         $this->_data['defaultBackend'] = [
+            'website_id' => 'Main Website',
             'firstname' => 'John',
             'lastname' => 'Doe',
             'email' => 'JohnDoe_%isolation%@example.com',
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest/testCreateCustomerBackendEntity.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest/testCreateCustomerBackendEntity.csv
index e6e356a43c234..47b35a7511a61 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest/testCreateCustomerBackendEntity.csv
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest/testCreateCustomerBackendEntity.csv
@@ -1,6 +1,6 @@
-"customer/data/website_id";"customer/data/group_id/dataSet";"customer/data/prefix";"customer/data/firstname";"customer/data/middlename";"customer/data/lastname";"customer/data/suffix";"customer/data/email";"customer/data/dob";"customer/data/taxvat";"customer/data/gender";"address/data/firstname";"address/data/lastname";"address/data/street";"address/data/city";"address/data/country_id";"address/data/region_id";"address/data/postcode";"address/data/telephone";"constraint";"issue"
-"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";""
-"Admin";"Wholesale";"M";"John%isolation%";"Jack";"Doe%isolation%";"S";"JohnDoe%isolation%@example.com";"3/16/2004";"-";"Male";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";""
-"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"Joe";"Doe";"1 Main Street";"Culver City";"United States";"California";"90230";"3109450345";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"Bug: MAGETWO-30226"
-"Main Website";"Retailer";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.ccc";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerInvalidEmail";"Bug: MAGETWO-28875"
-"Main Website";"General";"-";"Thomas%isolation%";"-";"Oster%isolation%";"-";"Thomas%isolation%@example.com";"-";"5250008057";"-";"Thomas";"Oster";"Chmielna 113";"Bielsko-Biala";"Poland";"-";"43-310 ";"799885616";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"Bug: MAGETWO-30226"
+"customer/data/website_id";"customer/data/group_id/dataSet";"customer/data/prefix";"customer/data/firstname";"customer/data/middlename";"customer/data/lastname";"customer/data/suffix";"customer/data/email";"customer/data/dob";"customer/data/taxvat";"customer/data/gender";"address/data/firstname";"address/data/lastname";"address/data/street";"address/data/city";"address/data/country_id";"address/data/region_id";"address/data/postcode";"address/data/telephone";"constraint"
+"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm"
+"Admin";"Wholesale";"M";"John%isolation%";"Jack";"Doe%isolation%";"S";"JohnDoe%isolation%@example.com";"3/16/2004";"-";"Male";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm"
+"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"Joe";"Doe";"1 Main Street";"Culver City";"United States";"California";"90230";"3109450345";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm"
+"Main Website";"Retailer";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.ccc";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerInvalidEmail"
+"Main Website";"General";"-";"Thomas%isolation%";"-";"Oster%isolation%";"-";"Thomas%isolation%@example.com";"-";"5250008057";"-";"Thomas";"Oster";"Chmielna 113";"Bielsko-Biala";"Poland";"-";"43-310 ";"799885616";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm"
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest/testUpdateCustomerBackendEntity.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest/testUpdateCustomerBackendEntity.csv
index aabdfc2d31fb4..649c9f7842c9f 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest/testUpdateCustomerBackendEntity.csv
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest/testUpdateCustomerBackendEntity.csv
@@ -1,4 +1,4 @@
 "initialCustomer/dataSet";"customer/data/group_id/dataSet";"customer/data/prefix";"customer/data/firstname";"customer/data/middlename";"customer/data/lastname";"customer/data/suffix";"customer/data/email";"customer/data/dob";"customer/data/taxvat";"customer/data/gender";"address/data/prefix";"address/data/firstname";"address/data/middlename";"address/data/lastname";"address/data/suffix";"address/data/company";"address/data/street";"address/data/city";"address/data/country_id";"address/data/region_id";"address/data/region";"address/data/postcode";"address/data/telephone";"address/data/fax";"address/data/vat_id";"constraint";"issue"
-"default";"Wholesale";"%isolation%Prefix_";"John_%isolation%";"Middle Name %isolation%";"Doe%isolation%";"_Suffix%isolation%";"JohnDoe%isolation%@example.com";1/8/1986;123456789001;"Male";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid";""
-"default";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Prefix%isolation%_";"Doe%isolation%";"Middle Name %isolation%";"Doe%isolation%";"_Suffix%isolation%";"Company%isolation%";"3962 Horner Street";"Dothan";"United States";"Alabama";"-";36303;"334-200-4060";"555-666-777-8910";"U1234567890";"assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid";"Bug: MAGETWO-30226"
-"default";"Retailer";"%isolation%Prefix_";"Jane_%isolation%";"Jane Middle Name %isolation%";"Doe%isolation%";"_JaneSuffix%isolation%";"Jane%isolation%@example.com";1/12/2000;987654321;"Female";"Prefix%isolation%_";"Doe%isolation%";"Middle Name %isolation%";"Doe%isolation%";"_Suffix%isolation%";"Company%isolation%";"39 Northgate Street";"BICKTON";"United Kingdom";"-";"PINMINNOCH";"KA26 1PF ";"999-777-111-2345";"-";987654321;"assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid";"Bug: MAGETWO-30226"
+"default";"Wholesale";"%isolation%Prefix_";"John_%isolation%";"Middle Name %isolation%";"Doe%isolation%";"_Suffix%isolation%";"JohnDoe%isolation%@example.com";1/8/1986;123456789001;"Male";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid";"Bug: MAGETWO-31689"
+"default";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"Prefix%isolation%_";"Doe%isolation%";"Middle Name %isolation%";"Doe%isolation%";"_Suffix%isolation%";"Company%isolation%";"3962 Horner Street";"Dothan";"United States";"Alabama";"-";36303;"334-200-4060";"555-666-777-8910";"U1234567890";"assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid";""
+"default";"Retailer";"%isolation%Prefix_";"Jane_%isolation%";"Jane Middle Name %isolation%";"Doe%isolation%";"_JaneSuffix%isolation%";"Jane%isolation%@example.com";1/12/2000;987654321;"Female";"Prefix%isolation%_";"Doe%isolation%";"Middle Name %isolation%";"Doe%isolation%";"_Suffix%isolation%";"Company%isolation%";"39 Northgate Street";"BICKTON";"United Kingdom";"-";"PINMINNOCH";"KA26 1PF ";"999-777-111-2345";"-";987654321;"assertCustomerSuccessSaveMessage, assertCustomerForm, assertCustomerInGrid";""
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VatGroupAssignmentTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VatGroupAssignmentTest.php
index a052d02b70c65..0df559a2205ac 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VatGroupAssignmentTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VatGroupAssignmentTest.php
@@ -27,7 +27,6 @@ class VatGroupAssignmentTest extends Functional
      */
     protected function setUp()
     {
-        $this->markTestIncomplete('Bug: MAGETWO-30630');
         Factory::getApp()->magentoBackendLoginUser();
         $this->vatFixture = Factory::getFixtureFactory()->getMagentoCustomerVatGroup();
     }
diff --git a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/TestCase/DeleteStoreCreditFromCurrentQuoteTest.php b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/TestCase/DeleteStoreCreditFromCurrentQuoteTest.php
index 8103d3f7b3593..8eba08129801c 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/TestCase/DeleteStoreCreditFromCurrentQuoteTest.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerBalance/Test/TestCase/DeleteStoreCreditFromCurrentQuoteTest.php
@@ -150,8 +150,6 @@ public function test(
         array $shipping,
         array $payment
     ) {
-        $this->markTestIncomplete("Bug: MAGETWO-30435");
-
         // Precondition
         $customer->persist();
         $customerBalance = $this->fixtureFactory->createByCode(
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php
index 9c1ff725bf24c..d71d319dd7bd2 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/Constraint/AssertCustomerCustomAttributeErrorDuplicateMessage.php
@@ -30,11 +30,9 @@ class AssertCustomerCustomAttributeErrorDuplicateMessage extends AbstractConstra
      */
     public function processAssert(CustomerAttributeNew $customerAttributeNew)
     {
-        $customerAttributeNew->getCustomerCustomAttributesForm()->openTab('properties');
-        $errors = $customerAttributeNew->getCustomerCustomAttributesForm()->getTabElement('properties')->getJsErrors();
         \PHPUnit_Framework_Assert::assertEquals(
             self::ERROR_DUPLICATE_MESSAGE,
-            $errors['Attribute Code']
+            $customerAttributeNew->getMessagesBlock()->getErrorMessages()
         );
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/TestCase/ValidationAttributeCodeCustomerCustomAttributesEntityTest.php b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/TestCase/ValidationAttributeCodeCustomerCustomAttributesEntityTest.php
index 999edd12aa355..386d26670baba 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/TestCase/ValidationAttributeCodeCustomerCustomAttributesEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerCustomAttributes/Test/TestCase/ValidationAttributeCodeCustomerCustomAttributesEntityTest.php
@@ -74,7 +74,6 @@ public function test(
         CustomerCustomAttribute $customerAttribute,
         CustomerCustomAttribute $initialCustomerAttribute
     ) {
-        $this->markTestIncomplete('MAGETWO-28194');
         //Preconditions
         $initialCustomerAttribute->persist();
         $customerAttribute = $fixtureFactory->createByCode(
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/TestCase/CreateCustomerSegmentEntityTest.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/TestCase/CreateCustomerSegmentEntityTest.php
index a203f1255af34..5c5e15bb9f693 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/TestCase/CreateCustomerSegmentEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/TestCase/CreateCustomerSegmentEntityTest.php
@@ -173,7 +173,6 @@ public function test(
         array $salesRule,
         AssertCustomerSegmentSuccessSaveMessage $assertCustomerSegmentSuccessSaveMessage
     ) {
-        $this->markTestIncomplete('MAGETWO-30226');
         //Preconditions
         $customer->persist();
         $filter = ['email' => $customer->getEmail()];
diff --git a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/TestCase/UpdateCustomerSegmentEntityTest.php b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/TestCase/UpdateCustomerSegmentEntityTest.php
index 73e9869be9d26..3125701d8c61f 100644
--- a/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/TestCase/UpdateCustomerSegmentEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/CustomerSegment/Test/TestCase/UpdateCustomerSegmentEntityTest.php
@@ -159,7 +159,6 @@ public function test(
         CustomerSegment $customerSegment,
         CustomerSegment $customerSegmentOriginal
     ) {
-        $this->markTestIncomplete('MAGETWO-30226');
         //Preconditions
         $customer->persist();
         $this->customerIndexPage->open();
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv
index 5c74a32bed354..486f051573ba4 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest/test.csv
@@ -1,15 +1,15 @@
-"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/is_virtual";"product/data/category";"product/data/description";"product/data/short_description";"product/data/stock_data/manage_stock";"product/data/stock_data/qty";"product/data/stock_data/use_config_min_qty";"product/data/stock_data/min_qty";"product/data/downloadable_sample/preset";"product/data/downloadable_links/preset";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/special_price";"product/data/group_price/preset";"product/data/tier_price/preset";"product/data/url_key";"constraint";"issue"
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"1";"In Stock";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertProductInStock";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"1";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertDownloadableSamplesData, assertDownloadableLinksData";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"33";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"55";"Taxable Goods";"10";"In Stock";"Yes";"-";"-";"-";"-";"-";"-";"-";"with_three_samples";"with_three_links";"two_options";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductCustomOptionsOnProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertProductSearchableBySku";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"50";"Out of Stock";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"9999";"Taxable Goods";"-";"-";"Yes";"Default Category";"-";"-";"Yes";"123";"No";"123";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"98";"None";"5";"In Stock";"Yes";"Default Category";"This is description for downloadable product";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"57";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"Taxable Goods";"11";"In Stock";"Yes";"category %isolation%";"This is description for downloadable product";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"Taxable Goods";"11";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductCustomOptionsOnProductPage";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"-";"-";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"10";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"5";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductSpecialPriceOnProductPage";""
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"365";"Taxable Goods";"23";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"default";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductGroupedPriceOnProductPage";"MAGETWO-31179"
-"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"250";"Taxable Goods";"65";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"default";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductTierPriceOnProductPage";""
+"product/data/name";"product/data/sku";"product/data/price/value";"product/data/tax_class_id/dataSet";"product/data/quantity_and_stock_status/qty";"product/data/quantity_and_stock_status/is_in_stock";"product/data/is_virtual";"product/data/category";"product/data/description";"product/data/short_description";"product/data/stock_data/manage_stock";"product/data/stock_data/qty";"product/data/stock_data/use_config_min_qty";"product/data/stock_data/min_qty";"product/data/downloadable_sample/preset";"product/data/downloadable_links/preset";"product/data/custom_options/preset";"product/data/custom_options/import_products";"product/data/special_price";"product/data/group_price/preset";"product/data/tier_price/preset";"product/data/url_key";"constraint"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"1";"In Stock";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertProductInStock"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"1";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertDownloadableSamplesData, assertDownloadableLinksData"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"33";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"55";"Taxable Goods";"10";"In Stock";"Yes";"-";"-";"-";"-";"-";"-";"-";"with_three_samples";"with_three_links";"two_options";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductCustomOptionsOnProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage, assertDownloadableLinksData, assertProductInStock, assertProductSearchableBySku"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"50";"Out of Stock";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductOutOfStock, assertProductInGrid, assertDownloadableProductForm"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"9999";"Taxable Goods";"-";"-";"Yes";"Default Category";"-";"-";"Yes";"123";"No";"123";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductOutOfStock"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"98";"None";"5";"In Stock";"Yes";"Default Category";"This is description for downloadable product";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"57";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"catalogProductSimple::with_two_custom_option,catalogProductSimple::with_all_custom_option";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"Taxable Goods";"11";"In Stock";"Yes";"category %isolation%";"This is description for downloadable product";"This is short description for downloadable product";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductPage, assertProductInGrid, assertDownloadableProductForm, assertProductCustomOptionsOnProductPage, assertDownloadableSamplesData, assertDownloadableLinksData"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"65";"Taxable Goods";"11";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"default";"with_three_links";"default";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertDownloadableLinksData, assertProductCustomOptionsOnProductPage"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"100";"Taxable Goods";"-";"-";"Yes";"Default Category";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertDownloadableProductForm, assertProductVisibleInCategory, assertProductPage"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"10";"Taxable Goods";"10";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"5";"-";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductSpecialPriceOnProductPage"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"365";"Taxable Goods";"23";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"default";"-";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductGroupedPriceOnProductPage"
+"DownloadableProduct_%isolation%";"DownloadableProduct_%isolation%";"250";"Taxable Goods";"65";"In Stock";"Yes";"category %isolation%";"-";"-";"-";"-";"-";"-";"-";"default";"-";"-";"-";"-";"default";"downloadableproduct-%isolation%";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductTierPriceOnProductPage"
diff --git a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Repository/GiftCardProduct.php b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Repository/GiftCardProduct.php
index 85e8989f01329..6d9511042c34a 100644
--- a/dev/tests/functional/tests/app/Magento/GiftCard/Test/Repository/GiftCardProduct.php
+++ b/dev/tests/functional/tests/app/Magento/GiftCard/Test/Repository/GiftCardProduct.php
@@ -46,7 +46,7 @@ public function __construct(array $defaultConfig = [], array $defaultData = [])
             'allow_message' => 'Yes',
             'use_config_allow_message' => 'Yes',
             'email_template' => 'Gift Card(s) Purchase (Default)',
-            'use_config_email_template' => 'Yes',
+            'use_config_email_template' => 'No',
             'visibility' => 'Catalog, Search',
             'url_key' => 'test-product-giftcard-%isolation%',
             'use_config_gift_message_available' => 'Yes',
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php
index 9280a88bf8ec5..48e9b9fb95a7a 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/TestCase/CheckoutWithGiftMessagesTest.php
@@ -35,7 +35,6 @@ class CheckoutWithGiftMessagesTest extends Scenario
      */
     public function test()
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30593");
         $this->executeScenario();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryFrontendEntityTest.php
index 5db2de41e85c3..e804daae43246 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/CreateGiftRegistryFrontendEntityTest.php
@@ -36,7 +36,7 @@
  * 8. Perform Asserts
  *
  * @group Gift_Registry_(CS)
- * @ZephyrId MAGETWO-26176
+ * @ZephyrId MAGETWO-26962
  */
 class CreateGiftRegistryFrontendEntityTest extends Injectable
 {
@@ -148,7 +148,6 @@ public function __prepare(
      */
     public function test(GiftRegistry $giftRegistry, CustomerInjectable $customer)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-31328');
         // Steps
         $this->cmsIndex->open();
         $this->cmsIndex->getLinksBlock()->openLink("Log In");
diff --git a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryFrontendEntityTest.php b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryFrontendEntityTest.php
index 43601582716c2..b577f4347d086 100644
--- a/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryFrontendEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftRegistry/Test/TestCase/UpdateGiftRegistryFrontendEntityTest.php
@@ -137,7 +137,6 @@ public function __prepare(
      */
     public function test(GiftRegistry $giftRegistryOrigin, GiftRegistry $giftRegistry, CustomerInjectable $customer)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-31328');
         // Preconditions
         $this->customerAccountLogin->open()->getLoginBlock()->login($customer);
         $giftRegistryOrigin->persist();
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/CreateGiftWrappingEntityTest.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/CreateGiftWrappingEntityTest.php
index 63201bc3e8b8d..36595e4c9b84b 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/CreateGiftWrappingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/CreateGiftWrappingEntityTest.php
@@ -62,7 +62,6 @@ public function __inject(GiftWrappingIndex $giftWrappingIndexPage, GiftWrappingN
      */
     public function test(GiftWrapping $giftWrapping)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-30995');
         // Steps
         $this->giftWrappingIndexPage->open();
         $this->giftWrappingIndexPage->getGridPageActions()->addNew();
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/DeleteGiftWrappingEntityTest.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/DeleteGiftWrappingEntityTest.php
index 4f81c04993cc9..50532cdedcb31 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/DeleteGiftWrappingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/DeleteGiftWrappingEntityTest.php
@@ -64,7 +64,6 @@ public function __inject(GiftWrappingIndex $giftWrappingIndexPage, GiftWrappingN
      */
     public function test(GiftWrapping $giftWrapping)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-30995');
         // Precondition
         $giftWrapping->persist();
 
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/MassActionsGiftWrappingEntityTest.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/MassActionsGiftWrappingEntityTest.php
index 4b307a0f298b8..413f96bc78f71 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/MassActionsGiftWrappingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/MassActionsGiftWrappingEntityTest.php
@@ -82,7 +82,6 @@ public function __inject(
      */
     public function test($giftWrappings, $giftWrappingsIndexToSelect, $action, $status, $giftWrappingsIndexToStay)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-30995');
         // Precondition
         $giftWrappingsInitial = explode(",", $giftWrappings);
         $giftWrappings = $this->createGiftWrappings($giftWrappingsInitial);
diff --git a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/UpdateGiftWrappingEntityTest.php b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/UpdateGiftWrappingEntityTest.php
index 7929d1b78987b..103af19e7241b 100644
--- a/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/UpdateGiftWrappingEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/GiftWrapping/Test/TestCase/UpdateGiftWrappingEntityTest.php
@@ -66,7 +66,6 @@ public function __inject(GiftWrappingIndex $giftWrappingIndexPage, GiftWrappingN
      */
     public function test(GiftWrapping $initialGiftWrapping, GiftWrapping $giftWrapping)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-30995');
         // Precondition
         $initialGiftWrapping->persist();
 
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
index 38ce82d5ca9e9..cd025b734f794 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Block;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml
index 4b4c273e145ba..87f9389c51434 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CreateAdmin.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 -->
 <mapping strict="0">
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
index fbf0c11b960b8..af5707450b52e 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Block;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml
index 954f66be0af8c..afca361627a82 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/CustomizeStore.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 -->
 <mapping strict="0">
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
index ecf02fc465917..efc112709e88d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Block;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
index 53283c70ceb3c..c09b95b5d282e 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Database.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 -->
 <mapping strict="0">
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
index 99c7a78c15b82..8df7ca8d6c0c2 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Install.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Block;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
index 3308d69583aad..75085d53c7507 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Landing.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Block;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
index dcc402e2cd050..83f59f7159d4d 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/License.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Block;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
index 9463367b61a56..72fcfcb1aa26a 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/Readiness.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Block;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
index 30b1cf16abe8c..08ca27d4d6f98 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Block;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
index a35c98e1fdd4b..b610ce62b6a1f 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Block/WebConfiguration.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 -->
 <mapping strict="0">
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
index 4afb503373024..673956def75bf 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertAgreementTextPresent.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
index 5636a6871aca7..b2da3668ba26f 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertCurrencySelected.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
index b83924058a1ca..13cd5642be416 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertKeyCreated.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
index 2c17cb6115f49..177673c0adb93 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertLanguageSelected.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
index 55394a8fcad3b..7c9672dfb3c3c 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertRewritesEnabled.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
index fb9cb8b23f9e7..8f10986c665da 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSecureUrlEnabled.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php
index 14a7530824cc7..96f01b94d167b 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessDbConnection.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
index 7cb82fe4f553d..47df11f0aacea 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessInstall.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
index 46e302fa3e9b2..22db21f2f57ab 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Constraint/AssertSuccessfulReadinessCheck.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Constraint;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
index 213887520373e..0eba0b7fd4682 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\Fixture;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
index 0bd709166a26e..aad8122cc39c7 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 -->
 <fixture class="Magento\Install\Test\Fixture\Install">
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml b/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml
index 8857bccbd2b47..06f3b3a33b408 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Page/Install.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 -->
 <page mca="setup/" module="Magento_Install">
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
index 55fdf17178c28..726337a42a551 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/TestCase/InstallTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Install\Test\TestCase;
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
index ac34e139034a0..921f167e82432 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/constraint.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 -->
 <constraint>
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
index f2bbf3984604d..c5c091aad3d47 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/fixture.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 -->
 
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml b/dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml
index 833b540683bd2..523ecd7d0672c 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/etc/page.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 -->
 <page module="Magento_Install">
diff --git a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php
index d808721ac0c3c..c665073f124b7 100644
--- a/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Integration/Test/TestCase/ActivateIntegrationEntityTest.php
@@ -53,7 +53,6 @@ public function __inject(IntegrationIndex $integrationIndex)
      */
     public function test(Integration $integration)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-30270');
         // Preconditions
         $integration->persist();
 
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Block/Form.php b/dev/tests/functional/tests/app/Magento/Invitation/Test/Block/Form.php
index eedaf1cc57499..d57ce65dce99c 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Block/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Block/Form.php
@@ -21,6 +21,13 @@ class Form extends \Mtf\Block\Form
      */
     protected $sendInvitationsButton = '.action.submit';
 
+    /**
+     * Add email button
+     *
+     * @var string
+     */
+    protected $addEmail = '.add';
+
     /**
      * Click 'Send Invitations' button
      *
@@ -42,6 +49,11 @@ public function fill(FixtureInterface $invitation, Element $element = null)
     {
         $data = $invitation->getData();
         $mapping = $this->dataMapping($data);
+        $emailCount = count($data['email']);
+        while ($emailCount > 1) {
+            $this->_rootElement->find($this->addEmail)->click();
+            $emailCount--;
+        }
         $this->_fill($mapping, $element);
 
         return $this;
diff --git a/dev/tests/functional/tests/app/Magento/Invitation/Test/Block/Form.xml b/dev/tests/functional/tests/app/Magento/Invitation/Test/Block/Form.xml
index f64ffda5028c2..c71f31eecfa40 100644
--- a/dev/tests/functional/tests/app/Magento/Invitation/Test/Block/Form.xml
+++ b/dev/tests/functional/tests/app/Magento/Invitation/Test/Block/Form.xml
@@ -8,19 +8,19 @@
     <fields>
         <email composite="1">
             <email_1>
-                <selector>[name="email[1]"]</selector>
+                <selector>[name="email[0]"]</selector>
             </email_1>
             <email_2>
-                <selector>[name="email[2]"]</selector>
+                <selector>[name="email[1]"]</selector>
             </email_2>
             <email_3>
-                <selector>[name="email[3]"]</selector>
+                <selector>[name="email[2]"]</selector>
             </email_3>
             <email_4>
-                <selector>[name="email[4]"]</selector>
+                <selector>[name="email[3]"]</selector>
             </email_4>
             <email_5>
-                <selector>[name="email[5]"]</selector>
+                <selector>[name="email[4]"]</selector>
             </email_5>
         </email>
         <message>
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Page/Category/CatalogCategoryView.xml b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Page/Category/CatalogCategoryView.xml
index 8829191c28d92..c88f8995f3bab 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Page/Category/CatalogCategoryView.xml
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/Page/Category/CatalogCategoryView.xml
@@ -8,7 +8,7 @@
     <blocks>
         <wishlistSearchBlock>
             <class>Magento\MultipleWishlist\Test\Block\Widget\Search</class>
-            <locator>.widget.block.wishlist.find</locator>
+            <locator>.widget.block.block-wishlist-search</locator>
             <strategy>css selector</strategy>
         </wishlistSearchBlock>
     </blocks>
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest.php
index de6c8bc9088af..1c20105b80c1c 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest.php
@@ -55,8 +55,6 @@ public function __prepare()
      */
     public function test(MultipleWishlist $multipleWishlist, $products, $duplicate)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-27949');
-
         // Preconditions
         $multipleWishlist->persist();
         $customer = $multipleWishlist->getDataFieldConfig('customer_id')['source']->getCustomer();
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest/test.csv b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest/test.csv
index cff804d156b84..1d7e89ec96b59 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest/test.csv
@@ -1,7 +1,7 @@
-"multipleWishlist/dataSet";"products";"duplicate";"qtyToAction";"constraint"
-"wishlist_public";"catalogProductSimple::100_dollar_product";"yes";"2";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
-"wishlist_public";"catalogProductVirtual::50_dollar_product";"no";"1";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
-"wishlist_public";"configurableProductInjectable::default";"no";"3";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
-"wishlist_public";"groupedProductInjectable::three_simple_products";"no";"-";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
-"wishlist_public";"downloadableProductInjectable::with_two_separately_links";"no";"-";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
-"wishlist_public";"bundleProduct::bundle_dynamic_product";"no";"2";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertBundleProductDetailsInMultipleWishlist, assertProductIsPresentInCustomerBackendWishlist"
\ No newline at end of file
+"multipleWishlist/dataSet";"products";"duplicate";"qtyToAction";"constraint";"issue"
+"wishlist_public";"catalogProductSimple::100_dollar_product";"yes";"2";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist";"Bug: MAGETWO-31724"
+"wishlist_public";"catalogProductVirtual::50_dollar_product";"no";"1";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist";""
+"wishlist_public";"configurableProductInjectable::default";"no";"3";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist";""
+"wishlist_public";"groupedProductInjectable::three_simple_products";"no";"-";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist";""
+"wishlist_public";"downloadableProductInjectable::with_two_separately_links";"no";"-";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist";""
+"wishlist_public";"bundleProduct::bundle_dynamic_product";"no";"2";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertBundleProductDetailsInMultipleWishlist, assertProductIsPresentInCustomerBackendWishlist";"Bug: MAGETWO-31724"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/CopyProductToAnotherWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/CopyProductToAnotherWishlistEntityTest.php
index cb0666bd40668..239e8372ca072 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/CopyProductToAnotherWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/CopyProductToAnotherWishlistEntityTest.php
@@ -50,7 +50,6 @@ class CopyProductToAnotherWishlistEntityTest extends AbstractActionProductToAnot
      */
     public function test(MultipleWishlist $multipleWishlist, CustomerInjectable $customer, $product, $qty, $qtyToAction)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-31328');
         // Preconditions
         $this->createMultipleWishlist($multipleWishlist, $customer);
         $product = $this->createProduct($product, $qty);
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductFromCustomerActivityToOrderTest/test.csv b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductFromCustomerActivityToOrderTest/test.csv
index eb783008ccb72..e795b38d0d463 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductFromCustomerActivityToOrderTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductFromCustomerActivityToOrderTest/test.csv
@@ -1,7 +1,7 @@
-"multipleWishlist/dataSet";"products";"duplicate";"qtyToMove";"constraint";"issue"
-"wishlist_public";"catalogProductSimple::100_dollar_product";"yes";"2";"assertProductInItemsOrderedGrid";""
-"wishlist_public";"catalogProductVirtual::50_dollar_product";"no";"1";"assertProductInItemsOrderedGrid";""
-"wishlist_public";"configurableProductInjectable::default";"no";"3";"assertConfigurableProductInItemsOrderedGrid";""
-"wishlist_public";"groupedProductInjectable::three_simple_products";"no";"-";"assertGroupedProductInItemsOrderedGrid";""
-"wishlist_public";"downloadableProductInjectable::with_two_separately_links";"no";"1";"assertProductInItemsOrderedGrid";"Bug: MAGETWO-29173"
-"wishlist_public";"bundleProduct::bundle_dynamic_product";"no";"2";"assertProductInItemsOrderedGrid";""
\ No newline at end of file
+"multipleWishlist/dataSet";"products";"duplicate";"qtyToMove";"constraint"
+"wishlist_public";"catalogProductSimple::100_dollar_product";"yes";"2";"assertProductInItemsOrderedGrid"
+"wishlist_public";"catalogProductVirtual::50_dollar_product";"no";"1";"assertProductInItemsOrderedGrid"
+"wishlist_public";"configurableProductInjectable::default";"no";"3";"assertConfigurableProductInItemsOrderedGrid"
+"wishlist_public";"groupedProductInjectable::three_simple_products";"no";"-";"assertGroupedProductInItemsOrderedGrid"
+"wishlist_public";"downloadableProductInjectable::with_two_separately_links";"no";"1";"assertProductInItemsOrderedGrid"
+"wishlist_public";"bundleProduct::bundle_dynamic_product";"no";"2";"assertProductInItemsOrderedGrid"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest.php
index 3063b4d9e90fb..61b749c250d84 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductToAnotherWishlistEntityTest.php
@@ -49,7 +49,6 @@ class MoveProductToAnotherWishlistEntityTest extends AbstractActionProductToAnot
      */
     public function test(MultipleWishlist $multipleWishlist, CustomerInjectable $customer, $product, $qty, $qtyToAction)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-31328');
         // Preconditions
         $this->createMultipleWishlist($multipleWishlist, $customer);
         $product = $this->createProduct($product, $qty);
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/ShareMultipleWishlistTest.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/ShareMultipleWishlistTest.php
index 8179d1d35b3df..ecae279578a91 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/ShareMultipleWishlistTest.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/ShareMultipleWishlistTest.php
@@ -134,7 +134,6 @@ public function test(
         MultipleWishlist $multipleWishlist,
         array $sharingInfo
     ) {
-        $this->markTestIncomplete("Bug: MAGETWO-30155");
         // Preconditions
         $multipleWishlist->persist();
         $product->persist();
@@ -145,7 +144,7 @@ public function test(
         $this->cmsIndex->getLinksBlock()->openLink("Log In");
         $this->customerAccountLogin->getLoginBlock()->login($customer);
         $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-        $this->catalogProductView->getMultipleWishlistViewBlock()->addToMultipleWishlist($multipleWishlist->getName());
+        $this->catalogProductView->getMultipleWishlistViewBlock()->addToMultipleWishlist($multipleWishlist);
         $this->wishlistIndex->getWishlistBlock()->clickShareWishList();
         $this->wishlistShare->getSharingInfoForm()->fillForm($sharingInfo);
         $this->wishlistShare->getSharingInfoForm()->shareWishlist();
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
index e808d05dc5b53..a7acfcfb81df5 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/AbandonedCartsReportEntityTest.php
@@ -80,6 +80,7 @@ public function __inject(
      */
     public function test($products, CustomerInjectable $customer)
     {
+        $this->markTestIncomplete('Bug: MAGETWO-31737');
         // Precondition
         $products = $this->createProducts($products);
         $customer->persist();
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.php
index ad5e499938fe6..3eb9432a53175 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/DownloadProductsReportEntityTest.php
@@ -79,7 +79,6 @@ public function __inject(
      */
     public function test(OrderInjectable $order, $downloads)
     {
-        $this->markTestIncomplete('MAGETWO-30346');
         // Preconditions
         $order->persist();
         $invoice = $this->objectManager->create('Magento\Sales\Test\TestStep\CreateInvoiceStep', ['order' => $order]);
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest/test.csv
index d3b91c6d306ef..b99734c752820 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesCouponReportEntityTest/test.csv
@@ -1,5 +1,5 @@
-"order/dataSet";"viewsReport/report_type";"viewsReport/period_type";"viewsReport/from";"viewsReport/to";"viewsReport/show_order_statuses";"viewsReport/order_statuses";"viewsReport/show_empty_rows";"viewsReport/price_rule_type";"viewsReport/rules_list";"constraint";"issue"
-"with_coupon";"Order Created Date";"Year";"m/d/Y";"m/d/Y";"Any";"-";"No";"Any";"-";"assertCouponReportResult";""
-"with_coupon";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Specified";"Processing";"No";"Any";"-";"assertCouponReportResult";""
-"with_coupon";"Order Updated Date";"Day";"m/d/Y";"m/d/Y";"Any";"-";"No";"Specified";"%rule_name%";"assertCouponReportResult";"Bug: MAGETWO-28201"
-"with_coupon";"Order Updated Date";"Day";"m/d/Y 12:00 a-1 day";"m/d/Y 12:00 a+1 day";"Specified";"Processing";"Yes";"Specified";"%rule_name%";"assertCouponReportResult";"Bug: MAGETWO-28201"
+"order/dataSet";"viewsReport/report_type";"viewsReport/period_type";"viewsReport/from";"viewsReport/to";"viewsReport/show_order_statuses";"viewsReport/order_statuses";"viewsReport/show_empty_rows";"viewsReport/price_rule_type";"viewsReport/rules_list";"constraint"
+"with_coupon";"Order Created Date";"Year";"m/d/Y";"m/d/Y";"Any";"-";"No";"Any";"-";"assertCouponReportResult"
+"with_coupon";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Specified";"Processing";"No";"Any";"-";"assertCouponReportResult"
+"with_coupon";"Order Updated Date";"Day";"m/d/Y";"m/d/Y";"Any";"-";"No";"Specified";"%rule_name%";"assertCouponReportResult"
+"with_coupon";"Order Updated Date";"Day";"m/d/Y 12:00 a-1 day";"m/d/Y 12:00 a+1 day";"Specified";"Processing";"Yes";"Specified";"%rule_name%";"assertCouponReportResult"
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest/test.csv
index 4f7347373f358..9870a0c150707 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesInvoiceReportEntityTest/test.csv
@@ -1,4 +1,4 @@
-"order/dataSet";"order/data/price/preset";"invoiceReport/report_type";"invoiceReport/period_type";"invoiceReport/from";"invoiceReport/to";"invoiceReport/show_order_statuses";"invoiceReport/data/order_statuses";"invoiceReport/show_empty_rows";"constraint";"issue"
-"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"-";"Yes";"assertInvoiceReportIntervalResult, assertInvoiceReportTotalResult";"Bug: MAGETWO-29383"
-"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"-";"No";"assertInvoiceReportIntervalResult, assertInvoiceReportTotalResult";""
-"default";"full_invoice";"Last Invoice Created Date";"Day";"m/d/Y";"m/d/Y";"Specified";"Processing";"No";"assertInvoiceReportIntervalResult, assertInvoiceReportTotalResult";""
+"order/dataSet";"order/data/price/preset";"invoiceReport/report_type";"invoiceReport/period_type";"invoiceReport/from";"invoiceReport/to";"invoiceReport/show_order_statuses";"invoiceReport/data/order_statuses";"invoiceReport/show_empty_rows";"constraint"
+"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"-";"Yes";"assertInvoiceReportIntervalResult, assertInvoiceReportTotalResult"
+"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"-";"No";"assertInvoiceReportIntervalResult, assertInvoiceReportTotalResult"
+"default";"full_invoice";"Last Invoice Created Date";"Day";"m/d/Y";"m/d/Y";"Specified";"Processing";"No";"assertInvoiceReportIntervalResult, assertInvoiceReportTotalResult"
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv
index e5dab82b29e18..8503c9d896de0 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesOrderReportEntityTest/test.csv
@@ -1,4 +1,4 @@
-"order/dataSet";"order/data/price/preset";"salesReport/report_type";"salesReport/period_type";"salesReport/from";"salesReport/to";"salesReport/show_order_statuses";"salesReport/order_statuses";"salesReport/show_empty_rows";"salesReport/show_actual_columns";"constraint";"issue"
-"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"-";"Yes";"Yes";"assertSalesReportIntervalResult, assertSalesReportTotalResult";";"Bug: MAGETWO-29383"
-"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"-";"No";"No";"assertSalesReportIntervalResult, assertSalesReportTotalResult";""
-"default";"full_invoice";"Order Updated Date";"Day";"m/d/Y";"m/d/Y";"Specified";"Processing";"No";"No";"assertSalesReportIntervalResult, assertSalesReportTotalResult";""
+"order/dataSet";"order/data/price/preset";"salesReport/report_type";"salesReport/period_type";"salesReport/from";"salesReport/to";"salesReport/show_order_statuses";"salesReport/order_statuses";"salesReport/show_empty_rows";"salesReport/show_actual_columns";"constraint"
+"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"-";"Yes";"Yes";"assertSalesReportIntervalResult, assertSalesReportTotalResult"
+"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"-";"No";"No";"assertSalesReportIntervalResult, assertSalesReportTotalResult"
+"default";"full_invoice";"Order Updated Date";"Day";"m/d/Y";"m/d/Y";"Specified";"Processing";"No";"No";"assertSalesReportIntervalResult, assertSalesReportTotalResult"
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest/test.csv
index f25229d78431f..74fb07c3a15fd 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesRefundsReportEntityTest/test.csv
@@ -1,4 +1,4 @@
-"description";"order/dataSet";"order/data/price/preset";"refundsReport/report_type";"refundsReport/period_type";"refundsReport/from";"refundsReport/to";"refundsReport/show_order_statuses";"refundsReport/show_empty_rows";"constraint";"issue"
-"assert refunds year report";"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"Yes";"assertRefundReportIntervalResult";"MAGETWO-29383"
-"assert refunds month report";"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"No";"assertRefundReportIntervalResult";""
-"assert refund Daily report";"default";"full_invoice";"Last Credit Memo Created Date";"Day";"m/d/Y";"m/d/Y";"Specified";"No";"assertRefundReportIntervalResult";""
+"description";"order/dataSet";"order/data/price/preset";"refundsReport/report_type";"refundsReport/period_type";"refundsReport/from";"refundsReport/to";"refundsReport/show_order_statuses";"refundsReport/show_empty_rows";"constraint"
+"assert refunds year report";"default";"full_invoice";"Order Created Date";"Year";"m/d/Y 12:00 a-2 days";"m/d/Y 12:00 a+2 days";"Any";"Yes";"assertRefundReportIntervalResult"
+"assert refunds month report";"default";"full_invoice";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Any";"No";"assertRefundReportIntervalResult"
+"assert refund Daily report";"default";"full_invoice";"Last Credit Memo Created Date";"Day";"m/d/Y";"m/d/Y";"Specified";"No";"assertRefundReportIntervalResult"
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php
index f022023a386ed..20b8e03158f26 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php
@@ -143,16 +143,14 @@ public function __inject(
      * @param OrderInjectable $order
      * @param TaxRule $taxRule
      * @param array $report
-     * @param string $orderStatus
-     * @param string $invoice
+     * @param string $orderSteps
      * @return void
      */
     public function test(
         OrderInjectable $order,
         TaxRule $taxRule,
         array $report,
-        $orderStatus,
-        $invoice
+        $orderSteps
     ) {
         // Precondition
         $taxRule->persist();
@@ -160,13 +158,7 @@ public function test(
         $order->persist();
         $this->orderIndex->open();
         $this->orderIndex->getSalesOrderGrid()->searchAndOpen(['id' => $order->getId()]);
-        if ($orderStatus !== 'Pending') {
-            $createInvoice = $this->objectManager->create(
-                'Magento\Sales\Test\TestStep\CreateInvoiceStep',
-                ['order' => $order, 'data' => $invoice]
-            );
-            $createInvoice->run();
-        }
+        $this->processOrder($orderSteps, $order);
         $this->reportStatistic->open();
         $this->reportStatistic->getGridBlock()->massaction(
             [['report' => 'Tax']],
@@ -180,6 +172,27 @@ public function test(
         $this->salesTaxReport->getActionBlock()->showReport();
     }
 
+    /**
+     * Process order to corresponded status
+     *
+     * @param string $orderSteps
+     * @param OrderInjectable $order
+     * @return void
+     */
+    protected function processOrder($orderSteps, OrderInjectable $order)
+    {
+        if (!$orderSteps) {
+            return;
+        }
+        $orderStatus = explode(',', $orderSteps);
+        foreach ($orderStatus as $orderStep) {
+            $this->objectManager->create(
+                'Magento\Sales\Test\TestStep\\Create' . ucfirst(trim($orderStep)) . 'Step',
+                ['order' => $order]
+            )->run();
+        }
+    }
+
     /**
      * Delete all tax rules after test.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest/test.csv
index 733b7a871cd84..615e27ca04b68 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest/test.csv
@@ -1,4 +1,4 @@
-"taxRule/dataSet";"order/dataSet";"orderStatus";"report/report_type";"report/period_type";"report/from";"report/to";"report/show_order_statuses";"report/order_statuses";"report/show_empty_rows";"invoice/do_shipment";"taxAmount";"constraint";"issue"
-"custom_rule";"default";"Pending";"Order Created Date";"Day";"m/d/Y";"m/d/Y";"Any";"-";"-";"No";"$46.20";"assertTaxReportNotInGrid";""
-"custom_rule";"default";"Processing";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Specified";"Processing";"-";"No";"$46.20";"assertTaxReportInGrid";""
-"custom_rule";"default";"Complete";"Order Updated Date";"Year";"m/d/Y";"m/d/Y";"Specified";"Complete";"Yes";"Yes";"$46.20";"assertTaxReportInGrid";"Bug: MAGETWO-28611"
+"orderSteps";"taxRule/dataSet";"order/dataSet";"orderStatus";"report/report_type";"report/period_type";"report/from";"report/to";"report/show_order_statuses";"report/order_statuses";"report/show_empty_rows";"invoice/do_shipment";"taxAmount";"constraint";"issue"
+"";"custom_rule";"default";"Pending";"Order Created Date";"Day";"m/d/Y";"m/d/Y";"Any";"-";"-";"No";"$46.20";"assertTaxReportNotInGrid";""
+"invoice";"custom_rule";"default";"Processing";"Order Created Date";"Month";"m/d/Y";"m/d/Y";"Specified";"Processing";"-";"No";"$46.20";"assertTaxReportInGrid";""
+"invoice,shipment";"custom_rule";"default";"Complete";"Order Updated Date";"Year";"m/d/Y";"m/d/Y";"Specified";"Complete";"Yes";"Yes";"$46.20";"assertTaxReportInGrid";"BUG: MAGETWO-29383"
diff --git a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewsTab.php b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewsTab.php
index 8e2d9b1c2e920..c2983dbc7d95c 100644
--- a/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewsTab.php
+++ b/dev/tests/functional/tests/app/Magento/Review/Test/Block/Adminhtml/ReviewsTab.php
@@ -18,7 +18,7 @@ class ReviewsTab extends Tab
      *
      * @var string
      */
-    protected $reviews = '#Product_Reviews';
+    protected $reviews = '#reviwGrid';
 
     /**
      * Returns product reviews grid
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Block/Customer/RewardPoints/RewardPointsInformation.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Block/Customer/RewardPoints/RewardPointsInformation.php
index ffc0c8e4f7a5a..e21ad425b9c23 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Block/Customer/RewardPoints/RewardPointsInformation.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Block/Customer/RewardPoints/RewardPointsInformation.php
@@ -34,7 +34,8 @@ class RewardPointsInformation extends Block
      */
     public function getRewardPointsRates()
     {
-        return $this->_rootElement->find($this->rewardRatesSelector)->getText();
+        $rates = $this->_rootElement->find($this->rewardRatesSelector)->getText();
+        return trim(preg_replace('/\s+/', ' ', $rates));
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php
index fbdbce8c4d7b0..7351b25540b3e 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/Constraint/AssertRewardPointsBalance.php
@@ -31,7 +31,7 @@ class AssertRewardPointsBalance extends AbstractConstraint
     /**
      * Message about reward points exchange rate
      */
-    const REWARD_POINTS_EXCHANGE_RATE = 'Current exchange rates: Each %d Reward points can be redeemed for $%.2f.';
+    const REWARD_POINTS_EXCHANGE_RATE = 'Current exchange rates: %d Reward points = $%.2f';
 
     /**
      * Assert that "Your balance is X Reward points ($X.00)." and current exchange message are appeared
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/TestCase/CreateExchangeRateForRewardPointsEntityTest.php b/dev/tests/functional/tests/app/Magento/Reward/Test/TestCase/CreateExchangeRateForRewardPointsEntityTest.php
index 48c73d83e7724..57ac4fd519770 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/TestCase/CreateExchangeRateForRewardPointsEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/TestCase/CreateExchangeRateForRewardPointsEntityTest.php
@@ -91,19 +91,13 @@ public function __inject(
      * @param CustomerInjectable $customer
      * @param ConfigData $config
      * @param ConfigData $configRollback
-     * @param string $registrationReward
-     * @param string $checkoutReward
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function test(
         RewardRate $rate,
         CustomerInjectable $customer,
         ConfigData $config,
-        ConfigData $configRollback,
-        $registrationReward,
-        $checkoutReward
+        ConfigData $configRollback
     ) {
         // Precondition
         $this->configRollback = $configRollback;
diff --git a/dev/tests/functional/tests/app/Magento/Reward/Test/TestCase/RemoveRewardPointsOnCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Reward/Test/TestCase/RemoveRewardPointsOnCheckoutTest.php
index 4c68780865514..673d278c39da1 100644
--- a/dev/tests/functional/tests/app/Magento/Reward/Test/TestCase/RemoveRewardPointsOnCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reward/Test/TestCase/RemoveRewardPointsOnCheckoutTest.php
@@ -129,10 +129,6 @@ public function __prepare(
         $this->fixtureFactory = $fixtureFactory;
         $product = $fixtureFactory->createByCode('catalogProductSimple');
         $product->persist();
-        $rewardRate = $fixtureFactory->createByCode('rewardRate', ['dataSet' => 'rate_1_point_to_1_currency']);
-        $rewardRate->persist();
-        $rewardRate = $fixtureFactory->createByCode('rewardRate', ['dataSet' => 'rate_1_currency_to_1_point']);
-        $rewardRate->persist();
 
         return ['product' => $product];
     }
@@ -162,6 +158,11 @@ public function __inject(
         $this->checkoutCart = $checkoutCart;
         $this->checkoutOnepage = $checkoutOnepage;
         $this->customerAccountLogout = $customerAccountLogout;
+        // TODO: Move creation of reward rates to "__prepare" method after fix bug MAGETWO-29331
+        $rewardRate = $this->fixtureFactory->createByCode('rewardRate', ['dataSet' => 'rate_1_point_to_1_currency']);
+        $rewardRate->persist();
+        $rewardRate = $this->fixtureFactory->createByCode('rewardRate', ['dataSet' => 'rate_1_currency_to_1_point']);
+        $rewardRate->persist();
     }
 
     /**
@@ -185,8 +186,6 @@ public function test(
         array $payment,
         $rewardPoints
     ) {
-        $this->markTestIncomplete("Bug: MAGETWO-30435");
-
         // Preconditions
         $customer->persist();
         $reward = $this->fixtureFactory->createByCode(
@@ -225,15 +224,8 @@ public function test(
     public function tearDown()
     {
         $this->customerAccountLogout->open();
-    }
 
-    /**
-     * Delete reward exchange rates
-     *
-     * @return void
-     */
-    public static function tearDownAfterClass()
-    {
+        // TODO: Move deletion of reward rates to "tearDownAfterClass" method after fix bug MAGETWO-29331
         self::$rewardRateIndexPage->open();
         while (self::$rewardRateIndexPage->getRewardRateGrid()->isFirstRowVisible()) {
             self::$rewardRateIndexPage->getRewardRateGrid()->openFirstRow();
diff --git a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForGuest.php b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForGuest.php
index d06269a2b165e..5a0bf56c4a0bf 100644
--- a/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForGuest.php
+++ b/dev/tests/functional/tests/app/Magento/Rma/Test/Constraint/AssertRmaOnFrontendForGuest.php
@@ -44,7 +44,7 @@ public function processAssert(
             ['order' => $order]
         )->run();
 
-        $salesGuestView->getViewBlock()->clickLink('Returns');
+        $salesGuestView->getViewBlock()->openLinkByName('Returns');
         $fixtureRmaStatus = $rma->getStatus();
         $pageRmaData = $rmaGuestIndex->getReturnsBlock()->getRmaRow($rma)->getData();
         \PHPUnit_Framework_Assert::assertEquals(
diff --git a/dev/tests/functional/tests/app/Magento/Rma/Test/Fixture/ReturnItem.php b/dev/tests/functional/tests/app/Magento/Rma/Test/Fixture/ReturnItem.php
index 545f0076916d5..eeb2fee6f93d1 100644
--- a/dev/tests/functional/tests/app/Magento/Rma/Test/Fixture/ReturnItem.php
+++ b/dev/tests/functional/tests/app/Magento/Rma/Test/Fixture/ReturnItem.php
@@ -50,7 +50,7 @@ protected function _initData()
                     'value' => '',
                 ],
                 'find_order_by' => [
-                    'value' => 'Email Address',
+                    'value' => 'Email',
                 ],
                 'email_address' => [
                     'value' => '',
diff --git a/dev/tests/functional/tests/app/Magento/Rma/Test/TestCase/CreateRmaEntityOnBackendTest/test.csv b/dev/tests/functional/tests/app/Magento/Rma/Test/TestCase/CreateRmaEntityOnBackendTest/test.csv
index 37936895c9eb3..15236e8954db8 100644
--- a/dev/tests/functional/tests/app/Magento/Rma/Test/TestCase/CreateRmaEntityOnBackendTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Rma/Test/TestCase/CreateRmaEntityOnBackendTest/test.csv
@@ -1,5 +1,5 @@
-"rma/data/order_id/preset";"rma/data/order_id/data/customer_id/dataSet";"rma/data/order_id/data/entity_id/products";"rma/data/items/data/0/qty_requested";"rma/data/items/data/0/reason";"rma/data/items/data/0/reason_other";"rma/data/items/data/0/condition";"rma/data/items/data/0/resolution";"rma/data/contact_email";"rma/data/comment/comment";"rma/data/comment/is_visible_on_front";"rma/data/status";"constraint";"issue"
-"default";"default";"catalogProductSimple::default";"1";"Wrong Size";"-";"Damaged";"Exchange";"test%isolation%@example.com";"comments %isolation%";"Yes";"Pending";"assertRmaInGrid, assertRmaForm, assertRmaOnFrontendForCustomer";""
-"default";"default";"configurableProductInjectable::default";"1";"Wrong Color";"-";"Opened";"Refund";"test%isolation%@example.com";"comments %isolation%";"No";"Pending";"assertRmaInGrid, assertRmaConfigurableForm, assertRmaConfigurableOnFrontendForCustomer";""
-"default";"default";"bundleProduct::bundle_fixed_product";"1";"Out of Service";"-";"Unopened";"Store Credit";"test%isolation%@example.com";"comments %isolation%";"Yes";"Pending";"assertRmaInGrid, assertRmaBundleOnFrontendForCustomer";""
-"default";"default";"catalogProductSimple::default";"1";"Other";"Other %isolation%";"Unopened";"Exchange";"test%isolation%@example.com";"comments %isolation%";"Yes";"Pending";"assertRmaInGrid, assertRmaOnFrontendForGuest";"Bug: MAGETWO-29552"
+"rma/data/order_id/preset";"rma/data/order_id/data/customer_id/dataSet";"rma/data/order_id/data/entity_id/products";"rma/data/items/data/0/qty_requested";"rma/data/items/data/0/reason";"rma/data/items/data/0/reason_other";"rma/data/items/data/0/condition";"rma/data/items/data/0/resolution";"rma/data/contact_email";"rma/data/comment/comment";"rma/data/comment/is_visible_on_front";"rma/data/status";"constraint"
+"default";"default";"catalogProductSimple::default";"1";"Wrong Size";"-";"Damaged";"Exchange";"test%isolation%@example.com";"comments %isolation%";"Yes";"Pending";"assertRmaInGrid, assertRmaForm, assertRmaOnFrontendForCustomer"
+"default";"default";"configurableProductInjectable::default";"1";"Wrong Color";"-";"Opened";"Refund";"test%isolation%@example.com";"comments %isolation%";"No";"Pending";"assertRmaInGrid, assertRmaConfigurableForm, assertRmaConfigurableOnFrontendForCustomer"
+"default";"default";"bundleProduct::bundle_fixed_product";"1";"Out of Service";"-";"Unopened";"Store Credit";"test%isolation%@example.com";"comments %isolation%";"Yes";"Pending";"assertRmaInGrid, assertRmaBundleOnFrontendForCustomer"
+"default";"default";"catalogProductSimple::default";"1";"Other";"Other %isolation%";"Unopened";"Exchange";"test%isolation%@example.com";"comments %isolation%";"Yes";"Pending";"assertRmaInGrid, assertRmaOnFrontendForGuest"
diff --git a/dev/tests/functional/tests/app/Magento/Rma/Test/TestCase/RmaTest.php b/dev/tests/functional/tests/app/Magento/Rma/Test/TestCase/RmaTest.php
index 96f0df2594fde..681db07f80498 100644
--- a/dev/tests/functional/tests/app/Magento/Rma/Test/TestCase/RmaTest.php
+++ b/dev/tests/functional/tests/app/Magento/Rma/Test/TestCase/RmaTest.php
@@ -44,8 +44,7 @@ public function testRma()
         $searchForm->submit();
 
         // Step 5: Click "Return" link
-        $viewBlock = Factory::getPageFactory()->getSalesGuestView()->getViewBlock();
-        $viewBlock->clickLink('Return');
+        Factory::getPageFactory()->getSalesGuestView()->getActionsToolbar()->clickLink('Return');
 
         // Steps 6 - 9:
         $returnId = $this->createRma($returnItem, $payPalExpressOrder);
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info/Buttons.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
similarity index 53%
rename from dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info/Buttons.php
rename to dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
index b48213a3076b3..d1e49fb25fa47 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/Info/Buttons.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Order/View/ActionsToolbar.php
@@ -3,7 +3,7 @@
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
-namespace Magento\Sales\Test\Block\Order\Info;
+namespace Magento\Sales\Test\Block\Order\View;
 
 use Mtf\Block\Block;
 use Mtf\Client\Element\Locator;
@@ -11,21 +11,14 @@
 /**
  * Order view block.
  */
-class Buttons extends Block
+class ActionsToolbar extends Block
 {
-    /**
-     * Selector for "Print Order" link.
-     *
-     * @var string
-     */
-    protected $printOrderSelector = '.action.print';
-
     /**
      * Link selector.
      *
      * @var string
      */
-    protected $linkSelector = '//div[contains(@class, "order-actions-toolbar")]//span[contains(text(), "%s")]';
+    protected $linkSelector = './/a[contains(@class, "action")]//span[contains(text(), "%s")]';
 
     /**
      * Click link on this page.
@@ -38,14 +31,4 @@ public function clickLink($linkName)
         }
         $link->click();
     }
-
-    /**
-     * Click on "Print Order" link.
-     *
-     * @return void
-     */
-    public function clickPrintOrder()
-    {
-        $this->_rootElement->find($this->printOrderSelector)->click();
-    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Widget/Guest/Form.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Widget/Guest/Form.php
index ade2c1ebf3bdb..0965eafbcf4a5 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Widget/Guest/Form.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Widget/Guest/Form.php
@@ -51,7 +51,7 @@ public function fill(FixtureInterface $fixture, Element $element = null, $isSear
             ];
 
             if ($isSearchByEmail) {
-                $data['find_order_by'] = 'Email Address';
+                $data['find_order_by'] = 'Email';
                 $data['email_address'] = $customer->getEmail();
             } else {
                 $data['find_order_by'] = 'ZIP Code';
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.php
deleted file mode 100644
index 5e5a00f93ff93..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-
-namespace Magento\Sales\Test\Page;
-
-use Mtf\Factory\Factory;
-use Mtf\Page\Page;
-
-/**
- * Class View
- * View orders page
- *
- */
-class SalesGuestView extends Page
-{
-    /**
-     * URL for order view page
-     */
-    const MCA = 'sales/guest/view';
-
-    /**
-     * Form wrapper selector
-     *
-     * @var string
-     */
-    protected $blockSelector = '.page-title';
-
-    /**
-     * Custom constructor
-     */
-    protected function _init()
-    {
-        $this->_url = $this->_url = $_ENV['app_frontend_url'] . self::MCA;
-    }
-
-    /**
-     * Get view block
-     *
-     * @return \Magento\Sales\Test\Block\Order\Info\Buttons
-     */
-    public function getViewBlock()
-    {
-        return Factory::getBlockFactory()->getMagentoSalesOrderInfoButtons(
-            $this->_browser->find($this->blockSelector)
-        );
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.xml b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.xml
new file mode 100644
index 0000000000000..93f0d1fc97b4e
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Page/SalesGuestView.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+-->
+<page mca="sales/guest/view" module="Magento_Sales">
+    <blocks>
+        <actionsToolbar>
+            <class>Magento\Sales\Test\Block\Order\View\ActionsToolbar</class>
+            <locator>.actions-toolbar</locator>
+            <strategy>css selector</strategy>
+        </actionsToolbar>
+        <viewBlock>
+            <class>Magento\Sales\Test\Block\Order\View</class>
+            <locator>.column.main</locator>
+            <strategy>css selector</strategy>
+        </viewBlock>
+    </blocks>
+</page>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest/test.csv
index d4358b9761bd9..ef91f9cd62b13 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateCreditMemoEntityTest/test.csv
@@ -1,4 +1,4 @@
-"description";"data/items_data/0/back_to_stock";"data/items_data/0/qty";"data/form_data/shipping_amount";"data/form_data/adjustment_positive";"data/form_data/adjustment_negative";"data/form_data/refund_customerbalance_return_enable";"data/form_data/refund_customerbalance_return";"order/dataSet";"order/data/entity_id/products";"order/data/price/preset";"constraint";"issue"
-"assert items return to stock (partial refund)";"Yes";"1";"-";"-";"-";"-";"-";"default";"catalogProductSimple::100_dollar_product";"partial_refund";"assertRefundSuccessCreateMessage, assertCreditMemoButton, assertRefundInCreditMemoTab, assertRefundInRefundsGrid, assertRefundedGrandTotalOnFrontend, assertProductForm, assertCreditMemoItems";""
-"assert money return to StoreCredit";"-";"-";"5";"-";"-";"Yes";"10";"default";"catalogProductSimple::default";"full_refund";"assertRefundSuccessCreateMessage, assertNoCreditMemoButton, assertRefundInCreditMemoTab, assertRefundInRefundsGrid, assertRefundedGrandTotalOnFrontend, assertCustomerBalanceAmount, assertCreditMemoItems";"Bug: MAGETWO-29184"
-"assert 0 shipping refund";"-";"-";"0";"5";"10";"-";"-";"default";"catalogProductSimple::default";"full_refund_with_zero_shipping_refund";"assertRefundSuccessCreateMessage, assertCreditMemoButton, assertRefundInCreditMemoTab, assertRefundInRefundsGrid, assertRefundedGrandTotalOnFrontend, assertCreditMemoItems";""
+"description";"data/items_data/0/back_to_stock";"data/items_data/0/qty";"data/form_data/shipping_amount";"data/form_data/adjustment_positive";"data/form_data/adjustment_negative";"data/form_data/refund_customerbalance_return_enable";"data/form_data/refund_customerbalance_return";"order/dataSet";"order/data/entity_id/products";"order/data/price/preset";"constraint"
+"assert items return to stock (partial refund)";"Yes";"1";"-";"-";"-";"-";"-";"default";"catalogProductSimple::100_dollar_product";"partial_refund";"assertRefundSuccessCreateMessage, assertCreditMemoButton, assertRefundInCreditMemoTab, assertRefundInRefundsGrid, assertRefundedGrandTotalOnFrontend, assertProductForm, assertCreditMemoItems"
+"assert money return to StoreCredit";"-";"-";"5";"-";"-";"Yes";"10";"default";"catalogProductSimple::default";"full_refund";"assertRefundSuccessCreateMessage, assertNoCreditMemoButton, assertRefundInCreditMemoTab, assertRefundInRefundsGrid, assertRefundedGrandTotalOnFrontend, assertCustomerBalanceAmount, assertCreditMemoItems"
+"assert 0 shipping refund";"-";"-";"0";"5";"10";"-";"-";"default";"catalogProductSimple::default";"full_refund_with_zero_shipping_refund";"assertRefundSuccessCreateMessage, assertCreditMemoButton, assertRefundInCreditMemoTab, assertRefundInRefundsGrid, assertRefundedGrandTotalOnFrontend, assertCreditMemoItems"
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest/test.csv b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest/test.csv
index edc687b2014b1..76191653bc2b3 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateOrderBackendTest/test.csv
@@ -1,16 +1,16 @@
-"products";"giftCardAccount";"salesRule";"customer/dataSet";"rewardPoints";"customerBalance";"billingAddress/dataSet";"shipping/shipping_service";"shipping/shipping_method";"grandTotal";"payment/method";"payment/po_number";"payment/use_reward_points";"payment/use_customer_balance";"status";"orderButtonsAvailable";"configData";"backendOrder/data/firstname";"backendOrder/data/lastname";"backendOrder/data/street[0]";"backendOrder/data/city";"backendOrder/data/country_id";"backendOrder/data/region_id";"backendOrder/data/postcode";"backendOrder/data/telephone";"backendOrder/data/shipping_same_as_billing";"constraint";"issue"
-"catalogProductSimple::simple_for_sales, catalogProductVirtual::virtual_for_sales";"-";"active_sales_rule_with_fixed_price_discount_coupon";"customer_US";"reward_points_50";"-";"customer_US";"Flat Rate";"Fixed";"315.00";"cashondelivery";"-";"Yes";"-";"Pending";"Back, Reorder, Cancel, Send Notification, Hold, Invoice, Ship, Edit";"cashondelivery";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";""
-"catalogProductVirtual::default";"default";"active_sales_rule_with_fixed_price_discount_coupon";"customer_UK";"-";"-";"customer_UK";"-";"-";"0.00";"free";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Edit";"cashondelivery_specificcountry_gb";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";"Bug MAGETWO-28633"
-"catalogProductSimple::default";"-";"-";"customer_US";"-";"-";"customer_US";"Flat Rate";"Fixed";"565.00";"cashondelivery";"-";"-";"-";"Pending";"Back, Reorder, Cancel, Send Notification, Hold, Invoice, Ship, Edit";"cashondelivery";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";""
-"catalogProductSimple::default, catalogProductVirtual::default";"default";"-";"-";"-";"customerBalance_5";"customer_US";"Flat Rate";"Fixed";"575.00";"checkmo";"-";"-";"Yes";"Pending";"Back, Reorder, Cancel, Send Notification, Hold, Invoice, Ship, Edit";"checkmo";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";""
-"catalogProductVirtual::default";"-";"-";"customer_UK";"-";"-";"customer_UK";"-";"-";"10.00";"checkmo";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Edit";"checkmo_specificcountry_gb";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";"Bug MAGETWO-28633"
-"catalogProductSimple::default";"default";"-";"customer_US";"-";"-";"customer_US";"Flat Rate";"Fixed";"565.00";"checkmo";"-";"-";"-";"Pending";"Back, Reorder, Cancel, Send Notification, Hold, Invoice, Ship, Edit";"checkmo";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";""
-"catalogProductSimple::default, catalogProductVirtual::default";"-";"-";"customer_US";"-";"customerBalance_5";"customer_US";"Flat Rate";"Fixed";"575.00";"banktransfer";"-";"-";"Yes";"Pending";"Back, Reorder, Cancel, Send Notification, Hold, Invoice, Ship, Edit";"banktransfer";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";""
-"catalogProductVirtual::default";"default";"-";"customer_UK";"-";"-";"customer_UK";"-";"-";"10.00";"free";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Edit";"banktransfer_specificcountry_gb";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";"Bug MAGETWO-28633"
-"catalogProductSimple::default";"-";"-";"customer_US";"-";"-";"customer_US";"Flat Rate";"Fixed";"565.00";"banktransfer";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Reorder, Invoice, Edit";"banktransfer";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";""
-"catalogProductSimple::default, catalogProductVirtual::default";"default";"active_sales_rule_with_fixed_price_discount_coupon";"customer_US";"reward_points_50";"-";"customer_US";"Free Shipping";"Free";"510.00";"banktransfer";"-";"Yes";"-";"Pending";"Back, Cancel, Send Notification, Hold, Reorder, Invoice, Edit";"freeshipping, banktransfer";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";""
-"catalogProductVirtual::default";"-";"-";"customer_UK";"-";"-";"customer_UK";"-";"-";"10.00";"banktransfer";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Edit";"freeshipping_specificcountry_gb, banktransfer";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";"Bug MAGETWO-28633"
-"catalogProductSimple::default";"default";"-";"customer_US";"-";"-";"customer_US";"Free Shipping";"Free";"560.00";"checkmo";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Reorder, Invoice, Edit";"freeshipping, checkmo";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";""
-"catalogProductSimple::default, catalogProductVirtual::default";"-";"-";"customer_US";"-";"customerBalance_5";"customer_US";"Flat Rate";"Fixed";"575.00";"purchaseorder";"123456";"-";"Yes";"Pending";"Back, Cancel, Send Notification, Hold, Reorder, Invoice, Edit";"purchaseorder";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";""
-"catalogProductVirtual::default";"default";"active_sales_rule_with_fixed_price_discount_coupon";"customer_UK";"-";"-";"customer_UK";"-";"-";"0.00";"free";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Edit";"purchaseorder_specificcountry_gb";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";"Bug MAGETWO-28633"
-"catalogProductSimple::default";"-";"-";"customer_US";"-";"-";"customer_US";"Flat Rate";"Fixed";"565.00";"purchaseorder";"123456";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Reorder, Edit";"purchaseorder";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend";""
+"products";"giftCardAccount";"salesRule";"customer/dataSet";"rewardPoints";"customerBalance";"billingAddress/dataSet";"shipping/shipping_service";"shipping/shipping_method";"grandTotal";"payment/method";"payment/po_number";"payment/use_reward_points";"payment/use_customer_balance";"status";"orderButtonsAvailable";"configData";"backendOrder/data/firstname";"backendOrder/data/lastname";"backendOrder/data/street[0]";"backendOrder/data/city";"backendOrder/data/country_id";"backendOrder/data/region_id";"backendOrder/data/postcode";"backendOrder/data/telephone";"backendOrder/data/shipping_same_as_billing";"constraint"
+"catalogProductSimple::simple_for_sales, catalogProductVirtual::virtual_for_sales";"-";"active_sales_rule_with_fixed_price_discount_coupon";"customer_US";"reward_points_50";"-";"customer_US";"Flat Rate";"Fixed";"315.00";"cashondelivery";"-";"Yes";"-";"Pending";"Back, Reorder, Cancel, Send Notification, Hold, Invoice, Ship, Edit";"cashondelivery";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductVirtual::default";"default";"active_sales_rule_with_fixed_price_discount_coupon";"customer_UK";"-";"-";"customer_UK";"-";"-";"0.00";"free";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Edit";"cashondelivery_specificcountry_gb";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductSimple::default";"-";"-";"customer_US";"-";"-";"customer_US";"Flat Rate";"Fixed";"565.00";"cashondelivery";"-";"-";"-";"Pending";"Back, Reorder, Cancel, Send Notification, Hold, Invoice, Ship, Edit";"cashondelivery";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductSimple::default, catalogProductVirtual::default";"default";"-";"-";"-";"customerBalance_5";"customer_US";"Flat Rate";"Fixed";"575.00";"checkmo";"-";"-";"Yes";"Pending";"Back, Reorder, Cancel, Send Notification, Hold, Invoice, Ship, Edit";"checkmo";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductVirtual::default";"-";"-";"customer_UK";"-";"-";"customer_UK";"-";"-";"10.00";"checkmo";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Edit";"checkmo_specificcountry_gb";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductSimple::default";"default";"-";"customer_US";"-";"-";"customer_US";"Flat Rate";"Fixed";"565.00";"checkmo";"-";"-";"-";"Pending";"Back, Reorder, Cancel, Send Notification, Hold, Invoice, Ship, Edit";"checkmo";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductSimple::default, catalogProductVirtual::default";"-";"-";"customer_US";"-";"customerBalance_5";"customer_US";"Flat Rate";"Fixed";"575.00";"banktransfer";"-";"-";"Yes";"Pending";"Back, Reorder, Cancel, Send Notification, Hold, Invoice, Ship, Edit";"banktransfer";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductVirtual::default";"default";"-";"customer_UK";"-";"-";"customer_UK";"-";"-";"10.00";"free";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Edit";"banktransfer_specificcountry_gb";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductSimple::default";"-";"-";"customer_US";"-";"-";"customer_US";"Flat Rate";"Fixed";"565.00";"banktransfer";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Reorder, Invoice, Edit";"banktransfer";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductSimple::default, catalogProductVirtual::default";"default";"active_sales_rule_with_fixed_price_discount_coupon";"customer_US";"reward_points_50";"-";"customer_US";"Free Shipping";"Free";"510.00";"banktransfer";"-";"Yes";"-";"Pending";"Back, Cancel, Send Notification, Hold, Reorder, Invoice, Edit";"freeshipping, banktransfer";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductVirtual::default";"-";"-";"customer_UK";"-";"-";"customer_UK";"-";"-";"10.00";"banktransfer";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Edit";"freeshipping_specificcountry_gb, banktransfer";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductSimple::default";"default";"-";"customer_US";"-";"-";"customer_US";"Free Shipping";"Free";"560.00";"checkmo";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Reorder, Invoice, Edit";"freeshipping, checkmo";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductSimple::default, catalogProductVirtual::default";"-";"-";"customer_US";"-";"customerBalance_5";"customer_US";"Flat Rate";"Fixed";"575.00";"purchaseorder";"123456";"-";"Yes";"Pending";"Back, Cancel, Send Notification, Hold, Reorder, Invoice, Edit";"purchaseorder";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductVirtual::default";"default";"active_sales_rule_with_fixed_price_discount_coupon";"customer_UK";"-";"-";"customer_UK";"-";"-";"0.00";"free";"-";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Edit";"purchaseorder_specificcountry_gb";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
+"catalogProductSimple::default";"-";"-";"customer_US";"-";"-";"customer_US";"Flat Rate";"Fixed";"565.00";"purchaseorder";"123456";"-";"-";"Pending";"Back, Cancel, Send Notification, Hold, Invoice, Reorder, Edit";"purchaseorder";"First Name%isolation%";"Last Name%isolation%";"6161 West Centinela Avenue";"Culver City";"Unites States";"California";"90230";"55555555";"Yes";"assertOrderSuccessCreateMessage, assertOrderButtonsAvailable, assertOrderGrandTotal, assertOrderInOrdersGrid, assertOrderInOrdersGridOnFrontend"
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php
index a4ad3337b351c..bb676a6c7fde4 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/PrintOrderOnFrontendStep.php
@@ -46,7 +46,7 @@ public function __construct(SalesGuestView $salesGuestView, Browser $browser)
      */
     public function run()
     {
-        $this->salesGuestView->getViewBlock()->clickPrintOrder();
+        $this->salesGuestView->getActionsToolbar()->clickLink('Print Order');
         $this->browser->selectWindow();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php
index 476580ea5d1e7..c74301060d42a 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/CreateSalesRuleEntityTest.php
@@ -113,21 +113,10 @@ public function __prepare(FixtureFactory $fixtureFactory)
      * Create Sales Rule Entity
      *
      * @param SalesRuleInjectable $salesRule
-     * @param AddressInjectable $address
-     * @param array $productQuantity
-     * @param array $shipping
-     * @param int $isLoggedIn
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function testCreateSalesRule(
-        SalesRuleInjectable $salesRule,
-        AddressInjectable $address,
-        $productQuantity,
-        $shipping,
-        $isLoggedIn
-    ) {
+    public function testCreateSalesRule(SalesRuleInjectable $salesRule)
+    {
         // Preconditions
         $this->salesRuleName = $salesRule->getName();
 
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
index cdc733e2d74b7..a09c55df53cc2 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRateForm.php
@@ -66,6 +66,7 @@ protected function prepareData(array $data)
         } else {
             unset($data['zip_from'], $data['zip_to']);
         }
+        $data['rate'] = number_format($data['rate'], 4);
 
         return $data;
     }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
index e03ebd290f449..ac4a53f3f3131 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleIsAppliedToAllPrices.php
@@ -159,14 +159,14 @@ public function getProductPagePrices($actualPrices)
      */
     public function getCartPrices(CatalogProductSimple $product, $actualPrices)
     {
-        $actualPrices['cart_item_price_excl_tax'] =
-            $this->checkoutCart->getCartBlock()->getCartItem($product)->getPrice();
-        $actualPrices['cart_item_price_incl_tax'] =
-            $this->checkoutCart->getCartBlock()->getCartItem($product)->getPriceInclTax();
         $actualPrices['cart_item_subtotal_excl_tax'] =
             $this->checkoutCart->getCartBlock()->getCartItem($product)->getSubtotalPrice();
         $actualPrices['cart_item_subtotal_incl_tax'] =
             $this->checkoutCart->getCartBlock()->getCartItem($product)->getSubtotalPriceInclTax();
+        $actualPrices['cart_item_price_excl_tax'] =
+            $this->checkoutCart->getCartBlock()->getCartItem($product)->getPrice();
+        $actualPrices['cart_item_price_incl_tax'] =
+            $this->checkoutCart->getCartBlock()->getCartItem($product)->getPriceInclTax();
         return $actualPrices;
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
index 68d001c6c4f6b..77d6796ba507d 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
@@ -102,7 +102,7 @@ class TaxCalculationTest extends Injectable
      */
     public static function setUpBeforeClass()
     {
-        self::markTestIncomplete("MAGETWO-28454");
+        self::markTestIncomplete("MAGETWO-31774");
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
index 010e87641c305..a5b6b384f4a03 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
@@ -16,11 +16,11 @@
 class Tree extends Block
 {
     /**
-     * Locator value for  skip category button
+     * Locator value for skip category button
      *
      * @var string
      */
-    protected $skipCategoryButton = '[data-ui-id="catalog-product-edit-skip-categories"]';
+    protected $skipCategoryButton = '[data-ui-id$="skip-categories"]';
 
     /**
      * Select category by its name
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest/test.csv
index cb82ccd2b4643..dc82f30d3e7d8 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/UpdateCustomUrlRewriteEntityTest/test.csv
@@ -1,3 +1,3 @@
-"initialRewrite/dataSet";"urlRewrite/data/store_id";"urlRewrite/data/request_path";"urlRewrite/data/target_path/entity";"urlRewrite/data/redirect_type";"urlRewrite/data/description";"constraint";"issue"
-"default";"Main Website/Main Website Store/Default Store View";"wishlist/%isolation%";"http://www.magentocommerce.com/magento-connect/";"Permanent (301)";"test_description_relative path";"assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteSuccessOutsideRedirect";"MAGETWO-29618"
-"custom_rewrite_wishlist";"Main Website/Main Website Store/Default Store View";"wishlist/%isolation%";"catalogsearch/result/?q=$%catalogProductSimple::defaul%sku$";"Temporary (302)";"test_description_relative path";"assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteCustomSearchRedirect";""
+"initialRewrite/dataSet";"urlRewrite/data/store_id";"urlRewrite/data/request_path";"urlRewrite/data/target_path/entity";"urlRewrite/data/redirect_type";"urlRewrite/data/description";"constraint"
+"default";"Main Website/Main Website Store/Default Store View";"wishlist/%isolation%";"http://www.magentocommerce.com/magento-connect/";"Permanent (301)";"test_description_relative path";"assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteSuccessOutsideRedirect"
+"custom_rewrite_wishlist";"Main Website/Main Website Store/Default Store View";"wishlist/%isolation%";"catalogsearch/result/?q=$%catalogProductSimple::defaul%sku$";"Temporary (302)";"test_description_relative path";"assertUrlRewriteSaveMessage, assertUrlRewriteInGrid, assertUrlRewriteCustomSearchRedirect"
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php
index ac4bd263bcebb..c21b6c0aa4ae7 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/User/Curl.php
@@ -33,7 +33,7 @@ public function persist(FixtureInterface $fixture = null)
         if ($fixture->hasData('role_id')) {
             $data['roles[]'] = $fixture->getDataFieldConfig('role_id')['source']->getRole()->getRoleId();
         }
-        $data['is_active'] = (isset($data['is_active']) && ($data['is_active'] === 'Active')) ? 1 : 0;
+        $data['is_active'] = (isset($data['is_active']) && ($data['is_active'] === 'Inactive')) ? 0 : 1;
         $url = $_ENV['app_backend_url'] . 'admin/user/save/active_tab/main_section/';
         $curl = new BackendDecorator(new CurlTransport(), new Config());
         $curl->addOption(CURLOPT_HEADER, 1);
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest/test.csv
index 7872c32a2612c..178ac7b96f4ca 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserEntityTest/test.csv
@@ -1,7 +1,7 @@
-"user/data/username";"user/data/firstname";"user/data/lastname";"user/data/email";"user/data/password";"user/data/password_confirmation";"user/data/is_active";"user/data/role_id/dataSet";"isDuplicated";"constraint";"user/data/current_password";"issue"
-"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"Administrators";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserSuccessLogin"; "123123q";""
-"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Inactive";"Administrators";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage"; "123123q";""
-"-";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"Administrators";"username";"assertUserDuplicateMessage"; "123123q";""
-"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"-";"123123q";"123123q";"Active";"Administrators";"email";"assertUserDuplicateMessage"; "123123q";""
-"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"-";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage"; "123123q";""
-"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.cim";"123123q";"123123q";"Active";"-";"-";"assertUserInvalidEmailMessage"; "123123q";"Bug: MAGETWO-28875"
+"user/data/username";"user/data/firstname";"user/data/lastname";"user/data/email";"user/data/password";"user/data/password_confirmation";"user/data/is_active";"user/data/role_id/dataSet";"isDuplicated";"constraint";"user/data/current_password"
+"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"Administrators";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserSuccessLogin"; "123123q"
+"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Inactive";"Administrators";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage"; "123123q"
+"-";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"Administrators";"username";"assertUserDuplicateMessage"; "123123q"
+"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"-";"123123q";"123123q";"Active";"Administrators";"email";"assertUserDuplicateMessage"; "123123q"
+"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.com";"123123q";"123123q";"Active";"-";"-";"assertUserSuccessSaveMessage, assertUserInGrid, assertUserSuccessLogOut, assertUserWrongCredentialsMessage"; "123123q"
+"AdminUser%isolation%";"FirstName%isolation%";"LastName%isolation%";"email%isolation%@example.cim";"123123q";"123123q";"Active";"-";"-";"assertUserInvalidEmailMessage"; "123123q"
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest/testUpdateAdminUserRolesEntity.csv b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest/testUpdateAdminUserRolesEntity.csv
index 40e2c721a2b66..a90ad495b8a14 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest/testUpdateAdminUserRolesEntity.csv
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserRoleEntityTest/testUpdateAdminUserRolesEntity.csv
@@ -1,3 +1,3 @@
-"user/dataSet";"role/data/rolename";"role/data/resource_access";"role/data/roles_resources";"role/data/in_role_users/dataSet";"constraint";"issue"
-"custom_admin_with_default_role";"NewAdminRole%isolation%";"-";"-";"-";"assertRoleSuccessSaveMessage, assertRoleInGrid, assertUserSuccessLogOut, assertUserSuccessLogin";""
-"default";"-";"Custom";"Sales";"custom_admin";"assertRoleSuccessSaveMessage, assertRoleInGrid, assertUserSuccessLogOut, assertUserSuccessLogin, assertUserRoleSalesRestrictedAccess";"Bug: MAGETWO-28587"
+"user/dataSet";"role/data/rolename";"role/data/resource_access";"role/data/roles_resources";"role/data/in_role_users/dataSet";"constraint"
+"custom_admin_with_default_role";"NewAdminRole%isolation%";"-";"-";"-";"assertRoleSuccessSaveMessage, assertRoleInGrid, assertUserSuccessLogOut, assertUserSuccessLogin"
+"default";"-";"Custom";"Sales";"custom_admin";"assertRoleSuccessSaveMessage, assertRoleInGrid, assertUserSuccessLogOut, assertUserSuccessLogin, assertUserRoleSalesRestrictedAccess"
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateCmsPageVersionsEntityForExistingCmsPageTest.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateCmsPageVersionsEntityForExistingCmsPageTest.php
index f8cd8837d1582..6c808644a3ea7 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateCmsPageVersionsEntityForExistingCmsPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateCmsPageVersionsEntityForExistingCmsPageTest.php
@@ -64,14 +64,10 @@ public function __inject(CmsIndex $cmsIndex, CmsNew $cmsNew)
      *
      * @param CmsPage $cmsInitial
      * @param CmsPage $cms
-     * @param array $results
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function test(CmsPage $cmsInitial, CmsPage $cms, array $results)
+    public function test(CmsPage $cmsInitial, CmsPage $cms)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30362");
         // Precondition
         $cmsInitial->persist();
         // Steps
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateCmsPageVersionsEntityForNewCmsPageTest.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateCmsPageVersionsEntityForNewCmsPageTest.php
index 289184ba05f99..2a46720972ead 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateCmsPageVersionsEntityForNewCmsPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateCmsPageVersionsEntityForNewCmsPageTest.php
@@ -58,14 +58,10 @@ public function __inject(CmsIndex $cmsIndex, CmsNew $cmsNew)
      * Create CMS Page Version Entity
      *
      * @param CmsPage $cms
-     * @param array $results
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function test(CmsPage $cms, array $results)
+    public function test(CmsPage $cms)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30362");
         // Steps
         $this->cmsIndex->open();
         $this->cmsIndex->getPageActionsBlock()->addNew();
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateWidgetHierarchyNodeLinkTest/test.csv b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateWidgetHierarchyNodeLinkTest/test.csv
index 5ec3dce43f4b8..2ba8abbd7415f 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateWidgetHierarchyNodeLinkTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/CreateWidgetHierarchyNodeLinkTest/test.csv
@@ -1,2 +1,2 @@
-"widget/data/widgetOptions/preset";"widget/data/code";"widget/data/theme_id";"widget/data/title";"widget/data/store_ids/dataSet";"widget/data/layout/preset";"constraint";"issue"
-"hierarchyNodeLink";"CMS Hierarchy Node Link";"Magento Blank";"Title_%isolation%";"All Store Views";"all_pages";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetHierarchyNodeLinkOnHomePage";"Bug: MAGETWO-28346"
+"widget/data/widgetOptions/preset";"widget/data/code";"widget/data/theme_id";"widget/data/title";"widget/data/store_ids/dataSet";"widget/data/layout/preset";"constraint";
+"hierarchyNodeLink";"CMS Hierarchy Node Link";"Magento Blank";"Title_%isolation%";"All Store Views";"all_pages";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetHierarchyNodeLinkOnHomePage";
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/DeleteCmsPageVersionsEntityTest.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/DeleteCmsPageVersionsEntityTest.php
index dc3a6d66afde2..87a3732ca9869 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/DeleteCmsPageVersionsEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/DeleteCmsPageVersionsEntityTest.php
@@ -84,7 +84,6 @@ public function __inject(CmsIndex $cmsIndex, CmsNew $cmsNew, CmsVersionEdit $cms
      */
     public function test(CmsPage $cms, Version $version, array $results, $initialVersionToDelete)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30362");
         // Precondition
         $cms->persist();
         $filter = ['title' => $cms->getTitle()];
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/MassDeleteCmsPageRevisionEntityTest.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/MassDeleteCmsPageRevisionEntityTest.php
index 700f6a98e6432..bc0358df61c2c 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/MassDeleteCmsPageRevisionEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/MassDeleteCmsPageRevisionEntityTest.php
@@ -115,7 +115,6 @@ public function __inject(
      */
     public function test(CmsPage $cms, Revision $revision, array $results, $initialRevision)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-27326, Bug: MAGETWO-28876, Bug: MAGETWO-30362');
         // Precondition
         $filter = ['title' => $cms->getTitle()];
         $this->cmsIndex->open();
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/MassDeleteCmsVersionsEntityTest.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/MassDeleteCmsVersionsEntityTest.php
index 0b95e3a5c06bb..64001669ed0bf 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/MassDeleteCmsVersionsEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/MassDeleteCmsVersionsEntityTest.php
@@ -85,7 +85,6 @@ public function __inject(CmsIndex $cmsIndex, CmsNew $cmsNew, CmsVersionEdit $cms
      */
     public function test(CmsPage $cms, Version $version, array $results, $initialVersionToDelete)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30362");
         // Precondition
         $cms->persist();
         $filter = ['title' => $cms->getTitle()];
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/PublishCmsPageRevisionEntityTest.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/PublishCmsPageRevisionEntityTest.php
index a583c341f6870..00852a2933a9b 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/PublishCmsPageRevisionEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/PublishCmsPageRevisionEntityTest.php
@@ -108,14 +108,10 @@ public function __inject(
      * @param CmsPage $cms
      * @param Revision $revision
      * @param int $initialRevision
-     * @param array $results
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function test(CmsPage $cms, Revision $revision, $initialRevision, array $results)
+    public function test(CmsPage $cms, Revision $revision, $initialRevision)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30362");
         // Steps
         $this->cmsIndex->open();
         $title = $cms->getTitle();
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/SaveNewRevisionInNewVersionTest.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/SaveNewRevisionInNewVersionTest.php
index a3bad07aa7c20..105902af69c7f 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/SaveNewRevisionInNewVersionTest.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/SaveNewRevisionInNewVersionTest.php
@@ -96,7 +96,6 @@ public function __inject(
      */
     public function test(CmsPage $cms, Revision $revision, array $revisionData, array $results)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30362");
         // Precondition:
         $cms->persist();
         $title = $cms->getTitle();
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/SaveNewVersionOfVersionsCmsEntityTest.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/SaveNewVersionOfVersionsCmsEntityTest.php
index f5716756bbd40..5adf5161c5451 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/SaveNewVersionOfVersionsCmsEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/SaveNewVersionOfVersionsCmsEntityTest.php
@@ -79,7 +79,6 @@ public function __inject(CmsIndex $cmsIndex, CmsNew $cmsNew, CmsVersionEdit $cms
      */
     public function test(CmsPage $cms, Version $version, $quantity)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30362");
         // Preconditions:
         $cms->persist();
 
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/UpdateCmsPageRevisionEntityTest.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/UpdateCmsPageRevisionEntityTest.php
index dd9efa48cfc2a..f287eaf9e99a4 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/UpdateCmsPageRevisionEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/UpdateCmsPageRevisionEntityTest.php
@@ -96,7 +96,6 @@ public function __inject(
      */
     public function test(CmsPage $cms, Revision $revision, array $revisionData, array $results)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-28602, Bug: MAGETWO-28876, Bug: MAGETWO-30362');
         // Precondition:
         $cms->persist();
         $title = $cms->getTitle();
diff --git a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/UpdateCmsPageVersionsEntityTest.php b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/UpdateCmsPageVersionsEntityTest.php
index f0871fb70ea8a..ad3d0e8f310bf 100644
--- a/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/UpdateCmsPageVersionsEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/VersionsCms/Test/TestCase/UpdateCmsPageVersionsEntityTest.php
@@ -82,7 +82,6 @@ public function __inject(CmsIndex $cmsIndex, CmsNew $cmsNew, CmsVersionEdit $cms
      */
     public function test(CmsPage $cms, Version $version, $quantity)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30362");
         // Precondition
         $cms->persist();
         // Steps
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php
index 0321f29538d26..260260a4d978e 100644
--- a/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php
+++ b/dev/tests/functional/tests/app/Magento/Weee/Test/Block/Cart/Totals.php
@@ -17,7 +17,7 @@ class Totals extends \Magento\Checkout\Test\Block\Cart\Totals
      *
      * @var string
      */
-    protected $fptBlock = './/tr[normalize-space(td)="FPT"]';
+    protected $fptBlock = './/tr[normalize-space(th)="FPT"]';
 
     /**
      * Get block fpt totals
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest/test.csv b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest/test.csv
index 3d36f615ecbc4..4679509ffa9fb 100644
--- a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest/test.csv
@@ -1,12 +1,12 @@
-"description";"config/dataSet";"productData";"prices/category_price";"prices/fpt_category";"prices/fpt_total_category";"prices/product_page_price";"prices/product_page_fpt";"prices/product_page_fpt_total";"prices/cart_item_price";"prices/cart_item_fpt";"prices/cart_item_fpt_total";"prices/cart_item_subtotal";"prices/cart_item_subtotal_fpt";"prices/cart_item_subtotal_fpt_total";"prices/grand_total";"prices/total_fpt";"constraint";"issue"
-"Check not taxed FPT display set to Excluding, Description and Including FPT on product with custom option catalog price Excluding Tax";"tax_with_fpt_cat_excl_disp_excl";"with_custom_option_and_fpt";"70.00";"10.00";"80.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"118.25";"10.00";"assertFptApplied";"MAGETWO-29617"
-"Check not taxed FPT display set to Including FPT and Description on product with custom option catalog price Excluding Tax";"tax_with_fpt_cat_excl_disp_incl";"with_custom_option_and_fpt";"80.00";"10.00";"";"100.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"118.25";"10.00";"assertFptApplied";""
-"Check not taxed FPT display set to Excluding, Description and Including FPT on product with special price catalog price Excluding Tax";"tax_with_fpt_cat_excl_disp_incl";"with_special_price_and_fpt";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"118.25";"10.00";"assertFptApplied";""
-"Check not taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax";"tax_with_fpt_cat_excl_disp_excl";"with_special_price_and_fpt";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"118.25";"10.00";"assertFptApplied";"MAGETWO-29617"
-"Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option catalog price Excluding Tax";"tax_with_fpt_taxed_cat_excl_disp_excl";"with_custom_option_and_fpt";"70.00";"10.00";"80.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"119.08";"10.00";"assertFptApplied";"MAGETWO-29617"
-"Check taxed FPT display set to Including FPT and Description on product with with custom option catalog price Excluding Tax";"tax_with_fpt_taxed_cat_excl_disp_incl";"with_custom_option_and_fpt";"80.00";"10.00";"";"100.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"119.08";"10.00";"assertFptApplied";""
-"Check taxed FPT display set to Excluding, Description and Including FPT on product with special price catalog price Excluding Tax";"tax_with_fpt_taxed_cat_excl_disp_incl";"with_special_price_and_fpt";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"119.08";"10.00";"assertFptApplied";""
-"Check taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax";"tax_with_fpt_taxed_cat_excl_disp_excl";"with_special_price_and_fpt";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"119.08";"10.00";"assertFptApplied";"MAGETWO-29617"
-"Check taxed FPT display set to Excluding, Description and Including FPT on product with with special price and catalog price Including Tax";"tax_with_fpt_taxed_cat_incl_disp_excl";"with_special_price_and_fpt";"82.38";"10.00";"92.38";"82.38";"10.00";"92.38";"92.38";"9.24";"101.62";"92.38";"9.24";"101.62";"110.00";"10.00";"assertFptApplied";"MAGETWO-29617"
-"Check taxed FPT display set to Including FPT and Description on product with with special price and catalog price Including Tax";"tax_with_fpt_taxed_cat_incl_disp_incl";"with_special_price_and_fpt";"92.38";"10.00";"";"92.38";"10.00";"";"101.62";"9.24";"";"101.62";"9.24";"";"110.00";"10.00";"assertFptApplied";""
-"Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option and catalog price Including Tax";"tax_with_fpt_taxed_cat_incl_disp_excl";"with_custom_option_and_fpt";"54.67";"10.00";"64.67";"82.38";"10.00";"92.38";"92.38";"9.24";"101.62";"92.38";"9.24";"101.62";"110.00";"10.00";"assertFptApplied";"MAGETWO-29617"
+"description";"config/dataSet";"productData";"prices/category_price";"prices/fpt_category";"prices/fpt_total_category";"prices/product_page_price";"prices/product_page_fpt";"prices/product_page_fpt_total";"prices/cart_item_price";"prices/cart_item_fpt";"prices/cart_item_fpt_total";"prices/cart_item_subtotal";"prices/cart_item_subtotal_fpt";"prices/cart_item_subtotal_fpt_total";"prices/grand_total";"prices/total_fpt";"constraint"
+"Check not taxed FPT display set to Excluding, Description and Including FPT on product with custom option catalog price Excluding Tax";"tax_with_fpt_cat_excl_disp_excl";"with_custom_option_and_fpt";"70.00";"10.00";"80.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"118.25";"10.00";"assertFptApplied"
+"Check not taxed FPT display set to Including FPT and Description on product with custom option catalog price Excluding Tax";"tax_with_fpt_cat_excl_disp_incl";"with_custom_option_and_fpt";"80.00";"10.00";"";"100.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"118.25";"10.00";"assertFptApplied"
+"Check not taxed FPT display set to Excluding, Description and Including FPT on product with special price catalog price Excluding Tax";"tax_with_fpt_cat_excl_disp_incl";"with_special_price_and_fpt";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"118.25";"10.00";"assertFptApplied"
+"Check not taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax";"tax_with_fpt_cat_excl_disp_excl";"with_special_price_and_fpt";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"118.25";"10.00";"assertFptApplied"
+"Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option catalog price Excluding Tax";"tax_with_fpt_taxed_cat_excl_disp_excl";"with_custom_option_and_fpt";"70.00";"10.00";"80.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"119.08";"10.00";"assertFptApplied"
+"Check taxed FPT display set to Including FPT and Description on product with with custom option catalog price Excluding Tax";"tax_with_fpt_taxed_cat_excl_disp_incl";"with_custom_option_and_fpt";"80.00";"10.00";"";"100.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"119.08";"10.00";"assertFptApplied"
+"Check taxed FPT display set to Excluding, Description and Including FPT on product with special price catalog price Excluding Tax";"tax_with_fpt_taxed_cat_excl_disp_incl";"with_special_price_and_fpt";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"110.00";"10.00";"";"119.08";"10.00";"assertFptApplied"
+"Check taxed FPT display set to Including FPT and Description on product with special price catalog price Excluding Tax";"tax_with_fpt_taxed_cat_excl_disp_excl";"with_special_price_and_fpt";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"100.00";"10.00";"110.00";"119.08";"10.00";"assertFptApplied"
+"Check taxed FPT display set to Excluding, Description and Including FPT on product with with special price and catalog price Including Tax";"tax_with_fpt_taxed_cat_incl_disp_excl";"with_special_price_and_fpt";"82.38";"10.00";"92.38";"82.38";"10.00";"92.38";"92.38";"9.24";"101.62";"92.38";"9.24";"101.62";"110.00";"10.00";"assertFptApplied"
+"Check taxed FPT display set to Including FPT and Description on product with with special price and catalog price Including Tax";"tax_with_fpt_taxed_cat_incl_disp_incl";"with_special_price_and_fpt";"92.38";"10.00";"";"92.38";"10.00";"";"101.62";"9.24";"";"101.62";"9.24";"";"110.00";"10.00";"assertFptApplied"
+"Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option and catalog price Including Tax";"tax_with_fpt_taxed_cat_incl_disp_excl";"with_custom_option_and_fpt";"54.67";"10.00";"64.67";"82.38";"10.00";"92.38";"92.38";"9.24";"101.62";"92.38";"9.24";"101.62";"110.00";"10.00";"assertFptApplied"
diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest/test.csv
index ca8eb8d1ee3b4..8dae6eddd27d4 100644
--- a/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest/test.csv
@@ -1,6 +1,6 @@
 "widget/data/widgetOptions/preset";"widget/data/code";"widget/data/theme_id";"widget/data/title";"widget/data/store_ids/dataSet";"widget/data/layout/preset";"constraint";"issue"
 "cmsStaticBlock";"CMS Static Block";"Magento Blank";"Title_%isolation%";"All Store Views";"on_category";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetOnFrontendInCatalog";""
-"cmsPageLink";"CMS Page Link";"Magento Blank";"Title_%isolation%";"All Store Views";"for_cms_page_link";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetCmsPageLink";"Bug: MAGETWO-31062"
+"cmsPageLink";"CMS Page Link";"Magento Blank";"Title_%isolation%";"All Store Views";"for_cms_page_link";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetCmsPageLink";""
 "recentlyViewedProducts";"Recently Viewed Products";"Magento Blank";"Title_%isolation%";"All Store Views";"for_viewed_products";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetRecentlyViewedProducts";"Bug: MAGETWO-17189"
 "recentlyComparedProducts";"Recently Compared Products";"Magento Blank";"Title_%isolation%";"All Store Views";"for_compared_products";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetRecentlyComparedProducts";"Bug: MAGETWO-17189"
 "catalogCategoryLink";"Catalog Category Link";"Magento Blank";"Title_%isolation%";"All Store Views";"for_category_link";"assertWidgetSuccessSaveMessage, assertWidgetInGrid, assertWidgetCatalogCategoryLink";""
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
index 3775a263fd167..23765d99f718e 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductDetailsInWishlist.php
@@ -41,7 +41,10 @@ public function processAssert(
         $cartFixture = $fixtureFactory->createByCode('cart', ['data' => ['items' => ['products' => [$product]]]]);
         $expectedOptions = $cartFixture->getItems()[0]->getData()['options'];
 
-        $errors = $this->verifyData($expectedOptions, $actualOptions);
+        $errors = $this->verifyData(
+            $this->sortDataByPath($expectedOptions, '::title'),
+            $this->sortDataByPath($actualOptions, '::title')
+        );
         \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
index f178999edab8c..c664bfbbc42e2 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Constraint/AssertProductIsPresentInCustomerBackendWishlist.php
@@ -44,7 +44,7 @@ public function processAssert(
         $wishlistGrid = $customerIndexEdit->getCustomerForm()->getTabElement('wishlist')->getSearchGridBlock();
 
         \PHPUnit_Framework_Assert::assertTrue(
-            $wishlistGrid->isRowVisible(['product_name' => $product->getName()]),
+            $wishlistGrid->isRowVisible(['product_name' => $product->getName()], true, false),
             $product->getName() . " is not visible in customer wishlist on backend."
         );
     }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php
index cd11872300b69..522d3c3196a0e 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductToWishlistEntityTest.php
@@ -49,7 +49,6 @@ public function __prepare(CustomerInjectable $customer)
      */
     public function test(CustomerInjectable $customer, $product)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-27949');
         $product = $this->createProducts($product)[0];
 
         // Steps:
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php
index 2b20ff511881b..4d6ff6c1cb4fb 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/AddProductsToCartFromCustomerWishlistOnFrontendTest.php
@@ -48,7 +48,6 @@ class AddProductsToCartFromCustomerWishlistOnFrontendTest extends AbstractWishli
      */
     public function test(CustomerInjectable $customer, $products, $qty, Browser $browser)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30097");
         // Preconditions
         $this->browser = $browser;
         $customer->persist();
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php
index 1fc45be9613fc..bcc6085617b8a 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php
@@ -52,7 +52,6 @@ public function __prepare(CustomerInjectable $customer)
      */
     public function test(CustomerInjectable $customer, $product)
     {
-        $this->markTestIncomplete("Bug: MAGETWO-30097");
         // Preconditions
         $product = $this->createProducts($product)[0];
         $this->loginCustomer($customer);
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php
index 9eeef2b4ef674..d0d161d526f3f 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/DeleteProductFromCustomerWishlistOnBackendTest.php
@@ -61,7 +61,6 @@ public function test(
         CustomerIndex $customerIndex,
         CustomerIndexEdit $customerIndexEdit
     ) {
-        $this->markTestIncomplete('MAGETWO-27949');
         //Preconditions
         $product = $this->createProducts($product)[0];
         $this->loginCustomer($customer);
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
index b4a26725034cf..8c83fe2fff1b8 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php
@@ -155,7 +155,6 @@ public function test(
         CatalogProductSimple $product,
         array $sharingInfo
     ) {
-        $this->markTestIncomplete("Bug: MAGETWO-30105");
         //Steps
         $this->loginCustomer($customer);
         $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php
index 21feb4148be38..6a19b5be336fe 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ViewProductInCustomerWishlistOnBackendTest.php
@@ -59,8 +59,6 @@ public function test(
         CustomerIndex $customerIndex,
         CustomerIndexEdit $customerIndexEdit
     ) {
-        $this->markTestIncomplete('Bug: MAGETWO-27949');
-
         // Preconditions
         $product = $this->createProducts($product)[0];
         $this->loginCustomer($customer);
diff --git a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml b/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml
index 5f8e879e73209..e4d2fbca97b05 100644
--- a/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml
+++ b/dev/tests/functional/testsuites/Mtf/TestSuite/InjectableTests/installation.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

From ba67993fa2ab3f1ffda37e634a1df557c858826e Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Sat, 13 Dec 2014 15:17:17 +0200
Subject: [PATCH 411/474] MAGETWO-31765: Continue button loses its style after
 return to Shipping Information step during Onepage checkout [Luma, IE11, FF]

---
 .../Checkout/view/frontend/templates/onepage/shipping.phtml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
index 51efdfcab6edf..59c0c325c7309 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
@@ -102,8 +102,10 @@
             <input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if ($this->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> class="checkbox" />
         <label class="label" for="shipping:same_as_billing"><span><?php echo __('Use Billing Address') ?></span></label>
     </div>
-    <div class="actions" id="shipping-buttons-container">
-        <div class="primary"><button data-role="opc-continue" type="button" class="button action continue"><span><?php echo __('Continue') ?></span></button></div>
+    <div class="actions-toolbar" id="shipping-buttons-container">
+        <div class="primary">
+            <button data-role="opc-continue" type="button" class="action continue primary"><span><?php echo __('Continue') ?></span></button>
+        </div>
         <div class="secondary"><a href="#" class="action back"><span><?php echo __('Back') ?></span></a></div>
     </div>
 </form>

From 7cd340c06e53bd5ce33c1734611c146a80eaa4a6 Mon Sep 17 00:00:00 2001
From: Anton Ohorodnyk <aohorodnyk@ebay.com>
Date: Sat, 13 Dec 2014 15:46:25 +0200
Subject: [PATCH 412/474] MAGETWO-31791: There is no validation for assign
 attribute into attribut group(API)

---
 .../Magento/Eav/Model/AttributeManagement.php |  7 ++-
 .../Eav/Model/AttributeManagementTest.php     | 43 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Eav/Model/AttributeManagement.php b/app/code/Magento/Eav/Model/AttributeManagement.php
index cfbe58eee74ef..357e1acb9367e 100644
--- a/app/code/Magento/Eav/Model/AttributeManagement.php
+++ b/app/code/Magento/Eav/Model/AttributeManagement.php
@@ -88,8 +88,13 @@ public function assign($entityTypeCode, $attributeSetId, $attributeGroupId, $att
         if ($setEntityType->getEntityTypeCode() != $entityTypeCode) {
             throw new InputException('Wrong attribute set id provided');
         }
+
         //Check if group exists. If not - expected exception
-        $this->groupRepository->get($attributeGroupId);
+        $attributeGroup = $this->groupRepository->get($attributeGroupId);
+
+        if ($attributeGroup->getAttributeSetId() != $attributeSetId) {
+            throw new InputException('Attribute group does not belong to attribute set');
+        }
 
         /** @var \Magento\Eav\Api\Data\AttributeInterface $attribute */
         $attribute = $this->attributeRepository->get($entityTypeCode, $attributeCode);
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/AttributeManagementTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/AttributeManagementTest.php
index 98d5618440529..03959f7ef8fae 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/AttributeManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/AttributeManagementTest.php
@@ -125,6 +125,40 @@ public function testAssignInputException()
         $this->model->assign($entityTypeCode, $attributeSetId, $attributeGroupId, $attributeCode, $sortOrder);
     }
 
+    /**
+     *
+     * @expectedException \Magento\Framework\Exception\InputException
+     * @expectedExceptionMessage Attribute group does not belong to attribute set
+     */
+    public function testAssignInputExceptionGroupInSet()
+    {
+        $entityTypeCode = 1;
+        $attributeSetId = 2;
+        $attributeGroupId = 3;
+        $attributeCode = 4;
+        $sortOrder = 5;
+        $attributeSetMock = $this->getMock('Magento\Eav\Api\Data\AttributeSetInterface', [], [], '', false);
+        $this->setRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($attributeSetId)
+            ->willReturn($attributeSetMock);
+        $this->entityTypeFactoryMock->expects($this->once())->method('create')->willReturn($this->eavConfigMock);
+        $attributeSetMock->expects($this->once())->method('getEntityTypeId')->willReturn(66);
+        $entityTypeMock = $this->getMock('Magento\Eav\Model\Entity\Type', [], [], '', false);
+        $this->eavConfigMock->expects($this->once())->method('getEntityType')->with(66)->willReturn($entityTypeMock);
+        $entityTypeMock->expects($this->once())->method('getEntityTypeCode')->willReturn($entityTypeCode);
+
+        $attributeGroup = $this->getMockBuilder('Magento\Eav\Api\Data\AttributeGroupInterface')
+            ->setMethods(['getAttributeSetId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->groupRepositoryMock->expects($this->once())->method('get')->willReturn($attributeGroup);
+        $attributeGroup->expects($this->once())->method('getAttributeSetId')->willReturn($attributeSetId + 1);
+
+        $this->model->assign($entityTypeCode, $attributeSetId, $attributeGroupId, $attributeCode, $sortOrder);
+    }
+
     public function testAssign()
     {
         $entityTypeCode = 1;
@@ -142,7 +176,6 @@ public function testAssign()
         $entityTypeMock = $this->getMock('Magento\Eav\Model\Entity\Type', [], [], '', false);
         $this->eavConfigMock->expects($this->once())->method('getEntityType')->with(66)->willReturn($entityTypeMock);
         $entityTypeMock->expects($this->once())->method('getEntityTypeCode')->willReturn($entityTypeCode);
-        $this->groupRepositoryMock->expects($this->once())->method('get')->with($attributeGroupId);
         $attributeMock = $this->getMock('Magento\Eav\Model\Attribute', [], [], '', false);
         $this->attributeRepositoryMock->expects($this->once())
             ->method('get')
@@ -162,6 +195,14 @@ public function testAssign()
         $attributeMock->expects($this->once())->method('loadEntityAttributeIdBySet')->willReturnSelf();
         $attributeMock->expects($this->once())->method('getData')->with('entity_attribute_id')->willReturnSelf();
 
+        $attributeGroup = $this->getMockBuilder('Magento\Eav\Api\Data\AttributeGroupInterface')
+            ->setMethods(['getAttributeSetId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->groupRepositoryMock->expects($this->once())->method('get')->willReturn($attributeGroup);
+        $attributeGroup->expects($this->once())->method('getAttributeSetId')->willReturn($attributeSetId);
+
         $this->assertEquals(
             $attributeMock,
             $this->model->assign($entityTypeCode, $attributeSetId, $attributeGroupId, $attributeCode, $sortOrder)

From 2d110cdd12ad2b4385d855200de2f4c2e0bdeaa1 Mon Sep 17 00:00:00 2001
From: Vladimir Pelipenko <vpelipenko@ebay.com>
Date: Sat, 13 Dec 2014 16:15:40 +0200
Subject: [PATCH 413/474] MAGETWO-31757: 'No such entity with cartId' message
 error appears during Create New Order for New Customer on non-default website

---
 app/code/Magento/Backend/Model/Session/Quote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
index 73f13a070c5f5..3b1b7149aed18 100644
--- a/app/code/Magento/Backend/Model/Session/Quote.php
+++ b/app/code/Magento/Backend/Model/Session/Quote.php
@@ -140,7 +140,7 @@ public function getQuote()
                     $this->quoteRepository->save($this->_quote);
                     $this->setQuoteId($this->_quote->getId());
                 } else {
-                    $this->_quote = $this->quoteRepository->get($this->getQuoteId());
+                    $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);
                     $this->_quote->setStoreId($this->getStoreId());
                 }
 

From 1baf63dd7954ecde71b92f22d01abdb12fa439cf Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Sat, 13 Dec 2014 16:26:05 +0200
Subject: [PATCH 414/474] MAGETWO-31724: Simple and Virtual Product can't be
 found in customer wishlist grid by name.

---
 .../Widget/Grid/Column/Filter/Text.php        | 18 +++++++++++++
 .../layout/customer_index_wishlist.xml        |  1 +
 .../Widget/Grid/Column/Filter/TextTest.php    | 27 +++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 app/code/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/Text.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php

diff --git a/app/code/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/Text.php b/app/code/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/Text.php
new file mode 100644
index 0000000000000..402e32b634c8e
--- /dev/null
+++ b/app/code/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/Text.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter;
+
+class Text extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Text
+{
+    /**
+     * Override abstract method
+     *
+     * @return array
+     */
+    public function getCondition()
+    {
+        return ['like' => $this->getValue()];
+    }
+}
diff --git a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
index a94b31b3176eb..621cc2d9cee6c 100644
--- a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
+++ b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
@@ -34,6 +34,7 @@
                         <argument name="header" xsi:type="string" translate="true">Product</argument>
                         <argument name="id" xsi:type="string">product_name</argument>
                         <argument name="index" xsi:type="string">product_name</argument>
+                        <argument name="filter" xsi:type="string">Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter\Text</argument>
                         <argument name="renderer" xsi:type="string">Magento\Customer\Block\Adminhtml\Edit\Tab\View\Grid\Renderer\Item</argument>
                         <argument name="column_css_class" xsi:type="string">col-name</argument>
                         <argument name="header_css_class" xsi:type="string">col-name</argument>
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
new file mode 100644
index 0000000000000..b813dcbc2d202
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace testsuite\Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter;
+
+use Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter\Text;
+
+class TextTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var Text | \PHPUnit_Framework_MockObject_MockObject */
+    private $textFilterBlock;
+
+    protected function setUp()
+    {
+        $this->textFilterBlock = (new \Magento\TestFramework\Helper\ObjectManager($this))->getObject(
+            'Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter\Text'
+        );
+    }
+
+    public function testGetCondition()
+    {
+        $value = "test";
+        $this->textFilterBlock->setValue($value);
+        $this->assertSame(["like" => $value], $this->textFilterBlock->getCondition());
+    }
+}

From 8320530439cb004a47bf59db7278e1e9cc580696 Mon Sep 17 00:00:00 2001
From: Anton Kaplya <akaplya@ebay.com>
Date: Sat, 13 Dec 2014 16:26:36 +0200
Subject: [PATCH 415/474] MAGETWO-31758: Cannot place order with registration
 method and different billing and shipping address

---
 app/code/Magento/Sales/Model/Quote.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Quote.php b/app/code/Magento/Sales/Model/Quote.php
index 1f94e48474048..d3f302b91243c 100644
--- a/app/code/Magento/Sales/Model/Quote.php
+++ b/app/code/Magento/Sales/Model/Quote.php
@@ -742,11 +742,12 @@ public function addCustomerAddress(\Magento\Customer\Api\Data\AddressInterface $
     {
         $addresses = (array)$this->getCustomer()->getAddresses();
         $addresses[] = $address;
-        $customer = $this->customerBuilder->populate($this->getCustomer())
-            ->setAddresses($addresses)
-            ->create();
-        $this->setCustomer($customer);
-
+        if ($this->getCustomer()->getEmail()) {
+            $customer = $this->customerBuilder->populate($this->getCustomer())
+                ->setAddresses($addresses)
+                ->create();
+            $this->setCustomer($customer);
+        }
         return $this;
     }
 

From dd3fa22b234c28075b46dd969e94a661d9935b2c Mon Sep 17 00:00:00 2001
From: Evgeniy Kolesov <ikolesov@ebay.com>
Date: Sat, 13 Dec 2014 16:21:12 +0200
Subject: [PATCH 416/474] MAGETWO-31794: Spaces are removed incorrectly in
 scope of MAGETWO-30317

- Revert "Merge remote-tracking branch 'origin/MAGETWO-30317' into bug-fixing-round-3"

This reverts commit 4729e0f1dcf6f875a783a90a546b85f185fd109c, reversing
changes made to 27ff523ed16321b720987700d0f3cfbe3b6d141f.
---
 .../Magento/Framework/Css/PreProcessor/_files/oyejorge.css   | 2 +-
 .../Magento/Framework/Css/PreProcessor/_files/oyejorge.less  | 5 -----
 .../Framework/Css/PreProcessor/_files/oyejorge_dev.css       | 4 ----
 lib/internal/Less/Parser.php                                 | 2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
index de2d6b90bf747..dfa22a70de2dc 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.css
@@ -1 +1 @@
-#header{color:#4d926f}h2{color:#4d926f}#header{-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;-o-border-radius:5px;border-radius:5px}#footer{-webkit-border-radius:10px;-moz-border-radius:10px;-ms-border-radius:10px;-o-border-radius:10px;border-radius:10px}#header h1{font-size:26px;font-weight:bold}#header p{font-size:12px}#header p a{text-decoration:none}#header p a:hover{border-width:1px}#header{color:#333;border-left:1px;border-right:2px}#footer{color:#141;border-color:#7d2717}body{background-image:url(Magento_Theme::validation_advice_bg.gif)}.overflow{overflow-y:hidden;overflow-x:auto}
\ No newline at end of file
+#header{color: #4d926f}h2{color: #4d926f}#header{-webkit-border-radius: 5px;-moz-border-radius: 5px;-ms-border-radius: 5px;-o-border-radius: 5px;border-radius: 5px}#footer{-webkit-border-radius: 10px;-moz-border-radius: 10px;-ms-border-radius: 10px;-o-border-radius: 10px;border-radius: 10px}#header h1{font-size: 26px;font-weight: bold}#header p{font-size: 12px}#header p a{text-decoration: none}#header p a:hover{border-width: 1px}#header{color: #333;border-left: 1px;border-right: 2px}#footer{color: #141;border-color: #7d2717}body{background-image: url(Magento_Theme::validation_advice_bg.gif)}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.less b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.less
index b7d511ed6ab03..febf31ee5af5b 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.less
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge.less
@@ -67,8 +67,3 @@ h2 {
 body {
   background-image: @body-bg-img;
 }
-
-.overflow {
-  overflow-y: hidden;
-  overflow-x: auto;
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css
index fe619ac8d0884..5cfe4bd6f2372 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css
+++ b/dev/tests/integration/testsuite/Magento/Framework/Css/PreProcessor/_files/oyejorge_dev.css
@@ -43,7 +43,3 @@ h2 {
 body {
   background-image: url(Magento_Theme::validation_advice_bg.gif);
 }
-.overflow {
-  overflow-y: hidden;
-  overflow-x: auto;
-}
diff --git a/lib/internal/Less/Parser.php b/lib/internal/Less/Parser.php
index f6214efb84248..e759f2ea1c6e1 100644
--- a/lib/internal/Less/Parser.php
+++ b/lib/internal/Less/Parser.php
@@ -179,7 +179,7 @@ public function getCss(){
 		}
 
 		if( Less_Parser::$options['compress'] ){
-            $css = preg_replace('/\s*([-a-z]{2,})\s*(:|>|,|!)\s*("[^"]*"|\'[^\']*\'|[\w]*|[^;]*)/', '$1$2$3', $css);
+			$css = preg_replace('/(^(\s)+)|((\s)+$)/', '', $css);
 		}
 
 		//reset php settings

From 10e9d5374d031e04102549b6dd399d3b6af92395 Mon Sep 17 00:00:00 2001
From: Anton Kaplya <akaplya@ebay.com>
Date: Sat, 13 Dec 2014 16:30:05 +0200
Subject: [PATCH 417/474] MAGETWO-31758: Cannot place order with registration
 method and different billing and shipping address

---
 dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
index 2548b7a342ed8..9388b2908314b 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
@@ -547,10 +547,9 @@ public function testSetCustomerAddressData()
             '',
             false
         );
-        $customerMock->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue($customerId));
-
+        $customerMock->expects($this->once())
+            ->method('getEmail')
+            ->will($this->returnValue('example@magento.com'));
         $this->customerRepositoryMock->expects($this->once())
             ->method('getById')
             ->will($this->returnValue($customerMock));

From 2bfbc6d355bf05e55de6e02317454dea25526f03 Mon Sep 17 00:00:00 2001
From: Anton Kaplya <akaplya@ebay.com>
Date: Sat, 13 Dec 2014 17:13:11 +0200
Subject: [PATCH 418/474] MAGETWO-31758: Cannot place order with registration
 method and different billing and shipping address

---
 app/code/Magento/Checkout/Model/Type/Onepage.php       |  8 ++++----
 app/code/Magento/Sales/Model/Quote.php                 | 10 ++++------
 .../unit/testsuite/Magento/Sales/Model/QuoteTest.php   |  3 ---
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index 1b11589918e96..00496f62cd207 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -786,6 +786,10 @@ protected function _prepareNewCustomerQuote()
 
         $customer = $quote->getCustomer();
         $customerBillingData = $billing->exportCustomerAddress();
+        $dataArray = $this->_objectCopyService->getDataFromFieldset('checkout_onepage_quote', 'to_customer', $quote);
+        $customer = $this->_customerBuilder->mergeDataObjectWithArray($customer, $dataArray);
+        $quote->setCustomer($customer->create())->setCustomerId(true);
+
         $customerBillingData = $this->_addressBuilder->populate(
             $customerBillingData
         )->setDefaultBilling(
@@ -813,10 +817,6 @@ protected function _prepareNewCustomerQuote()
                 ->create();
         }
         $billing->setCustomerAddressData($customerBillingData);
-
-        $dataArray = $this->_objectCopyService->getDataFromFieldset('checkout_onepage_quote', 'to_customer', $quote);
-        $customer = $this->_customerBuilder->mergeDataObjectWithArray($customer, $dataArray);
-        $quote->setCustomer($customer->create())->setCustomerId(true);
         // TODO : Eventually need to remove this legacy hack
         // Add billing address to quote since customer Data Object does not hold address information
         $quote->addCustomerAddress($customerBillingData);
diff --git a/app/code/Magento/Sales/Model/Quote.php b/app/code/Magento/Sales/Model/Quote.php
index d3f302b91243c..2a3013319bd2f 100644
--- a/app/code/Magento/Sales/Model/Quote.php
+++ b/app/code/Magento/Sales/Model/Quote.php
@@ -742,12 +742,10 @@ public function addCustomerAddress(\Magento\Customer\Api\Data\AddressInterface $
     {
         $addresses = (array)$this->getCustomer()->getAddresses();
         $addresses[] = $address;
-        if ($this->getCustomer()->getEmail()) {
-            $customer = $this->customerBuilder->populate($this->getCustomer())
-                ->setAddresses($addresses)
-                ->create();
-            $this->setCustomer($customer);
-        }
+        $customer = $this->customerBuilder->populate($this->getCustomer())
+            ->setAddresses($addresses)
+            ->create();
+        $this->setCustomer($customer);
         return $this;
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
index 9388b2908314b..f99a191a3f16f 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/QuoteTest.php
@@ -547,9 +547,6 @@ public function testSetCustomerAddressData()
             '',
             false
         );
-        $customerMock->expects($this->once())
-            ->method('getEmail')
-            ->will($this->returnValue('example@magento.com'));
         $this->customerRepositoryMock->expects($this->once())
             ->method('getById')
             ->will($this->returnValue($customerMock));

From 3b55f04d74ca62381ea138642ca15531645c3b88 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Sat, 13 Dec 2014 07:30:02 -0800
Subject: [PATCH 419/474] MAGETWO-31754: Impossible to recheck File Permission
 on Readiness Check step during installation

- added no cache header for all http responces
---
 setup/module/Magento/Setup/Module.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/setup/module/Magento/Setup/Module.php b/setup/module/Magento/Setup/Module.php
index 482b5e8f1ea24..857f9dbecdcbc 100644
--- a/setup/module/Magento/Setup/Module.php
+++ b/setup/module/Magento/Setup/Module.php
@@ -48,6 +48,15 @@ public function onBootstrap(EventInterface $e)
             [$injectTemplateListener, 'injectTemplate'],
             -89
         );
+        $response = $e->getResponse();
+        if ($response instanceof \Zend\Http\Response) {
+            $headers = $response->getHeaders();
+            if ($headers) {
+                $headers->addHeaderLine('Cache-Control', 'no-cache, no-store, must-revalidate');
+                $headers->addHeaderLine('Pragma', 'no-cache');
+                $headers->addHeaderLine('Expires', '1970-01-01');
+            }
+        }
     }
 
     /**

From 3b28aceda3f81f59c5e82d64b57f318d674e5310 Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Sat, 13 Dec 2014 17:39:30 +0200
Subject: [PATCH 420/474] MTA-1201: Remove incomplete in functional tests for
 fixed bugs

---
 dev/build/core_dev/functional/build.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev/build/core_dev/functional/build.xml b/dev/build/core_dev/functional/build.xml
index 173f231765a82..74f53eab31f22 100644
--- a/dev/build/core_dev/functional/build.xml
+++ b/dev/build/core_dev/functional/build.xml
@@ -211,6 +211,10 @@
         <condition property="env.bamboo_module_whitelist" value="">
             <not><isset property="env.bamboo_module_whitelist"/></not>
         </condition>
+        <!-- Property which defines whether Magento console installation is performed -->
+        <condition property="env.bamboo_is_magento_installed" value="1">
+            <not><isset property="env.bamboo_is_magento_installed"/></not>
+        </condition>
 
         <replace file="${dir.build_directory}/instance-${instanceIndex}/dev/tests/functional/phpunit.xml">
             <replacefilter token="{{admin_url}}" value="${env.http_host}${env.build.key}/instance-${instanceIndex}/backend/" />
@@ -279,11 +283,6 @@
             <param name="target_composer_dir" value="${basedir}/dev/tests/functional"/>
         </antcall>
 
-        <!-- Property which defines whether Magento console installation is performed -->
-        <condition property="env.bamboo_is_magento_installed" value="1">
-            <not><isset property="env.bamboo_is_magento_installed"/></not>
-        </condition>
-
         <script language="javascript"><![CDATA[
             var currentInstance = project.getProperty('instanceIndex');
             if (currentInstance == 0 && project.getProperty('env.bamboo_is_magento_installed') == 1) {

From 5e0489ff50890226cdebe49ef5520b45e310f039 Mon Sep 17 00:00:00 2001
From: Anton Ohorodnyk <aohorodnyk@ebay.com>
Date: Sat, 13 Dec 2014 18:17:14 +0200
Subject: [PATCH 421/474] MAGETWO-31797: Use Layered Navigation for custom
 product attributes leads to an error on anchor category page (frontend)

---
 .../CatalogSearch/Model/Layer/Filter/Attribute.php       | 9 +++++----
 .../CatalogSearch/Model/Search/RequestGenerator.php      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index 33ab1e5e38431..710775164b559 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -79,7 +79,8 @@ protected function _getItemsData()
     {
         $attribute = $this->getAttributeModel();
         /** @var \Magento\CatalogSearch\Model\Resource\Fulltext\Collection $productCollection */
-        $productCollection = $this->getLayer()->getProductCollection();
+        $productCollection = $this->getLayer()
+            ->getProductCollection();
         $optionsFacetedData = $productCollection->getFacetedData($attribute->getAttributeCode());
 
         $productSize = $productCollection->getSize();
@@ -91,9 +92,9 @@ protected function _getItemsData()
                 continue;
             }
             // Check filter type
-            if ($this->getAttributeIsFilterable($attribute) == static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
-                && (empty($optionsFacetedData[$option['value']]['count'])
-                    || !$this->isOptionReducesResults($optionsFacetedData[$option['value']]['count'], $productSize))
+            if (empty($optionsFacetedData[$option['value']]['count'])
+                || ($this->getAttributeIsFilterable($attribute) == static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
+                    && !$this->isOptionReducesResults($optionsFacetedData[$option['value']]['count'], $productSize))
             ) {
                 continue;
             }
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
index 088f703261fea..df7bd250c96e0 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php
@@ -125,7 +125,7 @@ protected function getSearchableAttributes()
         $productAttributes = $this->productAttributeCollectionFactory->create();
         $productAttributes->addFieldToFilter(
             ['is_searchable', 'is_visible_in_advanced_search', 'is_filterable'],
-            [1, 1, 1]
+            [1, 1, [1, 2]]
         );
 
         return $productAttributes;

From 8400db63da9191db81020f59afdf8d2951960af2 Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Sat, 13 Dec 2014 18:18:52 +0200
Subject: [PATCH 422/474] MAGETWO-31765: Continue button loses its style after
 return to Shipping Information step during Onepage checkout [Luma, IE11, FF]

---
 .../luma/Magento_Theme/web/css/source/module.less      | 10 +++++++---
 .../luma/Magento_Wishlist/web/css/source/module.less   |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module.less
index e5acdf98c9abd..469dadae1a7d5 100644
--- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module.less
+++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module.less
@@ -436,15 +436,19 @@ body {
             @_dropdown-toggle-active-icon-content: @icon-up,
             @_icon-font-text-hide: true,
             @_icon-font-size: 10px,
-            @_icon-font-line-height: 22px
+            @_icon-font-line-height: 22px,
+            @_dropdown-list-pointer-position: right,
+            @_dropdown-list-position-right: 0
         );
         .action.switch {
             .button-reset();
-            color: @color-white;
+            .css(color, @color-white);
+        }
+        .header.links {
+            min-width: 175px;
         }
         li {
             &:extend(.switcher li all);
-            min-width: 120px;
             a {
                 .link(
                       @_link-color: @color-gray20,
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/module.less
index 8086bfc3f0633..bac1fcf66843a 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/module.less
@@ -76,6 +76,7 @@
 .link.wishlist {
     .counter {
         color: @text-color-muted;
+        white-space: nowrap;
         &:before {
             content: "(";
         }

From f70fd60af51c4812a86541c150cae0f5e3742114 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Sat, 13 Dec 2014 18:25:47 +0200
Subject: [PATCH 423/474] MAGETWO-31627: Remove proxy for config classes

- adding to obsolete
---
 .../Magento/Test/Legacy/_files/obsolete_classes.php      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 4281e758e1679..e11d615cf0f70 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -2822,4 +2822,13 @@
     ['Magento\Customer\Model\Converter'],
     ['Magento\CatalogRule\Plugin\Indexer\Product\PriceIndexer'],
     ['Magento\CatalogRule\Plugin\Indexer\Product\PriceIndexerTest'],
+    [
+        'Magento\Framework\Interception\ObjectManager\Compiled\Config',
+        'Magento\Framework\Interception\ObjectManager\Config\Compiled'
+    ],
+    [
+        'Magento\Framework\Interception\ObjectManager\Config',
+        'Magento\Framework\Interception\ObjectManager\Config\Developer'
+    ],
+    ['Magento\Framework\ObjectManager\Config\ProxyConfig'],
 );

From 9a48a76c3bfa3c14d55ce2f687f0a154be74e460 Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@ebay.com>
Date: Sat, 13 Dec 2014 19:02:59 +0200
Subject: [PATCH 424/474] MAGETWO-31744: Last 5 Orders show 0 items qty for
 orders after created invoice

---
 .../Magento/Sales/Model/Resource/Order.php    |  2 +-
 .../Magento/Sales/Model/Order/InvoiceTest.php | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Model/Order/InvoiceTest.php

diff --git a/app/code/Magento/Sales/Model/Resource/Order.php b/app/code/Magento/Sales/Model/Resource/Order.php
index 12e3071d9e784..08f92e636d516 100644
--- a/app/code/Magento/Sales/Model/Resource/Order.php
+++ b/app/code/Magento/Sales/Model/Resource/Order.php
@@ -146,8 +146,8 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
                 $store->getName(),
             ];
             $object->setStoreName(implode("\n", $name));
+            $object->setTotalItemCount($this->calculateItems($object));
         }
-        $object->setTotalItemCount($this->calculateItems($object));
         $object->setData(
             'protect_code',
             substr(md5(uniqid(Random::getRandomNumber(), true) . ':' . microtime(true)), 5, 6)
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/InvoiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/InvoiceTest.php
new file mode 100644
index 0000000000000..35924012c0d5b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/InvoiceTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Sales\Model\Order\Invoice;
+
+class InvoiceTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Sales\Model\Resource\Order\Collection
+     */
+    private $_collection;
+
+    protected function setUp()
+    {
+        $this->_collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\Sales\Model\Resource\Order\Collection'
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/invoice.php
+     */
+    public function testOrderTotalItemCount()
+    {
+        $expectedResult = [['total_item_count' => 1]];
+        $actualResult = [];
+        /** @var \Magento\Sales\Model\Order $order */
+        foreach ($this->_collection->getItems() as $order) {
+            $actualResult[] = ['total_item_count' => $order->getData('total_item_count')];
+        }
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+}

From 168660a3a3c640668f10d02abcc14a7dadfafbbf Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Sat, 13 Dec 2014 19:09:04 +0200
Subject: [PATCH 425/474] MAGETWO-31627: Remove proxy for config classes

- fixed annotation
---
 .../Interception/ObjectManager/Config/Compiled.php         | 7 ++-----
 .../Interception/ObjectManager/Config/Developer.php        | 2 +-
 .../Interception/ObjectManager/ConfigInterface.php         | 7 +------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
index dc3c9d68a3a5a..2818966423ff2 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
@@ -1,11 +1,8 @@
 <?php
 /**
  * ObjectManager config with interception processing
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * 
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Framework\Interception\ObjectManager\Config;
 
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
index ba008bd4821e8..89fe814c65e86 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
@@ -36,7 +36,7 @@ public function getInstanceType($instanceName)
     {
         $type = parent::getInstanceType($instanceName);
         if ($this->interceptionConfig && $this->interceptionConfig->hasPlugins($instanceName)) {
-            return $type . '\\Interceptor';
+            return $type . '\\Intergit statsuceptor';
         }
         return $type;
     }
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php b/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
index 99a73f812b8d2..40480e34b7942 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
@@ -1,12 +1,7 @@
 <?php
 /**
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-
 namespace Magento\Framework\Interception\ObjectManager;
 
 interface ConfigInterface extends \Magento\Framework\ObjectManager\ConfigInterface

From 10c1292d24432194031559b4306a57e1314119a4 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Sat, 13 Dec 2014 19:29:03 +0200
Subject: [PATCH 426/474] MAGETWO-31627: Remove proxy for config classes

- fixed annotation
---
 .../Interception/ObjectManager/Config/DeveloperTest.php     | 6 +-----
 .../Interception/ObjectManager/Config/Developer.php         | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php b/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php
index e9c6894539cb9..51cf610cc80ea 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Interception/ObjectManager/Config/DeveloperTest.php
@@ -1,10 +1,6 @@
 <?php
 /**
- *
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\Framework\Interception\ObjectManager\Config;
 
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
index 89fe814c65e86..ba008bd4821e8 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
@@ -36,7 +36,7 @@ public function getInstanceType($instanceName)
     {
         $type = parent::getInstanceType($instanceName);
         if ($this->interceptionConfig && $this->interceptionConfig->hasPlugins($instanceName)) {
-            return $type . '\\Intergit statsuceptor';
+            return $type . '\\Interceptor';
         }
         return $type;
     }

From f47ebd39c9e2bba2bda542bb6420f71f4eadd8d8 Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Sat, 13 Dec 2014 19:34:01 +0200
Subject: [PATCH 427/474] MAGETWO-31627: Remove proxy for config classes

- suppress warning added
---
 .../Magento/Framework/ObjectManager/Factory/AbstractFactory.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index 59e96ca5b821e..788afb22868db 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -84,6 +84,7 @@ public function setArguments($arguments)
      *
      * @return object
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      *
      */
     protected function createObject($type, $args)

From fa4f6e19cf7f1521b0f80ed14c7842ad6e823217 Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Sat, 13 Dec 2014 20:10:10 +0200
Subject: [PATCH 428/474] MAGETWO-31724: Simple and Virtual Product can't be
 found in customer wishlist grid by name.

- test fix
---
 .../Test/TestCase/AddProductToMultipleWishListTest.php        | 2 --
 .../Test/TestCase/AddProductToMultipleWishListTest/test.csv   | 4 ++--
 .../Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php  | 3 ---
 .../Wishlist/Test/Block/Adminhtml/Edit/CustomerForm.xml       | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest.php
index de6c8bc9088af..1c20105b80c1c 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest.php
@@ -55,8 +55,6 @@ public function __prepare()
      */
     public function test(MultipleWishlist $multipleWishlist, $products, $duplicate)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-27949');
-
         // Preconditions
         $multipleWishlist->persist();
         $customer = $multipleWishlist->getDataFieldConfig('customer_id')['source']->getCustomer();
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest/test.csv b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest/test.csv
index cff804d156b84..fa1ef32f9a284 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/AddProductToMultipleWishListTest/test.csv
@@ -1,7 +1,7 @@
 "multipleWishlist/dataSet";"products";"duplicate";"qtyToAction";"constraint"
-"wishlist_public";"catalogProductSimple::100_dollar_product";"yes";"2";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
+"wishlist_public";"catalogProductSimple::100_dollar_product";"yes";"4";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
 "wishlist_public";"catalogProductVirtual::50_dollar_product";"no";"1";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
 "wishlist_public";"configurableProductInjectable::default";"no";"3";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
 "wishlist_public";"groupedProductInjectable::three_simple_products";"no";"-";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
 "wishlist_public";"downloadableProductInjectable::with_two_separately_links";"no";"-";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
-"wishlist_public";"bundleProduct::bundle_dynamic_product";"no";"2";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertBundleProductDetailsInMultipleWishlist, assertProductIsPresentInCustomerBackendWishlist"
\ No newline at end of file
+"wishlist_public";"bundleProduct::bundle_dynamic_product";"no";"2";"assertAddProductToWishlistSuccessMessage, assertProductInCustomWishlist, assertProductIsPresentInCustomerBackendWishlist"
\ No newline at end of file
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
index 274d23169e349..c2374e20b52ae 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
@@ -105,9 +105,6 @@ protected function getRow(array $filter, $isSearchable = true, $isStrict = true)
         }
         $location = '//div[@class="grid"]//tr[';
         $rowTemplate = 'td[contains(.,normalize-space("%s"))]';
-        if ($isStrict) {
-            $rowTemplate = 'td[text()[normalize-space()="%s"]]';
-        }
         $rows = [];
         foreach ($filter as $value) {
             $rows[] = sprintf($rowTemplate, $value);
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Edit/CustomerForm.xml b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Edit/CustomerForm.xml
index 6bf8bbb220023..3bca952aecf22 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Edit/CustomerForm.xml
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Edit/CustomerForm.xml
@@ -7,7 +7,7 @@
 <tabs>
     <wishlist>
         <class>\Magento\Wishlist\Test\Block\Adminhtml\Customer\Edit\Tab\Wishlist</class>
-        <selector>#customer_info_tabs_wishlist</selector>
+        <selector>#tab_wishlist</selector>
         <strategy>css selector</strategy>
     </wishlist>
 </tabs>

From a3405866fc73662e5b572d9d9d96d372735e8ff4 Mon Sep 17 00:00:00 2001
From: Anup Dugar <anup@x.com>
Date: Sat, 13 Dec 2014 12:12:13 -0600
Subject: [PATCH 429/474] MAGETWO-31382: Build stabilization for PR

- Removed duplicate entries in obsolete_methods
---
 .../Magento/Test/Legacy/_files/obsolete_methods.php         | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 92b470f815b64..b0ebb19cafeb1 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -1709,11 +1709,6 @@
         'Magento\CatalogInventory\Helper\Minsaleqty',
         'Magento\CatalogInventory\Helper\Minsaleqty::decodeArrayFieldValue'
     ],
-    ['limitCustomerSegments', 'Magento\AdminGws\Model\Collections'],
-    ['limitPriceRules', 'Magento\AdminGws\Model\Collections'],
-    ['customerSegmentSaveBefore', 'Magento\AdminGws\Model\Models'],
-    ['customerSegmentDeleteBefore', 'Magento\AdminGws\Model\Models'],
-    ['customerSegmentLoadAfter', 'Magento\AdminGws\Model\Models'],
     ['updateOrderAction', 'Magento\Paypal\Controller\Express\AbstractExpress'],
     ['updateOrder', 'Magento\Paypal\Model\Express\Checkout'],
     ['_matchBnCountryCode', 'Magento\Paypal\Model\Config'],
@@ -1974,7 +1969,6 @@
     ['urlDecode', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Url\DecoderInterface::decode'],
     ['isModuleEnabled', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Module\Manager::isEnabled()'],
     ['isModuleOutputEnabled', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Module\Manager::isOutputEnabled()'],
-    ['toFlatArrayStatic', 'Magento\Framework\Api\ExtensibleDataObjectConverter'],
     ['_packToTar', 'Magento\Framework\Archive\Tar'],
     ['_parseHeader', 'Magento\Framework\Archive\Tar'],
     ['getIdentities', 'Magento\Wishlist\Block\Link'],

From 54b2e85a484260c848802922cbefcf44d9127bce Mon Sep 17 00:00:00 2001
From: Dmytro Kvashnin <dkvashnin@ebay.com>
Date: Sat, 13 Dec 2014 20:17:05 +0200
Subject: [PATCH 430/474] MAGETWO-31627: Remove proxy for config classes

- changed obsolete mention
---
 lib/internal/Magento/Framework/App/ObjectManagerFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
index 04fa829c558d9..165a5f00e9fa2 100644
--- a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
+++ b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
@@ -41,7 +41,7 @@ class ObjectManagerFactory
      *
      * @var string
      */
-    protected $_configClassName = 'Magento\Framework\Interception\ObjectManager\Config';
+    protected $_configClassName = 'Magento\Framework\Interception\ObjectManager\ConfigInterface';
 
     /**
      * Environment factory class name

From 488f3b466937e5bb9f5ab263a08e79ead0006e92 Mon Sep 17 00:00:00 2001
From: Anup Dugar <anup@x.com>
Date: Sat, 13 Dec 2014 12:52:22 -0600
Subject: [PATCH 431/474] MAGETWO-31382: Build stabilization for PR

- Removed more duplicate entries in obsolete_methods
---
 .../testsuite/Magento/Test/Legacy/_files/obsolete_methods.php    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index b0ebb19cafeb1..5b3c80f4e523a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -1988,7 +1988,6 @@
     ['getEnv', 'Magento\Rule\Model\Resource\Rule\Collection\AbstractCollection'],
     ['setActiveFilter', 'Magento\Rule\Model\Resource\Rule\Collection\AbstractCollection'],
     ['process', 'Magento\Rule\Model\Resource\Rule\Collection\AbstractCollection'],
-    ['set', 'Magento\Framework\Api\ExtensibleObjectBuilder'],
     [
         'isAutomaticCleaningAvailable',
         'Magento\Framework\Cache\Backend\Decorator\AbstractDecorator',

From f3c78209ed4435b46b5091e5659191be576ed08f Mon Sep 17 00:00:00 2001
From: Yuxing Zheng <yuxzheng@ebay.com>
Date: Sat, 13 Dec 2014 12:53:26 -0600
Subject: [PATCH 432/474] MAGETWO-31119: Doubled error message when create
 admin role

 - Changes on adding error message to exception when verifying the current admin password
---
 app/code/Magento/User/Controller/Adminhtml/User/Save.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index 04535940a90b7..c41f53839d8ee 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -52,9 +52,11 @@ public function execute()
             && !empty($data[$currentUserPasswordField]) && is_string($data[$currentUserPasswordField]);
         try {
             if (!($isCurrentUserPasswordValid && $currentUser->verifyIdentity($data[$currentUserPasswordField]))) {
-                throw new \Magento\Backend\Model\Auth\Exception(
-                    __('You have entered an invalid password for current user.')
+                $exception = new \Magento\Backend\Model\Auth\Exception();
+                $exception->addMessage(
+                    new \Magento\Framework\Message\Error('You have entered an invalid password for current user.')
                 );
+                throw $exception;
             }
             $model->save();
             $this->messageManager->addSuccess(__('You saved the user.'));

From 266ab370a9f1938ea450084936370abc6bc22335 Mon Sep 17 00:00:00 2001
From: Bryant Luk <bluk@ebay.com>
Date: Sat, 13 Dec 2014 13:10:08 -0600
Subject: [PATCH 433/474] MAGETWO-12806: Prevent Sending Emails in Integration
 Tests

---
 .../TestFramework/Mail/Template/TransportBuilderMock.php        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php b/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php
index 6289b4cfeb888..cc8a08612d22d 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Mail/Template/TransportBuilderMock.php
@@ -40,6 +40,8 @@ public function getSentMessage()
      */
     public function getTransport()
     {
+        $this->prepareMessage();
+        $this->reset();
         return new \Magento\TestFramework\Mail\TransportInterfaceMock();
     }
 }

From 42982541db7c7f1096ae44bb2bc4b9498a142cd3 Mon Sep 17 00:00:00 2001
From: Yuxing Zheng <yuxzheng@ebay.com>
Date: Sat, 13 Dec 2014 13:39:00 -0600
Subject: [PATCH 434/474] MAGETWO-31119: Doubled error message when create
 admin role

 - CR changes
---
 .../Magento/User/Controller/Adminhtml/User/Save.php   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index c41f53839d8ee..368480b0adc53 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -52,11 +52,9 @@ public function execute()
             && !empty($data[$currentUserPasswordField]) && is_string($data[$currentUserPasswordField]);
         try {
             if (!($isCurrentUserPasswordValid && $currentUser->verifyIdentity($data[$currentUserPasswordField]))) {
-                $exception = new \Magento\Backend\Model\Auth\Exception();
-                $exception->addMessage(
-                    new \Magento\Framework\Message\Error('You have entered an invalid password for current user.')
+                throw new \Magento\Backend\Model\Auth\Exception(
+                    __('You have entered an invalid password for current user.')
                 );
-                throw $exception;
             }
             $model->save();
             $this->messageManager->addSuccess(__('You saved the user.'));
@@ -64,6 +62,11 @@ public function execute()
             $this->_redirect('adminhtml/*/');
         } catch (\Magento\Framework\Model\Exception $e) {
             $this->messageManager->addMessages($e->getMessages());
+            if (empty($e->getMessages())) {
+                if ($e->getMessage()) {
+                    $this->messageManager->addError($e->getMessage());
+                }
+            }
             $this->_getSession()->setUserData($data);
             $arguments = $model->getId() ? ['user_id' => $model->getId()] : [];
             $arguments = array_merge($arguments, ['_current' => true]);

From 4f9b6d71ac79bbc75b2ac03a0fbec8eaa131f8e1 Mon Sep 17 00:00:00 2001
From: Natalia Momotenko <nmomotenko@ebay.com>
Date: Sat, 13 Dec 2014 21:43:22 +0200
Subject: [PATCH 435/474] MAGETWO-31805: Previously selected countries in ship
 to specific countries are not visible when it is disabled in flat rate
 shipping method[IE11]

---
 app/design/adminhtml/Magento/backend/web/css/admin.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/admin.less b/app/design/adminhtml/Magento/backend/web/css/admin.less
index 08900037cbf66..31fc293dfcde2 100644
--- a/app/design/adminhtml/Magento/backend/web/css/admin.less
+++ b/app/design/adminhtml/Magento/backend/web/css/admin.less
@@ -636,9 +636,9 @@ textarea[readonly] {
     color: #999;
 }
 
-select[disabled].multiselect > option[selected] {
+select[disabled] option[selected] {
     color: #fff;
-    background: #6d6d6d;
+    background: #aaa;
 }
 
 textarea:-moz-placeholder,

From 3df0728c9dc3a631cd45a044a5fd2b10e5f842d8 Mon Sep 17 00:00:00 2001
From: Yuxing Zheng <yuxzheng@ebay.com>
Date: Sat, 13 Dec 2014 13:58:15 -0600
Subject: [PATCH 436/474] MAGETWO-31119: Doubled error message when create
 admin role

 - Fixed usage on empty() method by passing a variable instead of a method call
---
 app/code/Magento/User/Controller/Adminhtml/User/Save.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Save.php b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
index 368480b0adc53..048bf50ddba33 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Save.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Save.php
@@ -62,7 +62,8 @@ public function execute()
             $this->_redirect('adminhtml/*/');
         } catch (\Magento\Framework\Model\Exception $e) {
             $this->messageManager->addMessages($e->getMessages());
-            if (empty($e->getMessages())) {
+            $messages = $e->getMessages();
+            if (empty($messages)) {
                 if ($e->getMessage()) {
                     $this->messageManager->addError($e->getMessage());
                 }

From 171bce44841dc3670296783068cd70b6c66ae6fa Mon Sep 17 00:00:00 2001
From: Evgeniy Kolesov <ikolesov@ebay.com>
Date: Sat, 13 Dec 2014 22:13:56 +0200
Subject: [PATCH 437/474] MAGETWO-31802: Broken footer layout on some backend
 pages (product creation, order creation, catalog etc.) [IE11]

---
 .../backend/Magento_Theme/web/css/source/module.less     | 9 ++++++++-
 .../Magento/backend/web/css/source/navigation.less       | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
index ac995a67a410c..8b44b362e2b9d 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
@@ -44,10 +44,13 @@ body {
 .page-header {
     &-wrapper {
         background-color: @color-dark;
+        .vendor-prefix-flex-grow(0);
+        .vendor-prefix-flex-shrink(0);
+        .vendor-prefix-flex-basis(auto);
     }
     &:extend(._layout-width all);
     text-align: right;
-    .clearer();
+     .clearer();
     .logo {
         margin-top: 5px;
         float: left;
@@ -467,6 +470,10 @@ button {
 
 .page-content {
     &:extend(._layout-width all);
+    flex: 1 0 auto;
+    .vendor-prefix-flex-grow(1);
+    .vendor-prefix-flex-shrink(0);
+    .vendor-prefix-flex-basis(auto);
     .clearer();
 }
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/navigation.less b/app/design/adminhtml/Magento/backend/web/css/source/navigation.less
index 107ee2fa31304..cb2807d3509a4 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/navigation.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/navigation.less
@@ -10,6 +10,9 @@
     background-color: @color-middle;
     position: relative;
     z-index: 5;
+    .vendor-prefix-flex-grow(0);
+    .vendor-prefix-flex-shrink(0);
+    .vendor-prefix-flex-shrink(auto);
 }
 
 .navigation .level-0.reverse > .submenu {

From 3f181cbed7f18b9182b320e6af2aab1c079f7018 Mon Sep 17 00:00:00 2001
From: Eddie Lau <kahlau@ebay.com>
Date: Sat, 13 Dec 2014 19:38:17 -0600
Subject: [PATCH 438/474] MAGETWO-31807: DbStatusValidator integration test
 fails L4

- fixed L4 build
---
 .../TestFramework/Workaround/Cleanup/StaticProperties.php   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index 40c4193ed6121..3a4d0cd0eef4e 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -85,11 +85,7 @@ public static function restoreStaticVariables()
             $staticProperties = $reflectionClass->getProperties(\ReflectionProperty::IS_STATIC);
             foreach ($staticProperties as $staticProperty) {
                 $staticProperty->setAccessible(true);
-                $value = $staticProperty->getValue();
-                if (is_object($value) || is_array($value) && is_object(current($value))) {
-                    $staticProperty->setValue(self::$backupStaticVariables[$class][$staticProperty->getName()]);
-                }
-                unset($value);
+                $staticProperty->setValue(self::$backupStaticVariables[$class][$staticProperty->getName()]);
             }
         }
     }

From 0b864f0b3e6edab63a9dbcce1442280ee83d791a Mon Sep 17 00:00:00 2001
From: Vlad Veselov <vveselov@ebay.com>
Date: Sun, 14 Dec 2014 05:28:12 -0500
Subject: [PATCH 439/474] MAGETWO-31799: Cannot install Magento without
 ConfigurableProduct module

---
 .php_cs                                                   | 8 ++++++++
 .../data/configurableproduct_setup/data-install-2.0.0.php | 2 ++
 app/code/Magento/ConfigurableProduct/etc/module.xml       | 1 +
 app/code/Magento/Msrp/composer.json                       | 1 -
 .../Magento/Msrp/data/msrp_setup/data-install-2.0.0.php   | 1 -
 composer.json                                             | 1 -
 dev/build/core_dev/static/build.xml                       | 4 ----
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.php_cs b/.php_cs
index 86d1826adbeb2..56fc26c7e9c80 100644
--- a/.php_cs
+++ b/.php_cs
@@ -1,4 +1,12 @@
 <?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+/**
+ * Pre-commit hook installation:
+ * vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
+ */
 $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->name('*.phtml')
     ->exclude('dev/tests/functional/generated')
diff --git a/app/code/Magento/ConfigurableProduct/data/configurableproduct_setup/data-install-2.0.0.php b/app/code/Magento/ConfigurableProduct/data/configurableproduct_setup/data-install-2.0.0.php
index a44e10d861184..1040905b5e286 100644
--- a/app/code/Magento/ConfigurableProduct/data/configurableproduct_setup/data-install-2.0.0.php
+++ b/app/code/Magento/ConfigurableProduct/data/configurableproduct_setup/data-install-2.0.0.php
@@ -10,6 +10,8 @@
     'country_of_manufacture',
     'group_price',
     'minimal_price',
+    'msrp',
+    'msrp_display_actual_price_type',
     'price',
     'special_price',
     'special_from_date',
diff --git a/app/code/Magento/ConfigurableProduct/etc/module.xml b/app/code/Magento/ConfigurableProduct/etc/module.xml
index e8990945171af..b76e11aec6480 100644
--- a/app/code/Magento/ConfigurableProduct/etc/module.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/module.xml
@@ -8,6 +8,7 @@
     <module name="Magento_ConfigurableProduct" schema_version="2.0.0">
         <sequence>
             <module name="Magento_Catalog"/>
+            <module name="Magento_Msrp"/>
             <module name="Magento_CatalogInventory"/>
             <module name="Magento_Sales"/>
             <module name="Magento_Checkout"/>
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 9171355041bdb..e009ce47ca347 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -5,7 +5,6 @@
         "php": "~5.4.11|~5.5.0",
         "magento/module-bundle": "0.1.0-alpha107",
         "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-configurable-product": "0.1.0-alpha107",
         "magento/module-core": "0.1.0-alpha107",
         "magento/module-downloadable": "0.1.0-alpha107",
         "magento/module-eav": "0.1.0-alpha107",
diff --git a/app/code/Magento/Msrp/data/msrp_setup/data-install-2.0.0.php b/app/code/Magento/Msrp/data/msrp_setup/data-install-2.0.0.php
index 3b6f61a1a4977..eadb58a9090a1 100644
--- a/app/code/Magento/Msrp/data/msrp_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Msrp/data/msrp_setup/data-install-2.0.0.php
@@ -11,7 +11,6 @@
     \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL,
     \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE,
     \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE,
-    \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE,
 ];
 $productTypes = join(',', $productTypes);
 
diff --git a/composer.json b/composer.json
index 33875d57f50b8..a06ac6f0c84f6 100644
--- a/composer.json
+++ b/composer.json
@@ -237,7 +237,6 @@
         "psr-4": {
             "Magento\\Sniffs\\": "dev/tests/static/framework/Magento/Sniffs/",
             "Magento\\Tools\\": "dev/tools/Magento/Tools/",
-            "Magento\\Tools\\License\\": "dev/build/publication/license/",
             "Magento\\Tools\\Sanity\\": "dev/build/publication/sanity/Magento/Tools/Sanity/",
             "Magento\\TestFramework\\Inspection\\": "dev/tests/static/framework/Magento/TestFramework/Inspection/",
             "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/",
diff --git a/dev/build/core_dev/static/build.xml b/dev/build/core_dev/static/build.xml
index 0920051fb436c..d6a51193360cb 100644
--- a/dev/build/core_dev/static/build.xml
+++ b/dev/build/core_dev/static/build.xml
@@ -117,7 +117,6 @@
 
     <target name="static_tests_ee" depends="_server_info" description="Static tests for EE">
         <antcall>
-            <param name="license_replacement_enabled" value="true"/>
             <param name="product_edition_code" value="ee"/>
             <target name="_product_edition"/>
             <target name="_static_tests_no_js"/>
@@ -126,7 +125,6 @@
 
     <target name="sanity_check_ce" depends="_server_info" description="Sanity Check for CE">
         <antcall>
-            <param name="license_replacement_enabled" value="true"/>
             <param name="product_edition_code" value="ce"/>
             <target name="_product_edition_no_internal"/>
             <target name="_sanity_check"/>
@@ -135,7 +133,6 @@
 
     <target name="sanity_check_ee" depends="_server_info" description="Sanity Check for EE">
         <antcall>
-            <param name="license_replacement_enabled" value="true"/>
             <param name="product_edition_code" value="ee"/>
             <target name="_product_edition_no_internal"/>
             <target name="_sanity_check"/>
@@ -144,7 +141,6 @@
 
     <target name="static_tests_ce" depends="_server_info" description="Static tests for CE">
         <antcall>
-            <param name="license_replacement_enabled" value="true"/>
             <param name="product_edition_code" value="ce"/>
             <target name="_product_edition"/>
             <target name="_static_tests_no_js"/>

From 49c972bc35ff96a2223fbd21e95b2dd746adbc50 Mon Sep 17 00:00:00 2001
From: Evgeniy Kolesov <ikolesov@ebay.com>
Date: Sun, 14 Dec 2014 14:47:58 +0200
Subject: [PATCH 440/474] MAGETWO-31808: Admin tax and cache warning
 notifications are not show in IE11

---
 .../Magento_Theme/web/css/source/module.less     | 16 ++++++----------
 .../adminhtml/Magento/backend/web/css/admin.less |  6 +++++-
 .../backend/web/css/source/navigation.less       |  3 ---
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
index 8b44b362e2b9d..fdfc2c8da06b4 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
@@ -27,6 +27,8 @@ body {
     font-weight: @baseFontWeight;
     .font-size(@baseFontSize);
     background: @primary7;
+    .vendor-prefix-display(flex);
+    .vendor-prefix-flex-direction(column);
 }
 
 .page-wrapper {
@@ -36,17 +38,15 @@ body {
     width: 100%;
     max-width: 100%;
     min-width: @layout-min-width + 2 * @layout-indent;
-    .ie10 &,
-    .ie11 & {
-        height: 100%;
+    & > * {
+        .vendor-prefix-flex-grow(0);
+        .vendor-prefix-flex-shrink(0);
+        .vendor-prefix-flex-basis(auto);
     }
 }
 .page-header {
     &-wrapper {
         background-color: @color-dark;
-        .vendor-prefix-flex-grow(0);
-        .vendor-prefix-flex-shrink(0);
-        .vendor-prefix-flex-basis(auto);
     }
     &:extend(._layout-width all);
     text-align: right;
@@ -470,10 +470,6 @@ button {
 
 .page-content {
     &:extend(._layout-width all);
-    flex: 1 0 auto;
-    .vendor-prefix-flex-grow(1);
-    .vendor-prefix-flex-shrink(0);
-    .vendor-prefix-flex-basis(auto);
     .clearer();
 }
 
diff --git a/app/design/adminhtml/Magento/backend/web/css/admin.less b/app/design/adminhtml/Magento/backend/web/css/admin.less
index 31fc293dfcde2..ebd3fc8361b2b 100644
--- a/app/design/adminhtml/Magento/backend/web/css/admin.less
+++ b/app/design/adminhtml/Magento/backend/web/css/admin.less
@@ -7,6 +7,7 @@
 @import "../less/styles/vars.less";
 @import "../less/styles/base.less";
 @import "../less/lib/buttons.less";
+@import 'source/lib/utilities.less';
 
 .dont-use-this-class-big-size {
     font-size: 18px;
@@ -1792,7 +1793,8 @@ address {
     width: 262px;
     height: 64px;
     text-indent: -999em;
-    background: url(Magento_Backend::images/logo-magento.png) no-repeat;
+    .url('images/logo-magento.png', 'Magento_Backend');
+    background: url("@{url}") no-repeat;
 }
 
 .page-login {
@@ -3648,3 +3650,5 @@ tr.dynamic-grid input.input-text {
 .fieldset-wrapper-title:after {
     clear: both;
 }
+@baseDir: "../"; //default
+
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/navigation.less b/app/design/adminhtml/Magento/backend/web/css/source/navigation.less
index cb2807d3509a4..107ee2fa31304 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/navigation.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/navigation.less
@@ -10,9 +10,6 @@
     background-color: @color-middle;
     position: relative;
     z-index: 5;
-    .vendor-prefix-flex-grow(0);
-    .vendor-prefix-flex-shrink(0);
-    .vendor-prefix-flex-shrink(auto);
 }
 
 .navigation .level-0.reverse > .submenu {

From 7c7099d76d1e2e5fa1ac8dad2a196f569160cc26 Mon Sep 17 00:00:00 2001
From: Igor Miniailo <iminiailo@ebay.com>
Date: Sun, 14 Dec 2014 15:50:24 +0200
Subject: [PATCH 441/474] MAGETWO-31803: Fatal error on gouped product page if
 GropedProduct module was disabled

---
 app/code/Magento/GroupedProduct/Pricing/Price/FinalPrice.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/GroupedProduct/Pricing/Price/FinalPrice.php b/app/code/Magento/GroupedProduct/Pricing/Price/FinalPrice.php
index a634212946770..cc6cddecf5145 100644
--- a/app/code/Magento/GroupedProduct/Pricing/Price/FinalPrice.php
+++ b/app/code/Magento/GroupedProduct/Pricing/Price/FinalPrice.php
@@ -6,12 +6,12 @@
 namespace Magento\GroupedProduct\Pricing\Price;
 
 use Magento\Catalog\Model\Product;
-use Magento\Framework\Pricing\Price\AbstractPrice;
+use Magento\Catalog\Pricing\Price\FinalPriceInterface;
 
 /**
  * Final price model
  */
-class FinalPrice extends AbstractPrice
+class FinalPrice extends \Magento\Catalog\Pricing\Price\FinalPrice implements FinalPriceInterface
 {
     /**
      * Price type final

From 7c6c20896f47da0935f22944661f8de179b293c0 Mon Sep 17 00:00:00 2001
From: Evgeniy Kolesov <ikolesov@ebay.com>
Date: Sun, 14 Dec 2014 17:13:46 +0200
Subject: [PATCH 442/474] MAGETWO-31808: Admin tax and cache warning
 notifications are not shown in IE11

---
 .../backend/Magento_Theme/web/css/source/module.less        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
index fdfc2c8da06b4..fc05de4c15513 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Theme/web/css/source/module.less
@@ -29,6 +29,11 @@ body {
     background: @primary7;
     .vendor-prefix-display(flex);
     .vendor-prefix-flex-direction(column);
+    & > * {
+        .vendor-prefix-flex-grow(0);
+        .vendor-prefix-flex-shrink(0);
+        .vendor-prefix-flex-basis(auto);
+    }
 }
 
 .page-wrapper {
@@ -44,6 +49,7 @@ body {
         .vendor-prefix-flex-basis(auto);
     }
 }
+
 .page-header {
     &-wrapper {
         background-color: @color-dark;

From 21b3f947cc9a37a5981e932db0f472e04a6291d3 Mon Sep 17 00:00:00 2001
From: Alex Bomko <abomko@ebay.com>
Date: Sun, 14 Dec 2014 17:15:15 +0200
Subject: [PATCH 443/474] MAGETWO-31797: Use Layered Navigation for custom
 product attributes leads to an error on anchor category page (frontend)

- CR Changes
---
 .../Model/Layer/Filter/AttributeTest.php      | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
index 7454a4a0a2c84..85de9a5d76886 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
@@ -243,10 +243,16 @@ public function testGetItemsWithoutApply()
                 'value' => 'selectedOptionValue2',
                 'count' => 13,
             ],
+            [
+                'label' => 'selectedOptionLabel3',
+                'value' => 'selectedOptionValue3',
+                'count' => 10,
+            ],
         ];
         $facetedData = [
             'selectedOptionValue1' => ['count' => 10],
             'selectedOptionValue2' => ['count' => 45],
+            'selectedOptionValue3' => ['count' => 50],
         ];
 
         $builtData = [
@@ -260,14 +266,25 @@ public function testGetItemsWithoutApply()
                 'value' => $selectedOptions[1]['value'],
                 'count' => $facetedData[$selectedOptions[1]['value']]['count'],
             ],
+            [
+                'label' => $selectedOptions[2]['label'],
+                'value' => $selectedOptions[2]['value'],
+                'count' => $facetedData[$selectedOptions[2]['value']]['count'],
+            ],
         ];
 
         $this->attribute->expects($this->exactly(2))
             ->method('getAttributeCode')
             ->will($this->returnValue($attributeCode));
-        $this->attribute->expects($this->exactly(count($selectedOptions)))
+        $this->attribute->expects($this->at(3))
+            ->method('getIsFilterable')
+            ->will($this->returnValue(1));
+        $this->attribute->expects($this->at(4))
+            ->method('getIsFilterable')
+            ->will($this->returnValue(2));
+        $this->attribute->expects($this->at(5))
             ->method('getIsFilterable')
-            ->will($this->returnValue(true));
+            ->will($this->returnValue(1));
 
         $this->target->setAttributeModel($this->attribute);
 
@@ -306,6 +323,7 @@ public function testGetItemsWithoutApply()
         $expectedFilterItems = [
             $this->createFilterItem(0, $builtData[0]['label'], $builtData[0]['value'], $builtData[0]['count']),
             $this->createFilterItem(1, $builtData[1]['label'], $builtData[1]['value'], $builtData[1]['count']),
+            $this->createFilterItem(2, $builtData[2]['label'], $builtData[2]['value'], $builtData[2]['count']),
         ];
 
         $result = $this->target->getItems();

From de43f3fac0bc8b59069e10f09050ee4ca203a3a5 Mon Sep 17 00:00:00 2001
From: Alex Bomko <abomko@ebay.com>
Date: Sun, 14 Dec 2014 18:30:14 +0200
Subject: [PATCH 444/474] MAGETWO-31797: Use Layered Navigation for custom
 product attributes leads to an error on anchor category page (frontend)

- CR Changes
---
 .../CatalogSearch/Model/Search/RequestGeneratorTest.php      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/RequestGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/RequestGeneratorTest.php
index a493371230794..eeda495eee7b4 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/RequestGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/RequestGeneratorTest.php
@@ -68,6 +68,11 @@ public function testGenerate($countResult, $code, $type, $visibleInAdvanced = tr
                     ]
                 )
             );
+        $collection->expects($this->any())
+            ->method('addFieldToFilter')
+            ->with(['is_searchable', 'is_visible_in_advanced_search', 'is_filterable'], [1, 1, [1, 2]])
+            ->will($this->returnSelf());
+
         $this->productAttributeCollectionFactory->expects($this->any())
             ->method('create')
             ->willReturn($collection);

From 5b3c1b25ffd196c893afb68cfb759f113bdf4678 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Sun, 14 Dec 2014 17:49:07 +0200
Subject: [PATCH 445/474] MAGETWO-31798: Product alerts are not working

---
 app/code/Magento/Cron/Model/Schedule.php                     | 5 +++++
 dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index 1fc49939fccc5..656142dad160e 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -111,7 +111,12 @@ public function trySchedule()
             $time = strtotime($time);
         }
 
+        // set time zone to UTC as getdate() takes into account PHP time zone and gets as a parameter a timestamp
+        // which is shifted to time zone of Magento
+        $currentTimezone = @date_default_timezone_get();
+ 	    @date_default_timezone_set('UTC');
         $d = getdate($this->_date->timestamp($time));
+        @date_default_timezone_set($currentTimezone);
 
         $match = $this->matchCronExpression($e[0], $d['minutes'])
             && $this->matchCronExpression($e[1], $d['hours'])
diff --git a/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php b/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php
index 0ff086f160630..ad1c5a48f1f3f 100644
--- a/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php
@@ -197,7 +197,8 @@ public function tryScheduleDataProvider()
             [$date, ['*', '*', '*', '*', '*'], true],
             [strtotime($date), ['*', '*', '*', '*', '*'], true],
             [strtotime($date), ['15', '*', '*', '*', '*'], true],
-            [strtotime($date), ['*', '14', '*', '*', '*'], true],
+            // 22 hours because default timezone is Los Angeles (GMT-8, 14+8=22)
+            [strtotime($date), ['*', '22', '*', '*', '*'], true],
             [strtotime($date), ['*', '*', '13', '*', '*'], true],
             [strtotime($date), ['*', '*', '*', '12', '*'], true],
             [strtotime('Monday'), ['*', '*', '*', '*', '1'], true],

From 77e4754584a7a739ea7a3458abce40715838d04a Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Sun, 14 Dec 2014 18:45:42 +0200
Subject: [PATCH 446/474] MAGETWO-31798: Product alerts are not working

---
 app/code/Magento/Cron/Model/Schedule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index 656142dad160e..c3e9ace9ec9e1 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -114,7 +114,7 @@ public function trySchedule()
         // set time zone to UTC as getdate() takes into account PHP time zone and gets as a parameter a timestamp
         // which is shifted to time zone of Magento
         $currentTimezone = @date_default_timezone_get();
- 	    @date_default_timezone_set('UTC');
+        @date_default_timezone_set('UTC');
         $d = getdate($this->_date->timestamp($time));
         @date_default_timezone_set($currentTimezone);
 

From 3d3cac4f7f9c810addfe517cfa3690023092c2d9 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Sun, 14 Dec 2014 20:03:58 +0200
Subject: [PATCH 447/474] MAGETWO-31798: Product alerts are not working

---
 app/code/Magento/Cron/Model/Schedule.php      | 27 ++++++++-----------
 .../Magento/Cron/Model/ScheduleTest.php       | 24 ++++++++++++-----
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index c3e9ace9ec9e1..8547b88d30004 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -44,14 +44,14 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
     const STATUS_ERROR = 'error';
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
      */
-    protected $_date;
+    protected $timezone;
 
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
+     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -59,12 +59,12 @@ class Schedule extends \Magento\Framework\Model\AbstractModel
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Stdlib\DateTime\DateTime $date,
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $timezone,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
     ) {
-        $this->_date = $date;
+        $this->timezone = $timezone;
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
     }
 
@@ -111,18 +111,13 @@ public function trySchedule()
             $time = strtotime($time);
         }
 
-        // set time zone to UTC as getdate() takes into account PHP time zone and gets as a parameter a timestamp
-        // which is shifted to time zone of Magento
-        $currentTimezone = @date_default_timezone_get();
-        @date_default_timezone_set('UTC');
-        $d = getdate($this->_date->timestamp($time));
-        @date_default_timezone_set($currentTimezone);
+        $dateWithTimezone = $this->timezone->date($time);
 
-        $match = $this->matchCronExpression($e[0], $d['minutes'])
-            && $this->matchCronExpression($e[1], $d['hours'])
-            && $this->matchCronExpression($e[2], $d['mday'])
-            && $this->matchCronExpression($e[3], $d['mon'])
-            && $this->matchCronExpression($e[4], $d['wday']);
+        $match = $this->matchCronExpression($e[0], $dateWithTimezone->get(\Zend_Date::MINUTE))
+            && $this->matchCronExpression($e[1], $dateWithTimezone->get(\Zend_Date::HOUR))
+            && $this->matchCronExpression($e[2], $dateWithTimezone->get(\Zend_Date::DAY))
+            && $this->matchCronExpression($e[3], $dateWithTimezone->get(\Zend_Date::MONTH))
+            && $this->matchCronExpression($e[4], $dateWithTimezone->get(\Zend_Date::WEEKDAY));
 
         return $match;
     }
diff --git a/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php b/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php
index ad1c5a48f1f3f..e5b7eb3968374 100644
--- a/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cron/Model/ScheduleTest.php
@@ -157,22 +157,35 @@ public function setCronExprExceptionDataProvider()
     public function testTrySchedule($scheduledAt, $cronExprArr, $expected)
     {
         // 1. Create mocks
-        $date = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTime')
+        $timezoneMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\TimezoneInterface')
             ->disableOriginalConstructor()
-            ->getMock();
+            ->setMethods(['date'])
+            ->getMockForAbstractClass();
+        $dateMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateInterface')
+            ->disableOriginalConstructor()
+            ->setMethods(['get'])
+            ->getMockForAbstractClass();
 
         /** @var \Magento\Cron\Model\Schedule $model */
         $model = $this->helper->getObject(
             'Magento\Cron\Model\Schedule',
             [
-                'date' => $date
+                'timezone' => $timezoneMock
             ]
         );
 
         // 2. Set fixtures
         $model->setScheduledAt($scheduledAt);
         $model->setCronExprArr($cronExprArr);
-        $date->expects($this->any())->method('timestamp')->will($this->returnArgument(0));
+        if ($scheduledAt && $cronExprArr) {
+            $timezoneMock->expects($this->once())->method('date')->willReturn($dateMock);
+            $date = getdate(is_numeric($scheduledAt) ? $scheduledAt : strtotime($scheduledAt));
+            $dateMock->expects($this->at(0))->method('get')->with(\Zend_Date::MINUTE)->willReturn($date['minutes']);
+            $dateMock->expects($this->at(1))->method('get')->with(\Zend_Date::HOUR)->willReturn($date['hours']);
+            $dateMock->expects($this->at(2))->method('get')->with(\Zend_Date::DAY)->willReturn($date['mday']);
+            $dateMock->expects($this->at(3))->method('get')->with(\Zend_Date::MONTH)->willReturn($date['mon']);
+            $dateMock->expects($this->at(4))->method('get')->with(\Zend_Date::WEEKDAY)->willReturn($date['wday']);
+        }
 
         // 3. Run tested method
         $result = $model->trySchedule();
@@ -197,8 +210,7 @@ public function tryScheduleDataProvider()
             [$date, ['*', '*', '*', '*', '*'], true],
             [strtotime($date), ['*', '*', '*', '*', '*'], true],
             [strtotime($date), ['15', '*', '*', '*', '*'], true],
-            // 22 hours because default timezone is Los Angeles (GMT-8, 14+8=22)
-            [strtotime($date), ['*', '22', '*', '*', '*'], true],
+            [strtotime($date), ['*', '14', '*', '*', '*'], true],
             [strtotime($date), ['*', '*', '13', '*', '*'], true],
             [strtotime($date), ['*', '*', '*', '12', '*'], true],
             [strtotime('Monday'), ['*', '*', '*', '*', '1'], true],

From 6af5cc6691ef4f6558a3af7aed3b1af985c83b0d Mon Sep 17 00:00:00 2001
From: Igor Miniailo <iminiailo@ebay.com>
Date: Mon, 15 Dec 2014 09:32:12 +0200
Subject: [PATCH 448/474] MAGETWO-31801: Exception on category page if install
 magento without LayeredNavigation module

---
 .../Model/Resource/Fulltext/Collection.php           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
index 8fcdb929eb637..f20d6544bd44c 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
@@ -174,13 +174,13 @@ protected function _renderFiltersBefore()
             $this->requestBuilder->bind('search_term', $this->queryText);
         }
 
-        $this->requestBuilder->bind(
-            'price_dynamic_algorithm',
-            $this->_scopeConfig->getValue(
-                \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )
+        $priceRangeCalculation = $this->_scopeConfig->getValue(
+            \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
+        if ($priceRangeCalculation) {
+            $this->requestBuilder->bind('price_dynamic_algorithm', $priceRangeCalculation);
+        }
 
         $this->requestBuilder->setRequestName('quick_search_container');
         $queryRequest = $this->requestBuilder->create();

From a1d90a54830807dec725e5f4f56692b689836940 Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Mon, 15 Dec 2014 10:29:17 +0200
Subject: [PATCH 449/474] MAGETWO-31724: Simple and Virtual Product can't be
 found in customer wishlist grid by name.

- test fix
---
 .../Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
index b813dcbc2d202..6fae557de96a0 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
@@ -4,7 +4,7 @@
  */
 namespace testsuite\Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter;
 
-use Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter\Text;
+use Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter;
 
 class TextTest extends \PHPUnit_Framework_TestCase
 {

From 87401d659d090ba722abfa35c024d53892b9db0c Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Mon, 15 Dec 2014 10:32:45 +0200
Subject: [PATCH 450/474] MAGETWO-31724: Simple and Virtual Product can't be
 found in customer wishlist grid by name.

- test fix
---
 .../Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
index 6fae557de96a0..0cbad71c8d661 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
@@ -2,9 +2,8 @@
 /**
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-namespace testsuite\Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter;
 
-use Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter;
+namespace Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter;
 
 class TextTest extends \PHPUnit_Framework_TestCase
 {

From 1fc09b19c2b73dcc5f4b32cf9d6116f22619adaa Mon Sep 17 00:00:00 2001
From: Pavlo Cherniavskyi <pcherniavsky@ebay.com>
Date: Mon, 15 Dec 2014 10:57:39 +0200
Subject: [PATCH 451/474] Merge branch 'develop-mainline' into team develop
 branch

Conflicts:
 - app/code/Magento/Msrp/composer.json
---
 app/code/Magento/Msrp/composer.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index e009ce47ca347..9407296a1f270 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -3,20 +3,20 @@
     "description": "N/A",
     "require": {
         "php": "~5.4.11|~5.5.0",
-        "magento/module-bundle": "0.1.0-alpha107",
-        "magento/module-catalog": "0.1.0-alpha107",
-        "magento/module-core": "0.1.0-alpha107",
-        "magento/module-downloadable": "0.1.0-alpha107",
-        "magento/module-eav": "0.1.0-alpha107",
-        "magento/module-grouped-product": "0.1.0-alpha107",
-        "magento/module-sales": "0.1.0-alpha107",
-        "magento/module-store": "0.1.0-alpha107",
-        "magento/module-tax": "0.1.0-alpha107",
-        "magento/framework": "0.1.0-alpha107",
+        "magento/module-bundle": "0.1.0-alpha108",
+        "magento/module-catalog": "0.1.0-alpha108",
+        "magento/module-core": "0.1.0-alpha108",
+        "magento/module-downloadable": "0.1.0-alpha108",
+        "magento/module-eav": "0.1.0-alpha108",
+        "magento/module-grouped-product": "0.1.0-alpha108",
+        "magento/module-sales": "0.1.0-alpha108",
+        "magento/module-store": "0.1.0-alpha108",
+        "magento/module-tax": "0.1.0-alpha108",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

From 52db3b58b78e8e30e20d11feb8230b43620c258c Mon Sep 17 00:00:00 2001
From: Anton Ohorodnyk <aohorodnyk@ebay.com>
Date: Mon, 15 Dec 2014 15:40:38 +0200
Subject: [PATCH 452/474] MAGETWO-31801: Exception on category page if install
 magento without LayeredNavigation module

 - Test for changes
---
 .../Resource/Fulltext/CollectionTest.php      | 146 ++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php

diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
new file mode 100644
index 0000000000000..d1010e60398ae
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\CatalogSearch\Model\Resource\Fulltext;
+
+use Magento\TestFramework\Helper\ObjectManager;
+use PHPUnit_Framework_TestCase;
+
+class CollectionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\CatalogSearch\Model\Resource\Fulltext\Collection
+     */
+    private $model;
+
+    /**
+     * setUp method for CollectionTest
+     */
+    protected function setUp()
+    {
+        $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $storeManager = $this->getStoreManager();
+        $universalFactory = $this->getUniversalFactory();
+        $scopeConfig = $this->getScopeConfig();
+        $requestBuilder = $this->getRequestBuilder();
+
+        $this->model = $helper->getObject(
+            'Magento\CatalogSearch\Model\Resource\Fulltext\Collection',
+            [
+                'storeManager' => $storeManager,
+                'universalFactory' => $universalFactory,
+                'scopeConfig' => $scopeConfig,
+                'requestBuilder' => $requestBuilder
+            ]
+        );
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionCode 333
+     * @expectedExceptionMessage setRequestName
+     */
+    public function testGetFacetedData()
+    {
+        $this->model->getFacetedData('field');
+    }
+
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getStoreManager()
+    {
+        $store = $this->getMockBuilder('Magento\Store\Model\Store')
+            ->setMethods(['getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $store->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+
+        $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
+            ->setMethods(['getStore'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($store);
+
+        return $storeManager;
+    }
+
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getUniversalFactory()
+    {
+        $connection = $this->getMockBuilder('Zend_Db_Adapter_Abstract')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $entity = $this->getMockBuilder('Magento\Eav\Model\Entity\AbstractEntity')
+            ->setMethods(['getReadConnection', 'getTable', 'getDefaultAttributes', 'getEntityTable'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $entity->expects($this->once())
+            ->method('getReadConnection')
+            ->willReturn($connection);
+        $entity->expects($this->exactly(2))
+            ->method('getTable')
+            ->willReturnArgument(0);
+        $entity->expects($this->once())
+            ->method('getDefaultAttributes')
+            ->willReturn(['attr1', 'attr2']);
+        $entity->expects($this->once())
+            ->method('getEntityTable')
+            ->willReturn('table');
+
+        $universalFactory = $this->getMockBuilder('Magento\Framework\Validator\UniversalFactory')
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $universalFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($entity);
+
+        return $universalFactory;
+    }
+
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getScopeConfig()
+    {
+        $scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+            ->setMethods(['getValue'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->willReturn(1);
+
+        return $scopeConfig;
+    }
+
+    /**
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getRequestBuilder()
+    {
+        $requestBuilder = $this->getMockBuilder('Magento\Framework\Search\Request\Builder')
+            ->setMethods(['bind', 'setRequestName'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $requestBuilder->expects($this->once())
+            ->method('bind')
+            ->withConsecutive(['price_dynamic_algorithm', 1]);
+        $requestBuilder->expects($this->once())
+            ->method('setRequestName')
+            ->withConsecutive(['quick_search_container'])
+            ->willThrowException(new \Exception('setRequestName', 333));
+
+        return $requestBuilder;
+    }
+}

From e26278c997a69af0f87a593fc14f40029fde2237 Mon Sep 17 00:00:00 2001
From: Vlad Veselov <vveselov@ebay.com>
Date: Mon, 15 Dec 2014 10:39:15 -0500
Subject: [PATCH 453/474] MAGETWO-31792: Incorrect url rewrite for category
 with two stores after renaming category for one store

---
 .../Model/CategoryUrlPathGenerator.php        |  3 +
 .../Observer/CategoryUrlPathAutogenerator.php |  6 +-
 .../Model/CategoryUrlPathGeneratorTest.php    | 33 ++++-----
 .../CategoryUrlPathAutogeneratorTest.php      | 67 +++++++++++++++++++
 4 files changed, 91 insertions(+), 18 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorTest.php

diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
index ceb3881883af9..3ce52182ba0ba 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
@@ -68,6 +68,9 @@ public function getUrlPath($category)
             return $path;
         }
         $path = $category->getUrlKey();
+        if ($path === false) {
+            return $category->getUrlPath();
+        }
         if ($this->isNeedToGenerateUrlPathForParent($category)) {
             $parentPath = $this->getUrlPath($this->categoryRepository->get($category->getParentId()));
             $path = $parentPath === '' ? $path : $parentPath . '/' . $path;
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogenerator.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogenerator.php
index be8cafd88874d..bff78cbfa8b34 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogenerator.php
@@ -29,7 +29,9 @@ public function invoke(Observer $observer)
     {
         /** @var Category $category */
         $category = $observer->getEvent()->getCategory();
-        $category->setUrlKey($this->categoryUrlPathGenerator->generateUrlKey($category))
-            ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+        if ($category->getUrlKey() !== false) {
+            $category->setUrlKey($this->categoryUrlPathGenerator->generateUrlKey($category))
+                ->setUrlPath($this->categoryUrlPathGenerator->getUrlPath($category));
+        }
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
index 309b812ce89b9..07dddcb05df0e 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
@@ -54,22 +54,6 @@ protected function setUp()
         );
     }
 
-    /**
-     * @return array
-     */
-    public function getUrlPathDataProvider()
-    {
-        $noGenerationLevel = CategoryUrlPathGenerator::MINIMAL_CATEGORY_LEVEL_FOR_PROCESSING - 1;
-        $requireGenerationLevel = CategoryUrlPathGenerator::MINIMAL_CATEGORY_LEVEL_FOR_PROCESSING;
-        return [
-            [Category::TREE_ROOT_ID, 'url-path', $noGenerationLevel, '', false, false, ''],
-            ['parent_id', 'url-path', $noGenerationLevel, '', false, false, 'url-path'],
-            ['parent_id', 'url-path', $noGenerationLevel, 'url-key', true, false, 'url-key'],
-            ['parent_id', 'url-path', $noGenerationLevel, 'url-key', false, true, 'url-key'],
-            [null, 'url-path', $requireGenerationLevel, 'url-key', false, true, 'url-key'],
-        ];
-    }
-
     /**
      * @dataProvider getUrlPathDataProvider
      * @param int $parentId
@@ -99,6 +83,23 @@ public function testGetUrlPath(
         $this->assertEquals($result, $this->categoryUrlPathGenerator->getUrlPath($this->category));
     }
 
+    /**
+     * @return array
+     */
+    public function getUrlPathDataProvider()
+    {
+        $noGenerationLevel = CategoryUrlPathGenerator::MINIMAL_CATEGORY_LEVEL_FOR_PROCESSING - 1;
+        $requireGenerationLevel = CategoryUrlPathGenerator::MINIMAL_CATEGORY_LEVEL_FOR_PROCESSING;
+        return [
+            [Category::TREE_ROOT_ID, 'url-path', $noGenerationLevel, '', false, false, ''],
+            ['parent_id', 'url-path', $noGenerationLevel, '', false, false, 'url-path'],
+            ['parent_id', 'url-path', $noGenerationLevel, 'url-key', true, false, 'url-key'],
+            ['parent_id', 'url-path', $noGenerationLevel, 'url-key', false, true, 'url-key'],
+            [null, 'url-path', $requireGenerationLevel, 'url-key', false, true, 'url-key'],
+            ['parent_id', 'url-path', $noGenerationLevel, false, true, true, 'url-path'],
+        ];
+    }
+
     /**
      * @return array
      */
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorTest.php
new file mode 100644
index 0000000000000..08cd061150df5
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorTest.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\CatalogUrlRewrite\Observer;
+
+use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
+
+class CategoryUrlPathAutogeneratorTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogenerator */
+    protected $unit;
+    /** @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject */
+    protected $observer;
+    /** @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject */
+    protected $category;
+    /** @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator|\PHPUnit_Framework_MockObject_MockObject */
+    protected $categoryUrlPathGenerator;
+
+    protected function setUp()
+    {
+        $this->observer = $this->getMock(
+            'Magento\Framework\Event\Observer',
+            ['getEvent', 'getCategory'],
+            [],
+            '',
+            false
+        );
+        $this->category = $this->getMock(
+            'Magento\Catalog\Model\Category',
+            ['getUrlKey', 'setUrlKey', 'setUrlPath'],
+            [],
+            '',
+            false
+        );
+        $this->observer->expects($this->any())->method('getEvent')->willReturnSelf();
+        $this->observer->expects($this->any())->method('getCategory')->willReturn($this->category);
+        $this->categoryUrlPathGenerator = $this->getMock(
+            'Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator',
+            [],
+            [],
+            '',
+            false
+        );
+
+        $this->unit = (new ObjectManagerHelper($this))->getObject(
+            'Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogenerator',
+            ['categoryUrlPathGenerator' => $this->categoryUrlPathGenerator]
+        );
+    }
+
+    public function testInvokeWithGeneration()
+    {
+        $this->category->expects($this->once())->method('getUrlKey')->willReturn('category');
+        $this->category->expects($this->once())->method('setUrlKey')->willReturnSelf();
+        $this->category->expects($this->once())->method('setUrlPath')->willReturnSelf();
+        $this->unit->invoke($this->observer);
+    }
+
+    public function testInvokeWithoutGeneration()
+    {
+        $this->category->expects($this->once())->method('getUrlKey')->willReturn(false);
+        $this->category->expects($this->never())->method('setUrlKey')->willReturnSelf();
+        $this->category->expects($this->never())->method('setUrlPath')->willReturnSelf();
+        $this->unit->invoke($this->observer);
+    }
+}

From 6221177e33cbcca32e9c93d7ad1ede83aa3a7028 Mon Sep 17 00:00:00 2001
From: Denys Rudchenko <drudchenko@ebay.com>
Date: Mon, 15 Dec 2014 18:07:41 +0200
Subject: [PATCH 454/474] MAGETWO-31814: Broken export product file on
 environment SampleData

---
 app/code/Magento/CatalogImportExport/Model/Export/Product.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index a8b42a77aeab7..1f8ac93fd8125 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -973,7 +973,9 @@ protected function _getExportData()
                         $dataRow[self::COL_SKU] = null;
                         $dataRow[self::COL_ATTR_SET] = null;
                         $dataRow[self::COL_TYPE] = null;
-                        $dataRow[self::COL_VISIBILITY] = $productData[$defaultStoreId][self::COL_VISIBILITY];
+                        if (isset($productData[$defaultStoreId][self::COL_VISIBILITY])) {
+                            $dataRow[self::COL_VISIBILITY] = $productData[$defaultStoreId][self::COL_VISIBILITY];
+                        }
                     } else {
                         $dataRow[self::COL_STORE] = null;
                         if (isset($stockItemRows[$productId])) {

From 3b84d7a9293918cc59522ae0480ec5cb89ecb298 Mon Sep 17 00:00:00 2001
From: Anton Kril <akril@ebay.com>
Date: Mon, 15 Dec 2014 18:07:21 +0200
Subject: [PATCH 455/474] MAGETWO-31790: Success message absence after "Signup
 for price alert"

---
 app/code/Magento/ProductAlert/Block/Product/View.php           | 3 +++
 .../ProductAlert/view/frontend/templates/product/view.phtml    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/ProductAlert/Block/Product/View.php b/app/code/Magento/ProductAlert/Block/Product/View.php
index 140fd950fbdc4..f98640068840f 100644
--- a/app/code/Magento/ProductAlert/Block/Product/View.php
+++ b/app/code/Magento/ProductAlert/Block/Product/View.php
@@ -25,17 +25,20 @@ class View extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\ProductAlert\Helper\Data $helper
      * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Core\Helper\Data $coreHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\ProductAlert\Helper\Data $helper,
         \Magento\Framework\Registry $registry,
+        \Magento\Core\Helper\PostData $coreHelper,
         array $data = []
     ) {
         parent::__construct($context, $data);
         $this->_registry = $registry;
         $this->_helper = $helper;
+        $this->coreHelper = $coreHelper;
     }
 
     /**
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
index 656ea03cc3ebf..4d5e003768c28 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
@@ -5,7 +5,7 @@
 ?>
 <?php /* @var $this \Magento\ProductAlert\Block\Product\View */?>
 <div class="product alert <?php echo $this->getHtmlClass() ?>">
-    <a href="<?php echo $this->escapeHtml($this->getSignupUrl()) ?>"
+    <a href="#" data-post='<?php echo $this->coreHelper->getPostData($this->getSignupUrl()); ?>'
        title="<?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>" class="action alert">
         <?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>
     </a>

From c601eddd547b88ad1f4a5c350a817ed823cee0ef Mon Sep 17 00:00:00 2001
From: Vlad Veselov <vveselov@ebay.com>
Date: Mon, 15 Dec 2014 11:11:01 -0500
Subject: [PATCH 456/474] MAGETWO-31779: [GITHUB] Fix Travis CI builds #786

- fix mistake in .travis.yml which broke everything
- fix integration tests by MySQL 5.6 pre-install
- fix trouble caused integration tests failures on PHP 5.5/5.6
- speed up composer install by not preferring source
- eliminate notice due to empty config value passed to @magentoConfigFixture
- remove unused phpcs installation via PEAR
---
 app/code/Magento/Directory/Helper/Data.php    |  4 ++-
 .../publication/extra_files/ce/.travis.yml    | 34 +++++++++++++------
 .../Annotation/ConfigFixture.php              |  3 +-
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
index c584342db5c8d..17d96968a6e92 100644
--- a/app/code/Magento/Directory/Helper/Data.php
+++ b/app/code/Magento/Directory/Helper/Data.php
@@ -182,7 +182,9 @@ public function getRegionJson()
                     ];
                 }
                 $json = $this->_coreHelper->jsonEncode($regions);
-
+                if ($json === false) {
+                    $json = 'false';
+                }
                 $this->_configCacheType->save($json, $cacheKey);
             }
             $this->_regionJson = $json;
diff --git a/dev/build/publication/extra_files/ce/.travis.yml b/dev/build/publication/extra_files/ce/.travis.yml
index f95db1ab3fbb3..3b0108dd1abc7 100644
--- a/dev/build/publication/extra_files/ce/.travis.yml
+++ b/dev/build/publication/extra_files/ce/.travis.yml
@@ -10,30 +10,42 @@ env:
   - TEST_SUITE=static_annotation
 matrix:
   exclude:
-    - php: 5.5
+    - php: 5.4
       env: TEST_SUITE=static_phpcs
-    - php: 5.5
+    - php: 5.4
       env: TEST_SUITE=static_annotation
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq postfix
 before_script:
-  # mock mail
+  # Mock mail
   - sudo service postfix stop
   - smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 &
   - echo -e '#!/usr/bin/env bash\nexit 0' | sudo tee /usr/sbin/sendmail
-  - echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' | sudo tee "/home/travis/.phpenv/versions/`php -i | grep "PHP Version" | head -n 1 | grep -o -P '\d+\.\d+\.\d+.*'`/etc/conf.d/sendmail.ini"
+  - >
+      echo 'sendmail_path = "/usr/sbin/sendmail -t -i "'
+      | sudo tee "/home/travis/.phpenv/versions/`php -i
+      | grep "PHP Version"
+      | head -n 1
+      | grep -o -P '\d+\.\d+\.\d+.*'`/etc/conf.d/sendmail.ini"
   # Disable xDebug
   - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
-  # Create DB for Integration tests
-  - sh -c "if [ '$TEST_SUITE' = 'integration' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then mysql -e 'create database magento_integration_tests;'; mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php; fi"
-  # Install tools for static tests
-  - sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ] || [ '$TEST_SUITE' = 'static_annotation' ]; then pear install pear/PHP_CodeSniffer-1.5.2; fi"
-  # Change memmory_limit for travis server
+  # Install MySQL 5.6, create DB for integration tests
+  - >
+      sh -c "if [ '$TEST_SUITE' = 'integration' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
+      sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
+      sudo apt-get autoremove;
+      sudo apt-get autoclean;
+      sudo apt-add-repository ppa:ondrej/mysql-5.6 -y;
+      sudo apt-get update;
+      sudo apt-get install mysql-server-5.6 mysql-client-5.6;
+      mysql -uroot -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
+      mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php;
+      fi"
+  # Change memory_limit for travis
   - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - phpenv rehash;
-  - composer install --no-interaction --prefer-source --dev
-  - cd ..
+  - composer install --no-interaction --dev
 script:
   # Unit tests
   - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
index d1cf52c0ad8b6..f5bb55aa9639f 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
@@ -102,7 +102,8 @@ protected function _assignConfigData(\PHPUnit_Framework_TestCase $test)
             if (preg_match('/^.+?(?=_store\s)/', $configPathAndValue, $matches)) {
                 /* Store-scoped config value */
                 $storeCode = $matches[0] != 'current' ? $matches[0] : null;
-                list(, $configPath, $requiredValue) = preg_split('/\s+/', $configPathAndValue, 3);
+                $parts = preg_split('/\s+/', $configPathAndValue, 3);
+                list(, $configPath, $requiredValue) = $parts + ['', '', ''];
                 $originalValue = $this->_getConfigValue($configPath, $storeCode);
                 $this->_storeConfigValues[$storeCode][$configPath] = $originalValue;
                 $this->_setConfigValue($configPath, $requiredValue, $storeCode);

From 05e89064ab15352ca35c9fc139fe0db2aff16bc5 Mon Sep 17 00:00:00 2001
From: Oleksandr Ivashchenko <oivashchenko@ebay.com>
Date: Mon, 15 Dec 2014 15:13:23 +0200
Subject: [PATCH 457/474] MAGETWO-31645: Cache is not invalidated after moving
 categories in tree

 - Add plugin for invalidating cache
---
 .../Indexer/Category/Product/Execute.php      | 48 ++++++++++++
 app/code/Magento/Catalog/etc/adminhtml/di.xml |  4 +
 .../Model/Observer/InvalidateCache.php        |  1 -
 dev/build/core_dev/integration/build.xml      |  2 +-
 .../Indexer/Category/Product/ExecuteTest.php  | 77 +++++++++++++++++++
 5 files changed, 130 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/Execute.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Plugin/Model/Indexer/Category/Product/ExecuteTest.php

diff --git a/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/Execute.php b/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/Execute.php
new file mode 100644
index 0000000000000..b18eb5606580e
--- /dev/null
+++ b/app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/Execute.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Catalog\Plugin\Model\Indexer\Category\Product;
+
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+
+class Execute
+{
+    /**
+     * @var \Magento\PageCache\Model\Config
+     */
+    protected $config;
+
+    /**
+     * @var \Magento\Framework\App\Cache\TypeListInterface
+     */
+    protected $typeList;
+
+    /**
+     * @param \Magento\PageCache\Model\Config $config
+     * @param \Magento\Framework\App\Cache\TypeListInterface $typeList
+     */
+    public function __construct(
+        \Magento\PageCache\Model\Config $config,
+        \Magento\Framework\App\Cache\TypeListInterface $typeList
+    ) {
+        $this->config = $config;
+        $this->typeList = $typeList;
+    }
+
+    /**
+     * @param AbstractAction $subject
+     * @param AbstractAction $result
+     * @return AbstractAction
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(AbstractAction $subject, AbstractAction $result)
+    {
+        if ($this->config->isEnabled()) {
+            $this->typeList->invalidate('full_page');
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index fcc101ebddf36..aba41438ff8de 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -59,4 +59,8 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\Catalog\Model\Indexer\Category\Product\AbstractAction">
+        <plugin name="invalidate_pagecache_after_rows_reindex" type="Magento\Catalog\Plugin\Model\Indexer\Category\Product\Execute" />
+    </type>
 </config>
diff --git a/app/code/Magento/PageCache/Model/Observer/InvalidateCache.php b/app/code/Magento/PageCache/Model/Observer/InvalidateCache.php
index df4b261363fce..3563eb35ec27f 100644
--- a/app/code/Magento/PageCache/Model/Observer/InvalidateCache.php
+++ b/app/code/Magento/PageCache/Model/Observer/InvalidateCache.php
@@ -41,6 +41,5 @@ public function execute()
         if ($this->_config->isEnabled()) {
             $this->_typeList->invalidate('full_page');
         }
-        return $this;
     }
 }
diff --git a/dev/build/core_dev/integration/build.xml b/dev/build/core_dev/integration/build.xml
index 2accd4501c6ae..842d4cbdaed86 100644
--- a/dev/build/core_dev/integration/build.xml
+++ b/dev/build/core_dev/integration/build.xml
@@ -105,7 +105,7 @@
 
     <target name="prepare_for_single_process">
         <exec dir="${product_root_dir}/dev/tests/integration" executable="mysql" failonerror="true">
-            <arg line="-u${env.db_user} -p${env.db_password} -e 'DROP DATABASE IF EXISTS ${env.db_name}_${instance_index}; CREATE DATABASE ${env.db_name}_${instance_index}'"/>
+            <arg line="-u${env.db_user} -p${env.db_password} -h${env.db_host} -e 'DROP DATABASE IF EXISTS ${env.db_name}_${instance_index}; CREATE DATABASE ${env.db_name}_${instance_index}'"/>
         </exec>
 
         <copy file="${basedir}/dev/build/core_dev/integration/install-config-${db_vendor_name}.php"
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Plugin/Model/Indexer/Category/Product/ExecuteTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Plugin/Model/Indexer/Category/Product/ExecuteTest.php
new file mode 100644
index 0000000000000..ed548429e9b65
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Plugin/Model/Indexer/Category/Product/ExecuteTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Catalog\Plugin\Model\Indexer\Category\Product;
+
+class ExecuteTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Catalog\Plugin\Model\Indexer\Category\Product\Execute */
+    protected $execute;
+
+    /** @var \Magento\PageCache\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
+    protected $config;
+
+    /** @var \Magento\Framework\App\Cache\TypeListInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $typeList;
+
+    protected function setUp()
+    {
+        $this->config = $this->getMockBuilder('Magento\PageCache\Model\Config')
+            ->disableOriginalConstructor()
+            ->setMethods(['isEnabled'])
+            ->getMock();
+        $this->typeList = $this->getMockBuilder('Magento\Framework\App\Cache\TypeListInterface')
+            ->disableOriginalConstructor()
+            ->setMethods(['invalidate'])
+            ->getMockForAbstractClass();
+
+        $this->execute = new Execute($this->config, $this->typeList);
+    }
+
+    public function testAfterExecute()
+    {
+        $subject = $this->getMockBuilder('Magento\Catalog\Model\Indexer\Category\Product\AbstractAction')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $result = $this->getMockBuilder('Magento\Catalog\Model\Indexer\Category\Product\AbstractAction')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->config->expects($this->once())
+            ->method('isEnabled')
+            ->willReturn(false);
+        $this->typeList->expects($this->never())
+            ->method('invalidate');
+
+        $this->assertEquals(
+            $result,
+            $this->execute->afterExecute($subject, $result)
+        );
+    }
+
+    public function testAfterExecuteInvalidate()
+    {
+        $subject = $this->getMockBuilder('Magento\Catalog\Model\Indexer\Category\Product\AbstractAction')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $result = $this->getMockBuilder('Magento\Catalog\Model\Indexer\Category\Product\AbstractAction')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->config->expects($this->once())
+            ->method('isEnabled')
+            ->willReturn(true);
+        $this->typeList->expects($this->once())
+            ->method('invalidate')
+            ->with('full_page');
+
+        $this->assertEquals(
+            $result,
+            $this->execute->afterExecute($subject, $result)
+        );
+    }
+}

From 6a77c37b38ff856300de803b60eb201bb2cd7776 Mon Sep 17 00:00:00 2001
From: Anton Kril <akril@ebay.com>
Date: Mon, 15 Dec 2014 18:35:30 +0200
Subject: [PATCH 458/474] MAGETWO-31790: Success message absence after "Signup
 for price alert"

---
 app/code/Magento/ProductAlert/Block/Product/View.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/ProductAlert/Block/Product/View.php b/app/code/Magento/ProductAlert/Block/Product/View.php
index f98640068840f..6196cc53cc331 100644
--- a/app/code/Magento/ProductAlert/Block/Product/View.php
+++ b/app/code/Magento/ProductAlert/Block/Product/View.php
@@ -21,11 +21,16 @@ class View extends \Magento\Framework\View\Element\Template
      */
     protected $_helper;
 
+    /**
+     * @var \Magento\Core\Helper\Data|\Magento\Core\Helper\PostData
+     */
+    protected $coreHelper;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\ProductAlert\Helper\Data $helper
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Core\Helper\Data $coreHelper
+     * @param \Magento\Core\Helper\PostData $coreHelper
      * @param array $data
      */
     public function __construct(

From b88c35ce0a333694d08943cb1be2fd54f1def5cd Mon Sep 17 00:00:00 2001
From: Alex Bomko <abomko@ebay.com>
Date: Mon, 15 Dec 2014 18:39:00 +0200
Subject: [PATCH 459/474] MAGETWO-31823: Remove Sample data script from default
 Magento package

---
 dev/build/publication/edition/internal.txt       | 3 +++
 dev/tools/Magento/Tools/SampleData/composer.json | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev/build/publication/edition/internal.txt b/dev/build/publication/edition/internal.txt
index 2693867a01ac6..9934e0ed1943a 100644
--- a/dev/build/publication/edition/internal.txt
+++ b/dev/build/publication/edition/internal.txt
@@ -1,5 +1,8 @@
 # Files included in testing builds, but nor ready/approved for publication
 
+dev/tools/Magento/Tools/SampleData
+dev/tests/integration/testsuite/Magento/Tools/SampleData
+
 dev/tools/Magento/Tools/Formatter
 dev/tools/PHP-Parser
 
diff --git a/dev/tools/Magento/Tools/SampleData/composer.json b/dev/tools/Magento/Tools/SampleData/composer.json
index c2bb788ea5175..74ba1996aa50c 100644
--- a/dev/tools/Magento/Tools/SampleData/composer.json
+++ b/dev/tools/Magento/Tools/SampleData/composer.json
@@ -1,11 +1,11 @@
 {
-    "name": "magento/sample-data-scripts",
+    "name": "magento/sample-data",
     "description": "Sample Data scripts",
-    "version": "0.1.0-alpha107",
+    "version": "0.1.0-alpha108",
     "require": {
-        "magento/framework": "0.1.0-alpha107",
+        "magento/framework": "0.1.0-alpha108",
         "magento/magento-composer-installer": "*",
-        "magento/sample-data-media": "*"
+        "magento/sample-data-media": "0.1.0-alpha108"
     },
     "type": "magento2-component",
     "extra": {

From 446830ace4d4b4fb71826c3f12777fc3957fc7e5 Mon Sep 17 00:00:00 2001
From: Alex Bomko <abomko@ebay.com>
Date: Mon, 15 Dec 2014 18:51:06 +0200
Subject: [PATCH 460/474] MAGETWO-31823: Remove Sample data script from default
 Magento package

---
 dev/tools/Magento/Tools/Composer/etc/magento_components_list.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tools/Magento/Tools/Composer/etc/magento_components_list.txt b/dev/tools/Magento/Tools/Composer/etc/magento_components_list.txt
index 70d47494a3146..54550638cd577 100644
--- a/dev/tools/Magento/Tools/Composer/etc/magento_components_list.txt
+++ b/dev/tools/Magento/Tools/Composer/etc/magento_components_list.txt
@@ -3,4 +3,3 @@ app/design/adminhtml/Magento/*
 app/design/frontend/Magento/*
 app/i18n/magento/*
 lib/internal/Magento/*
-dev/tools/Magento/Tools/SampleData

From b0e5f6312dc66d83db91bdaabe1c5429ccbca57c Mon Sep 17 00:00:00 2001
From: Vlad Veselov <vveselov@ebay.com>
Date: Mon, 15 Dec 2014 11:54:29 -0500
Subject: [PATCH 461/474] MAGETWO-31572: Refactor and cover by unit tests
 Magento\GoogleShopping\Model\Attribute\SalePriceEffectiveDate::convertAttribute

- fix license header
---
 .../Model/Attribute/SalePriceEffectiveDateTest.php           | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php
index f8eea22a8a453..d7b77c400c1db 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/Attribute/SalePriceEffectiveDateTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 namespace Magento\GoogleShopping\Model\Attribute;
 

From 63e839a7c3ce4423c8a211b8e4d62fddc4fcd16e Mon Sep 17 00:00:00 2001
From: Illia Grybkov <igrybkov@ebay.com>
Date: Mon, 15 Dec 2014 19:08:13 +0200
Subject: [PATCH 462/474] MAGETWO-31801: Exception on category page if install
 magento without LayeredNavigation module

- Add aggregation resolver
---
 .../Model/Aggregation/Resolver.php            | 19 ++++++++++++
 app/code/Magento/LayeredNavigation/etc/di.xml |  9 ++++++
 app/etc/di.xml                                |  1 +
 .../Search/Request/Aggregation/Resolver.php   | 17 +++++++++++
 .../Request/Aggregation/ResolverInterface.php | 14 +++++++++
 .../Framework/Search/Request/Cleaner.php      | 29 +++++++++++++++++++
 6 files changed, 89 insertions(+)
 create mode 100644 app/code/Magento/LayeredNavigation/Model/Aggregation/Resolver.php
 create mode 100644 app/code/Magento/LayeredNavigation/etc/di.xml
 create mode 100644 lib/internal/Magento/Framework/Search/Request/Aggregation/Resolver.php
 create mode 100644 lib/internal/Magento/Framework/Search/Request/Aggregation/ResolverInterface.php

diff --git a/app/code/Magento/LayeredNavigation/Model/Aggregation/Resolver.php b/app/code/Magento/LayeredNavigation/Model/Aggregation/Resolver.php
new file mode 100644
index 0000000000000..262be3fb8c6ba
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Model/Aggregation/Resolver.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\LayeredNavigation\Model\Aggregation;
+
+use Magento\Framework\Search\Request\Aggregation\ResolverInterface;
+
+class Resolver implements ResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function isEnabled()
+    {
+        return true;
+    }
+}
diff --git a/app/code/Magento/LayeredNavigation/etc/di.xml b/app/code/Magento/LayeredNavigation/etc/di.xml
new file mode 100644
index 0000000000000..9e90f7dabb9f9
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/etc/di.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+    <preference for="Magento\Framework\Search\Request\Aggregation\ResolverInterface" type="Magento\LayeredNavigation\Model\Aggregation\Resolver" />
+</config>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 048eea823d789..ea9f09ac6254c 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -8,6 +8,7 @@
     <preference for="Magento\Framework\ObjectManager\FactoryInterface" type="Magento\Framework\ObjectManager\Factory\Dynamic\Developer" />
     <preference for="Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface" type="Magento\Framework\Search\Adapter\Mysql\Filter\Preprocessor" />
     <preference for="Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface" type="Magento\Framework\Search\Adapter\Mysql\Field\Resolver" />
+    <preference for="Magento\Framework\Search\Request\Aggregation\ResolverInterface" type="Magento\Framework\Search\Request\Aggregation\Resolver" />
     <preference for="Magento\Framework\App\RequestInterface" type="Magento\Framework\App\Request\Http" />
     <preference for="Magento\Framework\App\Http\RequestInterface" type="Magento\Framework\App\Request\Http" />
     <preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/Resolver.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/Resolver.php
new file mode 100644
index 0000000000000..6e88e1bfe4ac6
--- /dev/null
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/Resolver.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Framework\Search\Request\Aggregation;
+
+class Resolver implements ResolverInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function isEnabled()
+    {
+        return false;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/ResolverInterface.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/ResolverInterface.php
new file mode 100644
index 0000000000000..d6c3477e837f8
--- /dev/null
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/ResolverInterface.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Framework\Search\Request\Aggregation;
+
+interface ResolverInterface
+{
+    /**
+     * @return bool
+     */
+    public function isEnabled();
+}
diff --git a/lib/internal/Magento/Framework/Search/Request/Cleaner.php b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
index 043e9b0d28c74..f576fb1434dad 100644
--- a/lib/internal/Magento/Framework/Search/Request/Cleaner.php
+++ b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
@@ -5,6 +5,7 @@
 namespace Magento\Framework\Search\Request;
 
 use Magento\Framework\Exception\StateException;
+use Magento\Framework\Search\Request\Aggregation\ResolverInterface as AggregationResolver;
 
 class Cleaner
 {
@@ -23,6 +24,21 @@ class Cleaner
      */
     private $mappedFilters;
 
+    /**
+     * @var AggregationResolver
+     */
+    private $aggregationResolver;
+
+    /**
+     * Cleaner constructor
+     *
+     * @param AggregationResolver $aggregationResolver
+     */
+    public function __construct(AggregationResolver $aggregationResolver)
+    {
+        $this->aggregationResolver = $aggregationResolver;
+    }
+
     /**
      * Clean not binder queries and filters
      *
@@ -34,6 +50,7 @@ public function clean(array $requestData)
         $this->clear();
         $this->requestData = $requestData;
         $this->cleanQuery($requestData['query']);
+        $this->cleanAggregations();
         $requestData = $this->requestData;
         $this->clear();
 
@@ -93,6 +110,18 @@ private function cleanQuery($queryName)
         }
     }
 
+    /**
+     * Clean aggregations if we don't need to process them
+     *
+     * @return void
+     */
+    private function cleanAggregations()
+    {
+        if (!$this->aggregationResolver->isEnabled()) {
+            $this->requestData['aggregations'] = [];
+        }
+    }
+
     /**
      * Clear don't bind filters
      *

From eea89bd1bc71f6aa23966db27b2bba29db386f19 Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Mon, 15 Dec 2014 19:30:05 +0200
Subject: [PATCH 463/474] MTA-1201: Remove incomplete in functional tests for
 fixed bugs

---
 .../functional/config/install_data.yml.dist   |  1 +
 .../test.csv                                  |  4 +-
 .../test.csv                                  |  2 +-
 .../System/Store/FormPageFooterActions.php    | 32 --------------
 .../Test/Page/Adminhtml/DeleteGroup.xml       |  8 ++--
 .../Test/Page/Adminhtml/DeleteWebsite.xml     |  8 ++--
 .../Test/Page/Adminhtml/StoreDelete.xml       |  8 ++--
 ...sertAddedProductAttributeOnProductForm.php |  2 +-
 .../AssertProductAttributeIsUnique.php        | 13 +++++-
 .../Test/Fixture/CatalogProductSimple.php     |  1 +
 .../Test/Fixture/CatalogProductSimple.xml     |  1 +
 .../Handler/CatalogProductSimple/Curl.php     |  3 ++
 ... => AddAttributeToProductTemplateStep.php} |  3 +-
 .../app/Magento/Catalog/Test/etc/scenario.xml |  7 +--
 .../Test/TestCase/OnePageCheckoutTest.php     | 11 +++--
 .../TestCase/AbstractCmsBlockEntityTest.php   |  2 +-
 .../UpdateCmsPageRewriteEntityTest.php        |  2 +-
 .../Core/Test/Repository/ConfigData.php       | 22 ++++++++++
 .../UpdateCustomVariableEntityTest.php        |  2 +-
 .../Block/Adminhtml/Edit/Tab/Addresses.xml    | 30 ++++++-------
 .../CreateOrderFromCustomerPageTest.php       | 12 +++---
 ...ProductFromCustomerActivityToOrderTest.php |  1 +
 .../Test/TestCase/DeleteStoreEntityTest.php   |  2 +-
 .../TestCase/DeleteStoreGroupEntityTest.php   |  2 +-
 .../Test/TestCase/DeleteWebsiteEntityTest.php |  2 +-
 .../Tax/Test/TestCase/TaxCalculationTest.php  | 43 ++++++-------------
 .../Test/TestCase/TaxCalculationTest/test.csv | 22 +++++-----
 27 files changed, 114 insertions(+), 132 deletions(-)
 delete mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/FormPageFooterActions.php
 rename dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/{MoveAttributeToProductTemplateStep.php => AddAttributeToProductTemplateStep.php} (95%)

diff --git a/dev/tests/functional/config/install_data.yml.dist b/dev/tests/functional/config/install_data.yml.dist
index 61248a2f2d0fa..4bffc0a19622d 100644
--- a/dev/tests/functional/config/install_data.yml.dist
+++ b/dev/tests/functional/config/install_data.yml.dist
@@ -1,3 +1,4 @@
+# @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
 db_credentials:
     dbHost: '127.0.0.1'
     dbUser: 'root'
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromCustomerAccountTest/test.csv b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromCustomerAccountTest/test.csv
index 57c7448311cc2..204b7f8a172fc 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromCustomerAccountTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromCustomerAccountTest/test.csv
@@ -1,4 +1,4 @@
-"description";"products";"cartBlock";"orderOptions/sku";"orderOptions/qty";"config";"constraint";
+"description";"products";"cartBlock";"orderOptions/sku";"orderOptions/qty";"config";"constraint"
 "Two Simple products";"catalogProductSimple::default, catalogProductSimple::default";"cart, cart";"-, -";"1, 1";"-";"assertProductsAddBySkuSuccessMessage, assertProductPresentInShoppingCart"
 "Simple product";"catalogProductSimple::default";"cart";"-";"1";"-";"assertProductsAddBySkuSuccessMessage, assertProductPresentInShoppingCart"
 "Simple Out Of Stock";"catalogProductSimple::out_of_stock";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertProductIsOutOfStockFailMessage, assertCartIsEmpty"
@@ -12,7 +12,7 @@
 "Bundle fixed product";"bundleProduct::bundle_fixed_product";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertSpecifyProductOptionsLink, assertCartIsEmpty"
 "Simple product with custom options";"catalogProductSimple::with_one_custom_option";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertSpecifyProductOptionsLink, assertCartIsEmpty"
 "Simple product with custom options by compound sku";"catalogProductSimple::with_one_custom_option";"cart";"simpleWithOptionCompoundSku";"1";"-";"assertProductsAddBySkuSuccessMessage, assertProductPresentInShoppingCart"
-"Simple product with qty increments";"catalogProductSimple::simple_with_qty_increments";"required_attention";"-";"3";"-";"assertProductRequiredAttentionFailMessage, assertQtyIncrementsFailMessage, assertCartIsEmpty";
+"Simple product with qty increments";"catalogProductSimple::simple_with_qty_increments";"required_attention";"-";"3";"-";"assertProductRequiredAttentionFailMessage, assertQtyIncrementsFailMessage, assertCartIsEmpty"
 "Configurable product where all sub-items are disabled";"configurableProductInjectable::with_out_of_stock_item";"required_attention";"-";"1";"-";"assertProductRequiredAttentionFailMessage, assertProductIsOutOfStockFailMessage, assertCartIsEmpty"
 "Simple product with tier price and qty > than available";"catalogProductSimple::simple_with_tier_price_and_qty";"required_attention";"-";"26";"-";"assertProductRequiredAttentionFailMessage, assertProductTierPriceMessage, assertCartIsEmpty"
 "Product with displaying prices considering MAP settings";"catalogProductSimple::with_msrp";"required_attention";"-";"26";"msrp";"assertProductRequiredAttentionFailMessage, assertMsrpNotice, assertCartIsEmpty"
diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/DeleteProductsFromCartOfAdvancedCheckoutEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/DeleteProductsFromCartOfAdvancedCheckoutEntityTest/test.csv
index 14e560294579e..11ffd49202e0c 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/DeleteProductsFromCartOfAdvancedCheckoutEntityTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/DeleteProductsFromCartOfAdvancedCheckoutEntityTest/test.csv
@@ -1,4 +1,4 @@
-"products";"orderOptions/qty";"orderOptions/sku";"constraint";
+"products";"orderOptions/qty";"orderOptions/sku";"constraint"
 "catalogProductSimple::offline, catalogProductSimple::simple_with_cart_limits";"1, 6";"-, -";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart"
 "catalogProductSimple::out_of_stock";"1";"-";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart"
 "configurableProductInjectable::default";"2";"-";"assertRequiringAttentionProductSuccessDeleteMessage, assertProductsAbsentInRequiringAttention, assertProductsAbsentInShoppingCart"
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/FormPageFooterActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/FormPageFooterActions.php
deleted file mode 100644
index 7bebdcc662e96..0000000000000
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Store/FormPageFooterActions.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- */
-
-namespace Magento\Backend\Test\Block\System\Store;
-
-use Magento\Backend\Test\Block\PageActions;
-
-/**
- * Class FormPageFooterActions
- * Form page actions footer block
- */
-class FormPageFooterActions extends PageActions
-{
-    /**
-     * "Delete" button
-     *
-     * @var string
-     */
-    protected $deleteButton = '#delete';
-
-    /**
-     * Click on "Delete" button without acceptAlert
-     *
-     * @return void
-     */
-    public function delete()
-    {
-        $this->_rootElement->find($this->deleteButton)->click();
-    }
-}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteGroup.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteGroup.xml
index dd627c66fea4f..e4523af95b95a 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteGroup.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteGroup.xml
@@ -11,10 +11,10 @@
             <locator>#edit_form</locator>
             <strategy>css selector</strategy>
         </deleteGroupForm>
-        <formPageFooterActions>
-            <class>Magento\Backend\Test\Block\System\Store\FormPageFooterActions</class>
-            <locator>.content-footer</locator>
+        <formPageActions>
+            <class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
+            <locator>.page-main-actions</locator>
             <strategy>css selector</strategy>
-        </formPageFooterActions>
+        </formPageActions>
     </blocks>
 </page>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteWebsite.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteWebsite.xml
index 574c0c90d4927..a8d71273b067d 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteWebsite.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteWebsite.xml
@@ -11,10 +11,10 @@
             <locator>#edit_form</locator>
             <strategy>css selector</strategy>
         </deleteWebsiteForm>
-        <formPageFooterActions>
-            <class>Magento\Backend\Test\Block\System\Store\FormPageFooterActions</class>
-            <locator>.content-footer</locator>
+        <formPageActions>
+            <class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
+            <locator>.page-main-actions</locator>
             <strategy>css selector</strategy>
-        </formPageFooterActions>
+        </formPageActions>
     </blocks>
 </page>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreDelete.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreDelete.xml
index 2cc738d80ea35..a1662ce9a9446 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreDelete.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/StoreDelete.xml
@@ -16,10 +16,10 @@
             <locator>#edit_form</locator>
             <strategy>css selector</strategy>
         </storeForm>
-        <formPageFooterActions>
-            <class>Magento\Backend\Test\Block\System\Store\FormPageFooterActions</class>
-            <locator>.content-footer</locator>
+        <formPageActions>
+            <class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
+            <locator>.page-main-actions</locator>
             <strategy>css selector</strategy>
-        </formPageFooterActions>
+        </formPageActions>
     </blocks>
 </page>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
index 9ed0d06926a23..5b3438cec8d2e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertAddedProductAttributeOnProductForm.php
@@ -83,7 +83,7 @@ protected function createProductWithAttributeSet(
         CatalogAttributeSet $productTemplate
     ) {
         $product = ObjectManager::getInstance()->create(
-            'Magento\Catalog\Test\TestStep\MoveAttributeToProductTemplateStep',
+            'Magento\Catalog\Test\TestStep\AddAttributeToProductTemplateStep',
             ['attribute' => $attribute, 'productTemplate' => $productTemplate]
         )->run();
         ObjectManager::getInstance()->create('Magento\Catalog\Test\TestStep\SaveProductTemplateStep')->run();
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
index ac0543ed84b49..0eb936e80df26 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsUnique.php
@@ -32,6 +32,7 @@ class AssertProductAttributeIsUnique extends AbstractConstraint
      * @param CatalogProductIndex $catalogProductIndex
      * @param CatalogProductEdit $catalogProductEdit
      * @param CatalogProductAttribute $attribute
+     * @param CatalogProductSimple $product,
      * @param FixtureFactory $fixtureFactory
      * @throws \Exception
      * @return void
@@ -40,13 +41,21 @@ public function processAssert(
         CatalogProductIndex $catalogProductIndex,
         CatalogProductEdit $catalogProductEdit,
         CatalogProductAttribute $attribute,
+        CatalogProductSimple $product,
         FixtureFactory $fixtureFactory
     ) {
         $simpleProduct = $fixtureFactory->createByCode(
             'catalogProductSimple',
-            ['dataSet' => 'default', 'data' => ['custom_attribute' => $attribute]]
+            [
+                'dataSet' => 'product_with_category_with_anchor',
+                'data' => [
+                    'attribute_set_id' => [
+                        'attribute_set' => $product->getDataFieldConfig('attribute_set_id')['source']->getAttributeSet()
+                    ],
+                    'custom_attribute' => $attribute,
+                ],
+            ]
         );
-
         $catalogProductIndex->open()->getGridPageActionBlock()->addProduct('simple');
         $productForm = $catalogProductEdit->getProductForm();
         $productForm->fill($simpleProduct);
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
index 90f636b705d9b..51e5b73d7c450 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.php
@@ -493,6 +493,7 @@ public function __construct(
     protected $id = [
         'attribute_code' => 'id',
         'backend_type' => 'virtual',
+        'group' => null,
     ];
 
     protected $type_id = [
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
index e0d54d990c7f5..85a48583b0da8 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductSimple.xml
@@ -385,6 +385,7 @@
         <type_id>
             <attribute_code>type_id</attribute_code>
             <backend_type>virtual</backend_type>
+            <group />
         </type_id>
         <attribute_set_id>
             <attribute_code>attribute_set_id</attribute_code>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
index 5cda35666abff..e2f2dae1e8917 100755
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
@@ -231,6 +231,9 @@ protected function prepareData(FixtureInterface $fixture, $prefix = null)
             $fields += $fields['attributes'];
             unset($fields['attributes']);
         }
+        if (isset($fields['custom_attribute'])) {
+            $fields[$fields['custom_attribute']['code']] = $fields['custom_attribute']['value'];
+        }
 
         $fields = $this->prepareStockData($fields);
         $fields = $prefix ? [$prefix => $fields] : $fields;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/MoveAttributeToProductTemplateStep.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php
similarity index 95%
rename from dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/MoveAttributeToProductTemplateStep.php
rename to dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php
index 1b4ff42e4458d..18702297fcd8e 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/MoveAttributeToProductTemplateStep.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/AddAttributeToProductTemplateStep.php
@@ -15,7 +15,7 @@
 /**
  * Move attribute To attribute set.
  */
-class MoveAttributeToProductTemplateStep implements TestStepInterface
+class AddAttributeToProductTemplateStep implements TestStepInterface
 {
     /**
      * Catalog ProductSet Index page.
@@ -77,6 +77,7 @@ public function run()
         $filterAttribute = ['set_name' => $this->productTemplate->getAttributeSetName()];
         $this->catalogProductSetIndex->open()->getGrid()->searchAndOpen($filterAttribute);
         $this->catalogProductSetEdit->getAttributeSetEditBlock()->moveAttribute($this->attribute->getData());
+        $this->catalogProductSetEdit->getPageActions()->save();
 
         // Create product with attribute set mentioned above:
         $product = $this->fixtureFactory->createByCode(
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/scenario.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/scenario.xml
index 13e575ac29437..8a27acb812334 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/scenario.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/scenario.xml
@@ -51,12 +51,9 @@
                         <next>saveAttribute</next>
                     </step>
                     <step name="saveAttribute" module="Magento_Catalog">
-                        <next>moveAttributeToProductTemplate</next>
+                        <next>addAttributeToProductTemplate</next>
                     </step>
-                    <step name="moveAttributeToProductTemplate" module="Magento_Catalog">
-                        <next>saveProductTemplate</next>
-                    </step>
-                    <step name="saveProductTemplate" module="Magento_Catalog" />
+                    <step name="addAttributeToProductTemplate" module="Magento_Catalog" />
                 </steps>
             </method>
         </methods>
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php
index 3c70d197a28bc..0a5e0983602ab 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.php
@@ -96,17 +96,16 @@ public function test()
      */
     public function tearDown()
     {
-        $setConfigStep = $this->objectManager->create(
-            'Magento\Core\Test\TestStep\SetupConfigurationStep',
-            ['configData' => $this->currentVariation['arguments']['configData'], 'rollback' => true]
-        );
-        $setConfigStep->run();
-        $this->customerAccountLogout->open();
         // Deleting exchange rates
         $this->rewardRateIndexPage->open();
         while ($this->rewardRateIndexPage->getRewardRateGrid()->isFirstRowVisible()) {
             $this->rewardRateIndexPage->getRewardRateGrid()->openFirstRow();
             $this->rewardRateNewPage->getFormPageActions()->delete();
         }
+        $this->customerAccountLogout->open();
+        $this->objectManager->create(
+            'Magento\Core\Test\TestStep\SetupConfigurationStep',
+            ['configData' => $this->currentVariation['arguments']['configData'], 'rollback' => true]
+        )->run();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/AbstractCmsBlockEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/AbstractCmsBlockEntityTest.php
index de72b500270d9..4a9f1876002df 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/AbstractCmsBlockEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/AbstractCmsBlockEntityTest.php
@@ -111,7 +111,7 @@ public function tearDown()
             $this->storeIndex->getStoreGrid()->searchAndOpen($filter);
             $this->storeNew->getFormPageActions()->delete();
             $this->storeDelete->getStoreForm()->fillForm(['create_backup' => 'No']);
-            $this->storeDelete->getFormPageFooterActions()->delete();
+            $this->storeDelete->getFormPageActions()->delete();
         }
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.php b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.php
index 92708a55fc697..aae15f7fbeafe 100644
--- a/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Cms/Test/TestCase/UpdateCmsPageRewriteEntityTest.php
@@ -149,6 +149,6 @@ public function tearDown()
         $this->storeIndex->getStoreGrid()->searchAndOpen($filter);
         $this->storeNew->getFormPageActions()->delete();
         $this->storeDelete->getStoreForm()->fillForm(['create_backup' => 'No']);
-        $this->storeDelete->getFormPageFooterActions()->delete();
+        $this->storeDelete->getFormPageActions()->delete();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/ConfigData.php b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/ConfigData.php
index 4f6e12cf09724..3520957a0d690 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/Repository/ConfigData.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/Repository/ConfigData.php
@@ -1263,6 +1263,28 @@ public function __construct(array $defaultConfig = [], array $defaultData = [])
             ],
         ];
 
+        $this->_data['shipping_tax_class_taxable_goods'] = [
+            'section' => [
+                [
+                    'path' => 'tax/classes/shipping_tax_class',
+                    'scope' => 'tax',
+                    'scope_id' => '1',
+                    'value' => '2'
+                ]
+            ]
+        ];
+
+        $this->_data['shipping_tax_class_taxable_goods_rollback'] = [
+            'section' => [
+                [
+                    'path' => 'tax/classes/shipping_tax_class',
+                    'scope' => 'tax',
+                    'scope_id' => '1',
+                    'value' => '0'
+                ]
+            ]
+        ];
+
         $this->_data['row_cat_incl_ship_excl_after_disc_on_excl'] =
             array_replace_recursive(
                 $taxCalculationConf,
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/TestCase/UpdateCustomVariableEntityTest.php b/dev/tests/functional/tests/app/Magento/Core/Test/TestCase/UpdateCustomVariableEntityTest.php
index ef9ff97885bb2..565463e154879 100644
--- a/dev/tests/functional/tests/app/Magento/Core/Test/TestCase/UpdateCustomVariableEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Core/Test/TestCase/UpdateCustomVariableEntityTest.php
@@ -135,6 +135,6 @@ public static function tearDownAfterClass()
         $storeNew->getFormPageActions()->delete();
         $storeDelete = ObjectManager::getInstance()->create('Magento\Backend\Test\Page\Adminhtml\StoreDelete');
         $storeDelete->getStoreForm()->fillForm(['create_backup' => 'No']);
-        $storeDelete->getFormPageFooterActions()->delete();
+        $storeDelete->getFormPageActions()->delete();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
index beb5cb2346fa7..877cdbedaab9c 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/Tab/Addresses.xml
@@ -7,65 +7,65 @@
 <mapping strict="0">
     <fields>
         <prefix>
-            <selector>.address-item-edit[style=""] [name$="[prefix]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[prefix]"]</selector>
             <strategy>css selector</strategy>
         </prefix>
         <firstname>
-            <selector>.address-item-edit[style=""] [name$="[firstname]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[firstname]"]</selector>
             <strategy>css selector</strategy>
         </firstname>
         <middlename>
-            <selector>.address-item-edit[style=""] [name$="[middlename]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[middlename]"]</selector>
             <strategy>css selector</strategy>
         </middlename>
         <lastname>
-            <selector>.address-item-edit[style=""] [name$="[lastname]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[lastname]"]</selector>
             <strategy>css selector</strategy>
         </lastname>
         <suffix>
-            <selector>.address-item-edit[style=""] [name$="[suffix]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[suffix]"]</selector>
             <strategy>css selector</strategy>
         </suffix>
         <company>
-            <selector>.address-item-edit[style=""] [name$="[company]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[company]"]</selector>
             <strategy>css selector</strategy>
         </company>
         <street>
-            <selector>.address-item-edit[style=""] [name$="[street][0]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[street][0]"]</selector>
             <strategy>css selector</strategy>
         </street>
         <city>
-            <selector>.address-item-edit[style=""] [name$="[city]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[city]"]</selector>
             <strategy>css selector</strategy>
         </city>
         <country_id>
             <input>select</input>
-            <selector>.address-item-edit[style=""] [name$="[country_id]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[country_id]"]</selector>
             <strategy>css selector</strategy>
         </country_id>
         <region_id>
             <input>select</input>
-            <selector>.address-item-edit[style=""] [name$="[region_id]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[region_id]"]</selector>
             <strategy>css selector</strategy>
         </region_id>
         <region>
-            <selector>.address-item-edit[style=""] [name$="[region]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[region]"]</selector>
             <strategy>css selector</strategy>
         </region>
         <postcode>
-            <selector>.address-item-edit[style=""] [name$="[postcode]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[postcode]"]</selector>
             <strategy>css selector</strategy>
         </postcode>
         <telephone>
-            <selector>.address-item-edit[style=""] [name$="[telephone]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[telephone]"]</selector>
             <strategy>css selector</strategy>
         </telephone>
         <fax>
-            <selector>.address-item-edit[style=""] [name$="[fax]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[fax]"]</selector>
             <strategy>css selector</strategy>
         </fax>
         <vat_id>
-            <selector>.address-item-edit[style=""] [name$="[vat_id]"]</selector>
+            <selector>.address-item-edit:not([style="display: none;"]) [name$="[vat_id]"]</selector>
             <strategy>css selector</strategy>
         </vat_id>
         <default_billing>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateOrderFromCustomerPageTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateOrderFromCustomerPageTest.php
index 3f020bb8a3dcf..d8858d535e314 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateOrderFromCustomerPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateOrderFromCustomerPageTest.php
@@ -93,18 +93,16 @@ public function test()
      */
     public function tearDown()
     {
-        $setConfigStep = $this->objectManager->create(
-            'Magento\Core\Test\TestStep\SetupConfigurationStep',
-            ['configData' => $this->currentVariation['arguments']['configData'], 'rollback' => true]
-        );
-        $setConfigStep->run();
-        $this->customerAccountLogout->open();
-
         // Deleting exchange rates
         $this->rewardRateIndexPage->open();
         while ($this->rewardRateIndexPage->getRewardRateGrid()->isFirstRowVisible()) {
             $this->rewardRateIndexPage->getRewardRateGrid()->openFirstRow();
             $this->rewardRateNewPage->getFormPageActions()->delete();
         }
+        $this->customerAccountLogout->open();
+        $this->objectManager->create(
+            'Magento\Core\Test\TestStep\SetupConfigurationStep',
+            ['configData' => $this->currentVariation['arguments']['configData'], 'rollback' => true]
+        )->run();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductFromCustomerActivityToOrderTest.php b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductFromCustomerActivityToOrderTest.php
index 570a34316fbd9..76da23d0d6eb8 100644
--- a/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductFromCustomerActivityToOrderTest.php
+++ b/dev/tests/functional/tests/app/Magento/MultipleWishlist/Test/TestCase/MoveProductFromCustomerActivityToOrderTest.php
@@ -127,6 +127,7 @@ public function test(MultipleWishlist $multipleWishlist, $products, $duplicate,
         $this->customerIndex->open();
         $this->customerIndex->getCustomerGridBlock()->searchAndOpen(['email' => $customer->getEmail()]);
         $this->customerIndexEdit->getPageActionsBlock()->createOrder();
+        $this->orderCreateIndex->getStoreBlock()->selectStoreView();
         $this->orderCreateIndex->getMultipleWishlistBlock()->selectWishlist($multipleWishlist->getName());
         $wishlistItemsBlock = $this->orderCreateIndex->getMultipleWishlistBlock()->getWishlistItemsBlock();
         $wishlistItemsBlock->selectItemToAddToOrder($product, $qtyToMove);
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
index 74ff7199808e2..9d48de56e37bd 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreEntityTest.php
@@ -100,6 +100,6 @@ public function test(Store $store, $createBackup)
         $this->storeIndex->getStoreGrid()->searchAndOpenStore($store);
         $this->editStore->getFormPageActions()->delete();
         $this->storeDelete->getStoreForm()->fillForm(['create_backup' => $createBackup]);
-        $this->storeDelete->getFormPageFooterActions()->delete();
+        $this->storeDelete->getFormPageActions()->delete();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
index 1a5817d2d0ac2..3227833d67e76 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteStoreGroupEntityTest.php
@@ -102,6 +102,6 @@ public function test(StoreGroup $storeGroup, $createBackup)
         $this->storeIndex->getStoreGrid()->searchAndOpenStoreGroup($storeGroup);
         $this->editGroup->getFormPageActions()->delete();
         $this->deleteGroup->getDeleteGroupForm()->fillForm(['create_backup' => $createBackup]);
-        $this->deleteGroup->getFormPageFooterActions()->delete();
+        $this->deleteGroup->getFormPageActions()->delete();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
index 1bdd06c91fc37..66f06e8fbe61e 100644
--- a/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Store/Test/TestCase/DeleteWebsiteEntityTest.php
@@ -102,6 +102,6 @@ public function test(Website $website, $createBackup)
         $this->storeIndex->getStoreGrid()->searchAndOpenWebsite($website);
         $this->editWebsite->getFormPageActions()->delete();
         $this->deleteWebsite->getDeleteWebsiteForm()->fillForm(['create_backup' => $createBackup]);
-        $this->deleteWebsite->getFormPageFooterActions()->delete();
+        $this->deleteWebsite->getFormPageActions()->delete();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
index 77d6796ba507d..bc050bdfc43c0 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
@@ -8,13 +8,11 @@
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Cms\Test\Page\CmsIndex;
-use Magento\Core\Test\Fixture\ConfigData;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\SalesRule\Test\Fixture\SalesRuleInjectable;
 use Magento\Tax\Test\Fixture\TaxRule;
 use Mtf\Fixture\FixtureFactory;
-use Mtf\ObjectManager;
 use Mtf\TestCase\Injectable;
 
 /**
@@ -102,10 +100,10 @@ class TaxCalculationTest extends Injectable
      */
     public static function setUpBeforeClass()
     {
-        self::markTestIncomplete("MAGETWO-31774");
+        self::markTestIncomplete("Epic: MAGETWO-30073");
     }
 
-    /**
+    /**7
      * Prepare data.
      *
      * @param FixtureFactory $fixtureFactory
@@ -172,13 +170,14 @@ protected function clearShoppingCart()
      *
      * @param CatalogProductSimple $product
      * @param TaxRule $taxRule
-     * @param ConfigData $config
+     * @param string $configData
      * @return array
      */
-    public function test(CatalogProductSimple $product, TaxRule $taxRule, ConfigData $config)
+    public function test(CatalogProductSimple $product, TaxRule $taxRule, $configData)
     {
         //Preconditions
-        $config->persist();
+        $this->objectManager->create('Magento\Core\Test\TestStep\SetupConfigurationStep', ['configData' => $configData])
+            ->run();
         $product->persist();
         $taxRule->persist();
         self::$taxRuleCode = $taxRule->getData()['code'];
@@ -195,29 +194,11 @@ public function test(CatalogProductSimple $product, TaxRule $taxRule, ConfigData
      */
     public function tearDown()
     {
-        $taxRuleIndex = ObjectManager::getInstance()->create('\Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex');
-        $taxRuleIndex->open();
-        $taxRuleIndex->getTaxRuleGrid()->searchAndOpen(['code' => self::$taxRuleCode]);
-        $taxRuleNewPage = ObjectManager::getInstance()->create('Magento\Tax\Test\Page\Adminhtml\TaxRuleNew');
-        $taxRuleNewPage->getFormPageActions()->delete();
-    }
-
-    /**
-     * Tear down after tests.
-     *
-     * @return void
-     */
-    public static function tearDownAfterClass()
-    {
-        $promoQuoteIndex = ObjectManager::getInstance()
-            ->create('Magento\SalesRule\Test\Page\Adminhtml\PromoQuoteIndex');
-        $promoQuoteIndex->open();
-        $promoQuoteIndex->getPromoQuoteGrid()->searchAndOpen(['name' => self::$salesRuleName]);
-        $promoQuoteEdit = ObjectManager::getInstance()
-            ->create('Magento\SalesRule\Test\Page\Adminhtml\PromoQuoteEdit');
-        $promoQuoteEdit->getFormPageActions()->delete();
-        $fixtureFactory = ObjectManager::getInstance()->create('Mtf\Fixture\FixtureFactory');
-        $config = $fixtureFactory->createByCode('configData', ['dataSet' => 'default_tax_configuration']);
-        $config->persist();
+        $this->objectManager->create('Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep')->run();
+        $this->objectManager->create('Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep')->run();
+        $this->objectManager->create(
+            'Magento\Core\Test\TestStep\SetupConfigurationStep',
+            ['configData' => 'default_tax_configuration,shipping_tax_class_taxable_goods_rollback']
+        )->run();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest/test.csv b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest/test.csv
index 3c6255166eea2..b34a0dc97d871 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest/test.csv
@@ -1,11 +1,11 @@
-"config/dataSet";"product/dataSet";"taxRule/dataSet";"prices/category_price_excl_tax";"prices/category_price_incl_tax";"prices/product_view_price_excl_tax";"prices/product_view_price_incl_tax";"prices/cart_item_subtotal_excl_tax";"prices/cart_item_subtotal_incl_tax";"prices/cart_item_price_excl_tax";"prices/cart_item_price_incl_tax";"prices/subtotal_excl_tax";"prices/subtotal_incl_tax";"prices/discount";"prices/shipping_excl_tax";"prices/shipping_incl_tax";"prices/tax";"prices/grand_total_excl_tax";"prices/grand_total_incl_tax";"constraint"
-"row_cat_incl_ship_excl_after_disc_on_excl";"simple_with_tier_price_and_category";"customer_equals_store_rate";"277.14";"300.00";"277.14";"300.00";"41.57";"45.00";"13.86";"15.00";"41.57";"45.00";"20.79";"15.00";"16.24";"3.09";"37.36";"40.45";"assertTaxRuleIsAppliedToAllPrices"
-"row_cat_excl_ship_incl_before_disc_on_incl";"simple_with_group_price_and_category";"customer_greater_store_rate";"90.99";"98.61";"90.99";"98.61";"272.97";"295.83";"90.99";"98.61";"272.97";"295.83";"147.92";"13.86";"15.02";"24.02";"138.91";"162.93";"assertTaxRuleIsAppliedToAllPrices"
-"total_cat_excl_ship_incl_after_disc_on_excl";"simple_with_group_price_and_category";"customer_less_store_rate";"90.99";"98.50";"90.99";"98.50";"272.97";"295.49";"90.99";"98.50";"272.97";"295.49";"136.49";"13.84";"14.98";"12.40";"150.32";"162.72";"assertTaxRuleIsAppliedToAllPrices"
-"row_cat_incl_ship_excl_before_disc_on_incl";"product_with_special_price_and_category";"customer_less_store_rate";"83.05";"89.90";"83.05";"89.90";"249.15";"269.70";"83.05";"89.90";"249.15";"269.70";"134.85";"15.00";"16.24";"21.79";"129.30";"151.09";"assertTaxRuleIsAppliedToAllPrices"
-"unit_cat_incl_ship_incl_before_disc_on_incl";"simple_with_tier_price_and_category";"customer_less_store_rate";"276.81";"299.65";"276.81";"299.65";"41.52";"44.94";"13.84";"14.98";"41.52";"44.94";"22.47";"13.84";"14.98";"4.56";"32.89";"37.45";"assertTaxRuleIsAppliedToAllPrices"
-"total_cat_excl_ship_incl_before_disc_on_incl";"product_with_special_price_and_category";"customer_equals_store_rate";"90.00";"97.43";"90.00";"97.43";"270.00";"292.28";"90.00";"97.43";"270.00";"292.28";"146.15";"13.86";"15.00";"23.42";"137.71";"161.13";"assertTaxRuleIsAppliedToAllPrices"
-"unit_cat_excl_ship_excl_after_disc_on_excl";"simple_with_group_price_and_category";"customer_equals_store_rate";"90.99";"98.50";"90.99";"98.50";"272.97";"295.50";"90.99";"98.50";"272.97";"295.50";"136.49";"15.00";"16.24";"12.49";"151.48";"163.97";"assertTaxRuleIsAppliedToAllPrices"
-"total_cat_incl_ship_excl_before_disc_on_excl";"simple_with_group_price_and_category";"customer_greater_store_rate";"84.06";"91.10";"84.06";"91.10";"252.18";"273.30";"84.06";"91.10";"252.18";"273.30";"126.09";"15.00";"16.26";"22.38";"141.09";"163.47";"assertTaxRuleIsAppliedToAllPrices"
-"total_cat_excl_ship_incl_after_disc_on_incl";"simple_with_tier_price_and_category";"customer_greater_store_rate";"300.00";"325.13";"300.00";"325.13";"45.00";"48.77";"15.00";"16.26";"45.00";"48.77";"24.39";"13.86";"15.02";"2.89";"34.47";"37.36";"assertTaxRuleIsAppliedToAllPrices"
-"unit_cat_excl_ship_incl_after_disc_on_excl";"product_with_special_price_and_category";"customer_greater_store_rate";"90.00";"97.54";"90.00";"97.54";"270.00";"292.62";"90.00";"97.54";"270.00";"292.62";"135.00";"13.86";"15.02";"12.47";"148.86";"161.33";"assertTaxRuleIsAppliedToAllPrices"
+"configData";"product/dataSet";"taxRule/dataSet";"prices/category_price_excl_tax";"prices/category_price_incl_tax";"prices/product_view_price_excl_tax";"prices/product_view_price_incl_tax";"prices/cart_item_subtotal_excl_tax";"prices/cart_item_subtotal_incl_tax";"prices/cart_item_price_excl_tax";"prices/cart_item_price_incl_tax";"prices/subtotal_excl_tax";"prices/subtotal_incl_tax";"prices/discount";"prices/shipping_excl_tax";"prices/shipping_incl_tax";"prices/tax";"prices/grand_total_excl_tax";"prices/grand_total_incl_tax";"constraint"
+"shipping_tax_class_taxable_goods,row_cat_incl_ship_excl_after_disc_on_excl";"simple_with_tier_price_and_category";"customer_equals_store_rate";"277.14";"300.00";"277.14";"300.00";"41.57";"45.00";"13.86";"15.00";"41.57";"45.00";"20.79";"15.00";"16.24";"3.09";"37.36";"40.45";"assertTaxRuleIsAppliedToAllPrices"
+"shipping_tax_class_taxable_goods,row_cat_excl_ship_incl_before_disc_on_incl";"simple_with_group_price_and_category";"customer_greater_store_rate";"90.99";"98.61";"90.99";"98.61";"272.97";"295.83";"90.99";"98.61";"272.97";"295.83";"147.92";"13.86";"15.02";"24.02";"138.91";"162.93";"assertTaxRuleIsAppliedToAllPrices"
+"shipping_tax_class_taxable_goods,total_cat_excl_ship_incl_after_disc_on_excl";"simple_with_group_price_and_category";"customer_less_store_rate";"90.99";"98.50";"90.99";"98.50";"272.97";"295.49";"90.99";"98.50";"272.97";"295.49";"136.49";"13.84";"14.98";"12.40";"150.32";"162.72";"assertTaxRuleIsAppliedToAllPrices"
+"shipping_tax_class_taxable_goods,row_cat_incl_ship_excl_before_disc_on_incl";"product_with_special_price_and_category";"customer_less_store_rate";"83.05";"89.90";"83.05";"89.90";"249.15";"269.70";"83.05";"89.90";"249.15";"269.70";"134.85";"15.00";"16.24";"21.79";"129.30";"151.09";"assertTaxRuleIsAppliedToAllPrices"
+"shipping_tax_class_taxable_goods,unit_cat_incl_ship_incl_before_disc_on_incl";"simple_with_tier_price_and_category";"customer_less_store_rate";"276.81";"299.65";"276.81";"299.65";"41.52";"44.94";"13.84";"14.98";"41.52";"44.94";"22.47";"13.84";"14.98";"4.56";"32.89";"37.45";"assertTaxRuleIsAppliedToAllPrices"
+"shipping_tax_class_taxable_goods,total_cat_excl_ship_incl_before_disc_on_incl";"product_with_special_price_and_category";"customer_equals_store_rate";"90.00";"97.43";"90.00";"97.43";"270.00";"292.28";"90.00";"97.43";"270.00";"292.28";"146.15";"13.86";"15.00";"23.42";"137.71";"161.13";"assertTaxRuleIsAppliedToAllPrices"
+"shipping_tax_class_taxable_goods,unit_cat_excl_ship_excl_after_disc_on_excl";"simple_with_group_price_and_category";"customer_equals_store_rate";"90.99";"98.50";"90.99";"98.50";"272.97";"295.50";"90.99";"98.50";"272.97";"295.50";"136.49";"15.00";"16.24";"12.49";"151.48";"163.97";"assertTaxRuleIsAppliedToAllPrices"
+"shipping_tax_class_taxable_goods,total_cat_incl_ship_excl_before_disc_on_excl";"simple_with_group_price_and_category";"customer_greater_store_rate";"84.06";"91.10";"84.06";"91.10";"252.18";"273.30";"84.06";"91.10";"252.18";"273.30";"126.09";"15.00";"16.26";"22.38";"141.09";"163.47";"assertTaxRuleIsAppliedToAllPrices"
+"shipping_tax_class_taxable_goods,total_cat_excl_ship_incl_after_disc_on_incl";"simple_with_tier_price_and_category";"customer_greater_store_rate";"300.00";"325.13";"300.00";"325.13";"45.00";"48.77";"15.00";"16.26";"45.00";"48.77";"24.39";"13.86";"15.02";"2.89";"34.47";"37.36";"assertTaxRuleIsAppliedToAllPrices"
+"shipping_tax_class_taxable_goods,unit_cat_excl_ship_incl_after_disc_on_excl";"product_with_special_price_and_category";"customer_greater_store_rate";"90.00";"97.54";"90.00";"97.54";"270.00";"292.62";"90.00";"97.54";"270.00";"292.62";"135.00";"13.86";"15.02";"12.47";"148.86";"161.33";"assertTaxRuleIsAppliedToAllPrices"

From 85e7aaeded7a796d927e7790bbbc2c7f3973eda9 Mon Sep 17 00:00:00 2001
From: Illia Grybkov <igrybkov@ebay.com>
Date: Mon, 15 Dec 2014 19:50:48 +0200
Subject: [PATCH 464/474] MAGETWO-31801: Exception on category page if install
 magento without LayeredNavigation module

- Add tests
- Rename ResolverInterface to StatusInterface (and it's inheritors)
---
 .../Aggregation/{Resolver.php => Status.php}  |  4 +-
 app/code/Magento/LayeredNavigation/etc/di.xml |  2 +-
 app/etc/di.xml                                |  2 +-
 .../Framework/Search/Request/CleanerTest.php  | 98 ++++++++++++++++++-
 .../Aggregation/{Resolver.php => Status.php}  |  2 +-
 ...olverInterface.php => StatusInterface.php} |  2 +-
 .../Framework/Search/Request/Cleaner.php      | 14 +--
 7 files changed, 110 insertions(+), 14 deletions(-)
 rename app/code/Magento/LayeredNavigation/Model/Aggregation/{Resolver.php => Status.php} (70%)
 rename lib/internal/Magento/Framework/Search/Request/Aggregation/{Resolver.php => Status.php} (85%)
 rename lib/internal/Magento/Framework/Search/Request/Aggregation/{ResolverInterface.php => StatusInterface.php} (89%)

diff --git a/app/code/Magento/LayeredNavigation/Model/Aggregation/Resolver.php b/app/code/Magento/LayeredNavigation/Model/Aggregation/Status.php
similarity index 70%
rename from app/code/Magento/LayeredNavigation/Model/Aggregation/Resolver.php
rename to app/code/Magento/LayeredNavigation/Model/Aggregation/Status.php
index 262be3fb8c6ba..ae847b418da39 100644
--- a/app/code/Magento/LayeredNavigation/Model/Aggregation/Resolver.php
+++ b/app/code/Magento/LayeredNavigation/Model/Aggregation/Status.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\LayeredNavigation\Model\Aggregation;
 
-use Magento\Framework\Search\Request\Aggregation\ResolverInterface;
+use Magento\Framework\Search\Request\Aggregation\StatusInterface;
 
-class Resolver implements ResolverInterface
+class Status implements StatusInterface
 {
     /**
      * {@inheritdoc}
diff --git a/app/code/Magento/LayeredNavigation/etc/di.xml b/app/code/Magento/LayeredNavigation/etc/di.xml
index 9e90f7dabb9f9..3da6fc907246e 100644
--- a/app/code/Magento/LayeredNavigation/etc/di.xml
+++ b/app/code/Magento/LayeredNavigation/etc/di.xml
@@ -5,5 +5,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <preference for="Magento\Framework\Search\Request\Aggregation\ResolverInterface" type="Magento\LayeredNavigation\Model\Aggregation\Resolver" />
+    <preference for="Magento\Framework\Search\Request\Aggregation\StatusInterface" type="Magento\LayeredNavigation\Model\Aggregation\Status" />
 </config>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index ea9f09ac6254c..11bb9ee59bbfd 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -8,7 +8,7 @@
     <preference for="Magento\Framework\ObjectManager\FactoryInterface" type="Magento\Framework\ObjectManager\Factory\Dynamic\Developer" />
     <preference for="Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface" type="Magento\Framework\Search\Adapter\Mysql\Filter\Preprocessor" />
     <preference for="Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface" type="Magento\Framework\Search\Adapter\Mysql\Field\Resolver" />
-    <preference for="Magento\Framework\Search\Request\Aggregation\ResolverInterface" type="Magento\Framework\Search\Request\Aggregation\Resolver" />
+    <preference for="Magento\Framework\Search\Request\Aggregation\StatusInterface" type="Magento\Framework\Search\Request\Aggregation\Status" />
     <preference for="Magento\Framework\App\RequestInterface" type="Magento\Framework\App\Request\Http" />
     <preference for="Magento\Framework\App\Http\RequestInterface" type="Magento\Framework\App\Request\Http" />
     <preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Request/CleanerTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Request/CleanerTest.php
index d481832c30189..cd3280965f2ac 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Search/Request/CleanerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Request/CleanerTest.php
@@ -8,6 +8,9 @@
 
 class CleanerTest extends \PHPUnit_Framework_TestCase
 {
+    /** @var  \Magento\Framework\Search\Request\Aggregation\StatusInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $status;
+
     /**
      * @var \Magento\Framework\Search\Request\Cleaner
      */
@@ -17,11 +20,103 @@ protected function setUp()
     {
         $helper = new ObjectManager($this);
 
-        $this->cleaner = $helper->getObject('Magento\Framework\Search\Request\Cleaner');
+        $this->status = $this->getMockBuilder('\Magento\Framework\Search\Request\Aggregation\StatusInterface')
+            ->disableOriginalConstructor()
+            ->setMethods(['isEnabled'])
+            ->getMockForAbstractClass();
+
+        $this->cleaner = $helper->getObject(
+            'Magento\Framework\Search\Request\Cleaner',
+            ['aggregationStatus' => $this->status]
+        );
     }
 
     public function testClean()
     {
+        $this->status->expects($this->once())
+            ->method('isEnabled')
+            ->will($this->returnValue(true));
+        $requestData = [
+            'query' => 'bool_query',
+            'queries' => [
+                'bool_query' => [
+                    'queryReference' => [
+                        ['ref' => 'bool_query_rm'],
+                        ['ref' => 'match_query'],
+                        ['ref' => 'filtered_query_to_filter2'],
+                    ],
+                    'type' => 'boolQuery',
+                ],
+                'match_query' => ['value' => 'ok', 'type' => 'matchQuery'],
+                'bool_query_rm' => [
+                    'queryReference' => [
+                        ['ref' => 'match_query_rm'],
+                        ['ref' => 'filtered_query_to_query'],
+                        ['ref' => 'filtered_query_to_filter'],
+                    ],
+                    'type' => 'boolQuery',
+                ],
+                'match_query_rm' => ['value' => '$some$', 'type' => 'matchQuery'],
+                'match_query_rm2' => ['value' => '$some2$', 'type' => 'matchQuery'],
+                'filtered_query_to_query' => [
+                    'queryReference' => [['ref' => 'match_query_rm2']],
+                    'type' => 'filteredQuery',
+                ],
+                'filtered_query_to_filter' => [
+                    'filterReference' => [['ref' => 'bool_filter']],
+                    'type' => 'filteredQuery',
+                ],
+                'filtered_query_to_filter2' => [
+                    'filterReference' => [['ref' => 'bool_filter2']],
+                    'type' => 'filteredQuery',
+                ],
+            ],
+            'filters' => [
+                'bool_filter' => [
+                    'filterReference' => [['ref' => 'term_filter'], ['ref' => 'range_filter']],
+                    'type' => 'boolFilter',
+                ],
+                'term_filter' => ['value' => '$val$', 'type' => 'termFilter'],
+                'range_filter' => ['from' => '$from$', 'to' => '$to$', 'type' => 'rangeFilter'],
+                'bool_filter2' => [
+                    'filterReference' => [['ref' => 'term_filter2']],
+                    'type' => 'boolFilter',
+                ],
+                'term_filter2' => ['value' => 'value_good', 'type' => 'termFilter'],
+            ],
+        ];
+        $exceptedRequestData = [
+            'query' => 'bool_query',
+            'queries' => [
+                'bool_query' => [
+                    'queryReference' => [['ref' => 'match_query'], ['ref' => 'filtered_query_to_filter2']],
+                    'type' => 'boolQuery',
+                ],
+                'match_query' => ['value' => 'ok', 'type' => 'matchQuery'],
+                'filtered_query_to_filter2' => [
+                    'filterReference' => [['ref' => 'bool_filter2']],
+                    'type' => 'filteredQuery',
+                ],
+            ],
+            'filters' => [
+                'bool_filter2' => [
+                    'filterReference' => [['ref' => 'term_filter2']],
+                    'type' => 'boolFilter',
+                ],
+                'term_filter2' => ['value' => 'value_good', 'type' => 'termFilter'],
+            ],
+        ];
+
+        $result = $this->cleaner->clean($requestData);
+
+        $this->assertEquals($exceptedRequestData, $result);
+    }
+
+    public function testCleanWithoutAggregations()
+    {
+        $this->status->expects($this->once())
+            ->method('isEnabled')
+            ->will($this->returnValue(false));
         $requestData = [
             'query' => 'bool_query',
             'queries' => [
@@ -91,6 +186,7 @@ public function testClean()
                 ],
                 'term_filter2' => ['value' => 'value_good', 'type' => 'termFilter'],
             ],
+            'aggregations' => [],
         ];
 
         $result = $this->cleaner->clean($requestData);
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/Resolver.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/Status.php
similarity index 85%
rename from lib/internal/Magento/Framework/Search/Request/Aggregation/Resolver.php
rename to lib/internal/Magento/Framework/Search/Request/Aggregation/Status.php
index 6e88e1bfe4ac6..99f587a220936 100644
--- a/lib/internal/Magento/Framework/Search/Request/Aggregation/Resolver.php
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/Status.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Search\Request\Aggregation;
 
-class Resolver implements ResolverInterface
+class Status implements StatusInterface
 {
     /**
      * {@inheritdoc}
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/ResolverInterface.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/StatusInterface.php
similarity index 89%
rename from lib/internal/Magento/Framework/Search/Request/Aggregation/ResolverInterface.php
rename to lib/internal/Magento/Framework/Search/Request/Aggregation/StatusInterface.php
index d6c3477e837f8..d413bc61e7d41 100644
--- a/lib/internal/Magento/Framework/Search/Request/Aggregation/ResolverInterface.php
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/StatusInterface.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Search\Request\Aggregation;
 
-interface ResolverInterface
+interface StatusInterface
 {
     /**
      * @return bool
diff --git a/lib/internal/Magento/Framework/Search/Request/Cleaner.php b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
index f576fb1434dad..c9751c42e5798 100644
--- a/lib/internal/Magento/Framework/Search/Request/Cleaner.php
+++ b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
@@ -5,7 +5,7 @@
 namespace Magento\Framework\Search\Request;
 
 use Magento\Framework\Exception\StateException;
-use Magento\Framework\Search\Request\Aggregation\ResolverInterface as AggregationResolver;
+use Magento\Framework\Search\Request\Aggregation\StatusInterface as AggregationStatus;
 
 class Cleaner
 {
@@ -25,18 +25,18 @@ class Cleaner
     private $mappedFilters;
 
     /**
-     * @var AggregationResolver
+     * @var AggregationStatus
      */
-    private $aggregationResolver;
+    private $aggregationStatus;
 
     /**
      * Cleaner constructor
      *
-     * @param AggregationResolver $aggregationResolver
+     * @param AggregationStatus $aggregationStatus
      */
-    public function __construct(AggregationResolver $aggregationResolver)
+    public function __construct(AggregationStatus $aggregationStatus)
     {
-        $this->aggregationResolver = $aggregationResolver;
+        $this->aggregationStatus = $aggregationStatus;
     }
 
     /**
@@ -117,7 +117,7 @@ private function cleanQuery($queryName)
      */
     private function cleanAggregations()
     {
-        if (!$this->aggregationResolver->isEnabled()) {
+        if (!$this->aggregationStatus->isEnabled()) {
             $this->requestData['aggregations'] = [];
         }
     }

From cf698373505e6d9ff0795bf06e70047fe1d548dc Mon Sep 17 00:00:00 2001
From: Illia Grybkov <igrybkov@ebay.com>
Date: Mon, 15 Dec 2014 20:06:21 +0200
Subject: [PATCH 465/474] MAGETWO-31801: Exception on category page if install
 magento without LayeredNavigation module

- Add tests
---
 .../Search/Request/Aggregation/StatusTest.php | 32 +++++++++++++++++++
 .../Model/Aggregation/StatusTest.php          | 32 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 dev/tests/unit/testsuite/Magento/Framework/Search/Request/Aggregation/StatusTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/LayeredNavigation/Model/Aggregation/StatusTest.php

diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Request/Aggregation/StatusTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Request/Aggregation/StatusTest.php
new file mode 100644
index 0000000000000..70443bf44c87f
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Request/Aggregation/StatusTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\Framework\Search\Request\Aggregation;
+
+use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
+
+class StatusTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Framework\Search\Request\Aggregation\Status */
+    private $status;
+
+    /** @var ObjectManagerHelper */
+    private $objectManagerHelper;
+
+    protected function setUp()
+    {
+        
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->status = $this->objectManagerHelper->getObject('Magento\Framework\Search\Request\Aggregation\Status');
+    }
+
+    public function testIsEnabled()
+    {
+        $this->assertFalse($this->status->isEnabled());
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/LayeredNavigation/Model/Aggregation/StatusTest.php b/dev/tests/unit/testsuite/Magento/LayeredNavigation/Model/Aggregation/StatusTest.php
new file mode 100644
index 0000000000000..03c48b7a17ff6
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/LayeredNavigation/Model/Aggregation/StatusTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * {license_notice}
+ *
+ * @copyright   {copyright}
+ * @license     {license_link}
+ */
+
+namespace Magento\LayeredNavigation\Model\Aggregation;
+
+use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
+
+class StatusTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\LayeredNavigation\Model\Aggregation\Status */
+    private $resolver;
+
+    /** @var ObjectManagerHelper */
+    private $objectManagerHelper;
+
+    protected function setUp()
+    {
+        
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->resolver = $this->objectManagerHelper->getObject('Magento\LayeredNavigation\Model\Aggregation\Status');
+    }
+
+    public function testIsEnabled()
+    {
+        $this->assertTrue($this->resolver->isEnabled());
+    }
+}

From b54d982ff26739eec9689f546a9537b138b1d736 Mon Sep 17 00:00:00 2001
From: Vlad Veselov <vveselov@ebay.com>
Date: Mon, 15 Dec 2014 13:09:19 -0500
Subject: [PATCH 466/474] MAGETWO-31744: Last 5 Orders show 0 items qty for
 orders after created invoice

- corrected namespace of test
---
 .../testsuite/Magento/Sales/Model/Order/InvoiceTest.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/InvoiceTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/InvoiceTest.php
index 35924012c0d5b..9638ee4a86691 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/InvoiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/InvoiceTest.php
@@ -2,7 +2,7 @@
 /**
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-namespace Magento\Sales\Model\Order\Invoice;
+namespace Magento\Sales\Model\Order;
 
 class InvoiceTest extends \PHPUnit_Framework_TestCase
 {

From 6cab752612ecd7285030f9bb97c0ed59eeb06be5 Mon Sep 17 00:00:00 2001
From: Illia Grybkov <igrybkov@ebay.com>
Date: Mon, 15 Dec 2014 20:14:47 +0200
Subject: [PATCH 467/474] MAGETWO-31801: Exception on category page if install
 magento without LayeredNavigation module

- Update tests
---
 .../Framework/Search/Request/Aggregation/StatusTest.php      | 5 +----
 .../LayeredNavigation/Model/Aggregation/StatusTest.php       | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/Search/Request/Aggregation/StatusTest.php b/dev/tests/unit/testsuite/Magento/Framework/Search/Request/Aggregation/StatusTest.php
index 70443bf44c87f..8090b4a80c007 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Search/Request/Aggregation/StatusTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Search/Request/Aggregation/StatusTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\Framework\Search\Request\Aggregation;
diff --git a/dev/tests/unit/testsuite/Magento/LayeredNavigation/Model/Aggregation/StatusTest.php b/dev/tests/unit/testsuite/Magento/LayeredNavigation/Model/Aggregation/StatusTest.php
index 03c48b7a17ff6..d1863feb20d8f 100644
--- a/dev/tests/unit/testsuite/Magento/LayeredNavigation/Model/Aggregation/StatusTest.php
+++ b/dev/tests/unit/testsuite/Magento/LayeredNavigation/Model/Aggregation/StatusTest.php
@@ -1,9 +1,6 @@
 <?php
 /**
- * {license_notice}
- *
- * @copyright   {copyright}
- * @license     {license_link}
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
 
 namespace Magento\LayeredNavigation\Model\Aggregation;

From a2709936413b4f4b0c714b429b359e820ed6e13b Mon Sep 17 00:00:00 2001
From: Anton Kril <akril@ebay.com>
Date: Mon, 15 Dec 2014 20:55:51 +0200
Subject: [PATCH 468/474] MAGETWO-31845: Impossible to create Return from
 Backend

---
 .../Rma/view/adminhtml/layout/adminhtml_rma_chooseorder.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Rma/view/adminhtml/layout/adminhtml_rma_chooseorder.xml b/app/code/Magento/Rma/view/adminhtml/layout/adminhtml_rma_chooseorder.xml
index b0a30e42f4896..052fbaa998755 100644
--- a/app/code/Magento/Rma/view/adminhtml/layout/adminhtml_rma_chooseorder.xml
+++ b/app/code/Magento/Rma/view/adminhtml/layout/adminhtml_rma_chooseorder.xml
@@ -6,14 +6,14 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceBlock name="backend.page">
-            <block class="Magento\Rma\Block\Adminhtml\Rma\Create" name="content">
+        <referenceContainer name="content">
+            <block class="Magento\Rma\Block\Adminhtml\Rma\Create" name="rma_create">
                 <block class="Magento\Rma\Block\Adminhtml\Rma\Create\Form" template="create/form.phtml" name="form">
                     <block class="Magento\Rma\Block\Adminhtml\Rma\Create\Order" template="create/order.phtml" name="rma_create_order">
                         <block class="Magento\Rma\Block\Adminhtml\Rma\Create\Order\Grid" name="grid"/>
                     </block>
                 </block>
             </block>
-        </referenceBlock>
+        </referenceContainer>
     </body>
 </page>

From 1ba16ff9d659ee0d1d28cb7a488f525a175f409b Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Tue, 16 Dec 2014 11:19:48 +0200
Subject: [PATCH 469/474] MTA-1201: Remove incomplete in functional tests for
 fixed bugs - CR changes

---
 dev/tests/functional/composer.json            |  2 +-
 dev/tests/functional/composer.json.dist       | 10 ++++----
 .../Product/AbstractCompareProductsTest.php   |  2 ++
 .../ProductTypeSwitchingOnUpdateTest/test.csv | 24 +++++++++----------
 .../TestCase/UpdateCustomerFrontendEntity.php |  2 ++
 .../Magento/Install/Test/Fixture/Install.php  |  2 ++
 .../TestCase/SalesTaxReportEntityTest.php     |  2 +-
 .../Block/Adminhtml/Order/AbstractForm.php    |  2 +-
 ...actMoveComparedProductsOnOrderPageTest.php |  2 ++
 ...oveShoppingCartProductsOnOrderPageTest.php |  2 ++
 .../Tax/Test/TestCase/TaxCalculationTest.php  |  2 +-
 11 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 0dad71cbf422e..1d80cfb8c4561 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "magento/mtf": "1.0.0-rc9",
+        "magento/mtf": "1.0.0-rc10",
         "php": ">=5.4.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
diff --git a/dev/tests/functional/composer.json.dist b/dev/tests/functional/composer.json.dist
index 00488d8d09689..2ea37c5b4a7aa 100644
--- a/dev/tests/functional/composer.json.dist
+++ b/dev/tests/functional/composer.json.dist
@@ -1,16 +1,16 @@
 {
     "require": {
-        "magento/mtf": "dev-master",
+        "magento/mtf": "dev-develop",
         "php": ">=5.4.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",
         "netwing/selenium-server-standalone": ">=2.35"
     },
     "autoload": {
-        "psr-0": {
-            "Mtf\\": "lib",
-            "Magento\\": "",
-            "": ["testsuites", "generated", "lib", "tests/app"]
+        "psr-4": {
+            "Mtf\\": ["lib/Mtf/", "generated/Mtf/", "testsuites/Mtf/"],
+            "Magento\\": ["generated/Magento/", "tests/app/Magento/"],
+            "Test\\": "generated/Test/"
         }
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
index 73a296b9ef9dc..96916f5d25fa4 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php
@@ -18,6 +18,8 @@
 
 /**
  * Abstract class for compare products class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractCompareProductsTest extends Injectable
 {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest/test.csv b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest/test.csv
index 3ec77ae260b27..afbcec37babe9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest/test.csv
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest/test.csv
@@ -1,12 +1,12 @@
-"productOrigin";"product";"actionName";"constraint";"issue"
-"catalogProductSimple::default";"configurableProductInjectable::default";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately";""
-"catalogProductSimple::default";"catalogProductVirtual::default";"-";"assertProductSaveMessage, assertProductInGrid";""
-"configurableProductInjectable::default";"catalogProductSimple::default";"deleteAttributes";"assertProductSaveMessage, assertProductInGrid";""
-"configurableProductInjectable::default";"catalogProductVirtual::default";"deleteAttributes";"assertProductSaveMessage, assertProductInGrid";""
-"catalogProductVirtual::default";"catalogProductSimple::default";"-";"assertProductSaveMessage, assertProductInGrid";""
-"catalogProductVirtual::default";"configurableProductInjectable::not_virtual_for_type_switching";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately";""
-"catalogProductVirtual::default";"downloadableProductInjectable::default";"-";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock, assertDownloadableLinksData";""
-"downloadableProductInjectable::default";"catalogProductSimple::default";"-";"assertProductSaveMessage, assertProductInGrid";""
-"downloadableProductInjectable::default";"configurableProductInjectable::not_virtual_for_type_switching";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately";""
-"downloadableProductInjectable::default";"catalogProductVirtual::default";"clearDownloadableData";"assertProductSaveMessage, assertProductInGrid";"Bug: MAGETWO-29903"
-"catalogProductSimple::default";"downloadableProductInjectable::default";"-";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock, assertDownloadableLinksData";""
+"productOrigin";"product";"actionName";"constraint"
+"catalogProductSimple::default";"configurableProductInjectable::default";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately"
+"catalogProductSimple::default";"catalogProductVirtual::default";"-";"assertProductSaveMessage, assertProductInGrid"
+"configurableProductInjectable::default";"catalogProductSimple::default";"deleteAttributes";"assertProductSaveMessage, assertProductInGrid"
+"configurableProductInjectable::default";"catalogProductVirtual::default";"deleteAttributes";"assertProductSaveMessage, assertProductInGrid"
+"catalogProductVirtual::default";"catalogProductSimple::default";"-";"assertProductSaveMessage, assertProductInGrid"
+"catalogProductVirtual::default";"configurableProductInjectable::not_virtual_for_type_switching";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately"
+"catalogProductVirtual::default";"downloadableProductInjectable::default";"-";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock, assertDownloadableLinksData"
+"downloadableProductInjectable::default";"catalogProductSimple::default";"-";"assertProductSaveMessage, assertProductInGrid"
+"downloadableProductInjectable::default";"configurableProductInjectable::not_virtual_for_type_switching";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately"
+"downloadableProductInjectable::default";"catalogProductVirtual::default";"clearDownloadableData";"assertProductSaveMessage, assertProductInGrid"
+"catalogProductSimple::default";"downloadableProductInjectable::default";"-";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock, assertDownloadableLinksData"
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntity.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntity.php
index 1e38cf75dc121..ee0b3fbc58322 100644
--- a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntity.php
+++ b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerFrontendEntity.php
@@ -34,6 +34,8 @@
  *
  * @group Customer_Account_(CS)
  * @ZephyrId MAGETWO-25925
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UpdateCustomerFrontendEntity extends Injectable
 {
diff --git a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
index 0eba0b7fd4682..c8cdfe81c280e 100644
--- a/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
+++ b/dev/tests/functional/tests/app/Magento/Install/Test/Fixture/Install.php
@@ -9,6 +9,8 @@
 
 /**
  * Class Install
+ *
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class Install extends InjectableFixture
 {
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php
index 20b8e03158f26..21bd43ea2c6d5 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/SalesTaxReportEntityTest.php
@@ -173,7 +173,7 @@ public function test(
     }
 
     /**
-     * Process order to corresponded status
+     * Process order to corresponded status.
      *
      * @param string $orderSteps
      * @param OrderInjectable $order
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
index 761e3a8936e33..355bdef0c473c 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
@@ -25,7 +25,7 @@ abstract class AbstractForm extends Form
      *
      * @var string
      */
-    protected $loader = '#loading_mask_loader';
+    protected $loader = '[data-role="loader"]';
 
     /**
      * Fill form data
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AbstractMoveComparedProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AbstractMoveComparedProductsOnOrderPageTest.php
index e1dd056d2754f..f5ac6e1b63524 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AbstractMoveComparedProductsOnOrderPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AbstractMoveComparedProductsOnOrderPageTest.php
@@ -20,6 +20,8 @@
 /**
  * Class AbstractMoveComparedProductsOnOrderPageTest
  * Abstract class for move compared products on order page
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractMoveComparedProductsOnOrderPageTest extends Injectable
 {
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
index 8ee34aa5b2168..45fc4f03962ea 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MoveShoppingCartProductsOnOrderPageTest.php
@@ -37,6 +37,8 @@
  *
  * @group Order_Management_(CS)
  * @ZephyrId MAGETWO-28540
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class MoveShoppingCartProductsOnOrderPageTest extends Injectable
 {
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
index bc050bdfc43c0..600aced0b8f38 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxCalculationTest.php
@@ -103,7 +103,7 @@ public static function setUpBeforeClass()
         self::markTestIncomplete("Epic: MAGETWO-30073");
     }
 
-    /**7
+    /**
      * Prepare data.
      *
      * @param FixtureFactory $fixtureFactory

From 3f4a4a638623d99079cbb8bdfc006ee96b81dd7b Mon Sep 17 00:00:00 2001
From: Anton Kril <akril@ebay.com>
Date: Tue, 16 Dec 2014 11:34:47 +0200
Subject: [PATCH 470/474] MAGETWO-31790: Success message absence after "Signup
 for price alert"

---
 .../ProductAlert/Block/Product/View.php       | 12 ++++-
 .../frontend/templates/product/view.phtml     |  2 +-
 .../ProductAlert/Block/Product/ViewTest.php   | 44 +++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/ProductAlert/Block/Product/ViewTest.php

diff --git a/app/code/Magento/ProductAlert/Block/Product/View.php b/app/code/Magento/ProductAlert/Block/Product/View.php
index 6196cc53cc331..4e0058dffddf0 100644
--- a/app/code/Magento/ProductAlert/Block/Product/View.php
+++ b/app/code/Magento/ProductAlert/Block/Product/View.php
@@ -22,7 +22,7 @@ class View extends \Magento\Framework\View\Element\Template
     protected $_helper;
 
     /**
-     * @var \Magento\Core\Helper\Data|\Magento\Core\Helper\PostData
+     * @var \Magento\Core\Helper\PostData
      */
     protected $coreHelper;
 
@@ -59,4 +59,14 @@ protected function getProduct()
         }
         return false;
     }
+
+    /**
+     * Retrieve post action config
+     *
+     * @return string
+     */
+    public function getPostAction()
+    {
+        return $this->coreHelper->getPostData($this->getSignupUrl());
+    }
 }
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
index 4d5e003768c28..82e868064eecc 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
@@ -5,7 +5,7 @@
 ?>
 <?php /* @var $this \Magento\ProductAlert\Block\Product\View */?>
 <div class="product alert <?php echo $this->getHtmlClass() ?>">
-    <a href="#" data-post='<?php echo $this->coreHelper->getPostData($this->getSignupUrl()); ?>'
+    <a href="#" data-post='<?php echo $this->getPostAction(); ?>'
        title="<?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>" class="action alert">
         <?php echo $this->escapeHtml(__($this->getSignupLabel())); ?>
     </a>
diff --git a/dev/tests/unit/testsuite/Magento/ProductAlert/Block/Product/ViewTest.php b/dev/tests/unit/testsuite/Magento/ProductAlert/Block/Product/ViewTest.php
new file mode 100644
index 0000000000000..d2e8626481443
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/ProductAlert/Block/Product/ViewTest.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\ProductAlert\Block\Product;
+
+class ViewTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $block;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $postHelper;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->postHelper = $this->getMock(
+            'Magento\Core\Helper\PostData',
+            [],
+            [],
+            '',
+            false
+        );
+        $this->block = $objectManager->getObject(
+            'Magento\ProductAlert\Block\Product\View',
+            ['coreHelper' => $this->postHelper]
+        );
+    }
+
+    public function testGetPostAction()
+    {
+        $this->block->setSignupUrl('someUrl');
+        $this->postHelper->expects($this->once())
+            ->method('getPostData')
+            ->with('someUrl')
+            ->will($this->returnValue('{parsedAction}'));
+        $this->assertEquals('{parsedAction}', $this->block->getPostAction());
+    }
+}

From 5ea48ebea12a8186022b72c960ca483dc1807d82 Mon Sep 17 00:00:00 2001
From: Maxim Medinskiy <mmedinskiy@ebay.com>
Date: Mon, 15 Dec 2014 22:14:57 +0200
Subject: [PATCH 471/474] MAGETWO-31819: Fatal error on I18n tools launch due
 to incorrect bootstrap/autoload

---
 dev/tools/Magento/Tools/I18n/bootstrap.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/tools/Magento/Tools/I18n/bootstrap.php b/dev/tools/Magento/Tools/I18n/bootstrap.php
index 562a94b0e9e91..e66c2faf7d87d 100644
--- a/dev/tools/Magento/Tools/I18n/bootstrap.php
+++ b/dev/tools/Magento/Tools/I18n/bootstrap.php
@@ -2,5 +2,4 @@
 /**
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-define('BP', realpath(__DIR__) . '/');
-require realpath(BP . '/../../../../../app/autoload.php');
+require_once __DIR__ . '/../../../../../app/autoload.php';

From 12b903e54cf1961b946c1eea7abd3debc3026f05 Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Tue, 16 Dec 2014 11:50:06 +0200
Subject: [PATCH 472/474] MAGETWO-31804: Incorrect work of "Default Value for
 Disable Automatic Group Changes Based on VAT ID" setting

---
 .../Model/Attribute/Backend/Data/Boolean.php  |  1 +
 .../DisableAutoGroupAssignDefault.php         | 51 ++++++++++++
 .../Magento/Customer/etc/adminhtml/system.xml |  1 +
 .../Model/Attribute/Backend/BooleanTest.php   | 78 +++++++++++++++++++
 .../DisableAutoGroupAssignDefaultTest.php     | 58 ++++++++++++++
 5 files changed, 189 insertions(+)
 create mode 100644 app/code/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefault.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Customer/Model/Attribute/Backend/BooleanTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefaultTest.php

diff --git a/app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php b/app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php
index 7f290f5ca9f20..26f3aedba5784 100644
--- a/app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php
+++ b/app/code/Magento/Customer/Model/Attribute/Backend/Data/Boolean.php
@@ -21,6 +21,7 @@ public function beforeSave($customer)
     {
         $attributeName = $this->getAttribute()->getName();
         $inputValue = $customer->getData($attributeName);
+        $inputValue = is_null($inputValue) ? $this->getAttribute()->getDefaultValue() : $inputValue;
         $sanitizedValue = !empty($inputValue) ? '1' : '0';
         $customer->setData($attributeName, $sanitizedValue);
         return $this;
diff --git a/app/code/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefault.php b/app/code/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefault.php
new file mode 100644
index 0000000000000..16b492c800a94
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefault.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Customer\Model\Config\Backend\CreateAccount;
+
+class DisableAutoGroupAssignDefault extends \Magento\Framework\App\Config\Value
+{
+    /**
+     * @var \Magento\Eav\Model\Config
+     */
+    protected $eavConfig;
+
+    /**
+     * @param \Magento\Framework\Model\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
+     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param \Magento\Framework\Model\Resource\AbstractResource $resource
+     * @param \Magento\Framework\Data\Collection\Db $resourceCollection
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\Model\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\App\Config\ScopeConfigInterface $config,
+        \Magento\Eav\Model\Config $eavConfig,
+        \Magento\Framework\Model\Resource\AbstractResource $resource = null,
+        \Magento\Framework\Data\Collection\Db $resourceCollection = null,
+        array $data = []
+    ) {
+        $this->eavConfig = $eavConfig;
+        parent::__construct($context, $registry, $config, $resource, $resourceCollection, $data);
+    }
+
+    /**
+     * Save EAV default value after save
+     *
+     * @return $this
+     */
+    public function afterSave()
+    {
+        $result = parent::afterSave();
+
+        $attributeObject = $this->eavConfig->getAttribute('customer', 'disable_auto_group_change');
+        $attributeObject->setData('default_value', $this->getValue());
+        $attributeObject->save();
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
index 503a28dc7678d..b02cacade7aa7 100644
--- a/app/code/Magento/Customer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -79,6 +79,7 @@
                 <field id="viv_disable_auto_group_assign_default" translate="label" type="select" sortOrder="57" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Default Value for Disable Automatic Group Changes Based on VAT ID</label>
                     <source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
+                    <backend_model>Magento\Customer\Model\Config\Backend\createAccount\DisableAutoGroupAssignDefault</backend_model>
                 </field>
                 <field id="vat_frontend_visibility" translate="label" type="select" sortOrder="58" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Show VAT Number on Frontend</label>
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Attribute/Backend/BooleanTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Attribute/Backend/BooleanTest.php
new file mode 100644
index 0000000000000..be8d90c25021d
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Attribute/Backend/BooleanTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Customer\Model\Attribute\Backend;
+
+class BooleanTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Customer\Model\Attribute\Backend\Data\Boolean
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $this->model = new \Magento\Customer\Model\Attribute\Backend\Data\Boolean();
+    }
+
+    /**
+     * @param mixed $value
+     * @param mixed $defaultValue
+     * @param string|mixed $result
+     *
+     * @dataProvider beforeSaveDataProvider
+     */
+    public function testBeforeSave($value, $defaultValue, $result)
+    {
+        $attributeMock = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute\AbstractAttribute')
+            ->setMethods(['getName', 'getDefaultValue'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $customerMock = $this->getMockBuilder('Magento\Customer\Model\Customer')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model->setAttribute($attributeMock);
+
+        $attributeMock->expects($this->once())
+            ->method('getName')
+            ->willReturn('attribute_name');
+        $attributeMock->expects($this->any())
+            ->method('getDefaultValue')
+            ->willReturn($defaultValue);
+
+        $customerMock->expects($this->once())
+            ->method('getData')
+            ->with('attribute_name', null)
+            ->willReturn($value);
+        $customerMock->expects($this->once())
+            ->method('setData')
+            ->with('attribute_name', $result)
+            ->willReturnSelf();
+
+        $this->assertEquals($this->model, $this->model->beforeSave($customerMock));
+    }
+
+    /**
+     * @return array
+     */
+    public function beforeSaveDataProvider()
+    {
+        return [
+            [null, null, '0'],
+            [null, '', '0'],
+            [null, '0', '0'],
+            [null, '1', '1'],
+            [null, 'Yes', '1'],
+            ['', null, '0'],
+            ['0', null, '0'],
+            ['0', '1', '0'],
+            ['1', null, '1'],
+            ['1', 'Yes', '1'],
+            ['Yes', null, '1'],
+            ['Yes', 'Yes', '1'],
+        ];
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefaultTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefaultTest.php
new file mode 100644
index 0000000000000..023c81ab5c107
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Config/Backend/CreateAccount/DisableAutoGroupAssignDefaultTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Customer\Model\Config\Backend\CreateAccount;
+
+class DisableAutoGroupAssignDefaultTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Customer\Model\Config\Backend\CreateAccount\DisableAutoGroupAssignDefault
+     */
+    protected $model;
+
+    /**
+     * @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $eavConfigMock;
+
+    protected function setUp()
+    {
+        $this->eavConfigMock = $this->getMockBuilder('Magento\Eav\Model\Config')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
+        $this->model = $objectManager->getObject(
+            'Magento\Customer\Model\Config\Backend\CreateAccount\DisableAutoGroupAssignDefault',
+            [
+                'eavConfig' => $this->eavConfigMock,
+            ]
+        );
+    }
+
+    public function testAfterSave()
+    {
+        $value = true;
+
+        $attributeMock = $this->getMockBuilder('Magento\Eav\Model\Entity\Attribute\AbstractAttribute')
+            ->setMethods(['save', 'setData'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->eavConfigMock->expects($this->once())
+            ->method('getAttribute')
+            ->with('customer', 'disable_auto_group_change')
+            ->willReturn($attributeMock);
+
+        $attributeMock->expects($this->once())
+            ->method('setData')
+            ->with('default_value', $value);
+        $attributeMock->expects($this->once())
+            ->method('save');
+
+        $this->model->setValue($value);
+
+        $this->assertEquals($this->model, $this->model->afterSave());
+    }
+}

From 5ede69817ab764b3b8709e2361048a2216beecff Mon Sep 17 00:00:00 2001
From: Sviatoslav Mankivskyi <smankivskyi@ebay.com>
Date: Tue, 16 Dec 2014 11:59:45 +0200
Subject: [PATCH 473/474] MAGETWO-31804: Incorrect work of "Default Value for
 Disable Automatic Group Changes Based on VAT ID" setting

---
 app/code/Magento/Customer/etc/adminhtml/system.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
index b02cacade7aa7..728f0dd05b623 100644
--- a/app/code/Magento/Customer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -79,7 +79,7 @@
                 <field id="viv_disable_auto_group_assign_default" translate="label" type="select" sortOrder="57" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Default Value for Disable Automatic Group Changes Based on VAT ID</label>
                     <source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
-                    <backend_model>Magento\Customer\Model\Config\Backend\createAccount\DisableAutoGroupAssignDefault</backend_model>
+                    <backend_model>Magento\Customer\Model\Config\Backend\CreateAccount\DisableAutoGroupAssignDefault</backend_model>
                 </field>
                 <field id="vat_frontend_visibility" translate="label" type="select" sortOrder="58" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Show VAT Number on Frontend</label>

From adebbb7f86b8a2acfeeebc83e2eaa56c0f295158 Mon Sep 17 00:00:00 2001
From: Dmytro Aponasenko <daponasenko@ebay.com>
Date: Tue, 16 Dec 2014 12:42:37 +0200
Subject: [PATCH 474/474] Sync qmt repository with mainline - Sprint 1

---
 .../Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php
index 7c52e83522121..6202f510d8ab5 100644
--- a/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php
+++ b/dev/tests/functional/tests/app/Magento/AdvancedCheckout/Test/TestCase/AddProductsToCartBySkuFromWidgetTest.php
@@ -33,6 +33,8 @@
  *
  * @group Add_by_SKU_(CS)
  * @ZephyrId MAGETWO-29781
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AddProductsToCartBySkuFromWidgetTest extends AbstractAdvancedCheckoutEntityTest
 {